diff --git a/.github/PULL-REQUEST-TEMPLATE.md b/.github/PULL-REQUEST-TEMPLATE.md
index 7907a239cd..a014c12018 100644
--- a/.github/PULL-REQUEST-TEMPLATE.md
+++ b/.github/PULL-REQUEST-TEMPLATE.md
@@ -30,13 +30,27 @@ What is the new behavior?
 -->
 
 
-## Testing Instructions
+## Testing
 <!--
-Please provide some instructions and other information for how to verify that the feature works.
+When you add a feature, you should also provide relevant unit tests, in order to 
+* ensure that the feature works as expected
+* ensure that the feature will continue to work in the future
+-->
+
+- [ ] I have added one or more unit tests for this PR
+- [ ] I have updated the relevant unit tests
+- [ ] No unit test changes are needed for this PR
+
+### Affected areas
+
+<!--
+Please provide some details on what areas of the system that are affected by this PR.
+This is useful for testers to know where to focus their testing efforts.
 Examples:
-* "Do a Take for a part that contains an adlib, verify that the adlib plays out."
-* "Open the Switchboard panel and toggle a route, verify that the route toggles in the GUI."
-* "This feature also affects 'feature X', so that needs to be tested for regressions as well."
+* This PR affects the playout logic in general.
+* This PR affects the timing calculation in the Rundown during playout.
+* This PR affects the NRC/MOS integration
+* 
 -->
 
 
diff --git a/.github/workflows/node.yaml b/.github/workflows/node.yaml
index a498458894..bed7511205 100644
--- a/.github/workflows/node.yaml
+++ b/.github/workflows/node.yaml
@@ -184,11 +184,18 @@ jobs:
         run: |
           cd meteor
           yarn inject-git-hash
+      - name: Prepare webui for meteor build
+        if: steps.check-build-and-push.outputs.enable == 'true'
+        run: |
+          rm -Rf meteor/public
+          cp -R packages/webui/dist meteor/public
       - name: Meteor Build
         if: steps.check-build-and-push.outputs.enable == 'true'
         run: |
           cd meteor
           NODE_OPTIONS="--max-old-space-size=4096" METEOR_DEBUG_BUILD=1 meteor build --allow-superuser --directory .
+          mv bundle/programs/web.browser/assets/ bundle/programs/web.browser/app/assets/ || true
+
       - name: Meteor Bundle NPM Build
         if: steps.check-build-and-push.outputs.enable == 'true'
         run: |
@@ -212,7 +219,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       - name: Build and push to GHCR
         if: steps.check-build-and-push.outputs.enable == 'true' && steps.check-ghcr.outputs.enable == 'true' && steps.ghcr-tag.outputs.tags != 0
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: .
           file: ./meteor/Dockerfile.circle
@@ -223,7 +230,7 @@ jobs:
           github-token: ${{ github.token }}
       - name: Build and push to DockerHub
         if: steps.check-build-and-push.outputs.enable == 'true' && steps.dockerhub.outputs.dockerhub-publish == '1'
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: .
           file: ./meteor/Dockerfile.circle
@@ -239,7 +246,9 @@ jobs:
           echo "image=$image" >> $GITHUB_OUTPUT
       - name: Trivy scanning
         if: steps.check-build-and-push.outputs.enable == 'true' && steps.check-ghcr.outputs.enable == 'true' && steps.ghcr-tag.outputs.tags != 0
-        uses: aquasecurity/trivy-action@0.17.0
+        uses: aquasecurity/trivy-action@0.24.0
+        env:
+          TRIVY_DB_REPOSITORY: public.ecr.aws/aquasecurity/trivy-db
         with:
           image-ref: "${{ steps.trivy-image.outputs.image }}"
           format: "table"
@@ -362,7 +371,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       - name: Build and push to GHCR
         if: steps.check-build-and-push.outputs.enable == 'true' && steps.check-ghcr.outputs.enable == 'true' && steps.ghcr-tag.outputs.tags != 0
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: ./packages
           file: ./packages/${{ matrix.gateway-name }}/Dockerfile.circle
@@ -372,7 +381,7 @@ jobs:
           tags: "${{ steps.ghcr-tag.outputs.tags }}"
       - name: Build and push to DockerHub
         if: steps.check-build-and-push.outputs.enable == 'true' && steps.dockerhub.outputs.dockerhub-publish == '1'
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: ./packages
           file: ./packages/${{ matrix.gateway-name }}/Dockerfile.circle
@@ -388,7 +397,9 @@ jobs:
           echo "image=$image" >> $GITHUB_OUTPUT
       - name: Trivy scanning
         if: steps.check-build-and-push.outputs.enable == 'true' && steps.check-ghcr.outputs.enable == 'true' && steps.ghcr-tag.outputs.tags != 0
-        uses: aquasecurity/trivy-action@0.17.0
+        uses: aquasecurity/trivy-action@0.24.0
+        env:
+          TRIVY_DB_REPOSITORY: public.ecr.aws/aquasecurity/trivy-db
         with:
           image-ref: "${{ steps.trivy-image.outputs.image }}"
           format: "table"
@@ -422,9 +433,11 @@ jobs:
           - mos-gateway
           - corelib
           - shared-lib
+          - meteor-lib
           - job-worker
           - openapi
           - live-status-gateway
+          - webui
 
     steps:
       - uses: actions/checkout@v4
@@ -467,7 +480,7 @@ jobs:
           - blueprints-integration
           - server-core-integration
           - shared-lib
-        node-version: [14.x, 16.x, 18.x, 20.x]
+        node-version: [14.x, 18.x, 20.x, 22.x]
         include:
           # include additional configs, to run certain packages only for a certain version of node
           - node-version: 14.x
@@ -477,12 +490,12 @@ jobs:
             package-name: job-worker
             send-coverage: true
           # manual openapi to avoid testing for 14.x
-          - node-version: 16.x
-            package-name: openapi
           - node-version: 18.x
             package-name: openapi
           - node-version: 20.x
             package-name: openapi
+          - node-version: 22.x
+            package-name: openapi
           # No tests for the gateways yet
           # - node-version: 18.x
           #   package-name: playout-gateway
@@ -490,6 +503,15 @@ jobs:
           #   package-name: mos-gateway
           - node-version: 18.x
             package-name: live-status-gateway
+            send-coverage: true
+          - node-version: 18.x
+            package-name: webui
+          # manual meteor-lib as it only needs a couple of versions
+          - node-version: 18.x
+            package-name: meteor-lib
+            send-coverage: true
+          - node-version: 14.x
+            package-name: meteor-lib
 
     steps:
       - uses: actions/checkout@v4
@@ -520,7 +542,7 @@ jobs:
         env:
           CI: true
       - name: Send coverage
-        if: (matrix.node-version == '16.x' || matrix.send-coverage == true) && ((github.event_name == 'pull_request') && ((!startsWith(github.head_ref, 'release'))) || ((github.event_name == 'push') && (!startsWith(github.ref_name, 'release'))))
+        if: (matrix.node-version == '18.x' || matrix.send-coverage == true) && ((github.event_name == 'pull_request') && ((!startsWith(github.head_ref, 'release'))) || ((github.event_name == 'push') && (!startsWith(github.ref_name, 'release'))))
         uses: codecov/codecov-action@v4
         env:
           CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
@@ -569,13 +591,17 @@ jobs:
           yarn
         env:
           CI: true
-      - name: Run generator
+      - name: Build OpenAPI client library
+        run: |
+          cd packages/openapi
+          yarn build
+        env:
+          CI: true
+      - name: Generate OpenAPI docs and server
         run: |
           cd packages/openapi
-
           yarn gendocs
           yarn genserver
-          yarn genclient:ts
         env:
           CI: true
 
@@ -622,7 +648,7 @@ jobs:
           CI: true
       - name: Publish
         if: github.ref == 'refs/heads/master' # always publish for just the master branch
-        uses: peaceiris/actions-gh-pages@v3
+        uses: peaceiris/actions-gh-pages@v4
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           publish_dir: ./packages/documentation/build
@@ -664,7 +690,7 @@ jobs:
           else
             # make dependencies of `determine-npm-tag` available
             yarn install --mode=skip-build
-            
+
             cd packages
             PACKAGE_NAME="@sofie-automation/shared-lib"
             PUBLISHED_VERSION=$(yarn npm info --json $PACKAGE_NAME | jq -c '.version' -r)
@@ -682,6 +708,13 @@ jobs:
           yarn build
         env:
           CI: true
+      - name: Build OpenAPI client library
+        if: ${{ steps.do-publish.outputs.tag }}
+        run: |
+          cd packages/openapi
+          yarn build
+        env:
+          CI: true
       - name: Modify dependencies to use npm packages
         run: node scripts/prepublish.js
       - name: Publish to NPM
diff --git a/.github/workflows/prerelease-libs.yml b/.github/workflows/prerelease-libs.yml
index bac83c4b71..e9750028c4 100644
--- a/.github/workflows/prerelease-libs.yml
+++ b/.github/workflows/prerelease-libs.yml
@@ -53,7 +53,7 @@ jobs:
           - blueprints-integration
           - server-core-integration
           - shared-lib
-        node-version: [14.x, 16.x, 18.x, 20.x]
+        node-version: [14.x, 18.x, 20.x, 22.x]
 
     steps:
       - uses: actions/checkout@v4
@@ -131,6 +131,14 @@ jobs:
           yarn build
         env:
           CI: true
+
+      - name: Build OpenAPI client library
+        if: ${{ steps.do-publish.outputs.publish }}
+        run: |
+          cd packages/openapi
+          yarn build
+        env:
+          CI: true
       - name: Modify dependencies to use npm packages
         run: node scripts/prepublish.js
       - name: Publish to NPM
diff --git a/.github/workflows/prune-container-images.yml b/.github/workflows/prune-container-images.yml
index b7c5625124..11f35daef9 100644
--- a/.github/workflows/prune-container-images.yml
+++ b/.github/workflows/prune-container-images.yml
@@ -7,6 +7,8 @@ on:
 
 jobs:
   prune-container-images:
+    if: ${{ github.repository_owner == 'nrkno' }}
+    
     uses: nrkno/sofie-github-workflows/.github/workflows/prune-container-images.yml@main
     strategy:
       max-parallel: 1
diff --git a/.github/workflows/prune-tags.yml b/.github/workflows/prune-tags.yml
index e9d9a5bbbc..2bd28d2b81 100644
--- a/.github/workflows/prune-tags.yml
+++ b/.github/workflows/prune-tags.yml
@@ -16,6 +16,8 @@ on:
 
 jobs:
   prune-tags:
+    if: ${{ github.repository_owner == 'nrkno' }}
+    
     name: Prune tags
     runs-on: ubuntu-latest
     timeout-minutes: 15
diff --git a/.github/workflows/sonar.yaml b/.github/workflows/sonar.yaml
index 29a206dd6c..f67d9cab0f 100644
--- a/.github/workflows/sonar.yaml
+++ b/.github/workflows/sonar.yaml
@@ -12,7 +12,8 @@ jobs:
   sonarcloud:
     name: SonarCloud
     runs-on: ubuntu-latest
-    if: ${{ github.repository_owner == 'nrkno' }}
+    if: ${{ github.repository_owner == 'nrkno' && !github.event.pull_request.head.repo.fork }}
+    timeout-minutes: 15
 
     steps:
       - uses: actions/checkout@v4
diff --git a/.github/workflows/trivy.yml b/.github/workflows/trivy.yml
index 9462d9d985..212a538f80 100644
--- a/.github/workflows/trivy.yml
+++ b/.github/workflows/trivy.yml
@@ -6,21 +6,29 @@ on:
 
 jobs:
   trivy:
+    if: ${{ github.repository_owner == 'nrkno' }}
+
     name: Trivy scan
     runs-on: ubuntu-latest
     strategy:
       matrix:
         image: ["server-core", "playout-gateway", "mos-gateway"]
+    timeout-minutes: 15
+
     steps:
       - name: Run Trivy vulnerability scanner (json)
-        uses: aquasecurity/trivy-action@0.17.0
+        uses: aquasecurity/trivy-action@0.24.0
+        env:
+          TRIVY_DB_REPOSITORY: public.ecr.aws/aquasecurity/trivy-db
         with:
           image-ref: ghcr.io/nrkno/sofie-core-${{ matrix.image }}:latest
           format: json
           output: '${{ matrix.image }}-trivy-scan-results.json'
 
       - name: Run Trivy vulnerability scanner (table)
-        uses: aquasecurity/trivy-action@0.17.0
+        uses: aquasecurity/trivy-action@0.24.0
+        env:
+          TRIVY_DB_REPOSITORY: public.ecr.aws/aquasecurity/trivy-db
         with:
           image-ref: ghcr.io/nrkno/sofie-core-${{ matrix.image }}:latest
           output: '${{ matrix.image }}-trivy-scan-results.txt'
@@ -36,7 +44,9 @@ jobs:
           echo $CODE_BLOCK >> $GITHUB_STEP_SUMMARY
 
       - name: Run Trivy in GitHub SBOM mode and submit results to Dependency Graph
-        uses: aquasecurity/trivy-action@0.17.0
+        uses: aquasecurity/trivy-action@0.24.0
+        env:
+          TRIVY_DB_REPOSITORY: public.ecr.aws/aquasecurity/trivy-db
         with:
           format: 'github'
           output: 'dependency-results-${{ matrix.image }}.sbom.json'
@@ -54,7 +64,7 @@ jobs:
           echo ${{ env.SUMMARY }}
 
       - name: Send Slack Notification
-        uses: slackapi/slack-github-action@v1.25.0
+        uses: slackapi/slack-github-action@v1.27.0
         with:
           payload: |
             {
diff --git a/.vscode/settings.json.default b/.vscode/settings.json.default
index 29742098b9..bbed2d7f28 100644
--- a/.vscode/settings.json.default
+++ b/.vscode/settings.json.default
@@ -9,7 +9,8 @@
         "packages/shared-lib",
         "packages/job-worker",
         "packages/openapi",
-        "packages/live-status-gateway"
+        "packages/live-status-gateway",
+		"packages/webui"
     ],
     "prettier.enable": true,
     "sonarlint.connectedMode.project": { "projectKey": "nrkno_sofie-core" },
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index beced98156..b609a43658 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -9,4 +9,5 @@ This repository uses the following branches:
 * **_master_** is our main branch. We consider it stable and it is used in production.
 * The **_releaseXX_** branches are our in-development branches. When a release is ready, we decide to “freeze” that branch and create a new **_releaseXX+1_** branch.
 
-We encourage you to base your contributions on the latest **_releaseXX_** branch, alternatively the **_master_** branch or a recently frozen **_releaseXX_** branch. The [_Sofie Releases_](https://nrkno.github.io/sofie-core/releases) page collects the status and timeline of the releases.
+We require contributions to be based based on the latest **_release\*_** branch.
+The [_Sofie Releases_](https://nrkno.github.io/sofie-core/releases) page collects the status and timeline of the releases.
diff --git a/DEVELOPER.md b/DEVELOPER.md
index 0e72517e74..43b1749c7f 100644
--- a/DEVELOPER.md
+++ b/DEVELOPER.md
@@ -18,11 +18,14 @@ Follow these instructions to start up Sofie Core in development mode. (For produ
 
 ### Prerequisites
 
-- Install [Node.js](https://nodejs.org) 18 (14 should also work) (using [nvm](https://github.com/nvm-sh/nvm) or [nvm-windows](https://github.com/coreybutler/nvm-windows) is the recommended way to install Node.js)
-- If on Windows: `npm install --global windows-build-tools`
-- Install [Meteor](https://www.meteor.com/install) (`npm install --global meteor`)
+- Install [Node.js](https://nodejs.org) 14 (using [nvm](https://github.com/nvm-sh/nvm) or [nvm-windows](https://github.com/coreybutler/nvm-windows) is the recommended way to install Node.js)
+- Install [Meteor](https://www.meteor.com/install) (`npm install --global meteor@2`)
+- Install [Node.js](https://nodejs.org) 18 (using the same method you used above, you can uninstall node 14 if needed)
+- Install an older version of corepack (`npm install --global corepack@0.15.3`)
 - Enable [corepack](https://nodejs.org/api/corepack.html#corepack) (`corepack enable`) as administrator/root. If `corepack` is not found, you may need to install it first with `npm install --global corepack`
 
+- If on Windows, you may need to `npm install --global windows-build-tools` but this is not always necessary
+
 ### Quick Start
 
 ```bash
@@ -33,6 +36,8 @@ yarn start
 
 > 💡 First startup may take a while, especially on Windows. To speed things up, consider adding `%LOCALAPPDATA%\.meteor` and the directory where you cloned `server-core` to your Windows Defender virus protection exclusions.
 
+The Sofie ui (served by Vite) can be accessed at `http://localhost:3005`. The meteor http server can be access directly at `http://localhost:3000`
+
 ### Slightly more Involved Start
 
 1. Clone the repository (for development, it is recommended to base your work on the latest unstable release branch)
diff --git a/meteor/.eslintrc.js b/meteor/.eslintrc.js
index de695b84b4..dedc902676 100644
--- a/meteor/.eslintrc.js
+++ b/meteor/.eslintrc.js
@@ -56,43 +56,20 @@ const tsBase = {
 }
 
 module.exports = {
-	extends: [...commonExtends, 'plugin:react/recommended'],
-	plugins: [...commonPlugins, 'react'],
+	extends: [...commonExtends],
+	plugins: [...commonPlugins],
 	rules: {
 		'prettier/prettier': 'error',
 	},
 	env: { es2017: true },
 	parserOptions: { sourceType: 'module', ecmaVersion: 2018 },
-	settings: {
-		react: {
-			version: 'detect', // Tells eslint-plugin-react to automatically detect the version of React to use
-		},
-	},
+	settings: {},
 	overrides: [
 		// Note: these replace the values defined above, so make sure to extend them if they are needed
 		{
 			files: ['*.ts'],
 			...tsBase,
 		},
-		{
-			files: ['*.tsx'],
-			...tsBase,
-			extends: [...tsBase.extends, 'plugin:react/recommended'],
-			parserOptions: {
-				...tsBase.parserOptions,
-				ecmaFeatures: {
-					jsx: true, // Allows for the parsing of JSX
-				},
-			},
-			rules: {
-				...tsBase.rules,
-				'node/no-extraneous-import': 'off', // because there are a lot of them as dev-dependencies
-				'node/no-missing-import': 'off', // erroring on every single import
-				'react/prop-types': 'off', // we don't use this
-				'@typescript-eslint/no-empty-interface': 'off', // many prop/state types are {}
-				'@typescript-eslint/promise-function-async': 'off', // event handlers can't be async
-			},
-		},
 		{
 			files: ['*.js'],
 			env: {
diff --git a/meteor/.gitignore b/meteor/.gitignore
index 9daa93f13b..f9fbba253b 100644
--- a/meteor/.gitignore
+++ b/meteor/.gitignore
@@ -5,6 +5,7 @@ src/**/*.js.map
 coverage
 settings.json
 server/_force_restart.js
+public/
 
 # Ignore TV2-features:
 client/styles/tv2
diff --git a/meteor/.meteor/packages b/meteor/.meteor/packages
index 32ca94185a..04d09220d2 100644
--- a/meteor/.meteor/packages
+++ b/meteor/.meteor/packages
@@ -9,24 +9,14 @@
 # but you can also edit it by hand.
 
 meteor-base@1.5.1 # Packages every Meteor app needs to have
-mobile-experience@1.1.0 # Packages for a great mobile UX
 mongo@1.16.7 # The database Meteor supports right now
 reactive-var@1.0.12 # Reactive variable for tracker
 
-standard-minifier-css@1.9.2 # CSS minifier run for production mode
-standard-minifier-js@2.8.1 # JS minifier run for production mode
-es5-shim@4.8.0 # ECMAScript 5 compatibility for older browsers
 ecmascript@0.16.7 # Enable ECMAScript2015+ syntax in app code
 typescript@4.9.4 # Enable TypeScript syntax in .ts and .tsx modules
 shell-server@0.5.0 # Server-side component of the `meteor shell` command
-modern-browsers@0.1.9 # Select when to allow use of the "modern" bundle
-
-static-html@1.3.2 # Define static page content in .html files
-react-meteor-data # React higher-order component for reactively tracking Meteor data
 
 tracker@1.3.2 # Meteor's client-side reactive programming library
-session@1.2.1
-fourseven:scss
 
 dynamic-import@0.7.3
 ostrio:meteor-root
diff --git a/meteor/.meteor/versions b/meteor/.meteor/versions
index bd092097f2..d337a7f4b4 100644
--- a/meteor/.meteor/versions
+++ b/meteor/.meteor/versions
@@ -6,10 +6,7 @@ babel-compiler@7.10.4
 babel-runtime@1.5.1
 base64@1.0.12
 binary-heap@1.0.11
-blaze-tools@1.1.3
 boilerplate-generator@1.7.1
-caching-compiler@1.2.2
-caching-html-compiler@1.2.1
 callback-hook@1.5.1
 check@1.3.2
 ddp@1.4.1
@@ -27,25 +24,17 @@ ejson@1.1.3
 email@2.2.5
 es5-shim@4.8.0
 fetch@0.1.3
-fourseven:scss@4.15.0
 geojson-utils@1.0.11
 hot-code-push@1.0.4
-html-tools@1.1.3
-htmljs@1.1.1
 id-map@1.1.1
 inter-process-messaging@0.1.1
 julusian:meteor-elastic-apm@2.5.2
 kschingiz:meteor-measured@1.0.3
-launch-screen@1.3.0
 localstorage@1.2.0
 logging@1.3.2
 meteor@1.11.3
 meteor-base@1.5.1
-minifier-css@1.6.4
-minifier-js@2.7.5
 minimongo@1.9.3
-mobile-experience@1.1.0
-mobile-status-bar@1.1.0
 modern-browsers@0.1.9
 modules@0.19.0
 modules-runtime@0.13.1
@@ -60,21 +49,13 @@ promise@0.12.2
 random@1.2.1
 rate-limit@1.1.1
 react-fast-refresh@0.2.7
-react-meteor-data@2.5.1
-reactive-dict@1.3.1
 reactive-var@1.0.12
 reload@1.3.1
 retry@1.1.0
 routepolicy@1.1.1
-session@1.2.1
 sha@1.0.9
 shell-server@0.5.0
 socket-stream-client@0.5.1
-spacebars-compiler@1.3.1
-standard-minifier-css@1.9.2
-standard-minifier-js@2.8.1
-static-html@1.3.2
-templating-tools@1.2.2
 tracker@1.3.2
 typescript@4.9.4
 underscore@1.0.13
diff --git a/meteor/CHANGELOG.md b/meteor/CHANGELOG.md
index 99888a30a1..7a08165001 100644
--- a/meteor/CHANGELOG.md
+++ b/meteor/CHANGELOG.md
@@ -2,6 +2,302 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [1.51.0-in-testing.3](https://github.com/nrkno/sofie-core/compare/v1.51.0-in-testing.2...v1.51.0-in-testing.3) (2024-09-25)
+
+## [1.51.0-in-testing.2](https://github.com/nrkno/sofie-core/compare/v1.51.0-in-testing.1...v1.51.0-in-testing.2) (2024-09-24)
+
+
+### Bug Fixes
+
+* allow replacement in replaceInfinitesFromPreviousPlayhead ([ebb154d](https://github.com/nrkno/sofie-core/commit/ebb154d6b59369588da400d8d921a00e41b84dc8))
+* **BucketPanel:** Bucket AdLibs don't trigger when created before Rundown activation (SOFIE-3478) ([a16d977](https://github.com/nrkno/sofie-core/commit/a16d9777a301a6d7d69ea00be02b70c53cb9bdcc))
+* **LinePartTimeline:** make rules for findMainPiece consistent, make infinite graphics Pieces display correctly ([153d100](https://github.com/nrkno/sofie-core/commit/153d100fb659546201a654af5c566b513951df88))
+* **NoraFloatingInspector:** prevent Segment crash when trying to show a Piece with an invalid Nora `previewPayload` ([4a3a2e7](https://github.com/nrkno/sofie-core/commit/4a3a2e779c144b1c9e88c187cce2e5c80d34626d))
+* resolve an issue with prompter moving when Parts become PartInstances and the prompter position is juuuust right ([a670a73](https://github.com/nrkno/sofie-core/commit/a670a73fa6bfb8331921a2bedd9c927952cfffcf))
+
+## [1.51.0-in-testing.0](https://github.com/nrkno/sofie-core/compare/v1.50.4...v1.51.0-in-testing.0) (2024-08-19)
+
+
+### Features
+
+* Ensure peripheralDevice subdevice removal when requested ([#1227](https://github.com/nrkno/sofie-core/issues/1227)) ([d5cafe8](https://github.com/nrkno/sofie-core/commit/d5cafe8db5e453f87f8d46262f23e118b580d4d5))
+
+
+### Bug Fixes
+
+* update sorensen dep ([d4cc0f7](https://github.com/nrkno/sofie-core/commit/d4cc0f7d508c0fcbe516be5babcbdf17cca05c9d))
+
+### [1.50.5-LSG-updates](https://github.com/nrkno/sofie-core/compare/v1.50.4-LSG-updates...v1.50.5-LSG-updates) (2024-08-08)
+
+
+### Bug Fixes
+
+* compensate for piece preroll for adlibbed pieces SOFIE-3369 ([#1236](https://github.com/nrkno/sofie-core/issues/1236)) ([195a7d9](https://github.com/nrkno/sofie-core/commit/195a7d98242d6377dac9f1efc69f861fc3b554e5))
+* refactor Rundown orphaned property SOFIE-2963 [#1210](https://github.com/nrkno/sofie-core/issues/1210) ([#1217](https://github.com/nrkno/sofie-core/issues/1217)) ([cf9fa15](https://github.com/nrkno/sofie-core/commit/cf9fa159b7385614a879ee215b3093a7e708bb7d))
+* rundown timing drifting when playing parts with preroll SOFIE-3291 ([#1234](https://github.com/nrkno/sofie-core/issues/1234)) ([beee11a](https://github.com/nrkno/sofie-core/commit/beee11a21a44a3e3e75c8189061b74ae45f9068a))
+* unexpected timeline updates while playing final part in rundown SOFIE-3371 ([#1237](https://github.com/nrkno/sofie-core/issues/1237)) ([0fe74b4](https://github.com/nrkno/sofie-core/commit/0fe74b45d2c09e2e08e942c49dae55ceb1ef698c))
+* use same piece timing as timeline in LSG SOFIE-3305 ([#1219](https://github.com/nrkno/sofie-core/issues/1219)) ([bf48f17](https://github.com/nrkno/sofie-core/commit/bf48f171719452eb6e309964b3779bb8ad2992e9))
+
+### [1.50.4-LSG-updates](https://github.com/nrkno/sofie-core/compare/v1.50.3-LSG-updates...v1.50.4-LSG-updates) (2024-07-30)
+
+
+### Features
+
+* create adlib testing rundowns SOFIE-2963 ([#1211](https://github.com/nrkno/sofie-core/issues/1211)) ([a831989](https://github.com/nrkno/sofie-core/commit/a8319898c73d7233a2a665fd0bf5b9d6da83d713))
+* move `contentStatus` to separate property ([02d49bd](https://github.com/nrkno/sofie-core/commit/02d49bd30b7b2ae05ffd143986b119470c75249b))
+* Rundown `source` property SOFIE-2963 ([#1210](https://github.com/nrkno/sofie-core/issues/1210)) ([de6ee9b](https://github.com/nrkno/sofie-core/commit/de6ee9b3590cbdb6270c291cc41ad15c23652726))
+
+
+### Bug Fixes
+
+* `Cannot replace infinite PieceInstance` during normal operation SOFIE-3305 ([13264bb](https://github.com/nrkno/sofie-core/commit/13264bb5a48056d895f9bd206437554b3b2499fd))
+* further improve stringifyError ([0233073](https://github.com/nrkno/sofie-core/commit/02330735fd4f3b03f9bff84e4c41fb9199a4623e))
+* improve error logging: use stringifyError() ([8da63de](https://github.com/nrkno/sofie-core/commit/8da63dec44915439ea436eee9697f3774241537b))
+* **LSG:** fix async-api generation ([faaf202](https://github.com/nrkno/sofie-core/commit/faaf202703fe6c7829cd2216882ed96c6d2a1e26))
+* **LSG:** make AsyncAPI stuff build again ([53bea2a](https://github.com/nrkno/sofie-core/commit/53bea2a75f366f0c2ef487da13195fb6f7f70a36))
+* **LSG:** Token "examples" does not exist when running `yarn gendocs` ([87065d7](https://github.com/nrkno/sofie-core/commit/87065d7af229cd2e3bf1db1f9217d6d8b8945fee))
+* **LSG:** Token "examples" does not exist when running `yarn gendocs` ([a0ea9b4](https://github.com/nrkno/sofie-core/commit/a0ea9b48997fe39e8db5ababef744c103a68509f))
+* make stringifyError handle UserError better ([e2ecc7e](https://github.com/nrkno/sofie-core/commit/e2ecc7eb48b9ad6c0d95b299d954abac577e70a7))
+* move `UIDeviceTriggerPreview` to remove cross-boundary access ([1de77fc](https://github.com/nrkno/sofie-core/commit/1de77fc7544559c8425bc03bca4c98f22eb8b99a))
+* refactor VirtualElement to be a FC ([0dd6a1f](https://github.com/nrkno/sofie-core/commit/0dd6a1f61be57f0177b0b1953c489ee9c28f9215))
+* remove remaining usages of `withMediaObjectStatus` ([598b932](https://github.com/nrkno/sofie-core/commit/598b93201c09ef0a8860ebf2b0886e0f3c0d3519))
+
+### [1.50.3-LSG-updates](https://github.com/nrkno/sofie-core/compare/v1.50.3...v1.50.3-LSG-updates) (2024-06-24)
+
+
+### ⚠ BREAKING CHANGES
+
+* remove `metaData` from various interfaces
+* Remove unused config manifest types
+
+### Features
+
+* A/B player Ids as strings ([#1054](https://github.com/nrkno/sofie-core/issues/1054)) ([d9dee47](https://github.com/nrkno/sofie-core/commit/d9dee473068c4d96d15a6ef799ace830cf1fe1c0))
+* a11ly WIP ([3df556c](https://github.com/nrkno/sofie-core/commit/3df556c35ece15d1f3b7c192bda5c73422af3952))
+* **a11ly:** add :focus-visible outline ([3adcd49](https://github.com/nrkno/sofie-core/commit/3adcd49cbb3e42c3371e41abb8cdbd59bf43a9fd))
+* **a11ly:** replace systemActionKeys with stopPropagation on action listeners ([0fe2d24](https://github.com/nrkno/sofie-core/commit/0fe2d24152236b79e7b99e8e95502ff4d7a444d8))
+* **a11y:** add role properties to the RundownList components ([91113fc](https://github.com/nrkno/sofie-core/commit/91113fc6ee3706c583efc4b9641485c0fd03f4aa))
+* **a11y:** make buttons into buttons, add keyboard handler for shelf Handle ([44bfca2](https://github.com/nrkno/sofie-core/commit/44bfca293fec139fb0771261283a51db803968ca))
+* action triggers styleClassNames SOFIE-3138 ([#1192](https://github.com/nrkno/sofie-core/issues/1192)) ([fa306dc](https://github.com/nrkno/sofie-core/commit/fa306dc16d5f6ee31418e282180d4c704f5d9feb))
+* action triggers styleClassNames SOFIE-3138 ([#1192](https://github.com/nrkno/sofie-core/issues/1192)) ([49274d6](https://github.com/nrkno/sofie-core/commit/49274d64bdc0532f294be34b0a4413d848321e40))
+* add "processing" warning notification ([d123037](https://github.com/nrkno/sofie-core/commit/d123037ec455743d3e5fbe54a886a5cc7d287dd1))
+* add import/export support to config object tables SOFIE-3138 ([#1194](https://github.com/nrkno/sofie-core/issues/1194)) ([306d31e](https://github.com/nrkno/sofie-core/commit/306d31e03a63539035fce9d8f3f303122c13cbb3))
+* add import/export support to config object tables SOFIE-3138 ([#1194](https://github.com/nrkno/sofie-core/issues/1194)) ([3daaff0](https://github.com/nrkno/sofie-core/commit/3daaff052db261abdccdb30e170dbe2f91ecf2d8))
+* add onTake and onSetAsNext blueprint callbacks SOFIE-2897 SOFIE-2808 ([#1117](https://github.com/nrkno/sofie-core/issues/1117)) ([0bd621c](https://github.com/nrkno/sofie-core/commit/0bd621c13b08cb20c923ea573baca9db003c7df1))
+* add SourceLayer.STUDIO_SCREEN ([158e660](https://github.com/nrkno/sofie-core/commit/158e6603eda370e97e4b2fdaf23b5df229e8ff4a))
+* allow executing bucket adlibs by `externalId` ([af4e5e2](https://github.com/nrkno/sofie-core/commit/af4e5e2fe83d01afb3fb28c5b841e571a345bc0b))
+* backport of release51 live-status-gateway onto release50 ([0a87a95](https://github.com/nrkno/sofie-core/commit/0a87a9519ca1f344429e9b4d47a44c1a9acddff2))
+* base64 image input control SOFIE-3138 ([#1191](https://github.com/nrkno/sofie-core/issues/1191)) ([1a6f2ff](https://github.com/nrkno/sofie-core/commit/1a6f2ff51c98a80a6049959a68a15f5a4bbf7739))
+* base64 image input control SOFIE-3138 ([#1191](https://github.com/nrkno/sofie-core/issues/1191)) ([3a8ef45](https://github.com/nrkno/sofie-core/commit/3a8ef454b3675a56b1f05ce08c19d48eb3eacce1))
+* blueprint config fixup step SOFIE-2258 ([#1050](https://github.com/nrkno/sofie-core/issues/1050)) ([ea6c343](https://github.com/nrkno/sofie-core/commit/ea6c3435079172c682dd1e23d7813ae33fcdee78))
+* break out of maintain focus on wheel event ([bfcf08e](https://github.com/nrkno/sofie-core/commit/bfcf08e2fe2629b9c25a6c8a1fce256858d86e00))
+* Buckets in the HTTP API (SOFIE-2795) ([#1070](https://github.com/nrkno/sofie-core/issues/1070)) ([5d94d8a](https://github.com/nrkno/sofie-core/commit/5d94d8a0f3d0ef09894ccb03e1987638d1ad3573))
+* change sort icons ([6ee9282](https://github.com/nrkno/sofie-core/commit/6ee928230463eedfe496cc5f6c3951e72e1ef744))
+* check if segment should be immediately regenerated during ingest SOFIE-2887 ([64fb1da](https://github.com/nrkno/sofie-core/commit/64fb1da27e041e91a9faf70a30d602f017131764))
+* cleanup deprecations ([#996](https://github.com/nrkno/sofie-core/issues/996)) ([f04f18f](https://github.com/nrkno/sofie-core/commit/f04f18f8e94b706dd1a3da1525feb9787f6eb85f))
+* **Device Triggers:** add support for setting shift register operations ([aa19fcc](https://github.com/nrkno/sofie-core/commit/aa19fcc3b5bfad05158677701b838673578a4dcb))
+* **Device Triggers:** add support for setting shift register operations SOFIE-3136 ([c5a6292](https://github.com/nrkno/sofie-core/commit/c5a6292a85821d67653eebef75bbd929ff0cd44d))
+* document publications and remove mongo queries from parameters SOFIE-1183 ([#1062](https://github.com/nrkno/sofie-core/issues/1062)) ([17bb2e3](https://github.com/nrkno/sofie-core/commit/17bb2e3225db22505244b98a0c9c95fe54bef083))
+* Dynamic message in Evaluation form SOFIE-2766 ([#1101](https://github.com/nrkno/sofie-core/issues/1101)) ([2dc6b42](https://github.com/nrkno/sofie-core/commit/2dc6b4245fc416d87147b7b49d7dd5e52908af6c))
+* **EAV-31:** add blueprintsData on adlib actions ([114c064](https://github.com/nrkno/sofie-core/commit/114c06466ff1f35660454b66d1e35b3d339b9a80))
+* Editable fields as JSON ([ddfb66a](https://github.com/nrkno/sofie-core/commit/ddfb66a1ef8afbd507535037d12752742c7dfeda))
+* have both part and partInstance timings in rundownTiming context ([91c07c8](https://github.com/nrkno/sofie-core/commit/91c07c8410039c0527f3b09f11a5b9e64cc7737f))
+* have withResolvedSegment return Parts in correct order ([7362b52](https://github.com/nrkno/sofie-core/commit/7362b5216d89b8ed6061448ac73b30393c8caa57))
+* implement `loop` content property for Graphics ([2cf38ba](https://github.com/nrkno/sofie-core/commit/2cf38baadd5e7ba16d624b9ad75cfff9d48297a6))
+* implement partInstance-based timing calculator input ([6d77853](https://github.com/nrkno/sofie-core/commit/6d77853170b9da0db69c54ce0d63f4a6a874df95))
+* introduce `privateData` and `publicData` ([d94f1aa](https://github.com/nrkno/sofie-core/commit/d94f1aa82cec779c7eebddae42e1c4fab91ac494))
+* **live-status-gateway:** add partId and segmentId to adLibs ([a51e9f7](https://github.com/nrkno/sofie-core/commit/a51e9f7e6d0a3eb9b12b7d0c2073fba2892fd90e))
+* **live-status-gw:** expose publicData ([a7ab6e4](https://github.com/nrkno/sofie-core/commit/a7ab6e428b05e678d3def3df124b76d35040942b))
+* **LSG:** sort adlibs to match GUI ([167a625](https://github.com/nrkno/sofie-core/commit/167a6252fa7036ae5c1239f8af35292c8147e7de))
+* Media Status WIP ([fa3747e](https://github.com/nrkno/sofie-core/commit/fa3747ec1cc7965ecc12670022844513fea212e2))
+* Media Status WIP ([65f543a](https://github.com/nrkno/sofie-core/commit/65f543ad59d218dd5336bb293fa6621c3703f8a4))
+* MediaStatus WIP ([4468458](https://github.com/nrkno/sofie-core/commit/4468458be41fe975c687ef44cad1a6e12f562b6b))
+* **MediaStatus:** filter on part and segment identifiers, but require to start from filter string ([d407a9c](https://github.com/nrkno/sofie-core/commit/d407a9c0c64effbb45ae19503666bf911a11db50))
+* **MediaStatusList:** finish CSS ([4d081ab](https://github.com/nrkno/sofie-core/commit/4d081ab8c3252067d87a6e5f40b4309076edd99a))
+* **MediaStatusList:** search box clear button ([7e4edfd](https://github.com/nrkno/sofie-core/commit/7e4edfd6963f63916d2c4fe0d766896919c9a654))
+* **MediaStatusPopUp/MediaStatus:** add filter debounce for a better typing experience ([c312b43](https://github.com/nrkno/sofie-core/commit/c312b43a88b9b451402919fef0ff0d488f9d252b))
+* **MediaStatusPopUp:** finish styling, icons, etc. ([5b5c1c2](https://github.com/nrkno/sofie-core/commit/5b5c1c22f2998b05ec0aa9ff9ea171ae253145fa))
+* **MediaStatusPopUp:** WIP ([fbb0bc7](https://github.com/nrkno/sofie-core/commit/fbb0bc7e622afd6309b020fcc48c9f4469f37da9))
+* **MediaStatusPopUp:** WIP ([8e2ce74](https://github.com/nrkno/sofie-core/commit/8e2ce7430f060fefb0937ee11e67658765bef918))
+* **MediaStatus:** Rundown panel WIP ([e574bbb](https://github.com/nrkno/sofie-core/commit/e574bbb09e62e34ddacea80d326e3087e539edec))
+* **MediaStatus:** WIP ([e8acba2](https://github.com/nrkno/sofie-core/commit/e8acba2d43f7da396fb2d15fdb90e19fe9872fb6))
+* new style for step GFX pill ([869d301](https://github.com/nrkno/sofie-core/commit/869d3012bd3bbf891e9c701f23f42e31cb3e7ff0))
+* publication for blueprint upgrade status SOFIE-2258 ([#1049](https://github.com/nrkno/sofie-core/issues/1049)) ([48dbda2](https://github.com/nrkno/sofie-core/commit/48dbda2573bc9b48f252d3220c8d154c352cc255))
+* refactor server-core-integration subscription handling to reduce duplication ([8eaedd2](https://github.com/nrkno/sofie-core/commit/8eaedd22e8efb9750f00ff472301c6b3f2d0f0af))
+* remove some usages of `DbCacheWriteCollection` SOFIE-2672 ([#1106](https://github.com/nrkno/sofie-core/issues/1106)) ([ff1f730](https://github.com/nrkno/sofie-core/commit/ff1f730dacf82154e809e01766974e6955c29cf7))
+* remove supertimeline from Parts and Pieces resolving SOFIE-2373 ([#983](https://github.com/nrkno/sofie-core/issues/983)) ([55e02cb](https://github.com/nrkno/sofie-core/commit/55e02cb1a0b6d237ae9bcd02ebf54e06cf08fb26))
+* rename internal 'scratchpad' naming to 'adlib testing' SOFIE-3015 ([afb2f43](https://github.com/nrkno/sofie-core/commit/afb2f43c8f199ff5da4ea6c3ccc3bd1e97a80f4f))
+* reorder elements in Media Status lists ([4e77241](https://github.com/nrkno/sofie-core/commit/4e77241080b7e20320607ea74e4566ca4a76970b))
+* replace user facing 'scratchpad' references to 'rehearsal mode' and 'adlib testing' SOFIE-3015 ([251b1cc](https://github.com/nrkno/sofie-core/commit/251b1ccd83c0f3686fa3dc698002e758c00488bd))
+* Rework `CacheForIngest` to `IngestModel` SOFIE-2672 ([#1108](https://github.com/nrkno/sofie-core/issues/1108)) ([825b523](https://github.com/nrkno/sofie-core/commit/825b5231d7afe6fd13393b44e4f39a41e6093adb))
+* rework CacheForPlayout as structured objects SOFIE-2513 ([d28511a](https://github.com/nrkno/sofie-core/commit/d28511a0501254d9c432cf0a751b8b43e86f3661))
+* rework CacheForPlayout as structured objects SOFIE-2513 ([2b032f3](https://github.com/nrkno/sofie-core/commit/2b032f3cb695fb5fb361a016cdb542a309097c1f))
+* rework CacheForPlayout as structured objects SOFIE-2513 ([f2281bd](https://github.com/nrkno/sofie-core/commit/f2281bda6e61808e4417edeb1a7cba834e752cbd))
+* rework CacheForPlayout merge conflicts SOFIE-2513 ([dff6d2c](https://github.com/nrkno/sofie-core/commit/dff6d2ce87da66adf43662aabdd5a0f007058181))
+* rundown scratchpad SOFIE-2432 ([5e16632](https://github.com/nrkno/sofie-core/commit/5e16632908b8dd62e4470a9ba6089a56aa571b9f))
+* **RundownView:** add an h1 element for the playlist name ([b9292e6](https://github.com/nrkno/sofie-core/commit/b9292e6fbb09fe54b52a151549fb25fb29e658a6))
+* support packageinfo update flow for buckets and studio baseline SOFIE-2655 ([#1051](https://github.com/nrkno/sofie-core/issues/1051)) ([df7ed0c](https://github.com/nrkno/sofie-core/commit/df7ed0c653b897774f01a33c9e60a5e22fac99e4))
+* typed publications in gateways/peripheraldevices SOFIE-1183 ([#1056](https://github.com/nrkno/sofie-core/issues/1056)) ([0c3c1bf](https://github.com/nrkno/sofie-core/commit/0c3c1bfd2bb779034976dc34e49aa6e664ea874b))
+* update meteor to 2.12 SOFIE-2368 ([#931](https://github.com/nrkno/sofie-core/issues/931)) ([d7dfb71](https://github.com/nrkno/sofie-core/commit/d7dfb71d19405267cab5e2abc39794a80acb30b1))
+* upgrades docusaurus to 3.2.1 ([b025be4](https://github.com/nrkno/sofie-core/commit/b025be4c43a7742745427d6da4306086e053f657))
+
+
+### Bug Fixes
+
+* `DataCloneError: [object Object] could not be cloned` when propogating some errors from job-worker SOFIE-2903 ([7f618c7](https://github.com/nrkno/sofie-core/commit/7f618c75bb6a94e28e4a9c00db4688a77a1bc184))
+* `DataCloneError: [object Object] could not be cloned` when propogating some errors from job-worker SOFIE-2903 ([c1bb47f](https://github.com/nrkno/sofie-core/commit/c1bb47fe3958c245b708f9698c458b3d94055a3b))
+* `UIBlueprintUpgradeStatuses` crashing if no playlists in the system ([3491ec5](https://github.com/nrkno/sofie-core/commit/3491ec5c509adf6b83362973821d93a66595e828))
+* **a11y/ModalDialog:** reduce behavioral changes after refactoring ([02ecaad](https://github.com/nrkno/sofie-core/commit/02ecaad0a210e1f7f8b7c932d38cbe7ba097f7b1))
+* **a11y:** some button layout/tabbing order ([3bd2085](https://github.com/nrkno/sofie-core/commit/3bd2085417b9a32bf148cb30640a8eb9d965ebea))
+* **a11y:** trap focus within ModalDialog ([9edd110](https://github.com/nrkno/sofie-core/commit/9edd11075111471b5a72b64dc6b3210183ef6911))
+* action triggers disappearing when adlibbing and immediately taking a part [#1197](https://github.com/nrkno/sofie-core/issues/1197) SOFIE-3182 ([d01cd99](https://github.com/nrkno/sofie-core/commit/d01cd991865485d97435ffb1065c574653bf508f))
+* action triggers disappearing when adlibbing and immediately taking a part [#1197](https://github.com/nrkno/sofie-core/issues/1197) SOFIE-3182 ([1a44ff8](https://github.com/nrkno/sofie-core/commit/1a44ff8bea971922fc55fbb03686467e9bd3b0c9))
+* activate scratchpad segment failing ([3cd426f](https://github.com/nrkno/sofie-core/commit/3cd426ff7e6d7b28aef65bfb31f4874c34bae509))
+* add `count` method to job-worker `ICollection` ([9f6be1d](https://github.com/nrkno/sofie-core/commit/9f6be1d51fa46d7853f2c95c48fcb8298306db98))
+* add `RundownOrphanedReason` enum ([b4648d2](https://github.com/nrkno/sofie-core/commit/b4648d2e03cce09eb1fff8e3b9292dc1c8739801))
+* add a way to take a heap snapshot. ([ef918c2](https://github.com/nrkno/sofie-core/commit/ef918c2390c8af46caa1cd0ff08bab45af2f8380))
+* Add missing metadata types ([71eb739](https://github.com/nrkno/sofie-core/commit/71eb739bc87f64db50f06ab4647cb6972e58c7fa))
+* Add missing piece metadata types ([#1133](https://github.com/nrkno/sofie-core/issues/1133)) ([70c5739](https://github.com/nrkno/sofie-core/commit/70c5739c5e9848e57c21bde78ee16d4c78da8e1a))
+* add missing SourceLayerType cases ([45eefce](https://github.com/nrkno/sofie-core/commit/45eefcef737e8e8a5a7e425f9fdd713487ab4a59))
+* add missing SourceLayerType cases ([1c4bd0a](https://github.com/nrkno/sofie-core/commit/1c4bd0a36885cb582af88c2750b155de9b23fa2a))
+* add PromiseButton component ([4fa9f72](https://github.com/nrkno/sofie-core/commit/4fa9f72fe277c55449b28384abd77de538a99ea2))
+* **AfterBroadcastForm:** refactor the form to have a semantically-correct layout ([9e4f2b6](https://github.com/nrkno/sofie-core/commit/9e4f2b65fd2e30d04bae1cd37304a33ab744fc11))
+* allow blueprint assets to be gif SOFIE-3183 ([1d8bed7](https://github.com/nrkno/sofie-core/commit/1d8bed77e4262a12bba46eecf0631cbcae96fb34))
+* allow blueprint assets to be gif SOFIE-3183 ([afc20d8](https://github.com/nrkno/sofie-core/commit/afc20d87f62cf0098510f6ca0ce2c663d8154778))
+* allways show trigger popups ([68172c5](https://github.com/nrkno/sofie-core/commit/68172c565af3aaea7a2517abc9623b2eefd77fba))
+* also sort on "own" rank ([4224b02](https://github.com/nrkno/sofie-core/commit/4224b02be70851ca2058d85c73571d9085cbf97f))
+* AMQP connection issues logging SOFIE-2597 ([#1066](https://github.com/nrkno/sofie-core/issues/1066)) ([de04512](https://github.com/nrkno/sofie-core/commit/de045127a0b64e67d31bba7dbe42f4e0f5caadaf))
+* asyncapi generation ([e4d45b6](https://github.com/nrkno/sofie-core/commit/e4d45b6e5142e8ae71a75edf0fd5dcbeeec86f45))
+* avoid adding `originalId` to timeline-objects during lookahead ([282cbec](https://github.com/nrkno/sofie-core/commit/282cbec6e9de1948bbb6d82ccd3f0f56efa7fc64))
+* blueprint-integration missed typing in [#1077](https://github.com/nrkno/sofie-core/issues/1077) ([bd5e36f](https://github.com/nrkno/sofie-core/commit/bd5e36f9c0b390999ef465a5e1554b8faa2c456f))
+* broken link ([08e5130](https://github.com/nrkno/sofie-core/commit/08e513048d9b4660dd89ae37c1ae29a20ab48880))
+* bucket selectors and unhandled promises ([26ae99e](https://github.com/nrkno/sofie-core/commit/26ae99ed00b5f2310439697a1a3b59d44be42f46))
+* build errors ([020d3cf](https://github.com/nrkno/sofie-core/commit/020d3cfd2c112b57667d6612d19472570f8455b9))
+* build server-core image on alpine 3.19 ([#1160](https://github.com/nrkno/sofie-core/issues/1160)) ([0f73bed](https://github.com/nrkno/sofie-core/commit/0f73bedbeb0490417c0643e521465a8112c2e444))
+* **CameraView:** broken countdowns after RundownTimingCalculator modifications ([d5ed171](https://github.com/nrkno/sofie-core/commit/d5ed171f8ab99ddea16707c7a34e51dae0f71ea8))
+* clear Scratchpad when activating Rundown ([b629fe9](https://github.com/nrkno/sofie-core/commit/b629fe95ccac283c0229d7e0753d330455e795d7))
+* **Core System Settings:** Cron Job Settings are duplicated ([1b52f5e](https://github.com/nrkno/sofie-core/commit/1b52f5ecf1a7397182b476c6b76a1991697e1185))
+* core-integration: handle error when subscribing ([3ad0c73](https://github.com/nrkno/sofie-core/commit/3ad0c73dd7fa4d9572cc00a7ffa9987fed0df4e3))
+* create new mosTimes correctly ([e8cec88](https://github.com/nrkno/sofie-core/commit/e8cec88f8b9d8c298f1b2ddec8d45f6f80fea9bf))
+* **DashboardPieceButton:** hover previews are not positioned correctly ([e5a022a](https://github.com/nrkno/sofie-core/commit/e5a022a7f2b8b0e9abeb792d48bab741beeac567))
+* **DashboardPieceButton:** hover previews are not positioned correctly ([8f8d147](https://github.com/nrkno/sofie-core/commit/8f8d147a42b3e80f87f9d9f575f81a048521d989))
+* **DeviceTriggers:** improve code clarity ([a1dddb9](https://github.com/nrkno/sofie-core/commit/a1dddb9d817b644ff66f2d1ef0061daf769b4f13))
+* display adjustments ([bcfeb99](https://github.com/nrkno/sofie-core/commit/bcfeb99bc82c5dd9d849efdb1ea85d3a9ce20501))
+* displayDurationGroup calculations ([0c07924](https://github.com/nrkno/sofie-core/commit/0c0792460ed1a73beaf4bd754e1ea1adf46167b6))
+* don't log UserError messages at error level from the job-worker SOFIE-2592 ([#1026](https://github.com/nrkno/sofie-core/issues/1026)) ([a146d65](https://github.com/nrkno/sofie-core/commit/a146d65ea9adf14dea92c62923fdadce85306fc5))
+* **EAV-95:** interface inconsistencies ([cc3044b](https://github.com/nrkno/sofie-core/commit/cc3044b15733df599f6e3cc80133c73f8c0b3133))
+* emit ddp publciation remove messages before add SOFIE-3172 ([1b17a1d](https://github.com/nrkno/sofie-core/commit/1b17a1d946fb0b23b720b110e1f714324901dde5))
+* emit ddp publciation remove messages before add SOFIE-3172 ([348a6e6](https://github.com/nrkno/sofie-core/commit/348a6e60b23e7ef6ed8117740915f32654ce8c1e))
+* ensure that Shift register Ids are only positive integers ([16895bc](https://github.com/nrkno/sofie-core/commit/16895bc41e8b8571109a915f48846f6bd52d522e))
+* expose metaData as publicData as a temporary solution for R50 ([aa79096](https://github.com/nrkno/sofie-core/commit/aa790960e86f850baec1842c80e136fad2ed9e67))
+* expose metaData propery to liveStatusGateway ([596ab8d](https://github.com/nrkno/sofie-core/commit/596ab8ddbde3d590b62558c80ef675f24d1ad28c))
+* extract `PlayoutPieceInstanceModel` from `PlayoutPartInstanceModel` ([9e07ed9](https://github.com/nrkno/sofie-core/commit/9e07ed9bb8851f84364753173a7053102cc0dac5))
+* filter out virtual pieces in isPieceInstanceActive ([188c985](https://github.com/nrkno/sofie-core/commit/188c9855ce4398076960daa8a14f0f4009b145eb))
+* group sends together, for increased performance ([fb0d2c8](https://github.com/nrkno/sofie-core/commit/fb0d2c8ef2e316bfe53cfa7160711101ede29ac4))
+* **HelpPanel:** invalid child React error ([5682379](https://github.com/nrkno/sofie-core/commit/5682379d85df92b1b1a6d2f08e1a485f701387e1))
+* hide create playlist drop box when dragging a rundown not in a multi-rundown playlist SOFIE-2462 ([#1181](https://github.com/nrkno/sofie-core/issues/1181)) ([79ae7f4](https://github.com/nrkno/sofie-core/commit/79ae7f4207459310a84778b8fe1474c05c12ce89))
+* improve UX of object table, to indicate which rows have overrides and are custom ([68b1374](https://github.com/nrkno/sofie-core/commit/68b137489b1f3cfb6af290fe7ae542ac8448f50c))
+* improve UX of object table, to indicate which rows have overrides and are custom ([c39311d](https://github.com/nrkno/sofie-core/commit/c39311d4a8b194cde683a112b55ff10a76b1b8a3))
+* include timestamp when logging to file ([#1207](https://github.com/nrkno/sofie-core/issues/1207)) ([2dcca21](https://github.com/nrkno/sofie-core/commit/2dcca215403cc0256c78f5f8f5f6befa2a1ca683))
+* IngestDataCache not being populated correctly SOFIE-2672 [#1106](https://github.com/nrkno/sofie-core/issues/1106) ([33394a7](https://github.com/nrkno/sofie-core/commit/33394a7e494e1e2a32d8f8cc55b34df6e52747fb))
+* introduce MeteorApply as alternative to Meteor.apply, to log when a method is sent late, due to other blocking methods on the client. ([0425d8f](https://github.com/nrkno/sofie-core/commit/0425d8f5a8b289922d146d0fe5241e08ade06935))
+* invalidate deviceTriggerPreviews when the filterChain changes SOFIE-3172 ([c4e2ad0](https://github.com/nrkno/sofie-core/commit/c4e2ad0282a7b683f3d19b8b9b5b541bf6518cbe))
+* invalidate deviceTriggerPreviews when the filterChain changes SOFIE-3172 ([082f334](https://github.com/nrkno/sofie-core/commit/082f3344fe19f080489dbde8ff155513a1c203b8))
+* invalidate deviceTriggers when changing triggermode SOFIE-3253 ([50e8cd2](https://github.com/nrkno/sofie-core/commit/50e8cd26b8da3394eaa9f5fd9909d3f5d8dfe73c))
+* live status gateway including pieces which have been pruned and will never be played SOFIE-3301 ([#1206](https://github.com/nrkno/sofie-core/issues/1206)) ([65d0d35](https://github.com/nrkno/sofie-core/commit/65d0d35c586e080a08f5837e18e4583ef940770c))
+* live status gateway including pieces which have been pruned and will never be played SOFIE-3301 ([#1206](https://github.com/nrkno/sofie-core/issues/1206)) ([8682eca](https://github.com/nrkno/sofie-core/commit/8682eca8004aedb092a1dca7f7c856c0814eaf66))
+* live-status-gateway ignored settings from Core, so logLevel ended up always being the default ([58261e5](https://github.com/nrkno/sofie-core/commit/58261e54ffe87e448b0de80b007ddf7a06dd924b))
+* **live-status-gw:** active piece conditions ([89f155c](https://github.com/nrkno/sofie-core/commit/89f155c4ae903920af91cbc586c34eb222946623))
+* **live-status-gw:** adLibs having invalid layers before the first take ([4dd5231](https://github.com/nrkno/sofie-core/commit/4dd5231055cc907cee37453ef723906258d54044))
+* **live-status-gw:** adLibs having invalid layers before the first take ([566e0b8](https://github.com/nrkno/sofie-core/commit/566e0b89952afbd8a2c95703cea4e53b270810e4))
+* **live-status-gw:** missing handlers ([0eb19ac](https://github.com/nrkno/sofie-core/commit/0eb19ac3d8c05e791e7ef910db717731e3af8bde))
+* **live-status-gw:** not sending updates when relevant data has actually changed ([748b7a0](https://github.com/nrkno/sofie-core/commit/748b7a0aca8ef290d58ebb6f56bc5a323b9566a4))
+* **live-status-gw:** prevent incomplete data to arriving at topics ([a90688c](https://github.com/nrkno/sofie-core/commit/a90688ca24175dbeadc0ccd1b0c5a918c97fee6e))
+* **live-status-gw:** wrong pieces in nextPart ([56059f4](https://github.com/nrkno/sofie-core/commit/56059f401a2f3cdfaf62901cae8bd5734e408fb1))
+* looks for the correct property itemSlug on ncsItems ([45d233f](https://github.com/nrkno/sofie-core/commit/45d233f3b71cde6b8c0d09ab53bb1aee3ceca133))
+* **LSG:** further optimize sending of messages ([ae1adeb](https://github.com/nrkno/sofie-core/commit/ae1adeba0c9f992797a59a7a3ec1697897b5bd45))
+* **LSG:** sorting, make getRank return undefined if rank could not be established ([5667c0f](https://github.com/nrkno/sofie-core/commit/5667c0ffc4f28a92f477d4c2927875bec04a4301))
+* make content sorting consistent with Core ([67d5916](https://github.com/nrkno/sofie-core/commit/67d5916f64f0a543ebf8e93caee3243917458bd7))
+* Media Status PopUp panel filtering doesn't work ([471ad59](https://github.com/nrkno/sofie-core/commit/471ad593af5d2679eb1750f864c3984b40b6e82a))
+* **MediaStatus PopUp:** improve scroll to Part ([cc9401a](https://github.com/nrkno/sofie-core/commit/cc9401a9f5abf7ee387c654a729a5e6fc254bd3c))
+* **MediaStatus:** letter spacing ([a6494bd](https://github.com/nrkno/sofie-core/commit/a6494bdc1fe46ab402203a63e3cfbf93bcc11a1e))
+* **MediaStatus:** use lobby playlist sorting in Media Status view ([e8f3734](https://github.com/nrkno/sofie-core/commit/e8f3734ddac305c1b4d41823cb34a9ddb254a2fb))
+* Mounted AdLibs on DeviceTriggers don't refresh correctly after a Rundown Reset operation ([dbfc4a1](https://github.com/nrkno/sofie-core/commit/dbfc4a190019712f248e141074ada74226ef5897))
+* only load packages during ingest which have `listenToPackageInfoUpdates: true` ([fdf189d](https://github.com/nrkno/sofie-core/commit/fdf189dd9a059c72298afcdd8865ddb636e26e20))
+* **OpenAPI:** `showStyleVariant` schema has non-existent property `blueprintId` listed as required ([dc22c58](https://github.com/nrkno/sofie-core/commit/dc22c58e771afff6f591b0ffbadd437627299ecd))
+* **openapi:** buckets definitions and tests ([e502ed1](https://github.com/nrkno/sofie-core/commit/e502ed194ba6a2fa829c10c172fee349157c4d84))
+* **openapi:** incorrect return type ([65539b9](https://github.com/nrkno/sofie-core/commit/65539b93a63d0dccd44c8cd118a4eac1c9496a55))
+* **openapi:** missing and incorrect parameter definition ([abed9ec](https://github.com/nrkno/sofie-core/commit/abed9ecdf7fb4e9a9390cc20f9919faa4a32e198))
+* **openapi:** url parameter name ([4bd22b1](https://github.com/nrkno/sofie-core/commit/4bd22b12ccdca25f837374fd0bdd903ec1bedb8a))
+* Playout ignores 'Play from here' offset SOFIE-2356 ([#1063](https://github.com/nrkno/sofie-core/issues/1063)) ([479154a](https://github.com/nrkno/sofie-core/commit/479154a8029a076f0e76c79efd89922cd286f9e5))
+* **playout-gateway:** improve handling and typing of TSR events (fixes some logging issues) ([26a8613](https://github.com/nrkno/sofie-core/commit/26a8613cd64d7e077dfd7ff2092555c1b7805f4d))
+* PromiseButton: use Spinner ([8098aa2](https://github.com/nrkno/sofie-core/commit/8098aa26aeba35fb50d9ccaeb4faeac4291c31dc))
+* refactor ingest.test.ts to remove dependencies between tests ([#1172](https://github.com/nrkno/sofie-core/issues/1172)) ([2dbe0dd](https://github.com/nrkno/sofie-core/commit/2dbe0dd3e7cc7fc43d06690d608691c3c08c3b4b))
+* refactor part generation, to remove some 'owned' properties from the `replacePart` method signature ([4e3a359](https://github.com/nrkno/sofie-core/commit/4e3a359c4e0216b4b360d2a9d3e9ad439a8bc1da))
+* refactor VirtualElement to be a FC ([bf81baf](https://github.com/nrkno/sofie-core/commit/bf81baf9ff520ad6a9fc9b6378ce6ceeac320645))
+* remove adlib action's publicData from userLog SOFIE-2939 ([#1137](https://github.com/nrkno/sofie-core/issues/1137)) ([d92bf8d](https://github.com/nrkno/sofie-core/commit/d92bf8d030dbfd160cfced407f671fe7e1a58a8e))
+* remove duplicated migration ([c10d27d](https://github.com/nrkno/sofie-core/commit/c10d27d1c57d89d996a9f4addbb260318e7b763b))
+* Remove inspector for editable fields ([66561b8](https://github.com/nrkno/sofie-core/commit/66561b81accf03e5df8267311c171966e95b3a65))
+* rename 'onPresenterScreen' description in GUI ([43dfa10](https://github.com/nrkno/sofie-core/commit/43dfa10874c42a1d0cb2925e06cae52f0d0eec04))
+* replace `vm2` with builtin `vm` SOFIE-2535 ([#1136](https://github.com/nrkno/sofie-core/issues/1136)) ([64bf4d5](https://github.com/nrkno/sofie-core/commit/64bf4d55abd3d16a56c2a43392929ac927585e5a))
+* REST API UserAction log entries are incorrect and in ([813ae80](https://github.com/nrkno/sofie-core/commit/813ae80e2a0d21b7bee07a17365f5f90dfa9753e))
+* REST API UserAction log entries are incorrect and in ([65102f6](https://github.com/nrkno/sofie-core/commit/65102f67cd941c38c268d6edbed502b3f9c02524))
+* restore ALL data from snapshot, for debugging ([2464744](https://github.com/nrkno/sofie-core/commit/24647442de293cb72563635a6ee4f4f029218ee7))
+* **RundownView:** preserve scroll position is not preserved when Segments are moved around before the live Segment ([1b79d82](https://github.com/nrkno/sofie-core/commit/1b79d8211bf176946eb27b58db2fb8ffe29d8a67))
+* **RundownView:** split subscriptions into required and not-required ([8dcd844](https://github.com/nrkno/sofie-core/commit/8dcd844c7e6352d02288e70adaf8ad953f8c7975))
+* **RundownView:** subscriptions are considered ready too soon ([5bfda8f](https://github.com/nrkno/sofie-core/commit/5bfda8ff85ad343ed9728be2f726ff0b6a8bf063))
+* save to database when starting a piece ([6c2a1bf](https://github.com/nrkno/sofie-core/commit/6c2a1bf3c010fe882f0ef91f829ede183d43375a))
+* **SegmentContextMenu:** change the collection of mouse position from mouseUp to mouseDown ([d008bcf](https://github.com/nrkno/sofie-core/commit/d008bcfbe87afdd8ad1f2fe1d0e4654f55445247))
+* **SegmentContextMenu:** don't block play from here on current Part ([6967e9c](https://github.com/nrkno/sofie-core/commit/6967e9c2cd5ef168e67b0375c52f4773c6a8e8c8))
+* **SegmentTimeline:** prevent accidentally opening browser context menu ([4227ba2](https://github.com/nrkno/sofie-core/commit/4227ba20f73d7bcff34771269bdcf4c289147c8f))
+* **ShowStyleVariants:** the additionalProperties and required properties were mis-indented ([4403da5](https://github.com/nrkno/sofie-core/commit/4403da5a26adff9674bdbb699d2ef9a82fd4a1af))
+* simplify splits for DoS-safety ([8b4bb5d](https://github.com/nrkno/sofie-core/commit/8b4bb5d47ab3d0a945a322ec563bb704e57667dd))
+* simplify splits for DoS-safety ([c5d8c7e](https://github.com/nrkno/sofie-core/commit/c5d8c7e7a78c59d316950dcac648fb312284a04f))
+* **SupportPopUp:** invalid child React error ([230cb9a](https://github.com/nrkno/sofie-core/commit/230cb9afcd64aa76d7b1283abbaf80e6f3214640))
+* test ([43763fe](https://github.com/nrkno/sofie-core/commit/43763fe1bdb3228c542de7412291f173b4e1b525))
+* tests ([4f60881](https://github.com/nrkno/sofie-core/commit/4f60881e04392b2c2584c144bc32087dade8d20e))
+* transition piece hover preview SOFIE-3183 ([63939cd](https://github.com/nrkno/sofie-core/commit/63939cd9eea06ffb2d018b918b57dc648a679593))
+* transition piece hover preview SOFIE-3183 ([0fc20d9](https://github.com/nrkno/sofie-core/commit/0fc20d9d0234925498f4939924351907f5f4f347))
+* type fix ([f448092](https://github.com/nrkno/sofie-core/commit/f448092459ce5d5ae26e952a8aa0df966a230c1a))
+* update timeline to v9 ([15ff3ee](https://github.com/nrkno/sofie-core/commit/15ff3eef1760066f6f0a648f441fdd36f37e418b))
+* use helper function to keep the scope of 'unsafe' code small ([c58a6de](https://github.com/nrkno/sofie-core/commit/c58a6de80597373e158316d33661ac0e8a07956a))
+* Use PromiseButton for Take a Snapshot button ([e329935](https://github.com/nrkno/sofie-core/commit/e329935697b1969f5b8a79e2384282f7dfdb428d))
+* userEvent for REST API calls does not look sensible ([cfc178a](https://github.com/nrkno/sofie-core/commit/cfc178a36f21f1ccc98c8bcd208a02ea04d13f3a))
+* userEvent for REST API calls does not look sensible ([70ddd11](https://github.com/nrkno/sofie-core/commit/70ddd11431771b4cb71d74851c3d56161a8a1490))
+* validating studio blueprint config fails with DataCloneError ([d5f9221](https://github.com/nrkno/sofie-core/commit/d5f92213bee771d6cf78e4d51007f27e05b9fa98))
+
+
+* remove `metaData` from various interfaces ([2a9e416](https://github.com/nrkno/sofie-core/commit/2a9e416b8836857bc645252180098823d4252933))
+* Remove unused config manifest types ([1ec0ea7](https://github.com/nrkno/sofie-core/commit/1ec0ea7773e91fa6fc8c85c96de25a150b093ba0))
+
+### [1.50.5](///compare/v1.50.4-LSG-updates...v1.50.5) (2024-08-08)
+
+
+### Bug Fixes
+
+* compensate for piece preroll for adlibbed pieces SOFIE-3369 ([#1236](undefined/undefined/undefined/issues/1236)) 195a7d9
+* rundown timing drifting when playing parts with preroll SOFIE-3291 ([#1234](undefined/undefined/undefined/issues/1234)) beee11a
+* unexpected timeline updates while playing final part in rundown SOFIE-3371 ([#1237](undefined/undefined/undefined/issues/1237)) 0fe74b4
+
+### [1.50.4](https://github.com/nrkno/sofie-core/compare/v1.50.3-LSG-updates...v1.50.4) (2024-07-30)
+
+
+### Bug Fixes
+
+* further improve stringifyError ([0233073](https://github.com/nrkno/sofie-core/commit/02330735fd4f3b03f9bff84e4c41fb9199a4623e))
+* improve error logging: use stringifyError() ([8da63de](https://github.com/nrkno/sofie-core/commit/8da63dec44915439ea436eee9697f3774241537b))
+* **LSG:** Token "examples" does not exist when running `yarn gendocs` ([a0ea9b4](https://github.com/nrkno/sofie-core/commit/a0ea9b48997fe39e8db5ababef744c103a68509f))
+* make stringifyError handle UserError better ([e2ecc7e](https://github.com/nrkno/sofie-core/commit/e2ecc7eb48b9ad6c0d95b299d954abac577e70a7))
+* refactor VirtualElement to be a FC ([bf81baf](https://github.com/nrkno/sofie-core/commit/bf81baf9ff520ad6a9fc9b6378ce6ceeac320645))
+
+### [1.50.3](https://github.com/nrkno/sofie-core/compare/v1.50.2...v1.50.3) (2024-06-24)
+
+
+### Bug Fixes
+
+* **DashboardPieceButton:** hover previews are not positioned correctly ([89fd219](https://github.com/nrkno/sofie-core/commit/89fd219d57fb775ed140ed2eaf5326a80194661f))
+* input gateway devices lose rundown actions on reset SOFIE-3134 ([#1190](https://github.com/nrkno/sofie-core/issues/1190)) ([aa69e5d](https://github.com/nrkno/sofie-core/commit/aa69e5d2df512f0e79bb1ada51ed61560258c0cd))
+
 ### [1.50.2](///compare/v1.49.6...v1.50.2) (2024-05-15)
 
 
diff --git a/meteor/Dockerfile b/meteor/Dockerfile
index 77a80faf9a..10b06912e1 100644
--- a/meteor/Dockerfile
+++ b/meteor/Dockerfile
@@ -1,4 +1,18 @@
 # syntax=docker/dockerfile:experimental
+
+# BUILD WEBUI
+FROM node:18
+COPY packages /opt/core/packages
+WORKDIR /opt/core/packages
+
+RUN rm -R *-gateway documentation openapi
+RUN corepack enable
+RUN yarn install && yarn build
+
+# Install production dependencies for the worker
+# HACK: 
+# RUN yarn workspaces focus --production @sofie-automation/job-worker @sofie-automation/corelib
+
 # BUILD IMAGE
 FROM meteor/node:14.21.4
 RUN curl "https://install.meteor.com/?release=2.13.3" | sh
@@ -9,17 +23,18 @@ ENV NODE_ENV anythingButProduction
 
 # Prepare the packages
 COPY package.json /opt/core/package.json
-COPY packages /opt/core/packages
-WORKDIR /opt/core/packages
-RUN rm -R *-gateway documentation openapi
-RUN corepack enable
-RUN yarn install && yarn build
+COPY --from=0 /opt/core/packages /opt/core/packages
 
 # Add the meteor source
 COPY meteor /opt/core/meteor
 COPY scripts /opt/core/scripts
 WORKDIR /opt/core/meteor
 
+# move the webui to the correct place
+RUN rm -Rf /opt/core/meteor/public
+RUN cp -R /opt/core/packages/webui/dist /opt/core/meteor/public
+RUN rm -R /opt/core/packages/webui
+
 # Force meteor to setup the runtime
 RUN meteor --version --allow-superuser
 RUN meteor corepack enable
@@ -31,9 +46,8 @@ RUN --mount=type=cache,target=/opt/core/meteor/.meteor/local NODE_OPTIONS="--max
 WORKDIR /opt/bundle/programs/server/
 RUN npm install
 
-# Install production dependencies for the worker
-WORKDIR /opt/core/packages
-RUN yarn workspaces focus --production @sofie-automation/job-worker @sofie-automation/corelib
+# meteor does something weird with these files
+RUN mv /opt/bundle/programs/web.browser/assets /opt/bundle/programs/web.browser/app/assets || true
 
 # DEPLOY IMAGE
 FROM alpine:3.19
@@ -60,11 +74,8 @@ ENV PATH $DIR_NODE/v$NODE_VERSION/bin:$PATH
 # confirm installation
 RUN node -v && npm -v
 
-COPY --from=0 /opt/bundle /opt/core
+COPY --from=1 /opt/bundle /opt/core
 COPY meteor/docker-entrypoint.sh /opt
 
-# Tell meteor where the worker code is located
-ENV WORKER_EXEC_DIR=/opt/packages/job-worker
-
 WORKDIR /opt/core/
 CMD ["/opt/docker-entrypoint.sh"]
diff --git a/meteor/__mocks__/_extendJest.ts b/meteor/__mocks__/_extendJest.ts
index ed495fe307..68bead0d24 100644
--- a/meteor/__mocks__/_extendJest.ts
+++ b/meteor/__mocks__/_extendJest.ts
@@ -2,9 +2,8 @@ import { UserError, UserErrorMessage } from '@sofie-automation/corelib/dist/erro
 import { Meteor } from 'meteor/meteor'
 import { clone } from '@sofie-automation/corelib/dist/lib'
 import { stringifyError } from '@sofie-automation/shared-lib/dist/lib/stringifyError'
-import '../server/api/logger'
 import _ from 'underscore'
-import { ClientAPI } from '../lib/api/client'
+import { ClientAPI } from '@sofie-automation/meteor-lib/dist/api/client'
 
 // Include this file in to get access to the extended functions
 
diff --git a/meteor/__mocks__/_setupMocks.ts b/meteor/__mocks__/_setupMocks.ts
index 3e06887fb4..c869b5d3e4 100644
--- a/meteor/__mocks__/_setupMocks.ts
+++ b/meteor/__mocks__/_setupMocks.ts
@@ -2,7 +2,7 @@ import { setLogLevel } from '../server/logging'
 import { Fiber } from './Fibers'
 import { resetRandomId } from './random'
 import { makeCompatible } from 'meteor-promise'
-import { LogLevel } from '../lib/lib'
+import { LogLevel } from '../server/lib/tempLib'
 import { SupressLogMessages } from './suppressLogging'
 
 // This file is run before all tests start.
@@ -34,8 +34,6 @@ jest.mock('meteor/webapp', (...args) => require('./webapp').setup(args), { virtu
 jest.mock('../server/api/integration/slack', (...args) => require('./slack').setup(args), { virtual: true })
 jest.mock('../server/worker/worker', (...args) => require('./worker').setup(args), { virtual: true })
 
-require('../server/api/logger.ts')
-
 SupressLogMessages.init()
 
 beforeEach(() => {
diff --git a/meteor/__mocks__/defaultCollectionObjects.ts b/meteor/__mocks__/defaultCollectionObjects.ts
index 48c860b4b6..e254257340 100644
--- a/meteor/__mocks__/defaultCollectionObjects.ts
+++ b/meteor/__mocks__/defaultCollectionObjects.ts
@@ -1,5 +1,5 @@
 import { DBStudio } from '@sofie-automation/corelib/dist/dataModel/Studio'
-import { clone, getCurrentTime, unprotectString } from '../lib/lib'
+import { clone, unprotectString } from '../server/lib/tempLib'
 import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
 import { DBRundown } from '@sofie-automation/corelib/dist/dataModel/Rundown'
 import { DBSegment } from '@sofie-automation/corelib/dist/dataModel/Segment'
@@ -9,7 +9,7 @@ import { Piece, EmptyPieceTimelineObjectsBlob } from '@sofie-automation/corelib/
 import { AdLibPiece } from '@sofie-automation/corelib/dist/dataModel/AdLibPiece'
 import { getRundownId } from '../server/api/ingest/lib'
 import { wrapDefaultObject } from '@sofie-automation/corelib/dist/settings/objectWithOverrides'
-import { PartInstance } from '../lib/collections/PartInstances'
+import { PartInstance } from '@sofie-automation/meteor-lib/dist/collections/PartInstances'
 import { PieceInstance } from '@sofie-automation/corelib/dist/dataModel/PieceInstance'
 import {
 	PartId,
@@ -26,7 +26,10 @@ import {
 	ShowStyleVariantId,
 	StudioId,
 } from '@sofie-automation/corelib/dist/dataModel/Ids'
-import { DEFAULT_MINIMUM_TAKE_SPAN } from '@sofie-automation/shared-lib/dist/core/constants'
+import {
+	DEFAULT_FALLBACK_PART_DURATION,
+	DEFAULT_MINIMUM_TAKE_SPAN,
+} from '@sofie-automation/shared-lib/dist/core/constants'
 
 export function defaultRundownPlaylist(_id: RundownPlaylistId, studioId: StudioId): DBRundownPlaylist {
 	return {
@@ -37,8 +40,8 @@ export function defaultRundownPlaylist(_id: RundownPlaylistId, studioId: StudioI
 		studioId: studioId,
 
 		name: 'Default RundownPlaylist',
-		created: getCurrentTime(),
-		modified: getCurrentTime(),
+		created: Date.now(),
+		modified: Date.now(),
 
 		// activationId: undefined,
 		rehearsal: false,
@@ -72,8 +75,8 @@ export function defaultRundown(
 		externalId: externalId,
 		name: 'Default Rundown',
 
-		created: getCurrentTime(),
-		modified: getCurrentTime(),
+		created: Date.now(),
+		modified: Date.now(),
 		importVersions: {
 			studio: '',
 			showStyleBase: '',
@@ -106,11 +109,12 @@ export function defaultStudio(_id: StudioId): DBStudio {
 			frameRate: 25,
 			mediaPreviewsUrl: '',
 			minimumTakeSpan: DEFAULT_MINIMUM_TAKE_SPAN,
+			fallbackPartDuration: DEFAULT_FALLBACK_PART_DURATION,
 		},
 		_rundownVersionHash: '',
-		routeSets: {},
-		routeSetExclusivityGroups: {},
-		packageContainers: {},
+		routeSetsWithOverrides: wrapDefaultObject({}),
+		routeSetExclusivityGroupsWithOverrides: wrapDefaultObject({}),
+		packageContainersWithOverrides: wrapDefaultObject({}),
 		previewContainerIds: [],
 		thumbnailContainerIds: [],
 		peripheralDeviceSettings: {
@@ -142,7 +146,7 @@ export function defaultPart(_id: PartId, rundownId: RundownId, segmentId: Segmen
 		_rank: 0,
 		externalId: unprotectString(_id),
 		title: 'Default Part',
-		expectedDurationWithPreroll: undefined,
+		expectedDurationWithTransition: undefined,
 	}
 }
 export function defaultPiece(_id: PieceId, rundownId: RundownId, segmentId: SegmentId, partId: PartId): Piece {
diff --git a/meteor/__mocks__/helpers/database.ts b/meteor/__mocks__/helpers/database.ts
index 0581105b4c..e881d8a1f5 100644
--- a/meteor/__mocks__/helpers/database.ts
+++ b/meteor/__mocks__/helpers/database.ts
@@ -36,18 +36,18 @@ import {
 import { DBShowStyleBase } from '@sofie-automation/corelib/dist/dataModel/ShowStyleBase'
 import { DBShowStyleVariant } from '@sofie-automation/corelib/dist/dataModel/ShowStyleVariant'
 import { Blueprint } from '@sofie-automation/corelib/dist/dataModel/Blueprint'
-import { ICoreSystem, SYSTEM_ID, stripVersion } from '../../lib/collections/CoreSystem'
+import { ICoreSystem, SYSTEM_ID } from '@sofie-automation/meteor-lib/dist/collections/CoreSystem'
+import { stripVersion } from '../../server/systemStatus/semverUtils'
 import { internalUploadBlueprint } from '../../server/api/blueprints/api'
 import {
 	literal,
-	getCurrentTime,
 	protectString,
 	unprotectString,
 	getRandomId,
 	getRandomString,
 	Complete,
 	normalizeArray,
-} from '../../lib/lib'
+} from '../../server/lib/tempLib'
 import { DBRundown } from '@sofie-automation/corelib/dist/dataModel/Rundown'
 import { DBSegment } from '@sofie-automation/corelib/dist/dataModel/Segment'
 import { DBPart } from '@sofie-automation/corelib/dist/dataModel/Part'
@@ -59,14 +59,14 @@ import { restartRandomId } from '../random'
 import { MongoMock } from '../mongo'
 import { defaultRundownPlaylist, defaultStudio } from '../defaultCollectionObjects'
 import { PackageInfo } from '../../server/coreSystem'
-import { DBTriggeredActions } from '../../lib/collections/TriggeredActions'
-import { WorkerStatus } from '../../lib/collections/Workers'
+import { DBTriggeredActions } from '@sofie-automation/meteor-lib/dist/collections/TriggeredActions'
+import { WorkerStatus } from '@sofie-automation/meteor-lib/dist/collections/Workers'
 import { WorkerThreadStatus } from '@sofie-automation/corelib/dist/dataModel/WorkerThreads'
 import {
 	applyAndValidateOverrides,
 	wrapDefaultObject,
 } from '@sofie-automation/corelib/dist/settings/objectWithOverrides'
-import { UIShowStyleBase } from '../../lib/api/showStyles'
+import { UIShowStyleBase } from '@sofie-automation/meteor-lib/dist/api/showStyles'
 import {
 	BlueprintId,
 	OrganizationId,
@@ -624,8 +624,8 @@ export async function setupDefaultRundown(
 		externalId: 'MOCK_RUNDOWN_' + rundownId,
 		name: 'Default Rundown',
 
-		created: getCurrentTime(),
-		modified: getCurrentTime(),
+		created: Date.now(),
+		modified: Date.now(),
 		importVersions: {
 			studio: '',
 			showStyleBase: '',
@@ -666,7 +666,7 @@ export async function setupDefaultRundown(
 		_rank: 0,
 		externalId: 'MOCK_PART_0_0',
 		title: 'Part 0 0',
-		expectedDurationWithPreroll: undefined,
+		expectedDurationWithTransition: undefined,
 	}
 	await Parts.mutableCollection.insertAsync(part00)
 
@@ -734,7 +734,7 @@ export async function setupDefaultRundown(
 		_rank: 1,
 		externalId: 'MOCK_PART_0_1',
 		title: 'Part 0 1',
-		expectedDurationWithPreroll: undefined,
+		expectedDurationWithTransition: undefined,
 	}
 	await Parts.mutableCollection.insertAsync(part01)
 
@@ -775,7 +775,7 @@ export async function setupDefaultRundown(
 		_rank: 0,
 		externalId: 'MOCK_PART_1_0',
 		title: 'Part 1 0',
-		expectedDurationWithPreroll: undefined,
+		expectedDurationWithTransition: undefined,
 	}
 	await Parts.mutableCollection.insertAsync(part10)
 
@@ -786,7 +786,7 @@ export async function setupDefaultRundown(
 		_rank: 1,
 		externalId: 'MOCK_PART_1_1',
 		title: 'Part 1 1',
-		expectedDurationWithPreroll: undefined,
+		expectedDurationWithTransition: undefined,
 	}
 	await Parts.mutableCollection.insertAsync(part11)
 
@@ -797,7 +797,7 @@ export async function setupDefaultRundown(
 		_rank: 2,
 		externalId: 'MOCK_PART_1_2',
 		title: 'Part 1 2',
-		expectedDurationWithPreroll: undefined,
+		expectedDurationWithTransition: undefined,
 	}
 	await Parts.mutableCollection.insertAsync(part12)
 
diff --git a/meteor/__mocks__/helpers/lib.ts b/meteor/__mocks__/helpers/lib.ts
index 6bd164afb8..5424c55a43 100644
--- a/meteor/__mocks__/helpers/lib.ts
+++ b/meteor/__mocks__/helpers/lib.ts
@@ -1,5 +1,5 @@
 import * as _ from 'underscore'
-import { LogLevel, ProtectedString } from '../../lib/lib'
+import { LogLevel, ProtectedString } from '../../server/lib/tempLib'
 import { AsyncOnlyMongoCollection } from '../../server/collections/collection'
 import { getLogLevel, setLogLevel } from '../../server/logging'
 
diff --git a/meteor/__mocks__/mongo.ts b/meteor/__mocks__/mongo.ts
index 021ba46002..cf17069139 100644
--- a/meteor/__mocks__/mongo.ts
+++ b/meteor/__mocks__/mongo.ts
@@ -1,6 +1,7 @@
 /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
 import * as _ from 'underscore'
-import { literal, ProtectedString, unprotectString, protectString, sleep, getRandomString } from '../lib/lib'
+import { literal, ProtectedString, unprotectString, protectString, getRandomString } from '../server/lib/tempLib'
+import { sleep } from '../server/lib/lib'
 import { RandomMock } from './random'
 import { MeteorMock } from './meteor'
 import { Random } from 'meteor/random'
@@ -14,7 +15,7 @@ import {
 	ObserveChangesCallbacks,
 	UpdateOptions,
 	UpsertOptions,
-} from '../lib/collections/lib'
+} from '@sofie-automation/meteor-lib/dist/collections/lib'
 import {
 	mongoWhere,
 	mongoFindOptions,
diff --git a/meteor/client/lib/RenderLimiter.tsx b/meteor/client/lib/RenderLimiter.tsx
deleted file mode 100644
index b95ed1ce36..0000000000
--- a/meteor/client/lib/RenderLimiter.tsx
+++ /dev/null
@@ -1,21 +0,0 @@
-import * as React from 'react'
-
-type IWrappedComponent<IProps, IState> = new (props: IProps, state: IState) => React.Component<IProps, IState>
-
-export function withRenderLimiter<IProps, IState>(
-	shouldComponentUpdate: (currentProps: IProps, nextProps: IProps) => boolean
-): (
-	WrappedComponent: IWrappedComponent<IProps, IState>
-) => new (props: IProps, context: any) => React.Component<IProps, IState> {
-	return (WrappedComponent) => {
-		return class WithRenderLimiterHOCComponent extends React.Component<IProps, IState> {
-			shouldComponentUpdate(nextProps: IProps, _nextState: IState): boolean {
-				return shouldComponentUpdate(this.props, nextProps)
-			}
-
-			render(): JSX.Element {
-				return <WrappedComponent {...this.props} />
-			}
-		}
-	}
-}
diff --git a/meteor/client/lib/datePicker.tsx b/meteor/client/lib/datePicker.tsx
deleted file mode 100644
index 3a181a5c4f..0000000000
--- a/meteor/client/lib/datePicker.tsx
+++ /dev/null
@@ -1,115 +0,0 @@
-import * as React from 'react'
-import * as _ from 'underscore'
-import DatePicker from 'react-datepicker'
-import moment from 'moment'
-import 'react-datepicker/dist/react-datepicker.css'
-import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
-import { faChevronRight, faChevronLeft } from '@fortawesome/free-solid-svg-icons'
-import { Time } from '../../lib/lib'
-import { withTranslation, WithTranslation } from 'react-i18next'
-
-interface IProps {
-	from: Time
-	to: Time
-	onChange: (from: Time, to: Time) => void
-}
-interface IState {
-	dateFrom: Date
-	dateTo: Date
-}
-export const DatePickerFromTo = withTranslation()(
-	class DatePickerFromTo extends React.Component<IProps & WithTranslation, IState> {
-		constructor(props: IProps & WithTranslation) {
-			super(props)
-
-			this.state = {
-				dateFrom: props.from ? new Date(props.from) : moment().subtract(1, 'days').startOf('day').toDate(),
-				dateTo: props.to ? new Date(props.to) : moment().startOf('day').toDate(),
-			}
-		}
-		static getDerivedStateFromProps(props: Readonly<IProps>): IState {
-			return {
-				dateFrom: props.from ? new Date(props.from) : moment().subtract(1, 'days').startOf('day').toDate(),
-				dateTo: props.to ? new Date(props.to) : moment().startOf('day').toDate(),
-			}
-		}
-		triggerOnchange = (state: IState) => {
-			this.props.onChange(state.dateFrom.valueOf(), state.dateTo.valueOf())
-		}
-		updateData = (o: Partial<IState>) => {
-			this.setState(o as any)
-
-			const newState: IState = _.extend(_.clone(this.state), o)
-			this.triggerOnchange(newState)
-		}
-		handleChangeFrom = (date: Date | null) => {
-			if (date) {
-				this.updateData({
-					dateFrom: date,
-				})
-			}
-		}
-		handleChangeTo = (date: Date | null) => {
-			if (date) {
-				this.updateData({
-					dateTo: date,
-				})
-			}
-		}
-		onClickPrevious = () => {
-			const from = this.state.dateFrom.valueOf()
-			const to = this.state.dateTo.valueOf()
-			const range = to - from
-
-			this.updateData({
-				dateFrom: new Date(from - range),
-				dateTo: new Date(to - range),
-			})
-		}
-		onClickNext = () => {
-			const from = this.state.dateFrom.valueOf()
-			const to = this.state.dateTo.valueOf()
-			const range = to - from
-
-			this.updateData({
-				dateFrom: new Date(from + range),
-				dateTo: new Date(to + range),
-			})
-		}
-		render(): JSX.Element {
-			const { t } = this.props
-			return (
-				<div className="datepicker-from-to">
-					<button className="action-btn mod mhm" onClick={this.onClickPrevious}>
-						<FontAwesomeIcon icon={faChevronLeft} />
-					</button>
-					<label className="mod mhs mvn">
-						{t('From')}
-						<div className="picker expco">
-							<DatePicker
-								dateFormat="yyyy-MM-dd"
-								selected={this.state.dateFrom}
-								onChange={this.handleChangeFrom}
-								className="expco-title"
-							/>
-						</div>
-					</label>
-					<label className="mod mhs mvn">
-						{t('Until')}
-						<div className="picker expco">
-							<DatePicker
-								dateFormat="yyyy-MM-dd"
-								selected={this.state.dateTo}
-								onChange={this.handleChangeTo}
-								className="expco-title"
-							/>
-						</div>
-					</label>
-					<button className="action-btn mod mhm" onClick={this.onClickNext}>
-						<FontAwesomeIcon icon={faChevronRight} />
-					</button>
-				</div>
-			)
-		}
-	}
-)
diff --git a/meteor/client/lib/rundownLayouts.ts b/meteor/client/lib/rundownLayouts.ts
deleted file mode 100644
index 3bd7d6cb89..0000000000
--- a/meteor/client/lib/rundownLayouts.ts
+++ /dev/null
@@ -1,137 +0,0 @@
-import { PartInstanceId, RundownPlaylistActivationId } from '@sofie-automation/corelib/dist/dataModel/Ids'
-import { processAndPrunePieceInstanceTimings } from '@sofie-automation/corelib/dist/playout/processAndPrune'
-import { UIShowStyleBase } from '../../lib/api/showStyles'
-import { PieceInstance } from '@sofie-automation/corelib/dist/dataModel/PieceInstance'
-import { RequiresActiveLayers } from '../../lib/collections/RundownLayouts'
-import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
-import { getCurrentTime } from '../../lib/lib'
-import { invalidateAt } from './../../lib/invalidatingTime'
-import { memoizedIsolatedAutorun } from '../../lib/memoizedIsolatedAutorun'
-import { PartInstances, PieceInstances } from '../collections'
-import { ReadonlyDeep } from 'type-fest'
-
-/**
- * If the conditions of the filter are met, activePieceInstance will include the first piece instance found that matches the filter, otherwise it will be undefined.
- */
-export function getIsFilterActive(
-	playlist: DBRundownPlaylist,
-	showStyleBase: UIShowStyleBase,
-	panel: RequiresActiveLayers
-): { active: boolean; activePieceInstance: ReadonlyDeep<PieceInstance> | undefined } {
-	const unfinishedPieces = getUnfinishedPieceInstancesReactive(playlist, showStyleBase)
-	let activePieceInstance: ReadonlyDeep<PieceInstance> | undefined
-	const activeLayers = unfinishedPieces.map((p) => p.piece.sourceLayerId)
-	const containsEveryRequiredLayer = panel.requireAllAdditionalSourcelayers
-		? panel.additionalLayers?.length && panel.additionalLayers.every((s) => activeLayers.includes(s))
-		: false
-	const containsRequiredLayer = containsEveryRequiredLayer
-		? true
-		: panel.additionalLayers && panel.additionalLayers.length
-		? panel.additionalLayers.some((s) => activeLayers.includes(s))
-		: false
-
-	if (
-		(!panel.requireAllAdditionalSourcelayers || containsEveryRequiredLayer) &&
-		(!panel.additionalLayers?.length || containsRequiredLayer)
-	) {
-		activePieceInstance =
-			panel.requiredLayerIds && panel.requiredLayerIds.length
-				? unfinishedPieces.find((piece: ReadonlyDeep<PieceInstance>) => {
-						return (
-							(panel.requiredLayerIds || []).indexOf(piece.piece.sourceLayerId) !== -1 &&
-							piece.partInstanceId === playlist.currentPartInfo?.partInstanceId
-						)
-				  })
-				: undefined
-	}
-	return {
-		active:
-			activePieceInstance !== undefined || (!panel.requiredLayerIds?.length && !panel.additionalLayers?.length),
-		activePieceInstance,
-	}
-}
-
-export function getUnfinishedPieceInstancesReactive(
-	playlist: DBRundownPlaylist,
-	showStyleBase: UIShowStyleBase
-): ReadonlyDeep<PieceInstance>[] {
-	if (playlist.activationId && playlist.currentPartInfo) {
-		return memoizedIsolatedAutorun(
-			(
-				playlistActivationId: RundownPlaylistActivationId,
-				currentPartInstanceId: PartInstanceId,
-				showStyleBase: UIShowStyleBase
-			) => {
-				const now = getCurrentTime()
-				let prospectivePieces: ReadonlyDeep<PieceInstance>[] = []
-
-				const partInstance = PartInstances.findOne(currentPartInstanceId)
-
-				if (partInstance) {
-					prospectivePieces = PieceInstances.find({
-						partInstanceId: currentPartInstanceId,
-						playlistActivationId: playlistActivationId,
-					}).fetch()
-
-					const nowInPart = partInstance.timings?.plannedStartedPlayback
-						? now - partInstance.timings.plannedStartedPlayback
-						: 0
-					prospectivePieces = processAndPrunePieceInstanceTimings(
-						showStyleBase.sourceLayers,
-						prospectivePieces,
-						nowInPart
-					)
-
-					let nearestEnd = Number.POSITIVE_INFINITY
-					prospectivePieces = prospectivePieces.filter((pieceInstance) => {
-						const piece = pieceInstance.piece
-
-						if (!pieceInstance.adLibSourceId && !piece.tags) {
-							// No effect on the data, so ignore
-							return false
-						}
-
-						let end: number | undefined
-						if (pieceInstance.plannedStoppedPlayback) {
-							end = pieceInstance.plannedStoppedPlayback
-						} else if (
-							pieceInstance.userDuration &&
-							'endRelativeToPart' in pieceInstance.userDuration &&
-							typeof pieceInstance.userDuration.endRelativeToPart === 'number'
-						) {
-							end = pieceInstance.userDuration.endRelativeToPart
-						} else if (
-							pieceInstance.userDuration &&
-							'endRelativeToNow' in pieceInstance.userDuration &&
-							typeof pieceInstance.userDuration.endRelativeToNow === 'number'
-						) {
-							end = pieceInstance.userDuration.endRelativeToNow + now
-						} else if (typeof piece.enable.duration === 'number' && pieceInstance.plannedStartedPlayback) {
-							end = piece.enable.duration + pieceInstance.plannedStartedPlayback
-						}
-
-						if (end !== undefined) {
-							if (end > now) {
-								nearestEnd = Math.min(nearestEnd, end)
-								return true
-							} else {
-								return false
-							}
-						}
-						return true
-					})
-
-					if (Number.isFinite(nearestEnd)) invalidateAt(nearestEnd)
-				}
-
-				return prospectivePieces
-			},
-			'getUnfinishedPieceInstancesReactive',
-			playlist.activationId,
-			playlist.currentPartInfo.partInstanceId,
-			showStyleBase
-		)
-	}
-
-	return []
-}
diff --git a/meteor/client/styles/_robotoFont.scss b/meteor/client/styles/_robotoFont.scss
deleted file mode 100644
index d12bb84cb4..0000000000
--- a/meteor/client/styles/_robotoFont.scss
+++ /dev/null
@@ -1,2 +0,0 @@
-$FontPath: './fonts/roboto-gh-pages/fonts';
-@import 'fonts/roboto';
diff --git a/meteor/client/styles/main.scss b/meteor/client/styles/main.scss
deleted file mode 100644
index 7160500456..0000000000
--- a/meteor/client/styles/main.scss
+++ /dev/null
@@ -1,163 +0,0 @@
-/* SASS statring point. Import styles from here on: */
-
-/* body {
-	user-select: none;
-}
-
-input {
-	user-select: auto;
-} */
-
-@import '_variables';
-@import '_header';
-@import '_colorScheme';
-
-body {
-	overscroll-behavior: none;
-	touch-action: pan-x pan-y;
-}
-
-:fullscreen ::-webkit-scrollbar {
-	background: #252627;
-}
-
-:fullscreen ::-webkit-scrollbar-thumb {
-	background: #555;
-	border: 3px solid #252627;
-	border-radius: 10px;
-}
-
-.scroll-sink {
-	overscroll-behavior: none;
-}
-
-/* Don't show visited status, since people will browse around the app a lot */
-a:visited {
-	color: $ui-button-primary;
-}
-
-.header {
-	position: fixed;
-	top: 0;
-	left: 0;
-	right: 0;
-	z-index: 500;
-	user-select: none;
-	
-	// position: relative;
-	// z-index: 500;
-}
-.header-clear {
-	padding-top: 4rem;
-	padding-right: $statusbar-width;
-}
-
-#render-target {
-	font-weight: 300;
-
-	h5,
-	.h5,
-	.text-s,
-	.text-s p,
-	.text-s .mod,
-	.text-s .table,
-	.text-s .action-btn,
-	.switch,
-	.pill,
-	.pills .action-btn,
-	.notification,
-	.tooltip,
-	.btn,
-	.btn-tight {
-		font-weight: 300;
-	}
-
-	p,
-	center,
-	.table {
-		font-weight: 300;
-	}
-
-	.checkbox {
-		vertical-align: top;
-
-		&.mod {
-			vertical-align: middle;
-		}
-	}
-
-	.btn,
-	.btn-tight {
-		font-weight: 300;
-	}
-
-	input {
-		&::-webkit-input-placeholder,
-		&::placeholder {
-			color: #bbb;
-		}
-	}
-
-	.scroll-x {
-		overflow-x: auto;
-	}
-}
-
-.origo-pulse {
-	vertical-align: top;
-
-	&.small.left,
-	&.small.right {
-		top: 1px;
-	}
-}
-
-a.selectable {
-	display: block;
-	text-decoration: inherit;
-
-	&:hover,
-	&:active {
-		text-decoration: inherit;
-	}
-}
-
-.btn > svg.svg-inline--fa + span {
-	margin-left: 0.5em;
-}
-
-.switch-button {
-	width: 42px !important;
-	height: 21px !important;
-
-	&.sb-nocolor.sb-on {
-		.sb-content {
-			.sb-label {
-				background-color: #737373;
-			}
-		}
-	}
-
-	.sb-content {
-		width: 42px;
-		height: 21px;
-		> .sb-label {
-			width: 42px;
-			height: 21px;
-		}
-		.sb-switch {
-			width: 19px;
-			height: 19px;
-		}
-	}
-
-	&:active .sb-label {
-		opacity: 0.8;
-	}
-
-	&.sb-on {
-		.sb-switch {
-			transform: matrix(1, 0, 0, 1, 21, 0);
-		}
-	}
-}
diff --git a/meteor/client/ui/Account/AccountPage.tsx b/meteor/client/ui/Account/AccountPage.tsx
deleted file mode 100644
index c08bedefbe..0000000000
--- a/meteor/client/ui/Account/AccountPage.tsx
+++ /dev/null
@@ -1,210 +0,0 @@
-import * as React from 'react'
-import { Accounts } from 'meteor/accounts-base'
-import { Translated, translateWithTracker } from '../../lib/ReactMeteorData/react-meteor-data'
-import type { RouteComponentProps } from 'react-router'
-import { NotificationCenter, Notification, NoticeLevel } from '../../../lib/notifications/notifications'
-import { MeteorCall } from '../../../lib/api/methods'
-import { getUser, User, getUserRolesFromLoadedDocuments } from '../../../lib/collections/Users'
-import { DBOrganization, UserRoles } from '../../../lib/collections/Organization'
-import { Spinner } from '../../lib/Spinner'
-import { Link } from 'react-router-dom'
-import { unprotectString } from '../../../lib/lib'
-import { EditAttribute } from '../../lib/EditAttribute'
-import { Organizations } from '../../collections'
-
-interface IAccountPageProps extends RouteComponentProps {
-	user: User | null
-	organization: DBOrganization | null
-}
-
-interface IAccountPageState {
-	password: string
-	oldPassword: string
-	edit: boolean
-}
-
-export const AccountPage = translateWithTracker(() => {
-	const user = getUser()
-	const organization = user ? Organizations.findOne({ _id: user.organizationId }) : null
-	return {
-		user: user,
-		organization: organization,
-	}
-})(
-	class AccountPage extends React.Component<Translated<IAccountPageProps>, IAccountPageState> {
-		constructor(props: any) {
-			super(props)
-		}
-
-		state = {
-			password: '',
-			oldPassword: '',
-			edit: false,
-		}
-
-		private handleChange(e: React.ChangeEvent<HTMLInputElement>) {
-			this.setState({ ...this.state, [e.currentTarget.name]: e.currentTarget.value })
-		}
-
-		private handleChangePassword(e: React.MouseEvent<HTMLElement>) {
-			e.preventDefault()
-			if (!this.state.edit) return this.setState({ edit: true })
-			try {
-				if (!this.state.oldPassword || !this.state.password) throw { message: 'Missing requried password' }
-				if (this.state.password.length < 5) throw { message: 'New password must be atleast 5 characters' }
-				Accounts.changePassword(this.state.oldPassword, this.state.password, (error) => {
-					if (error) {
-						throw { message: error, lvl: NoticeLevel.CRITICAL }
-					}
-					this.handleNotif('Password Updated Successfully', NoticeLevel.NOTIFICATION)
-					this.setState({ edit: false })
-				})
-			} catch (error) {
-				const error2 = error as any
-				console.log(error)
-				this.handleNotif(error2.message, error2.lvl)
-			}
-		}
-
-		private handleRemoveUser() {
-			MeteorCall.user
-				.removeUser()
-				.then((error) => {
-					if (error) {
-						throw error
-					}
-					this.props.history.push('/')
-				})
-				.catch((error) => {
-					console.log(error)
-					this.handleNotif('Error deleting account', NoticeLevel.CRITICAL)
-				})
-		}
-
-		private handleNotif(error: string, lvl?: NoticeLevel) {
-			if (lvl === undefined) lvl = NoticeLevel.WARNING
-			NotificationCenter.push(new Notification(undefined, lvl, error, 'Account Page'))
-		}
-		private renderUserRole(userRole: keyof UserRoles) {
-			const user = this.props.user
-			const organization = this.props.organization
-
-			if (user && organization) {
-				const roles: UserRoles = organization.userRoles[unprotectString(user._id)] || {}
-				return getUserRolesFromLoadedDocuments(user, organization).admin ? (
-					<EditAttribute
-						attribute={`userRoles.${user._id}.${userRole}`}
-						obj={organization}
-						type="checkbox"
-						collection={Organizations}
-						className=""
-					/>
-				) : (
-					<input type="checkbox" disabled={true} checked={roles[userRole]}></input>
-				)
-			} else return null
-		}
-
-		render(): JSX.Element {
-			const { t } = this.props
-
-			const user = this.props.user
-			const organization = this.props.organization
-			return (
-				<div className="center-page">
-					<div className="mtl page">
-						<h1>{t('Account Page')}</h1>
-						{user ? (
-							<form
-								className="flex-col"
-								onSubmit={(e: React.MouseEvent<HTMLFormElement>) => this.handleChangePassword(e)}
-							>
-								<p>{t('Name:')}</p>
-								<input type="text" value={user.profile.name} disabled={true} />
-								<p>{t('Email:')}</p>
-								<input type="text" value={user.emails.map((e) => e.address).join(', ')} disabled={true} />
-								{this.state.edit && (
-									<React.Fragment>
-										<p>{t('Old Password')}</p>
-										<input
-											type="password"
-											name="oldPassword"
-											value={this.state.oldPassword}
-											onChange={(e: React.ChangeEvent<HTMLInputElement>) => this.handleChange(e)}
-										/>
-										<p>{t('New Password')}</p>
-										<input
-											type="password"
-											name="password"
-											value={this.state.password}
-											onChange={(e: React.ChangeEvent<HTMLInputElement>) => this.handleChange(e)}
-										/>
-									</React.Fragment>
-								)}
-								<button className="btn btn-primary" type="submit">
-									{this.state.edit ? t('Save Changes') : t('Edit Account')}
-								</button>
-								{this.state.edit && (
-									<button
-										className="btn"
-										type="button"
-										onClick={() => this.setState({ edit: false, password: '', oldPassword: '' })}
-									>
-										Cancel
-									</button>
-								)}
-							</form>
-						) : (
-							<Spinner />
-						)}
-						<h3>{t('Organization')}</h3>
-						{organization ? (
-							<React.Fragment>
-								<p>
-									{t('Name:')} {organization.name}
-								</p>
-								{user && getUserRolesFromLoadedDocuments(user, organization).admin ? (
-									<button className="btn btn-primary">
-										<Link to="/organization">Edit Organization</Link>
-									</button>
-								) : null}
-								{user ? (
-									<div>
-										<h4>{t('User roles in organization')}</h4>
-										<table>
-											<tbody>
-												<tr>
-													<td>{t('Studio')}</td>
-													<td>{this.renderUserRole('studio')}</td>
-												</tr>
-												<tr>
-													<td>{t('Configurator')}</td>
-													<td>{this.renderUserRole('configurator')}</td>
-												</tr>
-												<tr>
-													<td>{t('Developer')}</td>
-													<td>{this.renderUserRole('developer')}</td>
-												</tr>
-												<tr>
-													<td>{t('Admin')}</td>
-													<td>{this.renderUserRole('admin')}</td>
-												</tr>
-											</tbody>
-										</table>
-									</div>
-								) : null}
-							</React.Fragment>
-						) : (
-							<Spinner />
-						)}
-						{this.state.edit && (
-							<button className="btn" onClick={() => this.handleRemoveUser()}>
-								{t('Remove Self')}
-							</button>
-						)}
-					</div>
-				</div>
-			)
-		}
-	}
-)
diff --git a/meteor/client/ui/Account/NotLoggedIn/LoginPage.tsx b/meteor/client/ui/Account/NotLoggedIn/LoginPage.tsx
deleted file mode 100644
index 219f22465c..0000000000
--- a/meteor/client/ui/Account/NotLoggedIn/LoginPage.tsx
+++ /dev/null
@@ -1,132 +0,0 @@
-import * as React from 'react'
-import { Meteor } from 'meteor/meteor'
-import { Accounts } from 'meteor/accounts-base'
-import { Translated, translateWithTracker } from '../../../lib/ReactMeteorData/react-meteor-data'
-import { Link } from 'react-router-dom'
-import type { RouteComponentProps } from 'react-router'
-import { StatusResponse } from '../../../../lib/api/systemStatus'
-import { getUser, User } from '../../../../lib/collections/Users'
-import { NotLoggedInContainer } from './lib'
-import { stringifyError } from '@sofie-automation/shared-lib/dist/lib/stringifyError'
-
-interface ILoginProps extends RouteComponentProps<{ token?: string }> {
-	requestedRoute?: string
-}
-
-interface ILoginPageProps extends ILoginProps {
-	user: User | null
-}
-
-interface ILoginPageState {
-	systemStatus?: StatusResponse
-	email: string
-	password: string
-	error: string
-}
-
-export const LoginPage = translateWithTracker((_props: ILoginProps) => {
-	const user = getUser()
-	return { user: user ? user : null }
-})(
-	class LoginPage extends React.Component<Translated<ILoginPageProps>, ILoginPageState> {
-		// private _subscriptions: Array<Meteor.SubscriptionHandle> = []
-
-		constructor(props: Translated<ILoginPageProps>) {
-			super(props)
-
-			this.state = {
-				email: '',
-				password: '',
-				error: '',
-			}
-
-			this.handleChange = this.handleChange.bind(this)
-			this.attempLogin = this.attempLogin.bind(this)
-			this.handleLoginAttempt = this.handleLoginAttempt.bind(this)
-		}
-
-		private handleChange(e: React.ChangeEvent<HTMLInputElement>) {
-			const name = e.currentTarget.name as keyof ILoginPageState
-			if (!(name in this.state)) return
-
-			return this.setState({ ...this.state, [name]: e.currentTarget.value })
-		}
-
-		private attempLogin(e: React.MouseEvent<HTMLFormElement>): void {
-			e.preventDefault()
-			try {
-				if (!this.state.email.length) throw new Error('Please enter an email address')
-				if (!this.state.password.length) throw new Error('Please enter an password')
-			} catch (error) {
-				this.HandleError(stringifyError(error))
-				return
-			}
-			Meteor.loginWithPassword(this.state.email, this.state.password, this.handleLoginAttempt)
-		}
-
-		private handleLoginAttempt(error: Error | undefined) {
-			if (error) {
-				this.HandleError('Incorrect email or password')
-			}
-		}
-
-		private HandleError(msg: string) {
-			this.setState({ error: msg })
-		}
-
-		componentDidMount(): void {
-			const token = this.props.match.params.token
-			const user = this.props.user
-			if (token && (!user || (user && !user.emails[0].verified))) {
-				Accounts.verifyEmail(token, (e) => {
-					if (e) return this.setState({ error: e.message })
-				})
-			} else if (user) {
-				this.props.requestedRoute
-					? this.props.history.push(this.props.requestedRoute)
-					: this.props.history.push('/rundowns')
-			}
-		}
-
-		render(): JSX.Element {
-			const { t } = this.props
-
-			return (
-				<NotLoggedInContainer>
-					<form onSubmit={(e: React.MouseEvent<HTMLFormElement>) => this.attempLogin(e)}>
-						<input
-							className="mdinput mas"
-							type="text"
-							value={this.state.email}
-							onChange={this.handleChange}
-							placeholder={t('Email Address')}
-							name="email"
-						/>
-						<input
-							className="mdinput mas"
-							type="password"
-							value={this.state.password}
-							onChange={this.handleChange}
-							placeholder={t('Password')}
-							name="password"
-						/>
-						<button type="submit" className="btn btn-primary">
-							{t('Sign in')}
-						</button>
-					</form>
-					<div className="mas">
-						<Link className="selectable" to="/signup">
-							<button className="btn">{t('Create New Account')}</button>
-						</Link>
-						<Link className="selectable" to="/reset">
-							{t('Lost password?')}
-						</Link>
-					</div>
-					<div className={'error-msg ' + (this.state.error && 'error-msg-active')}>
-						<p>{this.state.error.length ? this.state.error : ''}&nbsp;</p>
-					</div>
-				</NotLoggedInContainer>
-			)
-		}
-	}
-)
diff --git a/meteor/client/ui/Account/NotLoggedIn/LostPassword.tsx b/meteor/client/ui/Account/NotLoggedIn/LostPassword.tsx
deleted file mode 100644
index 216ebc4a14..0000000000
--- a/meteor/client/ui/Account/NotLoggedIn/LostPassword.tsx
+++ /dev/null
@@ -1,91 +0,0 @@
-import * as React from 'react'
-import { Translated, translateWithTracker } from '../../../lib/ReactMeteorData/react-meteor-data'
-import type { RouteComponentProps } from 'react-router'
-import { getUser } from '../../../../lib/collections/Users'
-import { MeteorCall } from '../../../../lib/api/methods'
-import { NotLoggedInContainer } from './lib'
-import { Link } from 'react-router-dom'
-
-type ILostPasswordPageProps = RouteComponentProps
-
-interface ILostPasswordPageState {
-	email: string
-	error: string
-}
-
-export const LostPasswordPage = translateWithTracker((props: ILostPasswordPageProps) => {
-	const user = getUser()
-	if (user) {
-		props.history.push('/rundowns')
-	}
-
-	return {}
-})(
-	class LostPassword extends React.Component<Translated<ILostPasswordPageProps>, ILostPasswordPageState> {
-		constructor(props: Translated<ILostPasswordPageProps>) {
-			super(props)
-
-			this.state = {
-				email: '',
-				error: '',
-			}
-		}
-
-		private validateEmail(_e: React.FocusEvent<HTMLInputElement>) {
-			/** Find good email regex */
-		}
-
-		private async resetPassword(e: React.MouseEvent<HTMLElement>): Promise<void> {
-			e.preventDefault()
-			if (!this.state.email) {
-				this.handleError('Please enter a valid email')
-			} else {
-				const result = await MeteorCall.user.requestPasswordReset(this.state.email)
-				!result
-					? this.handleError(`No account found with email ${this.state.email}`)
-					: this.handleError(`Password reset email sent`)
-				setTimeout(() => this.handleError(''), 5000)
-			}
-		}
-
-		private handleError(msg: string) {
-			this.setState({ error: msg })
-		}
-
-		render(): JSX.Element {
-			const { t } = this.props
-			return (
-				<NotLoggedInContainer>
-					<form onSubmit={(e: React.MouseEvent<HTMLFormElement>) => this.resetPassword(e)}>
-						<label htmlFor="lost-password">Lost password?</label>
-						<input
-							id="lost-password"
-							className="mdinput mas"
-							type="text"
-							value={this.state.email}
-							onChange={(e: React.ChangeEvent<HTMLInputElement>) =>
-								this.setState({ ...this.state, email: e.target.value })
-							}
-							onBlur={this.validateEmail}
-							placeholder={t('Email Address')}
-							name="email"
-						/>
-						<button
-							type="submit"
-							className="btn btn-primary"
-							onClick={(e: React.MouseEvent<HTMLButtonElement>) => this.resetPassword(e)}
-						>
-							{t('Send reset email')}
-						</button>
-						<Link className="selectable" to="/">
-							<button className="btn">{t('Go back')}</button>
-						</Link>
-					</form>
-					<div className={'error-msg ' + (this.state.error && 'error-msg-active')}>
-						<p>{this.state.error.length ? this.state.error : ''}&nbsp;</p>
-					</div>
-				</NotLoggedInContainer>
-			)
-		}
-	}
-)
diff --git a/meteor/client/ui/Account/NotLoggedIn/ResetPasswordPage.tsx b/meteor/client/ui/Account/NotLoggedIn/ResetPasswordPage.tsx
deleted file mode 100644
index 47995bf21a..0000000000
--- a/meteor/client/ui/Account/NotLoggedIn/ResetPasswordPage.tsx
+++ /dev/null
@@ -1,111 +0,0 @@
-import * as React from 'react'
-import { Accounts } from 'meteor/accounts-base'
-import { Translated, translateWithTracker } from '../../../lib/ReactMeteorData/react-meteor-data'
-import type { RouteComponentProps } from 'react-router'
-import { getUser } from '../../../../lib/collections/Users'
-import { NotLoggedInContainer } from './lib'
-import { Link } from 'react-router-dom'
-import { logger } from '../../../../lib/logging'
-
-type IResetPageProps = RouteComponentProps<{ token: string }>
-
-interface IResetPageState {
-	password: string
-	error: string | React.ReactElement<HTMLElement>
-}
-
-export const ResetPasswordPage = translateWithTracker((props: IResetPageProps) => {
-	const user = getUser()
-	if (user) {
-		props.history.push('/rundowns')
-	}
-
-	return {}
-})(
-	class ResetPasswordPage extends React.Component<Translated<IResetPageProps>, IResetPageState> {
-		constructor(props: Translated<IResetPageProps>) {
-			super(props)
-
-			this.state = {
-				password: '',
-				error: '',
-			}
-			this.handleChange = this.handleChange.bind(this)
-			this.validateChange = this.validateChange.bind(this)
-			this.handleReset = this.handleReset.bind(this)
-		}
-
-		private handleChange(e: React.ChangeEvent<HTMLInputElement>) {
-			this.setState({ ...this.state, [e.currentTarget.name]: e.currentTarget.value })
-		}
-
-		private validateChange(): boolean {
-			const errors: string[] = []
-			const { t } = this.props
-
-			if (this.state.password.length < 5) {
-				errors.push(t('Password must be atleast 5 characters long'))
-			}
-			/** Add more password rules */
-			if (errors.length) {
-				this.handleError(
-					<React.Fragment>
-						{errors.map((e, i) => (
-							<span key={i}>{e}</span>
-						))}
-					</React.Fragment>
-				)
-				return false
-			}
-			return true
-		}
-
-		private handleReset(e: React.MouseEvent<HTMLElement>) {
-			e.preventDefault()
-			if (!this.validateChange()) return
-			const token = this.props.match.params.token
-			if (!this.state.password || this.state.password.length < 5)
-				return this.handleError('Please set a password with atleast 5 characters')
-			Accounts.resetPassword(token, this.state.password, (err) => {
-				if (err) {
-					logger.error(err)
-					return this.handleError('Unable to reset password')
-				}
-			})
-		}
-
-		private handleError(msg: string | React.ReactElement<HTMLElement>) {
-			this.setState({ error: msg })
-		}
-
-		render(): JSX.Element {
-			const { t } = this.props
-			return (
-				<NotLoggedInContainer>
-					<form onSubmit={(e: React.MouseEvent<HTMLFormElement>) => this.handleReset(e)}>
-						<label htmlFor="password-reset">{t('Enter your new password')}</label>
-						<input
-							id="password-reset"
-							className="mdinput mas"
-							type="password"
-							name="password"
-							value={this.state.password}
-							onChange={this.handleChange}
-							onBlur={this.validateChange}
-							placeholder={t('Password')}
-						/>
-						<button type="submit" className="btn btn-primary" onClick={this.handleReset}>
-							{t('Set new password')}
-						</button>
-						<Link className="selectable" to="/">
-							<button className="btn">{t('Go back')}</button>
-						</Link>
-					</form>
-					<div className={'error-msg ' + (this.state.error && 'error-msg-active')}>
-						<p>{this.state.error ? this.state.error : ''}&nbsp;</p>
-					</div>
-				</NotLoggedInContainer>
-			)
-		}
-	}
-)
diff --git a/meteor/client/ui/Account/NotLoggedIn/SignupPage.tsx b/meteor/client/ui/Account/NotLoggedIn/SignupPage.tsx
deleted file mode 100644
index b26a93cb36..0000000000
--- a/meteor/client/ui/Account/NotLoggedIn/SignupPage.tsx
+++ /dev/null
@@ -1,209 +0,0 @@
-import * as React from 'react'
-import { Translated, translateWithTracker } from '../../../lib/ReactMeteorData/react-meteor-data'
-import type { RouteComponentProps } from 'react-router'
-import { getUser } from '../../../../lib/collections/Users'
-import { NotLoggedInContainer } from './lib'
-import { Link } from 'react-router-dom'
-import { createUser } from '../../../../lib/api/user'
-import { stringifyError } from '@sofie-automation/shared-lib/dist/lib/stringifyError'
-import { logger } from '../../../../lib/logging'
-
-type ISignupPageProps = RouteComponentProps
-
-interface ISignupPageState {
-	email: string
-	password: string
-	name: string
-	organization: string
-	applications: string[]
-	broadcastMediums: string[]
-	error: string
-}
-
-export const SignupPage = translateWithTracker((props: ISignupPageProps) => {
-	const user = getUser()
-	if (user) props.history.push('/rundowns')
-	return {}
-})(
-	class SignupPage extends React.Component<Translated<ISignupPageProps>, ISignupPageState> {
-		private applications: string[] = [
-			'Doing TV shows from a studio',
-			'Doing streaming on the web from a studio',
-			'Doing OB productions',
-			'Installers / Integrators',
-		]
-		private broadcastMediums: string[] = ['News', 'Sports', 'E-Sports', 'Entertainment']
-
-		constructor(props: Translated<ISignupPageProps>) {
-			super(props)
-
-			this.state = {
-				email: '',
-				password: '',
-				name: '',
-				organization: '',
-				applications: [],
-				broadcastMediums: [],
-				error: '',
-			}
-
-			this.handleChange = this.handleChange.bind(this)
-		}
-
-		private handleChange(e: React.ChangeEvent<HTMLInputElement>) {
-			const name = e.currentTarget.name as keyof ISignupPageState
-			if (!(name in this.state)) return
-
-			const item = this.state[name]
-			if (Array.isArray(item)) {
-				if (e.currentTarget.type === 'checkbox') {
-					if (e.currentTarget.checked) {
-						item.push(e.currentTarget.value)
-					} else {
-						const found = item.findIndex((i) => i === e.currentTarget.value)
-						item.splice(found, 1)
-					}
-				} else {
-					const found = item.findIndex((i) => !this.state[name].includes(i))
-					found !== -1 ? item.splice(found, 1, e.currentTarget.value) : item.push(e.currentTarget.value)
-				}
-				this.setState({ ...this.state, [name]: item.filter((i) => i.length) })
-			} else {
-				this.setState({ ...this.state, [name]: e.currentTarget.value })
-			}
-		}
-
-		private handleError(msg: string) {
-			this.setState({ error: msg })
-		}
-
-		private createAccount(e: React.MouseEvent<HTMLElement>) {
-			e.preventDefault()
-			try {
-				if (!this.state.name.length) throw new Error('Please enter a name for the account')
-				if (!this.state.email.length) throw new Error('Please enter an email address')
-				// if(!validEmailRegex.test(this.state.email)) throw new Error('Invalid email address')
-				if (!this.state.password.length) throw new Error('Please enter an password')
-				if (!this.state.name.length) throw new Error('Please enter your full name')
-				if (!this.state.organization.length) throw new Error('Please enter an orgainzation name')
-				if (!this.state.applications.length) throw new Error('Please tell us what you mainly do')
-				if (!this.state.broadcastMediums.length) throw new Error('Please select a broadcast medium')
-			} catch (error) {
-				this.handleError(stringifyError(error))
-				return
-			}
-			createUser({
-				email: this.state.email,
-				password: this.state.password,
-				profile: { name: this.state.name },
-				createOrganization: {
-					name: this.state.organization,
-					applications: this.state.applications,
-					broadcastMediums: this.state.broadcastMediums,
-				},
-			}).catch((error) => {
-				logger.error(error)
-				this.handleError(`Error creating new user: ${error.reason || error.toString()}`)
-			})
-		}
-		render(): JSX.Element {
-			const { t } = this.props
-			return (
-				<NotLoggedInContainer>
-					<form className="frow content-left">
-						<div className="mtl flex-col page">
-							<p>{t('Your Account')}</p>
-							<input
-								className="mdinput mas"
-								type="text"
-								name="name"
-								value={this.state.name}
-								onChange={this.handleChange}
-								placeholder="Full Name"
-							/>
-							<input
-								className="mdinput mas"
-								type="email"
-								name="email"
-								value={this.state.email}
-								onChange={this.handleChange}
-								placeholder="Email Address"
-							/>
-							<input
-								className="mdinput mas"
-								type="password"
-								name="password"
-								value={this.state.password}
-								onChange={this.handleChange}
-								placeholder="Password"
-							/>
-						</div>
-						<div className="mtl flex-col page">
-							<p>{t('About Your Organization')}</p>
-							<input
-								className="mdinput mas"
-								type="text"
-								name="organization"
-								value={this.state.organization}
-								onChange={this.handleChange}
-								placeholder="Company / Organization name"
-							/>
-							<p>{t('We are mainly')}</p>
-							<ul>
-								{this.applications.map((a, i) => (
-									<div key={i}>
-										<input
-											id={`applications-${i}`}
-											type="checkbox"
-											name="applications"
-											checked={this.state.applications.indexOf(a) !== -1}
-											value={a}
-											onChange={this.handleChange}
-										/>
-										<label htmlFor={`applications-${i}`}>{a}</label>
-									</div>
-								))}
-								<div>
-									<input type="text" name="applications" placeholder="Other" onChange={this.handleChange} />
-								</div>
-							</ul>
-							<p>{t('Areas')}</p>
-							<ul>
-								{this.broadcastMediums.map((a, i) => (
-									<div key={i}>
-										<input
-											id={`mediums-${i}`}
-											type="checkbox"
-											name="broadcastMediums"
-											checked={this.state.broadcastMediums.indexOf(a) !== -1}
-											value={a}
-											onChange={this.handleChange}
-										/>
-										<label htmlFor={`mediums-${i}`}>{a}</label>
-									</div>
-								))}
-								<div>
-									<input type="text" name="broadcastMediums" placeholder="Other" onChange={this.handleChange} />
-								</div>
-							</ul>
-						</div>
-					</form>
-					<div className="flex-row-center container pills">
-						<Link className="selectable" to="/">
-							<button className="btn">{t('Go back')}</button>
-						</Link>
-						<button
-							className="btn btn-primary"
-							onClick={(e: React.MouseEvent<HTMLButtonElement>) => this.createAccount(e)}
-						>
-							{t('Create New Account')}
-						</button>
-					</div>
-					<div className={'error-msg ' + (this.state.error && 'error-msg-active')}>
-						<p>{this.state.error ? this.state.error : ''}&nbsp;</p>
-					</div>
-				</NotLoggedInContainer>
-			)
-		}
-	}
-)
diff --git a/meteor/client/ui/Account/NotLoggedIn/lib.tsx b/meteor/client/ui/Account/NotLoggedIn/lib.tsx
deleted file mode 100644
index 7a96a9dd89..0000000000
--- a/meteor/client/ui/Account/NotLoggedIn/lib.tsx
+++ /dev/null
@@ -1,20 +0,0 @@
-import * as React from 'react'
-
-interface IProps {
-	children: JSX.Element[]
-}
-export function NotLoggedInContainer(props: Readonly<IProps>): JSX.Element {
-	return (
-		<div className="center-page">
-			<div className="mtl gutter flex-col page">
-				<header className="mvs alc header">
-					<div className="badge">
-						<div className="sofie-logo"></div>
-					</div>
-					<h1>{'Sofie - TV Automation System'}</h1>
-				</header>
-				<div className="container">{props.children}</div>
-			</div>
-		</div>
-	)
-}
diff --git a/meteor/client/ui/Account/OrganizationPage.tsx b/meteor/client/ui/Account/OrganizationPage.tsx
deleted file mode 100644
index ba537e2709..0000000000
--- a/meteor/client/ui/Account/OrganizationPage.tsx
+++ /dev/null
@@ -1,148 +0,0 @@
-import React, { useCallback, useState } from 'react'
-import { useSubscriptions, useTracker } from '../../lib/ReactMeteorData/react-meteor-data'
-import { getUser, DBUser, getUserRolesFromLoadedDocuments } from '../../../lib/collections/Users'
-import { Spinner } from '../../lib/Spinner'
-import { MeteorPubSub } from '../../../lib/api/pubsub'
-import { DBOrganization, UserRoles } from '../../../lib/collections/Organization'
-import { unprotectString } from '../../../lib/lib'
-import { MeteorCall } from '../../../lib/api/methods'
-import { EditAttribute } from '../../lib/EditAttribute'
-import { Organizations, Users } from '../../collections'
-import { useTranslation } from 'react-i18next'
-import { logger } from '../../../lib/logging'
-
-export function OrganizationPage(): JSX.Element {
-	const { t } = useTranslation()
-
-	const loggedInUser = useTracker(() => getUser(), [], null)
-	const userOrganizationId = loggedInUser?.organizationId
-
-	// Subscribe to data:
-	useSubscriptions(MeteorPubSub.usersInOrganization, userOrganizationId ? [[userOrganizationId]] : [])
-
-	const organization =
-		useTracker(() => userOrganizationId && Organizations.findOne({ _id: userOrganizationId }), [userOrganizationId]) ??
-		null
-
-	const userIsAdmin = !!getUserRolesFromLoadedDocuments(loggedInUser, organization).admin
-
-	const usersInOrg = useTracker(
-		() => (userOrganizationId ? Users.find({ organizationId: userOrganizationId }).fetch() : []),
-		[userOrganizationId],
-		[]
-	)
-
-	const [newUserEmail, setNewUserEmail] = useState('')
-	const [newUserName, setNewUserName] = useState('')
-	const createAndEnrollUser = useCallback(() => {
-		if (!newUserEmail || !newUserName) {
-			return
-		}
-
-		MeteorCall.user
-			.enrollUser(newUserEmail, newUserName)
-			.then(() => {
-				// Clear fields
-				setNewUserEmail('')
-				setNewUserName('')
-			})
-			.catch((e) => {
-				logger.error('enrollUser failed: ', e)
-			})
-	}, [newUserEmail, newUserName])
-
-	const changeNewUserEmail = useCallback((e: React.FormEvent<HTMLInputElement>) => {
-		setNewUserEmail(e.currentTarget.value)
-	}, [])
-	const changeNewUserName = useCallback((e: React.FormEvent<HTMLInputElement>) => {
-		setNewUserName(e.currentTarget.value)
-	}, [])
-
-	if (!userIsAdmin) {
-		return <div>Not Allowed</div>
-	}
-
-	return (
-		<div className="center-page organization-page">
-			<div className="mtl page">
-				<h1>{t(`Organization Page${organization ? ' - ' + organization.name : ''}`)}</h1>
-				{loggedInUser ? (
-					<div className="flex-col">
-						<h2>{t('Invite User')}</h2>
-						<p>{t("New User's Email")}</p>
-						<input type="email" value={newUserEmail} onChange={changeNewUserEmail} />
-						<p>{t("New User's Name")}</p>
-						<input type="text" value={newUserName} onChange={changeNewUserName} />
-						<button className="btn btn-primary" onClick={createAndEnrollUser}>
-							{t('Create New User & Send Enrollment Email')}
-						</button>
-					</div>
-				) : (
-					<Spinner />
-				)}
-			</div>
-			<div className="mtl page flex-col">
-				<h2>{t('Users in organization')}</h2>
-				<table>
-					<thead>
-						<tr>
-							<th></th>
-							<th></th>
-							<th>{t('Studio')}</th>
-							<th>{t('Configurator')}</th>
-							<th>{t('Developer')}</th>
-							<th>{t('Admin')}</th>
-						</tr>
-					</thead>
-					<tbody>
-						{usersInOrg.map((user) => {
-							return (
-								<OrganizationPageUserRow
-									key={unprotectString(user._id)}
-									userIsAdmin={userIsAdmin}
-									displayUser={user}
-									organization={organization}
-								/>
-							)
-						})}
-					</tbody>
-				</table>
-			</div>
-		</div>
-	)
-}
-interface OrganizationPageUserRowProps {
-	userIsAdmin: boolean
-	displayUser: DBUser
-	organization: DBOrganization | null
-}
-function OrganizationPageUserRow({ userIsAdmin, displayUser, organization }: Readonly<OrganizationPageUserRowProps>) {
-	const renderUserRole = (user: DBUser, userRole: keyof UserRoles) => {
-		if (user && organization) {
-			const roles: UserRoles = organization.userRoles[unprotectString(user._id)] || {}
-			return userIsAdmin ? (
-				<EditAttribute
-					attribute={`userRoles.${user._id}.${userRole}`}
-					obj={organization}
-					type="checkbox"
-					collection={Organizations}
-					className=""
-				/>
-			) : (
-				<input type="checkbox" disabled={true} checked={roles[userRole]}></input>
-			)
-		} else return null
-	}
-
-	return (
-		<tr>
-			<td>{displayUser.profile.name}</td>
-			<td>{displayUser.emails.map((e) => e.address).join(', ')}</td>
-
-			<td>{renderUserRole(displayUser, 'studio')}</td>
-			<td>{renderUserRole(displayUser, 'configurator')}</td>
-			<td>{renderUserRole(displayUser, 'developer')}</td>
-			<td>{renderUserRole(displayUser, 'admin')}</td>
-		</tr>
-	)
-}
diff --git a/meteor/client/ui/App.tsx b/meteor/client/ui/App.tsx
deleted file mode 100644
index e101c78d83..0000000000
--- a/meteor/client/ui/App.tsx
+++ /dev/null
@@ -1,522 +0,0 @@
-import React, { useCallback, useContext, useEffect, useState } from 'react'
-import { useTranslation } from 'react-i18next'
-import 'moment/min/locales'
-import { parse as queryStringParse } from 'query-string'
-import Header from './Header'
-import {
-	setAllowStudio,
-	setAllowConfigure,
-	getAllowStudio,
-	getAllowConfigure,
-	setAllowDeveloper,
-	setAllowTesting,
-	getAllowTesting,
-	getAllowDeveloper,
-	setAllowSpeaking,
-	setAllowVibrating,
-	setAllowService,
-	getAllowService,
-	setHelpMode,
-	setUIZoom,
-	getUIZoom,
-	setShowHiddenSourceLayers,
-	setIgnorePieceContentStatus,
-	setShelfFollowsOnAir,
-	setReportNotifications,
-	unsetReportNotifications,
-	getShelfFollowsOnAir,
-	getAllowSpeaking,
-	getAllowVibrating,
-	getShowHiddenSourceLayers,
-	getIgnorePieceContentStatus,
-	getHelpMode,
-	getReportNotifications,
-} from '../lib/localStorage'
-import Status from './Status'
-import { Settings as SettingsView } from './Settings'
-import TestTools from './TestTools'
-import { RundownList } from './RundownList'
-import { RundownView } from './RundownView'
-import { ActiveRundownView } from './ActiveRundownView'
-import { ClockView } from './ClockView/ClockView'
-import { ConnectionStatusNotification } from '../lib/ConnectionStatusNotification'
-import { BrowserRouter as Router, Route, Switch, Redirect, useHistory } from 'react-router-dom'
-import { ErrorBoundary } from '../lib/ErrorBoundary'
-import { PrompterView } from './Prompter/PrompterView'
-import { ModalDialogGlobalContainer, doModalDialog } from '../lib/ModalDialog'
-import { Settings } from '../../lib/Settings'
-import { LoginPage } from './Account/NotLoggedIn/LoginPage'
-import { SignupPage } from './Account/NotLoggedIn/SignupPage'
-import { LostPasswordPage } from './Account/NotLoggedIn/LostPassword'
-import { ResetPasswordPage } from './Account/NotLoggedIn/ResetPasswordPage'
-import { AccountPage } from './Account/AccountPage'
-import { OrganizationPage } from './Account/OrganizationPage'
-import { getUser, User } from '../../lib/collections/Users'
-import { MeteorPubSub } from '../../lib/api/pubsub'
-import { useTracker, useSubscription } from '../lib/ReactMeteorData/ReactMeteorData'
-import { DocumentTitleProvider } from '../lib/DocumentTitleProvider'
-import { Spinner } from '../lib/Spinner'
-import { catchError, isRunningInPWA } from '../lib/lib'
-import { firstIfArray, protectString } from '../../lib/lib'
-
-const NullComponent = () => null
-
-const CRON_INTERVAL = 30 * 60 * 1000
-const LAST_RESTART_LATENCY = 3 * 60 * 60 * 1000
-const WINDOW_START_HOUR = 3
-const WINDOW_END_HOUR = 5
-
-const UserContext = React.createContext<User | null>(null)
-const UserSubscriptionReadyContext = React.createContext<boolean>(false)
-
-export const App: React.FC = function App() {
-	const { t } = useTranslation()
-	const user = useTracker(
-		() => {
-			return getUser()
-		},
-		[],
-		null
-	)
-
-	const [lastStart] = useState(Date.now())
-	const [requestedRoute, setRequestedRoute] = useState<undefined | string>()
-
-	const userReady = useSubscription(MeteorPubSub.loggedInUser)
-	const orgReady = useSubscription(MeteorPubSub.organization, user?.organizationId ?? null)
-
-	const subsReady = userReady && orgReady
-
-	const roles = useRoles(user, subsReady)
-	const featureFlags = useFeatureFlags()
-
-	useEffect(() => {
-		if (user) return
-
-		const path = String(window.location.pathname)
-		if (Settings.enableUserAccounts && !path.match(/verify-email/)) {
-			setRequestedRoute(path)
-		}
-	}, [user])
-
-	useEffect(() => {
-		if (!user) return
-
-		setRequestedRoute(undefined)
-	}, [user])
-
-	useEffect(() => {
-		function cronJob() {
-			const now = new Date()
-			const hour = now.getHours() + now.getMinutes() / 60
-			// if the time is between 3 and 5
-			if (
-				hour >= WINDOW_START_HOUR &&
-				hour < WINDOW_END_HOUR &&
-				// and the previous restart happened more than 3 hours ago
-				Date.now() - lastStart > LAST_RESTART_LATENCY &&
-				// and not in an active rundown
-				document.querySelector('.rundown.active') === null
-			) {
-				// @ts-expect-error forceReload is marked as deprecated, but it's still usable
-				setTimeout(() => window.location.reload(true), 1)
-			}
-		}
-
-		const interval = setInterval(cronJob, CRON_INTERVAL)
-
-		return () => {
-			clearInterval(interval)
-		}
-	}, [lastStart])
-
-	const mountPWAFullScreenTrigger = useCallback(() => {
-		document.addEventListener(
-			'mousedown',
-			(event) => {
-				event.preventDefault()
-
-				document.documentElement
-					.requestFullscreen({
-						navigationUI: 'auto',
-					})
-					.then(() => {
-						document.addEventListener('fullscreenchange', mountPWAFullScreenTrigger, {
-							once: true,
-						})
-					})
-					.catch(catchError('documentElement.requestFullscreen'))
-
-				// Use Keyboard API to lock the keyboard and disable all browser shortcuts
-				if (!('keyboard' in navigator)) return
-				// but we check for its availability, so it should be fine.
-				// Keyboard Lock: https://wicg.github.io/keyboard-lock/
-				navigator.keyboard.lock().catch(catchError('keyboard.lock'))
-			},
-			{
-				once: true,
-				passive: false,
-			}
-		)
-	}, [])
-
-	useEffect(() => {
-		if (Settings.customizationClassName) {
-			document.body.classList.add(Settings.customizationClassName)
-		}
-		const uiZoom = featureFlags.zoom
-		if (uiZoom !== 1) {
-			document.documentElement.style.fontSize = uiZoom * 16 + 'px'
-		}
-	}, [featureFlags.zoom])
-
-	useEffect(() => {
-		if (isRunningInPWA()) {
-			mountPWAFullScreenTrigger()
-		} else {
-			window.addEventListener('appinstalled', mountPWAFullScreenTrigger)
-
-			return () => {
-				window.removeEventListener('appinstalled', mountPWAFullScreenTrigger)
-			}
-		}
-	}, [mountPWAFullScreenTrigger])
-
-	const isAuthenticated = !Settings.enableUserAccounts || user
-	const shouldUseAuthentication = Settings.enableUserAccounts
-
-	const onNavigationUserConfirmation = useCallback((message: string, callback: (result: boolean) => void) => {
-		doModalDialog({
-			title: t('Are you sure?'),
-			message,
-			onAccept: () => {
-				callback(true)
-			},
-			onDiscard: () => {
-				callback(false)
-			},
-		})
-	}, [])
-
-	return (
-		<UserContext.Provider value={user}>
-			<UserSubscriptionReadyContext.Provider value={subsReady}>
-				<Router getUserConfirmation={onNavigationUserConfirmation}>
-					<div className="container-fluid header-clear">
-						{/* Header switch - render the usual header for all pages but the rundown view */}
-						{isAuthenticated && (
-							<ErrorBoundary>
-								<Switch>
-									<Route path="/rundown/:playlistId" component={NullComponent} />
-									<Route path="/countdowns/:studioId" component={NullComponent} />
-									<Route path="/activeRundown" component={NullComponent} />
-									<Route path="/prompter/:studioId" component={NullComponent} />
-									<Route
-										path="/"
-										render={(props) => (
-											<Header
-												{...props}
-												loggedIn={user ? true : false}
-												allowConfigure={roles.configure}
-												allowTesting={roles.testing}
-												allowDeveloper={roles.developer}
-											/>
-										)}
-									/>
-								</Switch>
-							</ErrorBoundary>
-						)}
-						{/* Main app switch */}
-						<ErrorBoundary>
-							<Switch>
-								{shouldUseAuthentication ? (
-									<>
-										<Route
-											exact
-											path="/"
-											render={(props) => <LoginPage {...props} requestedRoute={requestedRoute} />}
-										/>
-										<Route exact path="/login" render={() => <Redirect to="/" />} />
-										<Route
-											exact
-											path="/login/verify-email/:token"
-											render={(props) => <LoginPage {...props} requestedRoute={requestedRoute} />}
-										/>
-										<Route exact path="/signup" component={SignupPage} />
-										<Route exact path="/reset" component={LostPasswordPage} />
-										<Route exact path="/reset/:token" component={ResetPasswordPage} />
-										<Route
-											exact
-											path="/account"
-											render={() => (
-												<RequireAuth>
-													<AccountPage />
-												</RequireAuth>
-											)}
-										/>
-										<Route
-											exact
-											path="/organization"
-											render={() => (
-												<RequireAuth>
-													<OrganizationPage />
-												</RequireAuth>
-											)}
-										/>
-									</>
-								) : (
-									<Route exact path="/" component={RundownList} />
-								)}
-								<Route
-									path="/rundowns"
-									render={() => (
-										<RequireAuth>
-											<RundownList />
-										</RequireAuth>
-									)}
-								/>
-								<Route
-									path="/rundown/:playlistId/shelf"
-									exact
-									render={(props) => (
-										<RequireAuth>
-											<RundownView
-												playlistId={protectString(decodeURIComponent(props.match.params.playlistId))}
-												onlyShelf={true}
-											/>
-										</RequireAuth>
-									)}
-								/>
-								<Route
-									path="/rundown/:playlistId"
-									render={(props) => (
-										<RequireAuth>
-											<RundownView playlistId={protectString(decodeURIComponent(props.match.params.playlistId))} />
-										</RequireAuth>
-									)}
-								/>
-								<Route
-									path="/activeRundown/:studioId"
-									render={(props) => (
-										<RequireAuth>
-											<ActiveRundownView studioId={protectString(decodeURIComponent(props.match.params.studioId))} />
-										</RequireAuth>
-									)}
-								/>
-								<Route
-									path="/prompter/:studioId"
-									render={(props) => (
-										<RequireAuth>
-											<PrompterView studioId={protectString(decodeURIComponent(props.match.params.studioId))} />
-										</RequireAuth>
-									)}
-								/>
-								{/* We switch to the general ClockView component, and allow it to do the switch between various types of countdowns */}
-								<Route
-									path="/countdowns/:studioId"
-									render={(props) => (
-										<RequireAuth>
-											<ClockView studioId={protectString(decodeURIComponent(props.match.params.studioId))} />
-										</RequireAuth>
-									)}
-								/>
-								<Route
-									path="/status"
-									render={() => (
-										<RequireAuth>
-											<Status />
-										</RequireAuth>
-									)}
-								/>
-								<Route
-									path="/settings"
-									render={() => (
-										<RequireAuth>
-											<SettingsView />
-										</RequireAuth>
-									)}
-								/>
-								<Route
-									path="/testTools"
-									render={() => (
-										<RequireAuth>
-											<TestTools />
-										</RequireAuth>
-									)}
-								/>
-								<Route>
-									<Redirect to="/" />
-								</Route>
-							</Switch>
-						</ErrorBoundary>
-						<ErrorBoundary>
-							<Switch>
-								{/* Put views that should NOT have the Notification center here: */}
-								<Route path="/countdowns/:studioId" component={NullComponent} />
-								<Route path="/prompter/:studioId" component={NullComponent} />
-								<Route path="/" component={ConnectionStatusNotification} />
-							</Switch>
-						</ErrorBoundary>
-						<ErrorBoundary>
-							<DocumentTitleProvider />
-						</ErrorBoundary>
-						<ErrorBoundary>
-							<ModalDialogGlobalContainer />
-						</ErrorBoundary>
-					</div>
-				</Router>
-			</UserSubscriptionReadyContext.Provider>
-		</UserContext.Provider>
-	)
-}
-
-/**
- * This is a poly-fill, replicating the behavior of a <Navigate> element in React-Router-DOM v6.
- * TODO: Use React-Router-DOM element once React-Router-DOM is upgraded to v6.
- */
-const Navigate = React.memo(function Navigate({ to }: { to: string }): null {
-	const history = useHistory()
-
-	useEffect(() => {
-		history.push(to)
-	}, [to])
-
-	return null
-})
-
-const RequireAuth = React.memo(function RequireAuth({ children }: React.PropsWithChildren<{}>) {
-	const user = useContext(UserContext)
-	const ready = useContext(UserSubscriptionReadyContext)
-
-	let isAuthenticated = false
-	let isWorking = false
-	if (!Settings.enableUserAccounts || (ready && user)) {
-		isAuthenticated = true
-	} else if (!ready) {
-		isWorking = true
-	}
-
-	if (isWorking) return <Spinner />
-	if (isAuthenticated) return <>{children}</>
-
-	return <Navigate to="/" />
-})
-
-function useRoles(user: User | null, subsReady: boolean) {
-	const location = window.location
-
-	const [roles, setRoles] = useState(
-		Settings.enableUserAccounts
-			? {
-					studio: false,
-					configure: false,
-					developer: false,
-					testing: false,
-					service: false,
-			  }
-			: {
-					studio: getAllowStudio(),
-					configure: getAllowConfigure(),
-					developer: getAllowDeveloper(),
-					testing: getAllowTesting(),
-					service: getAllowService(),
-			  }
-	)
-
-	useEffect(() => {
-		if (!Settings.enableUserAccounts) {
-			if (!location.search) return
-
-			const params = queryStringParse(location.search)
-
-			if (params['studio']) setAllowStudio(params['studio'] === '1')
-			if (params['configure']) setAllowConfigure(params['configure'] === '1')
-			if (params['develop']) setAllowDeveloper(params['develop'] === '1')
-			if (params['testing']) setAllowTesting(params['testing'] === '1')
-			if (params['service']) setAllowService(params['service'] === '1')
-
-			if (params['admin']) {
-				const val = params['admin'] === '1'
-				setAllowStudio(val)
-				setAllowConfigure(val)
-				setAllowDeveloper(val)
-				setAllowTesting(val)
-				setAllowService(val)
-			}
-
-			setRoles({
-				studio: getAllowStudio(),
-				configure: getAllowConfigure(),
-				developer: getAllowDeveloper(),
-				testing: getAllowTesting(),
-				service: getAllowService(),
-			})
-		} else if (user && subsReady) {
-			setRoles({
-				studio: getAllowStudio(),
-				configure: getAllowConfigure(),
-				developer: getAllowDeveloper(),
-				testing: getAllowTesting(),
-				service: getAllowService(),
-			})
-		}
-	}, [location.search, user, subsReady])
-
-	return roles
-}
-
-function useFeatureFlags() {
-	const location = window.location
-
-	const [featureFlags, setFeatureFlags] = useState({
-		shelfFollowsOnAir: getShelfFollowsOnAir(),
-		speak: getAllowSpeaking(),
-		vibrate: getAllowVibrating(),
-		help: getHelpMode(),
-		zoom: getUIZoom(),
-		showHiddenSourceLayers: getShowHiddenSourceLayers(),
-		ignorePieceContentStatus: getIgnorePieceContentStatus(),
-		reportNotifications: getReportNotifications(),
-	})
-
-	useEffect(() => {
-		if (!location.search) return
-
-		const params = queryStringParse(location.search)
-
-		if (params['shelffollowsonair']) setShelfFollowsOnAir(params['shelffollowsonair'] === '1')
-		if (params['speak']) setAllowSpeaking(params['speak'] === '1')
-		if (params['vibrate']) setAllowVibrating(params['vibrate'] === '1')
-		if (params['help']) setHelpMode(params['help'] === '1')
-		if (params['zoom'] && typeof params['zoom'] === 'string') {
-			setUIZoom(parseFloat(firstIfArray(params['zoom']) || '1') / 100 || 1)
-		}
-		if (params['show_hidden_source_layers']) {
-			setShowHiddenSourceLayers(params['show_hidden_source_layers'] === '1')
-		}
-		if (params['ignore_piece_content_status']) {
-			setIgnorePieceContentStatus(params['ignore_piece_content_status'] === '1')
-		}
-		if (params['reportNotificationsId'] && params['reportNotificationsId'] !== '0') {
-			const notificationsId = firstIfArray(params['reportNotificationsId'])
-			if (notificationsId) setReportNotifications(notificationsId)
-		} else if (params['reportNotificationsId'] === '0') {
-			unsetReportNotifications()
-		}
-
-		setFeatureFlags({
-			shelfFollowsOnAir: getShelfFollowsOnAir(),
-			speak: getAllowSpeaking(),
-			vibrate: getAllowVibrating(),
-			help: getHelpMode(),
-			zoom: getUIZoom(),
-			showHiddenSourceLayers: getShowHiddenSourceLayers(),
-			ignorePieceContentStatus: getIgnorePieceContentStatus(),
-			reportNotifications: getReportNotifications(),
-		})
-	}, [location.search])
-
-	return featureFlags
-}
-
-export default App
diff --git a/meteor/client/ui/SegmentStoryboard/StoryboardPartThumbnail/StoryboardPartThumbnailInner.tsx b/meteor/client/ui/SegmentStoryboard/StoryboardPartThumbnail/StoryboardPartThumbnailInner.tsx
deleted file mode 100644
index 4df9e91126..0000000000
--- a/meteor/client/ui/SegmentStoryboard/StoryboardPartThumbnail/StoryboardPartThumbnailInner.tsx
+++ /dev/null
@@ -1,111 +0,0 @@
-import React, { useRef, useState } from 'react'
-import { ISourceLayer } from '@sofie-automation/blueprints-integration'
-import { PieceExtended } from '../../../../lib/Rundown'
-import { withMediaObjectStatus } from '../../SegmentTimeline/withMediaObjectStatus'
-import { getElementDocumentOffset, OffsetPosition } from '../../../utils/positions'
-import { getElementHeight, getElementWidth } from '../../../utils/dimensions'
-import renderThumbnail from './Renderers/ThumbnailRendererFactory'
-import { PieceElement } from '../../SegmentContainer/PieceElement'
-import { UIStudio } from '../../../../lib/api/studios'
-import { PartId, PartInstanceId } from '@sofie-automation/corelib/dist/dataModel/Ids'
-
-interface IProps {
-	partId: PartId
-	partInstanceId: PartInstanceId
-	partAutoNext: boolean
-	partPlannedStoppedPlayback: number | undefined
-	layer: ISourceLayer | undefined
-	piece: PieceExtended
-	studio: UIStudio | undefined
-	isLive: boolean
-	isNext: boolean
-	highlight?: boolean
-}
-
-export const StoryboardPartThumbnailInner = withMediaObjectStatus<IProps, {}>()(
-	({
-		piece,
-		layer,
-		partId,
-		partInstanceId,
-		studio,
-		highlight,
-		partAutoNext,
-		partPlannedStoppedPlayback,
-		isLive,
-		isNext,
-	}: IProps) => {
-		const [hover, setHover] = useState(false)
-		const [origin, setOrigin] = useState<OffsetPosition>({ left: 0, top: 0 })
-		const [width, setWidth] = useState(0)
-		const [height, setHeight] = useState(0)
-		const [mousePosition, setMousePosition] = useState(0)
-		const thumbnailEl = useRef<HTMLDivElement>(null)
-
-		const onPointerEnter = (e: React.PointerEvent<HTMLDivElement>) => {
-			if (e.pointerType !== 'mouse') {
-				return
-			}
-			setHover(true)
-
-			const newOffset = thumbnailEl.current && getElementDocumentOffset(thumbnailEl.current)
-			if (newOffset !== null) {
-				setOrigin(newOffset)
-			}
-			const newWidth = thumbnailEl.current && getElementWidth(thumbnailEl.current)
-			if (newWidth !== null) {
-				setWidth(newWidth)
-			}
-			const newHeight = thumbnailEl.current && getElementHeight(thumbnailEl.current)
-			if (newHeight !== null) {
-				setHeight(newHeight)
-			}
-		}
-
-		const onPointerLeave = (e: React.PointerEvent<HTMLDivElement>) => {
-			if (e.pointerType !== 'mouse') {
-				return
-			}
-			setHover(false)
-		}
-
-		const onPointerMove = (e: React.PointerEvent<HTMLDivElement>) => {
-			if (e.pointerType !== 'mouse') {
-				return
-			}
-			const newMousePosition = Math.max(0, Math.min(1, (e.pageX - origin.left - 5) / (width - 10)))
-			setMousePosition(newMousePosition)
-		}
-
-		return (
-			<PieceElement
-				className="segment-storyboard__part__thumbnail"
-				layer={layer}
-				partId={partId}
-				piece={piece}
-				highlight={highlight}
-				onPointerEnter={onPointerEnter}
-				onPointerLeave={onPointerLeave}
-				onPointerMove={onPointerMove}
-				ref={thumbnailEl}
-			>
-				{studio &&
-					renderThumbnail({
-						partId,
-						partInstanceId,
-						partAutoNext,
-						partPlannedStoppedPlayback,
-						hoverScrubTimePosition: mousePosition * (piece.instance.piece.content.sourceDuration || 0),
-						hovering: hover,
-						layer: layer,
-						height,
-						originPosition: origin,
-						pieceInstance: piece,
-						studio,
-						isLive,
-						isNext,
-					})}
-			</PieceElement>
-		)
-	}
-)
diff --git a/meteor/client/ui/SegmentTimeline/Renderers/STKSourceRenderer.tsx b/meteor/client/ui/SegmentTimeline/Renderers/STKSourceRenderer.tsx
deleted file mode 100644
index 48c540efef..0000000000
--- a/meteor/client/ui/SegmentTimeline/Renderers/STKSourceRenderer.tsx
+++ /dev/null
@@ -1,10 +0,0 @@
-import { VTSourceRendererBase } from './VTSourceRenderer'
-import { withTranslation } from 'react-i18next'
-
-export const STKSourceRenderer = withTranslation()(
-	class STKSourceRenderer extends VTSourceRendererBase {
-		render(): JSX.Element {
-			return super.render()
-		}
-	}
-)
diff --git a/meteor/client/ui/SegmentTimeline/SourceLayerItemContainer.tsx b/meteor/client/ui/SegmentTimeline/SourceLayerItemContainer.tsx
deleted file mode 100644
index 4030b906bd..0000000000
--- a/meteor/client/ui/SegmentTimeline/SourceLayerItemContainer.tsx
+++ /dev/null
@@ -1,14 +0,0 @@
-import * as React from 'react'
-import { ISourceLayerItemProps, SourceLayerItem } from './SourceLayerItem'
-import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
-import { withMediaObjectStatus } from './withMediaObjectStatus'
-import { UIStudio } from '../../../lib/api/studios'
-
-interface IPropsHeader extends ISourceLayerItemProps {
-	playlist: DBRundownPlaylist
-	studio: UIStudio
-}
-
-export const SourceLayerItemContainer = withMediaObjectStatus<IPropsHeader, {}>()((props: IPropsHeader) => (
-	<SourceLayerItem {...props} />
-))
diff --git a/meteor/client/ui/SegmentTimeline/withMediaObjectStatus.tsx b/meteor/client/ui/SegmentTimeline/withMediaObjectStatus.tsx
deleted file mode 100644
index eb207769bb..0000000000
--- a/meteor/client/ui/SegmentTimeline/withMediaObjectStatus.tsx
+++ /dev/null
@@ -1,178 +0,0 @@
-import React, { useEffect, useState } from 'react'
-import { PieceUi } from './SegmentTimelineContainer'
-import { ISourceLayer } from '@sofie-automation/blueprints-integration'
-import { RundownUtils } from '../../lib/rundown'
-import { IAdLibListItem } from '../Shelf/AdLibListItem'
-import { BucketAdLibUi, BucketAdLibActionUi } from '../Shelf/RundownViewBuckets'
-import { AdLibPieceUi } from '../../lib/shelf'
-import { UIStudio } from '../../../lib/api/studios'
-import { UIBucketContentStatuses, UIPieceContentStatuses } from '../Collections'
-import { Piece, PieceStatusCode } from '@sofie-automation/corelib/dist/dataModel/Piece'
-import { PieceContentStatusObj } from '../../../lib/api/pieceContentStatus'
-import { deepFreeze } from '@sofie-automation/corelib/dist/lib'
-import _ from 'underscore'
-import { useTracker } from '../../lib/ReactMeteorData/ReactMeteorData'
-import { PieceInstance } from '@sofie-automation/corelib/dist/dataModel/PieceInstance'
-import { UIBucketContentStatus, UIPieceContentStatus } from '../../../lib/api/rundownNotifications'
-
-type AnyPiece = {
-	piece?: BucketAdLibUi | IAdLibListItem | AdLibPieceUi | PieceUi | BucketAdLibActionUi | undefined
-	layer?: ISourceLayer | undefined
-	isLiveLine?: boolean
-	studio: UIStudio | undefined
-}
-
-type IWrappedComponent<IProps extends AnyPiece, IState> = new (props: IProps, state: IState) => React.Component<
-	IProps,
-	IState
->
-
-const DEFAULT_STATUS = deepFreeze<PieceContentStatusObj>({
-	status: PieceStatusCode.UNKNOWN,
-	messages: [],
-	progress: undefined,
-
-	blacks: [],
-	freezes: [],
-	scenes: [],
-
-	thumbnailUrl: undefined,
-	previewUrl: undefined,
-
-	packageName: null,
-
-	contentDuration: undefined,
-})
-
-function unwrapPieceInstance(piece: BucketAdLibUi | IAdLibListItem | AdLibPieceUi | PieceUi | BucketAdLibActionUi) {
-	if (RundownUtils.isPieceInstance(piece)) {
-		return piece.instance.piece
-	} else {
-		return piece
-	}
-}
-
-function getStatusDocForPiece(
-	piece: BucketAdLibUi | IAdLibListItem | AdLibPieceUi | PieceUi | BucketAdLibActionUi
-): UIPieceContentStatus | UIBucketContentStatus | undefined {
-	const pieceUnwrapped = unwrapPieceInstance(piece)
-
-	// Bucket items use a different collection
-	if (RundownUtils.isBucketAdLibItem(piece)) {
-		return UIBucketContentStatuses.findOne({
-			bucketId: piece.bucketId,
-			docId: pieceUnwrapped._id,
-		})
-	}
-
-	// PieceInstance's might have a dedicated status
-	if (RundownUtils.isPieceInstance(piece)) {
-		const status = UIPieceContentStatuses.findOne({
-			// Future: It would be good for this to be stricter.
-			pieceId: piece.instance._id,
-		})
-		if (status) return status
-	}
-
-	// Fallback to using the one from the source piece
-	return UIPieceContentStatuses.findOne({
-		// Future: It would be good for this to be stricter.
-		pieceId: pieceUnwrapped._id,
-	})
-}
-
-/**
- * @deprecated This can now be achieved by a simple minimongo query against either UIPieceContentStatuses or UIBucketContentStatuses
- */
-export function withMediaObjectStatus<IProps extends AnyPiece, IState>(): (
-	WrappedComponent: IWrappedComponent<IProps, IState> | React.FC<IProps>
-) => React.FC<IProps> {
-	return (WrappedComponent) => {
-		return function WithMediaObjectStatusHOCComponent(props: IProps) {
-			const [invalidationToken, setInvalidationToken] = useState(Date.now())
-			useEffect(() => {
-				// Force an invalidation shortly after mounting
-				const callback = window.requestIdleCallback(
-					() => {
-						setInvalidationToken(Date.now())
-					},
-					{
-						timeout: 500,
-					}
-				)
-				return () => {
-					window.cancelIdleCallback(callback)
-				}
-			}, [])
-
-			const overrides = useTracker(() => {
-				const { piece, studio, layer } = props
-				const overrides: Partial<IProps> = {}
-
-				// Check item status
-				if (piece && (piece.sourceLayer || layer) && studio) {
-					// Extract the status or populate some default values
-					const statusObj = getStatusDocForPiece(piece)?.status ?? DEFAULT_STATUS
-
-					if (RundownUtils.isAdLibPieceOrAdLibListItem(piece)) {
-						if (!overrides.piece || !_.isEqual(statusObj, (overrides.piece as AdLibPieceUi).contentStatus)) {
-							// Deep clone the required bits
-							const origPiece = (overrides.piece || props.piece) as AdLibPieceUi
-							const pieceCopy: AdLibPieceUi = {
-								...origPiece,
-
-								contentStatus: statusObj,
-							}
-
-							overrides.piece = pieceCopy
-						}
-					} else if (!overrides.piece || !_.isEqual(statusObj, (overrides.piece as PieceUi).contentStatus)) {
-						// Deep clone the required bits
-						const pieceCopy: PieceUi = {
-							...((overrides.piece || piece) as PieceUi),
-
-							contentStatus: statusObj,
-						}
-
-						overrides.piece = pieceCopy
-					}
-				}
-
-				return overrides
-			}, [props.piece, props.studio, props.isLiveLine, invalidationToken])
-
-			return <WrappedComponent {...props} {...overrides} />
-		}
-	}
-}
-
-export function useContentStatusForPiece(
-	piece: Pick<Piece, '_id' | 'startRundownId' | 'startSegmentId'> | undefined
-): PieceContentStatusObj | undefined {
-	return useTracker(
-		() =>
-			piece
-				? UIPieceContentStatuses.findOne({
-						pieceId: piece._id,
-						rundownId: piece.startRundownId || { $exists: false },
-						segmentId: piece.startSegmentId || { $exists: false },
-				  })?.status
-				: undefined,
-		[piece?._id, piece?.startRundownId, piece?.startSegmentId]
-	)
-}
-
-export function useContentStatusForPieceInstance(
-	piece: Pick<PieceInstance, '_id' | 'rundownId'> | undefined
-): PieceContentStatusObj | undefined {
-	return useTracker(
-		() =>
-			piece
-				? UIPieceContentStatuses.findOne({
-						pieceId: piece._id,
-						rundownId: piece.rundownId || { $exists: false },
-				  })?.status
-				: undefined,
-		[piece?._id, piece?.rundownId]
-	)
-}
diff --git a/meteor/client/ui/Settings/Studio/PackageManager.tsx b/meteor/client/ui/Settings/Studio/PackageManager.tsx
deleted file mode 100644
index ffbe8f5272..0000000000
--- a/meteor/client/ui/Settings/Studio/PackageManager.tsx
+++ /dev/null
@@ -1,816 +0,0 @@
-import ClassNames from 'classnames'
-import * as React from 'react'
-import { Meteor } from 'meteor/meteor'
-import * as _ from 'underscore'
-import { DBStudio, StudioPackageContainer } from '@sofie-automation/corelib/dist/dataModel/Studio'
-import { EditAttribute, EditAttributeBase } from '../../../lib/EditAttribute'
-import { doModalDialog } from '../../../lib/ModalDialog'
-import { Translated } from '../../../lib/ReactMeteorData/react-meteor-data'
-import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
-import { faTrash, faPencilAlt, faCheck, faPlus } from '@fortawesome/free-solid-svg-icons'
-import { withTranslation } from 'react-i18next'
-import { Accessor } from '@sofie-automation/blueprints-integration'
-import { Studios } from '../../../collections'
-import { applyAndValidateOverrides } from '@sofie-automation/corelib/dist/settings/objectWithOverrides'
-import { LabelActual } from '../../../lib/Components/LabelAndOverrides'
-
-interface IStudioPackageManagerSettingsProps {
-	studio: DBStudio
-}
-interface IStudioPackageManagerSettingsState {
-	editedPackageContainer: Array<string>
-	editedAccessors: Array<string>
-}
-
-export const StudioPackageManagerSettings = withTranslation()(
-	class StudioPackageManagerSettings extends React.Component<
-		Translated<IStudioPackageManagerSettingsProps>,
-		IStudioPackageManagerSettingsState
-	> {
-		constructor(props: Translated<IStudioPackageManagerSettingsProps>) {
-			super(props)
-
-			this.state = {
-				editedPackageContainer: [],
-				editedAccessors: [],
-			}
-		}
-		isPackageContainerEdited = (containerId: string) => {
-			return this.state.editedPackageContainer.indexOf(containerId) >= 0
-		}
-		finishEditPackageContainer = (containerId: string) => {
-			const index = this.state.editedPackageContainer.indexOf(containerId)
-			if (index >= 0) {
-				this.state.editedPackageContainer.splice(index, 1)
-				this.setState({
-					editedPackageContainer: this.state.editedPackageContainer,
-				})
-			}
-		}
-		editPackageContainer = (containerId: string) => {
-			if (this.state.editedPackageContainer.indexOf(containerId) < 0) {
-				this.state.editedPackageContainer.push(containerId)
-				this.setState({
-					editedPackageContainer: this.state.editedPackageContainer,
-				})
-			} else {
-				this.finishEditPackageContainer(containerId)
-			}
-		}
-		confirmRemovePackageContainer = (containerId: string) => {
-			const { t } = this.props
-			doModalDialog({
-				title: t('Remove this Package Container?'),
-				yes: t('Remove'),
-				no: t('Cancel'),
-				onAccept: () => {
-					this.removePackageContainer(containerId)
-				},
-				message: (
-					<React.Fragment>
-						<p>
-							{t('Are you sure you want to remove the Package Container "{{containerId}}"?', {
-								containerId: containerId,
-							})}
-						</p>
-						<p>{t('Please note: This action is irreversible!')}</p>
-					</React.Fragment>
-				),
-			})
-		}
-		removePackageContainer = (containerId: string) => {
-			const unsetObject: Record<string, 1> = {}
-			unsetObject['packageContainers.' + containerId] = 1
-			Studios.update(this.props.studio._id, {
-				$unset: unsetObject,
-			})
-		}
-		addNewPackageContainer = () => {
-			// find free key name
-			const newKeyName = 'newContainer'
-			let iter = 0
-			while ((this.props.studio.packageContainers || {})[newKeyName + iter]) {
-				iter++
-			}
-
-			const newPackageContainer: StudioPackageContainer = {
-				deviceIds: [],
-				container: {
-					label: 'New Package Container',
-					accessors: {},
-				},
-			}
-			const setObject: Record<string, any> = {}
-			setObject['packageContainers.' + newKeyName + iter] = newPackageContainer
-
-			Studios.update(this.props.studio._id, {
-				$set: setObject,
-			})
-		}
-		containerId = (edit: EditAttributeBase, newValue: string) => {
-			const oldContainerId = edit.props.overrideDisplayValue
-			const newContainerId = newValue + ''
-			const packageContainer = this.props.studio.packageContainers[oldContainerId]
-
-			if (this.props.studio.packageContainers[newContainerId]) {
-				throw new Meteor.Error(400, 'PackageContainer "' + newContainerId + '" already exists')
-			}
-
-			const mSet: Record<string, any> = {}
-			const mUnset: Record<string, 1> = {}
-			mSet['packageContainers.' + newContainerId] = packageContainer
-			mUnset['packageContainers.' + oldContainerId] = 1
-
-			if (edit.props.collection) {
-				edit.props.collection.update(this.props.studio._id, {
-					$set: mSet,
-					$unset: mUnset,
-				})
-			}
-
-			this.finishEditPackageContainer(oldContainerId)
-			this.editPackageContainer(newContainerId)
-		}
-		getPlayoutDeviceIds() {
-			const deviceIds: {
-				name: string
-				value: string
-			}[] = []
-
-			const playoutDevices = applyAndValidateOverrides(this.props.studio.peripheralDeviceSettings.playoutDevices).obj
-
-			for (const deviceId of Object.keys(playoutDevices)) {
-				deviceIds.push({
-					name: deviceId,
-					value: deviceId,
-				})
-			}
-
-			return deviceIds
-		}
-		renderPackageContainers() {
-			const { t } = this.props
-
-			if (Object.keys(this.props.studio.packageContainers).length === 0) {
-				return (
-					<tr>
-						<td className="mhn dimmed">{t('There are no Package Containers set up.')}</td>
-					</tr>
-				)
-			}
-
-			return _.map(
-				this.props.studio.packageContainers,
-				(packageContainer: StudioPackageContainer, containerId: string) => {
-					return (
-						<React.Fragment key={containerId}>
-							<tr
-								className={ClassNames({
-									hl: this.isPackageContainerEdited(containerId),
-								})}
-							>
-								<th className="settings-studio-package-container__id c2">{containerId}</th>
-								<td className="settings-studio-package-container__name c2">{packageContainer.container.label}</td>
-
-								<td className="settings-studio-package-container__actions table-item-actions c3">
-									<button className="action-btn" onClick={() => this.editPackageContainer(containerId)}>
-										<FontAwesomeIcon icon={faPencilAlt} />
-									</button>
-									<button className="action-btn" onClick={() => this.confirmRemovePackageContainer(containerId)}>
-										<FontAwesomeIcon icon={faTrash} />
-									</button>
-								</td>
-							</tr>
-							{this.isPackageContainerEdited(containerId) && (
-								<tr className="expando-details hl">
-									<td colSpan={6}>
-										<div className="properties-grid">
-											<label className="field">
-												<LabelActual label={t('Package Container ID')} />
-												<EditAttribute
-													modifiedClassName="bghl"
-													attribute={'packageContainers'}
-													overrideDisplayValue={containerId}
-													obj={this.props.studio}
-													type="text"
-													collection={Studios}
-													updateFunction={this.containerId}
-													className="input text-input input-l"
-												></EditAttribute>
-											</label>
-
-											<label className="field">
-												<LabelActual label={t('Label')} />
-												<EditAttribute
-													modifiedClassName="bghl"
-													attribute={`packageContainers.${containerId}.container.label`}
-													obj={this.props.studio}
-													type="text"
-													collection={Studios}
-													className="input text-input input-l"
-												></EditAttribute>
-												<span className="text-s dimmed field-hint">
-													{t('Display name/label of the Package Container')}
-												</span>
-											</label>
-
-											<label className="field">
-												<LabelActual label={t('Playout devices which uses this package container')} />
-												<EditAttribute
-													attribute={`packageContainers.${containerId}.deviceIds`}
-													obj={this.props.studio}
-													options={this.getPlayoutDeviceIds()}
-													label={t('Select playout devices')}
-													type="multiselect"
-													collection={Studios}
-												></EditAttribute>
-												<span className="text-s dimmed field-hint">
-													{t('Select which playout devices are using this package container')}
-												</span>
-											</label>
-
-											<div className="mdi"></div>
-										</div>
-										<div>
-											<div className="settings-studio-accessors">
-												<h3 className="mhn">{t('Accessors')}</h3>
-												<table className="expando settings-studio-package-containers-accessors-table">
-													<tbody>{this.renderAccessors(containerId, packageContainer)}</tbody>
-												</table>
-												<div className="mod mhs">
-													<button className="btn btn-primary" onClick={() => this.addNewAccessor(containerId)}>
-														<FontAwesomeIcon icon={faPlus} />
-													</button>
-												</div>
-											</div>
-										</div>
-									</td>
-								</tr>
-							)}
-						</React.Fragment>
-					)
-				}
-			)
-		}
-		isAccessorEdited = (containerId: string, accessorId: string) => {
-			return this.state.editedAccessors.indexOf(containerId + accessorId) >= 0
-		}
-		finishEditAccessor = (containerId: string, accessorId: string) => {
-			const index = this.state.editedAccessors.indexOf(containerId + accessorId)
-			if (index >= 0) {
-				this.state.editedAccessors.splice(index, 1)
-				this.setState({
-					editedAccessors: this.state.editedAccessors,
-				})
-			}
-		}
-		editAccessor = (containerId: string, accessorId: string) => {
-			if (this.state.editedAccessors.indexOf(containerId + accessorId) < 0) {
-				this.state.editedAccessors.push(containerId + accessorId)
-				this.setState({
-					editedAccessors: this.state.editedAccessors,
-				})
-			} else {
-				this.finishEditAccessor(containerId, accessorId)
-			}
-		}
-		confirmRemoveAccessor = (containerId: string, accessorId: string) => {
-			const { t } = this.props
-			doModalDialog({
-				title: t('Remove this Package Container Accessor?'),
-				yes: t('Remove'),
-				no: t('Cancel'),
-				onAccept: () => {
-					this.removeAccessor(containerId, accessorId)
-				},
-				message: (
-					<React.Fragment>
-						<p>
-							{t('Are you sure you want to remove the Package Container Accessor "{{accessorId}}"?', {
-								accessorId: accessorId,
-							})}
-						</p>
-						<p>{t('Please note: This action is irreversible!')}</p>
-					</React.Fragment>
-				),
-			})
-		}
-		removeAccessor = (containerId: string, accessorId: string) => {
-			const unsetObject: Record<string, 1> = {}
-			unsetObject[`packageContainers.${containerId}.container.accessors.${accessorId}`] = 1
-			Studios.update(this.props.studio._id, {
-				$unset: unsetObject,
-			})
-		}
-		addNewAccessor = (containerId: string) => {
-			// find free key name
-			const newKeyName = 'local'
-			let iter = 0
-			const packageContainer = this.props.studio.packageContainers[containerId]
-			if (!packageContainer) throw new Error(`Can't add an accessor to nonexistant Package Container "${containerId}"`)
-
-			while (packageContainer.container.accessors[newKeyName + iter]) {
-				iter++
-			}
-			const accessorId = newKeyName + iter
-
-			const newAccessor: Accessor.LocalFolder = {
-				type: Accessor.AccessType.LOCAL_FOLDER,
-				label: 'Local folder',
-				allowRead: true,
-				allowWrite: false,
-				folderPath: '',
-			}
-			const setObject: Record<string, any> = {}
-			setObject[`packageContainers.${containerId}.container.accessors.${accessorId}`] = newAccessor
-
-			Studios.update(this.props.studio._id, {
-				$set: setObject,
-			})
-		}
-		updateAccessorId = (edit: EditAttributeBase, newValue: string) => {
-			const oldAccessorId = edit.props.overrideDisplayValue
-			const newAccessorId = newValue + ''
-			const containerId = edit.props.attribute
-			if (!containerId) throw new Error(`containerId not set`)
-			const packageContainer = this.props.studio.packageContainers[containerId]
-			if (!packageContainer) throw new Error(`Can't edit an accessor to nonexistant Package Container "${containerId}"`)
-
-			const accessor = this.props.studio.packageContainers[containerId].container.accessors[oldAccessorId]
-
-			if (this.props.studio.packageContainers[containerId].container.accessors[newAccessorId]) {
-				throw new Meteor.Error(400, 'Accessor "' + newAccessorId + '" already exists')
-			}
-
-			const mSet: Record<string, any> = {}
-			const mUnset: Record<string, 1> = {}
-			mSet[`packageContainers.${containerId}.container.accessors.${newAccessorId}`] = accessor
-			mUnset[`packageContainers.${containerId}.container.accessors.${oldAccessorId}`] = 1
-
-			if (edit.props.collection) {
-				edit.props.collection.update(this.props.studio._id, {
-					$set: mSet,
-					$unset: mUnset,
-				})
-			}
-
-			this.finishEditAccessor(containerId, oldAccessorId)
-			this.editAccessor(containerId, newAccessorId)
-		}
-
-		renderAccessors(containerId: string, packageContainer: StudioPackageContainer) {
-			const { t } = this.props
-
-			if (Object.keys(this.props.studio.packageContainers).length === 0) {
-				return (
-					<tr>
-						<td className="mhn dimmed">{t('There are no Accessors set up.')}</td>
-					</tr>
-				)
-			}
-
-			return _.map(packageContainer.container.accessors, (accessor: Accessor.Any, accessorId: string) => {
-				const accessorContent: string[] = []
-				_.each(accessor as any, (value, key: string) => {
-					if (key !== 'type' && value !== '') {
-						let str = JSON.stringify(value)
-						if (str.length > 20) str = str.slice(0, 17) + '...'
-						accessorContent.push(`${key}: ${str}`)
-					}
-				})
-				return (
-					<React.Fragment key={accessorId}>
-						<tr
-							className={ClassNames({
-								hl: this.isAccessorEdited(containerId, accessorId),
-							})}
-						>
-							<th className="settings-studio-accessor__id c2">{accessorId}</th>
-							{/* <td className="settings-studio-accessor__name c2">{accessor.name}</td> */}
-							<td className="settings-studio-accessor__type c1">{accessor.type}</td>
-							<td className="settings-studio-accessor__accessorContent c7">{accessorContent.join(', ')}</td>
-
-							<td className="settings-studio-accessor__actions table-item-actions c3">
-								<button className="action-btn" onClick={() => this.editAccessor(containerId, accessorId)}>
-									<FontAwesomeIcon icon={faPencilAlt} />
-								</button>
-								<button className="action-btn" onClick={() => this.confirmRemoveAccessor(containerId, accessorId)}>
-									<FontAwesomeIcon icon={faTrash} />
-								</button>
-							</td>
-						</tr>
-						{this.isAccessorEdited(containerId, accessorId) && (
-							<tr className="expando-details hl">
-								<td colSpan={6}>
-									<div className="properties-grid">
-										<label className="field">
-											<LabelActual label={t('Accessor ID')} />
-											<EditAttribute
-												modifiedClassName="bghl"
-												attribute={containerId}
-												overrideDisplayValue={accessorId}
-												obj={this.props.studio}
-												type="text"
-												collection={Studios}
-												updateFunction={this.updateAccessorId}
-												className="input text-input input-l"
-											></EditAttribute>
-										</label>
-										<label className="field">
-											<LabelActual label={t('Label')} />
-											<EditAttribute
-												modifiedClassName="bghl"
-												attribute={`packageContainers.${containerId}.container.accessors.${accessorId}.label`}
-												obj={this.props.studio}
-												type="text"
-												collection={Studios}
-												className="input text-input input-l"
-											></EditAttribute>
-											<span className="text-s dimmed field-hint">{t('Display name of the Package Container')}</span>
-										</label>
-										<label className="field">
-											<LabelActual label={t('Accessor Type')} />
-											<EditAttribute
-												modifiedClassName="bghl"
-												attribute={`packageContainers.${containerId}.container.accessors.${accessorId}.type`}
-												obj={this.props.studio}
-												type="dropdown"
-												options={Accessor.AccessType}
-												collection={Studios}
-												className="input text-input input-l"
-											></EditAttribute>
-										</label>
-										{accessor.type === Accessor.AccessType.LOCAL_FOLDER ? (
-											<>
-												<label className="field">
-													<LabelActual label={t('Folder path')} />
-													<EditAttribute
-														modifiedClassName="bghl"
-														attribute={`packageContainers.${containerId}.container.accessors.${accessorId}.folderPath`}
-														obj={this.props.studio}
-														type="text"
-														collection={Studios}
-														className="input text-input input-l"
-													></EditAttribute>
-													<span className="text-s dimmed field-hint">
-														{t('File path to the folder of the local folder')}
-													</span>
-												</label>
-
-												<label className="field">
-													<LabelActual label={t('Resource Id')} />
-													<EditAttribute
-														modifiedClassName="bghl"
-														attribute={`packageContainers.${containerId}.container.accessors.${accessorId}.resourceId`}
-														obj={this.props.studio}
-														type="text"
-														collection={Studios}
-														className="input text-input input-l"
-													></EditAttribute>
-													<span className="text-s dimmed field-hint">
-														{t('(Optional) This could be the name of the computer on which the local folder is on')}
-													</span>
-												</label>
-											</>
-										) : accessor.type === Accessor.AccessType.HTTP ? (
-											<>
-												<label className="field">
-													<LabelActual label={t('Base URL')} />
-													<EditAttribute
-														modifiedClassName="bghl"
-														attribute={`packageContainers.${containerId}.container.accessors.${accessorId}.baseUrl`}
-														obj={this.props.studio}
-														type="text"
-														collection={Studios}
-														className="input text-input input-l"
-													></EditAttribute>
-													<span className="text-s dimmed field-hint">
-														{t('Base url to the resource (example: http://myserver/folder)')}
-													</span>
-												</label>
-
-												<label className="field">
-													<LabelActual label={t('Network Id')} />
-													<EditAttribute
-														modifiedClassName="bghl"
-														attribute={`packageContainers.${containerId}.container.accessors.${accessorId}.networkId`}
-														obj={this.props.studio}
-														type="text"
-														collection={Studios}
-														className="input text-input input-l"
-													></EditAttribute>
-													<span className="text-s dimmed field-hint">
-														{t(
-															'(Optional) A name/identifier of the local network where the share is located, leave empty if globally accessible'
-														)}
-													</span>
-												</label>
-											</>
-										) : accessor.type === Accessor.AccessType.HTTP_PROXY ? (
-											<>
-												<label className="field">
-													<LabelActual label={t('Base URL')} />
-													<EditAttribute
-														modifiedClassName="bghl"
-														attribute={`packageContainers.${containerId}.container.accessors.${accessorId}.baseUrl`}
-														obj={this.props.studio}
-														type="text"
-														collection={Studios}
-														className="input text-input input-l"
-													></EditAttribute>
-													<span className="text-s dimmed field-hint">
-														{t('Base url to the resource (example: http://myserver/folder)')}
-													</span>
-												</label>
-
-												<label className="field">
-													<LabelActual label={t('Network Id')} />
-													<EditAttribute
-														modifiedClassName="bghl"
-														attribute={`packageContainers.${containerId}.container.accessors.${accessorId}.networkId`}
-														obj={this.props.studio}
-														type="text"
-														collection={Studios}
-														className="input text-input input-l"
-													></EditAttribute>
-													<span className="text-s dimmed field-hint">
-														{t(
-															'(Optional) A name/identifier of the local network where the share is located, leave empty if globally accessible'
-														)}
-													</span>
-												</label>
-											</>
-										) : accessor.type === Accessor.AccessType.FILE_SHARE ? (
-											<>
-												<label className="field">
-													<LabelActual label={t('Base URL')} />
-													<EditAttribute
-														modifiedClassName="bghl"
-														attribute={`packageContainers.${containerId}.container.accessors.${accessorId}.folderPath`}
-														obj={this.props.studio}
-														type="text"
-														collection={Studios}
-														className="input text-input input-l"
-													></EditAttribute>
-													<span className="text-s dimmed field-hint">{t('Folder path to shared folder')}</span>
-												</label>
-												<label className="field">
-													<LabelActual label={t('UserName')} />
-													<EditAttribute
-														modifiedClassName="bghl"
-														attribute={`packageContainers.${containerId}.container.accessors.${accessorId}.userName`}
-														obj={this.props.studio}
-														type="text"
-														collection={Studios}
-														className="input text-input input-l"
-													></EditAttribute>
-													<span className="text-s dimmed field-hint">{t('Username for athuentication')}</span>
-												</label>
-												<label className="field">
-													<LabelActual label={t('Password')} />
-													<EditAttribute
-														modifiedClassName="bghl"
-														attribute={`packageContainers.${containerId}.container.accessors.${accessorId}.password`}
-														obj={this.props.studio}
-														type="text"
-														collection={Studios}
-														className="input text-input input-l"
-													></EditAttribute>
-													<span className="text-s dimmed field-hint">{t('Password for authentication')}</span>
-												</label>
-												<label className="field">
-													<LabelActual label={t('Network Id')} />
-													<EditAttribute
-														modifiedClassName="bghl"
-														attribute={`packageContainers.${containerId}.container.accessors.${accessorId}.networkId`}
-														obj={this.props.studio}
-														type="text"
-														collection={Studios}
-														className="input text-input input-l"
-													></EditAttribute>
-													<span className="text-s dimmed field-hint">
-														{t('(Optional) A name/identifier of the local network where the share is located')}
-													</span>
-												</label>
-											</>
-										) : accessor.type === Accessor.AccessType.QUANTEL ? (
-											<>
-												<label className="field">
-													<LabelActual label={t('Quantel gateway URL')} />
-													<EditAttribute
-														modifiedClassName="bghl"
-														attribute={`packageContainers.${containerId}.container.accessors.${accessorId}.quantelGatewayUrl`}
-														obj={this.props.studio}
-														type="text"
-														collection={Studios}
-														className="input text-input input-l"
-													></EditAttribute>
-													<span className="text-s dimmed field-hint">{t('URL to the Quantel Gateway')}</span>
-												</label>
-												<label className="field">
-													<LabelActual label={t('ISA URLs')} />
-													<EditAttribute
-														modifiedClassName="bghl"
-														attribute={`packageContainers.${containerId}.container.accessors.${accessorId}.ISAUrls`}
-														obj={this.props.studio}
-														type="array"
-														arrayType="string"
-														collection={Studios}
-														className="input text-input input-l"
-													></EditAttribute>
-													<span className="text-s dimmed field-hint">
-														{t('URLs to the ISAs, in order of importance (comma separated)')}
-													</span>
-												</label>
-												<label className="field">
-													<LabelActual label={t('Zone ID')} />
-													<EditAttribute
-														modifiedClassName="bghl"
-														attribute={`packageContainers.${containerId}.container.accessors.${accessorId}.zoneId`}
-														obj={this.props.studio}
-														type="text"
-														collection={Studios}
-														className="input text-input input-l"
-													></EditAttribute>
-													<span className="text-s dimmed field-hint">{t('Zone ID (default value: "default")')}</span>
-												</label>
-												<label className="field">
-													<LabelActual label={t('Server ID')} />
-													<EditAttribute
-														modifiedClassName="bghl"
-														attribute={`packageContainers.${containerId}.container.accessors.${accessorId}.serverId`}
-														obj={this.props.studio}
-														type="int"
-														collection={Studios}
-														className="input text-input input-l"
-													></EditAttribute>
-													<span className="text-s dimmed field-hint">
-														{t(
-															'Server ID. For sources, this should generally be omitted (or set to 0) so clip-searches are zone-wide. If set, clip-searches are limited to that server.'
-														)}
-													</span>
-												</label>
-
-												<label className="field">
-													<LabelActual label={t('Quantel transformer URL')} />
-													<EditAttribute
-														modifiedClassName="bghl"
-														attribute={`packageContainers.${containerId}.container.accessors.${accessorId}.transformerURL`}
-														obj={this.props.studio}
-														type="text"
-														collection={Studios}
-														className="input text-input input-l"
-													></EditAttribute>
-													<span className="text-s dimmed field-hint">{t('URL to the Quantel HTTP transformer')}</span>
-												</label>
-
-												<label className="field">
-													<LabelActual label={t('Quantel FileFlow URL')} />
-													<EditAttribute
-														modifiedClassName="bghl"
-														attribute={`packageContainers.${containerId}.container.accessors.${accessorId}.fileflowURL`}
-														obj={this.props.studio}
-														type="text"
-														collection={Studios}
-														className="input text-input input-l"
-													></EditAttribute>
-													<span className="text-s dimmed field-hint">{t('URL to the Quantel FileFlow Manager')}</span>
-												</label>
-
-												<label className="field">
-													<LabelActual label={t('Quantel FileFlow Profile name')} />
-													<EditAttribute
-														modifiedClassName="bghl"
-														attribute={`packageContainers.${containerId}.container.accessors.${accessorId}.fileflowProfile`}
-														obj={this.props.studio}
-														type="text"
-														collection={Studios}
-														className="input text-input input-l"
-													></EditAttribute>
-													<span className="text-s dimmed field-hint">
-														{t('Profile name to be used by FileFlow when exporting the clips')}
-													</span>
-												</label>
-											</>
-										) : null}
-
-										<label className="field">
-											<LabelActual label={t('Allow Read access')} />
-											<EditAttribute
-												modifiedClassName="bghl"
-												attribute={`packageContainers.${containerId}.container.accessors.${accessorId}.allowRead`}
-												obj={this.props.studio}
-												type="checkbox"
-												collection={Studios}
-												className="input"
-											></EditAttribute>
-											<span className="text-s dimmed field-hint">{t('')}</span>
-										</label>
-
-										<label className="field">
-											<LabelActual label={t('Allow Write access')} />
-											<EditAttribute
-												modifiedClassName="bghl"
-												attribute={`packageContainers.${containerId}.container.accessors.${accessorId}.allowWrite`}
-												obj={this.props.studio}
-												type="checkbox"
-												collection={Studios}
-												className="input"
-											></EditAttribute>
-											<span className="text-s dimmed field-hint">{t('')}</span>
-										</label>
-									</div>
-									<div className="mod">
-										<button
-											className="btn btn-primary right"
-											onClick={() => this.finishEditAccessor(containerId, accessorId)}
-										>
-											<FontAwesomeIcon icon={faCheck} />
-										</button>
-									</div>
-								</td>
-							</tr>
-						)}
-					</React.Fragment>
-				)
-			})
-		}
-		getAvailablePackageContainers() {
-			const arr: {
-				name: string
-				value: string
-			}[] = []
-
-			for (const [containerId, packageContainer] of Object.entries<StudioPackageContainer>(
-				this.props.studio.packageContainers
-			)) {
-				let hasHttpAccessor = false
-				for (const accessor of Object.values<Accessor.Any>(packageContainer.container.accessors)) {
-					if (accessor.type === Accessor.AccessType.HTTP_PROXY) {
-						hasHttpAccessor = true
-						break
-					}
-				}
-				if (hasHttpAccessor) {
-					arr.push({
-						name: packageContainer.container.label,
-						value: containerId,
-					})
-				}
-			}
-			return arr
-		}
-
-		render(): JSX.Element {
-			const { t } = this.props
-			return (
-				<div>
-					<h2 className="mhn mbs">{t('Package Manager')}</h2>
-
-					<div className="settings-studio-package-containers">
-						<h3 className="mhn">{t('Studio Settings')}</h3>
-
-						<div>
-							<div className="field mvs">
-								<label>{t('Package Containers to use for previews')}</label>
-								<div className="mdi">
-									<EditAttribute
-										attribute="previewContainerIds"
-										obj={this.props.studio}
-										options={this.getAvailablePackageContainers()}
-										label={t('Click to show available Package Containers')}
-										type="multiselect"
-										collection={Studios}
-									></EditAttribute>
-								</div>
-							</div>
-							<div className="field mvs">
-								<label>{t('Package Containers to use for thumbnails')}</label>
-								<div className="mdi">
-									<EditAttribute
-										attribute="thumbnailContainerIds"
-										obj={this.props.studio}
-										options={this.getAvailablePackageContainers()}
-										label={t('Click to show available Package Containers')}
-										type="multiselect"
-										collection={Studios}
-									></EditAttribute>
-								</div>
-							</div>
-						</div>
-
-						<h3 className="mhn">{t('Package Containers')}</h3>
-						<table className="table expando settings-studio-package-containers-table">
-							<tbody>{this.renderPackageContainers()}</tbody>
-						</table>
-						<div className="mod mhs">
-							<button className="btn btn-primary" onClick={() => this.addNewPackageContainer()}>
-								<FontAwesomeIcon icon={faPlus} />
-							</button>
-						</div>
-					</div>
-				</div>
-			)
-		}
-	}
-)
diff --git a/meteor/client/ui/Settings/Studio/Routings.tsx b/meteor/client/ui/Settings/Studio/Routings.tsx
deleted file mode 100644
index f7839cef26..0000000000
--- a/meteor/client/ui/Settings/Studio/Routings.tsx
+++ /dev/null
@@ -1,768 +0,0 @@
-import ClassNames from 'classnames'
-import * as React from 'react'
-import { Meteor } from 'meteor/meteor'
-import * as _ from 'underscore'
-import {
-	DBStudio,
-	StudioRouteSet,
-	StudioRouteBehavior,
-	RouteMapping,
-	StudioRouteSetExclusivityGroup,
-	StudioRouteType,
-	MappingsExt,
-	MappingExt,
-} from '@sofie-automation/corelib/dist/dataModel/Studio'
-import { EditAttribute, EditAttributeBase } from '../../../lib/EditAttribute'
-import { doModalDialog } from '../../../lib/ModalDialog'
-import { Translated } from '../../../lib/ReactMeteorData/react-meteor-data'
-import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
-import { faTrash, faPencilAlt, faCheck, faPlus } from '@fortawesome/free-solid-svg-icons'
-import { withTranslation } from 'react-i18next'
-import { TSR } from '@sofie-automation/blueprints-integration'
-import { MeteorCall } from '../../../../lib/api/methods'
-import { doUserAction, UserAction } from '../../../../lib/clientUserAction'
-import { ReadonlyDeep } from 'type-fest'
-import { MappingsSettingsManifest, MappingsSettingsManifests } from './Mappings'
-import { SchemaFormForCollection } from '../../../lib/forms/SchemaFormForCollection'
-import { literal, objectPathGet } from '@sofie-automation/corelib/dist/lib'
-import { DropdownInputOption } from '../../../lib/Components/DropdownInput'
-import { JSONSchema } from '@sofie-automation/shared-lib/dist/lib/JSONSchemaTypes'
-import { Studios } from '../../../collections'
-import { LabelActual } from '../../../lib/Components/LabelAndOverrides'
-
-interface IStudioRoutingsProps {
-	translationNamespaces: string[]
-	studio: DBStudio
-	studioMappings: ReadonlyDeep<MappingsExt>
-	manifest: MappingsSettingsManifests | undefined
-}
-interface IStudioRoutingsState {
-	editedItems: Array<string>
-}
-
-export const StudioRoutings = withTranslation()(
-	class StudioRoutings extends React.Component<Translated<IStudioRoutingsProps>, IStudioRoutingsState> {
-		constructor(props: Translated<IStudioRoutingsProps>) {
-			super(props)
-
-			this.state = {
-				editedItems: [],
-			}
-		}
-		isItemEdited = (routeSetId: string) => {
-			return this.state.editedItems.indexOf(routeSetId) >= 0
-		}
-		finishEditItem = (routeSetId: string) => {
-			const index = this.state.editedItems.indexOf(routeSetId)
-			if (index >= 0) {
-				this.state.editedItems.splice(index, 1)
-				this.setState({
-					editedItems: this.state.editedItems,
-				})
-			}
-		}
-		editItem = (routeSetId: string) => {
-			if (this.state.editedItems.indexOf(routeSetId) < 0) {
-				this.state.editedItems.push(routeSetId)
-				this.setState({
-					editedItems: this.state.editedItems,
-				})
-			} else {
-				this.finishEditItem(routeSetId)
-			}
-		}
-		confirmRemoveEGroup = (eGroupId: string, exclusivityGroup: StudioRouteSetExclusivityGroup) => {
-			const { t } = this.props
-			doModalDialog({
-				title: t('Remove this Exclusivity Group?'),
-				yes: t('Remove'),
-				no: t('Cancel'),
-				onAccept: () => {
-					this.removeExclusivityGroup(eGroupId)
-				},
-				message: (
-					<React.Fragment>
-						<p>
-							{t(
-								'Are you sure you want to remove exclusivity group "{{eGroupName}}"?\nRoute Sets assigned to this group will be reset to no group.',
-								{
-									eGroupName: exclusivityGroup.name,
-								}
-							)}
-						</p>
-						<p>{t('Please note: This action is irreversible!')}</p>
-					</React.Fragment>
-				),
-			})
-		}
-		confirmRemoveRoute = (routeSetId: string, route: RouteMapping, index: number) => {
-			const { t } = this.props
-			doModalDialog({
-				title: t('Remove this Route from this Route Set?'),
-				yes: t('Remove'),
-				no: t('Cancel'),
-				onAccept: () => {
-					this.removeRouteSetRoute(routeSetId, index)
-				},
-				message: (
-					<React.Fragment>
-						<p>
-							{t('Are you sure you want to remove the Route from "{{sourceLayerId}}" to "{{newLayerId}}"?', {
-								sourceLayerId: route.mappedLayer,
-								newLayerId: route.outputMappedLayer,
-							})}
-						</p>
-						<p>{t('Please note: This action is irreversible!')}</p>
-					</React.Fragment>
-				),
-			})
-		}
-		confirmRemove = (routeSetId: string) => {
-			const { t } = this.props
-			doModalDialog({
-				title: t('Remove this Route Set?'),
-				yes: t('Remove'),
-				no: t('Cancel'),
-				onAccept: () => {
-					this.removeRouteSet(routeSetId)
-				},
-				message: (
-					<React.Fragment>
-						<p>{t('Are you sure you want to remove the Route Set "{{routeId}}"?', { routeId: routeSetId })}</p>
-						<p>{t('Please note: This action is irreversible!')}</p>
-					</React.Fragment>
-				),
-			})
-		}
-		removeExclusivityGroup = (eGroupId: string) => {
-			const unsetObject: Record<string, 1> = {}
-			_.forEach(this.props.studio.routeSets, (routeSet, routeSetId) => {
-				if (routeSet.exclusivityGroup === eGroupId) {
-					unsetObject['routeSets.' + routeSetId + '.exclusivityGroup'] = 1
-				}
-			})
-			unsetObject['routeSetExclusivityGroups.' + eGroupId] = 1
-			Studios.update(this.props.studio._id, {
-				$unset: unsetObject,
-			})
-		}
-		removeRouteSetRoute = (routeId: string, index: number) => {
-			const unsetObject: Record<string, any> = {}
-			const newRoutes = this.props.studio.routeSets[routeId].routes.slice()
-			newRoutes.splice(index, 1)
-			unsetObject['routeSets.' + routeId + '.routes'] = newRoutes
-			Studios.update(this.props.studio._id, {
-				$set: unsetObject,
-			})
-		}
-		removeRouteSet = (routeId: string) => {
-			const unsetObject: Record<string, 1> = {}
-			unsetObject['routeSets.' + routeId] = 1
-			Studios.update(this.props.studio._id, {
-				$unset: unsetObject,
-			})
-		}
-		addNewRouteInSet = (routeId: string) => {
-			const newRouteKeyName = 'newRouteSet'
-			let iter = 0
-			while ((this.props.studio.routeSets || {})[newRouteKeyName + iter]) {
-				iter++
-			}
-
-			const newRoute: RouteMapping = {
-				mappedLayer: '',
-				outputMappedLayer: '',
-				remapping: {},
-				routeType: StudioRouteType.REROUTE,
-			}
-			const setObject: Record<string, any> = {}
-			setObject['routeSets.' + routeId + '.routes'] = newRoute
-
-			Studios.update(this.props.studio._id, {
-				$push: setObject,
-			})
-		}
-		addNewRouteSet = () => {
-			// find free key name
-			const newRouteKeyName = 'newRouteSet'
-			let iter = 0
-			while ((this.props.studio.routeSets || {})[newRouteKeyName + iter]) {
-				iter++
-			}
-
-			const newRoute: StudioRouteSet = {
-				name: 'New Route Set',
-				active: false,
-				routes: [],
-				behavior: StudioRouteBehavior.TOGGLE,
-			}
-			const setObject: Record<string, any> = {}
-			setObject['routeSets.' + newRouteKeyName + iter] = newRoute
-
-			Studios.update(this.props.studio._id, {
-				$set: setObject,
-			})
-		}
-		addNewExclusivityGroup = () => {
-			const newEGroupKeyName = 'exclusivityGroup'
-			let iter = 0
-			while ((this.props.studio.routeSetExclusivityGroups || {})[newEGroupKeyName + iter]) {
-				iter++
-			}
-
-			const newGroup: StudioRouteSetExclusivityGroup = {
-				name: 'New Exclusivity Group',
-			}
-			const setObject: Record<string, any> = {}
-			setObject['routeSetExclusivityGroups.' + newEGroupKeyName + iter] = newGroup
-
-			Studios.update(this.props.studio._id, {
-				$set: setObject,
-			})
-		}
-		updateRouteSetId = (edit: EditAttributeBase, newValue: string) => {
-			const oldRouteId = edit.props.overrideDisplayValue
-			const newRouteId = newValue + ''
-			const route = this.props.studio.routeSets[oldRouteId]
-
-			if (this.props.studio.routeSets[newRouteId]) {
-				throw new Meteor.Error(400, 'Route Set "' + newRouteId + '" already exists')
-			}
-
-			const mSet: Record<string, any> = {}
-			const mUnset: Record<string, 1> = {}
-			mSet['routeSets.' + newRouteId] = route
-			mUnset['routeSets.' + oldRouteId] = 1
-
-			if (edit.props.collection) {
-				edit.props.collection.update(this.props.studio._id, {
-					$set: mSet,
-					$unset: mUnset,
-				})
-			}
-
-			this.finishEditItem(oldRouteId)
-			this.editItem(newRouteId)
-		}
-		updateExclusivityGroupId = (edit: EditAttributeBase, newValue: string) => {
-			const oldRouteId = edit.props.overrideDisplayValue
-			const newRouteId = newValue + ''
-			const route = this.props.studio.routeSetExclusivityGroups[oldRouteId]
-
-			if (this.props.studio.routeSetExclusivityGroups[newRouteId]) {
-				throw new Meteor.Error(400, 'Exclusivity Group "' + newRouteId + '" already exists')
-			}
-
-			const mSet: Record<string, any> = {}
-			const mUnset: Record<string, 1> = {}
-			mSet['routeSetExclusivityGroups.' + newRouteId] = route
-			mUnset['routeSetExclusivityGroups.' + oldRouteId] = 1
-
-			if (edit.props.collection) {
-				edit.props.collection.update(this.props.studio._id, {
-					$set: mSet,
-					$unset: mUnset,
-				})
-			}
-
-			this.finishEditItem(oldRouteId)
-			this.editItem(newRouteId)
-		}
-		updateRouteSetActive = (routeSetId: string, value: boolean) => {
-			const { t } = this.props
-			doUserAction(t, 'StudioSettings', UserAction.SWITCH_ROUTE_SET, (e, ts) =>
-				MeteorCall.userAction.switchRouteSet(e, ts, this.props.studio._id, routeSetId, value)
-			)
-		}
-
-		renderRoutes(routeSet: StudioRouteSet, routeSetId: string, manifest: MappingsSettingsManifests) {
-			const { t } = this.props
-
-			return (
-				<React.Fragment>
-					<h4 className="mod mhs">{t('Routes')}</h4>
-					{routeSet.routes.length === 0 ? (
-						<p className="text-s dimmed field-hint mhs">{t('There are no routes set up yet')}</p>
-					) : null}
-					{routeSet.routes.map((route, index) => {
-						const mappedLayer = route.mappedLayer ? this.props.studioMappings[route.mappedLayer] : undefined
-						const deviceTypeFromMappedLayer: TSR.DeviceType | undefined = mappedLayer?.device
-
-						const routeDeviceType: TSR.DeviceType | undefined =
-							route.routeType === StudioRouteType.REMAP
-								? route.deviceType
-								: route.mappedLayer
-								? deviceTypeFromMappedLayer
-								: route.deviceType
-
-						const routeMappingSchema = manifest[(routeDeviceType ?? route.remapping?.device) as TSR.DeviceType]
-
-						const rawMappingTypeOptions = Object.entries<JSONSchema>(routeMappingSchema?.mappingsSchema || {})
-						const mappingTypeOptions = rawMappingTypeOptions.map(([id, entry], i) =>
-							literal<DropdownInputOption<string | number>>({
-								value: id + '',
-								name: entry?.title ?? id + '',
-								i,
-							})
-						)
-
-						return (
-							<div className="route-sets-editor mod pan mas" key={index}>
-								<button
-									className="action-btn right mod man pas"
-									onClick={() => this.confirmRemoveRoute(routeSetId, route, index)}
-								>
-									<FontAwesomeIcon icon={faTrash} />
-								</button>
-								<div className="properties-grid">
-									<label className="field">
-										<LabelActual label={t('Original Layer')} />
-										<EditAttribute
-											modifiedClassName="bghl"
-											attribute={`routeSets.${routeSetId}.routes.${index}.mappedLayer`}
-											obj={this.props.studio}
-											type="dropdowntext"
-											options={Object.keys(this.props.studioMappings)}
-											label={t('None')}
-											collection={Studios}
-											className="input text-input input-l"
-										></EditAttribute>
-									</label>
-									<label className="field">
-										<LabelActual label={t('New Layer')} />
-										<EditAttribute
-											modifiedClassName="bghl"
-											attribute={`routeSets.${routeSetId}.routes.${index}.outputMappedLayer`}
-											obj={this.props.studio}
-											type="text"
-											collection={Studios}
-											className="input text-input input-l"
-										></EditAttribute>
-									</label>
-
-									<label className="field">
-										<LabelActual label={t('Route Type')} />
-										{!route.mappedLayer ? (
-											<span className="mls">REMAP</span>
-										) : (
-											<EditAttribute
-												modifiedClassName="bghl"
-												attribute={`routeSets.${routeSetId}.routes.${index}.routeType`}
-												obj={this.props.studio}
-												type="dropdown"
-												options={StudioRouteType}
-												optionsAreNumbers={true}
-												collection={Studios}
-												className="input text-input input-l"
-											></EditAttribute>
-										)}
-									</label>
-
-									<label className="field">
-										<LabelActual label={t('Device Type')} />
-										{route.routeType === StudioRouteType.REROUTE && route.mappedLayer ? (
-											deviceTypeFromMappedLayer !== undefined ? (
-												<span className="mls">{TSR.DeviceType[deviceTypeFromMappedLayer]}</span>
-											) : (
-												<span className="mls dimmed">{t('Source Layer not found')}</span>
-											)
-										) : (
-											<EditAttribute
-												modifiedClassName="bghl"
-												attribute={`routeSets.${routeSetId}.routes.${index}.deviceType`}
-												obj={this.props.studio}
-												type="dropdown"
-												options={TSR.DeviceType}
-												optionsAreNumbers={true}
-												collection={Studios}
-												className="input text-input input-l"
-											></EditAttribute>
-										)}
-									</label>
-
-									{mappingTypeOptions.length > 0 && (
-										<label className="field">
-											<LabelActual label={t('Mapping Type')} />
-											<EditAttribute
-												modifiedClassName="bghl"
-												attribute={`routeSets.${routeSetId}.routes.${index}.remapping.options.mappingType`}
-												obj={this.props.studio}
-												type="dropdown"
-												options={mappingTypeOptions}
-												collection={Studios}
-												className="input text-input input-l"
-											></EditAttribute>
-										</label>
-									)}
-									{route.routeType === StudioRouteType.REMAP ||
-									(routeDeviceType !== undefined && route.remapping !== undefined) ? (
-										<>
-											<label className="field">
-												<LabelActual label={t('Device ID')} />
-												<div>
-													<EditAttribute
-														modifiedClassName="bghl"
-														attribute={`routeSets.${routeSetId}.routes.${index}.remapping.deviceId`}
-														obj={this.props.studio}
-														type="checkbox"
-														collection={Studios}
-														className="mrs mvxs"
-														mutateDisplayValue={(v) => (v === undefined ? false : true)}
-														mutateUpdateValue={() => undefined}
-													/>
-													<EditAttribute
-														modifiedClassName="bghl"
-														attribute={`routeSets.${routeSetId}.routes.${index}.remapping.deviceId`}
-														obj={this.props.studio}
-														type="text"
-														collection={Studios}
-														className="input text-input input-l"
-													></EditAttribute>
-												</div>
-											</label>
-
-											<DeviceMappingSettings
-												translationNamespaces={this.props.translationNamespaces}
-												studio={this.props.studio}
-												attribute={`routeSets.${routeSetId}.routes.${index}.remapping.options`}
-												mappedLayer={mappedLayer}
-												manifest={routeMappingSchema}
-											/>
-										</>
-									) : null}
-								</div>
-							</div>
-						)
-					})}
-				</React.Fragment>
-			)
-		}
-
-		renderExclusivityGroups() {
-			const { t } = this.props
-
-			if (Object.keys(this.props.studio.routeSetExclusivityGroups).length === 0) {
-				return (
-					<tr>
-						<td className="mhn dimmed">{t('There are no exclusivity groups set up.')}</td>
-					</tr>
-				)
-			}
-
-			return _.map(
-				this.props.studio.routeSetExclusivityGroups,
-				(exclusivityGroup: StudioRouteSetExclusivityGroup, exclusivityGroupId: string) => {
-					return (
-						<React.Fragment key={exclusivityGroupId}>
-							<tr
-								className={ClassNames({
-									hl: this.isItemEdited(exclusivityGroupId),
-								})}
-							>
-								<th className="settings-studio-device__name c3">{exclusivityGroupId}</th>
-								<td className="settings-studio-device__id c5">{exclusivityGroup.name}</td>
-								<td className="settings-studio-device__id c3">
-									{
-										_.filter(
-											this.props.studio.routeSets,
-											(routeSet) => routeSet.exclusivityGroup === exclusivityGroupId
-										).length
-									}
-								</td>
-
-								<td className="settings-studio-device__actions table-item-actions c3">
-									<button className="action-btn" onClick={() => this.editItem(exclusivityGroupId)}>
-										<FontAwesomeIcon icon={faPencilAlt} />
-									</button>
-									<button
-										className="action-btn"
-										onClick={() => this.confirmRemoveEGroup(exclusivityGroupId, exclusivityGroup)}
-									>
-										<FontAwesomeIcon icon={faTrash} />
-									</button>
-								</td>
-							</tr>
-							{this.isItemEdited(exclusivityGroupId) && (
-								<tr className="expando-details hl">
-									<td colSpan={6}>
-										<div className="properties-grid">
-											<label className="field">
-												<LabelActual label={t('Exclusivity Group ID')} />
-												<EditAttribute
-													modifiedClassName="bghl"
-													attribute={'routeSetExclusivityGroups'}
-													overrideDisplayValue={exclusivityGroupId}
-													obj={this.props.studio}
-													type="text"
-													collection={Studios}
-													updateFunction={this.updateExclusivityGroupId}
-													className="input text-input input-l"
-												></EditAttribute>
-											</label>
-											<label className="field">
-												<LabelActual label={t('Exclusivity Group Name')} />
-												<EditAttribute
-													modifiedClassName="bghl"
-													attribute={'routeSetExclusivityGroups.' + exclusivityGroupId + '.name'}
-													obj={this.props.studio}
-													type="text"
-													collection={Studios}
-													className="input text-input input-l"
-												></EditAttribute>
-												<span className="text-s dimmed field-hint">{t('Display name of the Exclusivity Group')}</span>
-											</label>
-										</div>
-										<div className="mod alright">
-											<button className="btn btn-primary" onClick={() => this.finishEditItem(exclusivityGroupId)}>
-												<FontAwesomeIcon icon={faCheck} />
-											</button>
-										</div>
-									</td>
-								</tr>
-							)}
-						</React.Fragment>
-					)
-				}
-			)
-		}
-
-		renderRouteSets(manifest: MappingsSettingsManifests) {
-			const { t } = this.props
-
-			const DEFAULT_ACTIVE_OPTIONS = {
-				[t('Active')]: true,
-				[t('Not Active')]: false,
-				[t('Not defined')]: undefined,
-			}
-
-			if (Object.keys(this.props.studio.routeSets).length === 0) {
-				return (
-					<tr>
-						<td className="mhn dimmed">{t('There are no Route Sets set up.')}</td>
-					</tr>
-				)
-			}
-
-			return _.map(this.props.studio.routeSets, (routeSet: StudioRouteSet, routeId: string) => {
-				return (
-					<React.Fragment key={routeId}>
-						<tr
-							className={ClassNames({
-								hl: this.isItemEdited(routeId),
-							})}
-						>
-							<th className="settings-studio-device__name c2">{routeId}</th>
-							<td className="settings-studio-device__id c3">{routeSet.name}</td>
-							<td className="settings-studio-device__id c4">{routeSet.exclusivityGroup}</td>
-							<td className="settings-studio-device__id c2">{routeSet.routes.length}</td>
-							<td className="settings-studio-device__id c2">
-								{routeSet.active ? <span className="pill">{t('Active')}</span> : null}
-							</td>
-
-							<td className="settings-studio-device__actions table-item-actions c3">
-								<button className="action-btn" onClick={() => this.editItem(routeId)}>
-									<FontAwesomeIcon icon={faPencilAlt} />
-								</button>
-								<button className="action-btn" onClick={() => this.confirmRemove(routeId)}>
-									<FontAwesomeIcon icon={faTrash} />
-								</button>
-							</td>
-						</tr>
-						{this.isItemEdited(routeId) && (
-							<tr className="expando-details hl">
-								<td colSpan={6}>
-									<div className="properties-grid">
-										<label className="field">
-											<LabelActual label={t('Route Set ID')} />
-											<EditAttribute
-												modifiedClassName="bghl"
-												attribute={'routeSets'}
-												overrideDisplayValue={routeId}
-												obj={this.props.studio}
-												type="text"
-												collection={Studios}
-												updateFunction={this.updateRouteSetId}
-												className="input text-input input-l"
-											></EditAttribute>
-										</label>
-										<label className="field">
-											<LabelActual label={t('Active')} />
-											<EditAttribute
-												modifiedClassName="bghl"
-												attribute={`routeSets.${routeId}.active`}
-												obj={this.props.studio}
-												type="checkbox"
-												collection={Studios}
-												updateFunction={(_ctx, value) => this.updateRouteSetActive(routeId, value)}
-												disabled={routeSet.behavior === StudioRouteBehavior.ACTIVATE_ONLY && routeSet.active}
-												className=""
-											></EditAttribute>
-											<span className="mlm text-s dimmed field-hint">{t('Is this Route Set currently active')}</span>
-										</label>
-										<label className="field">
-											<LabelActual label={t('Default State')} />
-											<EditAttribute
-												modifiedClassName="bghl"
-												attribute={`routeSets.${routeId}.defaultActive`}
-												obj={this.props.studio}
-												type="dropdown"
-												collection={Studios}
-												options={DEFAULT_ACTIVE_OPTIONS}
-												className="input text-input input-l"
-											></EditAttribute>
-											<span className="mlm text-s dimmed field-hint">{t('The default state of this Route Set')}</span>
-										</label>
-
-										<label className="field">
-											<LabelActual label={t('Route Set Name')} />
-											<EditAttribute
-												modifiedClassName="bghl"
-												attribute={`routeSets.${routeId}.name`}
-												obj={this.props.studio}
-												type="text"
-												collection={Studios}
-												className="input text-input input-l"
-											></EditAttribute>
-											<span className="text-s dimmed field-hint">{t('Display name of the Route Set')}</span>
-										</label>
-
-										<label className="field">
-											<LabelActual label={t('Exclusivity group')} />
-											<div>
-												<EditAttribute
-													modifiedClassName="bghl"
-													attribute={`routeSets.${routeId}.exclusivityGroup`}
-													obj={this.props.studio}
-													type="checkbox"
-													className="mrs mvxs"
-													collection={Studios}
-													mutateDisplayValue={(v) => (v === undefined ? false : true)}
-													mutateUpdateValue={() => undefined}
-												/>
-												<EditAttribute
-													modifiedClassName="bghl"
-													attribute={`routeSets.${routeId}.exclusivityGroup`}
-													obj={this.props.studio}
-													type="dropdown"
-													options={Object.keys(this.props.studio.routeSetExclusivityGroups)}
-													mutateDisplayValue={(v) => (v === undefined ? 'None' : v)}
-													collection={Studios}
-													className="input text-input input-l"
-												></EditAttribute>
-											</div>
-											<span className="text-s dimmed field-hint">
-												{t('If set, only one Route Set will be active per exclusivity group')}
-											</span>
-										</label>
-
-										<label className="field">
-											<LabelActual label={t('Behavior')} />
-											<EditAttribute
-												modifiedClassName="bghl"
-												attribute={`routeSets.${routeId}.behavior`}
-												obj={this.props.studio}
-												type="dropdown"
-												options={StudioRouteBehavior}
-												optionsAreNumbers={true}
-												collection={Studios}
-												className="input text-input input-l"
-											></EditAttribute>
-											<span className="text-s dimmed field-hint">
-												{t('The way this Route Set should behave towards the user')}
-											</span>
-										</label>
-									</div>
-									{this.renderRoutes(routeSet, routeId, manifest)}
-									<div className="mod">
-										<button className="btn btn-primary right" onClick={() => this.finishEditItem(routeId)}>
-											<FontAwesomeIcon icon={faCheck} />
-										</button>
-										<button className="btn btn-secondary" onClick={() => this.addNewRouteInSet(routeId)}>
-											<FontAwesomeIcon icon={faPlus} />
-										</button>
-									</div>
-								</td>
-							</tr>
-						)}
-					</React.Fragment>
-				)
-			})
-		}
-
-		render(): JSX.Element {
-			const { t } = this.props
-			return (
-				<div>
-					<h2 className="mhn mbs">{t('Route Sets')}</h2>
-					{!this.props.manifest && (
-						<span>{t('Add a playout device to the studio in order to configure the route sets')}</span>
-					)}
-					{this.props.manifest && (
-						<React.Fragment>
-							<p className="mhn mvs text-s dimmed field-hint">
-								{t(
-									'Controls for exposed Route Sets will be displayed to the producer within the Rundown View in the Switchboard.'
-								)}
-							</p>
-							<h3 className="mhn">{t('Exclusivity Groups')}</h3>
-							<table className="expando settings-studio-mappings-table">
-								<tbody>{this.renderExclusivityGroups()}</tbody>
-							</table>
-							<div className="mod mhs">
-								<button className="btn btn-primary" onClick={() => this.addNewExclusivityGroup()}>
-									<FontAwesomeIcon icon={faPlus} />
-								</button>
-							</div>
-							<h3 className="mhn">{t('Route Sets')}</h3>
-							<table className="expando settings-studio-mappings-table">
-								<tbody>{this.renderRouteSets(this.props.manifest)}</tbody>
-							</table>
-							<div className="mod mhs">
-								<button className="btn btn-primary" onClick={() => this.addNewRouteSet()}>
-									<FontAwesomeIcon icon={faPlus} />
-								</button>
-							</div>
-						</React.Fragment>
-					)}
-				</div>
-			)
-		}
-	}
-)
-
-interface IDeviceMappingSettingsProps {
-	translationNamespaces: string[]
-	studio: DBStudio
-	attribute: string
-	manifest: MappingsSettingsManifest | undefined
-	mappedLayer: ReadonlyDeep<MappingExt> | undefined
-}
-
-function DeviceMappingSettings({
-	translationNamespaces,
-	attribute,
-	manifest,
-	studio,
-	mappedLayer,
-}: IDeviceMappingSettingsProps) {
-	const routeRemapping = objectPathGet(studio, attribute)
-
-	const mappingType = routeRemapping?.mappingType ?? mappedLayer?.options?.mappingType
-	const mappingSchema = manifest?.mappingsSchema?.[mappingType]
-
-	if (mappingSchema && routeRemapping) {
-		return (
-			<SchemaFormForCollection
-				schema={mappingSchema}
-				object={routeRemapping}
-				basePath={attribute}
-				translationNamespaces={translationNamespaces}
-				collection={Studios}
-				objectId={studio._id}
-				partialOverridesForObject={mappedLayer}
-			/>
-		)
-	} else {
-		return null
-	}
-}
diff --git a/meteor/client/ui/Shelf/AdLibListItem.tsx b/meteor/client/ui/Shelf/AdLibListItem.tsx
deleted file mode 100644
index 3f31a479c8..0000000000
--- a/meteor/client/ui/Shelf/AdLibListItem.tsx
+++ /dev/null
@@ -1,86 +0,0 @@
-import * as React from 'react'
-import ClassNames from 'classnames'
-import { ISourceLayer, IOutputLayer, IBlueprintActionTriggerMode } from '@sofie-automation/blueprints-integration'
-import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
-import { unprotectString } from '../../../lib/lib'
-import renderItem from './Renderers/ItemRendererFactory'
-import { withMediaObjectStatus } from '../SegmentTimeline/withMediaObjectStatus'
-import { ContextMenuTrigger } from '@jstarpl/react-contextmenu'
-import { contextMenuHoldToDisplayTime } from '../../lib/lib'
-import { setShelfContextMenuContext, ContextType as MenuContextType } from './ShelfContextMenu'
-import { AdLibPieceUi } from '../../lib/shelf'
-import { UIStudio } from '../../../lib/api/studios'
-
-export interface IAdLibListItem extends AdLibPieceUi {
-	sourceLayer?: ISourceLayer
-	outputLayer?: IOutputLayer
-	isHidden?: boolean
-	invalid?: boolean
-	floated?: boolean
-}
-
-interface IListViewItemProps {
-	piece: IAdLibListItem
-	studio: UIStudio
-	layer: ISourceLayer | undefined
-	selected: boolean
-	disabled?: boolean
-	onSelectAdLib?: (aSLine: IAdLibListItem) => void
-	onToggleAdLib?: (aSLine: IAdLibListItem, queue: boolean, context: any, mode?: IBlueprintActionTriggerMode) => void
-	playlist: DBRundownPlaylist
-}
-
-export const AdLibListItem = withMediaObjectStatus<IListViewItemProps, {}>()(
-	class AdLibListItem extends React.Component<IListViewItemProps> {
-		constructor(props: IListViewItemProps) {
-			super(props)
-		}
-
-		render(): JSX.Element {
-			return (
-				<ContextMenuTrigger
-					id="shelf-context-menu"
-					attributes={{
-						className: ClassNames('adlib-panel__list-view__list__segment__item', {
-							selected: this.props.selected,
-							invalid: this.props.piece.invalid,
-							floated: this.props.piece.floated,
-							disabled: this.props.disabled,
-						}),
-						//@ts-expect-error React.HTMLAttributes does not list data attributes, but that's fine
-						'data-obj-id': this.props.piece._id,
-						onClick: () => this.props.onSelectAdLib && this.props.onSelectAdLib(this.props.piece),
-						onContextMenu: () => this.props.onSelectAdLib && this.props.onSelectAdLib(this.props.piece),
-						onDoubleClick: (e) =>
-							!this.props.disabled &&
-							this.props.onToggleAdLib &&
-							this.props.onToggleAdLib(this.props.piece, e.shiftKey, e),
-					}}
-					collect={() =>
-						setShelfContextMenuContext({
-							type: MenuContextType.ADLIB,
-							details: {
-								adLib: this.props.piece,
-								onToggle: !this.props.disabled ? this.props.onToggleAdLib : undefined,
-								disabled: this.props.disabled,
-							},
-						})
-					}
-					holdToDisplay={contextMenuHoldToDisplayTime()}
-					renderTag="tr"
-					key={unprotectString(this.props.piece._id)}
-				>
-					{renderItem({
-						adLibListItem: this.props.piece,
-						layer: this.props.layer,
-						outputLayer: this.props.piece.outputLayer,
-						selected: this.props.selected,
-						status: this.props.piece.contentStatus?.status,
-						messages: this.props.piece.contentStatus?.messages,
-						studio: this.props.studio,
-					})}
-				</ContextMenuTrigger>
-			)
-		}
-	}
-)
diff --git a/meteor/client/ui/Shelf/BucketPieceButton.tsx b/meteor/client/ui/Shelf/BucketPieceButton.tsx
deleted file mode 100644
index b95eb66464..0000000000
--- a/meteor/client/ui/Shelf/BucketPieceButton.tsx
+++ /dev/null
@@ -1,138 +0,0 @@
-import { IDashboardButtonProps, DashboardPieceButtonBase } from './DashboardPieceButton'
-
-import {
-	DragSource,
-	DropTarget,
-	ConnectDragSource,
-	ConnectDropTarget,
-	DragSourceMonitor,
-	DropTargetMonitor,
-	ConnectDragPreview,
-	ConnectableElement,
-} from 'react-dnd'
-import { DragDropItemTypes } from '../DragDropItemTypes'
-import { BucketAdLib } from '@sofie-automation/corelib/dist/dataModel/BucketAdLibPiece'
-import { withMediaObjectStatus } from '../SegmentTimeline/withMediaObjectStatus'
-import { BucketAdLibActionUi, BucketAdLibItem } from './RundownViewBuckets'
-import { IBlueprintActionTriggerMode } from '@sofie-automation/blueprints-integration'
-import { BucketId, PieceId } from '@sofie-automation/corelib/dist/dataModel/Ids'
-
-type IDashboardButtonPropsCombined = BucketPieceButtonBaseProps & IDashboardButtonProps
-
-interface IBucketPieceDragObject {
-	id: PieceId
-	bucketId: BucketId
-	originalIndex: number
-}
-
-export interface IBucketPieceDropResult {
-	index: number
-	bucketId: BucketId
-	action: 'reorder' | 'move' | undefined
-}
-
-const buttonSource = {
-	beginDrag(props: IDashboardButtonPropsCombined, _monitor: DragSourceMonitor, _component: any) {
-		return {
-			id: props.piece._id,
-			originalIndex: props.findAdLib(props.piece._id).index,
-			bucketId: props.bucketId,
-		}
-	},
-
-	endDrag(
-		props: IDashboardButtonPropsCombined,
-		monitor: DragSourceMonitor<IBucketPieceDragObject, IBucketPieceDropResult>
-	) {
-		const { id: droppedId, originalIndex } = monitor.getItem()
-		const didDrop = monitor.didDrop()
-
-		if (!didDrop) {
-			props.moveAdLib(droppedId, originalIndex)
-		} else {
-			const dropResult = monitor.getDropResult()
-			if (!dropResult) return
-
-			const { action } = dropResult
-			if (action === 'reorder') {
-				const { index: newIndex } = props.findAdLib(droppedId)
-				props.onAdLibReorder(droppedId, newIndex, originalIndex)
-			} else if (action === 'move') {
-				const { bucketId } = dropResult
-				props.onAdLibMove(droppedId, bucketId)
-			}
-		}
-	},
-}
-
-const buttonTarget = {
-	canDrop(_props: IDashboardButtonPropsCombined, _monitor: DropTargetMonitor) {
-		return true
-	},
-
-	hover(
-		props: IDashboardButtonPropsCombined,
-		monitor: DropTargetMonitor<IBucketPieceDragObject, IBucketPieceDropResult>,
-		_component: any
-	) {
-		const { id: draggedId } = monitor.getItem()
-		const overId = props.piece._id
-
-		if (draggedId !== overId) {
-			const { index: overIndex } = props.findAdLib(overId)
-			props.moveAdLib(draggedId, overIndex)
-		}
-	},
-
-	drop(props: IDashboardButtonPropsCombined, _monitor: DropTargetMonitor) {
-		const { index } = props.findAdLib(props.piece._id)
-
-		return {
-			index,
-			action: 'reorder',
-		}
-	},
-}
-
-export interface BucketPieceButtonBaseProps {
-	moveAdLib: (id: PieceId, atIndex: number) => void
-	findAdLib: (id: PieceId) => { piece: BucketAdLib | BucketAdLibActionUi | undefined; index: number }
-	onAdLibReorder: (draggedId: PieceId, newIndex: number, oldIndex: number) => void
-	onAdLibMove: (id: PieceId, newBucketId: BucketId) => void
-	bucketId: BucketId
-	onToggleAdLib: (piece: BucketAdLibItem, queue: boolean, e: any, mode?: IBlueprintActionTriggerMode) => void
-}
-
-interface ButtonSourceCollectedProps {
-	connectDragSource: ConnectDragSource
-	connectDragPreview: ConnectDragPreview
-	isDragging: boolean
-}
-
-interface ButtonTargetCollectedProps {
-	connectDropTarget: ConnectDropTarget
-}
-
-class BucketPieceButtonBase extends DashboardPieceButtonBase<ButtonSourceCollectedProps & ButtonTargetCollectedProps> {
-	inBucket = true
-	render(): JSX.Element {
-		const { connectDragSource, connectDropTarget } = this.props
-
-		return connectDropTarget(connectDragSource(super.render() as ConnectableElement)) as JSX.Element
-	}
-}
-
-export const BucketPieceButton = withMediaObjectStatus<
-	React.PropsWithChildren<IDashboardButtonProps> & BucketPieceButtonBaseProps,
-	{}
->()(
-	DropTarget(DragDropItemTypes.BUCKET_ADLIB_PIECE, buttonTarget, (connect) => ({
-		connectDropTarget: connect.dropTarget(),
-	}))(
-		DragSource(DragDropItemTypes.BUCKET_ADLIB_PIECE, buttonSource, (connect, monitor) => ({
-			connectDragSource: connect.dragSource(),
-			connectDragPreview: connect.dragPreview(),
-			isDragging: monitor.isDragging(),
-		}))(BucketPieceButtonBase)
-	) as any
-)
diff --git a/meteor/client/ui/Status/SystemStatus.tsx b/meteor/client/ui/Status/SystemStatus.tsx
deleted file mode 100644
index 569f034890..0000000000
--- a/meteor/client/ui/Status/SystemStatus.tsx
+++ /dev/null
@@ -1,687 +0,0 @@
-import * as React from 'react'
-import { Translated, useSubscription, useTracker } from '../../lib/ReactMeteorData/react-meteor-data'
-import {
-	PeripheralDevice,
-	PeripheralDeviceType,
-	PERIPHERAL_SUBTYPE_PROCESS,
-} from '@sofie-automation/corelib/dist/dataModel/PeripheralDevice'
-import * as reacti18next from 'react-i18next'
-import * as i18next from 'i18next'
-import Moment from 'react-moment'
-import { assertNever, getCurrentTime, protectString, unprotectString } from '../../../lib/lib'
-import { Link } from 'react-router-dom'
-import Tooltip from 'rc-tooltip'
-import { faTrash, faEye } from '@fortawesome/free-solid-svg-icons'
-import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
-import * as _ from 'underscore'
-import { doModalDialog } from '../../lib/ModalDialog'
-import { callPeripheralDeviceAction, PeripheralDevicesAPI } from '../../lib/clientAPI'
-import { NotificationCenter, NoticeLevel, Notification } from '../../../lib/notifications/notifications'
-import { getAllowConfigure, getAllowDeveloper, getAllowStudio, getHelpMode } from '../../lib/localStorage'
-import ClassNames from 'classnames'
-import { StatusCode, TSR } from '@sofie-automation/blueprints-integration'
-import { ICoreSystem } from '../../../lib/collections/CoreSystem'
-import { StatusResponse } from '../../../lib/api/systemStatus'
-import { doUserAction, UserAction } from '../../../lib/clientUserAction'
-import { MeteorCall } from '../../../lib/api/methods'
-import { hashSingleUseToken } from '../../../lib/api/userActions'
-import { DEFAULT_TSR_ACTION_TIMEOUT_TIME } from '@sofie-automation/shared-lib/dist/core/constants'
-import { SubdeviceAction } from '@sofie-automation/shared-lib/dist/core/deviceConfigManifest'
-import { StatusCodePill } from './StatusCodePill'
-import { isTranslatableMessage, translateMessage } from '@sofie-automation/corelib/dist/TranslatableMessage'
-import { i18nTranslator } from '../i18n'
-import { SchemaFormInPlace } from '../../lib/forms/SchemaFormInPlace'
-import { CoreSystem, PeripheralDevices } from '../../collections'
-import { PeripheralDeviceId } from '@sofie-automation/shared-lib/dist/core/model/Ids'
-import { DebugStateTable } from './DebugState'
-import { JSONBlobParse } from '@sofie-automation/shared-lib/dist/lib/JSONBlob'
-import { ClientAPI } from '../../../lib/api/client'
-import { catchError } from '../../lib/lib'
-import { logger } from '../../../lib/logging'
-import { CorelibPubSub } from '@sofie-automation/corelib/dist/pubsub'
-
-interface IDeviceItemProps {
-	parentDevice: PeripheralDevice | null
-	device: PeripheralDevice
-	showRemoveButtons?: boolean
-	hasChildren?: boolean
-
-	debugState: object | undefined
-}
-interface IDeviceItemState {}
-
-export function statusCodeToString(t: i18next.TFunction, statusCode: StatusCode): string {
-	switch (statusCode) {
-		case StatusCode.UNKNOWN:
-			return t('Unknown')
-		case StatusCode.GOOD:
-			return t('Good')
-		case StatusCode.WARNING_MINOR:
-			return t('Minor Warning')
-		case StatusCode.WARNING_MAJOR:
-			return t('Warning')
-		case StatusCode.BAD:
-			return t('Bad')
-		case StatusCode.FATAL:
-			return t('Fatal')
-		default:
-			assertNever(statusCode)
-			return t('Unknown')
-	}
-}
-
-export const DeviceItem = reacti18next.withTranslation()(
-	class DeviceItem extends React.Component<Translated<IDeviceItemProps>, IDeviceItemState> {
-		deviceTypeString() {
-			const t = this.props.t
-
-			switch (this.props.device.type) {
-				case PeripheralDeviceType.MOS:
-					return t('MOS Gateway')
-				case PeripheralDeviceType.PLAYOUT:
-					return t('Play-out Gateway')
-				case PeripheralDeviceType.MEDIA_MANAGER:
-					return t('Media Manager')
-				case PeripheralDeviceType.LIVE_STATUS:
-					return t('Live Status Gateway')
-				default:
-					return t('Unknown Device')
-			}
-		}
-		deviceVersions() {
-			const versions = this.props.device.versions
-			if (versions) {
-				return _.map(versions, (version, packageName) => {
-					return packageName + ': ' + version
-				}).join('\n')
-			}
-		}
-		onToggleIgnore(device: PeripheralDevice) {
-			PeripheralDevices.update(device._id, {
-				$set: {
-					ignore: !device.ignore,
-				},
-			})
-		}
-		onExecuteAction(event: any, device: PeripheralDevice, action: SubdeviceAction) {
-			const { t } = this.props
-			const namespaces = ['peripheralDevice_' + device._id]
-
-			const processResponse = (r: TSR.ActionExecutionResult) => {
-				if (r?.result === TSR.ActionExecutionResultCode.Error) {
-					throw new Error(
-						r.response && isTranslatableMessage(r.response)
-							? translateMessage(r.response, i18nTranslator)
-							: t('Unknown error')
-					)
-				}
-				NotificationCenter.push(
-					new Notification(
-						undefined,
-						NoticeLevel.NOTIFICATION,
-						r?.response && isTranslatableMessage(r.response)
-							? t('Executed {{actionName}} on device "{{deviceName}}": {{response}}', {
-									actionName: action.name,
-									deviceName: device.name,
-									response: translateMessage(r.response, i18nTranslator),
-							  })
-							: t('Executed {{actionName}} on device "{{deviceName}}"...', {
-									actionName: action.name,
-									deviceName: device.name,
-							  }),
-						'SystemStatus'
-					)
-				)
-			}
-			const processError = (err: any) => {
-				NotificationCenter.push(
-					new Notification(
-						undefined,
-						NoticeLevel.WARNING,
-						t('Failed to execute {{actionName}} on device: "{{deviceName}}": {{errorMessage}}', {
-							actionName: action.name,
-							deviceName: device.name,
-							errorMessage: err,
-						}),
-						'SystemStatus'
-					)
-				)
-			}
-
-			if (action.destructive || action.payload) {
-				const payload = {}
-				doModalDialog({
-					title: translateMessage({ key: action.name, namespaces }, i18nTranslator),
-					yes: t('Execute'),
-					no: t('Cancel'),
-					message: action.payload ? (
-						<SchemaFormInPlace
-							schema={JSONBlobParse(action.payload)}
-							object={payload}
-							translationNamespaces={namespaces}
-						/>
-					) : (
-						t('Do you want to execute {{actionName}}? This may the disrupt the output', { actionName: action.name })
-					),
-					onAccept: (event: any) => {
-						callPeripheralDeviceAction(
-							event,
-							device._id,
-							action.timeout || DEFAULT_TSR_ACTION_TIMEOUT_TIME,
-							action.id,
-							payload
-						)
-							.then(processResponse)
-							.catch(processError)
-					},
-				})
-			} else {
-				callPeripheralDeviceAction(event, device._id, action.timeout || DEFAULT_TSR_ACTION_TIMEOUT_TIME, action.id)
-					.then(processResponse)
-					.catch(processError)
-			}
-		}
-
-		render(): JSX.Element {
-			const { t } = this.props
-
-			const namespaces = ['peripheralDevice_' + this.props.device._id]
-
-			const configManifest = (this.props.parentDevice ?? this.props.device)?.configManifest?.subdeviceManifest?.[
-				this.props.device.subType
-			]
-
-			return (
-				<div key={unprotectString(this.props.device._id)} className="device-item">
-					<div className="status-container">
-						<StatusCodePill
-							connected={this.props.device.connected}
-							statusCode={this.props.device?.status.statusCode}
-							messages={this.props.device?.status.messages}
-						/>
-
-						<div className="device-item__last-seen">
-							<label>{t('Last seen')}: </label>
-							<div className="value">
-								<Moment from={getCurrentTime()} date={this.props.device.lastSeen} />
-							</div>
-						</div>
-					</div>
-					<div className="device-item__id">
-						<Tooltip
-							overlay={t('Connect some devices to the playout gateway')}
-							visible={
-								getHelpMode() &&
-								this.props.device.type === PeripheralDeviceType.PLAYOUT &&
-								!this.props.parentDevice &&
-								!this.props.hasChildren &&
-								this.props.hasChildren !== undefined
-							}
-							placement="right"
-						>
-							{getAllowConfigure() ? (
-								<div className="value">
-									<Link to={'/settings/peripheralDevice/' + this.props.device._id}>{this.props.device.name}</Link>
-								</div>
-							) : (
-								<div className="value">{this.props.device.name}</div>
-							)}
-						</Tooltip>
-					</div>
-					{this.props.device.versions ? (
-						<div className="device-item__version">
-							<label>{t('Version')}: </label>
-							<div className="value">
-								<a title={this.deviceVersions()} href="#">
-									{this.props.device.versions._process || 'N/A'}
-								</a>
-							</div>
-						</div>
-					) : null}
-
-					{this.props.debugState ? <DebugStateTable debugState={this.props.debugState} /> : null}
-
-					<div className="actions-container">
-						<div className="device-item__actions">
-							{configManifest?.actions?.map((action) => (
-								<React.Fragment key={action.id}>
-									<button
-										className="btn btn-secondary"
-										onClick={(e) => {
-											e.preventDefault()
-											e.stopPropagation()
-											this.onExecuteAction(e, this.props.device, action)
-										}}
-									>
-										{translateMessage({ key: action.name, namespaces }, i18nTranslator)}
-									</button>
-								</React.Fragment>
-							))}
-							{getAllowDeveloper() ? (
-								<button
-									key="button-ignore"
-									className={ClassNames('btn btn-secondary', {
-										warn: this.props.device.ignore,
-									})}
-									onClick={(e) => {
-										e.preventDefault()
-										e.stopPropagation()
-										this.onToggleIgnore(this.props.device)
-									}}
-									title={
-										this.props.device.ignore
-											? 'Click to show device status to users'
-											: 'Click to hide device status from users'
-									}
-								>
-									<FontAwesomeIcon icon={faEye} />
-								</button>
-							) : null}
-							{this.props.showRemoveButtons ? (
-								<button
-									key="button-device"
-									className="btn btn-primary"
-									onClick={(e) => {
-										e.preventDefault()
-										e.stopPropagation()
-
-										doModalDialog({
-											title: t('Delete'),
-											message: (
-												<p>
-													{t('Are you sure you want to delete this device: "{{deviceId}}"?', {
-														deviceId: this.props.device.name || this.props.device._id,
-													})}
-												</p>
-											),
-											onAccept: () => {
-												MeteorCall.peripheralDevice
-													.removePeripheralDevice(this.props.device._id)
-													.catch(catchError('peripheralDevice.removePeripheralDevice'))
-											},
-										})
-									}}
-								>
-									<FontAwesomeIcon icon={faTrash} />
-								</button>
-							) : null}
-							{getAllowStudio() && this.props.device.subType === PERIPHERAL_SUBTYPE_PROCESS ? (
-								<React.Fragment>
-									<button
-										className="btn btn-secondary"
-										onClick={(e) => {
-											e.preventDefault()
-											e.stopPropagation()
-											e.persist()
-
-											doModalDialog({
-												message: t('Are you sure you want to restart this device?'),
-												title: t('Restart this Device?'),
-												yes: t('Restart'),
-												no: t('Cancel'),
-												onAccept: () => {
-													const { t } = this.props
-													PeripheralDevicesAPI.restartDevice(this.props.device, e)
-														.then(() => {
-															NotificationCenter.push(
-																new Notification(
-																	undefined,
-																	NoticeLevel.NOTIFICATION,
-																	t('Device "{{deviceName}}" restarting...', {
-																		deviceName: this.props.device.name,
-																	}),
-																	'SystemStatus'
-																)
-															)
-														})
-														.catch((err) => {
-															NotificationCenter.push(
-																new Notification(
-																	undefined,
-																	NoticeLevel.WARNING,
-																	t('Failed to restart device: "{{deviceName}}": {{errorMessage}}', {
-																		deviceName: this.props.device.name,
-																		errorMessage: err + '',
-																	}),
-																	'SystemStatus'
-																)
-															)
-														})
-												},
-											})
-										}}
-									>
-										{t('Restart')}
-									</button>
-								</React.Fragment>
-							) : null}
-						</div>
-					</div>
-
-					<div className="clear"></div>
-				</div>
-			)
-		}
-	}
-)
-
-interface ICoreItemProps {
-	systemStatus: StatusResponse | undefined
-	coreSystem: ICoreSystem
-}
-
-interface ICoreItemState {}
-
-const PackageInfo = require('../../../package.json')
-
-export const CoreItem = reacti18next.withTranslation()(
-	class CoreItem extends React.Component<Translated<ICoreItemProps>, ICoreItemState> {
-		constructor(props: Translated<ICoreItemProps>) {
-			super(props)
-			this.state = {}
-		}
-
-		render(): JSX.Element {
-			const { t } = this.props
-
-			return (
-				<div key={unprotectString(this.props.coreSystem._id)} className="device-item">
-					<div className="status-container">
-						<div
-							className={ClassNames(
-								'device-status',
-								this.props.systemStatus &&
-									this.props.systemStatus.status && {
-										'device-status--unknown': this.props.systemStatus.status === 'UNDEFINED',
-										'device-status--good': this.props.systemStatus.status === 'OK',
-										'device-status--warning': this.props.systemStatus.status === 'WARNING',
-										'device-status--fatal': this.props.systemStatus.status === 'FAIL',
-									}
-							)}
-						>
-							<div className="value">
-								<span className="pill device-status__label">
-									<a
-										href="#"
-										title={
-											this.props.systemStatus && this.props.systemStatus._internal.messages
-												? this.props.systemStatus._internal.messages.join('\n')
-												: undefined
-										}
-									>
-										{this.props.systemStatus && this.props.systemStatus.status}
-									</a>
-								</span>
-							</div>
-						</div>
-					</div>
-					<div className="device-item__id">
-						<div className="value">
-							{t('Sofie Automation Server Core: {{name}}', { name: this.props.coreSystem.name || 'unnamed' })}
-						</div>
-					</div>
-					<div className="device-item__version">
-						<label>{t('Version')}: </label>
-						<div className="value">{PackageInfo.version || 'UNSTABLE'}</div>
-					</div>
-
-					{(getAllowConfigure() || getAllowDeveloper()) && (
-						<div className="actions-container">
-							<div className="device-item__actions">
-								<button
-									className="btn btn-secondary"
-									onClick={(e) => {
-										e.preventDefault()
-										e.stopPropagation()
-
-										doModalDialog({
-											title: t('Restart this system?'),
-											yes: t('Restart'),
-											no: t('Cancel'),
-											message: (
-												<p>
-													{t('Are you sure you want to restart this Sofie Automation Server Core: {{name}}?', {
-														name: this.props.coreSystem.name || 'unnamed',
-													})}
-												</p>
-											),
-											onAccept: (e) => {
-												doUserAction(
-													t,
-													e,
-													UserAction.RESTART_CORE,
-													(e, ts) =>
-														MeteorCall.system.generateSingleUseToken().then((tokenResponse) => {
-															if (ClientAPI.isClientResponseError(tokenResponse) || !tokenResponse.result)
-																throw tokenResponse
-															return MeteorCall.userAction.restartCore(e, ts, hashSingleUseToken(tokenResponse.result))
-														}),
-													(err, restartMessage) => {
-														if (err || !restartMessage) {
-															NotificationCenter.push(
-																new Notification(
-																	undefined,
-																	NoticeLevel.CRITICAL,
-																	t('Could not restart core: {{err}}', { err }),
-																	'SystemStatus'
-																)
-															)
-															return
-														}
-														let time = 'unknown'
-														const match = restartMessage.match(/([\d.]+)s/)
-														if (match) {
-															time = match[1]
-														}
-														NotificationCenter.push(
-															new Notification(
-																undefined,
-																NoticeLevel.WARNING,
-																t('Sofie Automation Server Core will restart in {{time}}s...', { time }),
-																'SystemStatus'
-															)
-														)
-													}
-												)
-											},
-										})
-									}}
-								>
-									{t('Restart')}
-								</button>
-							</div>
-						</div>
-					)}
-
-					<div className="clear"></div>
-				</div>
-			)
-		}
-	}
-)
-
-interface ISystemStatusProps {}
-interface ISystemStatusState {
-	systemStatus: StatusResponse | undefined
-	deviceDebugState: Map<PeripheralDeviceId, object>
-}
-
-interface ISystemStatusTrackedProps {
-	coreSystem: ICoreSystem | undefined
-	devices: Array<PeripheralDevice>
-}
-
-interface DeviceInHierarchy {
-	device: PeripheralDevice
-	children: Array<DeviceInHierarchy>
-}
-
-export default function SystemStatus(props: Readonly<ISystemStatusProps>): JSX.Element {
-	// Subscribe to data:
-	useSubscription(CorelibPubSub.peripheralDevices, null)
-
-	const coreSystem = useTracker(() => CoreSystem.findOne(), [])
-	const devices = useTracker(() => PeripheralDevices.find({}, { sort: { lastConnected: -1 } }).fetch(), [], [])
-
-	return <SystemStatusContent {...props} coreSystem={coreSystem} devices={devices} />
-}
-
-const SystemStatusContent = reacti18next.withTranslation()(
-	class SystemStatusContent extends React.Component<
-		Translated<ISystemStatusProps & ISystemStatusTrackedProps>,
-		ISystemStatusState
-	> {
-		private refreshInterval: NodeJS.Timer | undefined = undefined
-		private refreshDebugStatesInterval: NodeJS.Timer | undefined = undefined
-		private destroyed = false
-
-		constructor(props: Translated<ISystemStatusProps & ISystemStatusTrackedProps>) {
-			super(props)
-
-			this.state = {
-				systemStatus: undefined,
-				deviceDebugState: new Map(),
-			}
-		}
-
-		componentDidMount(): void {
-			this.refreshSystemStatus()
-			this.refreshInterval = setInterval(this.refreshSystemStatus, 5000)
-			this.refreshDebugStatesInterval = setInterval(this.refreshDebugStates, 1000)
-		}
-
-		componentWillUnmount(): void {
-			if (this.refreshInterval) clearInterval(this.refreshInterval)
-			if (this.refreshDebugStatesInterval) clearInterval(this.refreshDebugStatesInterval)
-			this.destroyed = true
-		}
-
-		refreshSystemStatus = () => {
-			const { t } = this.props
-			MeteorCall.systemStatus
-				.getSystemStatus()
-				.then((systemStatus: StatusResponse) => {
-					if (this.destroyed) return
-
-					this.setState({
-						systemStatus: systemStatus,
-					})
-				})
-				.catch((err) => {
-					if (this.destroyed) return
-
-					logger.error('systemStatus.getSystemStatus', err)
-					NotificationCenter.push(
-						new Notification(
-							'systemStatus_failed',
-							NoticeLevel.CRITICAL,
-							t('Could not get system status. Please consult system administrator.'),
-							'RundownList'
-						)
-					)
-				})
-		}
-
-		refreshDebugStates = () => {
-			for (const device of this.props.devices) {
-				if (device.type === PeripheralDeviceType.PLAYOUT && device.settings && (device.settings as any)['debugState']) {
-					MeteorCall.systemStatus
-						.getDebugStates(device._id)
-						.then((res) => {
-							const states: Map<PeripheralDeviceId, object> = new Map()
-							for (const [key, state] of Object.entries<any>(res)) {
-								states.set(protectString(key), state)
-							}
-							this.setState({
-								deviceDebugState: states,
-							})
-						})
-						.catch((err) => console.log(`Error fetching device states: ${err}`))
-				}
-			}
-		}
-
-		renderPeripheralDevices() {
-			const devices: Array<DeviceInHierarchy> = []
-			const refs: Record<string, DeviceInHierarchy | undefined> = {}
-			const devicesToAdd: Record<string, DeviceInHierarchy> = {}
-			// First, add all as references:
-			_.each(this.props.devices, (device) => {
-				const d: DeviceInHierarchy = {
-					device: device,
-					children: [],
-				}
-				refs[unprotectString(device._id)] = d
-				devicesToAdd[unprotectString(device._id)] = d
-			})
-			// Then, map and add devices:
-			_.each(devicesToAdd, (d: DeviceInHierarchy) => {
-				if (d.device.parentDeviceId) {
-					const parent = refs[unprotectString(d.device.parentDeviceId)]
-					if (parent) {
-						parent.children.push(d)
-					} else {
-						// not found, add on top level then:
-						devices.push(d)
-					}
-				} else {
-					devices.push(d)
-				}
-			})
-
-			const getDeviceContent = (parentDevice: DeviceInHierarchy | null, d: DeviceInHierarchy): JSX.Element => {
-				const content: JSX.Element[] = [
-					<DeviceItem
-						key={'device' + d.device._id}
-						parentDevice={parentDevice?.device ?? null}
-						device={d.device}
-						hasChildren={d.children.length !== 0}
-						debugState={this.state.deviceDebugState.get(d.device._id)}
-					/>,
-				]
-				if (d.children.length) {
-					const children: JSX.Element[] = []
-					_.each(d.children, (child: DeviceInHierarchy) =>
-						children.push(
-							<li key={'childdevice' + child.device._id} className="child-device-li">
-								{getDeviceContent(d, child)}
-							</li>
-						)
-					)
-					content.push(
-						<div key={d.device._id + '_children'} className="children">
-							<ul className="childlist">{children}</ul>
-						</div>
-					)
-				}
-				return (
-					<div key={d.device._id + '_parent'} className="device-item-container">
-						{content}
-					</div>
-				)
-			}
-
-			return (
-				<React.Fragment>
-					{this.props.coreSystem && (
-						<CoreItem coreSystem={this.props.coreSystem} systemStatus={this.state.systemStatus} />
-					)}
-					{_.map(devices, (d) => getDeviceContent(null, d))}
-				</React.Fragment>
-			)
-		}
-
-		render(): JSX.Element {
-			const { t } = this.props
-
-			return (
-				<div className="mhl gutter system-status">
-					<header className="mbs">
-						<h1>{t('System Status')}</h1>
-					</header>
-					<div className="mod mvl">{this.renderPeripheralDevices()}</div>
-				</div>
-			)
-		}
-	}
-)
diff --git a/meteor/jest.config.js b/meteor/jest.config.js
index 9fdcdeac90..2c93ee5633 100644
--- a/meteor/jest.config.js
+++ b/meteor/jest.config.js
@@ -33,16 +33,6 @@ const commonConfig = {
 
 module.exports = {
 	projects: [
-		Object.assign({}, commonConfig, {
-			displayName: 'client',
-			testMatch: [
-				'<rootDir>/client/__tests__/**/*.(spec|test).(ts|js)',
-				'<rootDir>/client/**/__tests__/**/*.(spec|test).(ts|js)',
-				'!.meteor/*.*',
-			],
-			testEnvironment: 'jsdom',
-			setupFilesAfterEnv: [...commonConfig.setupFilesAfterEnv, '<rootDir>/client/__tests__/jest-setup.js'],
-		}),
 		Object.assign({}, commonConfig, {
 			displayName: 'lib',
 			testMatch: [
@@ -75,9 +65,7 @@ module.exports = {
 	collectCoverageFrom: [
 		'server/**/*.{js,ts}',
 		'lib/**/*.{js,ts}',
-		'client/**/*.{js,ts}',
 		'!**/*.{tsx}',
-		'!**/client/main.js',
 		'!.meteor/**/*.*',
 		'!**/__tests__/**',
 		'!**/__mocks__/**',
diff --git a/meteor/lib/__tests__/lib.test.ts b/meteor/lib/__tests__/lib.test.ts
deleted file mode 100644
index c50db5fdf7..0000000000
--- a/meteor/lib/__tests__/lib.test.ts
+++ /dev/null
@@ -1,235 +0,0 @@
-import '../../__mocks__/_extendJest'
-
-import { Meteor } from 'meteor/meteor'
-import { Mongo } from 'meteor/mongo'
-import { afterEachInFiber, testInFiber } from '../../__mocks__/helpers/jest'
-import { setLogLevel } from '../../server/logging'
-import {
-	getCurrentTime,
-	systemTime,
-	formatDateTime,
-	stringifyObjects,
-	partial,
-	protectString,
-	equalSets,
-	equivalentArrays,
-	LogLevel,
-	makePromise,
-	MeteorPromiseApply,
-} from '../lib'
-import { MeteorMock } from '../../__mocks__/meteor'
-import { MeteorDebugMethods } from '../../server/methods'
-import { Settings } from '../Settings'
-
-// require('../../../../../server/api/ingest/mosDevice/api.ts') // include in order to create the Meteor methods needed
-
-describe('lib/lib', () => {
-	afterEachInFiber(() => {
-		MeteorMock.mockSetServerEnvironment()
-	})
-
-	testInFiber('MeteorPromiseApply', async () => {
-		// set up method:
-		Settings.enableUserAccounts = false
-		MeteorDebugMethods({
-			myMethod: async (value1: string, value2: string) => {
-				// Do an async operation, to ensure that asynchronous operations work:
-				const v = await new Promise((resolve) => {
-					setTimeout(() => {
-						resolve(value1 + value2)
-					}, 10)
-				})
-				return v
-			},
-		})
-		const pValue: any = MeteorPromiseApply('myMethod', ['myValue', 'AAA']).catch((e) => {
-			throw e
-		})
-		expect(pValue).toHaveProperty('then') // be a promise
-		const value = await pValue
-		expect(value).toEqual('myValueAAA')
-	})
-	testInFiber('getCurrentTime', () => {
-		systemTime.diff = 5439
-		MeteorMock.mockSetClientEnvironment()
-		expect(getCurrentTime() / 1000).toBeCloseTo((Date.now() - 5439) / 1000, 1)
-		MeteorMock.mockSetServerEnvironment()
-		expect(getCurrentTime() / 1000).toBeCloseTo(Date.now() / 1000, 1)
-	})
-
-	testInFiber('formatDateTime', () => {
-		expect(formatDateTime(1556194064374)).toMatch(/2019-04-\d{2} \d{2}:\d{2}:\d{2}/)
-	})
-	testInFiber('stringifyObjects', () => {
-		const o: any = {
-			a: 1,
-			b: {
-				c: '1',
-				d: {
-					e: 2,
-				},
-			},
-		}
-		expect(stringifyObjects(o)).toEqual(stringifyObjects(o))
-	})
-	testInFiber('mongowhere', () => {
-		setLogLevel(LogLevel.DEBUG)
-
-		// mongoWhere is used my Collection mock
-		const MyCollection = new Mongo.Collection<any>('mycollection')
-
-		expect(MyCollection.findOne()).toBeFalsy()
-
-		MyCollection.insert({
-			_id: protectString('id0'),
-			name: 'abc',
-			rank: 0,
-		})
-		MyCollection.insert({
-			_id: protectString('id1'),
-			name: 'abc',
-			rank: 1,
-		})
-		MyCollection.insert({
-			_id: protectString('id2'),
-			name: 'abcd',
-			rank: 2,
-		})
-		MyCollection.insert({
-			_id: protectString('id3'),
-			name: 'abcd',
-			rank: 3,
-		})
-		MyCollection.insert({
-			_id: protectString('id4'),
-			name: 'xyz',
-			rank: 4,
-		})
-		MyCollection.insert({
-			_id: protectString('id5'),
-			name: 'xyz',
-			rank: 5,
-		})
-
-		expect(MyCollection.find().fetch()).toHaveLength(6)
-
-		expect(MyCollection.find({ _id: protectString('id3') }).fetch()).toHaveLength(1)
-		expect(MyCollection.find({ _id: protectString('id99') }).fetch()).toHaveLength(0)
-
-		expect(MyCollection.find({ name: 'abcd' }).fetch()).toHaveLength(2)
-		expect(MyCollection.find({ name: 'xyz' }).fetch()).toHaveLength(2)
-		expect(MyCollection.find({ name: { $in: ['abc', 'xyz'] } }).fetch()).toHaveLength(4)
-
-		expect(MyCollection.find({ rank: { $gt: 2 } }).fetch()).toHaveLength(3)
-		expect(MyCollection.find({ rank: { $gte: 2 } }).fetch()).toHaveLength(4)
-
-		expect(MyCollection.find({ rank: { $lt: 3 } }).fetch()).toHaveLength(3)
-		expect(MyCollection.find({ rank: { $lte: 3 } }).fetch()).toHaveLength(4)
-	})
-	// testInFiber('getRank', () => {
-	// 	const objs: { _rank: number }[] = [
-	// 		{ _rank: 0 },
-	// 		{ _rank: 10 },
-	// 		{ _rank: 20 },
-	// 		{ _rank: 21 },
-	// 		{ _rank: 22 },
-	// 		{ _rank: 23 },
-	// 	]
-
-	// 	// First:
-	// 	expect(getRank(null, objs[0])).toEqual(-0.5)
-	// 	// Insert two:
-	// 	expect(getRank(null, objs[0], 0, 2)).toEqual(-0.6666666666666667)
-	// 	expect(getRank(null, objs[0], 1, 2)).toEqual(-0.33333333333333337)
-
-	// 	// Center:
-	// 	expect(getRank(objs[1], objs[2])).toEqual(15)
-	// 	// Insert three:
-	// 	expect(getRank(objs[1], objs[2], 0, 3)).toEqual(12.5)
-	// 	expect(getRank(objs[1], objs[2], 1, 3)).toEqual(15)
-	// 	expect(getRank(objs[1], objs[2], 2, 3)).toEqual(17.5)
-
-	// 	// Last:
-	// 	expect(getRank(objs[5], undefined)).toEqual(23.5)
-	// 	// Insert three:
-	// 	expect(getRank(objs[5], undefined, 0, 3)).toEqual(23.25)
-	// 	expect(getRank(objs[5], undefined, 1, 3)).toEqual(23.5)
-	// 	expect(getRank(objs[5], undefined, 2, 3)).toEqual(23.75)
-
-	// 	// Insert in empty list
-	// 	expect(getRank(undefined, undefined)).toEqual(0.5)
-
-	// 	// Insert three:
-	// 	expect(getRank(undefined, undefined, 0, 2)).toEqual(0.3333333333333333)
-	// 	expect(getRank(undefined, undefined, 1, 2)).toEqual(0.6666666666666666)
-	// })
-	testInFiber('partial', () => {
-		const o = {
-			a: 1,
-			b: 'asdf',
-			c: {
-				d: 1,
-			},
-			e: null,
-			f: undefined,
-		}
-		expect(partial(o)).toEqual(o) // The function only affects typings
-	})
-	testInFiber('formatDateTime', () => {
-		if (process.platform === 'win32') {
-			// Due to a bug in how timezones are handled in Windows & Node, we just have to skip these tests when running tests locally..
-			expect(0).toEqual(0)
-			return
-		}
-
-		expect(new Date().getTimezoneOffset()).toBe(0) // Timezone is UTC
-
-		expect(formatDateTime(1578295344070)).toBe('2020-01-06 07:22:24')
-		expect(formatDateTime(1578389166594)).toBe('2020-01-07 09:26:06')
-		expect(formatDateTime(2579299201000)).toBe('2051-09-26 00:00:01')
-		expect(formatDateTime(2579299200000)).toBe('2051-09-26 00:00:00')
-		expect(formatDateTime(2579299344070)).toBe('2051-09-26 00:02:24')
-	})
-
-	testInFiber('equalSets', () => {
-		expect(equalSets(new Set(['a', 'b', 'c']), new Set(['c', 'b', 'a']))).toBe(true)
-		expect(equalSets(new Set(['a', 'b', 'c']), new Set(['d', 'b', 'a']))).toBe(false)
-	})
-	testInFiber('equivalentArrays', () => {
-		expect(equivalentArrays(['a', 'b', 'c'], ['c', 'a', 'b'])).toBe(true)
-		expect(equivalentArrays(['a', 'b', 'c'], ['b', 'g', 'a'])).toBe(false)
-	})
-	testInFiber('makePromise', async () => {
-		let a = 0
-		// Check that they are executed in order:
-		expect(
-			await Promise.all([
-				makePromise(() => {
-					return a++
-				}),
-				makePromise(() => {
-					return a++
-				}),
-			])
-		).toStrictEqual([0, 1])
-
-		// Handle an instant throw:
-		await expect(
-			makePromise(() => {
-				throw new Error('asdf')
-			})
-		).rejects.toMatchToString(/asdf/)
-
-		// Handle a delayed throw:
-		const delayedThrow = Meteor.wrapAsync((callback: (err: any, result: any) => void) => {
-			setTimeout(() => {
-				callback(new Error('asdf'), null)
-			}, 10)
-		})
-		await expect(
-			makePromise(() => {
-				delayedThrow()
-			})
-		).rejects.toMatchToString(/asdf/)
-	})
-})
diff --git a/meteor/lib/__tests__/memoizedIsolatedAutorun.test.ts b/meteor/lib/__tests__/memoizedIsolatedAutorun.test.ts
deleted file mode 100644
index cb42843fdc..0000000000
--- a/meteor/lib/__tests__/memoizedIsolatedAutorun.test.ts
+++ /dev/null
@@ -1,133 +0,0 @@
-import { MeteorMock } from '../../__mocks__/meteor'
-import { testInFiber } from '../../__mocks__/helpers/jest'
-import { memoizedIsolatedAutorun } from '../memoizedIsolatedAutorun'
-import { Tracker } from 'meteor/tracker'
-
-describe('memoizedIsolatedAutorun', () => {
-	describe('memoizedIsolatedAutorun', () => {
-		describe('Meteor.isClient', () => {
-			beforeAll(() => {
-				MeteorMock.mockSetClientEnvironment()
-			})
-			testInFiber('it returns the result of the autorun function', () => {
-				const dep = new Tracker.Dependency()
-				const result0 = memoizedIsolatedAutorun(() => {
-					dep.depend()
-					return 'result0'
-				}, 'getResult0')
-				expect(result0).toBe('result0')
-			})
-			testInFiber('it reruns when the dependency is changed', () => {
-				let runCount = 0
-				const dep = new Tracker.Dependency()
-				const result1 = memoizedIsolatedAutorun(() => {
-					runCount++
-					dep.depend()
-					return 'result1'
-				}, 'getResult1')
-				expect(result1).toBe('result1')
-				expect(runCount).toBe(1)
-				dep.changed()
-				expect(runCount).toBe(2)
-			})
-			testInFiber(
-				"it invalidates the parent computation if it's dependency has changed and the returned result is different",
-				() => {
-					let runCount0 = 0
-					let runCount1 = 0
-					const dep0 = new Tracker.Dependency()
-					const dep1 = new Tracker.Dependency()
-					let innerResult = ''
-					Tracker.autorun(() => {
-						runCount0++
-						dep0.depend()
-						innerResult = memoizedIsolatedAutorun(() => {
-							runCount1++
-							dep1.depend()
-							return 'result2_' + runCount1
-						}, 'getResult2')
-					})
-					expect(innerResult).toBe('result2_1')
-					expect(runCount0).toBe(1)
-					expect(runCount1).toBe(1)
-					dep1.changed()
-					expect(innerResult).toBe('result2_2')
-					expect(runCount0).toBe(2)
-					expect(runCount1).toBe(2)
-				}
-			)
-			testInFiber(
-				"it doesn't invalidate the parent computation if it's dependency has changed and the returned result is the same",
-				() => {
-					let runCount0 = 0
-					let runCount1 = 0
-					const dep0 = new Tracker.Dependency()
-					const dep1 = new Tracker.Dependency()
-					Tracker.autorun(() => {
-						runCount0++
-						dep0.depend()
-						memoizedIsolatedAutorun(() => {
-							runCount1++
-							dep1.depend()
-							return 'result3'
-						}, 'getResult3')
-					})
-					expect(runCount0).toBe(1)
-					expect(runCount1).toBe(1)
-					dep1.changed()
-					expect(runCount0).toBe(1)
-					expect(runCount1).toBe(2)
-				}
-			)
-			testInFiber(
-				"it doesn't rerun if the dependency is not changed, even if the outer computation is invalidated",
-				() => {
-					let runCount0 = 0
-					let runCount1 = 0
-					const dep0 = new Tracker.Dependency()
-					const dep1 = new Tracker.Dependency()
-					Tracker.autorun(() => {
-						runCount0++
-						dep0.depend()
-						memoizedIsolatedAutorun(() => {
-							runCount1++
-							dep1.depend()
-							return 'result4'
-						}, 'getResult4')
-					})
-					expect(runCount0).toBe(1)
-					expect(runCount1).toBe(1)
-					dep0.changed()
-					expect(runCount0).toBe(2)
-					expect(runCount1).toBe(1)
-				}
-			)
-		})
-		describe('Meteor.isServer', () => {
-			beforeAll(() => {
-				MeteorMock.mockSetServerEnvironment()
-			})
-			testInFiber('it returns the result of the autorun function', () => {
-				const dep = new Tracker.Dependency()
-				const result0 = memoizedIsolatedAutorun(() => {
-					dep.depend()
-					return 'result0'
-				}, 'getResult0')
-				expect(result0).toBe('result0')
-			})
-			testInFiber("it doesn't rerun when the dependency is changed", () => {
-				let runCount = 0
-				const dep = new Tracker.Dependency()
-				const result1 = memoizedIsolatedAutorun(() => {
-					runCount++
-					dep.depend()
-					return 'result1'
-				}, 'getResult1')
-				expect(result1).toBe('result1')
-				expect(runCount).toBe(1)
-				dep.changed()
-				expect(runCount).toBe(1)
-			})
-		})
-	})
-})
diff --git a/meteor/lib/api/methods.ts b/meteor/lib/api/methods.ts
deleted file mode 100644
index 40c4a513d0..0000000000
--- a/meteor/lib/api/methods.ts
+++ /dev/null
@@ -1,108 +0,0 @@
-import * as _ from 'underscore'
-import { MeteorPromiseApply } from '../lib'
-import { NewBlueprintAPI, BlueprintAPIMethods } from './blueprint'
-import { NewClientAPI, ClientAPIMethods } from './client'
-import { NewExternalMessageQueueAPI, ExternalMessageQueueAPIMethods } from './ExternalMessageQueue'
-import { NewMigrationAPI, MigrationAPIMethods } from './migration'
-import { NewPlayoutAPI, PlayoutAPIMethods } from './playout'
-import { NewRundownAPI, RundownAPIMethods } from './rundown'
-import { NewRundownLayoutsAPI, RundownLayoutsAPIMethods } from './rundownLayouts'
-import { NewShowStylesAPI, ShowStylesAPIMethods } from './showStyles'
-import { NewSnapshotAPI, SnapshotAPIMethods } from './shapshot'
-import { NewSystemStatusAPI, SystemStatusAPIMethods } from './systemStatus'
-import { NewUserActionAPI, UserActionAPIMethods } from './userActions'
-import { StudiosAPIMethods, NewStudiosAPI } from './studios'
-import { NewOrganizationAPI, OrganizationAPIMethods } from './organization'
-import { NewUserAPI, UserAPIMethods } from './user'
-import { SystemAPIMethods, SystemAPI } from './system'
-import { Meteor } from 'meteor/meteor'
-import { NewTriggeredActionsAPI, TriggeredActionsAPIMethods } from './triggeredActions'
-import { UserId } from '@sofie-automation/corelib/dist/dataModel/Ids'
-import {
-	NewPeripheralDeviceAPI,
-	PeripheralDeviceAPIMethods,
-} from '@sofie-automation/shared-lib/dist/peripheralDevice/methodsAPI'
-
-/** All methods typings are defined here, the actual implementation is defined in other places */
-export type MethodsBase = {
-	[key: string]: (...args: any[]) => Promise<any>
-}
-interface IMeteorCall {
-	blueprint: NewBlueprintAPI
-	client: NewClientAPI
-	externalMessages: NewExternalMessageQueueAPI
-	migration: NewMigrationAPI
-	peripheralDevice: NewPeripheralDeviceAPI
-	playout: NewPlayoutAPI
-	rundown: NewRundownAPI
-	rundownLayout: NewRundownLayoutsAPI
-	snapshot: NewSnapshotAPI
-	showstyles: NewShowStylesAPI
-	triggeredActions: NewTriggeredActionsAPI
-	studio: NewStudiosAPI
-	systemStatus: NewSystemStatusAPI
-	user: NewUserAPI
-	userAction: NewUserActionAPI
-	organization: NewOrganizationAPI
-	system: SystemAPI
-}
-export const MeteorCall: IMeteorCall = {
-	blueprint: makeMethods(BlueprintAPIMethods),
-	client: makeMethods(ClientAPIMethods),
-	externalMessages: makeMethods(ExternalMessageQueueAPIMethods),
-	migration: makeMethods(MigrationAPIMethods),
-	peripheralDevice: makeMethods(PeripheralDeviceAPIMethods),
-	playout: makeMethods(PlayoutAPIMethods),
-	rundown: makeMethods(RundownAPIMethods),
-	rundownLayout: makeMethods(RundownLayoutsAPIMethods),
-	snapshot: makeMethods(SnapshotAPIMethods),
-	showstyles: makeMethods(ShowStylesAPIMethods),
-	triggeredActions: makeMethods(TriggeredActionsAPIMethods),
-	studio: makeMethods(StudiosAPIMethods),
-	systemStatus: makeMethods(SystemStatusAPIMethods),
-	user: makeMethods(UserAPIMethods),
-	userAction: makeMethods(UserActionAPIMethods, ['storeRundownSnapshot']),
-	organization: makeMethods(OrganizationAPIMethods),
-	system: makeMethods(SystemAPIMethods),
-}
-function makeMethods<Enum extends { [key: string]: string }>(
-	methods: Enum,
-	/** (Optional) An array of methodnames. Calls to these methods won't be retried in the case of a loss-of-connection for the client. */
-	listOfMethodsThatShouldNotRetry?: (keyof Enum)[]
-): any {
-	const resultingMethods: Record<string, (...args: any[]) => any> = {}
-	_.each(methods, (serverMethodName: any, methodName: string) => {
-		if (listOfMethodsThatShouldNotRetry?.includes(methodName)) {
-			resultingMethods[methodName] = async (...args: any[]) =>
-				MeteorPromiseApply(serverMethodName, args, {
-					noRetry: true,
-				})
-		} else {
-			resultingMethods[methodName] = async (...args: any[]) => MeteorPromiseApply(serverMethodName, args)
-		}
-	})
-	return resultingMethods
-}
-export interface MethodContext extends Omit<Meteor.MethodThisType, 'userId'> {
-	userId: UserId | null
-}
-
-/** Abstarct class to be used when defining Mehod-classes */
-export abstract class MethodContextAPI implements MethodContext {
-	// These properties are added by Meteor to the `this` context when calling methods
-	public userId!: UserId | null
-	public isSimulation!: boolean
-	public setUserId(_userId: string | null): void {
-		throw new Meteor.Error(
-			500,
-			`This shoulc never be called, there's something wrong in with 'this' in the calling method`
-		)
-	}
-	public unblock(): void {
-		throw new Meteor.Error(
-			500,
-			`This shoulc never be called, there's something wrong in with 'this' in the calling method`
-		)
-	}
-	public connection!: Meteor.Connection | null
-}
diff --git a/meteor/lib/api/triggers/universalDoUserActionAdapter.ts b/meteor/lib/api/triggers/universalDoUserActionAdapter.ts
deleted file mode 100644
index f6ac538e4b..0000000000
--- a/meteor/lib/api/triggers/universalDoUserActionAdapter.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import { TFunction } from 'i18next'
-import { Meteor } from 'meteor/meteor'
-import { ClientAPI } from '../client'
-import { doUserAction as clientDoUserAction } from '../../clientUserAction'
-import { UserAction } from '../../userAction'
-import { getCurrentTime, Time } from '../../lib'
-
-export function doUserAction<Result>(
-	t: TFunction,
-	userEvent: string,
-	action: UserAction,
-	fcn: (event: string, timeStamp: Time) => Promise<ClientAPI.ClientResponse<Result>>,
-	callback?: (err: any, res?: Result) => void | boolean,
-	okMessage?: string
-): void {
-	if (Meteor.isClient) {
-		clientDoUserAction(t, userEvent, action, fcn, callback, okMessage)
-	} else {
-		fcn(userEvent, getCurrentTime()).then(
-			(value) =>
-				typeof callback === 'function' &&
-				(ClientAPI.isClientResponseSuccess(value) ? callback(undefined, value.result) : callback(value)),
-			(reason) => typeof callback === 'function' && callback(reason)
-		)
-	}
-}
diff --git a/meteor/lib/collections/PeripheralDevices.ts b/meteor/lib/collections/PeripheralDevices.ts
deleted file mode 100644
index c901ad708f..0000000000
--- a/meteor/lib/collections/PeripheralDevices.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from '@sofie-automation/corelib/dist/dataModel/PeripheralDevice'
diff --git a/meteor/lib/collections/Users.ts b/meteor/lib/collections/Users.ts
deleted file mode 100644
index 29f60eddba..0000000000
--- a/meteor/lib/collections/Users.ts
+++ /dev/null
@@ -1,57 +0,0 @@
-import { Meteor } from 'meteor/meteor'
-import { unprotectString } from '../lib'
-import { UserRoles, DBOrganization } from './Organization'
-import { UserId, OrganizationId } from '@sofie-automation/corelib/dist/dataModel/Ids'
-import { Organizations } from '../collections/libCollections'
-
-export interface UserProfile {
-	name: string
-}
-
-export interface DBUser {
-	// Note: This interface is partly defined by the dataset from the Meteor.users collection
-
-	_id: UserId
-	createdAt: string
-	services: {
-		password: {
-			bcrypt: string
-		}
-	}
-	username: string
-	emails: [
-		{
-			address: string
-			verified: boolean
-		}
-	]
-	profile: UserProfile
-	organizationId: OrganizationId
-	superAdmin?: boolean
-}
-
-export type User = DBUser // to be replaced by a class somet ime later?
-
-/** Returns the currently logged in user, or null if not logged in */
-export function getUser(): User | null {
-	const user = Meteor.user() as any
-	return user
-}
-export function getUserId(): UserId | null {
-	return (Meteor.userId() as any) || null
-}
-export function getUserRoles(user?: User | null, organization?: DBOrganization | null): UserRoles {
-	if (user === undefined) user = getUser()
-	if (!user) {
-		return {}
-	}
-	if (organization === undefined) organization = Organizations.findOne({ _id: user.organizationId }) || null
-	return getUserRolesFromLoadedDocuments(user, organization)
-}
-
-export function getUserRolesFromLoadedDocuments(user: User | null, organization: DBOrganization | null): UserRoles {
-	if (!user) {
-		return {}
-	}
-	return (organization?.userRoles && organization.userRoles[unprotectString(user._id)]) || {}
-}
diff --git a/meteor/lib/collections/lib.ts b/meteor/lib/collections/lib.ts
deleted file mode 100644
index 67c756c7f0..0000000000
--- a/meteor/lib/collections/lib.ts
+++ /dev/null
@@ -1,387 +0,0 @@
-import { Meteor } from 'meteor/meteor'
-import { Mongo } from 'meteor/mongo'
-import { ProtectedString, protectString } from '../lib'
-import { stringifyError } from '@sofie-automation/shared-lib/dist/lib/stringifyError'
-import type { Collection as RawCollection, Db as RawDb } from 'mongodb'
-import { CollectionName } from '@sofie-automation/corelib/dist/dataModel/Collections'
-import { MongoFieldSpecifier, MongoModifier, MongoQuery, SortSpecifier } from '@sofie-automation/corelib/dist/mongo'
-import { CustomCollectionName, MeteorPubSubCustomCollections } from '../api/pubsub'
-import {
-	PeripheralDevicePubSubCollections,
-	PeripheralDevicePubSubCollectionsNames,
-} from '@sofie-automation/shared-lib/dist/pubsub/peripheralDevice'
-
-export const ClientCollections = new Map<CollectionName, MongoCollection<any> | WrappedMongoReadOnlyCollection<any>>()
-function registerClientCollection(
-	name: CollectionName,
-	collection: MongoCollection<any> | WrappedMongoReadOnlyCollection<any>
-): void {
-	if (ClientCollections.has(name)) throw new Meteor.Error(`Cannot re-register collection "${name}"`)
-	ClientCollections.set(name, collection)
-}
-
-export const PublicationCollections = new Map<
-	CustomCollectionName | PeripheralDevicePubSubCollectionsNames,
-	WrappedMongoReadOnlyCollection<any>
->()
-
-/**
- * Map of current collection objects.
- * Future: Could this weakly hold the collections?
- */
-export const collectionsCache = new Map<string, Mongo.Collection<any>>()
-export function getOrCreateMongoCollection(name: string): Mongo.Collection<any> {
-	const collection = collectionsCache.get(name)
-	if (collection) {
-		return collection
-	}
-
-	const newCollection = new Mongo.Collection(name)
-	collectionsCache.set(name, newCollection)
-	return newCollection
-}
-
-/**
- * Wrap an existing Mongo.Collection to have async methods. Primarily to convert the built-in Users collection
- * @param collection Collection to wrap
- * @param name Name of the collection
- */
-export function wrapMongoCollection<DBInterface extends { _id: ProtectedString<any> }>(
-	collection: Mongo.Collection<DBInterface>,
-	name: CollectionName
-): MongoCollection<DBInterface> {
-	const wrapped = new WrappedMongoCollection<DBInterface>(collection, name)
-
-	registerClientCollection(name, wrapped)
-
-	return wrapped
-}
-
-/**
- * Create a sync in-memory Mongo Collection (for ui temporary storage)
- * @param name Name of the collection (for logging)
- */
-export function createInMemorySyncMongoCollection<DBInterface extends { _id: ProtectedString<any> }>(
-	name: string
-): MongoCollection<DBInterface> {
-	const collection = new Mongo.Collection<DBInterface>(null)
-	return new WrappedMongoCollection<DBInterface>(collection, name)
-}
-
-/**
- * Create a Mongo Collection for use in the client (has sync apis)
- * @param name Name of the collection
- */
-export function createSyncMongoCollection<DBInterface extends { _id: ProtectedString<any> }>(
-	name: CollectionName
-): MongoCollection<DBInterface> {
-	const collection = getOrCreateMongoCollection(name)
-	const wrapped = new WrappedMongoCollection<DBInterface>(collection, name)
-
-	registerClientCollection(name, wrapped)
-
-	return wrapped
-}
-
-/**
- * Create a Mongo Collection for use in the client (has sync apis)
- * @param name Name of the collection
- */
-export function createSyncReadOnlyMongoCollection<DBInterface extends { _id: ProtectedString<any> }>(
-	name: CollectionName
-): MongoReadOnlyCollection<DBInterface> {
-	const collection = getOrCreateMongoCollection(name)
-	const wrapped = new WrappedMongoReadOnlyCollection<DBInterface>(collection, name)
-
-	registerClientCollection(name, wrapped)
-
-	return wrapped
-}
-
-/**
- * Create a Mongo Collection for a virtual collection populated by a custom-publication
- * @param name Name of the custom-collection
- */
-export function createSyncCustomPublicationMongoCollection<
-	K extends CustomCollectionName & keyof MeteorPubSubCustomCollections
->(name: K): MongoReadOnlyCollection<MeteorPubSubCustomCollections[K]> {
-	const collection = new Mongo.Collection<MeteorPubSubCustomCollections[K]>(name)
-	const wrapped = new WrappedMongoReadOnlyCollection<MeteorPubSubCustomCollections[K]>(collection, name)
-
-	if (PublicationCollections.has(name)) throw new Meteor.Error(`Cannot re-register collection "${name}"`)
-	PublicationCollections.set(name, wrapped)
-
-	return wrapped
-}
-
-export function createSyncPeripheralDeviceCustomPublicationMongoCollection<
-	K extends PeripheralDevicePubSubCollectionsNames & keyof PeripheralDevicePubSubCollections
->(name: K): MongoReadOnlyCollection<PeripheralDevicePubSubCollections[K]> {
-	const collection = new Mongo.Collection<PeripheralDevicePubSubCollections[K]>(name)
-	const wrapped = new WrappedMongoReadOnlyCollection<PeripheralDevicePubSubCollections[K]>(collection, name)
-
-	if (PublicationCollections.has(name)) throw new Meteor.Error(`Cannot re-register collection "${name}"`)
-	PublicationCollections.set(name, wrapped)
-
-	return wrapped
-}
-
-class WrappedMongoReadOnlyCollection<DBInterface extends { _id: ProtectedString<any> }>
-	implements MongoReadOnlyCollection<DBInterface>
-{
-	protected readonly _collection: Mongo.Collection<DBInterface>
-
-	public readonly name: string | null
-
-	constructor(collection: Mongo.Collection<DBInterface>, name: string | null) {
-		this._collection = collection
-		this.name = name
-	}
-
-	protected get _isMock() {
-		// @ts-expect-error re-export private property
-		return this._collection._isMock
-	}
-
-	public get mockCollection() {
-		return this._collection
-	}
-
-	protected wrapMongoError(e: any): never {
-		const str = stringifyError(e) || 'Unknown MongoDB Error'
-		throw new Meteor.Error((e && e.error) || 500, `Collection "${this.name}": ${str}`)
-	}
-
-	find(
-		selector?: MongoQuery<DBInterface> | DBInterface['_id'],
-		options?: FindOptions<DBInterface>
-	): MongoCursor<DBInterface> {
-		try {
-			return this._collection.find((selector ?? {}) as any, options as any) as MongoCursor<DBInterface>
-		} catch (e) {
-			this.wrapMongoError(e)
-		}
-	}
-	findOne(
-		selector?: MongoQuery<DBInterface> | DBInterface['_id'],
-		options?: FindOneOptions<DBInterface>
-	): DBInterface | undefined {
-		try {
-			return this._collection.findOne((selector ?? {}) as any, options as any)
-		} catch (e) {
-			this.wrapMongoError(e)
-		}
-	}
-}
-export class WrappedMongoCollection<DBInterface extends { _id: ProtectedString<any> }>
-	extends WrappedMongoReadOnlyCollection<DBInterface>
-	implements MongoCollection<DBInterface>
-{
-	insert(doc: DBInterface): DBInterface['_id'] {
-		try {
-			const resultId = this._collection.insert(doc as unknown as Mongo.OptionalId<DBInterface>)
-			return protectString(resultId)
-		} catch (e) {
-			this.wrapMongoError(e)
-		}
-	}
-	rawCollection(): RawCollection<DBInterface> {
-		return this._collection.rawCollection() as any
-	}
-	rawDatabase(): RawDb {
-		return this._collection.rawDatabase() as any
-	}
-	remove(selector: MongoQuery<DBInterface> | DBInterface['_id']): number {
-		try {
-			return this._collection.remove(selector as any)
-		} catch (e) {
-			this.wrapMongoError(e)
-		}
-	}
-	update(
-		selector: MongoQuery<DBInterface> | DBInterface['_id'] | { _id: DBInterface['_id'] },
-		modifier: MongoModifier<DBInterface>,
-		options?: UpdateOptions
-	): number {
-		try {
-			return this._collection.update(selector as any, modifier as any, options)
-		} catch (e) {
-			this.wrapMongoError(e)
-		}
-	}
-	upsert(
-		selector: MongoQuery<DBInterface> | DBInterface['_id'],
-		modifier: MongoModifier<DBInterface>,
-		options?: UpsertOptions
-	): {
-		numberAffected?: number
-		insertedId?: DBInterface['_id']
-	} {
-		try {
-			const result = this._collection.upsert(selector as any, modifier as any, options)
-			return {
-				numberAffected: result.numberAffected,
-				insertedId: protectString(result.insertedId),
-			}
-		} catch (e) {
-			this.wrapMongoError(e)
-		}
-	}
-}
-
-export interface MongoReadOnlyCollection<DBInterface extends { _id: ProtectedString<any> }> {
-	/**
-	 * Find the documents in a collection that match the selector.
-	 * @param selector A query describing the documents to find
-	 */
-	find(
-		selector?: MongoQuery<DBInterface> | DBInterface['_id'],
-		options?: FindOptions<DBInterface>
-	): MongoCursor<DBInterface>
-
-	/**
-	 * Finds the first document that matches the selector, as ordered by sort and skip options. Returns `undefined` if no matching document is found.
-	 * @param selector A query describing the documents to find
-	 */
-	findOne(
-		selector?: MongoQuery<DBInterface> | DBInterface['_id'],
-		options?: FindOneOptions<DBInterface>
-	): DBInterface | undefined
-}
-/**
- * A minimal MongoCollection type based on the Meteor Mongo.Collection type, but with our improved _id type safety.
- * Note: when updating method signatures, make sure to update the implementions as new properties may not be fed through without additional work
- */
-export interface MongoCollection<DBInterface extends { _id: ProtectedString<any> }>
-	extends MongoReadOnlyCollection<DBInterface> {
-	/**
-	 * Insert a document in the collection.  Returns its unique _id.
-	 * @param doc The document to insert. May not yet have an _id attribute, in which case Meteor will generate one for you.
-	 */
-	insert(doc: DBInterface): DBInterface['_id']
-
-	/**
-	 * Returns the [`Collection`](http://mongodb.github.io/node-mongodb-native/3.0/api/Collection.html) object corresponding to this collection from the
-	 * [npm `mongodb` driver module](https://www.npmjs.com/package/mongodb) which is wrapped by `Mongo.Collection`.
-	 */
-	rawCollection(): RawCollection<DBInterface>
-
-	/**
-	 * Returns the [`Db`](http://mongodb.github.io/node-mongodb-native/3.0/api/Db.html) object corresponding to this collection's database connection from the
-	 * [npm `mongodb` driver module](https://www.npmjs.com/package/mongodb) which is wrapped by `Mongo.Collection`.
-	 */
-	rawDatabase(): RawDb
-
-	/**
-	 * Remove documents from the collection
-	 * @param selector Specifies which documents to remove
-	 */
-	remove(selector: MongoQuery<DBInterface> | DBInterface['_id']): number
-
-	/**
-	 * Modify one or more documents in the collection. Returns the number of matched documents.
-	 * @param selector Specifies which documents to modify
-	 * @param modifier Specifies how to modify the documents
-	 */
-	update(
-		selector: DBInterface['_id'] | { _id: DBInterface['_id'] },
-		modifier: MongoModifier<DBInterface>,
-		options?: UpdateOptions
-	): number
-	update(
-		selector: MongoQuery<DBInterface>,
-		modifier: MongoModifier<DBInterface>,
-		// Require { multi } to be set when selecting multiple documents to be updated, otherwise only the first found document will be updated
-		options: UpdateOptions & Required<Pick<UpdateOptions, 'multi'>>
-	): number
-
-	/**
-	 * Modify one or more documents in the collection, or insert one if no matching documents were found. Returns an object with keys `numberAffected` (the number of documents modified) and
-	 * `insertedId` (the unique _id of the document that was inserted, if any).
-	 * @param selector Specifies which documents to modify
-	 * @param modifier Specifies how to modify the documents
-	 */
-	upsert(
-		selector: MongoQuery<DBInterface> | DBInterface['_id'],
-		modifier: MongoModifier<DBInterface>,
-		options?: UpsertOptions
-	): {
-		numberAffected?: number
-		insertedId?: DBInterface['_id']
-	}
-}
-
-export interface UpdateOptions {
-	/** True to modify all matching documents; false to only modify one of the matching documents (the default). */
-	multi?: boolean
-	/** True to insert a document if no matching documents are found. */
-	upsert?: boolean
-	/**
-	 * Used in combination with MongoDB [filtered positional operator](https://docs.mongodb.com/manual/reference/operator/update/positional-filtered/) to specify which elements to
-	 * modify in an array field.
-	 */
-	arrayFilters?: { [identifier: string]: any }[]
-}
-export interface UpsertOptions {
-	/** True to modify all matching documents; false to only modify one of the matching documents (the default). */
-	multi?: boolean
-}
-
-export type IndexSpecifier<T> = {
-	[P in keyof T]?: -1 | 1 | string
-}
-
-export interface MongoCursor<DBInterface extends { _id: ProtectedString<any> }>
-	extends Omit<Mongo.Cursor<DBInterface>, 'observe' | 'observeChanges'> {
-	observe(callbacks: ObserveCallbacks<DBInterface>): Meteor.LiveQueryHandle
-	observeChanges(callbacks: ObserveChangesCallbacks<DBInterface>): Meteor.LiveQueryHandle
-}
-export interface ObserveCallbacks<DBInterface> {
-	added?(document: DBInterface): void
-	addedAt?(document: DBInterface, atIndex: number, before: DBInterface): void
-	changed?(newDocument: DBInterface, oldDocument: DBInterface): void
-	changedAt?(newDocument: DBInterface, oldDocument: DBInterface, indexAt: number): void
-	removed?(oldDocument: DBInterface): void
-	removedAt?(oldDocument: DBInterface, atIndex: number): void
-	movedTo?(document: DBInterface, fromIndex: number, toIndex: number, before: Object): void
-}
-export interface ObserveChangesCallbacks<DBInterface extends { _id: ProtectedString<any> }> {
-	added?(id: DBInterface['_id'], fields: Object): void
-	addedBefore?(id: DBInterface['_id'], fields: Object, before: Object): void
-	changed?(id: DBInterface['_id'], fields: Object): void
-	movedBefore?(id: DBInterface['_id'], before: Object): void
-	removed?(id: DBInterface['_id']): void
-}
-
-export interface FindOneOptions<TRawDoc> {
-	/** Sort order (default: natural order) */
-	sort?: SortSpecifier<TRawDoc>
-	/** Number of results to skip at the beginning */
-	skip?: number
-	/** @deprecated Dictionary of fields to return or exclude. */
-	fields?: MongoFieldSpecifier<TRawDoc>
-	/** Dictionary of fields to return or exclude. */
-	projection?: MongoFieldSpecifier<TRawDoc>
-	/** (Client only) Default `true`; pass `false` to disable reactivity */
-	reactive?: boolean
-	/** Overrides `transform` on the  [`Collection`](#collections) for this cursor.  Pass `null` to disable transformation. */
-	//  transform?: Transform<TRawDoc, TDoc>;
-	/** (Server only) Specifies a custom MongoDB readPreference for this particular cursor. Possible values are primary, primaryPreferred, secondary, secondaryPreferred and nearest. */
-	readPreference?: string
-}
-export interface FindOptions<DBInterface> extends FindOneOptions<DBInterface> {
-	/** Maximum number of results to return */
-	limit?: number
-	/** (Server only) Pass true to disable oplog-tailing on this query. This affects the way server processes calls to observe on this query. Disabling the oplog can be useful when working with data that updates in large batches. */
-	disableOplog?: boolean
-	/** (Server only) When oplog is disabled (through the use of disableOplog or when otherwise not available), the frequency (in milliseconds) of how often to poll this query when observing on the server. Defaults to 10000ms (10 seconds). */
-	pollingIntervalMs?: number
-	/** (Server only) When oplog is disabled (through the use of disableOplog or when otherwise not available), the minimum time (in milliseconds) to allow between re-polling when observing on the server. Increasing this will save CPU and mongo load at the expense of slower updates to users. Decreasing this is not recommended. Defaults to 50ms. */
-	pollingThrottleMs?: number
-	/** (Server only) If set, instructs MongoDB to set a time limit for this cursor's operations. If the operation reaches the specified time limit (in milliseconds) without the having been completed, an exception will be thrown. Useful to prevent an (accidental or malicious) unoptimized query from causing a full collection scan that would disrupt other database users, at the expense of needing to handle the resulting error. */
-	maxTimeMs?: number
-	/** (Server only) Overrides MongoDB's default index selection and query optimization process. Specify an index to force its use, either by its name or index specification. You can also specify { $natural : 1 } to force a forwards collection scan, or { $natural : -1 } for a reverse collection scan. Setting this is only recommended for advanced users. */
-	hint?: string | object
-}
-
-export type FieldNames<DBInterface> = (keyof DBInterface)[]
diff --git a/meteor/lib/collections/libCollections.ts b/meteor/lib/collections/libCollections.ts
deleted file mode 100644
index 9192074ad2..0000000000
--- a/meteor/lib/collections/libCollections.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-/**
- * These collections should be in meteor/client/collections, but are used here in lib.
- * Over time they should be moved across as this is decoupled from server
- */
-
-import { CollectionName } from '@sofie-automation/corelib/dist/dataModel/Collections'
-import { AdLibAction } from '@sofie-automation/corelib/dist/dataModel/AdlibAction'
-import { AdLibPiece } from '@sofie-automation/corelib/dist/dataModel/AdLibPiece'
-import { createSyncMongoCollection, createSyncReadOnlyMongoCollection } from './lib'
-import { DBOrganization } from './Organization'
-import { PartInstance } from './PartInstances'
-import { DBPart } from '@sofie-automation/corelib/dist/dataModel/Part'
-import { PieceInstance } from '@sofie-automation/corelib/dist/dataModel/PieceInstance'
-import { Piece } from '@sofie-automation/corelib/dist/dataModel/Piece'
-import { RundownBaselineAdLibAction } from '@sofie-automation/corelib/dist/dataModel/RundownBaselineAdLibAction'
-import { RundownBaselineAdLibItem } from '@sofie-automation/corelib/dist/dataModel/RundownBaselineAdLibPiece'
-import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
-import { DBRundown } from '@sofie-automation/corelib/dist/dataModel/Rundown'
-import { DBSegment } from '@sofie-automation/corelib/dist/dataModel/Segment'
-
-export const AdLibActions = createSyncReadOnlyMongoCollection<AdLibAction>(CollectionName.AdLibActions)
-
-export const AdLibPieces = createSyncReadOnlyMongoCollection<AdLibPiece>(CollectionName.AdLibPieces)
-
-export const Organizations = createSyncMongoCollection<DBOrganization>(CollectionName.Organizations)
-
-export const PieceInstances = createSyncReadOnlyMongoCollection<PieceInstance>(CollectionName.PieceInstances)
-
-export const Pieces = createSyncReadOnlyMongoCollection<Piece>(CollectionName.Pieces)
-
-export const PartInstances = createSyncReadOnlyMongoCollection<PartInstance>(CollectionName.PartInstances)
-
-export const Parts = createSyncReadOnlyMongoCollection<DBPart>(CollectionName.Parts)
-
-export const RundownBaselineAdLibActions = createSyncReadOnlyMongoCollection<RundownBaselineAdLibAction>(
-	CollectionName.RundownBaselineAdLibActions
-)
-
-export const RundownBaselineAdLibPieces = createSyncReadOnlyMongoCollection<RundownBaselineAdLibItem>(
-	CollectionName.RundownBaselineAdLibPieces
-)
-
-export const RundownPlaylists = createSyncReadOnlyMongoCollection<DBRundownPlaylist>(CollectionName.RundownPlaylists)
-
-export const Rundowns = createSyncReadOnlyMongoCollection<DBRundown>(CollectionName.Rundowns)
-
-export const Segments = createSyncReadOnlyMongoCollection<DBSegment>(CollectionName.Segments)
diff --git a/meteor/lib/lib.ts b/meteor/lib/lib.ts
deleted file mode 100644
index b177976c87..0000000000
--- a/meteor/lib/lib.ts
+++ /dev/null
@@ -1,519 +0,0 @@
-import * as _ from 'underscore'
-import { ITranslatableMessage } from '@sofie-automation/corelib/dist/TranslatableMessage'
-import { Meteor } from 'meteor/meteor'
-import { ProtectedString } from '@sofie-automation/corelib/dist/protectedString'
-import { logger } from './logging'
-
-import { Time, TimeDuration } from '@sofie-automation/shared-lib/dist/lib/lib'
-import { stringifyError } from '@sofie-automation/shared-lib/dist/lib/stringifyError'
-import { ReactiveVar } from 'meteor/reactive-var'
-import { MeteorApply } from './MeteorApply'
-export { Time, TimeDuration }
-
-// Legacy compatability
-export * from '@sofie-automation/corelib/dist/protectedString'
-export * from '@sofie-automation/corelib/dist/lib'
-
-export type PromisifyCallbacks<T> = {
-	[K in keyof T]: PromisifyFunction<T[K]>
-}
-type PromisifyFunction<T> = T extends (...args: any) => any
-	? (...args: Parameters<T>) => Promise<ReturnType<T>> | ReturnType<T>
-	: T
-
-/**
- * Convenience method to convert a Meteor.apply() into a Promise
- * @param callName {string} Method name
- * @param args {Array<any>} An array of arguments for the method call
- * @param options (Optional) An object with options for the call. See Meteor documentation.
- * @returns {Promise<any>} A promise containing the result of the called method.
- */
-export async function MeteorPromiseApply(
-	callName: Parameters<typeof Meteor.apply>[0],
-	args: Parameters<typeof Meteor.apply>[1],
-	options?: Parameters<typeof Meteor.apply>[2]
-): Promise<any> {
-	if (Meteor.isServer) {
-		return new Promise((resolve, reject) => {
-			Meteor.apply(callName, args, options, (err, res) => {
-				if (err) reject(err)
-				else resolve(res)
-			})
-		})
-	} else {
-		return MeteorApply(callName, args, options)
-	}
-}
-
-// The diff is currently only used client-side
-const systemTime = {
-	hasBeenSet: false,
-	diff: 0,
-	stdDev: 9999,
-	lastSync: 0,
-	timeOriginDiff: 0,
-}
-/**
- * Returns the current (synced) time.
- * If NTP-syncing is enabled, it'll be unaffected of whether the client has a well-synced computer time or not.
- * @return {Time}
- */
-export function getCurrentTime(): Time {
-	return Math.floor(Date.now() - (Meteor.isServer ? 0 : systemTime.diff))
-}
-export { systemTime }
-
-export interface DBObj {
-	_id: ProtectedString<any>
-	[key: string]: any
-}
-
-export type Partial<T> = {
-	[P in keyof T]?: T[P]
-}
-export function partial<T>(o: Partial<T>): Partial<T> {
-	return o
-}
-
-/**
- * Formats the time as human-readable time "YYYY-MM-DD hh:ii:ss"
- * @param time
- */
-export function formatDateTime(time: Time): string {
-	const d = new Date(time)
-
-	const yyyy: any = d.getFullYear()
-	let mm: any = d.getMonth() + 1
-	let dd: any = d.getDate()
-
-	let hh: any = d.getHours()
-	let ii: any = d.getMinutes()
-	let ss: any = d.getSeconds()
-
-	if (mm < 10) mm = '0' + mm
-	if (dd < 10) dd = '0' + dd
-	if (hh < 10) hh = '0' + hh
-	if (ii < 10) ii = '0' + ii
-	if (ss < 10) ss = '0' + ss
-
-	return `${yyyy}-${mm}-${dd} ${hh}:${ii}:${ss}`
-}
-
-export function formatTime(time: number): string {
-	const ss = String(Math.ceil(time / 1000) % 60).padStart(2, '0')
-	const mm = String(Math.floor(time / 60000) % 60).padStart(2, '0')
-	const hh = String(Math.floor(time / 3600000)).padStart(2, '0')
-
-	return `${hh}:${mm}:${ss}`
-}
-
-/**
- * Returns a string that can be used to compare objects for equality
- * @param objs
- */
-export function stringifyObjects(objs: unknown): string {
-	if (_.isArray(objs)) {
-		return _.map(objs, (obj) => {
-			if (obj !== undefined) {
-				return stringifyObjects(obj)
-			}
-		}).join(',')
-	} else if (_.isFunction(objs)) {
-		return ''
-	} else if (_.isObject(objs)) {
-		const objs0 = objs as any
-		const keys = _.sortBy(_.keys(objs), (k) => k)
-
-		return _.compact(
-			_.map(keys, (key) => {
-				if (objs0[key] !== undefined) {
-					return key + '=' + stringifyObjects(objs0[key])
-				} else {
-					return null
-				}
-			})
-		).join(',')
-	} else {
-		return objs + ''
-	}
-}
-
-/** Convenience function, to be used when length of array has previously been verified */
-export function last<T>(values: T[]): T {
-	return _.last(values) as T
-}
-
-export function objectFromEntries<Key extends ProtectedString<any>, Val>(
-	entries: Array<[Key, Val]>
-): Record<string, Val> {
-	return Object.fromEntries(entries)
-}
-
-const cacheResultCache: {
-	[name: string]: {
-		ttl: number
-		value: any
-	}
-} = {}
-/** Cache the result of function for a limited time */
-export function cacheResult<T>(name: string, fcn: () => T, limitTime = 1000): T {
-	if (Math.random() < 0.01) {
-		Meteor.setTimeout(cleanOldCacheResult, 10000)
-	}
-	const cache = cacheResultCache[name]
-	if (!cache || cache.ttl < Date.now()) {
-		const value: T = fcn()
-		cacheResultCache[name] = {
-			ttl: Date.now() + limitTime,
-			value: value,
-		}
-		return value
-	} else {
-		return cache.value
-	}
-}
-/** Cache the result of function for a limited time */
-export async function cacheResultAsync<T>(name: string, fcn: () => Promise<T>, limitTime = 1000): Promise<T> {
-	if (Math.random() < 0.01) {
-		Meteor.setTimeout(cleanOldCacheResult, 10000)
-	}
-	const cache = cacheResultCache[name]
-	if (!cache || cache.ttl < Date.now()) {
-		const value: Promise<T> = fcn()
-		cacheResultCache[name] = {
-			ttl: Date.now() + limitTime,
-			value: value,
-		}
-		return value
-	} else {
-		return cache.value
-	}
-}
-export function clearCacheResult(name: string): void {
-	delete cacheResultCache[name]
-}
-function cleanOldCacheResult() {
-	_.each(cacheResultCache, (cache, name) => {
-		if (cache.ttl < Date.now()) clearCacheResult(name)
-	})
-}
-const lazyIgnoreCache: { [name: string]: number } = {}
-export function lazyIgnore(name: string, f1: () => Promise<void> | void, t: number): void {
-	// Don't execute the function f1 until the time t has passed.
-	// Subsequent calls will extend the laziness and ignore the previous call
-
-	if (lazyIgnoreCache[name]) {
-		Meteor.clearTimeout(lazyIgnoreCache[name])
-	}
-	lazyIgnoreCache[name] = Meteor.setTimeout(() => {
-		delete lazyIgnoreCache[name]
-		if (Meteor.isClient) {
-			f1()?.catch((e) => {
-				throw new Error(e)
-			})
-		} else {
-			waitForPromise(f1())
-		}
-	}, t)
-}
-
-const ticCache: Record<NamedCurve, number> = {}
-/**
- * Performance debugging. tic() starts a timer, toc() traces the time since tic()
- * @param name
- */
-export function tic(name = 'default'): void {
-	ticCache[name] = Date.now()
-}
-export function toc(name = 'default', logStr?: string | Promise<any>[]): number | undefined {
-	if (_.isArray(logStr)) {
-		_.each(logStr, (promise, i) => {
-			promise
-				.then((result) => {
-					toc(name, 'Promise ' + i)
-					return result
-				})
-				.catch((e) => {
-					throw e
-				})
-		})
-	} else {
-		const t: number = Date.now() - ticCache[name]
-		if (logStr) logger.info('toc: ' + name + ': ' + logStr + ': ' + t)
-		return t
-	}
-}
-
-/**
- * Make Meteor.startup support async functions
- */
-export function MeteorStartupAsync(fcn: () => Promise<void>): void {
-	Meteor.startup(() => waitForPromise(fcn()))
-}
-
-/**
- * Make Meteor.wrapAsync a bit more type safe
- * The original version makes the callback be after the last non-undefined parameter, rather than after or replacing the last parameter.
- * Which makes it incredibly hard to find without iterating over all the parameters. This does that for you, so you dont need to check as many places
- */
-export function MeteorWrapAsync(func: Function, context?: Object): any {
-	// A variant of Meteor.wrapAsync to fix the bug
-	// https://github.com/meteor/meteor/issues/11120
-
-	return Meteor.wrapAsync((...args: any[]) => {
-		// Find the callback-function:
-		for (let i = args.length - 1; i >= 0; i--) {
-			if (typeof args[i] === 'function') {
-				if (i < args.length - 1) {
-					// The callback is not the last argument, make it so then:
-					const callback = args[i]
-					const fixedArgs = args
-					fixedArgs[i] = undefined
-					fixedArgs.push(callback)
-
-					func.apply(context, fixedArgs)
-					return
-				} else {
-					// The callback is the last argument, that's okay
-					func.apply(context, args)
-					return
-				}
-			}
-		}
-		throw new Meteor.Error(500, `Error in MeteorWrapAsync: No callback found!`)
-	})
-}
-
-export type Awaited<T> = T extends PromiseLike<infer U> ? Awaited<U> : T
-
-/**
- * Convert a promise to a "synchronous" Fiber function
- * Makes the Fiber wait for the promise to resolve, then return the value of the promise.
- * If the fiber rejects, the function in the Fiber will "throw"
- */
-export const waitForPromise: <T>(p: Promise<T> | T) => Awaited<T> = Meteor.wrapAsync(function waitForPromise<T>(
-	p: Promise<T> | T,
-	cb: (err: any | null, result?: any) => Awaited<T>
-) {
-	if (Meteor.isClient) throw new Meteor.Error(500, `waitForPromise can't be used client-side`)
-	if (cb === undefined && typeof p === 'function') {
-		cb = p as any
-		p = undefined as any
-	}
-
-	Promise.resolve(p)
-		.then((result) => {
-			cb(null, result)
-		})
-		.catch((e) => {
-			cb(e)
-		})
-}) as <T>(p: Promise<T> | T) => Awaited<T> // `wrapAsync` has opaque `Function` type
-/**
- * Convert a Fiber function into a promise
- * Makes the Fiber function to run in its own fiber and return a promise
- */
-export async function makePromise<T>(fcn: () => T): Promise<T> {
-	const p = new Promise<T>((resolve, reject) => {
-		Meteor.defer(() => {
-			try {
-				resolve(fcn())
-			} catch (e) {
-				reject(e)
-			}
-		})
-	})
-
-	return (
-		await Promise.all([
-			p,
-			// Pause the current Fiber briefly, in order to allow for the deferred Fiber to start executing:
-			sleep(0),
-		])
-	)[0]
-}
-
-export function deferAsync(fcn: () => Promise<void>): void {
-	Meteor.defer(() => {
-		fcn().catch((e) => logger.error(stringifyError(e)))
-	})
-}
-
-/**
- * Replaces all invalid characters in order to make the path a valid one
- * @param path
- */
-export function fixValidPath(path: string): string {
-	return path.replace(/([^a-z0-9_.@()-])/gi, '_')
-}
-
-/**
- * Thanks to https://github.com/Microsoft/TypeScript/issues/23126#issuecomment-395929162
- */
-export type OptionalPropertyNames<T> = {
-	[K in keyof T]-?: undefined extends T[K] ? K : never
-}[keyof T]
-export type RequiredPropertyNames<T> = {
-	[K in keyof T]-?: undefined extends T[K] ? never : K
-}[keyof T]
-export type OptionalProperties<T> = Pick<T, OptionalPropertyNames<T>>
-export type RequiredProperties<T> = Pick<T, RequiredPropertyNames<T>>
-
-export type Diff<T, U> = T extends U ? never : T // Remove types from T that are assignable to U
-export type KeysByType<TObj, TVal> = Diff<
-	{
-		[K in keyof TObj]: TObj[K] extends TVal ? K : never
-	}[keyof TObj],
-	undefined
->
-
-/**
- * Returns the difference between object A and B
- */
-type Difference<A, B extends A> = Pick<B, Exclude<keyof B, keyof RequiredProperties<A>>>
-/**
- * Somewhat like _.extend, but with strong types & mandated additional properties
- * @param original Object to be extended
- * @param extendObj properties to add
- */
-export function extendMandadory<A, B extends A>(original: A, extendObj: Difference<A, B> & Partial<A>): B {
-	return _.extend(original, extendObj)
-}
-
-export function trimIfString<T>(value: T): T | string {
-	if (_.isString(value)) return value.trim()
-	return value
-}
-
-export function firstIfArray<T>(value: T | T[] | null | undefined): T | null | undefined
-export function firstIfArray<T>(value: T | T[] | null): T | null
-export function firstIfArray<T>(value: T | T[] | undefined): T | undefined
-export function firstIfArray<T>(value: T | T[]): T
-export function firstIfArray<T>(value: unknown): T {
-	return _.isArray(value) ? _.first(value) : value
-}
-
-/**
- * Wait for specified time
- * @param time
- */
-export async function sleep(ms: number): Promise<void> {
-	return new Promise((resolve) => Meteor.setTimeout(resolve, ms))
-}
-
-export function isPromise<T>(val: unknown): val is Promise<T> {
-	const val0 = val as any
-	return _.isObject(val0) && typeof val0.then === 'function' && typeof val0.catch === 'function'
-}
-
-/**
- * This is a fast, shallow compare of two Sets.
- *
- * **Note**: This is a shallow compare, so it will return false if the objects in the arrays are identical, but not the same.
- *
- * @param a
- * @param b
- */
-export function equalSets<T>(a: Set<T>, b: Set<T>): boolean {
-	if (a === b) return true
-	if (a.size !== b.size) return false
-	for (const val of a.values()) {
-		if (!b.has(val)) return false
-	}
-	return true
-}
-
-/**
- * This is a fast, shallow compare of two arrays that are used as unsorted lists. The ordering of the elements is ignored.
- *
- * **Note**: This is a shallow compare, so it will return false if the objects in the arrays are identical, but not the same.
- *
- * @param a
- * @param b
- */
-export function equivalentArrays<T>(a: T[], b: T[]): boolean {
-	if (a === b) return true
-	if (a.length !== b.length) return false
-	for (let i = 0; i < a.length; i++) {
-		if (!b.includes(a[i])) return false
-	}
-	return true
-}
-
-/**
- * This is a fast, shallow compare of two arrays of the same type.
- *
- * **Note**: This is a shallow compare, so it will return false if the objects in the arrays are identical, but not the same.
- * @param a
- * @param b
- */
-export function equalArrays<T>(a: T[], b: T[]): boolean {
-	if (a === b) return true
-	if (a.length !== b.length) return false
-	for (let i = 0; i < a.length; i++) {
-		if (b[i] !== a[i]) return false
-	}
-	return true
-}
-
-/** Generate the translation for a string, to be applied later when it gets rendered */
-export function generateTranslation(
-	key: string,
-	args?: { [k: string]: any },
-	namespaces?: string[]
-): ITranslatableMessage {
-	return {
-		key,
-		args,
-		namespaces,
-	}
-}
-
-export enum LogLevel {
-	SILLY = 'silly',
-	DEBUG = 'debug',
-	VERBOSE = 'verbose',
-	INFO = 'info',
-	WARN = 'warn',
-	ERROR = 'error',
-	NONE = 'crit',
-}
-
-export enum LocalStorageProperty {
-	STUDIO = 'studioMode',
-	CONFIGURE = 'configureMode',
-	DEVELOPER = 'developerMode',
-	TESTING = 'testingMode',
-	SPEAKING = 'speakingMode',
-	VIBRATING = 'vibratingMode',
-	SERVICE = 'serviceMode',
-	SHELF_FOLLOWS_ON_AIR = 'shelfFollowsOnAir',
-	SHOW_HIDDEN_SOURCE_LAYERS = 'showHiddenSourceLayers',
-	IGNORE_PIECE_CONTENT_STATUS = 'ignorePieceContentStatus',
-	UI_ZOOM_LEVEL = 'uiZoomLevel',
-	HELP_MODE = 'helpMode',
-	LOG_NOTIFICATIONS = 'logNotifications',
-	PROTO_ONE_PART_PER_LINE = 'proto:onePartPerLine',
-}
-
-/**
- * This just looks like a ReactiveVar, but is not reactive.
- * It's used to use the same interface/typings, but when code is run on both client and server side.
- * */
-export class DummyReactiveVar<T> implements ReactiveVar<T> {
-	constructor(private value: T) {}
-	public get(): T {
-		return this.value
-	}
-	public set(newValue: T): void {
-		this.value = newValue
-	}
-}
-
-export function ensureHasTrailingSlash(input: string | null): string | undefined {
-	if (input) {
-		return input.endsWith('/') ? input : input + '/'
-	} else {
-		return undefined
-	}
-}
diff --git a/meteor/lib/logging.ts b/meteor/lib/logging.ts
deleted file mode 100644
index 57143093b7..0000000000
--- a/meteor/lib/logging.ts
+++ /dev/null
@@ -1,110 +0,0 @@
-import { Meteor } from 'meteor/meteor'
-import { stringifyError } from '@sofie-automation/shared-lib/dist/lib/stringifyError'
-import { MeteorApply } from './MeteorApply'
-
-export const LOGGER_METHOD_NAME = 'logger'
-
-export interface LoggerInstanceFixed {
-	error: LeveledLogMethodFixed
-	warn: LeveledLogMethodFixed
-	help: LeveledLogMethodFixed
-	data: LeveledLogMethodFixed
-	info: LeveledLogMethodFixed
-	debug: LeveledLogMethodFixed
-	prompt: LeveledLogMethodFixed
-	verbose: LeveledLogMethodFixed
-	input: LeveledLogMethodFixed
-	silly: LeveledLogMethodFixed
-
-	emerg: LeveledLogMethodFixed
-	alert: LeveledLogMethodFixed
-	crit: LeveledLogMethodFixed
-	warning: LeveledLogMethodFixed
-	notice: LeveledLogMethodFixed
-}
-type Winston_LogCallback = (error?: any, level?: string, msg?: string, meta?: any) => void
-export interface LeveledLogMethodFixed {
-	(msg: any, callback: Winston_LogCallback): LoggerInstanceFixed
-	(msg: any, meta: any, callback: Winston_LogCallback): LoggerInstanceFixed
-	(msg: any, ...meta: any[]): LoggerInstanceFixed
-}
-
-let logger: LoggerInstanceFixed
-if (Meteor.isServer) {
-	const getLogMethod = (type: string) => {
-		return (...args: any[]) => {
-			const stringifiedArgs: string[] = args.map((arg) => {
-				return stringifyError(arg)
-			})
-
-			Meteor.call(LOGGER_METHOD_NAME, type, ...stringifiedArgs)
-			return logger
-		}
-	}
-
-	logger = {
-		error: getLogMethod('error'),
-		warn: getLogMethod('warn'),
-		help: getLogMethod('help'),
-		data: getLogMethod('data'),
-		info: getLogMethod('info'),
-		debug: getLogMethod('debug'),
-		prompt: getLogMethod('prompt'),
-		verbose: getLogMethod('verbose'),
-		input: getLogMethod('input'),
-		silly: getLogMethod('silly'),
-
-		emerg: getLogMethod('emerg'),
-		alert: getLogMethod('alert'),
-		crit: getLogMethod('crit'),
-		warning: getLogMethod('warn'),
-		notice: getLogMethod('notice'),
-	}
-} else {
-	const getLogMethod = (type: string) => {
-		return (...args: any[]) => {
-			console.log(type, ...args)
-
-			if (type === 'error' || type === 'warn' || type === 'info') {
-				// Also send log entry to server, for logging:
-				const stringifiedArgs: string[] = args.map((arg) => {
-					return stringifyError(arg)
-				})
-				MeteorApply(LOGGER_METHOD_NAME, [type, `Client ${type}`, ...stringifiedArgs]).catch(console.error)
-				return logger
-			}
-			return logger
-		}
-	}
-
-	const noop = (_type: string) => {
-		// do nothing
-		return logger
-	}
-
-	logger = {
-		error: getLogMethod('error'),
-		warn: getLogMethod('warn'),
-		help: getLogMethod('help'),
-		data: getLogMethod('data'),
-		info: getLogMethod('info'),
-		debug: getLogMethod('debug'),
-		prompt: getLogMethod('prompt'),
-		verbose: getLogMethod('verbose'),
-		input: getLogMethod('input'),
-		silly: getLogMethod('silly'),
-
-		emerg: getLogMethod('emerg'),
-		alert: getLogMethod('alert'),
-		crit: getLogMethod('crit'),
-		warning: getLogMethod('warn'),
-		notice: getLogMethod('notice'),
-	}
-	if (localStorage && localStorage.getItem('developerMode') !== '1') {
-		// not in developerMode, don't log everything then:
-		logger.debug = noop
-		logger.silly = noop
-	}
-}
-
-export { logger }
diff --git a/meteor/lib/main.ts b/meteor/lib/main.ts
deleted file mode 100644
index 9dee266e55..0000000000
--- a/meteor/lib/main.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * This file is the entry-point for both server side and client side code
- */
-
-import './collections/Buckets'
-import './collections/CoreSystem'
-import './collections/Evaluations'
-import './collections/ExpectedPackages'
-import './collections/Organization'
-import './collections/PartInstances'
-import './collections/RundownLayouts'
-import './collections/Snapshots'
-import './collections/Studios'
-import './collections/Timeline'
-import './collections/UserActionsLog'
-import './collections/Users'
-import './collections/TriggeredActions'
-
-import './Settings'
-import './systemTime'
diff --git a/meteor/lib/mos.ts b/meteor/lib/mos.ts
deleted file mode 100644
index d84c789977..0000000000
--- a/meteor/lib/mos.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as MOS from '@mos-connection/helper'
-
-export const MOS_DATA_IS_STRICT = true
-export const mosTypes = MOS.getMosTypes(MOS_DATA_IS_STRICT)
diff --git a/meteor/lib/systemTime.ts b/meteor/lib/systemTime.ts
deleted file mode 100644
index 6039e8195e..0000000000
--- a/meteor/lib/systemTime.ts
+++ /dev/null
@@ -1,139 +0,0 @@
-import { Meteor } from 'meteor/meteor'
-import { logger } from './logging'
-import { getCurrentTime, systemTime } from './lib'
-import { MeteorCall } from './api/methods'
-
-/** How often the client should sync its time to the server [ms] */
-const SYNC_TIME = 5 * 60 * 1000 // 5 minutes
-
-/** How much we assume a clock to drift over time [time unit per time unit] */
-const ASSUMED_CLOCK_DRIFT = 5 / (3600 * 24) // We assume 5 seconds drift in a day for the system clock
-
-/** How good time sync quality we should strive for [ms] */
-const TARGET_TIME_SYNC_QUALITY = 50 // 50 milliseconds
-
-/** How often we should check if its time has jumped or been skewed [ms] */
-const JUMP_CHECK_INTERVAL = 10 * 1000 // 10 seconds
-
-export class TimeJumpDetector {
-	private wallTime: number = TimeJumpDetector.getWallTime()
-	private monotonicTime: number = TimeJumpDetector.getMonotonicTime()
-
-	constructor(private jumpCheckInterval: number, private onJumpDetected: (syncDiff: number) => void) {}
-
-	public start(): void {
-		Meteor.setInterval(() => {
-			if (Meteor.isServer || Meteor.status().connected) {
-				this.detectTimeJump()
-			}
-		}, this.jumpCheckInterval)
-	}
-
-	/** Returns the actual time of the OS, which could be influenced (jump) by an NTP sync. */
-	private static getWallTime() {
-		return Date.now()
-	}
-
-	/** Returns a Monotonic Time, which is not influenced by any NTP-sync  */
-	private static getMonotonicTime() {
-		return Meteor.isServer ? Number(process.hrtime.bigint() / BigInt(1000000)) : performance.now()
-	}
-
-	private detectTimeJump() {
-		const wallTime = TimeJumpDetector.getWallTime()
-		const monotonicTime = TimeJumpDetector.getMonotonicTime()
-		const currentDiff = wallTime - monotonicTime
-		const previousDiff = this.wallTime - this.monotonicTime
-		const syncDiff = currentDiff - previousDiff
-		if (Math.abs(syncDiff) > TARGET_TIME_SYNC_QUALITY) {
-			this.wallTime = wallTime
-			this.monotonicTime = monotonicTime
-			this.onJumpDetected(syncDiff)
-		}
-	}
-}
-
-if (Meteor.isServer) {
-	// handled in systemTime, but we want to log jumps anyway
-	if (!Meteor.isTest) {
-		Meteor.startup(() => {
-			const timeJumpDetector = new TimeJumpDetector(JUMP_CHECK_INTERVAL * 6, (syncDiff) => {
-				logger.warn(`Time jump or skew of ${Math.round(syncDiff)} ms detected`)
-				// But we're not doing anything more
-				// TODO: Should we trigger peripheralDevices to resync? And clients?
-			})
-			timeJumpDetector.start()
-		})
-	}
-} else {
-	// fetch time from server:
-	const updateDiffTime = (force?: boolean) => {
-		// Calculate an "adjusted standard deviation", something that increases over time.
-		// Using this we can decide wether a new measurement is better or worse than previous one. (the lower, the better)
-		const currentSyncDegradation =
-			systemTime.stdDev + (performance.now() - systemTime.lastSync) * ASSUMED_CLOCK_DRIFT
-
-		// If the sync is assumed to have degraded enough, it's time to resync
-		if (currentSyncDegradation > TARGET_TIME_SYNC_QUALITY || force) {
-			const sentTime = performance.now()
-			MeteorCall.peripheralDevice
-				.getTimeDiff()
-				.then((stat) => {
-					const replyTime = performance.now()
-
-					const diff = Math.round(Date.now() + (sentTime - replyTime) / 2 - stat.currentTime)
-					const stdDev = Math.abs(Math.round(sentTime - replyTime)) / 2 // Not really a standard deviation calculation, but it's what we can do with just one measuring point..
-
-					// Only use the result if the stdDev is better than previous sync quality:
-					if (stdDev <= currentSyncDegradation || force) {
-						// Only trace the result if the diff is different than the previous:
-						if (Math.abs(systemTime.diff - diff) > 10) {
-							logger.verbose(
-								`Time diff set to: ${diff} ms (server stdDev: ${
-									Math.floor(stat.stdDev * 10) / 10
-								} ms, client stdDev: ${stdDev} ms)`
-							)
-						}
-
-						// Store the result into the global variable `systemTime` (used in getCurrentTime()):
-						systemTime.diff = diff
-						systemTime.stdDev = stdDev
-						systemTime.lastSync = performance.now()
-						systemTime.hasBeenSet = true
-						systemTime.timeOriginDiff = getCurrentTime() - (performance.timeOrigin + performance.now())
-					}
-				})
-				.catch((err) => {
-					logger.error(err)
-				})
-		}
-	}
-
-	Meteor.startup(() => {
-		// Run it once right away:
-		updateDiffTime()
-
-		// Also run it a few seconds in, to get a more accurate reading:
-		Meteor.setTimeout(() => {
-			updateDiffTime()
-		}, 5000)
-
-		// Also run it after 30 seconds, to get an even more accurate reading:
-		Meteor.setTimeout(() => {
-			updateDiffTime()
-		}, 30 * 1000)
-
-		// Then run it on an interval, to ensure it is kept up to date:
-		Meteor.setInterval(() => {
-			if (Meteor.status().connected) {
-				updateDiffTime()
-			}
-		}, SYNC_TIME)
-
-		const timeJumpDetector = new TimeJumpDetector(JUMP_CHECK_INTERVAL, (syncDiff) => {
-			logger.verbose(`Time jump or skew of ${Math.round(syncDiff)} ms detected, resyncing with server.`)
-			updateDiffTime(true)
-		})
-		timeJumpDetector.start()
-	})
-}
diff --git a/meteor/lib/typings/reactivearray.d.ts b/meteor/lib/typings/reactivearray.d.ts
deleted file mode 100644
index 03d04fa6f2..0000000000
--- a/meteor/lib/typings/reactivearray.d.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-declare class ReactiveArray<T> extends Array<T> {
-	constructor(source?: Array<T>)
-
-	/**
-	 * Return all elements as a plain Javascript array.
-	 */
-	array(): Array<T>
-
-	/**
-	 * Returns a reactive source of the array.
-	 */
-	list(): Array<T>
-
-	/**
-	 * An alias of list().
-	 */
-	depend(): Array<T>
-
-	/**
-	 * Remove all elements of the array.
-	 */
-	clear(): void
-}
-
-declare class ReactiveDict<T> {
-	constructor(id?: string)
-	set(key: string, value: T): void
-	get(key: string): T
-	equals(key: string, compareValue: T): boolean
-}
diff --git a/meteor/package.json b/meteor/package.json
index 34cabd8ce9..f347b2c096 100644
--- a/meteor/package.json
+++ b/meteor/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "automation-core",
-	"version": "1.51.0-in-development",
+	"version": "1.52.0-in-development",
 	"private": true,
 	"engines": {
 		"node": ">=14.19.1"
@@ -27,7 +27,7 @@
 		"lint:raw": "eslint --ext .ts --ext .js --ext .tsx --ext .jsx",
 		"lintfix": "run lint --fix",
 		"quickformat": "prettier \"__mocks__/**\" --write ; prettier \"lib/**\" --write ; prettier \"server/**\" --write ; prettier \"client/**\" --write ; prettier \"*.json\" --write ; prettier \"*.js\" --write ; prettier \"*.md\" --write",
-		"i18n-extract-pot": "node ./scripts/extract-i18next-pot.mjs -f \"{./client/ui/**/*.+(ts|tsx),./lib/mediaObjects.ts,./lib/rundownNotifications.ts,./server/migration/**/*.ts}\" -o i18n/template.pot",
+		"i18n-extract-pot": "node ./scripts/extract-i18next-pot.mjs -f \"{./lib/**/*.+(ts|tsx),./server/**/*.+(ts|tsx),../packages/job-worker/src/**/*.+(ts|tsx),../packages/corelib/src/**/*.+(ts|tsx),../packages/webui/src/**/*.+(ts|tsx)}\" -o i18n/template.pot",
 		"i18n-compile-json": "node ./scripts/i18n-compile-json.mjs",
 		"visualize": "meteor --production --extra-packages bundle-visualizer",
 		"release": "standard-version --commit-all",
@@ -40,39 +40,25 @@
 	},
 	"dependencies": {
 		"@babel/runtime": "^7.23.9",
-		"@crello/react-lottie": "0.0.9",
-		"@fortawesome/fontawesome-free": "^6.4.2",
-		"@fortawesome/fontawesome-svg-core": "~6.4.2",
-		"@fortawesome/free-solid-svg-icons": "^6.4.2",
-		"@fortawesome/react-fontawesome": "^0.2.0",
-		"@jstarpl/react-contextmenu": "^2.15.0",
 		"@koa/cors": "^5.0.0",
 		"@koa/router": "^12.0.1",
-		"@mos-connection/helper": "^4.1.1-nightly-master-20240430-072032-ffb8bf6.0",
-		"@nrk/core-icons": "^9.6.0",
-		"@popperjs/core": "^2.11.8",
+		"@mos-connection/helper": "v4.2.0-alpha.1",
 		"@slack/webhook": "^6.1.0",
 		"@sofie-automation/blueprints-integration": "portal:../packages/blueprints-integration",
 		"@sofie-automation/corelib": "portal:../packages/corelib",
 		"@sofie-automation/job-worker": "portal:../packages/job-worker",
+		"@sofie-automation/meteor-lib": "portal:../packages/meteor-lib",
 		"@sofie-automation/shared-lib": "portal:../packages/shared-lib",
-		"@sofie-automation/sorensen": "^1.4.2",
 		"app-root-path": "^3.1.0",
 		"bcrypt": "^5.1.1",
 		"body-parser": "^1.20.2",
-		"classnames": "^2.5.1",
-		"core-js": "^3.35.1",
-		"cubic-spline": "^3.0.3",
 		"deep-extend": "0.6.0",
 		"deepmerge": "^4.3.1",
 		"i18next": "^21.10.0",
-		"i18next-browser-languagedetector": "^6.1.8",
-		"i18next-http-backend": "^1.4.5",
-		"immutability-helper": "^3.1.1",
 		"indexof": "0.0.1",
 		"koa": "^2.15.0",
 		"koa-bodyparser": "^4.4.1",
-		"lottie-web": "^5.12.2",
+		"koa-static": "^5.0.0",
 		"meteor-node-stubs": "^1.2.7",
 		"moment": "^2.30.1",
 		"nanoid": "^3.3.7",
@@ -80,36 +66,13 @@
 		"ntp-client": "^0.5.3",
 		"object-path": "^0.11.8",
 		"p-lazy": "^3.1.0",
-		"p-queue": "^7.4.1",
-		"promise.allsettled": "^1.0.7",
-		"prop-types": "^15.8.1",
-		"query-string": "^6.14.1",
-		"rc-tooltip": "^6.1.3",
-		"react": "^18.2.0",
-		"react-circular-progressbar": "^2.1.0",
-		"react-datepicker": "^3.8.0",
-		"react-dnd": "^14.0.5",
-		"react-dnd-html5-backend": "^14.1.0",
-		"react-dom": "^18.2.0",
-		"react-focus-bounder": "^1.1.6",
-		"react-hotkeys": "^2.0.0",
-		"react-i18next": "^11.18.6",
-		"react-intersection-observer": "^9.10.3",
-		"react-moment": "^0.9.7",
-		"react-popper": "^2.3.0",
-		"react-router-dom": "^5.3.4",
-		"react-timer-hoc": "^2.3.0",
 		"semver": "^7.5.4",
-		"superfly-timeline": "9.0.0",
+		"superfly-timeline": "9.0.2",
 		"threadedclass": "^1.2.2",
 		"timecode": "0.0.4",
 		"type-fest": "^3.13.1",
 		"underscore": "^1.13.6",
-		"velocity-animate": "^1.5.2",
-		"velocity-react": "^1.4.3",
-		"webmidi": "^2.5.3",
-		"winston": "^3.11.0",
-		"xmlbuilder": "^15.1.1"
+		"winston": "^3.11.0"
 	},
 	"devDependencies": {
 		"@babel/core": "^7.23.9",
@@ -119,32 +82,21 @@
 		"@sofie-automation/eslint-plugin": "^0.1.1",
 		"@types/app-root-path": "^1.2.8",
 		"@types/body-parser": "^1.19.5",
-		"@types/classnames": "^2.3.1",
 		"@types/deep-extend": "^0.6.2",
 		"@types/fibers": "^3.1.4",
 		"@types/jest": "^29.5.11",
 		"@types/koa": "^2.14.0",
 		"@types/koa-bodyparser": "^4.3.12",
+		"@types/koa-static": "^4.0.4",
 		"@types/koa__cors": "^5.0.0",
 		"@types/koa__router": "^12.0.4",
 		"@types/node": "^14.18.63",
-		"@types/prop-types": "^15.7.11",
-		"@types/react": "^18.2.51",
-		"@types/react-circular-progressbar": "^1.1.0",
-		"@types/react-datepicker": "^3.1.8",
-		"@types/react-dom": "^18.2.18",
-		"@types/react-router": "^5.1.20",
-		"@types/react-router-dom": "^5.3.3",
 		"@types/request": "^2.48.12",
 		"@types/semver": "^7.5.6",
-		"@types/sinon": "^10.0.20",
-		"@types/underscore": "1.11.15",
-		"@types/xml2js": "^0.4.14",
+		"@types/underscore": "^1.11.15",
 		"@typescript-eslint/eslint-plugin": "^5.62.0",
 		"@typescript-eslint/parser": "^5.62.0",
 		"@typescript-eslint/utils": "^5.62.0",
-		"@welldone-software/why-did-you-render": "^4.3.2",
-		"@xmldom/xmldom": "^0.8.10",
 		"babel-jest": "^29.7.0",
 		"ejson": "^2.2.3",
 		"eslint": "^8.56.0",
@@ -153,23 +105,19 @@
 		"eslint-plugin-jest": "^27.6.3",
 		"eslint-plugin-node": "^11.1.0",
 		"eslint-plugin-prettier": "^4.2.1",
-		"eslint-plugin-react": "^7.33.2",
 		"fast-clone": "^1.5.13",
 		"fibers-npm": "npm:fibers@5.0.3",
 		"glob": "^8.1.0",
 		"i18next-conv": "^10.2.0",
 		"i18next-scanner": "^4.4.0",
 		"jest": "^29.7.0",
-		"jest-environment-jsdom": "^29.7.0",
 		"legally": "^3.5.10",
 		"meteor-promise": "0.9.0",
 		"open-cli": "^7.2.0",
 		"prettier": "^2.8.8",
-		"sinon": "^14.0.2",
 		"standard-version": "^9.5.0",
 		"ts-jest": "^29.1.2",
 		"typescript": "^4.9.5",
-		"xml2js": "^0.6.2",
 		"yargs": "^17.7.2"
 	},
 	"prettier": "@sofie-automation/code-standard-preset/.prettierrc.json",
@@ -183,16 +131,7 @@
 	},
 	"meteor": {
 		"mainModule": {
-			"client": "client/main.tsx",
 			"server": "server/main.ts"
-		},
-		"nodeModules": {
-			"recompile": {
-				"@mos-connection/helper": "legacy",
-				"@mos-connection/model": "legacy",
-				"@sofie-automation/corelib": "legacy",
-				"@sofie-automation/shared-lib": "legacy"
-			}
 		}
 	},
 	"standard-version": {
diff --git a/meteor/scripts/extract-i18next-pot.mjs b/meteor/scripts/extract-i18next-pot.mjs
index 026e13473b..443cf5417e 100644
--- a/meteor/scripts/extract-i18next-pot.mjs
+++ b/meteor/scripts/extract-i18next-pot.mjs
@@ -105,14 +105,13 @@ const files = await pGlob(fileGlob)
 
 // console.debug('Loading content of ' + files.length + ' files')
 
-let content = ''
+// console.debug('Parsing translation keys out of content')
 files.map(function (file) {
-	content += fs.readFileSync(file, 'utf-8')
+	const content = fs.readFileSync(file, 'utf-8')
+	parser.parseFuncFromString(content, parserOptions)
+	parser.parseAttrFromString(content, parserOptions)
 })
 
-// console.debug('Parsing translation keys out of content')
-parser.parseFuncFromString(content, parserOptions)
-parser.parseAttrFromString(content, parserOptions)
 const json = parser.get().en.translation
 
 // console.debug('Converting ' + Object.keys(json).length + ' translation keys into gettext')
diff --git a/meteor/scripts/i18n-compile-json.mjs b/meteor/scripts/i18n-compile-json.mjs
index cfe2a48a86..fb2a0b4d55 100644
--- a/meteor/scripts/i18n-compile-json.mjs
+++ b/meteor/scripts/i18n-compile-json.mjs
@@ -28,7 +28,7 @@ for (const lng of languages) {
 	try {
 		console.log('\n')
 		await runCmd(
-			`i18next-conv -l ${lng} -s i18n/${lng}.po -t public/locales/${lng}/translations.json --skipUntranslated`
+			`i18next-conv -l ${lng} -s i18n/${lng}.po -t ../packages/webui/public/locales/${lng}/translations.json --skipUntranslated`
 		)
 	} catch (e) {
 		console.error(`💣 Failed: ${lng}`)
diff --git a/meteor/server/Connections.ts b/meteor/server/Connections.ts
index fd22a397e0..d97d44d5fa 100644
--- a/meteor/server/Connections.ts
+++ b/meteor/server/Connections.ts
@@ -1,4 +1,4 @@
-import { deferAsync, getCurrentTime } from '../lib/lib'
+import { deferAsync, getCurrentTime } from './lib/lib'
 import { Meteor } from 'meteor/meteor'
 import { logger } from './logging'
 import { sendTrace } from './api/integration/influx'
diff --git a/meteor/server/Settings.ts b/meteor/server/Settings.ts
new file mode 100644
index 0000000000..4a0d402ea3
--- /dev/null
+++ b/meteor/server/Settings.ts
@@ -0,0 +1,17 @@
+import { Meteor } from 'meteor/meteor'
+import * as _ from 'underscore'
+import { ISettings, DEFAULT_SETTINGS } from '@sofie-automation/meteor-lib/dist/Settings'
+
+/**
+ * This is an object specifying installation-wide, User Interface settings.
+ * There are default values for these settings that will be used, unless overriden
+ * through Meteor.settings functionality.
+ *
+ * You can use METEOR_SETTING to inject the settings JSON or you can use the
+ * --settings [filename] to provide a JSON file containing the settings
+ */
+export let Settings: ISettings = _.clone(DEFAULT_SETTINGS)
+
+Meteor.startup(() => {
+	Settings = _.extend(Settings, Meteor.settings.public)
+})
diff --git a/meteor/server/__tests__/_testEnvironment.test.ts b/meteor/server/__tests__/_testEnvironment.test.ts
index 2dfa15aaf8..7ff4542025 100644
--- a/meteor/server/__tests__/_testEnvironment.test.ts
+++ b/meteor/server/__tests__/_testEnvironment.test.ts
@@ -1,7 +1,8 @@
 import { Meteor } from 'meteor/meteor'
 import { RandomMock } from '../../__mocks__/random'
 import { MongoMock } from '../../__mocks__/mongo'
-import { waitForPromise, protectString, getRandomString, sleep } from '../../lib/lib'
+import { protectString, getRandomString } from '../lib/tempLib'
+import { waitForPromise, sleep } from '../lib/lib'
 import { testInFiber } from '../../__mocks__/helpers/jest'
 import {
 	AdLibPieces,
diff --git a/meteor/server/__tests__/api/serviceMessages/postHandler.test.ts b/meteor/server/__tests__/api/serviceMessages/postHandler.test.ts
index b55fc0c28b..c0027a2681 100644
--- a/meteor/server/__tests__/api/serviceMessages/postHandler.test.ts
+++ b/meteor/server/__tests__/api/serviceMessages/postHandler.test.ts
@@ -1,5 +1,5 @@
 import { postHandler } from '../../../api/serviceMessages/postHandler'
-import { Criticality, ExternalServiceMessage } from '../../../../lib/collections/CoreSystem'
+import { Criticality, ExternalServiceMessage } from '@sofie-automation/meteor-lib/dist/collections/CoreSystem'
 import * as serviceMessagesApi from '../../../api/serviceMessages/serviceMessagesApi'
 import { SupressLogMessages } from '../../../../__mocks__/suppressLogging'
 import { createMockContext } from '@shopify/jest-koa-mocks'
diff --git a/meteor/server/__tests__/api/serviceMessages/serviceMessagesApi.test.ts b/meteor/server/__tests__/api/serviceMessages/serviceMessagesApi.test.ts
index 44f11c3186..f210cd7286 100644
--- a/meteor/server/__tests__/api/serviceMessages/serviceMessagesApi.test.ts
+++ b/meteor/server/__tests__/api/serviceMessages/serviceMessagesApi.test.ts
@@ -1,12 +1,12 @@
 import { readAllMessages, writeMessage } from '../../../api/serviceMessages/serviceMessagesApi'
 import * as CoreSystemUtil from '../../../coreSystem/collection'
-import { protectString } from '../../../../lib/lib'
+import { protectString } from '../../../lib/tempLib'
 import {
 	Criticality,
 	ExternalServiceMessage,
 	ICoreSystem,
 	ServiceMessage,
-} from '../../../../lib/collections/CoreSystem'
+} from '@sofie-automation/meteor-lib/dist/collections/CoreSystem'
 import { CoreSystem } from '../../../collections'
 import { SupressLogMessages } from '../../../../__mocks__/suppressLogging'
 
diff --git a/meteor/server/__tests__/cronjobs.test.ts b/meteor/server/__tests__/cronjobs.test.ts
index a1a621a7d7..a083184179 100644
--- a/meteor/server/__tests__/cronjobs.test.ts
+++ b/meteor/server/__tests__/cronjobs.test.ts
@@ -2,8 +2,8 @@ import '../../__mocks__/_extendJest'
 import { testInFiber, runAllTimers, beforeAllInFiber, waitUntil } from '../../__mocks__/helpers/jest'
 import { MeteorMock } from '../../__mocks__/meteor'
 import { logger } from '../logging'
-import { getRandomId, getRandomString, protectString } from '../../lib/lib'
-import { SnapshotType } from '../../lib/collections/Snapshots'
+import { getRandomId, getRandomString, protectString } from '../lib/tempLib'
+import { SnapshotType } from '@sofie-automation/meteor-lib/dist/collections/Snapshots'
 import { IBlueprintPieceType, PieceLifespan, StatusCode, TSR } from '@sofie-automation/blueprints-integration'
 import {
 	PeripheralDeviceType,
@@ -11,10 +11,10 @@ import {
 	PeripheralDevice,
 	PERIPHERAL_SUBTYPE_PROCESS,
 } from '@sofie-automation/corelib/dist/dataModel/PeripheralDevice'
-import { SYSTEM_ID } from '../../lib/collections/CoreSystem'
-import * as lib from '../../lib/lib'
+import { SYSTEM_ID } from '@sofie-automation/meteor-lib/dist/collections/CoreSystem'
+import * as lib from '../lib/lib'
 import { DBPart } from '@sofie-automation/corelib/dist/dataModel/Part'
-import { PartInstance } from '../../lib/collections/PartInstances'
+import { PartInstance } from '@sofie-automation/meteor-lib/dist/collections/PartInstances'
 import { PieceInstance } from '@sofie-automation/corelib/dist/dataModel/PieceInstance'
 import { Meteor } from 'meteor/meteor'
 import { EmptyPieceTimelineObjectsBlob } from '@sofie-automation/corelib/dist/dataModel/Piece'
@@ -60,7 +60,7 @@ import {
 	setupDefaultStudioEnvironment,
 } from '../../__mocks__/helpers/database'
 import { DBSegment } from '@sofie-automation/corelib/dist/dataModel/Segment'
-import { Settings } from '../../lib/Settings'
+import { Settings } from '../Settings'
 
 describe('cronjobs', () => {
 	let env: DefaultEnvironment
@@ -230,7 +230,7 @@ describe('cronjobs', () => {
 				segmentId: segment0._id,
 				externalId: '',
 				title: '',
-				expectedDurationWithPreroll: undefined,
+				expectedDurationWithTransition: undefined,
 			}
 			await Parts.mutableCollection.insertAsync(part0)
 			const part1: DBPart = {
@@ -240,7 +240,7 @@ describe('cronjobs', () => {
 				segmentId: getRandomId<SegmentId>(), // non-existent
 				externalId: '',
 				title: '',
-				expectedDurationWithPreroll: undefined,
+				expectedDurationWithTransition: undefined,
 			}
 			await Parts.mutableCollection.insertAsync(part1)
 
diff --git a/meteor/server/__tests__/logging.test.ts b/meteor/server/__tests__/logging.test.ts
index dcddaa06bd..0485711eff 100644
--- a/meteor/server/__tests__/logging.test.ts
+++ b/meteor/server/__tests__/logging.test.ts
@@ -19,4 +19,12 @@ describe('server/logger', () => {
 		await supressLogging(logMessages, true)
 		expect(1).toBe(1)
 	})
+
+	testInFiber('logger', () => {
+		expect(typeof logger.error).toEqual('function')
+		expect(typeof logger.warn).toEqual('function')
+		// expect(typeof logger.help).toEqual('function')
+		expect(typeof logger.info).toEqual('function')
+		expect(typeof logger.debug).toEqual('function')
+	})
 })
diff --git a/meteor/lib/__tests__/systemTime.test.ts b/meteor/server/__tests__/systemTime.test.ts
similarity index 100%
rename from meteor/lib/__tests__/systemTime.test.ts
rename to meteor/server/__tests__/systemTime.test.ts
diff --git a/meteor/server/api/ExternalMessageQueue.ts b/meteor/server/api/ExternalMessageQueue.ts
index d163889ef3..8f1fe9c284 100644
--- a/meteor/server/api/ExternalMessageQueue.ts
+++ b/meteor/server/api/ExternalMessageQueue.ts
@@ -1,11 +1,14 @@
 import { Meteor } from 'meteor/meteor'
-import { check } from '../../lib/check'
+import { check } from '../lib/check'
 import { StatusCode } from '@sofie-automation/blueprints-integration'
-import { deferAsync, getCurrentTime } from '../../lib/lib'
+import { deferAsync, getCurrentTime } from '../lib/lib'
 import { registerClassToMeteorMethods } from '../methods'
-import { NewExternalMessageQueueAPI, ExternalMessageQueueAPIMethods } from '../../lib/api/ExternalMessageQueue'
+import {
+	NewExternalMessageQueueAPI,
+	ExternalMessageQueueAPIMethods,
+} from '@sofie-automation/meteor-lib/dist/api/ExternalMessageQueue'
 import { StatusObject, setSystemStatus } from '../systemStatus/systemStatus'
-import { MethodContextAPI, MethodContext } from '../../lib/api/methods'
+import { MethodContextAPI, MethodContext } from './methodContext'
 import { StudioContentWriteAccess } from '../security/studio'
 import { ExternalMessageQueueObjId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import { ExternalMessageQueue } from '../collections'
diff --git a/meteor/server/api/__tests__/cleanup.test.ts b/meteor/server/api/__tests__/cleanup.test.ts
index b9f2f34ec4..75cc3e5f35 100644
--- a/meteor/server/api/__tests__/cleanup.test.ts
+++ b/meteor/server/api/__tests__/cleanup.test.ts
@@ -1,4 +1,4 @@
-import { getRandomId } from '../../../lib/lib'
+import { getRandomId } from '../../lib/tempLib'
 import { beforeEachInFiber, testInFiber } from '../../../__mocks__/helpers/jest'
 
 import '../../collections' // include this in order to get all of the collection set up
@@ -48,7 +48,7 @@ import {
 } from '../../collections'
 import { Collections } from '../../collections/lib'
 import { generateTranslationBundleOriginId } from '../translationsBundles'
-import { CollectionCleanupResult } from '../../../lib/api/system'
+import { CollectionCleanupResult } from '@sofie-automation/meteor-lib/dist/api/system'
 
 describe('Cleanup', () => {
 	let env: DefaultEnvironment
diff --git a/meteor/server/api/__tests__/client.test.ts b/meteor/server/api/__tests__/client.test.ts
index d4f6a2dca2..018b2bc936 100644
--- a/meteor/server/api/__tests__/client.test.ts
+++ b/meteor/server/api/__tests__/client.test.ts
@@ -1,8 +1,9 @@
 import { Meteor } from 'meteor/meteor'
 import { MeteorMock } from '../../../__mocks__/meteor'
-import { UserActionsLogItem } from '../../../lib/collections/UserActionsLog'
-import { ClientAPIMethods } from '../../../lib/api/client'
-import { protectString, makePromise, LogLevel } from '../../../lib/lib'
+import { UserActionsLogItem } from '@sofie-automation/meteor-lib/dist/collections/UserActionsLog'
+import { ClientAPIMethods } from '@sofie-automation/meteor-lib/dist/api/client'
+import { protectString, LogLevel } from '../../lib/tempLib'
+import { makePromise } from '../../lib/lib'
 import { PeripheralDeviceCommand } from '@sofie-automation/corelib/dist/dataModel/PeripheralDeviceCommand'
 import { setLogLevel } from '../../logging'
 import { testInFiber, beforeAllInFiber } from '../../../__mocks__/helpers/jest'
@@ -12,7 +13,7 @@ import {
 	PERIPHERAL_SUBTYPE_PROCESS,
 } from '@sofie-automation/corelib/dist/dataModel/PeripheralDevice'
 import { setupMockPeripheralDevice, setupMockStudio } from '../../../__mocks__/helpers/database'
-import { MeteorCall } from '../../../lib/api/methods'
+import { MeteorCall } from '../methods'
 import { PeripheralDeviceId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import { PeripheralDeviceCommands, UserActionsLog } from '../../collections'
 import { SupressLogMessages } from '../../../__mocks__/suppressLogging'
diff --git a/meteor/server/api/__tests__/externalMessageQueue.test.ts b/meteor/server/api/__tests__/externalMessageQueue.test.ts
index 8a0797b85e..65fca90ee3 100644
--- a/meteor/server/api/__tests__/externalMessageQueue.test.ts
+++ b/meteor/server/api/__tests__/externalMessageQueue.test.ts
@@ -4,8 +4,9 @@ import { ExternalMessageQueue, RundownPlaylists, Rundowns } from '../../collecti
 import { IBlueprintExternalMessageQueueType, PlaylistTimingType } from '@sofie-automation/blueprints-integration'
 import { testInFiber } from '../../../__mocks__/helpers/jest'
 import { DefaultEnvironment, setupDefaultStudioEnvironment } from '../../../__mocks__/helpers/database'
-import { getCurrentTime, getRandomId, protectString } from '../../../lib/lib'
-import { MeteorCall } from '../../../lib/api/methods'
+import { getRandomId, protectString } from '../../lib/tempLib'
+import { getCurrentTime } from '../../lib/lib'
+import { MeteorCall } from '../methods'
 
 import '../ExternalMessageQueue'
 import { SupressLogMessages } from '../../../__mocks__/suppressLogging'
diff --git a/meteor/server/api/__tests__/methods.test.ts b/meteor/server/api/__tests__/methods.test.ts
new file mode 100644
index 0000000000..5b0e3be3e6
--- /dev/null
+++ b/meteor/server/api/__tests__/methods.test.ts
@@ -0,0 +1,27 @@
+import '../../../__mocks__/_extendJest'
+import { MeteorDebugMethods } from '../../methods'
+import { Settings } from '../../Settings'
+import { MeteorPromiseApply } from '../methods'
+import { testInFiber } from '../../../__mocks__/helpers/jest'
+
+testInFiber('MeteorPromiseApply', async () => {
+	// set up method:
+	Settings.enableUserAccounts = false
+	MeteorDebugMethods({
+		myMethod: async (value1: string, value2: string) => {
+			// Do an async operation, to ensure that asynchronous operations work:
+			const v = await new Promise((resolve) => {
+				setTimeout(() => {
+					resolve(value1 + value2)
+				}, 10)
+			})
+			return v
+		},
+	})
+	const pValue: any = MeteorPromiseApply('myMethod', ['myValue', 'AAA']).catch((e) => {
+		throw e
+	})
+	expect(pValue).toHaveProperty('then') // be a promise
+	const value = await pValue
+	expect(value).toEqual('myValueAAA')
+})
diff --git a/meteor/server/api/__tests__/peripheralDevice.test.ts b/meteor/server/api/__tests__/peripheralDevice.test.ts
index 266d036bdc..3048dd3d17 100644
--- a/meteor/server/api/__tests__/peripheralDevice.test.ts
+++ b/meteor/server/api/__tests__/peripheralDevice.test.ts
@@ -6,15 +6,8 @@ import {
 	PeripheralDeviceType,
 } from '@sofie-automation/corelib/dist/dataModel/PeripheralDevice'
 import { EmptyPieceTimelineObjectsBlob } from '@sofie-automation/corelib/dist/dataModel/Piece'
-import {
-	getCurrentTime,
-	literal,
-	protectString,
-	ProtectedString,
-	getRandomId,
-	LogLevel,
-	getRandomString,
-} from '../../../lib/lib'
+import { literal, protectString, ProtectedString, getRandomId, LogLevel, getRandomString } from '../../lib/tempLib'
+import { getCurrentTime } from '../../lib/lib'
 import { testInFiber, waitUntil } from '../../../__mocks__/helpers/jest'
 import { setupDefaultStudioEnvironment, DefaultEnvironment } from '../../../__mocks__/helpers/database'
 import { setLogLevel } from '../../logging'
@@ -24,7 +17,7 @@ import {
 } from '@sofie-automation/corelib/dist/dataModel/PeripheralDeviceSettings/ingestDevice'
 import { MediaWorkFlow } from '@sofie-automation/shared-lib/dist/core/model/MediaWorkFlows'
 import { MediaWorkFlowStep } from '@sofie-automation/shared-lib/dist/core/model/MediaWorkFlowSteps'
-import { MediaManagerAPI } from '../../../lib/api/mediaManager'
+import { MediaManagerAPI } from '@sofie-automation/meteor-lib/dist/api/mediaManager'
 import { MediaObject } from '@sofie-automation/shared-lib/dist/core/model/MediaObjects'
 import {
 	IBlueprintPieceType,
@@ -38,7 +31,7 @@ jest.mock('../../api/deviceTriggers/observer')
 
 import '../peripheralDevice'
 import { OnTimelineTriggerTimeProps, StudioJobFunc, StudioJobs } from '@sofie-automation/corelib/dist/worker/studio'
-import { MeteorCall } from '../../../lib/api/methods'
+import { MeteorCall } from '../methods'
 import { PeripheralDeviceForDevice } from '@sofie-automation/shared-lib/dist/core/model/peripheralDevice'
 import {
 	PeripheralDeviceInitOptions,
@@ -136,7 +129,7 @@ describe('test peripheralDevice general API methods', () => {
 			segmentId: segmentID,
 			rundownId: rundownID,
 			title: 'Part 000',
-			expectedDurationWithPreroll: undefined,
+			expectedDurationWithTransition: undefined,
 		})
 		await Pieces.mutableCollection.insertAsync({
 			_id: protectString('piece0001'),
@@ -163,7 +156,7 @@ describe('test peripheralDevice general API methods', () => {
 			segmentId: segmentID,
 			rundownId: rundownID,
 			title: 'Part 001',
-			expectedDurationWithPreroll: undefined,
+			expectedDurationWithTransition: undefined,
 		})
 		await Segments.mutableCollection.insertAsync({
 			_id: protectString('segment1'),
diff --git a/meteor/server/api/__tests__/rundownLayouts.test.ts b/meteor/server/api/__tests__/rundownLayouts.test.ts
index 4c959a219c..7661c10bcd 100644
--- a/meteor/server/api/__tests__/rundownLayouts.test.ts
+++ b/meteor/server/api/__tests__/rundownLayouts.test.ts
@@ -1,9 +1,13 @@
 import '../../../__mocks__/_extendJest'
 import { testInFiber } from '../../../__mocks__/helpers/jest'
 import { setupDefaultStudioEnvironment, DefaultEnvironment } from '../../../__mocks__/helpers/database'
-import { protectString, literal, getRandomString } from '../../../lib/lib'
-import { RundownLayoutType, RundownLayout, CustomizableRegions } from '../../../lib/collections/RundownLayouts'
-import { MeteorCall } from '../../../lib/api/methods'
+import { protectString, literal, getRandomString } from '../../lib/tempLib'
+import {
+	RundownLayoutType,
+	RundownLayout,
+	CustomizableRegions,
+} from '@sofie-automation/meteor-lib/dist/collections/RundownLayouts'
+import { MeteorCall } from '../methods'
 import { RundownLayoutId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import { RundownLayouts } from '../../collections'
 import { SupressLogMessages } from '../../../__mocks__/suppressLogging'
diff --git a/meteor/server/api/__tests__/userActions/buckets.test.ts2 b/meteor/server/api/__tests__/userActions/buckets.test.ts2
index 30661d9e5a..fd4beed3df 100644
--- a/meteor/server/api/__tests__/userActions/buckets.test.ts2
+++ b/meteor/server/api/__tests__/userActions/buckets.test.ts2
@@ -2,12 +2,12 @@ import '../../../../__mocks__/_extendJest'
 import { testInFiber } from '../../../../__mocks__/helpers/jest'
 import { setupDefaultStudioEnvironment, DefaultEnvironment } from '../../../../__mocks__/helpers/database'
 import { getRandomId, protectString } from '../../../../lib/lib'
-import { ClientAPI } from '../../../../lib/api/client'
+import { ClientAPI } from '@sofie-automation/meteor-lib/dist/api/client'
 import { Bucket, BucketId, Buckets } from '../../../../lib/collections/Buckets'
 import { BucketAdLibs } from '../../../../lib/collections/BucketAdlibs'
 import { PieceLifespan } from '@sofie-automation/blueprints-integration'
 import { CreateFakeResult, QueueIngestJobSpy } from '../../../../__mocks__/worker'
-import { MeteorCall } from '../../../../lib/api/methods'
+import { MeteorCall } from '../../../lib/meteorApi'
 
 require('../../client') // include in order to create the Meteor methods needed
 require('../../userActions') // include in order to create the Meteor methods needed
diff --git a/meteor/server/api/__tests__/userActions/general.test.ts b/meteor/server/api/__tests__/userActions/general.test.ts
index b505426674..823cd6c80c 100644
--- a/meteor/server/api/__tests__/userActions/general.test.ts
+++ b/meteor/server/api/__tests__/userActions/general.test.ts
@@ -1,10 +1,10 @@
 import '../../../../__mocks__/_extendJest'
 import { testInFiber } from '../../../../__mocks__/helpers/jest'
 import { setupDefaultStudioEnvironment } from '../../../../__mocks__/helpers/database'
-import { hashSingleUseToken } from '../../../../lib/api/userActions'
-import { getCurrentTime } from '../../../../lib/lib'
-import { MeteorCall } from '../../../../lib/api/methods'
-import { ClientAPI } from '../../../../lib/api/client'
+import { hashSingleUseToken } from '../../deviceTriggers/triggersContext'
+import { getCurrentTime } from '../../../lib/lib'
+import { MeteorCall } from '../../methods'
+import { ClientAPI } from '@sofie-automation/meteor-lib/dist/api/client'
 import { UserActionsLog } from '../../../collections'
 
 require('../../system') // include so that we can call generateSingleUseToken()
@@ -13,6 +13,8 @@ require('../../userActions') // include in order to create the Meteor methods ne
 
 describe('User Actions - General', () => {
 	beforeEach(async () => {
+		await UserActionsLog.removeAsync({})
+
 		await setupDefaultStudioEnvironment()
 	})
 
diff --git a/meteor/server/api/__tests__/userActions/mediaManager.test.ts b/meteor/server/api/__tests__/userActions/mediaManager.test.ts
index f6820d3600..b4806df71f 100644
--- a/meteor/server/api/__tests__/userActions/mediaManager.test.ts
+++ b/meteor/server/api/__tests__/userActions/mediaManager.test.ts
@@ -1,8 +1,9 @@
 import '../../../../__mocks__/_extendJest'
 import { testInFiber, waitUntil } from '../../../../__mocks__/helpers/jest'
-import { getCurrentTime, getRandomId, protectString } from '../../../../lib/lib'
+import { getRandomId, protectString } from '../../../lib/tempLib'
+import { getCurrentTime } from '../../../lib/lib'
 import { setupDefaultStudioEnvironment, DefaultEnvironment } from '../../../../__mocks__/helpers/database'
-import { MeteorCall } from '../../../../lib/api/methods'
+import { MeteorCall } from '../../methods'
 import { MediaWorkFlowId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import { MediaWorkFlows, PeripheralDeviceCommands, PeripheralDevices } from '../../../collections'
 
diff --git a/meteor/server/api/__tests__/userActions/system.test.ts b/meteor/server/api/__tests__/userActions/system.test.ts
index 0d1c9c147f..a011ef0a4c 100644
--- a/meteor/server/api/__tests__/userActions/system.test.ts
+++ b/meteor/server/api/__tests__/userActions/system.test.ts
@@ -1,11 +1,12 @@
-import { MeteorCall } from '../../../../lib/api/methods'
+import { MeteorCall } from '../../methods'
 import {
 	PeripheralDevice,
 	PeripheralDeviceCategory,
 	PeripheralDeviceType,
 	PERIPHERAL_SUBTYPE_PROCESS,
 } from '@sofie-automation/corelib/dist/dataModel/PeripheralDevice'
-import { getCurrentTime, protectString } from '../../../../lib/lib'
+import { protectString } from '@sofie-automation/shared-lib/dist/lib/protectedString'
+import { getCurrentTime } from '../../../lib/lib'
 import {
 	DefaultEnvironment,
 	setupDefaultStudioEnvironment,
diff --git a/meteor/server/api/blueprintConfigPresets.ts b/meteor/server/api/blueprintConfigPresets.ts
index 27ce981516..c3fe8e70ef 100644
--- a/meteor/server/api/blueprintConfigPresets.ts
+++ b/meteor/server/api/blueprintConfigPresets.ts
@@ -5,7 +5,7 @@ import { DBShowStyleBase } from '@sofie-automation/corelib/dist/dataModel/ShowSt
 import { DBShowStyleVariant } from '@sofie-automation/corelib/dist/dataModel/ShowStyleVariant'
 import { DBStudio } from '@sofie-automation/corelib/dist/dataModel/Studio'
 import { ObserveChangesHelper } from '../collections/lib'
-import { MeteorStartupAsync } from '../../lib/lib'
+import { MeteorStartupAsync } from '../lib/lib'
 
 const ObserveChangeBufferTimeout = 100
 
diff --git a/meteor/server/api/blueprints/__tests__/api.test.ts b/meteor/server/api/blueprints/__tests__/api.test.ts
index 6f2a3318e2..9d22018e26 100644
--- a/meteor/server/api/blueprints/__tests__/api.test.ts
+++ b/meteor/server/api/blueprints/__tests__/api.test.ts
@@ -1,12 +1,13 @@
 import * as _ from 'underscore'
 import { setupDefaultStudioEnvironment, packageBlueprint } from '../../../../__mocks__/helpers/database'
 import { testInFiber } from '../../../../__mocks__/helpers/jest'
-import { literal, getRandomId, protectString } from '../../../../lib/lib'
+import { literal, getRandomId, protectString } from '../../../lib/tempLib'
 import { Blueprint } from '@sofie-automation/corelib/dist/dataModel/Blueprint'
 import { BlueprintManifestType } from '@sofie-automation/blueprints-integration'
-import { SYSTEM_ID, ICoreSystem } from '../../../../lib/collections/CoreSystem'
+import { SYSTEM_ID, ICoreSystem } from '@sofie-automation/meteor-lib/dist/collections/CoreSystem'
 import { insertBlueprint, uploadBlueprint } from '../api'
-import { MeteorCall, MethodContext } from '../../../../lib/api/methods'
+import { MeteorCall } from '../../methods'
+import { MethodContext } from '../../methodContext'
 import '../../../../__mocks__/_extendJest'
 import { Blueprints, CoreSystem } from '../../../collections'
 import { SupressLogMessages } from '../../../../__mocks__/suppressLogging'
diff --git a/meteor/server/api/blueprints/__tests__/lib.ts b/meteor/server/api/blueprints/__tests__/lib.ts
index 012231094a..1b443d9715 100644
--- a/meteor/server/api/blueprints/__tests__/lib.ts
+++ b/meteor/server/api/blueprints/__tests__/lib.ts
@@ -1,5 +1,5 @@
 import { BlueprintManifestType, SomeBlueprintManifest } from '@sofie-automation/blueprints-integration'
-import { getRandomId, literal, protectString } from '../../../../lib/lib'
+import { getRandomId, literal, protectString } from '../../../lib/tempLib'
 import { Blueprint } from '@sofie-automation/corelib/dist/dataModel/Blueprint'
 import { JSONBlobStringify } from '@sofie-automation/shared-lib/dist/lib/JSONBlob'
 
diff --git a/meteor/server/api/blueprints/__tests__/migrationContext.test.ts b/meteor/server/api/blueprints/__tests__/migrationContext.test.ts
index 3f8935b77d..47fce54f94 100644
--- a/meteor/server/api/blueprints/__tests__/migrationContext.test.ts
+++ b/meteor/server/api/blueprints/__tests__/migrationContext.test.ts
@@ -7,7 +7,7 @@ import {
 	PeripheralDeviceType,
 	PERIPHERAL_SUBTYPE_PROCESS,
 } from '@sofie-automation/corelib/dist/dataModel/PeripheralDevice'
-import { literal, getRandomId, protectString, unprotectString } from '../../../../lib/lib'
+import { literal, getRandomId, protectString, unprotectString } from '../../../lib/tempLib'
 import {
 	LookaheadMode,
 	BlueprintMapping,
diff --git a/meteor/server/api/blueprints/api.ts b/meteor/server/api/blueprints/api.ts
index 3f7e508ad7..e2f2ec7bc5 100644
--- a/meteor/server/api/blueprints/api.ts
+++ b/meteor/server/api/blueprints/api.ts
@@ -1,7 +1,8 @@
 import * as _ from 'underscore'
 import path from 'path'
 import { ReadStream, createReadStream, promises as fsp } from 'fs'
-import { getCurrentTime, unprotectString, getRandomId } from '../../../lib/lib'
+import { unprotectString, getRandomId } from '../../lib/tempLib'
+import { getCurrentTime } from '../../lib/lib'
 import { logger } from '../../logging'
 import { Meteor } from 'meteor/meteor'
 import { Blueprint } from '@sofie-automation/corelib/dist/dataModel/Blueprint'
@@ -11,17 +12,18 @@ import {
 	SomeBlueprintManifest,
 	TranslationsBundle,
 } from '@sofie-automation/blueprints-integration'
-import { check, Match } from '../../../lib/check'
-import { NewBlueprintAPI, BlueprintAPIMethods } from '../../../lib/api/blueprint'
+import { check, Match } from '../../lib/check'
+import { NewBlueprintAPI, BlueprintAPIMethods } from '@sofie-automation/meteor-lib/dist/api/blueprint'
 import { registerClassToMeteorMethods, ReplaceOptionalWithNullInMethodArguments } from '../../methods'
-import { parseVersion, SYSTEM_ID } from '../../../lib/collections/CoreSystem'
+import { SYSTEM_ID } from '@sofie-automation/meteor-lib/dist/collections/CoreSystem'
+import { parseVersion } from '../../systemStatus/semverUtils'
 import { evalBlueprint } from './cache'
 import { removeSystemStatus } from '../../systemStatus/systemStatus'
-import { MethodContext, MethodContextAPI } from '../../../lib/api/methods'
+import { MethodContext, MethodContextAPI } from '../methodContext'
 import { OrganizationContentWriteAccess, OrganizationReadAccess } from '../../security/organization'
 import { SystemWriteAccess } from '../../security/system'
 import { Credentials, isResolvedCredentials } from '../../security/lib/credentials'
-import { Settings } from '../../../lib/Settings'
+import { Settings } from '../../Settings'
 import { generateTranslationBundleOriginId, upsertBundles } from '../translationsBundles'
 import { BlueprintId, OrganizationId, ShowStyleBaseId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import { Blueprints, CoreSystem, ShowStyleBases, ShowStyleVariants, Studios } from '../../collections'
diff --git a/meteor/server/api/blueprints/http.ts b/meteor/server/api/blueprints/http.ts
index b59f322f98..70a0bb520f 100644
--- a/meteor/server/api/blueprints/http.ts
+++ b/meteor/server/api/blueprints/http.ts
@@ -2,9 +2,9 @@ import * as _ from 'underscore'
 import { logger } from '../../logging'
 import { Meteor } from 'meteor/meteor'
 import { BlueprintManifestSet } from '@sofie-automation/blueprints-integration'
-import { check, Match } from '../../../lib/check'
+import { check, Match } from '../../lib/check'
 import { retrieveBlueprintAsset, uploadBlueprint, uploadBlueprintAsset } from './api'
-import { protectString } from '../../../lib/lib'
+import { protectString } from '../../lib/tempLib'
 import path from 'path'
 import { BlueprintId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import KoaRouter from '@koa/router'
diff --git a/meteor/server/api/blueprints/migrationContext.ts b/meteor/server/api/blueprints/migrationContext.ts
index 2efa6221ca..fe742fdc9d 100644
--- a/meteor/server/api/blueprints/migrationContext.ts
+++ b/meteor/server/api/blueprints/migrationContext.ts
@@ -1,6 +1,5 @@
 import * as _ from 'underscore'
 import {
-	trimIfString,
 	getHash,
 	unprotectObject,
 	protectString,
@@ -9,9 +8,9 @@ import {
 	objectPathSet,
 	clone,
 	Complete,
-	waitForPromise,
 	objectPathDelete,
-} from '../../../lib/lib'
+} from '../../lib/tempLib'
+import { waitForPromise } from '../../lib/lib'
 import { DBStudio, StudioPlayoutDevice } from '@sofie-automation/corelib/dist/dataModel/Studio'
 import { DBShowStyleBase } from '@sofie-automation/corelib/dist/dataModel/ShowStyleBase'
 import { Meteor } from 'meteor/meteor'
@@ -31,12 +30,12 @@ import {
 } from '@sofie-automation/blueprints-integration'
 
 import { DBShowStyleVariant } from '@sofie-automation/corelib/dist/dataModel/ShowStyleVariant'
-import { check } from '../../../lib/check'
+import { check } from '../../lib/check'
 import {
 	PERIPHERAL_SUBTYPE_PROCESS,
 	PeripheralDeviceType,
 } from '@sofie-automation/corelib/dist/dataModel/PeripheralDevice'
-import { TriggeredActionsObj } from '../../../lib/collections/TriggeredActions'
+import { TriggeredActionsObj } from '@sofie-automation/meteor-lib/dist/collections/TriggeredActions'
 import { Match } from 'meteor/check'
 import { MongoModifier } from '@sofie-automation/corelib/dist/mongo'
 import { wrapDefaultObject } from '@sofie-automation/corelib/dist/settings/objectWithOverrides'
@@ -44,6 +43,11 @@ import { ShowStyleBaseId, ShowStyleVariantId, TriggeredActionId } from '@sofie-a
 import { PeripheralDevices, ShowStyleBases, ShowStyleVariants, Studios, TriggeredActions } from '../../collections'
 import { literal } from '@sofie-automation/shared-lib/dist/lib/lib'
 
+function trimIfString<T>(value: T): T | string {
+	if (_.isString(value)) return value.trim()
+	return value
+}
+
 function convertTriggeredActionToBlueprints(triggeredAction: TriggeredActionsObj): IBlueprintTriggeredActions {
 	const obj: Complete<IBlueprintTriggeredActions> = {
 		_id: unprotectString(triggeredAction._id),
diff --git a/meteor/server/api/buckets.ts b/meteor/server/api/buckets.ts
index 7d2c75a9c2..ac2ad69cbe 100644
--- a/meteor/server/api/buckets.ts
+++ b/meteor/server/api/buckets.ts
@@ -1,7 +1,7 @@
 import * as _ from 'underscore'
 import { Meteor } from 'meteor/meteor'
-import { Bucket } from '../../lib/collections/Buckets'
-import { getRandomId, getRandomString, literal } from '../../lib/lib'
+import { Bucket } from '@sofie-automation/meteor-lib/dist/collections/Buckets'
+import { getRandomId, getRandomString, literal } from '../lib/tempLib'
 import { BucketSecurity } from '../security/buckets'
 import { BucketAdLib } from '@sofie-automation/corelib/dist/dataModel/BucketAdLibPiece'
 import { AdLibAction, AdLibActionCommon } from '@sofie-automation/corelib/dist/dataModel/AdlibAction'
@@ -10,7 +10,7 @@ import { BucketAdLibActions, Buckets, Rundowns, ShowStyleVariants, Studios } fro
 import { runIngestOperation } from './ingest/lib'
 import { IngestJobs } from '@sofie-automation/corelib/dist/worker/ingest'
 import { StudioContentAccess } from '../security/studio'
-import { Settings } from '../../lib/Settings'
+import { Settings } from '../Settings'
 import { IngestAdlib } from '@sofie-automation/blueprints-integration'
 import { getShowStyleCompound } from './showStyles'
 import { ShowStyleBaseId, ShowStyleVariantId } from '@sofie-automation/corelib/dist/dataModel/Ids'
diff --git a/meteor/server/api/cleanup.ts b/meteor/server/api/cleanup.ts
index ddda7da794..f763388407 100644
--- a/meteor/server/api/cleanup.ts
+++ b/meteor/server/api/cleanup.ts
@@ -1,5 +1,6 @@
-import { ProtectedString, getCurrentTime } from '../../lib/lib'
-import { CollectionCleanupResult } from '../../lib/api/system'
+import { ProtectedString } from '@sofie-automation/shared-lib/dist/lib/protectedString'
+import { getCurrentTime } from '../lib/lib'
+import { CollectionCleanupResult } from '@sofie-automation/meteor-lib/dist/api/system'
 import { MongoQuery } from '@sofie-automation/corelib/dist/mongo'
 import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
 import {
@@ -8,7 +9,7 @@ import {
 	getOrphanedPackageInfos,
 	removePackageInfos,
 } from './studio/lib'
-import { Settings } from '../../lib/Settings'
+import { Settings } from '../Settings'
 import { CollectionName } from '@sofie-automation/corelib/dist/dataModel/Collections'
 import {
 	BlueprintId,
diff --git a/meteor/server/api/client.ts b/meteor/server/api/client.ts
index 90bdfd170f..9aeb3a7156 100644
--- a/meteor/server/api/client.ts
+++ b/meteor/server/api/client.ts
@@ -1,12 +1,13 @@
-import { check } from '../../lib/check'
-import { literal, getCurrentTime, Time, getRandomId } from '../../lib/lib'
+import { check } from '../lib/check'
+import { literal, Time, getRandomId } from '../lib/tempLib'
+import { getCurrentTime } from '../lib/lib'
 import { stringifyError } from '@sofie-automation/shared-lib/dist/lib/stringifyError'
 import { logger } from '../logging'
-import { ClientAPI, NewClientAPI, ClientAPIMethods } from '../../lib/api/client'
-import { UserActionsLogItem } from '../../lib/collections/UserActionsLog'
+import { ClientAPI, NewClientAPI, ClientAPIMethods } from '@sofie-automation/meteor-lib/dist/api/client'
+import { UserActionsLogItem } from '@sofie-automation/meteor-lib/dist/collections/UserActionsLog'
 import { registerClassToMeteorMethods } from '../methods'
-import { MethodContext, MethodContextAPI } from '../../lib/api/methods'
-import { Settings } from '../../lib/Settings'
+import { MethodContext, MethodContextAPI } from './methodContext'
+import { Settings } from '../Settings'
 import { resolveCredentials } from '../security/lib/credentials'
 import { isInTestWrite, triggerWriteAccessBecauseNoCheckNecessary } from '../security/lib/securityVerify'
 import { PeripheralDeviceContentWriteAccess } from '../security/peripheralDevice'
@@ -32,9 +33,9 @@ import {
 	VerifiedRundownPlaylistContentAccess,
 } from './lib'
 import { BasicAccessContext } from '../security/organization'
-import { NoticeLevel } from '../../lib/notifications/notifications'
 import { UserActionsLog } from '../collections'
 import { executePeripheralDeviceFunctionWithCustomTimeout } from './peripheralDevice/executeFunction'
+import { LeveledLogMethodFixed } from '@sofie-automation/corelib/dist/logging'
 
 function rewrapError(methodName: string, e: any): ClientAPI.ClientResponseError {
 	const userError = UserError.fromUnknown(e)
@@ -63,7 +64,7 @@ export namespace ServerClientAPI {
 			userEvent,
 			eventTime,
 			`worker.${jobName}`,
-			[jobArguments],
+			jobArguments as any,
 			async (_credentials, userActionMetadata) => {
 				checkArgs()
 
@@ -90,7 +91,7 @@ export namespace ServerClientAPI {
 			userEvent,
 			eventTime,
 			`worker.${jobName}`,
-			[jobArguments],
+			jobArguments as any,
 			async (_credentials, userActionMetadata) => {
 				checkArgs()
 
@@ -110,7 +111,7 @@ export namespace ServerClientAPI {
 		playlistId: RundownPlaylistId,
 		checkArgs: () => void,
 		methodName: string,
-		args: any[],
+		args: Record<string, unknown>,
 		fcn: (access: VerifiedRundownPlaylistContentAccess) => Promise<T>
 	): Promise<ClientAPI.ClientResponse<T>> {
 		return runUserActionInLog(context, userEvent, eventTime, methodName, args, async () => {
@@ -131,7 +132,7 @@ export namespace ServerClientAPI {
 		rundownId: RundownId,
 		checkArgs: () => void,
 		methodName: string,
-		args: any[],
+		args: Record<string, unknown>,
 		fcn: (access: VerifiedRundownContentAccess) => Promise<T>
 	): Promise<ClientAPI.ClientResponse<T>> {
 		return runUserActionInLog(context, userEvent, eventTime, methodName, args, async () => {
@@ -183,7 +184,7 @@ export namespace ServerClientAPI {
 		userEvent: string,
 		eventTime: Time,
 		methodName: string,
-		methodArgs: unknown[],
+		methodArgs: Record<string, unknown>,
 		fcn: (credentials: BasicAccessContext, userActionMetadata: UserActionMetadata) => Promise<TRes>
 	): Promise<ClientAPI.ClientResponse<TRes>> {
 		// If we are in the test write auth check mode, then bypass all special logic to ensure errors dont get mangled
@@ -235,14 +236,21 @@ export namespace ServerClientAPI {
 					const result = await fcn(credentials, userActionMetadata)
 
 					const completeTime = Date.now()
-					await UserActionsLog.updateAsync(actionId, {
-						$set: {
-							success: true,
-							doneTime: completeTime,
-							executionTime: completeTime - startTime,
-							workerTime: userActionMetadata.workerDuration,
-						},
-					})
+					pInitialInsert
+						.then(async () =>
+							UserActionsLog.updateAsync(actionId, {
+								$set: {
+									success: true,
+									doneTime: completeTime,
+									executionTime: completeTime - startTime,
+									workerTime: userActionMetadata.workerDuration,
+								},
+							})
+						)
+						.catch((err) => {
+							// If this fails make sure it is handled
+							logger.warn(`Failed to update UserActionsLog: ${stringifyError(err)}`)
+						})
 
 					return ClientAPI.responseSuccess(result)
 				} catch (e) {
@@ -413,6 +421,11 @@ export namespace ServerClientAPI {
 }
 
 class ServerClientAPIClass extends MethodContextAPI implements NewClientAPI {
+	async clientLogger(type: string, ...args: string[]): Promise<void> {
+		const loggerFunction: LeveledLogMethodFixed = (logger as any)[type] || logger.log
+
+		loggerFunction(args.join(', '))
+	}
 	async clientErrorReport(timestamp: Time, errorString: string, location: string) {
 		check(timestamp, Number)
 		triggerWriteAccessBecauseNoCheckNecessary() // TODO: discuss if is this ok?
@@ -422,7 +435,7 @@ class ServerClientAPIClass extends MethodContextAPI implements NewClientAPI {
 			}"\n  at ${new Date(timestamp).toISOString()}:\n"${errorString}`
 		)
 	}
-	async clientLogNotification(timestamp: Time, from: string, severity: NoticeLevel, message: string, source?: any) {
+	async clientLogNotification(timestamp: Time, from: string, severity: number, message: string, source?: any) {
 		check(timestamp, Number)
 		triggerWriteAccessBecauseNoCheckNecessary() // TODO: discuss if is this ok?
 		const address = this.connection ? this.connection.clientAddress : 'N/A'
diff --git a/meteor/server/api/deviceTriggers/StudioActionManagers.ts b/meteor/server/api/deviceTriggers/StudioActionManagers.ts
index 403731ec4f..9e1f020480 100644
--- a/meteor/server/api/deviceTriggers/StudioActionManagers.ts
+++ b/meteor/server/api/deviceTriggers/StudioActionManagers.ts
@@ -1,6 +1,9 @@
 import { StudioId } from '@sofie-automation/corelib/dist/dataModel/Ids'
-import { ExecutableAction, ReactivePlaylistActionContext } from '../../../lib/api/triggers/actionFactory'
-import { DeviceActionId } from '../../../lib/api/triggers/MountedTriggers'
+import {
+	ExecutableAction,
+	ReactivePlaylistActionContext,
+} from '@sofie-automation/meteor-lib/dist/triggers/actionFactory'
+import { DeviceActionId } from '@sofie-automation/meteor-lib/dist/api/MountedTriggers'
 
 /**
  * `StudioActionManager` allows to store the current, runtime ReactivePlaylistActionContext for a given studio
diff --git a/meteor/server/api/deviceTriggers/StudioDeviceTriggerManager.ts b/meteor/server/api/deviceTriggers/StudioDeviceTriggerManager.ts
index fc1b6ac0c2..f710070aba 100644
--- a/meteor/server/api/deviceTriggers/StudioDeviceTriggerManager.ts
+++ b/meteor/server/api/deviceTriggers/StudioDeviceTriggerManager.ts
@@ -8,23 +8,28 @@ import {
 	ExecutableAction,
 	isPreviewableAction,
 	ReactivePlaylistActionContext,
-} from '../../../lib/api/triggers/actionFactory'
+} from '@sofie-automation/meteor-lib/dist/triggers/actionFactory'
 import {
 	DeviceActionId,
 	DeviceTriggerMountedActionId,
 	PreviewWrappedAdLib,
 	PreviewWrappedAdLibId,
 	ShiftRegisterActionArguments,
-} from '../../../lib/api/triggers/MountedTriggers'
-import { isDeviceTrigger } from '../../../lib/api/triggers/triggerTypeSelectors'
-import { DBTriggeredActions, UITriggeredActionsObj } from '../../../lib/collections/TriggeredActions'
-import { DummyReactiveVar, protectString } from '../../../lib/lib'
+} from '@sofie-automation/meteor-lib/dist/api/MountedTriggers'
+import { isDeviceTrigger } from '@sofie-automation/meteor-lib/dist/triggers/triggerTypeSelectors'
+import {
+	DBTriggeredActions,
+	UITriggeredActionsObj,
+} from '@sofie-automation/meteor-lib/dist/collections/TriggeredActions'
+import { protectString } from '../../lib/tempLib'
 import { StudioActionManager, StudioActionManagers } from './StudioActionManagers'
 import { DeviceTriggerMountedActionAdlibsPreview, DeviceTriggerMountedActions } from './observer'
 import { ContentCache } from './reactiveContentCache'
 import { logger } from '../../logging'
 import { SomeAction, SomeBlueprintTrigger } from '@sofie-automation/blueprints-integration'
 import { DeviceActions } from '@sofie-automation/shared-lib/dist/core/model/ShowStyle'
+import { DummyReactiveVar } from '@sofie-automation/meteor-lib/dist/triggers/reactive-var'
+import { MeteorTriggersContext } from './triggersContext'
 
 export class StudioDeviceTriggerManager {
 	#lastShowStyleBaseId: ShowStyleBaseId | null = null
@@ -51,7 +56,7 @@ export class StudioDeviceTriggerManager {
 			return
 		}
 
-		const context = createCurrentContextFromCache(cache)
+		const context = createCurrentContextFromCache(cache, studioId)
 		const actionManager = StudioActionManagers.get(studioId)
 		if (!actionManager)
 			throw new Meteor.Error(
@@ -95,7 +100,7 @@ export class StudioDeviceTriggerManager {
 				if (existingAction) {
 					thisAction = existingAction
 				} else {
-					const compiledAction = createAction(action, sourceLayers)
+					const compiledAction = createAction(MeteorTriggersContext, action, sourceLayers)
 					actionManager.setAction(actionId, compiledAction)
 					thisAction = compiledAction
 				}
@@ -266,7 +271,7 @@ function convertDocument(doc: ReadonlyObjectDeep<DBTriggeredActions>): UITrigger
 	})
 }
 
-function createCurrentContextFromCache(cache: ContentCache): ReactivePlaylistActionContext {
+function createCurrentContextFromCache(cache: ContentCache, studioId: StudioId): ReactivePlaylistActionContext {
 	const rundownPlaylist = cache.RundownPlaylists.findOne({
 		activationId: {
 			$exists: true,
@@ -296,6 +301,7 @@ function createCurrentContextFromCache(cache: ContentCache): ReactivePlaylistAct
 		: []
 
 	return {
+		studioId: new DummyReactiveVar(studioId),
 		currentPartInstanceId: new DummyReactiveVar(currentPartInstance?._id ?? null),
 		currentPartId: new DummyReactiveVar(currentPartInstance?.part._id ?? null),
 		nextPartId: new DummyReactiveVar(nextPartInstance?.part._id ?? null),
diff --git a/meteor/server/api/deviceTriggers/StudioObserver.ts b/meteor/server/api/deviceTriggers/StudioObserver.ts
index 586363558b..a6b38c239b 100644
--- a/meteor/server/api/deviceTriggers/StudioObserver.ts
+++ b/meteor/server/api/deviceTriggers/StudioObserver.ts
@@ -10,7 +10,7 @@ import { MongoFieldSpecifierOnesStrict } from '@sofie-automation/corelib/dist/mo
 import EventEmitter from 'events'
 import { Meteor } from 'meteor/meteor'
 import _ from 'underscore'
-import { MongoCursor } from '../../../lib/collections/lib'
+import { MongoCursor } from '@sofie-automation/meteor-lib/dist/collections/lib'
 import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
 import { DBRundown } from '@sofie-automation/corelib/dist/dataModel/Rundown'
 import { DBShowStyleBase } from '@sofie-automation/corelib/dist/dataModel/ShowStyleBase'
diff --git a/meteor/server/api/deviceTriggers/observer.ts b/meteor/server/api/deviceTriggers/observer.ts
index 62ae1b6ca8..b23ba371ae 100644
--- a/meteor/server/api/deviceTriggers/observer.ts
+++ b/meteor/server/api/deviceTriggers/observer.ts
@@ -3,12 +3,12 @@ import { ITranslatableMessage } from '@sofie-automation/corelib/dist/Translatabl
 import { check } from 'meteor/check'
 import { Meteor } from 'meteor/meteor'
 import _ from 'underscore'
-import { MethodContext } from '../../../lib/api/methods'
+import { MethodContext } from '../methodContext'
 import {
 	DeviceTriggerArguments,
 	DeviceTriggerMountedAction,
 	PreviewWrappedAdLib,
-} from '../../../lib/api/triggers/MountedTriggers'
+} from '@sofie-automation/meteor-lib/dist/api/MountedTriggers'
 import { logger } from '../../logging'
 import { checkAccessAndGetPeripheralDevice } from '../ingest/lib'
 import { StudioActionManagers } from './StudioActionManagers'
@@ -17,6 +17,7 @@ import { StudioDeviceTriggerManager } from './StudioDeviceTriggerManager'
 import { StudioObserver } from './StudioObserver'
 import { Studios } from '../../collections'
 import { ReactiveCacheCollection } from '../../publications/lib/ReactiveCacheCollection'
+import { stringifyError } from '@sofie-automation/shared-lib/dist/lib/stringifyError'
 
 type ObserverAndManager = {
 	observer: StudioObserver
@@ -34,8 +35,7 @@ Meteor.startup(() => {
 
 	function workInQueue(fnc: () => Promise<void>) {
 		jobQueue.add(fnc).catch((e) => {
-			logger.error(`Error in DeviceTriggers Studio observer reaction: ${e}`)
-			logger.error(e)
+			logger.error(`Error in DeviceTriggers Studio observer reaction: ${stringifyError(e)}`)
 		})
 	}
 
diff --git a/meteor/server/api/deviceTriggers/reactiveContentCache.ts b/meteor/server/api/deviceTriggers/reactiveContentCache.ts
index c3606fe849..c61d96fe97 100644
--- a/meteor/server/api/deviceTriggers/reactiveContentCache.ts
+++ b/meteor/server/api/deviceTriggers/reactiveContentCache.ts
@@ -9,7 +9,7 @@ import { RundownBaselineAdLibItem } from '@sofie-automation/corelib/dist/dataMod
 import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
 import { DBSegment } from '@sofie-automation/corelib/dist/dataModel/Segment'
 import { DBShowStyleBase } from '@sofie-automation/corelib/dist/dataModel/ShowStyleBase'
-import { DBTriggeredActions } from '../../../lib/collections/TriggeredActions'
+import { DBTriggeredActions } from '@sofie-automation/meteor-lib/dist/collections/TriggeredActions'
 import { MongoFieldSpecifierOnesStrict } from '@sofie-automation/corelib/dist/mongo'
 import { literal } from '@sofie-automation/corelib/dist/lib'
 import { ReactiveCacheCollection } from '../../publications/lib/ReactiveCacheCollection'
diff --git a/meteor/server/api/deviceTriggers/triggersContext.ts b/meteor/server/api/deviceTriggers/triggersContext.ts
new file mode 100644
index 0000000000..c8c95db6b5
--- /dev/null
+++ b/meteor/server/api/deviceTriggers/triggersContext.ts
@@ -0,0 +1,185 @@
+import { TriggersContext } from '@sofie-automation/meteor-lib/dist/triggers/triggersContext'
+import { SINGLE_USE_TOKEN_SALT } from '@sofie-automation/meteor-lib/dist/api/userActions'
+import { assertNever, getHash, Time } from '../../lib/tempLib'
+import { getCurrentTime } from '../../lib/lib'
+import { MeteorCall } from '../methods'
+import { ClientAPI } from '@sofie-automation/meteor-lib/dist/api/client'
+import { UserAction } from '@sofie-automation/meteor-lib/dist/userAction'
+import { TFunction } from 'i18next'
+import { Tracker } from 'meteor/tracker'
+
+import { logger } from '../../logging'
+import { IBaseFilterLink, IRundownPlaylistFilterLink } from '@sofie-automation/blueprints-integration'
+import { PartId, StudioId } from '@sofie-automation/corelib/dist/dataModel/Ids'
+import { DummyReactiveVar } from '@sofie-automation/meteor-lib/dist/triggers/reactive-var'
+import { ReactivePlaylistActionContext } from '@sofie-automation/meteor-lib/dist/triggers/actionFactory'
+import { MongoQuery } from '@sofie-automation/corelib/dist/mongo'
+import { CollectionName } from '@sofie-automation/corelib/dist/dataModel/Collections'
+import { AdLibAction } from '@sofie-automation/corelib/dist/dataModel/AdlibAction'
+import { AdLibPiece } from '@sofie-automation/corelib/dist/dataModel/AdLibPiece'
+import { PartInstance } from '@sofie-automation/meteor-lib/dist/collections/PartInstances'
+import { DBPart } from '@sofie-automation/corelib/dist/dataModel/Part'
+import { RundownBaselineAdLibAction } from '@sofie-automation/corelib/dist/dataModel/RundownBaselineAdLibAction'
+import { RundownBaselineAdLibItem } from '@sofie-automation/corelib/dist/dataModel/RundownBaselineAdLibPiece'
+import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
+import { DBRundown } from '@sofie-automation/corelib/dist/dataModel/Rundown'
+import { DBSegment } from '@sofie-automation/corelib/dist/dataModel/Segment'
+import { createSyncReadOnlyMongoCollection } from './triggersContextCollection'
+
+export function hashSingleUseToken(token: string): string {
+	return getHash(SINGLE_USE_TOKEN_SALT + token)
+}
+
+/**
+ * Some synchronous read-only collections to satisfy the TriggersContext interface
+ */
+const AdLibActions = createSyncReadOnlyMongoCollection<AdLibAction>(CollectionName.AdLibActions)
+const AdLibPieces = createSyncReadOnlyMongoCollection<AdLibPiece>(CollectionName.AdLibPieces)
+const PartInstances = createSyncReadOnlyMongoCollection<PartInstance>(CollectionName.PartInstances)
+const Parts = createSyncReadOnlyMongoCollection<DBPart>(CollectionName.Parts)
+const RundownBaselineAdLibActions = createSyncReadOnlyMongoCollection<RundownBaselineAdLibAction>(
+	CollectionName.RundownBaselineAdLibActions
+)
+const RundownBaselineAdLibPieces = createSyncReadOnlyMongoCollection<RundownBaselineAdLibItem>(
+	CollectionName.RundownBaselineAdLibPieces
+)
+const RundownPlaylists = createSyncReadOnlyMongoCollection<DBRundownPlaylist>(CollectionName.RundownPlaylists)
+const Rundowns = createSyncReadOnlyMongoCollection<DBRundown>(CollectionName.Rundowns)
+const Segments = createSyncReadOnlyMongoCollection<DBSegment>(CollectionName.Segments)
+
+export const MeteorTriggersContext: TriggersContext = {
+	MeteorCall,
+
+	logger,
+
+	isClient: false,
+
+	AdLibActions,
+	AdLibPieces,
+	Parts,
+	RundownBaselineAdLibActions,
+	RundownBaselineAdLibPieces,
+	RundownPlaylists,
+	Rundowns,
+	Segments,
+
+	hashSingleUseToken,
+
+	doUserAction: <Result>(
+		_t: TFunction,
+		userEvent: string,
+		_action: UserAction,
+		fcn: (event: string, timeStamp: Time) => Promise<ClientAPI.ClientResponse<Result>>,
+		callback?: (err: any, res?: Result) => void | boolean,
+		_okMessage?: string
+	): void => {
+		fcn(userEvent, getCurrentTime()).then(
+			(value) =>
+				typeof callback === 'function' &&
+				(ClientAPI.isClientResponseSuccess(value) ? callback(undefined, value.result) : callback(value)),
+			(reason) => typeof callback === 'function' && callback(reason)
+		)
+	},
+
+	nonreactiveTracker: Tracker.nonreactive,
+
+	memoizedIsolatedAutorun: <T extends (...args: any) => any>(
+		fnc: T,
+		_functionName: string,
+		...params: Parameters<T>
+	): ReturnType<T> => {
+		return fnc(...(params as any))
+	},
+
+	createContextForRundownPlaylistChain,
+}
+
+function createContextForRundownPlaylistChain(
+	studioId: StudioId,
+	filterChain: IBaseFilterLink[]
+): ReactivePlaylistActionContext | undefined {
+	const playlist = rundownPlaylistFilter(
+		studioId,
+		filterChain.filter((link) => link.object === 'rundownPlaylist') as IRundownPlaylistFilterLink[]
+	)
+
+	if (!playlist) return undefined
+
+	let currentPartId: PartId | null = null,
+		nextPartId: PartId | null = null,
+		currentPartInstance: PartInstance | null = null,
+		currentSegmentPartIds: PartId[] = [],
+		nextSegmentPartIds: PartId[] = []
+
+	if (playlist.currentPartInfo) {
+		currentPartInstance = PartInstances.findOne(playlist.currentPartInfo.partInstanceId) ?? null
+		const currentPart = currentPartInstance?.part ?? null
+		if (currentPart) {
+			currentPartId = currentPart._id
+			currentSegmentPartIds = Parts.find({
+				segmentId: currentPart.segmentId,
+			}).map((part) => part._id)
+		}
+	}
+	if (playlist.nextPartInfo) {
+		const nextPart = PartInstances.findOne(playlist.nextPartInfo.partInstanceId)?.part ?? null
+		if (nextPart) {
+			nextPartId = nextPart._id
+			nextSegmentPartIds = Parts.find({
+				segmentId: nextPart.segmentId,
+			}).map((part) => part._id)
+		}
+	}
+
+	return {
+		studioId: new DummyReactiveVar(studioId),
+		rundownPlaylistId: new DummyReactiveVar(playlist?._id),
+		rundownPlaylist: new DummyReactiveVar(playlist),
+		currentRundownId: new DummyReactiveVar(currentPartInstance?.rundownId ?? playlist.rundownIdsInOrder[0] ?? null),
+		currentPartId: new DummyReactiveVar(currentPartId),
+		currentSegmentPartIds: new DummyReactiveVar(currentSegmentPartIds),
+		nextPartId: new DummyReactiveVar(nextPartId),
+		nextSegmentPartIds: new DummyReactiveVar(nextSegmentPartIds),
+		currentPartInstanceId: new DummyReactiveVar(playlist.currentPartInfo?.partInstanceId ?? null),
+	}
+}
+
+function rundownPlaylistFilter(
+	studioId: StudioId,
+	filterChain: IRundownPlaylistFilterLink[]
+): DBRundownPlaylist | undefined {
+	const selector: MongoQuery<DBRundownPlaylist> = {
+		$and: [
+			{
+				studioId,
+			},
+		],
+	}
+
+	filterChain.forEach((link) => {
+		switch (link.field) {
+			case 'activationId':
+				selector['activationId'] = {
+					$exists: link.value,
+				}
+				break
+			case 'name':
+				selector['name'] = {
+					$regex: link.value,
+				}
+				break
+			case 'studioId':
+				selector['$and']?.push({
+					studioId: {
+						$regex: link.value as any,
+					},
+				})
+				break
+			default:
+				assertNever(link)
+				break
+		}
+	})
+
+	return RundownPlaylists.findOne(selector)
+}
diff --git a/meteor/server/api/deviceTriggers/triggersContextCollection.ts b/meteor/server/api/deviceTriggers/triggersContextCollection.ts
new file mode 100644
index 0000000000..23711d92bb
--- /dev/null
+++ b/meteor/server/api/deviceTriggers/triggersContextCollection.ts
@@ -0,0 +1,76 @@
+import { Meteor } from 'meteor/meteor'
+import { Mongo } from 'meteor/mongo'
+import { stringifyError } from '@sofie-automation/shared-lib/dist/lib/stringifyError'
+import { CollectionName } from '@sofie-automation/corelib/dist/dataModel/Collections'
+import { MongoQuery } from '@sofie-automation/corelib/dist/mongo'
+import {
+	MongoReadOnlyCollection,
+	MongoCursor,
+	FindOptions,
+	FindOneOptions,
+} from '@sofie-automation/meteor-lib/dist/collections/lib'
+import { ProtectedString } from '@sofie-automation/corelib/dist/protectedString'
+import { getOrCreateMongoCollection } from '../../collections/collection'
+
+/**
+ * Create a Mongo Collection for use in the client (has sync apis)
+ * @param name Name of the collection
+ */
+export function createSyncReadOnlyMongoCollection<DBInterface extends { _id: ProtectedString<any> }>(
+	name: CollectionName
+): MongoReadOnlyCollection<DBInterface> {
+	const collection = getOrCreateMongoCollection(name)
+	const wrapped = new WrappedMongoReadOnlyCollection<DBInterface>(collection, name)
+
+	// registerClientCollection(name, wrapped)
+
+	return wrapped
+}
+
+class WrappedMongoReadOnlyCollection<DBInterface extends { _id: ProtectedString<any> }>
+	implements MongoReadOnlyCollection<DBInterface>
+{
+	protected readonly _collection: Mongo.Collection<DBInterface>
+
+	public readonly name: string | null
+
+	constructor(collection: Mongo.Collection<DBInterface>, name: string | null) {
+		this._collection = collection
+		this.name = name
+	}
+
+	protected get _isMock() {
+		// @ts-expect-error re-export private property
+		return this._collection._isMock
+	}
+
+	public get mockCollection() {
+		return this._collection
+	}
+
+	protected wrapMongoError(e: any): never {
+		const str = stringifyError(e) || 'Unknown MongoDB Error'
+		throw new Meteor.Error((e && e.error) || 500, `Collection "${this.name}": ${str}`)
+	}
+
+	find(
+		selector?: MongoQuery<DBInterface> | DBInterface['_id'],
+		options?: FindOptions<DBInterface>
+	): MongoCursor<DBInterface> {
+		try {
+			return this._collection.find((selector ?? {}) as any, options as any) as MongoCursor<DBInterface>
+		} catch (e) {
+			this.wrapMongoError(e)
+		}
+	}
+	findOne(
+		selector?: MongoQuery<DBInterface> | DBInterface['_id'],
+		options?: FindOneOptions<DBInterface>
+	): DBInterface | undefined {
+		try {
+			return this._collection.findOne((selector ?? {}) as any, options as any)
+		} catch (e) {
+			this.wrapMongoError(e)
+		}
+	}
+}
diff --git a/meteor/server/api/evaluations.ts b/meteor/server/api/evaluations.ts
index 7088198584..3034110a65 100644
--- a/meteor/server/api/evaluations.ts
+++ b/meteor/server/api/evaluations.ts
@@ -1,5 +1,7 @@
-import { EvaluationBase } from '../../lib/collections/Evaluations'
-import { deferAsync, getCurrentTime, getRandomId, getSofieHostUrl } from '../../lib/lib'
+import { EvaluationBase } from '@sofie-automation/meteor-lib/dist/collections/Evaluations'
+import { getRandomId, getSofieHostUrl } from '../lib/tempLib'
+import { getCurrentTime } from '../lib/lib'
+import { deferAsync } from '../lib/lib'
 import { logger } from '../logging'
 import { Meteor } from 'meteor/meteor'
 import * as _ from 'underscore'
diff --git a/meteor/server/api/heapSnapshot.ts b/meteor/server/api/heapSnapshot.ts
index e441c538e3..1b9cb142a2 100644
--- a/meteor/server/api/heapSnapshot.ts
+++ b/meteor/server/api/heapSnapshot.ts
@@ -3,13 +3,13 @@ import { Readable } from 'stream'
 import { Meteor } from 'meteor/meteor'
 import Koa from 'koa'
 import KoaRouter from '@koa/router'
-import { fixValidPath } from '../../lib/lib'
+import { fixValidPath } from '../lib/lib'
+import { sleep } from '../lib/lib'
 import { stringifyError } from '@sofie-automation/shared-lib/dist/lib/stringifyError'
 import { logger } from '../logging'
-import { Settings } from '../../lib/Settings'
+import { Settings } from '../Settings'
 import { Credentials } from '../security/lib/credentials'
 import { SystemWriteAccess } from '../security/system'
-import { sleep } from '@sofie-automation/corelib/dist/lib'
 
 async function retrieveHeapSnapshot(cred0: Credentials): Promise<Readable> {
 	if (Settings.enableUserAccounts) {
diff --git a/meteor/server/api/ingest/actions.ts b/meteor/server/api/ingest/actions.ts
index cdabc65157..dc46d4a3fa 100644
--- a/meteor/server/api/ingest/actions.ts
+++ b/meteor/server/api/ingest/actions.ts
@@ -2,7 +2,7 @@ import { getPeripheralDeviceFromRundown, runIngestOperation } from './lib'
 import { MOSDeviceActions } from './mosDevice/actions'
 import { Meteor } from 'meteor/meteor'
 import { Rundown } from '@sofie-automation/corelib/dist/dataModel/Rundown'
-import { TriggerReloadDataResponse } from '../../../lib/api/userActions'
+import { TriggerReloadDataResponse } from '@sofie-automation/meteor-lib/dist/api/userActions'
 import { GenericDeviceActions } from './genericDevice/actions'
 import { PeripheralDeviceType } from '@sofie-automation/corelib/dist/dataModel/PeripheralDevice'
 import { IngestJobs } from '@sofie-automation/corelib/dist/worker/ingest'
diff --git a/meteor/server/api/ingest/debug.ts b/meteor/server/api/ingest/debug.ts
index 46ddca9630..4645a26450 100644
--- a/meteor/server/api/ingest/debug.ts
+++ b/meteor/server/api/ingest/debug.ts
@@ -1,5 +1,5 @@
 import { Meteor } from 'meteor/meteor'
-import { check } from '../../../lib/check'
+import { check } from '../../lib/check'
 import { RundownPlaylists, Rundowns, Segments } from '../../collections'
 import { logger } from '../../logging'
 import { runIngestOperation } from './lib'
diff --git a/meteor/server/api/ingest/genericDevice/actions.ts b/meteor/server/api/ingest/genericDevice/actions.ts
index 880b43db37..b78832a54c 100644
--- a/meteor/server/api/ingest/genericDevice/actions.ts
+++ b/meteor/server/api/ingest/genericDevice/actions.ts
@@ -1,7 +1,7 @@
 import { Meteor } from 'meteor/meteor'
 import { PeripheralDevice } from '@sofie-automation/corelib/dist/dataModel/PeripheralDevice'
 import { Rundown } from '@sofie-automation/corelib/dist/dataModel/Rundown'
-import { TriggerReloadDataResponse } from '../../../../lib/api/userActions'
+import { TriggerReloadDataResponse } from '@sofie-automation/meteor-lib/dist/api/userActions'
 import { stringifyError } from '@sofie-automation/shared-lib/dist/lib/stringifyError'
 import { logger } from '../../../logging'
 import * as _ from 'underscore'
diff --git a/meteor/server/api/ingest/http.ts b/meteor/server/api/ingest/http.ts
index 035f9d06a8..c708ed3128 100644
--- a/meteor/server/api/ingest/http.ts
+++ b/meteor/server/api/ingest/http.ts
@@ -1,9 +1,9 @@
-import { logger } from '../../../lib/logging'
+import { logger } from '../../logging'
 import { Meteor } from 'meteor/meteor'
-import { check } from '../../../lib/check'
+import { check } from '../../lib/check'
 import { Rundowns } from '../../collections'
 import { getRundownId, runIngestOperation } from './lib'
-import { protectString } from '../../../lib/lib'
+import { protectString } from '../../lib/tempLib'
 import { stringifyError } from '@sofie-automation/shared-lib/dist/lib/stringifyError'
 import { IngestJobs } from '@sofie-automation/corelib/dist/worker/ingest'
 import { IngestRundown } from '@sofie-automation/blueprints-integration'
diff --git a/meteor/server/api/ingest/ingestCache.ts b/meteor/server/api/ingest/ingestCache.ts
index c1e04b9691..e8f2cc74c9 100644
--- a/meteor/server/api/ingest/ingestCache.ts
+++ b/meteor/server/api/ingest/ingestCache.ts
@@ -1,7 +1,7 @@
 import * as _ from 'underscore'
 import { Meteor } from 'meteor/meteor'
 import { IngestRundown, IngestSegment, IngestPart } from '@sofie-automation/blueprints-integration'
-import { logger } from '../../../lib/logging'
+import { logger } from '../../logging'
 import { profiler } from '../profiler'
 import { RundownId, SegmentId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import { IngestDataCache } from '../../collections'
diff --git a/meteor/server/api/ingest/lib.ts b/meteor/server/api/ingest/lib.ts
index 9ea3789a65..15cd36b428 100644
--- a/meteor/server/api/ingest/lib.ts
+++ b/meteor/server/api/ingest/lib.ts
@@ -1,11 +1,12 @@
 import { Meteor } from 'meteor/meteor'
-import { getHash, getCurrentTime, protectString } from '../../../lib/lib'
+import { getHash, protectString } from '../../lib/tempLib'
+import { getCurrentTime } from '../../lib/lib'
 import { stringifyError } from '@sofie-automation/shared-lib/dist/lib/stringifyError'
 import { PeripheralDevice, PeripheralDeviceCategory } from '@sofie-automation/corelib/dist/dataModel/PeripheralDevice'
 import { Rundown, RundownSourceNrcs } from '@sofie-automation/corelib/dist/dataModel/Rundown'
 import { logger } from '../../logging'
 import { PeripheralDeviceContentWriteAccess } from '../../security/peripheralDevice'
-import { MethodContext } from '../../../lib/api/methods'
+import { MethodContext } from '../methodContext'
 import { Credentials } from '../../security/lib/credentials'
 import { profiler } from '../profiler'
 import { IngestJobFunc } from '@sofie-automation/corelib/dist/worker/ingest'
@@ -139,7 +140,7 @@ function updateDeviceLastDataReceived(deviceId: PeripheralDeviceId) {
 			lastDataReceived: getCurrentTime(),
 		},
 	}).catch((err) => {
-		logger.error(`Error in updateDeviceLastDataReceived "${deviceId}": ${err}`)
+		logger.error(`Error in updateDeviceLastDataReceived "${deviceId}": ${stringifyError(err)}`)
 	})
 }
 
diff --git a/meteor/server/api/ingest/mosDevice/__tests__/actions.test.ts b/meteor/server/api/ingest/mosDevice/__tests__/actions.test.ts
index 5b09f57b47..ba2d158797 100644
--- a/meteor/server/api/ingest/mosDevice/__tests__/actions.test.ts
+++ b/meteor/server/api/ingest/mosDevice/__tests__/actions.test.ts
@@ -1,13 +1,13 @@
 import '../../../../../__mocks__/_extendJest'
 import { Meteor } from 'meteor/meteor'
 
-import * as MOS from '@mos-connection/helper'
+import { MOS } from '@sofie-automation/meteor-lib/dist/mos'
 import { setupDefaultStudioEnvironment } from '../../../../../__mocks__/helpers/database'
 import { testInFiber } from '../../../../../__mocks__/helpers/jest'
 import { PeripheralDevice } from '@sofie-automation/corelib/dist/dataModel/PeripheralDevice'
 import { MOSDeviceActions } from '../actions'
 import { PeripheralDeviceCommand } from '@sofie-automation/corelib/dist/dataModel/PeripheralDeviceCommand'
-import { TriggerReloadDataResponse } from '../../../../../lib/api/userActions'
+import { TriggerReloadDataResponse } from '@sofie-automation/meteor-lib/dist/api/userActions'
 import { deferAsync, getRandomId, getRandomString, literal } from '@sofie-automation/corelib/dist/lib'
 import { stringifyError } from '@sofie-automation/shared-lib/dist/lib/stringifyError'
 import { PeripheralDeviceCommandId, RundownId, StudioId } from '@sofie-automation/corelib/dist/dataModel/Ids'
diff --git a/meteor/server/api/ingest/mosDevice/actions.ts b/meteor/server/api/ingest/mosDevice/actions.ts
index 7fcd643a58..c2bc59275c 100644
--- a/meteor/server/api/ingest/mosDevice/actions.ts
+++ b/meteor/server/api/ingest/mosDevice/actions.ts
@@ -1,4 +1,3 @@
-import { MOS } from '@sofie-automation/corelib'
 import { logger } from '../../../logging'
 import { Rundown } from '@sofie-automation/corelib/dist/dataModel/Rundown'
 import { Meteor } from 'meteor/meteor'
@@ -8,11 +7,12 @@ import { IngestPart } from '@sofie-automation/blueprints-integration'
 import { parseMosString } from './lib'
 import { stringifyError } from '@sofie-automation/shared-lib/dist/lib/stringifyError'
 import * as _ from 'underscore'
-import { TriggerReloadDataResponse } from '../../../../lib/api/userActions'
+import { TriggerReloadDataResponse } from '@sofie-automation/meteor-lib/dist/api/userActions'
 import { generateRundownSource, getPeripheralDeviceFromRundown, runIngestOperation } from '../lib'
 import { IngestJobs } from '@sofie-automation/corelib/dist/worker/ingest'
 import { DEFAULT_MOS_TIMEOUT_TIME } from '@sofie-automation/shared-lib/dist/core/constants'
 import { executePeripheralDeviceFunctionWithCustomTimeout } from '../../peripheralDevice/executeFunction'
+import { MOS } from '@sofie-automation/meteor-lib/dist/mos'
 
 export namespace MOSDeviceActions {
 	export async function reloadRundown(
@@ -72,9 +72,15 @@ export namespace MOSDeviceActions {
 		if (!mosPayload.Body)
 			throw new Meteor.Error(500, `Part Cache for "${partCache.externalId}" missing FullStory content!`)
 
-		const story = mosPayload.Body.filter(
-			(item) => item.Type === 'storyItem' && item.Content.ID === piece.externalId
-		)[0].Content
+		const mosTypes = MOS.getMosTypes(false)
+
+		const story = mosPayload.Body.find(
+			(item) =>
+				item.itemType === 'storyItem' && mosTypes.mosString128.stringify(item.Content.ID) === piece.externalId
+		)?.Content as MOS.IMOSItem | undefined
+
+		if (!story) throw new Meteor.Error(404, `Story "${piece.externalId}" not found in mosPayload`)
+
 		const timeBase = story.TimeBase || 1
 		const modifiedFields = {
 			EditorialStart: (inPoint * timeBase) as number | undefined,
diff --git a/meteor/server/api/ingest/mosDevice/lib.ts b/meteor/server/api/ingest/mosDevice/lib.ts
index d8e78b274f..5b12fd9ee1 100644
--- a/meteor/server/api/ingest/mosDevice/lib.ts
+++ b/meteor/server/api/ingest/mosDevice/lib.ts
@@ -1,6 +1,6 @@
 import { MOS } from '@sofie-automation/corelib'
 import { Meteor } from 'meteor/meteor'
-import { mosTypes } from '../../../../lib/mos'
+import { mosTypes } from '@sofie-automation/meteor-lib/dist/mos'
 
 export function parseMosString(str: MOS.IMOSString128): string {
 	if (!str) throw new Meteor.Error(401, 'parseMosString: str parameter missing!')
diff --git a/meteor/server/api/ingest/mosDevice/mosIntegration.ts b/meteor/server/api/ingest/mosDevice/mosIntegration.ts
index 8c3433ad39..ad226d6d84 100644
--- a/meteor/server/api/ingest/mosDevice/mosIntegration.ts
+++ b/meteor/server/api/ingest/mosDevice/mosIntegration.ts
@@ -7,7 +7,7 @@ import {
 	runIngestOperation,
 } from '../lib'
 import { parseMosString } from './lib'
-import { MethodContext } from '../../../../lib/api/methods'
+import { MethodContext } from '../../methodContext'
 import { profiler } from '../../profiler'
 import { IngestJobs } from '@sofie-automation/corelib/dist/worker/ingest'
 import { PeripheralDeviceId } from '@sofie-automation/corelib/dist/dataModel/Ids'
diff --git a/meteor/server/api/ingest/packageInfo.ts b/meteor/server/api/ingest/packageInfo.ts
index 8774ab68d7..d3d52ccaf6 100644
--- a/meteor/server/api/ingest/packageInfo.ts
+++ b/meteor/server/api/ingest/packageInfo.ts
@@ -8,7 +8,8 @@ import {
 } from '@sofie-automation/corelib/dist/dataModel/ExpectedPackages'
 import { PackageInfoDB } from '@sofie-automation/corelib/dist/dataModel/PackageInfos'
 import { ExpectedPackages, Rundowns } from '../../collections'
-import { assertNever, lazyIgnore } from '../../../lib/lib'
+import { assertNever } from '../../lib/tempLib'
+import { lazyIgnore } from '../../lib/lib'
 import { logger } from '../../logging'
 import { runIngestOperation } from './lib'
 import { IngestJobs } from '@sofie-automation/corelib/dist/worker/ingest'
@@ -16,6 +17,7 @@ import { ExpectedPackageId, RundownId } from '@sofie-automation/corelib/dist/dat
 import { Rundown } from '@sofie-automation/corelib/dist/dataModel/Rundown'
 import { QueueStudioJob } from '../../worker/worker'
 import { StudioJobs } from '@sofie-automation/corelib/dist/worker/studio'
+import { stringifyError } from '@sofie-automation/shared-lib/dist/lib/stringifyError'
 
 export async function onUpdatedPackageInfo(packageId: ExpectedPackageId, _doc: PackageInfoDB | null): Promise<void> {
 	logger.info(`PackageInfo updated "${packageId}"`)
@@ -68,7 +70,9 @@ function onUpdatedPackageInfoForRundownDebounce(pkg: ExpectedPackageFromRundown
 			if (packageIds) {
 				pendingRundownPackageUpdates.delete(pkg.rundownId)
 				onUpdatedPackageInfoForRundown(pkg.rundownId, packageIds).catch((e) => {
-					logger.error(`Updating ExpectedPackages for Rundown "${pkg.rundownId}" failed: ${e}`)
+					logger.error(
+						`Updating ExpectedPackages for Rundown "${pkg.rundownId}" failed: ${stringifyError(e)}`
+					)
 				})
 			}
 		},
@@ -114,7 +118,9 @@ function onUpdatedPackageInfoForBucketItemDebounce(
 				externalId: pkg.pieceExternalId,
 			}).catch((err) => {
 				logger.error(
-					`Updating ExpectedPackages for Bucket "${pkg.bucketId}" Item "${pkg.pieceExternalId}" failed: ${err}`
+					`Updating ExpectedPackages for Bucket "${pkg.bucketId}" Item "${
+						pkg.pieceExternalId
+					}" failed: ${stringifyError(err)}`
 				)
 			})
 		},
@@ -131,7 +137,9 @@ function onUpdatedPackageInfoForStudioBaselineDebounce(pkg: ExpectedPackageDBFro
 					await job.complete
 				})
 				.catch((err) => {
-					logger.error(`Updating ExpectedPackages for StudioBaseline "${pkg.studioId}" failed: ${err}`)
+					logger.error(
+						`Updating ExpectedPackages for StudioBaseline "${pkg.studioId}" failed: ${stringifyError(err)}`
+					)
 				})
 		},
 		1000
diff --git a/meteor/server/api/ingest/rundownInput.ts b/meteor/server/api/ingest/rundownInput.ts
index 9352ddf33e..bacdd0fd55 100644
--- a/meteor/server/api/ingest/rundownInput.ts
+++ b/meteor/server/api/ingest/rundownInput.ts
@@ -1,10 +1,11 @@
 import { Meteor } from 'meteor/meteor'
-import { check } from '../../../lib/check'
+import { check } from '../../lib/check'
 import { PeripheralDevice } from '@sofie-automation/corelib/dist/dataModel/PeripheralDevice'
 import { IngestDataCache, MediaObjects, Parts, Rundowns, Segments } from '../../collections'
-import { lazyIgnore, literal } from '../../../lib/lib'
+import { literal } from '../../lib/tempLib'
+import { lazyIgnore } from '../../lib/lib'
 import { IngestRundown, IngestSegment, IngestPart, IngestPlaylist } from '@sofie-automation/blueprints-integration'
-import { logger } from '../../../lib/logging'
+import { logger } from '../../logging'
 import { RundownIngestDataCache } from './ingestCache'
 import {
 	checkAccessAndGetPeripheralDevice,
@@ -12,11 +13,12 @@ import {
 	generateRundownSource,
 	runIngestOperation,
 } from './lib'
-import { MethodContext } from '../../../lib/api/methods'
+import { MethodContext } from '../methodContext'
 import { IngestJobs } from '@sofie-automation/corelib/dist/worker/ingest'
 import { MediaObject } from '@sofie-automation/shared-lib/dist/core/model/MediaObjects'
 import { PeripheralDeviceId, RundownId, SegmentId, StudioId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import { IngestCacheType } from '@sofie-automation/corelib/dist/dataModel/IngestDataCache'
+import { stringifyError } from '@sofie-automation/shared-lib/dist/lib/stringifyError'
 
 export namespace RundownInput {
 	export async function dataPlaylistGet(
@@ -26,7 +28,7 @@ export namespace RundownInput {
 		playlistExternalId: string
 	): Promise<IngestPlaylist> {
 		const peripheralDevice = await checkAccessAndGetPeripheralDevice(deviceId, deviceToken, context)
-		logger.debug('dataPlaylistGet', playlistExternalId)
+		logger.debug('dataPlaylistGet', { playlistExternalId })
 		check(playlistExternalId, String)
 		return getIngestPlaylist(peripheralDevice, playlistExternalId)
 	}
@@ -47,7 +49,7 @@ export namespace RundownInput {
 		rundownExternalId: string
 	): Promise<IngestRundown> {
 		const peripheralDevice = await checkAccessAndGetPeripheralDevice(deviceId, deviceToken, context)
-		logger.debug('dataRundownGet', rundownExternalId)
+		logger.debug('dataRundownGet', { rundownExternalId })
 		check(rundownExternalId, String)
 		return getIngestRundown(peripheralDevice, rundownExternalId)
 	}
@@ -60,7 +62,7 @@ export namespace RundownInput {
 	): Promise<void> {
 		const peripheralDevice = await checkAccessAndGetPeripheralDevice(deviceId, deviceToken, context)
 		const studioId = await fetchStudioIdFromDevice(peripheralDevice)
-		logger.debug('dataRundownDelete', rundownExternalId)
+		logger.debug('dataRundownDelete', { rundownExternalId })
 		check(rundownExternalId, String)
 
 		await runIngestOperation(studioId, IngestJobs.RemoveRundown, {
@@ -128,7 +130,7 @@ export namespace RundownInput {
 		segmentExternalId: string
 	): Promise<IngestSegment> {
 		const peripheralDevice = await checkAccessAndGetPeripheralDevice(deviceId, deviceToken, context)
-		logger.debug('dataSegmentGet', rundownExternalId, segmentExternalId)
+		logger.debug('dataSegmentGet', { rundownExternalId, segmentExternalId })
 		check(rundownExternalId, String)
 		check(segmentExternalId, String)
 		return getIngestSegment(peripheralDevice, rundownExternalId, segmentExternalId)
@@ -143,7 +145,7 @@ export namespace RundownInput {
 	): Promise<void> {
 		const peripheralDevice = await checkAccessAndGetPeripheralDevice(deviceId, deviceToken, context)
 		const studioId = await fetchStudioIdFromDevice(peripheralDevice)
-		logger.debug('dataSegmentDelete', rundownExternalId, segmentExternalId)
+		logger.debug('dataSegmentDelete', { rundownExternalId, segmentExternalId })
 		check(rundownExternalId, String)
 		check(segmentExternalId, String)
 
@@ -161,7 +163,7 @@ export namespace RundownInput {
 	): Promise<void> {
 		const peripheralDevice = await checkAccessAndGetPeripheralDevice(deviceId, deviceToken, context)
 		const studioId = await fetchStudioIdFromDevice(peripheralDevice)
-		logger.debug('dataSegmentCreate', rundownExternalId, ingestSegment)
+		logger.debug('dataSegmentCreate', { rundownExternalId, ingestSegment })
 		check(rundownExternalId, String)
 		check(ingestSegment, Object)
 
@@ -180,7 +182,7 @@ export namespace RundownInput {
 	): Promise<void> {
 		const peripheralDevice = await checkAccessAndGetPeripheralDevice(deviceId, deviceToken, context)
 		const studioId = await fetchStudioIdFromDevice(peripheralDevice)
-		logger.debug('dataSegmentUpdate', rundownExternalId, ingestSegment)
+		logger.debug('dataSegmentUpdate', { rundownExternalId, ingestSegment })
 		check(rundownExternalId, String)
 		check(ingestSegment, Object)
 
@@ -199,7 +201,7 @@ export namespace RundownInput {
 	): Promise<void> {
 		const peripheralDevice = await checkAccessAndGetPeripheralDevice(deviceId, deviceToken, context)
 		const studioId = await fetchStudioIdFromDevice(peripheralDevice)
-		logger.debug('dataSegmentRanksUpdate', rundownExternalId, Object.keys(newRanks))
+		logger.debug('dataSegmentRanksUpdate', { rundownExternalId, ranks: Object.keys(newRanks) })
 		check(rundownExternalId, String)
 		check(newRanks, Object)
 
@@ -219,7 +221,7 @@ export namespace RundownInput {
 	): Promise<void> {
 		const peripheralDevice = await checkAccessAndGetPeripheralDevice(deviceId, deviceToken, context)
 		const studioId = await fetchStudioIdFromDevice(peripheralDevice)
-		logger.debug('dataPartDelete', rundownExternalId, segmentExternalId, partExternalId)
+		logger.debug('dataPartDelete', { rundownExternalId, segmentExternalId, partExternalId })
 		check(rundownExternalId, String)
 		check(segmentExternalId, String)
 		check(partExternalId, String)
@@ -240,7 +242,7 @@ export namespace RundownInput {
 	): Promise<void> {
 		const peripheralDevice = await checkAccessAndGetPeripheralDevice(deviceId, deviceToken, context)
 		const studioId = await fetchStudioIdFromDevice(peripheralDevice)
-		logger.debug('dataPartCreate', rundownExternalId, segmentExternalId, ingestPart)
+		logger.debug('dataPartCreate', { rundownExternalId, segmentExternalId, ingestPart })
 		check(rundownExternalId, String)
 		check(segmentExternalId, String)
 		check(ingestPart, Object)
@@ -262,7 +264,7 @@ export namespace RundownInput {
 	): Promise<void> {
 		const peripheralDevice = await checkAccessAndGetPeripheralDevice(deviceId, deviceToken, context)
 		const studioId = await fetchStudioIdFromDevice(peripheralDevice)
-		logger.debug('dataPartUpdate', rundownExternalId, segmentExternalId, ingestPart)
+		logger.debug('dataPartUpdate', { rundownExternalId, segmentExternalId, ingestPart })
 		check(rundownExternalId, String)
 		check(segmentExternalId, String)
 		check(ingestPart, Object)
@@ -436,7 +438,11 @@ async function onMediaObjectChanged(newDocument: MediaObject, oldDocument?: Medi
 						200
 					)
 				} catch (exception) {
-					logger.error('Error thrown while updating Segment from cache after MediaObject changed', exception)
+					logger.error(
+						`Error thrown while updating Segment from cache after MediaObject changed: ${stringifyError(
+							exception
+						)}`
+					)
 				}
 			}
 		}
diff --git a/meteor/server/api/integration/expectedPackages.ts b/meteor/server/api/integration/expectedPackages.ts
index 99edaa58cc..1c3d489b9a 100644
--- a/meteor/server/api/integration/expectedPackages.ts
+++ b/meteor/server/api/integration/expectedPackages.ts
@@ -1,10 +1,11 @@
-import { check } from '../../../lib/check'
+import { check } from '../../lib/check'
 import { Meteor } from 'meteor/meteor'
-import { MethodContext } from '../../../lib/api/methods'
+import { MethodContext } from '../methodContext'
 import { checkAccessAndGetPeripheralDevice } from '../ingest/lib'
 import { ExpectedPackageStatusAPI, PackageInfo } from '@sofie-automation/blueprints-integration'
 import { ExpectedPackageWorkStatus } from '@sofie-automation/corelib/dist/dataModel/ExpectedPackageWorkStatuses'
-import { assertNever, getCurrentTime, literal, protectString } from '../../../lib/lib'
+import { assertNever, literal, protectString } from '../../lib/tempLib'
+import { getCurrentTime } from '../../lib/lib'
 import {
 	getPackageContainerPackageId,
 	PackageContainerPackageStatusDB,
diff --git a/meteor/server/api/integration/media-scanner.ts b/meteor/server/api/integration/media-scanner.ts
index dc1881e3fa..4af257f01a 100644
--- a/meteor/server/api/integration/media-scanner.ts
+++ b/meteor/server/api/integration/media-scanner.ts
@@ -1,7 +1,7 @@
 import { Meteor } from 'meteor/meteor'
-import { protectString } from '../../../lib/lib'
+import { protectString } from '../../lib/tempLib'
 import { checkAccessAndGetPeripheralDevice } from '../ingest/lib'
-import { MethodContext } from '../../../lib/api/methods'
+import { MethodContext } from '../methodContext'
 import { MediaObject } from '@sofie-automation/shared-lib/dist/core/model/MediaObjects'
 import { MediaObjId, PeripheralDeviceId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import { MediaObjectRevision } from '@sofie-automation/shared-lib/dist/peripheralDevice/mediaManager'
diff --git a/meteor/server/api/integration/mediaWorkFlows.ts b/meteor/server/api/integration/mediaWorkFlows.ts
index 408f8e5f21..20c1a65bf6 100644
--- a/meteor/server/api/integration/mediaWorkFlows.ts
+++ b/meteor/server/api/integration/mediaWorkFlows.ts
@@ -1,4 +1,4 @@
-import { check, Match } from '../../../lib/check'
+import { check, Match } from '../../lib/check'
 import { Meteor } from 'meteor/meteor'
 import { logger } from '../../logging'
 import { MediaWorkFlow } from '@sofie-automation/shared-lib/dist/core/model/MediaWorkFlows'
@@ -8,7 +8,7 @@ import {
 	MediaWorkFlowStepRevision,
 } from '@sofie-automation/shared-lib/dist/peripheralDevice/mediaManager'
 import { PeripheralDeviceType } from '@sofie-automation/corelib/dist/dataModel/PeripheralDevice'
-import { MethodContext } from '../../../lib/api/methods'
+import { MethodContext } from '../methodContext'
 import { checkAccessAndGetPeripheralDevice } from '../ingest/lib'
 import { MediaWorkFlowId, MediaWorkFlowStepId, PeripheralDeviceId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import { MediaWorkFlows, MediaWorkFlowSteps } from '../../collections'
diff --git a/meteor/server/api/lib.ts b/meteor/server/api/lib.ts
index b75b57e97d..e0d4ed7dea 100644
--- a/meteor/server/api/lib.ts
+++ b/meteor/server/api/lib.ts
@@ -1,6 +1,6 @@
 import { RundownId, RundownPlaylistId, StudioId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import { Meteor } from 'meteor/meteor'
-import { MethodContext } from '../../lib/api/methods'
+import { MethodContext } from './methodContext'
 import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
 import { Rundown } from '@sofie-automation/corelib/dist/dataModel/Rundown'
 import {
diff --git a/meteor/server/api/logger.ts b/meteor/server/api/logger.ts
deleted file mode 100644
index c7431092dc..0000000000
--- a/meteor/server/api/logger.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { Meteor } from 'meteor/meteor'
-import { LOGGER_METHOD_NAME, LeveledLogMethodFixed } from '../../lib/logging'
-import { logger } from '../logging'
-
-Meteor.methods({
-	[LOGGER_METHOD_NAME]: (type: string, ...args: string[]) => {
-		const loggerFunction: LeveledLogMethodFixed = (logger as any)[type] || logger.log
-
-		loggerFunction(args.join(', '))
-	},
-})
diff --git a/meteor/server/api/methodContext.ts b/meteor/server/api/methodContext.ts
new file mode 100644
index 0000000000..cd8e962aae
--- /dev/null
+++ b/meteor/server/api/methodContext.ts
@@ -0,0 +1,26 @@
+import { Meteor } from 'meteor/meteor'
+import { UserId } from '@sofie-automation/corelib/dist/dataModel/Ids'
+
+export interface MethodContext extends Omit<Meteor.MethodThisType, 'userId'> {
+	userId: UserId | null
+}
+
+/** Abstarct class to be used when defining Mehod-classes */
+export abstract class MethodContextAPI implements MethodContext {
+	// These properties are added by Meteor to the `this` context when calling methods
+	public userId!: UserId | null
+	public isSimulation!: boolean
+	public setUserId(_userId: string | null): void {
+		throw new Meteor.Error(
+			500,
+			`This shoulc never be called, there's something wrong in with 'this' in the calling method`
+		)
+	}
+	public unblock(): void {
+		throw new Meteor.Error(
+			500,
+			`This shoulc never be called, there's something wrong in with 'this' in the calling method`
+		)
+	}
+	public connection!: Meteor.Connection | null
+}
diff --git a/meteor/server/api/methods.ts b/meteor/server/api/methods.ts
new file mode 100644
index 0000000000..10de2b2be3
--- /dev/null
+++ b/meteor/server/api/methods.ts
@@ -0,0 +1,24 @@
+import { Meteor } from 'meteor/meteor'
+import { MakeMeteorCall } from '@sofie-automation/meteor-lib/dist/api/methods'
+
+export const MeteorCall = MakeMeteorCall(MeteorPromiseApply)
+
+/**
+ * Convenience method to convert a Meteor.apply() into a Promise
+ * @param callName {string} Method name
+ * @param args {Array<any>} An array of arguments for the method call
+ * @param options (Optional) An object with options for the call. See Meteor documentation.
+ * @returns {Promise<any>} A promise containing the result of the called method.
+ */
+export async function MeteorPromiseApply(
+	callName: Parameters<typeof Meteor.apply>[0],
+	args: Parameters<typeof Meteor.apply>[1],
+	options?: Parameters<typeof Meteor.apply>[2]
+): Promise<any> {
+	return new Promise((resolve, reject) => {
+		Meteor.apply(callName, args, options, (err, res) => {
+			if (err) reject(err)
+			else resolve(res)
+		})
+	})
+}
diff --git a/meteor/server/api/organizations.ts b/meteor/server/api/organizations.ts
index 1ac7beda57..df8e0cedfd 100644
--- a/meteor/server/api/organizations.ts
+++ b/meteor/server/api/organizations.ts
@@ -1,8 +1,9 @@
-import { literal, getRandomId, getCurrentTime } from '../../lib/lib'
-import { MethodContextAPI, MethodContext } from '../../lib/api/methods'
-import { NewOrganizationAPI, OrganizationAPIMethods } from '../../lib/api/organization'
+import { literal, getRandomId } from '../lib/tempLib'
+import { getCurrentTime } from '../lib/lib'
+import { MethodContextAPI, MethodContext } from './methodContext'
+import { NewOrganizationAPI, OrganizationAPIMethods } from '@sofie-automation/meteor-lib/dist/api/organization'
 import { registerClassToMeteorMethods } from '../methods'
-import { DBOrganization, DBOrganizationBase } from '../../lib/collections/Organization'
+import { DBOrganization, DBOrganizationBase } from '@sofie-automation/meteor-lib/dist/collections/Organization'
 import { OrganizationContentWriteAccess } from '../security/organization'
 import { triggerWriteAccessBecauseNoCheckNecessary } from '../security/lib/securityVerify'
 import { insertStudioInner } from './studio/api'
diff --git a/meteor/server/api/peripheralDevice.ts b/meteor/server/api/peripheralDevice.ts
index d0caed2cfb..0c6bed8857 100644
--- a/meteor/server/api/peripheralDevice.ts
+++ b/meteor/server/api/peripheralDevice.ts
@@ -1,9 +1,10 @@
 import { Meteor } from 'meteor/meteor'
-import { check, Match } from '../../lib/check'
+import { check, Match } from '../lib/check'
 import * as _ from 'underscore'
 import { PeripheralDeviceType, PeripheralDevice } from '@sofie-automation/corelib/dist/dataModel/PeripheralDevice'
 import { PeripheralDeviceCommands, PeripheralDevices, Rundowns, Studios, UserActionsLog } from '../collections'
-import { getCurrentTime, protectString, stringifyObjects, literal, unprotectString } from '../../lib/lib'
+import { protectString, stringifyObjects, literal, unprotectString } from '../lib/tempLib'
+import { getCurrentTime } from '../lib/lib'
 import { logger } from '../logging'
 import { TimelineHash } from '@sofie-automation/corelib/dist/dataModel/Timeline'
 import { registerClassToMeteorMethods } from '../methods'
@@ -26,10 +27,10 @@ import { MOS } from '@sofie-automation/corelib'
 import { determineDiffTime } from './systemTime/systemTime'
 import { getTimeDiff } from './systemTime/api'
 import { PeripheralDeviceContentWriteAccess } from '../security/peripheralDevice'
-import { MethodContextAPI, MethodContext } from '../../lib/api/methods'
+import { MethodContextAPI, MethodContext } from './methodContext'
 import { triggerWriteAccess, triggerWriteAccessBecauseNoCheckNecessary } from '../security/lib/securityVerify'
 import { checkAccessAndGetPeripheralDevice } from './ingest/lib'
-import { UserActionsLogItem } from '../../lib/collections/UserActionsLog'
+import { UserActionsLogItem } from '@sofie-automation/meteor-lib/dist/collections/UserActionsLog'
 import { PackageManagerIntegration } from './integration/expectedPackages'
 import { profiler } from './profiler'
 import { QueueStudioJob } from '../worker/worker'
diff --git a/meteor/server/api/peripheralDevice/executeFunction.ts b/meteor/server/api/peripheralDevice/executeFunction.ts
index e2927d2f1e..e89c638ad1 100644
--- a/meteor/server/api/peripheralDevice/executeFunction.ts
+++ b/meteor/server/api/peripheralDevice/executeFunction.ts
@@ -1,9 +1,11 @@
 import { Meteor } from 'meteor/meteor'
 import { PeripheralDeviceCommandId, PeripheralDeviceId } from '@sofie-automation/shared-lib/dist/core/model/Ids'
-import { createManualPromise, getCurrentTime, getRandomId } from '../../../lib/lib'
+import { createManualPromise, getRandomId } from '../../lib/tempLib'
+import { getCurrentTime } from '../../lib/lib'
 import { PeripheralDeviceCommands } from '../../collections'
 import { logger } from '../../logging'
 import { TSR } from '@sofie-automation/blueprints-integration'
+import { stringifyError } from '@sofie-automation/shared-lib/dist/lib/stringifyError'
 
 export async function executePeripheralDeviceFunctionWithCustomTimeout(
 	deviceId: PeripheralDeviceId,
@@ -70,7 +72,9 @@ export async function executePeripheralDeviceFunctionWithCustomTimeout(
 
 					observer?.stop()
 					PeripheralDeviceCommands.removeAsync(cmdId).catch((e) => {
-						logger.error(`Cleanup PeripheralDeviceCommand "${commandId}" document failed: ${e}`)
+						logger.error(
+							`Cleanup PeripheralDeviceCommand "${commandId}" document failed: ${stringifyError(e)}`
+						)
 					})
 				}
 
@@ -118,7 +122,7 @@ export async function executePeripheralDeviceFunctionWithCustomTimeout(
 
 	const doCheckReply = () => {
 		checkReply().catch((e) => {
-			logger.error(`PeripheralDeviceCommand "${commandId}" check failed: ${e}`)
+			logger.error(`PeripheralDeviceCommand "${commandId}" check failed: ${stringifyError(e)}`)
 		})
 	}
 
diff --git a/meteor/server/api/playout/api.ts b/meteor/server/api/playout/api.ts
index bfc6ed26d3..d290abc6d7 100644
--- a/meteor/server/api/playout/api.ts
+++ b/meteor/server/api/playout/api.ts
@@ -1,9 +1,9 @@
 import { registerClassToMeteorMethods, MeteorDebugMethods } from '../../methods'
-import { NewPlayoutAPI, PlayoutAPIMethods } from '../../../lib/api/playout'
+import { NewPlayoutAPI, PlayoutAPIMethods } from '@sofie-automation/meteor-lib/dist/api/playout'
 import { ServerPlayoutAPI } from './playout'
-import { getCurrentTime } from '../../../lib/lib'
+import { getCurrentTime } from '../../lib/lib'
 import { logger } from '../../logging'
-import { MethodContextAPI } from '../../../lib/api/methods'
+import { MethodContextAPI } from '../methodContext'
 import { QueueStudioJob } from '../../worker/worker'
 import { StudioJobs } from '@sofie-automation/corelib/dist/worker/studio'
 import { StudioContentWriteAccess } from '../../security/studio'
diff --git a/meteor/server/api/playout/playout.ts b/meteor/server/api/playout/playout.ts
index f5b11df21f..20fb5e40c3 100644
--- a/meteor/server/api/playout/playout.ts
+++ b/meteor/server/api/playout/playout.ts
@@ -1,12 +1,10 @@
 /* tslint:disable:no-use-before-declare */
-import { Meteor } from 'meteor/meteor'
-import * as _ from 'underscore'
-import { StudioRouteBehavior } from '@sofie-automation/corelib/dist/dataModel/Studio'
 import { PackageInfo } from '../../coreSystem'
 import { StudioContentAccess } from '../../security/studio'
 import { shouldUpdateStudioBaselineInner } from '@sofie-automation/corelib/dist/studio/baseline'
-import { logger } from '../../logging'
-import { Blueprints, RundownPlaylists, Studios, Timeline } from '../../collections'
+import { Blueprints, RundownPlaylists, Timeline } from '../../collections'
+import { StudioJobs } from '@sofie-automation/corelib/dist/worker/studio'
+import { QueueStudioJob } from '../../worker/worker'
 
 export namespace ServerPlayoutAPI {
 	export async function shouldUpdateStudioBaseline(access: StudioContentAccess): Promise<string | false> {
@@ -38,32 +36,12 @@ export namespace ServerPlayoutAPI {
 	export async function switchRouteSet(
 		access: StudioContentAccess,
 		routeSetId: string,
-		state: boolean
+		state: boolean | 'toggle'
 	): Promise<void> {
-		logger.debug(`switchRouteSet "${access.studioId}" "${routeSetId}"=${state}`)
-
-		const studio = access.studio
-
-		if (studio.routeSets[routeSetId] === undefined)
-			throw new Meteor.Error(404, `RouteSet "${routeSetId}" not found!`)
-		const routeSet = studio.routeSets[routeSetId]
-		if (routeSet.behavior === StudioRouteBehavior.ACTIVATE_ONLY && state === false)
-			throw new Meteor.Error(400, `RouteSet "${routeSetId}" is ACTIVATE_ONLY`)
-
-		const modification: Record<string, any> = {}
-		modification[`routeSets.${routeSetId}.active`] = state
-
-		if (studio.routeSets[routeSetId].exclusivityGroup && state === true) {
-			_.each(studio.routeSets, (otherRouteSet, otherRouteSetId) => {
-				if (otherRouteSetId === routeSetId) return
-				if (otherRouteSet.exclusivityGroup === routeSet.exclusivityGroup) {
-					modification[`routeSets.${otherRouteSetId}.active`] = false
-				}
-			})
-		}
-
-		await Studios.updateAsync(studio._id, {
-			$set: modification,
+		const queuedJob = await QueueStudioJob(StudioJobs.SwitchRouteSet, access.studioId, {
+			routeSetId,
+			state,
 		})
+		await queuedJob.complete
 	}
 }
diff --git a/meteor/server/api/rest/koa.ts b/meteor/server/api/rest/koa.ts
index 0e399f37dd..3a8c54dc0a 100644
--- a/meteor/server/api/rest/koa.ts
+++ b/meteor/server/api/rest/koa.ts
@@ -5,6 +5,10 @@ import { WebApp } from 'meteor/webapp'
 import { Meteor } from 'meteor/meteor'
 import { getRandomString } from '@sofie-automation/corelib/dist/lib'
 import _ from 'underscore'
+import { public_dir } from '../../lib'
+import staticServe from 'koa-static'
+import { logger } from '../../logging'
+import { PackageInfo } from '../../coreSystem'
 
 declare module 'http' {
 	interface IncomingMessage {
@@ -13,15 +17,13 @@ declare module 'http' {
 	}
 }
 
-export function bindKoaRouter(koaRouter: KoaRouter, bindPath: string): void {
-	const app = new Koa()
-	// Expose the API at the url
-	WebApp.rawConnectHandlers.use(bindPath, (req, res) => {
-		const callback = Meteor.bindEnvironment(app.callback())
-		callback(req, res).catch(() => res.end())
-	})
+const rootRouter = new KoaRouter()
+const boundRouterPaths: string[] = []
+
+Meteor.startup(() => {
+	const koaApp = new Koa()
 
-	app.use(async (ctx, next) => {
+	koaApp.use(async (ctx, next) => {
 		// Strange - sometimes a JSON body gets parsed by Koa before here (eg for a POST call?).
 		if (typeof ctx.req.body === 'object') {
 			ctx.disableBodyParser = true
@@ -33,7 +35,7 @@ export function bindKoaRouter(koaRouter: KoaRouter, bindPath: string): void {
 		}
 		await next()
 	})
-	app.use(
+	koaApp.use(
 		cors({
 			// Allow anything
 			origin(ctx) {
@@ -41,7 +43,57 @@ export function bindKoaRouter(koaRouter: KoaRouter, bindPath: string): void {
 			},
 		})
 	)
-	app.use(koaRouter.routes()).use(koaRouter.allowedMethods())
+
+	// Expose the API at the url
+	WebApp.rawConnectHandlers.use((req, res) => {
+		const callback = Meteor.bindEnvironment(koaApp.callback())
+		callback(req, res).catch(() => res.end())
+	})
+
+	// serve the webui through koa
+	// This is to avoid meteor injecting anything into the served html
+	const webuiServer = staticServe(public_dir)
+	koaApp.use(webuiServer)
+	logger.debug(`Serving static files from ${public_dir}`)
+
+	// Serve the meteor runtime config
+	rootRouter.get('/meteor-runtime-config.js', async (ctx) => {
+		const versionExtended: string = PackageInfo.versionExtended || PackageInfo.version // package version
+
+		ctx.body = `window.__meteor_runtime_config__ = (${JSON.stringify({
+			// @ts-expect-error missing types for internal meteor detail
+			...__meteor_runtime_config__,
+			sofieVersionExtended: versionExtended,
+		})})`
+	})
+
+	koaApp.use(rootRouter.routes()).use(rootRouter.allowedMethods())
+
+	koaApp.use(async (ctx, next) => {
+		if (ctx.method !== 'GET') return next()
+
+		// Don't use the fallback for certain paths
+		if (ctx.path.startsWith('/assets/')) return next()
+
+		// Don't use the fallback for anything handled by another router
+		// This does not feel efficient, but koa doesn't appear to have any shared state between the router handlers
+		for (const bindPath of boundRouterPaths) {
+			if (ctx.path.startsWith(bindPath)) return next()
+		}
+
+		// fallback to the root file
+		ctx.path = '/'
+		return webuiServer(ctx, next)
+	})
+})
+
+export function bindKoaRouter(koaRouter: KoaRouter, bindPath: string): void {
+	// Track this path as having a router
+	let bindPathFull = bindPath
+	if (!bindPathFull.endsWith('/')) bindPathFull += '/'
+	boundRouterPaths.push(bindPathFull)
+
+	rootRouter.use(bindPath, koaRouter.routes()).use(bindPath, koaRouter.allowedMethods())
 }
 
 const REVERSE_PROXY_COUNT = process.env.HTTP_FORWARDED_COUNT ? parseInt(process.env.HTTP_FORWARDED_COUNT) : 0
diff --git a/meteor/server/api/rest/v0/__tests__/rest.test.ts b/meteor/server/api/rest/v0/__tests__/rest.test.ts
index 4fe5d3d1f5..e40b92664e 100644
--- a/meteor/server/api/rest/v0/__tests__/rest.test.ts
+++ b/meteor/server/api/rest/v0/__tests__/rest.test.ts
@@ -1,9 +1,9 @@
 import { beforeEachInFiber } from '../../../../../__mocks__/helpers/jest'
 import { MeteorMock } from '../../../../../__mocks__/meteor'
 import { Meteor } from 'meteor/meteor'
-import { UserActionAPIMethods } from '../../../../../lib/api/userActions'
+import { UserActionAPIMethods } from '@sofie-automation/meteor-lib/dist/api/userActions'
 import { MeteorMethodSignatures } from '../../../../methods'
-import { ClientAPI } from '../../../../../lib/api/client'
+import { ClientAPI } from '@sofie-automation/meteor-lib/dist/api/client'
 import { callKoaRoute } from '../../../../../__mocks__/koa-util'
 import { createLegacyApiRouter } from '..'
 import '../../../userActions.ts' // required to get the UserActionsAPI methods populated
diff --git a/meteor/server/api/rest/v0/index.ts b/meteor/server/api/rest/v0/index.ts
index f37418fbd3..721a3a803c 100644
--- a/meteor/server/api/rest/v0/index.ts
+++ b/meteor/server/api/rest/v0/index.ts
@@ -7,11 +7,11 @@
 import * as _ from 'underscore'
 import { Meteor } from 'meteor/meteor'
 import { MeteorMethodSignatures } from '../../../methods'
-import { MeteorPubSub } from '../../../../lib/api/pubsub'
+import { MeteorPubSub } from '@sofie-automation/meteor-lib/dist/api/pubsub'
 import { MeteorPublications, MeteorPublicationSignatures } from '../../../publications/lib'
-import { UserActionAPIMethods } from '../../../../lib/api/userActions'
-import { logger } from '../../../../lib/logging'
-import { ClientAPI } from '../../../../lib/api/client'
+import { UserActionAPIMethods } from '@sofie-automation/meteor-lib/dist/api/userActions'
+import { logger } from '../../../logging'
+import { ClientAPI } from '@sofie-automation/meteor-lib/dist/api/client'
 import Koa from 'koa'
 import KoaRouter from '@koa/router'
 import { CorelibPubSub } from '@sofie-automation/corelib/dist/pubsub'
diff --git a/meteor/server/api/rest/v1/blueprints.ts b/meteor/server/api/rest/v1/blueprints.ts
index 8b2ed73ffb..3e5495474c 100644
--- a/meteor/server/api/rest/v1/blueprints.ts
+++ b/meteor/server/api/rest/v1/blueprints.ts
@@ -1,12 +1,12 @@
 import { BlueprintId } from '@sofie-automation/corelib/dist/dataModel/Ids'
-import { check } from '../../../../lib/check'
-import { protectString, unprotectString } from '../../../../lib/lib'
+import { check } from '../../../lib/check'
+import { protectString, unprotectString } from '../../../lib/tempLib'
 import { logger } from '../../../logging'
 import { APIFactory, APIRegisterHook, ServerAPIContext } from './types'
-import { APIBlueprint } from '../../../../lib/api/rest/v1'
-import { BlueprintsRestAPI } from '../../../../lib/api/rest/v1'
+import { APIBlueprint } from '../../../lib/rest/v1'
+import { BlueprintsRestAPI } from '../../../lib/rest/v1'
 import { Meteor } from 'meteor/meteor'
-import { ClientAPI } from '../../../../lib/api/client'
+import { ClientAPI } from '@sofie-automation/meteor-lib/dist/api/client'
 import { Blueprints } from '../../../collections'
 import { Blueprint } from '@sofie-automation/corelib/dist/dataModel/Blueprint'
 import { UserError, UserErrorMessage } from '@sofie-automation/corelib/dist/error'
diff --git a/meteor/server/api/rest/v1/buckets.ts b/meteor/server/api/rest/v1/buckets.ts
index 36aaaa404d..5a4b764267 100644
--- a/meteor/server/api/rest/v1/buckets.ts
+++ b/meteor/server/api/rest/v1/buckets.ts
@@ -1,11 +1,12 @@
 import { Meteor } from 'meteor/meteor'
-import { APIBucket, APIBucketComplete, APIImportAdlib, BucketsRestAPI } from '../../../../lib/api/rest/v1/buckets'
+import { APIBucket, APIBucketComplete, APIImportAdlib, BucketsRestAPI } from '../../../lib/rest/v1/buckets'
 import { BucketAdLibActions, BucketAdLibs, Buckets } from '../../../collections'
 import { APIBucketFrom } from './typeConversion'
-import { ClientAPI } from '../../../../lib/api/client'
+import { ClientAPI } from '@sofie-automation/meteor-lib/dist/api/client'
 import { BucketId, ShowStyleBaseId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import { ServerClientAPI } from '../../client'
-import { getCurrentTime, protectString } from '../../../../lib/lib'
+import { protectString } from '@sofie-automation/shared-lib/dist/lib/protectedString'
+import { getCurrentTime } from '../../../lib/lib'
 import { check } from 'meteor/check'
 import { StudioContentWriteAccess } from '../../../security/studio'
 import { BucketsAPI } from '../../buckets'
@@ -51,7 +52,7 @@ export class BucketsServerAPI implements BucketsRestAPI {
 			event,
 			getCurrentTime(),
 			'bucketsCreateNewBucket',
-			[bucket],
+			{ bucket },
 			async () => {
 				check(bucket.studioId, String)
 				check(bucket.name, String)
@@ -79,7 +80,7 @@ export class BucketsServerAPI implements BucketsRestAPI {
 			event,
 			getCurrentTime(),
 			'bucketsRemoveBucket',
-			[bucketId],
+			{ bucketId },
 			async () => {
 				check(bucketId, String)
 
@@ -99,7 +100,7 @@ export class BucketsServerAPI implements BucketsRestAPI {
 			event,
 			getCurrentTime(),
 			'bucketsEmptyBucket',
-			[bucketId],
+			{ bucketId },
 			async () => {
 				check(bucketId, String)
 
@@ -119,7 +120,7 @@ export class BucketsServerAPI implements BucketsRestAPI {
 			event,
 			getCurrentTime(),
 			'bucketsRemoveBucketAdLib',
-			[externalId],
+			{ externalId },
 			async () => {
 				const bucketAdLibPiecePromise = BucketAdLibs.findOneAsync(
 					{ externalId },
@@ -166,7 +167,7 @@ export class BucketsServerAPI implements BucketsRestAPI {
 			event,
 			getCurrentTime(),
 			'bucketAdlibImport',
-			[bucketId, showStyleBaseId, ingestItem],
+			{ bucketId, showStyleBaseId, ingestItem },
 			async () => {
 				check(bucketId, String)
 				check(showStyleBaseId, String)
diff --git a/meteor/server/api/rest/v1/devices.ts b/meteor/server/api/rest/v1/devices.ts
index a66fbc96b6..915d424540 100644
--- a/meteor/server/api/rest/v1/devices.ts
+++ b/meteor/server/api/rest/v1/devices.ts
@@ -4,13 +4,13 @@ import {
 	DevicesRestAPI,
 	PeripheralDeviceActionRestart,
 	PeripheralDeviceActionType,
-} from '../../../../lib/api/rest/v1'
+} from '../../../lib/rest/v1'
 import { logger } from '../../../logging'
 import { APIFactory, APIRegisterHook, ServerAPIContext } from './types'
 import { PeripheralDeviceId } from '@sofie-automation/corelib/dist/dataModel/Ids'
-import { check } from '../../../../lib/check'
+import { check } from '../../../lib/check'
 import { Meteor } from 'meteor/meteor'
-import { ClientAPI } from '../../../../lib/api/client'
+import { ClientAPI } from '@sofie-automation/meteor-lib/dist/api/client'
 import { PeripheralDevices } from '../../../collections'
 import { PeripheralDevice } from '@sofie-automation/corelib/dist/dataModel/PeripheralDevice'
 import { UserError, UserErrorMessage } from '@sofie-automation/corelib/dist/error'
diff --git a/meteor/server/api/rest/v1/index.ts b/meteor/server/api/rest/v1/index.ts
index ee18e347e3..c935f83fa4 100644
--- a/meteor/server/api/rest/v1/index.ts
+++ b/meteor/server/api/rest/v1/index.ts
@@ -5,8 +5,8 @@ import { IConfigMessage, NoteSeverity } from '@sofie-automation/blueprints-integ
 import Koa from 'koa'
 import bodyParser from 'koa-bodyparser'
 import { Meteor } from 'meteor/meteor'
-import { ClientAPI } from '../../../../lib/api/client'
-import { MethodContextAPI } from '../../../../lib/api/methods'
+import { ClientAPI } from '@sofie-automation/meteor-lib/dist/api/client'
+import { MethodContextAPI } from '../../methodContext'
 import { logger } from '../../../logging'
 import { CURRENT_SYSTEM_VERSION } from '../../../migration/currentSystemVersion'
 import { Credentials } from '../../../security/lib/credentials'
diff --git a/meteor/server/api/rest/v1/playlists.ts b/meteor/server/api/rest/v1/playlists.ts
index 7fa1dcfb47..93c621e224 100644
--- a/meteor/server/api/rest/v1/playlists.ts
+++ b/meteor/server/api/rest/v1/playlists.ts
@@ -13,10 +13,10 @@ import {
 	RundownPlaylistId,
 	SegmentId,
 } from '@sofie-automation/corelib/dist/dataModel/Ids'
-import { Match, check } from '../../../../lib/check'
-import { PlaylistsRestAPI } from '../../../../lib/api/rest/v1'
+import { Match, check } from '../../../lib/check'
+import { PlaylistsRestAPI } from '../../../lib/rest/v1'
 import { Meteor } from 'meteor/meteor'
-import { ClientAPI } from '../../../../lib/api/client'
+import { ClientAPI } from '@sofie-automation/meteor-lib/dist/api/client'
 import {
 	AdLibActions,
 	AdLibPieces,
@@ -30,8 +30,8 @@ import {
 import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
 import { ServerClientAPI } from '../../client'
 import { QueueNextSegmentResult, StudioJobs } from '@sofie-automation/corelib/dist/worker/studio'
-import { getCurrentTime } from '../../../../lib/lib'
-import { TriggerReloadDataResponse } from '../../../../lib/api/userActions'
+import { getCurrentTime } from '../../../lib/lib'
+import { TriggerReloadDataResponse } from '@sofie-automation/meteor-lib/dist/api/userActions'
 import { ServerRundownAPI } from '../../rundown'
 import { triggerWriteAccess } from '../../../security/lib/securityVerify'
 
@@ -330,7 +330,7 @@ class PlaylistsServerAPI implements PlaylistsRestAPI {
 				check(rundownPlaylistId, String)
 			},
 			'reloadPlaylist',
-			[rundownPlaylistId],
+			{ rundownPlaylistId },
 			async (access) => {
 				const reloadResponse = await ServerRundownAPI.resyncRundownPlaylist(access)
 				const success = !reloadResponse.rundownsResponses.reduce((missing, rundownsResponse) => {
@@ -458,11 +458,11 @@ class PlaylistsServerAPI implements PlaylistsRestAPI {
 		)
 	}
 
-	async clearSourceLayer(
+	async clearSourceLayers(
 		connection: Meteor.Connection,
 		event: string,
 		rundownPlaylistId: RundownPlaylistId,
-		sourceLayerId: string
+		sourceLayerIds: string[]
 	): Promise<ClientAPI.ClientResponse<void>> {
 		const rundownPlaylist = await RundownPlaylists.findOneAsync(rundownPlaylistId)
 		if (!rundownPlaylist)
@@ -489,13 +489,13 @@ class PlaylistsServerAPI implements PlaylistsRestAPI {
 			rundownPlaylistId,
 			() => {
 				check(rundownPlaylistId, String)
-				check(sourceLayerId, String)
+				check(sourceLayerIds, [String])
 			},
 			StudioJobs.StopPiecesOnSourceLayers,
 			{
 				playlistId: rundownPlaylistId,
 				partInstanceId: rundownPlaylist.currentPartInfo.partInstanceId,
-				sourceLayerIds: [sourceLayerId],
+				sourceLayerIds: sourceLayerIds,
 			}
 		)
 	}
@@ -786,6 +786,26 @@ export function registerRoutes(registerRoute: APIRegisterHook<PlaylistsRestAPI>)
 		}
 	)
 
+	registerRoute<{ playlistId: string }, { sourceLayerIds: string[] }, void>(
+		'put',
+		'/playlists/:playlistId/clear-sourcelayers',
+		new Map([
+			[404, [UserErrorMessage.RundownPlaylistNotFound]],
+			[412, [UserErrorMessage.InactiveRundown]],
+		]),
+		playlistsAPIFactory,
+		async (serverAPI, connection, event, params, body) => {
+			const playlistId = protectString<RundownPlaylistId>(params.playlistId)
+			const sourceLayerIds = body?.sourceLayerIds
+			logger.info(`API POST: clear-sourcelayers ${playlistId} ${sourceLayerIds}`)
+
+			check(playlistId, String)
+			check(sourceLayerIds, Array<String>)
+
+			return await serverAPI.clearSourceLayers(connection, event, playlistId, sourceLayerIds)
+		}
+	)
+
 	registerRoute<{ playlistId: string; sourceLayerId: string }, never, void>(
 		'delete',
 		'/playlists/:playlistId/sourceLayer/:sourceLayerId',
@@ -801,7 +821,7 @@ export function registerRoutes(registerRoute: APIRegisterHook<PlaylistsRestAPI>)
 
 			check(playlistId, String)
 			check(sourceLayerId, String)
-			return await serverAPI.clearSourceLayer(connection, event, playlistId, sourceLayerId)
+			return await serverAPI.clearSourceLayers(connection, event, playlistId, [sourceLayerId])
 		}
 	)
 
diff --git a/meteor/server/api/rest/v1/showstyles.ts b/meteor/server/api/rest/v1/showstyles.ts
index 75cb55cd9c..9c434b6ac0 100644
--- a/meteor/server/api/rest/v1/showstyles.ts
+++ b/meteor/server/api/rest/v1/showstyles.ts
@@ -5,14 +5,14 @@ import {
 	ShowStyleBaseAction,
 	ShowStyleBaseActionType,
 	ShowStylesRestAPI,
-} from '../../../../lib/api/rest/v1'
+} from '../../../lib/rest/v1'
 import { logger } from '../../../logging'
 import { APIFactory, APIRegisterHook, ServerAPIContext } from './types'
 import { ShowStyleBaseId, ShowStyleVariantId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import { protectString, unprotectString } from '@sofie-automation/corelib/dist/protectedString'
-import { check } from '../../../../lib/check'
+import { check } from '../../../lib/check'
 import { Meteor } from 'meteor/meteor'
-import { ClientAPI } from '../../../../lib/api/client'
+import { ClientAPI } from '@sofie-automation/meteor-lib/dist/api/client'
 import { RundownPlaylists, Rundowns, ShowStyleBases, ShowStyleVariants } from '../../../collections'
 import { DBShowStyleBase } from '@sofie-automation/corelib/dist/dataModel/ShowStyleBase'
 import {
diff --git a/meteor/server/api/rest/v1/studios.ts b/meteor/server/api/rest/v1/studios.ts
index 7a23cfcba8..30e57b14ba 100644
--- a/meteor/server/api/rest/v1/studios.ts
+++ b/meteor/server/api/rest/v1/studios.ts
@@ -3,16 +3,17 @@ import { logger } from '../../../logging'
 import { APIFactory, APIRegisterHook, ServerAPIContext } from './types'
 import { protectString, unprotectString } from '@sofie-automation/corelib/dist/protectedString'
 import { PeripheralDeviceId, StudioId } from '@sofie-automation/corelib/dist/dataModel/Ids'
-import { check } from '../../../../lib/check'
-import { APIStudio, StudioAction, StudioActionType, StudiosRestAPI } from '../../../../lib/api/rest/v1'
+import { check } from '../../../lib/check'
+import { APIStudio, StudioAction, StudioActionType, StudiosRestAPI } from '../../../lib/rest/v1'
 import { Meteor } from 'meteor/meteor'
-import { ClientAPI } from '../../../../lib/api/client'
+import { ClientAPI } from '@sofie-automation/meteor-lib/dist/api/client'
 import { PeripheralDevices, RundownPlaylists, Studios } from '../../../collections'
 import { APIStudioFrom, studioFrom, validateAPIBlueprintConfigForStudio } from './typeConversion'
 import { runUpgradeForStudio, validateConfigForStudio } from '../../../migration/upgrades'
 import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
 import { ServerClientAPI } from '../../client'
-import { assertNever, getCurrentTime } from '../../../../lib/lib'
+import { assertNever } from '../../../lib/tempLib'
+import { getCurrentTime } from '../../../lib/lib'
 import { StudioJobs } from '@sofie-automation/corelib/dist/worker/studio'
 import { DBStudio } from '@sofie-automation/corelib/dist/dataModel/Studio'
 import { PeripheralDevice } from '@sofie-automation/corelib/dist/dataModel/PeripheralDevice'
@@ -208,7 +209,7 @@ class StudiosServerAPI implements StudiosRestAPI {
 			event,
 			getCurrentTime(),
 			'switchRouteSet',
-			[studioId, routeSetId, state],
+			{ studioId, routeSetId, state },
 			async () => {
 				check(studioId, String)
 				check(routeSetId, String)
diff --git a/meteor/server/api/rest/v1/system.ts b/meteor/server/api/rest/v1/system.ts
index dfdc5835b8..99c2609cf9 100644
--- a/meteor/server/api/rest/v1/system.ts
+++ b/meteor/server/api/rest/v1/system.ts
@@ -1,13 +1,13 @@
 import { UserErrorMessage } from '@sofie-automation/corelib/dist/error'
-import { MigrationData, PendingMigrations, SystemRestAPI } from '../../../../lib/api/rest/v1'
+import { MigrationData, PendingMigrations, SystemRestAPI } from '../../../lib/rest/v1'
 import { logger } from '../../../logging'
 import { APIFactory, APIRegisterHook, ServerAPIContext } from './types'
-import { check } from '../../../../lib/check'
+import { check } from '../../../lib/check'
 import { protectString } from '@sofie-automation/corelib/dist/protectedString'
 import { BlueprintId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import { Meteor } from 'meteor/meteor'
-import { ClientAPI } from '../../../../lib/api/client'
-import { MeteorCall } from '../../../../lib/api/methods'
+import { ClientAPI } from '@sofie-automation/meteor-lib/dist/api/client'
+import { MeteorCall } from '../../methods'
 import { MigrationStepInputResult } from '@sofie-automation/blueprints-integration'
 
 class SystemServerAPI implements SystemRestAPI {
diff --git a/meteor/server/api/rest/v1/typeConversion.ts b/meteor/server/api/rest/v1/typeConversion.ts
index 5ef75402fd..c6069f4506 100644
--- a/meteor/server/api/rest/v1/typeConversion.ts
+++ b/meteor/server/api/rest/v1/typeConversion.ts
@@ -40,7 +40,7 @@ import {
 	APISourceLayer,
 	APIStudio,
 	APIStudioSettings,
-} from '../../../../lib/api/rest/v1'
+} from '../../../lib/rest/v1'
 import { DBShowStyleBase } from '@sofie-automation/corelib/dist/dataModel/ShowStyleBase'
 import { DBShowStyleVariant } from '@sofie-automation/corelib/dist/dataModel/ShowStyleVariant'
 import { Blueprints, ShowStyleBases, Studios } from '../../../collections'
@@ -48,8 +48,12 @@ import { Meteor } from 'meteor/meteor'
 import { evalBlueprint } from '../../blueprints/cache'
 import { CommonContext } from '../../../migration/upgrades/context'
 import { logger } from '../../../logging'
-import { DEFAULT_MINIMUM_TAKE_SPAN } from '@sofie-automation/shared-lib/dist/core/constants'
-import { Bucket } from '../../../../lib/collections/Buckets'
+import {
+	DEFAULT_MINIMUM_TAKE_SPAN,
+	DEFAULT_FALLBACK_PART_DURATION,
+} from '@sofie-automation/shared-lib/dist/core/constants'
+import { Bucket } from '@sofie-automation/meteor-lib/dist/collections/Buckets'
+import { ForceQuickLoopAutoNext } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
 
 /*
 This file contains functions that convert between the internal Sofie-Core types and types exposed to the external API.
@@ -313,10 +317,10 @@ export async function studioFrom(apiStudio: APIStudio, existingId?: StudioId): P
 		supportedShowStyleBase: apiStudio.supportedShowStyleBase?.map((id) => protectString<ShowStyleBaseId>(id)) ?? [],
 		organizationId: null,
 		mappingsWithOverrides: wrapDefaultObject({}),
-		routeSets: {},
+		routeSetsWithOverrides: wrapDefaultObject({}),
 		_rundownVersionHash: '',
-		routeSetExclusivityGroups: {},
-		packageContainers: {},
+		routeSetExclusivityGroupsWithOverrides: wrapDefaultObject({}),
+		packageContainersWithOverrides: wrapDefaultObject({}),
 		previewContainerIds: [],
 		thumbnailContainerIds: [],
 		peripheralDeviceSettings: {
@@ -355,6 +359,9 @@ export function studioSettingsFrom(apiStudioSettings: APIStudioSettings): IStudi
 		allowRundownResetOnAir: apiStudioSettings.allowRundownResetOnAir,
 		preserveOrphanedSegmentPositionInRundown: apiStudioSettings.preserveOrphanedSegmentPositionInRundown,
 		minimumTakeSpan: apiStudioSettings.minimumTakeSpan ?? DEFAULT_MINIMUM_TAKE_SPAN,
+		enableQuickLoop: apiStudioSettings.enableQuickLoop,
+		forceQuickLoopAutoNext: forceQuickLoopAutoNextFrom(apiStudioSettings.forceQuickLoopAutoNext),
+		fallbackPartDuration: apiStudioSettings.fallbackPartDuration ?? DEFAULT_FALLBACK_PART_DURATION,
 	}
 }
 
@@ -371,6 +378,42 @@ export function APIStudioSettingsFrom(settings: IStudioSettings): APIStudioSetti
 		allowRundownResetOnAir: settings.allowRundownResetOnAir,
 		preserveOrphanedSegmentPositionInRundown: settings.preserveOrphanedSegmentPositionInRundown,
 		minimumTakeSpan: settings.minimumTakeSpan,
+		enableQuickLoop: settings.enableQuickLoop,
+		forceQuickLoopAutoNext: APIForceQuickLoopAutoNextFrom(settings.forceQuickLoopAutoNext),
+		fallbackPartDuration: settings.fallbackPartDuration,
+	}
+}
+
+export function forceQuickLoopAutoNextFrom(
+	forceQuickLoopAutoNext: APIStudioSettings['forceQuickLoopAutoNext']
+): ForceQuickLoopAutoNext | undefined {
+	if (!forceQuickLoopAutoNext) return undefined
+	switch (forceQuickLoopAutoNext) {
+		case 'disabled':
+			return ForceQuickLoopAutoNext.DISABLED
+		case 'enabled_forcing_min_duration':
+			return ForceQuickLoopAutoNext.ENABLED_FORCING_MIN_DURATION
+		case 'enabled_when_valid_duration':
+			return ForceQuickLoopAutoNext.ENABLED_WHEN_VALID_DURATION
+		default:
+			assertNever(forceQuickLoopAutoNext)
+			return undefined
+	}
+}
+
+export function APIForceQuickLoopAutoNextFrom(
+	forceQuickLoopAutoNext: ForceQuickLoopAutoNext | undefined
+): APIStudioSettings['forceQuickLoopAutoNext'] {
+	if (!forceQuickLoopAutoNext) return undefined
+	switch (forceQuickLoopAutoNext) {
+		case ForceQuickLoopAutoNext.DISABLED:
+			return 'disabled'
+		case ForceQuickLoopAutoNext.ENABLED_FORCING_MIN_DURATION:
+			return 'enabled_forcing_min_duration'
+		case ForceQuickLoopAutoNext.ENABLED_WHEN_VALID_DURATION:
+			return 'enabled_when_valid_duration'
+		default:
+			assertNever(forceQuickLoopAutoNext)
 	}
 }
 
diff --git a/meteor/server/api/rest/v1/types.ts b/meteor/server/api/rest/v1/types.ts
index 3e0723e631..f7bb0e7a43 100644
--- a/meteor/server/api/rest/v1/types.ts
+++ b/meteor/server/api/rest/v1/types.ts
@@ -1,8 +1,8 @@
 import { UserErrorMessage } from '@sofie-automation/corelib/dist/error'
 import { Meteor } from 'meteor/meteor'
-import { ClientAPI } from '../../../../lib/api/client'
+import { ClientAPI } from '@sofie-automation/meteor-lib/dist/api/client'
 import { Credentials } from '../../../security/lib/credentials'
-import { MethodContextAPI } from '../../../../lib/api/methods'
+import { MethodContextAPI } from '../../methodContext'
 
 export type APIRegisterHook<T> = <Params, Body, Response>(
 	method: 'get' | 'post' | 'put' | 'delete',
diff --git a/meteor/server/api/rundown.ts b/meteor/server/api/rundown.ts
index 1848066610..51b9ec5a9d 100644
--- a/meteor/server/api/rundown.ts
+++ b/meteor/server/api/rundown.ts
@@ -1,14 +1,17 @@
 import * as _ from 'underscore'
-import { check } from '../../lib/check'
+import { check } from '../lib/check'
 import { logger } from '../logging'
 import { registerClassToMeteorMethods } from '../methods'
-import { NewRundownAPI, RundownAPIMethods } from '../../lib/api/rundown'
+import { NewRundownAPI, RundownAPIMethods } from '@sofie-automation/meteor-lib/dist/api/rundown'
 import { DBShowStyleVariant } from '@sofie-automation/corelib/dist/dataModel/ShowStyleVariant'
 import { DBShowStyleBase } from '@sofie-automation/corelib/dist/dataModel/ShowStyleBase'
 import { PackageInfo } from '../coreSystem'
 import { IngestActions } from './ingest/actions'
-import { ReloadRundownPlaylistResponse, TriggerReloadDataResponse } from '../../lib/api/userActions'
-import { MethodContextAPI, MethodContext } from '../../lib/api/methods'
+import {
+	ReloadRundownPlaylistResponse,
+	TriggerReloadDataResponse,
+} from '@sofie-automation/meteor-lib/dist/api/userActions'
+import { MethodContextAPI, MethodContext } from './methodContext'
 import { StudioContentWriteAccess } from '../security/studio'
 import { runIngestOperation } from './ingest/lib'
 import { IngestJobs } from '@sofie-automation/corelib/dist/worker/ingest'
diff --git a/meteor/server/api/rundownLayouts.ts b/meteor/server/api/rundownLayouts.ts
index 58e7c97ae8..db9eb108e0 100644
--- a/meteor/server/api/rundownLayouts.ts
+++ b/meteor/server/api/rundownLayouts.ts
@@ -1,11 +1,15 @@
 import { Meteor } from 'meteor/meteor'
-import { check, Match } from '../../lib/check'
+import { check, Match } from '../lib/check'
 import { registerClassToMeteorMethods } from '../methods'
-import { NewRundownLayoutsAPI, RundownLayoutsAPIMethods } from '../../lib/api/rundownLayouts'
-import { RundownLayoutType, RundownLayoutBase, CustomizableRegions } from '../../lib/collections/RundownLayouts'
-import { literal, getRandomId, protectString } from '../../lib/lib'
+import { NewRundownLayoutsAPI, RundownLayoutsAPIMethods } from '@sofie-automation/meteor-lib/dist/api/rundownLayouts'
+import {
+	RundownLayoutType,
+	RundownLayoutBase,
+	CustomizableRegions,
+} from '@sofie-automation/meteor-lib/dist/collections/RundownLayouts'
+import { literal, getRandomId, protectString } from '../lib/tempLib'
 import { logger } from '../logging'
-import { MethodContext, MethodContextAPI } from '../../lib/api/methods'
+import { MethodContext, MethodContextAPI } from './methodContext'
 import { ShowStyleContentWriteAccess } from '../security/showStyle'
 import { fetchShowStyleBaseLight } from '../optimizations'
 import { BlueprintId, RundownLayoutId, ShowStyleBaseId, UserId } from '@sofie-automation/corelib/dist/dataModel/Ids'
diff --git a/meteor/server/api/serviceMessages/postHandler.ts b/meteor/server/api/serviceMessages/postHandler.ts
index 2091fb4a42..99995d7e98 100644
--- a/meteor/server/api/serviceMessages/postHandler.ts
+++ b/meteor/server/api/serviceMessages/postHandler.ts
@@ -1,5 +1,5 @@
 import { logger } from '../../logging'
-import { ServiceMessage, Criticality } from '../../../lib/collections/CoreSystem'
+import { ServiceMessage, Criticality } from '@sofie-automation/meteor-lib/dist/collections/CoreSystem'
 import { writeMessage } from './serviceMessagesApi'
 import moment from 'moment'
 import Koa from 'koa'
diff --git a/meteor/server/api/serviceMessages/serviceMessagesApi.ts b/meteor/server/api/serviceMessages/serviceMessagesApi.ts
index 8245fe2a6c..e39ebac678 100644
--- a/meteor/server/api/serviceMessages/serviceMessagesApi.ts
+++ b/meteor/server/api/serviceMessages/serviceMessagesApi.ts
@@ -1,5 +1,5 @@
 import { stringifyError } from '@sofie-automation/shared-lib/dist/lib/stringifyError'
-import { ServiceMessage } from '../../../lib/collections/CoreSystem'
+import { ServiceMessage } from '@sofie-automation/meteor-lib/dist/collections/CoreSystem'
 import { getCoreSystemAsync } from '../../coreSystem/collection'
 import { logger } from '../../logging'
 import { CoreSystem } from '../../collections'
diff --git a/meteor/server/api/showStyles.ts b/meteor/server/api/showStyles.ts
index db8a018da2..8275c81836 100644
--- a/meteor/server/api/showStyles.ts
+++ b/meteor/server/api/showStyles.ts
@@ -1,11 +1,15 @@
-import { check } from '../../lib/check'
+import { check } from '../lib/check'
 import { registerClassToMeteorMethods } from '../methods'
-import { CreateAdlibTestingRundownOption, NewShowStylesAPI, ShowStylesAPIMethods } from '../../lib/api/showStyles'
+import {
+	CreateAdlibTestingRundownOption,
+	NewShowStylesAPI,
+	ShowStylesAPIMethods,
+} from '@sofie-automation/meteor-lib/dist/api/showStyles'
 import { Meteor } from 'meteor/meteor'
 import { DBShowStyleBase } from '@sofie-automation/corelib/dist/dataModel/ShowStyleBase'
 import { DBShowStyleVariant } from '@sofie-automation/corelib/dist/dataModel/ShowStyleVariant'
-import { protectString, getRandomId, omit } from '../../lib/lib'
-import { MethodContextAPI, MethodContext } from '../../lib/api/methods'
+import { protectString, getRandomId, omit } from '../lib/tempLib'
+import { MethodContextAPI, MethodContext } from './methodContext'
 import { OrganizationContentWriteAccess } from '../security/organization'
 import { ShowStyleContentWriteAccess } from '../security/showStyle'
 import { Credentials } from '../security/lib/credentials'
diff --git a/meteor/server/api/singleUseTokens.ts b/meteor/server/api/singleUseTokens.ts
index 0603f01191..d775a5e760 100644
--- a/meteor/server/api/singleUseTokens.ts
+++ b/meteor/server/api/singleUseTokens.ts
@@ -1,7 +1,8 @@
 import { createHmac, randomBytes } from 'crypto'
 import { Time } from '@sofie-automation/blueprints-integration'
-import { getCurrentTime, getHash } from '../../lib/lib'
-import { SINGLE_USE_TOKEN_SALT } from '../../lib/api/userActions'
+import { getHash } from '@sofie-automation/corelib/dist/hash'
+import { getCurrentTime } from '../lib/lib'
+import { SINGLE_USE_TOKEN_SALT } from '@sofie-automation/meteor-lib/dist/api/userActions'
 import { isInTestWrite } from '../security/lib/securityVerify'
 
 // The following code is taken from an NPM pacakage called "@sunknudsen/totp", but copied here, instead
diff --git a/meteor/server/api/snapshot.ts b/meteor/server/api/snapshot.ts
index 0bbe8510d9..d346e5c3a2 100644
--- a/meteor/server/api/snapshot.ts
+++ b/meteor/server/api/snapshot.ts
@@ -4,7 +4,7 @@ import * as _ from 'underscore'
 import Koa from 'koa'
 import KoaRouter from '@koa/router'
 import bodyParser from 'koa-bodyparser'
-import { check } from '../../lib/check'
+import { check } from '../lib/check'
 import { DBStudio } from '@sofie-automation/corelib/dist/dataModel/Studio'
 import {
 	SnapshotType,
@@ -12,21 +12,13 @@ import {
 	SnapshotDebug,
 	SnapshotBase,
 	SnapshotRundownPlaylist,
-} from '../../lib/collections/Snapshots'
-import { UserActionsLogItem } from '../../lib/collections/UserActionsLog'
+} from '@sofie-automation/meteor-lib/dist/collections/Snapshots'
+import { UserActionsLogItem } from '@sofie-automation/meteor-lib/dist/collections/UserActionsLog'
 import { PieceGeneric } from '@sofie-automation/corelib/dist/dataModel/Piece'
 import { MediaObject } from '@sofie-automation/shared-lib/dist/core/model/MediaObjects'
-import {
-	getCurrentTime,
-	Time,
-	formatDateTime,
-	fixValidPath,
-	protectString,
-	getRandomId,
-	omit,
-	unprotectStringArray,
-	unprotectString,
-} from '../../lib/lib'
+import { Time, protectString, getRandomId, omit, unprotectStringArray, unprotectString } from '../lib/tempLib'
+import { formatDateTime } from '@sofie-automation/meteor-lib/dist/time'
+import { getCurrentTime, fixValidPath } from '../lib/lib'
 import { stringifyError } from '@sofie-automation/shared-lib/dist/lib/stringifyError'
 import { DBShowStyleBase } from '@sofie-automation/corelib/dist/dataModel/ShowStyleBase'
 import { PeripheralDevice, PERIPHERAL_SUBTYPE_PROCESS } from '@sofie-automation/corelib/dist/dataModel/PeripheralDevice'
@@ -34,8 +26,9 @@ import { logger } from '../logging'
 import { TimelineComplete } from '@sofie-automation/corelib/dist/dataModel/Timeline'
 import { PeripheralDeviceCommand } from '@sofie-automation/corelib/dist/dataModel/PeripheralDeviceCommand'
 import { registerClassToMeteorMethods } from '../methods'
-import { NewSnapshotAPI, SnapshotAPIMethods } from '../../lib/api/shapshot'
-import { ICoreSystem, parseVersion } from '../../lib/collections/CoreSystem'
+import { NewSnapshotAPI, SnapshotAPIMethods } from '@sofie-automation/meteor-lib/dist/api/shapshot'
+import { ICoreSystem } from '@sofie-automation/meteor-lib/dist/collections/CoreSystem'
+import { parseVersion } from '../systemStatus/semverUtils'
 import { CURRENT_SYSTEM_VERSION } from '../migration/currentSystemVersion'
 import { isVersionSupported } from '../migration/databaseMigration'
 import { DBShowStyleVariant } from '@sofie-automation/corelib/dist/dataModel/ShowStyleVariant'
@@ -44,10 +37,10 @@ import { IngestRundown, VTContent } from '@sofie-automation/blueprints-integrati
 import { MongoQuery } from '@sofie-automation/corelib/dist/mongo'
 import { importIngestRundown } from './ingest/http'
 import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
-import { RundownLayoutBase } from '../../lib/collections/RundownLayouts'
-import { DBTriggeredActions } from '../../lib/collections/TriggeredActions'
-import { Settings } from '../../lib/Settings'
-import { MethodContext, MethodContextAPI } from '../../lib/api/methods'
+import { RundownLayoutBase } from '@sofie-automation/meteor-lib/dist/collections/RundownLayouts'
+import { DBTriggeredActions } from '@sofie-automation/meteor-lib/dist/collections/TriggeredActions'
+import { Settings } from '../Settings'
+import { MethodContext, MethodContextAPI } from './methodContext'
 import { Credentials, isResolvedCredentials } from '../security/lib/credentials'
 import { OrganizationContentWriteAccess } from '../security/organization'
 import { StudioContentWriteAccess } from '../security/studio'
diff --git a/meteor/server/api/studio/api.ts b/meteor/server/api/studio/api.ts
index cd212f28ee..70e7699f80 100644
--- a/meteor/server/api/studio/api.ts
+++ b/meteor/server/api/studio/api.ts
@@ -1,9 +1,10 @@
 import { Meteor } from 'meteor/meteor'
-import { check } from '../../../lib/check'
+import { check } from '../../lib/check'
 import { registerClassToMeteorMethods } from '../../methods'
-import { NewStudiosAPI, StudiosAPIMethods } from '../../../lib/api/studios'
+import { NewStudiosAPI, StudiosAPIMethods } from '@sofie-automation/meteor-lib/dist/api/studios'
 import { DBStudio } from '@sofie-automation/corelib/dist/dataModel/Studio'
-import { literal, getRandomId, lazyIgnore } from '../../../lib/lib'
+import { literal, getRandomId } from '../../lib/tempLib'
+import { lazyIgnore } from '../../lib/lib'
 import { stringifyError } from '@sofie-automation/shared-lib/dist/lib/stringifyError'
 import {
 	ExpectedPackages,
@@ -18,7 +19,7 @@ import {
 	Studios,
 	Timeline,
 } from '../../collections'
-import { MethodContextAPI, MethodContext } from '../../../lib/api/methods'
+import { MethodContextAPI, MethodContext } from '../methodContext'
 import { OrganizationContentWriteAccess } from '../../security/organization'
 import { Credentials } from '../../security/lib/credentials'
 import { wrapDefaultObject } from '@sofie-automation/corelib/dist/settings/objectWithOverrides'
@@ -49,9 +50,9 @@ export async function insertStudioInner(organizationId: OrganizationId | null, n
 				minimumTakeSpan: DEFAULT_MINIMUM_TAKE_SPAN,
 			},
 			_rundownVersionHash: '',
-			routeSets: {},
-			routeSetExclusivityGroups: {},
-			packageContainers: {},
+			routeSetsWithOverrides: wrapDefaultObject({}),
+			routeSetExclusivityGroupsWithOverrides: wrapDefaultObject({}),
+			packageContainersWithOverrides: wrapDefaultObject({}),
 			thumbnailContainerIds: [],
 			previewContainerIds: [],
 			peripheralDeviceSettings: {
@@ -140,7 +141,7 @@ Studios.observeChanges(
 	{
 		fields: {
 			mappingsWithOverrides: 1,
-			routeSets: 1,
+			routeSetsWithOverrides: 1,
 		},
 	}
 )
diff --git a/meteor/server/api/studio/lib.ts b/meteor/server/api/studio/lib.ts
index eb7804b097..f991b43997 100644
--- a/meteor/server/api/studio/lib.ts
+++ b/meteor/server/api/studio/lib.ts
@@ -2,7 +2,8 @@ import { RundownPlaylistId, StudioId } from '@sofie-automation/corelib/dist/data
 import { PackageInfoDB } from '@sofie-automation/corelib/dist/dataModel/PackageInfos'
 import { PeripheralDevice } from '@sofie-automation/corelib/dist/dataModel/PeripheralDevice'
 import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
-import { getCurrentTime, protectString } from '../../../lib/lib'
+import { protectString } from '@sofie-automation/shared-lib/dist/lib/protectedString'
+import { getCurrentTime } from '../../lib/lib'
 import { ExpectedPackages, PackageInfos, PeripheralDevices, RundownPlaylists } from '../../collections'
 import { logger } from '../../logging'
 
diff --git a/meteor/server/api/system.ts b/meteor/server/api/system.ts
index d29e30a8d3..a2c7aa9806 100644
--- a/meteor/server/api/system.ts
+++ b/meteor/server/api/system.ts
@@ -1,24 +1,25 @@
 import * as _ from 'underscore'
-import { getCurrentTime, sleep, Time } from '../../lib/lib'
+import { Time } from '../lib/tempLib'
+import { sleep, getCurrentTime } from '../lib/lib'
 import { registerClassToMeteorMethods } from '../methods'
-import { MethodContextAPI, MethodContext } from '../../lib/api/methods'
+import { MethodContextAPI, MethodContext } from './methodContext'
 import {
 	SystemAPIMethods,
 	CollectionCleanupResult,
 	SystemAPI,
 	BenchmarkResult,
 	SystemBenchmarkResults,
-} from '../../lib/api/system'
+} from '@sofie-automation/meteor-lib/dist/api/system'
 import { CollectionIndexes, getTargetRegisteredIndexes } from '../collections/indices'
 import { Meteor } from 'meteor/meteor'
 import { logger } from '../logging'
 import { SystemWriteAccess } from '../security/system'
-import { check } from '../../lib/check'
-import { IndexSpecifier } from '../../lib/collections/lib'
+import { check } from '../lib/check'
+import { IndexSpecifier } from '@sofie-automation/meteor-lib/dist/collections/lib'
 import { getBundle as getTranslationBundleInner } from './translationsBundles'
-import { TranslationsBundle } from '../../lib/collections/TranslationsBundles'
+import { TranslationsBundle } from '@sofie-automation/meteor-lib/dist/collections/TranslationsBundles'
 import { OrganizationContentWriteAccess } from '../security/organization'
-import { ClientAPI } from '../../lib/api/client'
+import { ClientAPI } from '@sofie-automation/meteor-lib/dist/api/client'
 import { cleanupOldDataInner } from './cleanup'
 import { IndexSpecification } from 'mongodb'
 import { nightlyCronjobInner } from '../cronjobs'
@@ -26,6 +27,7 @@ import { TranslationsBundleId } from '@sofie-automation/corelib/dist/dataModel/I
 import { createAsyncOnlyMongoCollection, AsyncOnlyMongoCollection } from '../collections/collection'
 import { generateToken } from './singleUseTokens'
 import { triggerWriteAccessBecauseNoCheckNecessary } from '../security/lib/securityVerify'
+import { stringifyError } from '@sofie-automation/shared-lib/dist/lib/stringifyError'
 
 async function setupIndexes(removeOldIndexes = false): Promise<Array<IndexSpecification>> {
 	// Note: This function should NOT run on Meteor.startup, due to getCollectionIndexes failing if run before indexes have been created.
@@ -54,7 +56,9 @@ async function setupIndexes(removeOldIndexes = false): Promise<Array<IndexSpecif
 						if (removeOldIndexes) {
 							logger.info(`Removing index: ${JSON.stringify(existingIndex.key)}`)
 							rawCollection.dropIndex(existingIndex.name).catch((e) => {
-								logger.warn(`Failed to drop index: ${JSON.stringify(existingIndex.key)}: ${e}`)
+								logger.warn(
+									`Failed to drop index: ${JSON.stringify(existingIndex.key)}: ${stringifyError(e)}`
+								)
 							})
 						}
 					}
diff --git a/meteor/server/api/systemTime/api.ts b/meteor/server/api/systemTime/api.ts
index 89b7cdb2a5..48b80a5498 100644
--- a/meteor/server/api/systemTime/api.ts
+++ b/meteor/server/api/systemTime/api.ts
@@ -1,12 +1,16 @@
 import { TimeDiff } from '@sofie-automation/shared-lib/dist/peripheralDevice/peripheralDeviceAPI'
-import { getCurrentTime, systemTime } from '../../../lib/lib'
+import { getCurrentTime } from '../../lib/lib'
 
 export function getTimeDiff(): TimeDiff {
 	return {
 		currentTime: getCurrentTime(),
 		systemRawTime: Date.now(),
-		diff: systemTime.diff,
-		stdDev: systemTime.stdDev,
-		good: systemTime.stdDev < 1000 / 50,
+		// TODO: Since the server doesn't do its own sync, these are never set, but are propogated to clients. They probably shouldn't be
+		diff: 0,
+		stdDev: 0,
+		good: true,
+		// diff: systemTime.diff,
+		// stdDev: systemTime.stdDev,
+		// good: systemTime.stdDev < 1000 / 50,
 	}
 }
diff --git a/meteor/server/api/systemTime/ntpTimeChecker.ts b/meteor/server/api/systemTime/ntpTimeChecker.ts
index 9b82e56bf6..5d588eeea5 100644
--- a/meteor/server/api/systemTime/ntpTimeChecker.ts
+++ b/meteor/server/api/systemTime/ntpTimeChecker.ts
@@ -1,9 +1,10 @@
 import { Meteor } from 'meteor/meteor'
-import { Settings } from '../../../lib/Settings'
+import { Settings } from '../../Settings'
 import { StatusCode } from '@sofie-automation/blueprints-integration'
 import { setSystemStatus } from '../../systemStatus/systemStatus'
 import { logger } from '../../logging'
 import { determineDiffTime } from './systemTime'
+import { stringifyError } from '@sofie-automation/shared-lib/dist/lib/stringifyError'
 
 const CHECK_INTERVAL = 60 * 1000
 
@@ -37,7 +38,7 @@ Meteor.startup(() => {
 					}
 				})
 				.catch((err) => {
-					logger.error(`Error in determineDiffTime: ${err}`)
+					logger.error(`Error in determineDiffTime: ${stringifyError(err)}`)
 					failCount++
 					if (failCount > 10) {
 						setSystemStatus('ntpTimeChecker', {
diff --git a/meteor/server/api/systemTime/startup.ts b/meteor/server/api/systemTime/startup.ts
deleted file mode 100644
index 561fefcb38..0000000000
--- a/meteor/server/api/systemTime/startup.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { Meteor } from 'meteor/meteor'
-import { systemTime } from '../../../lib/lib'
-import { performance } from 'perf_hooks'
-
-Meteor.startup(() => {
-	// Since we currently don't set any diff in systemTime and just use the parent OS's time,
-	// we just set these to zero:
-
-	systemTime.diff = 0
-	systemTime.stdDev = 0
-	systemTime.lastSync = performance.now()
-	systemTime.hasBeenSet = true
-})
diff --git a/meteor/server/api/translationsBundles.ts b/meteor/server/api/translationsBundles.ts
index 6bc0c8d688..f6acd74d9f 100644
--- a/meteor/server/api/translationsBundles.ts
+++ b/meteor/server/api/translationsBundles.ts
@@ -1,12 +1,15 @@
 import { Meteor } from 'meteor/meteor'
-import { Translation, TranslationsBundle as DBTranslationsBundle } from '../../lib/collections/TranslationsBundles'
+import {
+	Translation,
+	TranslationsBundle as DBTranslationsBundle,
+} from '@sofie-automation/meteor-lib/dist/collections/TranslationsBundles'
 import { TranslationsBundles as TranslationsBundleCollection } from '../collections'
 import {
 	I18NextData,
 	TranslationsBundle as BlueprintTranslationsbundle,
 	TranslationsBundleType,
 } from '@sofie-automation/blueprints-integration'
-import { getHash, protectString, unprotectString } from '../../lib/lib'
+import { getHash, protectString, unprotectString } from '../lib/tempLib'
 import {
 	BlueprintId,
 	PeripheralDeviceId,
diff --git a/meteor/server/api/triggeredActions.ts b/meteor/server/api/triggeredActions.ts
index 043ed7a600..f172786207 100644
--- a/meteor/server/api/triggeredActions.ts
+++ b/meteor/server/api/triggeredActions.ts
@@ -1,16 +1,16 @@
 import { Meteor } from 'meteor/meteor'
-import { check, Match } from '../../lib/check'
+import { check, Match } from '../lib/check'
 import { registerClassToMeteorMethods, ReplaceOptionalWithNullInMethodArguments } from '../methods'
-import { literal, getRandomId, protectString, Complete } from '../../lib/lib'
+import { literal, getRandomId, protectString, Complete } from '../lib/tempLib'
 import { logger } from '../logging'
-import { MethodContext, MethodContextAPI } from '../../lib/api/methods'
+import { MethodContext, MethodContextAPI } from './methodContext'
 import { ShowStyleContentWriteAccess } from '../security/showStyle'
-import { DBTriggeredActions, TriggeredActionsObj } from '../../lib/collections/TriggeredActions'
+import { DBTriggeredActions, TriggeredActionsObj } from '@sofie-automation/meteor-lib/dist/collections/TriggeredActions'
 import {
 	CreateTriggeredActionsContent,
 	NewTriggeredActionsAPI,
 	TriggeredActionsAPIMethods,
-} from '../../lib/api/triggeredActions'
+} from '@sofie-automation/meteor-lib/dist/api/triggeredActions'
 import { SystemWriteAccess } from '../security/system'
 import { fetchShowStyleBaseLight } from '../optimizations'
 import {
diff --git a/meteor/server/api/user.ts b/meteor/server/api/user.ts
index 7381828b94..50dd833241 100644
--- a/meteor/server/api/user.ts
+++ b/meteor/server/api/user.ts
@@ -1,16 +1,17 @@
 import { Meteor } from 'meteor/meteor'
 import * as _ from 'underscore'
 import { Accounts } from 'meteor/accounts-base'
-import { unprotectString, protectString, deferAsync, sleep } from '../../lib/lib'
-import { MethodContextAPI, MethodContext } from '../../lib/api/methods'
-import { NewUserAPI, UserAPIMethods, createUser, CreateNewUserData } from '../../lib/api/user'
+import { unprotectString, protectString } from '../lib/tempLib'
+import { sleep, deferAsync } from '../lib/lib'
+import { MethodContextAPI, MethodContext } from './methodContext'
+import { NewUserAPI, UserAPIMethods, createUser, CreateNewUserData } from '@sofie-automation/meteor-lib/dist/api/user'
 import { registerClassToMeteorMethods } from '../methods'
 import { SystemWriteAccess } from '../security/system'
 import { triggerWriteAccess, triggerWriteAccessBecauseNoCheckNecessary } from '../security/lib/securityVerify'
 import { logNotAllowed } from '../../server/security/lib/lib'
-import { User } from '../../lib/collections/Users'
+import { User } from '@sofie-automation/meteor-lib/dist/collections/Users'
 import { createOrganization } from './organizations'
-import { DBOrganizationBase } from '../../lib/collections/Organization'
+import { DBOrganizationBase } from '@sofie-automation/meteor-lib/dist/collections/Organization'
 import { resetCredentials } from '../security/lib/credentials'
 import { OrganizationId, UserId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import { Organizations, Users } from '../collections'
diff --git a/meteor/server/api/userActions.ts b/meteor/server/api/userActions.ts
index 0c07d95244..507ec96d35 100644
--- a/meteor/server/api/userActions.ts
+++ b/meteor/server/api/userActions.ts
@@ -1,10 +1,10 @@
-import { check, Match } from '../../lib/check'
+import { check, Match } from '../lib/check'
 import { Meteor } from 'meteor/meteor'
-import { ClientAPI } from '../../lib/api/client'
-import { Time } from '../../lib/lib'
+import { ClientAPI } from '@sofie-automation/meteor-lib/dist/api/client'
+import { Time } from '../lib/tempLib'
 import { ServerPlayoutAPI } from './playout/playout'
-import { NewUserActionAPI, UserActionAPIMethods } from '../../lib/api/userActions'
-import { EvaluationBase } from '../../lib/collections/Evaluations'
+import { NewUserActionAPI, UserActionAPIMethods } from '@sofie-automation/meteor-lib/dist/api/userActions'
+import { EvaluationBase } from '@sofie-automation/meteor-lib/dist/collections/Evaluations'
 import { IngestPart, IngestAdlib, ActionUserData } from '@sofie-automation/blueprints-integration'
 import { storeRundownPlaylistSnapshot } from './snapshot'
 import { registerClassToMeteorMethods, ReplaceOptionalWithNullInMethodArguments } from '../methods'
@@ -12,12 +12,12 @@ import { ServerRundownAPI } from './rundown'
 import { saveEvaluation } from './evaluations'
 import { MediaManagerAPI } from './mediaManager'
 import { MOSDeviceActions } from './ingest/mosDevice/actions'
-import { MethodContextAPI } from '../../lib/api/methods'
+import { MethodContextAPI } from './methodContext'
 import { ServerClientAPI } from './client'
 import { OrganizationContentWriteAccess } from '../security/organization'
 import { SystemWriteAccess } from '../security/system'
 import { triggerWriteAccessBecauseNoCheckNecessary } from '../security/lib/securityVerify'
-import { Bucket } from '../../lib/collections/Buckets'
+import { Bucket } from '@sofie-automation/meteor-lib/dist/collections/Buckets'
 import { BucketsAPI } from './buckets'
 import { BucketAdLib } from '@sofie-automation/corelib/dist/dataModel/BucketAdLibPiece'
 import { AdLibActionCommon } from '@sofie-automation/corelib/dist/dataModel/AdlibAction'
@@ -49,6 +49,7 @@ import {
 import { IngestDataCache, Parts, Pieces, Rundowns } from '../collections'
 import { IngestCacheType } from '@sofie-automation/corelib/dist/dataModel/IngestDataCache'
 import { verifyHashedToken } from './singleUseTokens'
+import { QuickLoopMarker } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
 import { runIngestOperation } from './ingest/lib'
 import { IngestJobs } from '@sofie-automation/corelib/dist/worker/ingest'
 
@@ -384,7 +385,7 @@ class ServerUserActionAPI
 				check(duration, Number)
 			},
 			'pieceSetInOutPoints',
-			[rundownPlaylistId, partId, pieceId, inPoint, duration],
+			{ rundownPlaylistId, partId, pieceId, inPoint, duration },
 			async (access) => {
 				return pieceSetInOutPoints(access, partId, pieceId, inPoint, duration)
 			}
@@ -538,7 +539,7 @@ class ServerUserActionAPI
 			userEvent,
 			eventTime,
 			'bucketAdlibImport',
-			[bucketId, showStyleBaseId, ingestItem],
+			{ bucketId, showStyleBaseId, ingestItem },
 			async () => {
 				check(bucketId, String)
 				check(showStyleBaseId, String)
@@ -619,7 +620,7 @@ class ServerUserActionAPI
 				//
 			},
 			'saveEvaluation',
-			[evaluation],
+			{ evaluation },
 			async (access) => {
 				return saveEvaluation(access, evaluation)
 			}
@@ -643,7 +644,7 @@ class ServerUserActionAPI
 				check(reason, String)
 			},
 			'storeRundownSnapshot',
-			[playlistId, reason, full],
+			{ playlistId, reason, full },
 			async (access) => {
 				return storeRundownPlaylistSnapshot(access, hashedToken, reason, full)
 			}
@@ -692,7 +693,7 @@ class ServerUserActionAPI
 				check(playlistId, String)
 			},
 			'resyncRundownPlaylist',
-			[playlistId],
+			{ playlistId },
 			async (access) => {
 				return ServerRundownAPI.resyncRundownPlaylist(access)
 			}
@@ -708,7 +709,7 @@ class ServerUserActionAPI
 				check(rundownId, String)
 			},
 			'unsyncRundown',
-			[rundownId],
+			{ rundownId },
 			async (access) => {
 				return ServerRundownAPI.unsyncRundown(access)
 			}
@@ -724,7 +725,7 @@ class ServerUserActionAPI
 				check(rundownId, String)
 			},
 			'removeRundown',
-			[rundownId],
+			{ rundownId },
 			async (access) => {
 				return ServerRundownAPI.removeRundown(access)
 			}
@@ -740,7 +741,7 @@ class ServerUserActionAPI
 				check(rundownId, String)
 			},
 			'resyncRundown',
-			[rundownId],
+			{ rundownId },
 			async (access) => {
 				return ServerRundownAPI.resyncRundown(access)
 			}
@@ -752,7 +753,7 @@ class ServerUserActionAPI
 			userEvent,
 			eventTime,
 			'mediaRestartWorkflow',
-			[workflowId],
+			{ workflowId },
 			async () => {
 				check(workflowId, String)
 
@@ -767,7 +768,7 @@ class ServerUserActionAPI
 			userEvent,
 			eventTime,
 			'mediaAbortWorkflow',
-			[workflowId],
+			{ workflowId },
 			async () => {
 				check(workflowId, String)
 
@@ -782,7 +783,7 @@ class ServerUserActionAPI
 			userEvent,
 			eventTime,
 			'mediaPrioritizeWorkflow',
-			[workflowId],
+			{ workflowId },
 			async () => {
 				check(workflowId, String)
 
@@ -797,7 +798,7 @@ class ServerUserActionAPI
 			userEvent,
 			eventTime,
 			'mediaRestartAllWorkflows',
-			[],
+			{},
 			async () => {
 				const access = await OrganizationContentWriteAccess.mediaWorkFlows(this)
 				return MediaManagerAPI.restartAllWorkflows(access)
@@ -810,7 +811,7 @@ class ServerUserActionAPI
 			userEvent,
 			eventTime,
 			'mediaAbortAllWorkflows',
-			[],
+			{},
 			async () => {
 				const access = await OrganizationContentWriteAccess.mediaWorkFlows(this)
 				return MediaManagerAPI.abortAllWorkflows(access)
@@ -828,7 +829,7 @@ class ServerUserActionAPI
 			userEvent,
 			eventTime,
 			'packageManagerRestartExpectation',
-			[deviceId, workId],
+			{ deviceId, workId },
 			async () => {
 				check(deviceId, String)
 				check(workId, String)
@@ -844,7 +845,7 @@ class ServerUserActionAPI
 			userEvent,
 			eventTime,
 			'packageManagerRestartAllExpectations',
-			[studioId],
+			{ studioId },
 			async () => {
 				check(studioId, String)
 
@@ -864,7 +865,7 @@ class ServerUserActionAPI
 			userEvent,
 			eventTime,
 			'packageManagerAbortExpectation',
-			[deviceId, workId],
+			{ deviceId, workId },
 			async () => {
 				check(deviceId, String)
 				check(workId, String)
@@ -885,7 +886,7 @@ class ServerUserActionAPI
 			userEvent,
 			eventTime,
 			'packageManagerRestartPackageContainer',
-			[deviceId, containerId],
+			{ deviceId, containerId },
 			async () => {
 				check(deviceId, String)
 				check(containerId, String)
@@ -916,7 +917,7 @@ class ServerUserActionAPI
 			userEvent,
 			eventTime,
 			'restartCore',
-			[hashedToken],
+			{ hashedToken },
 			async () => {
 				check(hashedToken, String)
 
@@ -935,13 +936,13 @@ class ServerUserActionAPI
 		)
 	}
 
-	async guiFocused(userEvent: string, eventTime: Time, viewInfo: any[] | null) {
-		return ServerClientAPI.runUserActionInLog(this, userEvent, eventTime, 'guiFocused', [viewInfo], async () => {
+	async guiFocused(userEvent: string, eventTime: Time, viewInfo: unknown | null) {
+		return ServerClientAPI.runUserActionInLog(this, userEvent, eventTime, 'guiFocused', { viewInfo }, async () => {
 			triggerWriteAccessBecauseNoCheckNecessary()
 		})
 	}
-	async guiBlurred(userEvent: string, eventTime: Time, viewInfo: any[] | null) {
-		return ServerClientAPI.runUserActionInLog(this, userEvent, eventTime, 'guiBlurred', [viewInfo], async () => {
+	async guiBlurred(userEvent: string, eventTime: Time, viewInfo: unknown | null) {
+		return ServerClientAPI.runUserActionInLog(this, userEvent, eventTime, 'guiBlurred', { viewInfo }, async () => {
 			triggerWriteAccessBecauseNoCheckNecessary()
 		})
 	}
@@ -952,7 +953,7 @@ class ServerUserActionAPI
 			userEvent,
 			eventTime,
 			'bucketsRemoveBucket',
-			[bucketId],
+			{ bucketId },
 			async () => {
 				check(bucketId, String)
 
@@ -972,7 +973,7 @@ class ServerUserActionAPI
 			userEvent,
 			eventTime,
 			'bucketsModifyBucket',
-			[bucketId, bucketProps],
+			{ bucketId, bucketProps },
 			async () => {
 				check(bucketId, String)
 				check(bucketProps, Object)
@@ -988,7 +989,7 @@ class ServerUserActionAPI
 			userEvent,
 			eventTime,
 			'bucketsEmptyBucket',
-			[bucketId],
+			{ bucketId },
 			async () => {
 				check(bucketId, String)
 
@@ -1003,7 +1004,7 @@ class ServerUserActionAPI
 			userEvent,
 			eventTime,
 			'bucketsCreateNewBucket',
-			[name, studioId],
+			{ name, studioId },
 			async () => {
 				check(studioId, String)
 				check(name, String)
@@ -1021,7 +1022,7 @@ class ServerUserActionAPI
 			userEvent,
 			eventTime,
 			'bucketsRemoveBucketAdLib',
-			[adlibId],
+			{ adlibId },
 			async () => {
 				const access = await BucketSecurity.allowWriteAccessPiece(this, adlibId)
 				return BucketsAPI.removeBucketAdLib(access)
@@ -1034,7 +1035,7 @@ class ServerUserActionAPI
 			userEvent,
 			eventTime,
 			'bucketsRemoveBucketAdLibAction',
-			[actionId],
+			{ actionId },
 			async () => {
 				check(actionId, String)
 
@@ -1054,7 +1055,7 @@ class ServerUserActionAPI
 			userEvent,
 			eventTime,
 			'bucketsModifyBucketAdLib',
-			[adlibId, adlibProps],
+			{ adlibId, adlibProps },
 			async () => {
 				check(adlibId, String)
 				check(adlibProps, Object)
@@ -1075,7 +1076,7 @@ class ServerUserActionAPI
 			userEvent,
 			eventTime,
 			'bucketsModifyBucketAdLib',
-			[actionId, actionProps],
+			{ actionId, actionProps },
 			async () => {
 				check(actionId, String)
 				check(actionProps, Object)
@@ -1097,7 +1098,7 @@ class ServerUserActionAPI
 			userEvent,
 			eventTime,
 			'bucketsSaveActionIntoBucket',
-			[studioId, bucketId, action],
+			{ studioId, bucketId, action },
 			async () => {
 				check(studioId, String)
 				check(bucketId, String)
@@ -1113,18 +1114,18 @@ class ServerUserActionAPI
 		eventTime: Time,
 		studioId: StudioId,
 		routeSetId: string,
-		state: boolean
+		state: boolean | 'toggle'
 	): Promise<ClientAPI.ClientResponse<void>> {
 		return ServerClientAPI.runUserActionInLog(
 			this,
 			userEvent,
 			eventTime,
 			'packageManagerRestartAllExpectations',
-			[studioId, routeSetId, state],
+			{ studioId, routeSetId, state },
 			async () => {
 				check(studioId, String)
 				check(routeSetId, String)
-				check(state, Boolean)
+				check(state, Match.OneOf('toggle', Boolean))
 
 				const access = await StudioContentWriteAccess.routeSet(this, studioId)
 				return ServerPlayoutAPI.switchRouteSet(access, routeSetId, state)
@@ -1187,7 +1188,7 @@ class ServerUserActionAPI
 			userEvent,
 			eventTime,
 			'packageManagerRestartAllExpectations',
-			[peripheralDeviceId, subDeviceId, disable],
+			{ peripheralDeviceId, subDeviceId, disable },
 			async () => {
 				check(peripheralDeviceId, String)
 				check(subDeviceId, String)
@@ -1222,6 +1223,52 @@ class ServerUserActionAPI
 		)
 	}
 
+	async setQuickLoopStart(
+		userEvent: string,
+		eventTime: number,
+		playlistId: RundownPlaylistId,
+		marker: QuickLoopMarker | null
+	): Promise<ClientAPI.ClientResponse<void>> {
+		return ServerClientAPI.runUserActionInLogForPlaylistOnWorker(
+			this,
+			userEvent,
+			eventTime,
+			playlistId,
+			() => {
+				check(playlistId, String)
+			},
+			StudioJobs.SetQuickLoopMarker,
+			{
+				playlistId,
+				marker,
+				type: 'start',
+			}
+		)
+	}
+
+	async setQuickLoopEnd(
+		userEvent: string,
+		eventTime: number,
+		playlistId: RundownPlaylistId,
+		marker: QuickLoopMarker | null
+	): Promise<ClientAPI.ClientResponse<void>> {
+		return ServerClientAPI.runUserActionInLogForPlaylistOnWorker(
+			this,
+			userEvent,
+			eventTime,
+			playlistId,
+			() => {
+				check(playlistId, String)
+			},
+			StudioJobs.SetQuickLoopMarker,
+			{
+				playlistId,
+				marker,
+				type: 'end',
+			}
+		)
+	}
+
 	async createAdlibTestingRundownForShowStyleVariant(
 		userEvent: string,
 		eventTime: number,
@@ -1234,7 +1281,7 @@ class ServerUserActionAPI
 			userEvent,
 			eventTime,
 			`worker.ingest.${jobName}`,
-			[showStyleVariantId],
+			{ showStyleVariantId },
 			async (_credentials) => {
 				check(studioId, String)
 				check(showStyleVariantId, String)
diff --git a/meteor/server/collections/bucket.ts b/meteor/server/collections/bucket.ts
index fd7b84f6c8..5479fcfeef 100644
--- a/meteor/server/collections/bucket.ts
+++ b/meteor/server/collections/bucket.ts
@@ -1,7 +1,7 @@
 import { BucketAdLibAction } from '@sofie-automation/corelib/dist/dataModel/BucketAdLibAction'
 import { BucketAdLib } from '@sofie-automation/corelib/dist/dataModel/BucketAdLibPiece'
 import { CollectionName } from '@sofie-automation/corelib/dist/dataModel/Collections'
-import { Bucket } from '../../lib/collections/Buckets'
+import { Bucket } from '@sofie-automation/meteor-lib/dist/collections/Buckets'
 import { createAsyncOnlyMongoCollection } from './collection'
 import { registerIndex } from './indices'
 
diff --git a/meteor/server/collections/collection.ts b/meteor/server/collections/collection.ts
index d68a1c3d52..c889709021 100644
--- a/meteor/server/collections/collection.ts
+++ b/meteor/server/collections/collection.ts
@@ -1,28 +1,26 @@
 import { UserId } from '@sofie-automation/corelib/dist/dataModel/Ids'
-import { MongoModifier, MongoQuery } from '@sofie-automation/corelib/dist/mongo'
+import { FindOptions, MongoModifier, MongoQuery } from '@sofie-automation/corelib/dist/mongo'
 import { ProtectedString, protectString } from '@sofie-automation/corelib/dist/protectedString'
 import { Meteor } from 'meteor/meteor'
 import { Mongo } from 'meteor/mongo'
 import { NpmModuleMongodb } from 'meteor/npm-mongo'
-import {
-	UpdateOptions,
-	UpsertOptions,
-	FieldNames,
-	getOrCreateMongoCollection,
-	FindOptions,
-	collectionsCache,
-	IndexSpecifier,
-	MongoCursor,
-	ObserveChangesCallbacks,
-	ObserveCallbacks,
-} from '../../lib/collections/lib'
-import { PromisifyCallbacks, waitForPromise } from '../../lib/lib'
+import { PromisifyCallbacks } from '@sofie-automation/shared-lib/dist/lib/types'
+import { waitForPromise } from '../lib/lib'
 import type { AnyBulkWriteOperation, Collection as RawCollection } from 'mongodb'
 import { CollectionName } from '@sofie-automation/corelib/dist/dataModel/Collections'
 import { registerCollection } from './lib'
 import { WrappedMockCollection } from './implementations/mock'
 import { WrappedAsyncMongoCollection } from './implementations/asyncCollection'
 import { WrappedReadOnlyMongoCollection } from './implementations/readonlyWrapper'
+import {
+	FieldNames,
+	IndexSpecifier,
+	MongoCursor,
+	ObserveCallbacks,
+	ObserveChangesCallbacks,
+	UpdateOptions,
+	UpsertOptions,
+} from '@sofie-automation/meteor-lib/dist/collections/lib'
 
 export interface MongoAllowRules<DBInterface> {
 	insert?: (userId: UserId, doc: DBInterface) => Promise<boolean> | boolean
@@ -35,6 +33,22 @@ export interface MongoAllowRules<DBInterface> {
 	remove?: (userId: UserId, doc: DBInterface) => Promise<boolean> | boolean
 }
 
+/**
+ * Map of current collection objects.
+ * Future: Could this weakly hold the collections?
+ */
+export const collectionsCache = new Map<string, Mongo.Collection<any>>()
+export function getOrCreateMongoCollection(name: string): Mongo.Collection<any> {
+	const collection = collectionsCache.get(name)
+	if (collection) {
+		return collection
+	}
+
+	const newCollection = new Mongo.Collection(name)
+	collectionsCache.set(name, newCollection)
+	return newCollection
+}
+
 /**
  * Wrap an existing Mongo.Collection to have async methods. Primarily to convert the built-in Users collection
  * @param collection Collection to wrap
diff --git a/meteor/server/collections/implementations/asyncCollection.ts b/meteor/server/collections/implementations/asyncCollection.ts
index 70bef8f6e2..506e48d5f4 100644
--- a/meteor/server/collections/implementations/asyncCollection.ts
+++ b/meteor/server/collections/implementations/asyncCollection.ts
@@ -8,8 +8,9 @@ import {
 	MongoCursor,
 	ObserveChangesCallbacks,
 	ObserveCallbacks,
-} from '../../../lib/collections/lib'
-import { PromisifyCallbacks, makePromise } from '../../../lib/lib'
+} from '@sofie-automation/meteor-lib/dist/collections/lib'
+import { PromisifyCallbacks } from '@sofie-automation/shared-lib/dist/lib/types'
+import { makePromise } from '../../lib/lib'
 import type { AnyBulkWriteOperation } from 'mongodb'
 import { WrappedMongoCollectionBase, dePromiseObjectOfFunctions } from './base'
 import { AsyncOnlyMongoCollection } from '../collection'
diff --git a/meteor/server/collections/implementations/base.ts b/meteor/server/collections/implementations/base.ts
index c5ee57b162..a6c731ba73 100644
--- a/meteor/server/collections/implementations/base.ts
+++ b/meteor/server/collections/implementations/base.ts
@@ -2,10 +2,17 @@ import { MongoModifier, MongoQuery } from '@sofie-automation/corelib/dist/mongo'
 import { ProtectedString, protectString } from '@sofie-automation/corelib/dist/protectedString'
 import { Meteor } from 'meteor/meteor'
 import { Mongo } from 'meteor/mongo'
-import { UpdateOptions, UpsertOptions, FindOptions, IndexSpecifier, MongoCursor } from '../../../lib/collections/lib'
+import {
+	UpdateOptions,
+	UpsertOptions,
+	FindOptions,
+	IndexSpecifier,
+	MongoCursor,
+} from '@sofie-automation/meteor-lib/dist/collections/lib'
 import type { Collection as RawCollection, Db as RawDb } from 'mongodb'
 import { stringifyError } from '@sofie-automation/shared-lib/dist/lib/stringifyError'
-import { PromisifyCallbacks, waitForPromise } from '../../../lib/lib'
+import { PromisifyCallbacks } from '@sofie-automation/shared-lib/dist/lib/types'
+import { waitForPromise } from '../../lib/lib'
 import { NpmModuleMongodb } from 'meteor/npm-mongo'
 
 export class WrappedMongoCollectionBase<DBInterface extends { _id: ProtectedString<any> }> {
diff --git a/meteor/server/collections/implementations/mock.ts b/meteor/server/collections/implementations/mock.ts
index 67484966f0..d208efc59b 100644
--- a/meteor/server/collections/implementations/mock.ts
+++ b/meteor/server/collections/implementations/mock.ts
@@ -9,8 +9,8 @@ import {
 	MongoCursor,
 	ObserveChangesCallbacks,
 	ObserveCallbacks,
-} from '../../../lib/collections/lib'
-import { PromisifyCallbacks } from '../../../lib/lib'
+} from '@sofie-automation/meteor-lib/dist/collections/lib'
+import { PromisifyCallbacks } from '@sofie-automation/shared-lib/dist/lib/types'
 import type { AnyBulkWriteOperation } from 'mongodb'
 import { AsyncOnlyMongoCollection } from '../collection'
 import { WrappedMongoCollectionBase, dePromiseObjectOfFunctions } from './base'
diff --git a/meteor/server/collections/implementations/readonlyWrapper.ts b/meteor/server/collections/implementations/readonlyWrapper.ts
index 5357c85ba3..eaf4418fd5 100644
--- a/meteor/server/collections/implementations/readonlyWrapper.ts
+++ b/meteor/server/collections/implementations/readonlyWrapper.ts
@@ -1,6 +1,6 @@
 import { ProtectedString } from '@sofie-automation/corelib/dist/protectedString'
 import { Meteor } from 'meteor/meteor'
-import { MongoCursor } from '../../../lib/collections/lib'
+import { MongoCursor } from '@sofie-automation/meteor-lib/dist/collections/lib'
 import type { Collection } from 'mongodb'
 import { AsyncOnlyMongoCollection, AsyncOnlyReadOnlyMongoCollection } from '../collection'
 
diff --git a/meteor/server/collections/index.ts b/meteor/server/collections/index.ts
index e2865e7bb9..112093c97b 100644
--- a/meteor/server/collections/index.ts
+++ b/meteor/server/collections/index.ts
@@ -10,24 +10,25 @@ import { ExternalMessageQueueObj } from '@sofie-automation/corelib/dist/dataMode
 import { PeripheralDeviceCommand } from '@sofie-automation/corelib/dist/dataModel/PeripheralDeviceCommand'
 import { WorkerThreadStatus } from '@sofie-automation/corelib/dist/dataModel/WorkerThreads'
 import { Meteor } from 'meteor/meteor'
-import { ICoreSystem } from '../../lib/collections/CoreSystem'
-import { Evaluation } from '../../lib/collections/Evaluations'
-import { DBOrganization } from '../../lib/collections/Organization'
+import { ICoreSystem } from '@sofie-automation/meteor-lib/dist/collections/CoreSystem'
+import { Evaluation } from '@sofie-automation/meteor-lib/dist/collections/Evaluations'
+import { DBOrganization } from '@sofie-automation/meteor-lib/dist/collections/Organization'
 import { PeripheralDevice } from '@sofie-automation/corelib/dist/dataModel/PeripheralDevice'
-import { RundownLayoutBase } from '../../lib/collections/RundownLayouts'
+import { RundownLayoutBase } from '@sofie-automation/meteor-lib/dist/collections/RundownLayouts'
 import { DBShowStyleBase } from '@sofie-automation/corelib/dist/dataModel/ShowStyleBase'
 import { DBShowStyleVariant } from '@sofie-automation/corelib/dist/dataModel/ShowStyleVariant'
-import { SnapshotItem } from '../../lib/collections/Snapshots'
+import { SnapshotItem } from '@sofie-automation/meteor-lib/dist/collections/Snapshots'
 import { DBStudio } from '@sofie-automation/corelib/dist/dataModel/Studio'
 import { TimelineComplete } from '@sofie-automation/corelib/dist/dataModel/Timeline'
 import { DBTimelineDatastoreEntry } from '@sofie-automation/corelib/dist/dataModel/TimelineDatastore'
-import { TranslationsBundle } from '../../lib/collections/TranslationsBundles'
-import { DBTriggeredActions } from '../../lib/collections/TriggeredActions'
-import { UserActionsLogItem } from '../../lib/collections/UserActionsLog'
-import { DBUser } from '../../lib/collections/Users'
-import { WorkerStatus } from '../../lib/collections/Workers'
+import { TranslationsBundle } from '@sofie-automation/meteor-lib/dist/collections/TranslationsBundles'
+import { DBTriggeredActions } from '@sofie-automation/meteor-lib/dist/collections/TriggeredActions'
+import { UserActionsLogItem } from '@sofie-automation/meteor-lib/dist/collections/UserActionsLog'
+import { DBUser } from '@sofie-automation/meteor-lib/dist/collections/Users'
+import { WorkerStatus } from '@sofie-automation/meteor-lib/dist/collections/Workers'
 import { registerIndex } from './indices'
-import { getCurrentTime, MeteorStartupAsync } from '../../lib/lib'
+import { getCurrentTime } from '../lib/lib'
+import { MeteorStartupAsync } from '../lib/lib'
 import { stringifyError } from '@sofie-automation/shared-lib/dist/lib/stringifyError'
 import {
 	createAsyncOnlyMongoCollection,
diff --git a/meteor/server/collections/indices.ts b/meteor/server/collections/indices.ts
index 00d3e1c115..fd63cd5be3 100644
--- a/meteor/server/collections/indices.ts
+++ b/meteor/server/collections/indices.ts
@@ -1,6 +1,6 @@
-import { ProtectedString } from '../../lib/lib'
+import { ProtectedString } from '../lib/tempLib'
 import { Meteor } from 'meteor/meteor'
-import { IndexSpecifier } from '../../lib/collections/lib'
+import { IndexSpecifier } from '@sofie-automation/meteor-lib/dist/collections/lib'
 import { AsyncOnlyReadOnlyMongoCollection } from './collection'
 
 interface CollectionsIndexes {
diff --git a/meteor/server/collections/lib.ts b/meteor/server/collections/lib.ts
index 8237507cb0..161c3cfa47 100644
--- a/meteor/server/collections/lib.ts
+++ b/meteor/server/collections/lib.ts
@@ -4,7 +4,7 @@ import { MongoFieldSpecifierOnes } from '@sofie-automation/corelib/dist/mongo'
 import { ProtectedString } from '@sofie-automation/corelib/dist/protectedString'
 import { Meteor } from 'meteor/meteor'
 import _ from 'underscore'
-import { stringifyObjects } from '../../lib/lib'
+import { stringifyObjects } from '../lib/tempLib'
 import { stringifyError } from '@sofie-automation/shared-lib/dist/lib/stringifyError'
 import { logger } from '../logging'
 import { AsyncOnlyMongoCollection, AsyncOnlyReadOnlyMongoCollection } from './collection'
diff --git a/meteor/server/collections/rundown.ts b/meteor/server/collections/rundown.ts
index 6562898ffc..ff35b31591 100644
--- a/meteor/server/collections/rundown.ts
+++ b/meteor/server/collections/rundown.ts
@@ -9,7 +9,7 @@ import { RundownBaselineAdLibAction } from '@sofie-automation/corelib/dist/dataM
 import { RundownBaselineAdLibItem } from '@sofie-automation/corelib/dist/dataModel/RundownBaselineAdLibPiece'
 import { RundownBaselineObj } from '@sofie-automation/corelib/dist/dataModel/RundownBaselineObj'
 import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
-import { PartInstance } from '../../lib/collections/PartInstances'
+import { PartInstance } from '@sofie-automation/meteor-lib/dist/collections/PartInstances'
 import { DBPart } from '@sofie-automation/corelib/dist/dataModel/Part'
 import { DBSegment } from '@sofie-automation/corelib/dist/dataModel/Segment'
 import { createAsyncOnlyReadOnlyMongoCollection } from './collection'
diff --git a/meteor/server/coreSystem/checkDatabaseVersions.ts b/meteor/server/coreSystem/checkDatabaseVersions.ts
index c75173729c..8fdd141b56 100644
--- a/meteor/server/coreSystem/checkDatabaseVersions.ts
+++ b/meteor/server/coreSystem/checkDatabaseVersions.ts
@@ -9,10 +9,10 @@ import {
 	parseRange,
 	isPrerelease,
 	parseCoreIntegrationCompatabilityRange,
-} from '../../lib/collections/CoreSystem'
+} from '../systemStatus/semverUtils'
 import { DBShowStyleBase } from '@sofie-automation/corelib/dist/dataModel/ShowStyleBase'
 import { DBStudio } from '@sofie-automation/corelib/dist/dataModel/Studio'
-import { lazyIgnore } from '../../lib/lib'
+import { lazyIgnore } from '../lib/lib'
 import { logger } from '../logging'
 import { CURRENT_SYSTEM_VERSION } from '../migration/currentSystemVersion'
 import { setSystemStatus, removeSystemStatus } from '../systemStatus/systemStatus'
diff --git a/meteor/server/coreSystem/collection.ts b/meteor/server/coreSystem/collection.ts
index 6478f6df14..62063910de 100644
--- a/meteor/server/coreSystem/collection.ts
+++ b/meteor/server/coreSystem/collection.ts
@@ -1,6 +1,7 @@
 import { Meteor } from 'meteor/meteor'
 import semver from 'semver'
-import { ICoreSystem, SYSTEM_ID, parseVersion } from '../../lib/collections/CoreSystem'
+import { ICoreSystem, SYSTEM_ID } from '@sofie-automation/meteor-lib/dist/collections/CoreSystem'
+import { parseVersion } from '../systemStatus/semverUtils'
 import { logger } from '../logging'
 import { CoreSystem } from '../collections'
 
diff --git a/meteor/server/coreSystem/index.ts b/meteor/server/coreSystem/index.ts
index f058a343e2..3d58469eff 100644
--- a/meteor/server/coreSystem/index.ts
+++ b/meteor/server/coreSystem/index.ts
@@ -1,5 +1,7 @@
-import { SYSTEM_ID, parseVersion, GENESIS_SYSTEM_VERSION } from '../../lib/collections/CoreSystem'
-import { getCurrentTime, MeteorStartupAsync } from '../../lib/lib'
+import { SYSTEM_ID, GENESIS_SYSTEM_VERSION } from '@sofie-automation/meteor-lib/dist/collections/CoreSystem'
+import { parseVersion } from '../systemStatus/semverUtils'
+import { MeteorStartupAsync } from '../lib/lib'
+import { getCurrentTime } from '../lib/lib'
 import { stringifyError } from '@sofie-automation/shared-lib/dist/lib/stringifyError'
 import { Meteor } from 'meteor/meteor'
 import { prepareMigration, runMigration } from '../migration/databaseMigration'
@@ -118,7 +120,7 @@ export const RelevantSystemVersions = PLazy.from(async () => {
 				const pkgInfo = require(name + '/package.json')
 				return pkgInfo.version
 			} catch (e) {
-				logger.warn(`Failed to read version of package "${name}": ${e}`)
+				logger.warn(`Failed to read version of package "${name}": ${stringifyError(e)}`)
 				return parseVersion(fallback)
 			}
 		}
diff --git a/meteor/server/cronjobs.ts b/meteor/server/cronjobs.ts
index f99f1f1b5c..88bb16c851 100644
--- a/meteor/server/cronjobs.ts
+++ b/meteor/server/cronjobs.ts
@@ -4,7 +4,7 @@ import {
 	PeripheralDevice,
 	PeripheralDeviceType,
 } from '@sofie-automation/corelib/dist/dataModel/PeripheralDevice'
-import { getCurrentTime } from '../lib/lib'
+import { getCurrentTime } from './lib/lib'
 import { stringifyError } from '@sofie-automation/shared-lib/dist/lib/stringifyError'
 import { logger } from './logging'
 import { Meteor } from 'meteor/meteor'
@@ -17,8 +17,8 @@ import { internalStoreRundownPlaylistSnapshot } from './api/snapshot'
 import { deferAsync, normalizeArrayToMap } from '@sofie-automation/corelib/dist/lib'
 import { getCoreSystemAsync } from './coreSystem/collection'
 import { cleanupOldDataInner } from './api/cleanup'
-import { CollectionCleanupResult } from '../lib/api/system'
-import { ICoreSystem } from '../lib/collections/CoreSystem'
+import { CollectionCleanupResult } from '@sofie-automation/meteor-lib/dist/api/system'
+import { ICoreSystem } from '@sofie-automation/meteor-lib/dist/collections/CoreSystem'
 import { executePeripheralDeviceFunctionWithCustomTimeout } from './api/peripheralDevice/executeFunction'
 import {
 	interpollateTranslation,
@@ -51,14 +51,14 @@ export async function nightlyCronjobInner(): Promise<void> {
 
 	await Promise.allSettled([
 		cleanupOldDataCronjob().catch((error) => {
-			logger.error(`Cronjob: Error when cleaning up old data: ${error}`)
+			logger.error(`Cronjob: Error when cleaning up old data: ${stringifyError(error)}`)
 			logger.error(error)
 		}),
 		restartCasparCG(system, previousLastNightlyCronjob).catch((e) => {
-			logger.error(`Cron: Restart CasparCG error: ${e}`)
+			logger.error(`Cron: Restart CasparCG error: ${stringifyError(e)}`)
 		}),
 		storeSnapshots(system).catch((e) => {
-			logger.error(`Cron: Rundown Snapshots error: ${e}`)
+			logger.error(`Cron: Rundown Snapshots error: ${stringifyError(e)}`)
 		}),
 	])
 
@@ -202,7 +202,7 @@ Meteor.startup(() => {
 			timeSinceLast > 20 * 3600 * 1000 // was last run yesterday
 		) {
 			nightlyCronjobInner().catch((e) => {
-				logger.error(`Nightly cronjob: error: ${e}`)
+				logger.error(`Nightly cronjob: error: ${stringifyError(e)}`)
 			})
 		}
 	}
@@ -225,7 +225,7 @@ Meteor.startup(() => {
 					)
 				},
 				(e) => {
-					logger.error(`Cron: CleanupPlaylists error: ${e}`)
+					logger.error(`Cron: CleanupPlaylists error: ${stringifyError(e)}`)
 				}
 			)
 		}
diff --git a/meteor/server/lib.ts b/meteor/server/lib.ts
index d01893a522..8b337fc8c7 100644
--- a/meteor/server/lib.ts
+++ b/meteor/server/lib.ts
@@ -4,6 +4,7 @@ import fs from 'fs'
 import path from 'path'
 import { logger } from './logging'
 import { stringifyError } from '@sofie-automation/shared-lib/dist/lib/stringifyError'
+import { Meteor } from 'meteor/meteor'
 
 /** Returns absolute path to programs/server directory of your compiled application, without trailing slash. */
 export function getAbsolutePath(): string {
diff --git a/meteor/lib/ReactiveStore.ts b/meteor/server/lib/ReactiveStore.ts
similarity index 97%
rename from meteor/lib/ReactiveStore.ts
rename to meteor/server/lib/ReactiveStore.ts
index 005b35ab20..429da1ab93 100644
--- a/meteor/lib/ReactiveStore.ts
+++ b/meteor/server/lib/ReactiveStore.ts
@@ -1,7 +1,8 @@
 import { Meteor } from 'meteor/meteor'
 import { Tracker } from 'meteor/tracker'
 import * as _ from 'underscore'
-import { getRandomString, lazyIgnore, ProtectedString } from './lib'
+import { getRandomString, ProtectedString } from './tempLib'
+import { lazyIgnore } from '../lib/lib'
 
 /** The ReactiveStore is a Reactive key-value store.
  * Keeps track of when the reactive values aren't in use anymore and automatically cleans them up.
diff --git a/meteor/lib/__tests__/check.test.ts b/meteor/server/lib/__tests__/check.test.ts
similarity index 100%
rename from meteor/lib/__tests__/check.test.ts
rename to meteor/server/lib/__tests__/check.test.ts
diff --git a/meteor/server/lib/__tests__/lib.test.ts b/meteor/server/lib/__tests__/lib.test.ts
index a94b6a709d..0975875449 100644
--- a/meteor/server/lib/__tests__/lib.test.ts
+++ b/meteor/server/lib/__tests__/lib.test.ts
@@ -1,3 +1,4 @@
+import '../../../__mocks__/_extendJest'
 import { TSR } from '@sofie-automation/blueprints-integration'
 import {
 	TimelineObjGeneric,
@@ -6,10 +7,12 @@ import {
 	deserializeTimelineBlob,
 	serializeTimelineBlob,
 } from '@sofie-automation/corelib/dist/dataModel/Timeline'
-import { protectString } from '../../../lib/lib'
+import { protectString } from '../tempLib'
 import { testInFiber } from '../../../__mocks__/helpers/jest'
 import { Timeline } from '../../collections'
 import { SaveIntoDbHooks, saveIntoDb, sumChanges, anythingChanged } from '../database'
+import { makePromise } from '../lib'
+import { Meteor } from 'meteor/meteor'
 
 describe('server/lib', () => {
 	testInFiber('saveIntoDb', async () => {
@@ -191,4 +194,38 @@ describe('server/lib', () => {
 			})
 		).toBeTruthy()
 	})
+
+	testInFiber('makePromise', async () => {
+		let a = 0
+		// Check that they are executed in order:
+		expect(
+			await Promise.all([
+				makePromise(() => {
+					return a++
+				}),
+				makePromise(() => {
+					return a++
+				}),
+			])
+		).toStrictEqual([0, 1])
+
+		// Handle an instant throw:
+		await expect(
+			makePromise(() => {
+				throw new Error('asdf')
+			})
+		).rejects.toMatchToString(/asdf/)
+
+		// Handle a delayed throw:
+		const delayedThrow = Meteor.wrapAsync((callback: (err: any, result: any) => void) => {
+			setTimeout(() => {
+				callback(new Error('asdf'), null)
+			}, 10)
+		})
+		await expect(
+			makePromise(() => {
+				delayedThrow()
+			})
+		).rejects.toMatchToString(/asdf/)
+	})
 })
diff --git a/meteor/server/lib/cacheResult.ts b/meteor/server/lib/cacheResult.ts
new file mode 100644
index 0000000000..1b896bc63c
--- /dev/null
+++ b/meteor/server/lib/cacheResult.ts
@@ -0,0 +1,51 @@
+import { Meteor } from 'meteor/meteor'
+import _ from 'underscore'
+
+const cacheResultCache: {
+	[name: string]: {
+		ttl: number
+		value: any
+	}
+} = {}
+/** Cache the result of function for a limited time */
+export function cacheResult<T>(name: string, fcn: () => T, limitTime = 1000): T {
+	if (Math.random() < 0.01) {
+		Meteor.setTimeout(cleanOldCacheResult, 10000)
+	}
+	const cache = cacheResultCache[name]
+	if (!cache || cache.ttl < Date.now()) {
+		const value: T = fcn()
+		cacheResultCache[name] = {
+			ttl: Date.now() + limitTime,
+			value: value,
+		}
+		return value
+	} else {
+		return cache.value
+	}
+}
+/** Cache the result of function for a limited time */
+export async function cacheResultAsync<T>(name: string, fcn: () => Promise<T>, limitTime = 1000): Promise<T> {
+	if (Math.random() < 0.01) {
+		Meteor.setTimeout(cleanOldCacheResult, 10000)
+	}
+	const cache = cacheResultCache[name]
+	if (!cache || cache.ttl < Date.now()) {
+		const value: Promise<T> = fcn()
+		cacheResultCache[name] = {
+			ttl: Date.now() + limitTime,
+			value: value,
+		}
+		return value
+	} else {
+		return cache.value
+	}
+}
+export function clearCacheResult(name: string): void {
+	delete cacheResultCache[name]
+}
+function cleanOldCacheResult() {
+	_.each(cacheResultCache, (cache, name) => {
+		if (cache.ttl < Date.now()) clearCacheResult(name)
+	})
+}
diff --git a/meteor/lib/check.ts b/meteor/server/lib/check.ts
similarity index 100%
rename from meteor/lib/check.ts
rename to meteor/server/lib/check.ts
diff --git a/meteor/server/lib/customPublication/__tests__/optimizedObserver.test.ts b/meteor/server/lib/customPublication/__tests__/optimizedObserver.test.ts
index d4bec4a0a8..c77442a391 100644
--- a/meteor/server/lib/customPublication/__tests__/optimizedObserver.test.ts
+++ b/meteor/server/lib/customPublication/__tests__/optimizedObserver.test.ts
@@ -1,8 +1,9 @@
 import { UserId } from '@sofie-automation/corelib/dist/dataModel/Ids'
-import { createManualPromise, sleep } from '@sofie-automation/corelib/dist/lib'
+import { createManualPromise } from '@sofie-automation/corelib/dist/lib'
 import { ProtectedString } from '@sofie-automation/corelib/dist/protectedString'
 import { optimizedObserverCountSubscribers, setUpOptimizedObserverInner, TriggerUpdate } from '../optimizedObserverBase'
 import { CustomPublish, CustomPublishChanges } from '../publish'
+import { sleep } from '../../lib'
 
 interface CustomPublishMockExt {
 	stop?: () => void
diff --git a/meteor/server/lib/customPublication/optimizedObserverArray.ts b/meteor/server/lib/customPublication/optimizedObserverArray.ts
index 784232b9e1..bd31ce073b 100644
--- a/meteor/server/lib/customPublication/optimizedObserverArray.ts
+++ b/meteor/server/lib/customPublication/optimizedObserverArray.ts
@@ -1,6 +1,6 @@
 import { Meteor } from 'meteor/meteor'
 import { ReadonlyDeep } from 'type-fest'
-import { clone, ProtectedString } from '../../../lib/lib'
+import { clone, ProtectedString } from '../tempLib'
 import { TriggerUpdate, setUpOptimizedObserverInner } from './optimizedObserverBase'
 import { CustomPublish, CustomPublishChanges } from './publish'
 import { diffObject } from './lib'
diff --git a/meteor/server/lib/customPublication/optimizedObserverBase.ts b/meteor/server/lib/customPublication/optimizedObserverBase.ts
index 66766fcdde..e25720d109 100644
--- a/meteor/server/lib/customPublication/optimizedObserverBase.ts
+++ b/meteor/server/lib/customPublication/optimizedObserverBase.ts
@@ -2,12 +2,12 @@ import deepmerge from 'deepmerge'
 import { Meteor } from 'meteor/meteor'
 import { Mongo } from 'meteor/mongo'
 import { ReadonlyDeep } from 'type-fest'
-import { clone, createManualPromise, lazyIgnore, ProtectedString } from '../../../lib/lib'
+import { clone, createManualPromise, ProtectedString } from '../tempLib'
 import { stringifyError } from '@sofie-automation/shared-lib/dist/lib/stringifyError'
 import { profiler } from '../../api/profiler'
 import { logger } from '../../logging'
 import { ReactiveCacheCollection } from '../../publications/lib/ReactiveCacheCollection'
-import { LiveQueryHandle } from '../lib'
+import { LiveQueryHandle, lazyIgnore } from '../lib'
 import { CustomPublish, CustomPublishChanges } from './publish'
 
 const apmNamespace = 'optimizedObserver'
diff --git a/meteor/server/lib/customPublication/optimizedObserverCollection.ts b/meteor/server/lib/customPublication/optimizedObserverCollection.ts
index d3aed08fb8..aad28131b2 100644
--- a/meteor/server/lib/customPublication/optimizedObserverCollection.ts
+++ b/meteor/server/lib/customPublication/optimizedObserverCollection.ts
@@ -1,5 +1,5 @@
 import { ReadonlyDeep } from 'type-fest'
-import { ProtectedString } from '../../../lib/lib'
+import { ProtectedString } from '../tempLib'
 import { LiveQueryHandle } from '../lib'
 import { CustomPublishCollection } from './customPublishCollection'
 import { TriggerUpdate, setUpOptimizedObserverInner } from './optimizedObserverBase'
diff --git a/meteor/server/lib/customPublication/publish.ts b/meteor/server/lib/customPublication/publish.ts
index 39a04e9878..0a864a28dc 100644
--- a/meteor/server/lib/customPublication/publish.ts
+++ b/meteor/server/lib/customPublication/publish.ts
@@ -1,7 +1,7 @@
 import { UserId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import { Meteor } from 'meteor/meteor'
-import { AllPubSubTypes } from '../../../lib/api/pubsub'
-import { ProtectedString, unprotectString } from '../../../lib/lib'
+import { AllPubSubTypes } from '@sofie-automation/meteor-lib/dist/api/pubsub'
+import { ProtectedString, unprotectString } from '../tempLib'
 import { PublishDocType, SubscriptionContext, meteorPublishUnsafe } from '../../publications/lib'
 
 export interface CustomPublishChanges<T extends { _id: ProtectedString<any> }> {
diff --git a/meteor/server/lib/database.ts b/meteor/server/lib/database.ts
index 4ec8b7a396..5f17486bbd 100644
--- a/meteor/server/lib/database.ts
+++ b/meteor/server/lib/database.ts
@@ -1,11 +1,16 @@
 import { Meteor } from 'meteor/meteor'
 import type { AnyBulkWriteOperation } from 'mongodb'
 import _ from 'underscore'
-import { DBObj, normalizeArrayToMap, ProtectedString, deleteAllUndefinedProperties } from '../../lib/lib'
+import { normalizeArrayToMap, ProtectedString, deleteAllUndefinedProperties } from './tempLib'
 import { MongoQuery } from '@sofie-automation/corelib/dist/mongo'
 import { profiler } from '../api/profiler'
 import { AsyncOnlyMongoCollection } from '../collections/collection'
 
+export interface DBObj {
+	_id: ProtectedString<any>
+	[key: string]: any
+}
+
 export interface Changes {
 	added: number
 	updated: number
diff --git a/meteor/server/lib/lib.ts b/meteor/server/lib/lib.ts
index d8cbb32a76..860b680496 100644
--- a/meteor/server/lib/lib.ts
+++ b/meteor/server/lib/lib.ts
@@ -1,6 +1,145 @@
+import { Meteor } from 'meteor/meteor'
+import { logger } from '../logging'
+import { stringifyError } from '@sofie-automation/shared-lib/dist/lib/stringifyError'
+import { Time } from '@sofie-automation/shared-lib/dist/lib/lib'
+
+export function getCurrentTime(): Time {
+	// We assume the os does NTP syncing, at a frequent interval.
+	return Date.now()
+}
+
 /**
  * Async version of Meteor.LiveQueryHandle
  */
 export interface LiveQueryHandle {
 	stop(): void | Promise<void>
 }
+
+/**
+ * Replaces all invalid characters in order to make the path a valid one
+ * @param path
+ */
+export function fixValidPath(path: string): string {
+	return path.replace(/([^a-z0-9_.@()-])/gi, '_')
+}
+
+/**
+ * Make Meteor.wrapAsync a bit more type safe
+ * The original version makes the callback be after the last non-undefined parameter, rather than after or replacing the last parameter.
+ * Which makes it incredibly hard to find without iterating over all the parameters. This does that for you, so you dont need to check as many places
+ */
+export function MeteorWrapAsync(func: Function, context?: Object): any {
+	// A variant of Meteor.wrapAsync to fix the bug
+	// https://github.com/meteor/meteor/issues/11120
+
+	return Meteor.wrapAsync((...args: any[]) => {
+		// Find the callback-function:
+		for (let i = args.length - 1; i >= 0; i--) {
+			if (typeof args[i] === 'function') {
+				if (i < args.length - 1) {
+					// The callback is not the last argument, make it so then:
+					const callback = args[i]
+					const fixedArgs = args
+					fixedArgs[i] = undefined
+					fixedArgs.push(callback)
+
+					func.apply(context, fixedArgs)
+					return
+				} else {
+					// The callback is the last argument, that's okay
+					func.apply(context, args)
+					return
+				}
+			}
+		}
+		throw new Meteor.Error(500, `Error in MeteorWrapAsync: No callback found!`)
+	})
+}
+
+const lazyIgnoreCache: { [name: string]: number } = {}
+export function lazyIgnore(name: string, f1: () => Promise<void> | void, t: number): void {
+	// Don't execute the function f1 until the time t has passed.
+	// Subsequent calls will extend the laziness and ignore the previous call
+
+	if (lazyIgnoreCache[name]) {
+		Meteor.clearTimeout(lazyIgnoreCache[name])
+	}
+	lazyIgnoreCache[name] = Meteor.setTimeout(() => {
+		delete lazyIgnoreCache[name]
+		if (Meteor.isClient) {
+			f1()?.catch((e) => {
+				throw new Error(e)
+			})
+		} else {
+			waitForPromise(f1())
+		}
+	}, t)
+}
+
+/**
+ * Make Meteor.startup support async functions
+ */
+export function MeteorStartupAsync(fcn: () => Promise<void>): void {
+	Meteor.startup(() => waitForPromise(fcn()))
+}
+
+/**
+ * Convert a promise to a "synchronous" Fiber function
+ * Makes the Fiber wait for the promise to resolve, then return the value of the promise.
+ * If the fiber rejects, the function in the Fiber will "throw"
+ */
+export const waitForPromise: <T>(p: Promise<T> | T) => Awaited<T> = Meteor.wrapAsync(function waitForPromise<T>(
+	p: Promise<T> | T,
+	cb: (err: any | null, result?: any) => Awaited<T>
+) {
+	if (Meteor.isClient) throw new Meteor.Error(500, `waitForPromise can't be used client-side`)
+	if (cb === undefined && typeof p === 'function') {
+		cb = p as any
+		p = undefined as any
+	}
+
+	Promise.resolve(p)
+		.then((result) => {
+			cb(null, result)
+		})
+		.catch((e) => {
+			cb(e)
+		})
+}) as <T>(p: Promise<T> | T) => Awaited<T> // `wrapAsync` has opaque `Function` type
+/**
+ * Convert a Fiber function into a promise
+ * Makes the Fiber function to run in its own fiber and return a promise
+ */
+export async function makePromise<T>(fcn: () => T): Promise<T> {
+	const p = new Promise<T>((resolve, reject) => {
+		Meteor.defer(() => {
+			try {
+				resolve(fcn())
+			} catch (e) {
+				reject(e)
+			}
+		})
+	})
+
+	return (
+		await Promise.all([
+			p,
+			// Pause the current Fiber briefly, in order to allow for the deferred Fiber to start executing:
+			sleep(0),
+		])
+	)[0]
+}
+
+export function deferAsync(fcn: () => Promise<void>): void {
+	Meteor.defer(() => {
+		fcn().catch((e) => logger.error(stringifyError(e)))
+	})
+}
+
+/**
+ * Wait for specified time
+ * @param time
+ */
+export async function sleep(ms: number): Promise<void> {
+	return new Promise((resolve) => Meteor.setTimeout(resolve, ms))
+}
diff --git a/meteor/lib/reactiveMap.ts b/meteor/server/lib/reactiveMap.ts
similarity index 100%
rename from meteor/lib/reactiveMap.ts
rename to meteor/server/lib/reactiveMap.ts
diff --git a/meteor/lib/api/rest/v1/blueprints.ts b/meteor/server/lib/rest/v1/blueprints.ts
similarity index 94%
rename from meteor/lib/api/rest/v1/blueprints.ts
rename to meteor/server/lib/rest/v1/blueprints.ts
index a22045523c..14aa176f0b 100644
--- a/meteor/lib/api/rest/v1/blueprints.ts
+++ b/meteor/server/lib/rest/v1/blueprints.ts
@@ -1,6 +1,6 @@
 import { BlueprintId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import { Meteor } from 'meteor/meteor'
-import { ClientAPI } from '../../client'
+import { ClientAPI } from '@sofie-automation/meteor-lib/dist/api/client'
 
 /* *************************************************************************
 This file contains types and interfaces that are used by the REST API.
diff --git a/meteor/lib/api/rest/v1/buckets.ts b/meteor/server/lib/rest/v1/buckets.ts
similarity index 97%
rename from meteor/lib/api/rest/v1/buckets.ts
rename to meteor/server/lib/rest/v1/buckets.ts
index 6df295761d..83f45113f3 100644
--- a/meteor/lib/api/rest/v1/buckets.ts
+++ b/meteor/server/lib/rest/v1/buckets.ts
@@ -1,5 +1,5 @@
 import { Meteor } from 'meteor/meteor'
-import { ClientAPI } from '../../client'
+import { ClientAPI } from '@sofie-automation/meteor-lib/dist/api/client'
 import { BucketId, ShowStyleBaseId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import { IngestAdlib } from '@sofie-automation/blueprints-integration'
 
diff --git a/meteor/lib/api/rest/v1/devices.ts b/meteor/server/lib/rest/v1/devices.ts
similarity index 97%
rename from meteor/lib/api/rest/v1/devices.ts
rename to meteor/server/lib/rest/v1/devices.ts
index bf0256c1a4..5c1c48fb67 100644
--- a/meteor/lib/api/rest/v1/devices.ts
+++ b/meteor/server/lib/rest/v1/devices.ts
@@ -1,4 +1,4 @@
-import { ClientAPI } from '../../client'
+import { ClientAPI } from '@sofie-automation/meteor-lib/dist/api/client'
 import { PeripheralDeviceId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import { Meteor } from 'meteor/meteor'
 
diff --git a/meteor/lib/api/rest/v1/index.ts b/meteor/server/lib/rest/v1/index.ts
similarity index 100%
rename from meteor/lib/api/rest/v1/index.ts
rename to meteor/server/lib/rest/v1/index.ts
diff --git a/meteor/lib/api/rest/v1/playlists.ts b/meteor/server/lib/rest/v1/playlists.ts
similarity index 97%
rename from meteor/lib/api/rest/v1/playlists.ts
rename to meteor/server/lib/rest/v1/playlists.ts
index d3dcbb7adf..ec4c21e468 100644
--- a/meteor/lib/api/rest/v1/playlists.ts
+++ b/meteor/server/lib/rest/v1/playlists.ts
@@ -1,4 +1,4 @@
-import { ClientAPI } from '../../client'
+import { ClientAPI } from '@sofie-automation/meteor-lib/dist/api/client'
 import {
 	AdLibActionId,
 	BucketAdLibId,
@@ -227,19 +227,19 @@ export interface PlaylistsRestAPI {
 		fromPartInstanceId: PartInstanceId | undefined
 	): Promise<ClientAPI.ClientResponse<void>>
 	/**
-	 * Clears the specified SourceLayer.
+	 * Clears the specified SourceLayers.
 	 *
 	 * Throws if specified playlist is not active.
 	 * @param connection Connection data including client and header details
 	 * @param event User event string
 	 * @param rundownPlaylistId Target Playlist.
-	 * @param sourceLayerId Target SourceLayer.
+	 * @param sourceLayerIds Target SourceLayers.
 	 */
-	clearSourceLayer(
+	clearSourceLayers(
 		connection: Meteor.Connection,
 		event: string,
 		rundownPlaylistId: RundownPlaylistId,
-		sourceLayerId: string
+		sourceLayerIds: string[]
 	): Promise<ClientAPI.ClientResponse<void>>
 	/**
 	 * Recalls the last sticky Piece on the specified SourceLayer, if there is any.
diff --git a/meteor/lib/api/rest/v1/showstyles.ts b/meteor/server/lib/rest/v1/showstyles.ts
similarity index 99%
rename from meteor/lib/api/rest/v1/showstyles.ts
rename to meteor/server/lib/rest/v1/showstyles.ts
index d50d9f15e8..9668629b52 100644
--- a/meteor/lib/api/rest/v1/showstyles.ts
+++ b/meteor/server/lib/rest/v1/showstyles.ts
@@ -1,4 +1,4 @@
-import { ClientAPI } from '../../client'
+import { ClientAPI } from '@sofie-automation/meteor-lib/dist/api/client'
 import { ShowStyleBaseId, ShowStyleVariantId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import { Meteor } from 'meteor/meteor'
 
diff --git a/meteor/lib/api/rest/v1/studios.ts b/meteor/server/lib/rest/v1/studios.ts
similarity index 96%
rename from meteor/lib/api/rest/v1/studios.ts
rename to meteor/server/lib/rest/v1/studios.ts
index fd3a133283..1b67bcfafb 100644
--- a/meteor/lib/api/rest/v1/studios.ts
+++ b/meteor/server/lib/rest/v1/studios.ts
@@ -1,4 +1,4 @@
-import { ClientAPI } from '../../client'
+import { ClientAPI } from '@sofie-automation/meteor-lib/dist/api/client'
 import { PeripheralDeviceId, StudioId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import { Meteor } from 'meteor/meteor'
 
@@ -210,5 +210,8 @@ export interface APIStudioSettings {
 	multiGatewayNowSafeLatency?: number
 	allowRundownResetOnAir?: boolean
 	preserveOrphanedSegmentPositionInRundown?: boolean
+	enableQuickLoop?: boolean
+	forceQuickLoopAutoNext?: 'disabled' | 'enabled_when_valid_duration' | 'enabled_forcing_min_duration'
 	minimumTakeSpan?: number
+	fallbackPartDuration?: number
 }
diff --git a/meteor/lib/api/rest/v1/system.ts b/meteor/server/lib/rest/v1/system.ts
similarity index 96%
rename from meteor/lib/api/rest/v1/system.ts
rename to meteor/server/lib/rest/v1/system.ts
index cf999eec0f..9b86fda7c2 100644
--- a/meteor/lib/api/rest/v1/system.ts
+++ b/meteor/server/lib/rest/v1/system.ts
@@ -1,5 +1,5 @@
 import { BlueprintId } from '@sofie-automation/corelib/dist/dataModel/Ids'
-import { ClientAPI } from '../../client'
+import { ClientAPI } from '@sofie-automation/meteor-lib/dist/api/client'
 import { Meteor } from 'meteor/meteor'
 
 /* *************************************************************************
diff --git a/meteor/server/lib/tempLib.ts b/meteor/server/lib/tempLib.ts
new file mode 100644
index 0000000000..9eb37c3f76
--- /dev/null
+++ b/meteor/server/lib/tempLib.ts
@@ -0,0 +1,12 @@
+/**
+ * This file contains some temporary re-exports of code that has been moved.
+ * It should be removed entirely, but requires a bit of effort to update the hundreds of references to this file.
+ */
+
+import { Time, TimeDuration } from '@sofie-automation/shared-lib/dist/lib/lib'
+export { Time, TimeDuration }
+
+// Legacy compatability
+export * from '@sofie-automation/corelib/dist/protectedString'
+export * from '@sofie-automation/corelib/dist/lib'
+export * from '@sofie-automation/meteor-lib/dist/lib'
diff --git a/meteor/server/lib/tic-toc.ts b/meteor/server/lib/tic-toc.ts
new file mode 100644
index 0000000000..e19ec73624
--- /dev/null
+++ b/meteor/server/lib/tic-toc.ts
@@ -0,0 +1,28 @@
+import _ from 'underscore'
+
+const ticCache: Record<NamedCurve, number> = {}
+/**
+ * Performance debugging. tic() starts a timer, toc() traces the time since tic()
+ * @param name
+ */
+export function tic(name = 'default'): void {
+	ticCache[name] = Date.now()
+}
+export function toc(name = 'default', logStr?: string | Promise<any>[]): number | undefined {
+	if (_.isArray(logStr)) {
+		_.each(logStr, (promise, i) => {
+			promise
+				.then((result) => {
+					toc(name, 'Promise ' + i)
+					return result
+				})
+				.catch((e) => {
+					throw e
+				})
+		})
+	} else {
+		const t: number = Date.now() - ticCache[name]
+		if (logStr) console.info('toc: ' + name + ': ' + logStr + ': ' + t)
+		return t
+	}
+}
diff --git a/meteor/server/logging.ts b/meteor/server/logging.ts
index 2fb8886c92..b8d082d2a5 100644
--- a/meteor/server/logging.ts
+++ b/meteor/server/logging.ts
@@ -1,10 +1,11 @@
 import * as Winston from 'winston'
 import * as fs from 'fs'
 import { getAbsolutePath } from './lib'
-import { LogLevel } from '../lib/lib'
+import { LogLevel } from './lib/tempLib'
 import { stringifyError } from '@sofie-automation/shared-lib/dist/lib/stringifyError'
 import { Meteor } from 'meteor/meteor'
 import * as _ from 'underscore'
+import { LoggerInstanceFixed } from '@sofie-automation/corelib/dist/logging'
 
 export function getLogLevel(): LogLevel {
 	return logger.level as LogLevel
@@ -24,9 +25,9 @@ export function setLogLevel(level: LogLevel, startup = false): void {
 		}
 	}
 }
-let originalLogger: LoggerInstanceFixed | undefined = undefined
+let originalLogger: LoggerInstanceFixedExt | undefined = undefined
 /** For use in unit tests */
-export function overrideLogger(fcn: (logger: LoggerInstanceFixed) => LoggerInstanceFixed): void {
+export function overrideLogger(fcn: (logger: LoggerInstanceFixedExt) => LoggerInstanceFixedExt): void {
 	originalLogger = logger
 	logger = fcn(logger)
 }
@@ -39,37 +40,8 @@ export function getEnvLogLevel(): LogLevel | undefined {
 	return Object.values<LogLevel>(LogLevel as any).find((level) => level === process.env.LOG_LEVEL)
 }
 
-// @todo: remove this and do a PR to https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/winston
-// because there's an error in the typings logging.debug() takes any, not only string
-interface LoggerInstanceFixed extends Winston.Logger {
-	// for cli and npm levels
-	error: LeveledLogMethodFixed
-	warn: LeveledLogMethodFixed
-	help: LeveledLogMethodFixed
-	data: LeveledLogMethodFixed
-	info: LeveledLogMethodFixed
-	debug: LeveledLogMethodFixed
-	prompt: LeveledLogMethodFixed
-	http: LeveledLogMethodFixed
-	verbose: LeveledLogMethodFixed
-	input: LeveledLogMethodFixed
-	silly: LeveledLogMethodFixed
+export type LoggerInstanceFixedExt = LoggerInstanceFixed & Pick<Winston.Logger, 'level'>
 
-	// for syslog levels only
-	emerg: LeveledLogMethodFixed
-	alert: LeveledLogMethodFixed
-	crit: LeveledLogMethodFixed
-	warning: LeveledLogMethodFixed
-	notice: LeveledLogMethodFixed
-}
-interface LogMeta {
-	[key: string]: any
-}
-interface LeveledLogMethodFixed {
-	(msg: any, callback: Winston.LogCallback): LoggerInstanceFixed
-	(msg: any, meta: LogMeta, callback: Winston.LogCallback): LoggerInstanceFixed
-	(msg: any, ...meta: LogMeta[]): LoggerInstanceFixed
-}
 const leadingZeros = (num: number | string, length: number) => {
 	num = num + ''
 	if (num.length < length) {
@@ -83,7 +55,7 @@ if (process.env.LOG_TO_FILE) logToFile = true
 
 let logPath = process.env.LOG_FILE || ''
 
-let logger: LoggerInstanceFixed
+let logger: LoggerInstanceFixedExt
 let transports: {
 	console?: Winston.transports.ConsoleTransportInstance
 	file?: Winston.transports.FileTransportInstance
diff --git a/meteor/server/logo.ts b/meteor/server/logo.ts
index d6dc7a5ddb..26536e65b8 100644
--- a/meteor/server/logo.ts
+++ b/meteor/server/logo.ts
@@ -1,7 +1,7 @@
 import * as fs from 'fs'
 import { public_dir } from './lib'
 import { getCoreSystemAsync } from './coreSystem/collection'
-import { SofieLogo } from '../lib/collections/CoreSystem'
+import { SofieLogo } from '@sofie-automation/meteor-lib/dist/collections/CoreSystem'
 import KoaRouter from '@koa/router'
 import { Meteor } from 'meteor/meteor'
 import { bindKoaRouter } from './api/rest/koa'
diff --git a/meteor/server/main.ts b/meteor/server/main.ts
index dd25f9c70f..30c7678f5c 100644
--- a/meteor/server/main.ts
+++ b/meteor/server/main.ts
@@ -3,28 +3,11 @@
  */
 
 import { Meteor } from 'meteor/meteor'
-import { setMinimumBrowserVersions } from 'meteor/modern-browsers'
 
 Meteor.startup(() => {
 	console.log('startup')
 })
 
-setMinimumBrowserVersions(
-	{
-		chrome: 80,
-		firefox: 74,
-		edge: 80,
-		ie: Infinity,
-		mobile_safari: [13, 4],
-		opera: 67,
-		safari: [13, 1],
-		electron: 6,
-	},
-	'optional chaining'
-)
-
-import '../lib/main'
-
 // Import all files that register Meteor methods:
 import './api/blueprints/api'
 import './api/blueprints/http'
@@ -36,7 +19,6 @@ import './api/ingest/debug'
 import './api/integration/expectedPackages'
 import './api/integration/media-scanner'
 import './api/integration/mediaWorkFlows'
-import './api/logger'
 import './api/peripheralDevice'
 import './api/playout/api'
 import './api/rundown'
@@ -61,7 +43,6 @@ import './webmanifest'
 
 // import all files that calls Meteor.startup:
 import './api/rest/api'
-import './api/systemTime/startup'
 import './Connections'
 import './coreSystem'
 import './cronjobs'
@@ -69,6 +50,7 @@ import './email'
 import './prometheus'
 import './api/deviceTriggers/observer'
 import './logo'
+import './systemTime'
 // import './performanceMonitor' // called above
 
 // Setup publications and security:
diff --git a/meteor/server/methods.ts b/meteor/server/methods.ts
index e753be187c..865928cb85 100644
--- a/meteor/server/methods.ts
+++ b/meteor/server/methods.ts
@@ -2,10 +2,11 @@ import { Meteor } from 'meteor/meteor'
 import * as _ from 'underscore'
 import { logger } from './logging'
 import { extractFunctionSignature } from './lib'
-import { MethodContext, MethodContextAPI } from '../lib/api/methods'
-import { isPromise, waitForPromise } from '../lib/lib'
+import { MethodContext, MethodContextAPI } from './api/methodContext'
+import { waitForPromise } from './lib/lib'
 import { stringifyError } from '@sofie-automation/shared-lib/dist/lib/stringifyError'
-import { Settings } from '../lib/Settings'
+import { Settings } from './Settings'
+import { isPromise } from '@sofie-automation/shared-lib/dist/lib/lib'
 
 type MeteorMethod = (this: MethodContext, ...args: any[]) => any
 
diff --git a/meteor/server/migration/0_1_0.ts b/meteor/server/migration/0_1_0.ts
index a38c18b55c..80247e212b 100644
--- a/meteor/server/migration/0_1_0.ts
+++ b/meteor/server/migration/0_1_0.ts
@@ -1,6 +1,6 @@
 import { addMigrationSteps } from './databaseMigration'
 import { logger } from '../logging'
-import { getRandomId, protectString, generateTranslation as t, getHash } from '../../lib/lib'
+import { getRandomId, protectString, generateTranslation as t, getHash } from '../lib/tempLib'
 import { wrapDefaultObject } from '@sofie-automation/corelib/dist/settings/objectWithOverrides'
 import { ShowStyleVariantId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import { ShowStyleBases, ShowStyleVariants, Studios, TriggeredActions } from '../collections'
@@ -445,9 +445,9 @@ export const addSteps = addMigrationSteps('0.1.0', [
 				mappingsWithOverrides: wrapDefaultObject({}),
 				blueprintConfigWithOverrides: wrapDefaultObject({}),
 				_rundownVersionHash: '',
-				routeSets: {},
-				routeSetExclusivityGroups: {},
-				packageContainers: {},
+				routeSetsWithOverrides: wrapDefaultObject({}),
+				routeSetExclusivityGroupsWithOverrides: wrapDefaultObject({}),
+				packageContainersWithOverrides: wrapDefaultObject({}),
 				thumbnailContainerIds: [],
 				previewContainerIds: [],
 				peripheralDeviceSettings: {
diff --git a/meteor/server/migration/1_39_0.ts b/meteor/server/migration/1_39_0.ts
index 6f754eea0d..382063cdd9 100644
--- a/meteor/server/migration/1_39_0.ts
+++ b/meteor/server/migration/1_39_0.ts
@@ -4,19 +4,19 @@ import { addMigrationSteps } from './databaseMigration'
 // Release 39
 export const addSteps = addMigrationSteps('1.39.0', [
 	{
-		id: `Parts.expectedDurationWithPreroll`,
+		id: `Parts.expectedDurationWithTransition`,
 		canBeRunAutomatically: true,
 		validate: async () => {
 			const objects = await Parts.countDocuments({
 				expectedDuration: {
 					$exists: true,
 				},
-				expectedDurationWithPreroll: {
+				expectedDurationWithTransition: {
 					$exists: false,
 				},
 			})
 			if (objects > 0) {
-				return `timing is expectedDurationWithPreroll on ${objects} objects`
+				return `timing is expectedDurationWithTransition on ${objects} objects`
 			}
 			return false
 		},
@@ -25,14 +25,14 @@ export const addSteps = addMigrationSteps('1.39.0', [
 				expectedDuration: {
 					$exists: true,
 				},
-				expectedDurationWithPreroll: {
+				expectedDurationWithTransition: {
 					$exists: false,
 				},
 			})
 			for (const obj of objects) {
 				await Parts.mutableCollection.updateAsync(obj._id, {
 					$set: {
-						expectedDurationWithPreroll: obj.expectedDuration,
+						expectedDurationWithTransition: obj.expectedDuration,
 					},
 				})
 			}
diff --git a/meteor/server/migration/1_40_0.ts b/meteor/server/migration/1_40_0.ts
index 6e08378cd6..5e669407df 100644
--- a/meteor/server/migration/1_40_0.ts
+++ b/meteor/server/migration/1_40_0.ts
@@ -1,5 +1,5 @@
 import { addMigrationSteps } from './databaseMigration'
-import { Settings } from '../../lib/Settings'
+import { Settings } from '../Settings'
 import { Studios } from '../collections'
 
 // Release 40 (Skipped)
@@ -42,8 +42,6 @@ const OldSettings = Settings as Partial<ISettingsOld>
 const oldFrameRate = OldSettings.frameRate ?? 25
 
 export const addSteps = addMigrationSteps('1.40.0', [
-	// Add some migrations!
-
 	{
 		id: `Studio.settings.frameRate`,
 		canBeRunAutomatically: true,
diff --git a/meteor/server/migration/1_42_0.ts b/meteor/server/migration/1_42_0.ts
deleted file mode 100644
index e5f454d5bc..0000000000
--- a/meteor/server/migration/1_42_0.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-import { addMigrationSteps } from './databaseMigration'
-import { StudioRouteSet, StudioRouteType } from '@sofie-automation/corelib/dist/dataModel/Studio'
-import { Studios } from '../collections'
-
-export const addSteps = addMigrationSteps('1.42.0', [
-	// Add some migrations!
-
-	{
-		id: 'Add new routeType property to routeSets where missing',
-		canBeRunAutomatically: true,
-		validate: async () => {
-			return (
-				(await Studios.countDocuments({
-					routeSets: { $exists: false },
-				})) > 0
-			)
-		},
-		migrate: async () => {
-			const studios = await Studios.findFetchAsync({})
-
-			for (const studio of studios) {
-				const routeSets = studio.routeSets
-
-				Object.entries<StudioRouteSet>(routeSets).forEach(([routeSetId, routeSet]) => {
-					routeSet.routes.forEach((route) => {
-						if (!route.routeType) {
-							route.routeType = StudioRouteType.REROUTE
-						}
-					})
-
-					routeSets[routeSetId] = routeSet
-				})
-
-				await Studios.updateAsync(studio._id, { $set: { routeSets } })
-			}
-		},
-	},
-])
diff --git a/meteor/server/migration/1_44_0.ts b/meteor/server/migration/1_44_0.ts
index ed2b35e53d..b6d0d5c9a9 100644
--- a/meteor/server/migration/1_44_0.ts
+++ b/meteor/server/migration/1_44_0.ts
@@ -1,6 +1,8 @@
 import { addMigrationSteps } from './databaseMigration'
 import { RundownPlaylists, Rundowns } from '../collections'
 
+// Release 44
+
 export const addSteps = addMigrationSteps('1.44.0', [
 	{
 		id: 'Add new rundownIdsInOrder property to playlists where missing',
diff --git a/meteor/server/migration/1_46_0.ts b/meteor/server/migration/1_46_0.ts
index 30c5bf7ee2..d0c59be8ce 100644
--- a/meteor/server/migration/1_46_0.ts
+++ b/meteor/server/migration/1_46_0.ts
@@ -2,5 +2,5 @@ import { addMigrationSteps } from './databaseMigration'
 
 // Release 46
 export const addSteps = addMigrationSteps('1.46.0', [
-	// Add some migrations!
+	// >> No migration steps in this release <<
 ])
diff --git a/meteor/server/migration/1_47_0.ts b/meteor/server/migration/1_47_0.ts
index b001e89e37..61c51cefe9 100644
--- a/meteor/server/migration/1_47_0.ts
+++ b/meteor/server/migration/1_47_0.ts
@@ -3,11 +3,12 @@ import { DBStudio, MappingsExt } from '@sofie-automation/corelib/dist/dataModel/
 import { wrapDefaultObject } from '@sofie-automation/corelib/dist/settings/objectWithOverrides'
 import { DBShowStyleVariant } from '@sofie-automation/corelib/dist/dataModel/ShowStyleVariant'
 import { DBShowStyleBase, OutputLayers, SourceLayers } from '@sofie-automation/corelib/dist/dataModel/ShowStyleBase'
-import { DBBlueprintTrigger, TriggeredActionsObj } from '../../lib/collections/TriggeredActions'
+import { DBBlueprintTrigger, TriggeredActionsObj } from '@sofie-automation/meteor-lib/dist/collections/TriggeredActions'
 import { getRandomString, normalizeArray } from '@sofie-automation/corelib/dist/lib'
 import { IBlueprintConfig, IOutputLayer, ISourceLayer, SomeAction } from '@sofie-automation/blueprints-integration'
 import { ShowStyleBases, ShowStyleVariants, Studios, TriggeredActions } from '../collections'
 
+// Release 47
 interface StudioOld {
 	mappings: MappingsExt
 	blueprintConfig: IBlueprintConfig
@@ -33,18 +34,7 @@ function normalizeArrayRandomId<T>(array: Array<T>): { [indexKey: string]: T } {
 	return normalizedObject as { [key: string]: T }
 }
 
-/*
- * **************************************************************************************
- *
- *  These migrations are destined for the next release
- *
- * (This file is to be renamed to the correct version number when doing the release)
- *
- * **************************************************************************************
- */
-
 export const addSteps = addMigrationSteps('1.47.0', [
-	// Add some migrations!
 	{
 		id: `Studios generate *withOverrides`,
 		canBeRunAutomatically: true,
diff --git a/meteor/server/migration/1_48_0.ts b/meteor/server/migration/1_48_0.ts
index 492860f498..c2e307995c 100644
--- a/meteor/server/migration/1_48_0.ts
+++ b/meteor/server/migration/1_48_0.ts
@@ -1,22 +1,13 @@
 import { addMigrationSteps } from './databaseMigration'
-import { TranslationsBundle } from '../../lib/collections/TranslationsBundles'
+import { TranslationsBundle } from '@sofie-automation/meteor-lib/dist/collections/TranslationsBundles'
 import { generateTranslationBundleOriginId } from '../api/translationsBundles'
 import { BlueprintId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import { unprotectString } from '@sofie-automation/corelib/dist/protectedString'
 import { TranslationsBundles } from '../collections'
 
-/*
- * **************************************************************************************
- *
- *  These migrations are destined for the next release
- *
- * (This file is to be renamed to the correct version number when doing the release)
- *
- * **************************************************************************************
- */
+// Release 48
 
 export const addSteps = addMigrationSteps('1.48.0', [
-	// Add some migrations!
 	{
 		id: `TranslationBundles originId`,
 		canBeRunAutomatically: true,
diff --git a/meteor/server/migration/1_49_0.ts b/meteor/server/migration/1_49_0.ts
index a5c022f78b..d2016e2210 100644
--- a/meteor/server/migration/1_49_0.ts
+++ b/meteor/server/migration/1_49_0.ts
@@ -2,15 +2,7 @@ import { addMigrationSteps } from './databaseMigration'
 import { Blueprints, ShowStyleVariants } from '../collections'
 import { getRandomId } from '@sofie-automation/corelib/dist/lib'
 
-/*
- * **************************************************************************************
- *
- *  These migrations are destined for the next release
- *
- * (This file is to be renamed to the correct version number when doing the release)
- *
- * **************************************************************************************
- */
+// Release 49
 
 export const addSteps = addMigrationSteps('1.49.0', [
 	{
diff --git a/meteor/server/migration/1_50_0.ts b/meteor/server/migration/1_50_0.ts
index e511c5688e..9d85f90c98 100644
--- a/meteor/server/migration/1_50_0.ts
+++ b/meteor/server/migration/1_50_0.ts
@@ -3,6 +3,8 @@ import {
 	AdLibActions,
 	AdLibPieces,
 	ExpectedPackages,
+	PartInstances,
+	Parts,
 	PeripheralDevices,
 	Pieces,
 	RundownPlaylists,
@@ -37,15 +39,7 @@ import { Piece } from '@sofie-automation/corelib/dist/dataModel/Piece'
 import { AdLibPiece } from '@sofie-automation/corelib/dist/dataModel/AdLibPiece'
 import { AdLibAction } from '@sofie-automation/corelib/dist/dataModel/AdlibAction'
 
-/*
- * **************************************************************************************
- *
- *  These migrations are destined for the next release
- *
- * (This file is to be renamed to the correct version number when doing the release)
- *
- * **************************************************************************************
- */
+// Release 50
 
 const mappingBaseOptions: Array<keyof MappingExt> = [
 	'_id' as any,
@@ -89,10 +83,10 @@ function convertMappingsOverrideOps(studio: DBStudio) {
 	return changed && newOverrides
 }
 
-function convertRouteSetMappings(studio: DBStudio) {
+function convertRouteSetMappings(routeSets: Record<string, StudioRouteSet>) {
 	let changed = false
 
-	const newRouteSets = clone(studio.routeSets || {})
+	const newRouteSets = clone(routeSets || {})
 	for (const routeSet of Object.values<StudioRouteSet>(newRouteSets)) {
 		for (const route of routeSet.routes) {
 			if (route.remapping && !route.remapping.options) {
@@ -101,7 +95,7 @@ function convertRouteSetMappings(studio: DBStudio) {
 					..._.pick(route.remapping, ...mappingBaseOptions),
 					options: _.omit(route.remapping, ...mappingBaseOptions),
 				}
-				console.log('new route', route)
+				// console.log('new route', route)
 				changed = true
 			}
 		}
@@ -253,10 +247,13 @@ export const addSteps = addMigrationSteps('1.50.0', [
 		canBeRunAutomatically: true,
 		validate: async () => {
 			const studios = await Studios.findFetchAsync({ routeSets: { $exists: true } })
-
 			for (const studio of studios) {
-				const newOverrides = convertRouteSetMappings(studio)
-				if (newOverrides) {
+				// Ignore this if the routeSets has been converted into an OverrideWithObjects:
+				if (studio.routeSetsWithOverrides) continue
+				//@ts-expect-error routeSets are not part of the typings:
+				const plainRouteSets = studio.routeSets as any as Record<string, StudioRouteSet>
+				const newRouteSets = convertRouteSetMappings(plainRouteSets)
+				if (newRouteSets) {
 					return `object needs to be updated`
 				}
 			}
@@ -267,7 +264,12 @@ export const addSteps = addMigrationSteps('1.50.0', [
 			const studios = await Studios.findFetchAsync({ routeSets: { $exists: true } })
 
 			for (const studio of studios) {
-				const newRouteSets = convertRouteSetMappings(studio)
+				// Ignore this if the routeSets already has been converted into an OverrideWithObjects:
+				if (studio.routeSetsWithOverrides) continue
+				//@ts-expect-error routeSets are not part of the typings:
+				const plainRouteSets = studio.routeSets as any as Record<string, StudioRouteSet>
+
+				const newRouteSets = convertRouteSetMappings(plainRouteSets)
 
 				if (newRouteSets) {
 					await Studios.updateAsync(studio._id, {
@@ -928,6 +930,71 @@ export const addSteps = addMigrationSteps('1.50.0', [
 			}
 		},
 	},
+
+	{
+		id: `Part rename 'expectedDurationWithPreroll' to 'expectedDurationWithTransition'`,
+		canBeRunAutomatically: true,
+		validate: async () => {
+			const objectCount = await Parts.countDocuments({
+				expectedDurationWithTransition: { $exists: false },
+				expectedDurationWithPreroll: { $exists: true },
+			})
+
+			if (objectCount) {
+				return `object needs to be updated`
+			}
+			return false
+		},
+		migrate: async () => {
+			const objects = await Parts.findFetchAsync({
+				expectedDurationWithTransition: { $exists: false },
+				expectedDurationWithPreroll: { $exists: true },
+			})
+
+			for (const part of objects) {
+				await Parts.mutableCollection.updateAsync(part._id, {
+					$set: {
+						expectedDurationWithTransition: (part as any).expectedDurationWithPreroll,
+					},
+					$unset: {
+						expectedDurationWithPreroll: 1,
+					},
+				})
+			}
+		},
+	},
+	{
+		id: `PartInstance rename 'part.expectedDurationWithPreroll' to 'part.expectedDurationWithTransition'`,
+		canBeRunAutomatically: true,
+		validate: async () => {
+			const objectCount = await PartInstances.countDocuments({
+				'part.expectedDurationWithTransition': { $exists: false },
+				'part.expectedDurationWithPreroll': { $exists: true },
+			})
+
+			if (objectCount) {
+				return `object needs to be updated`
+			}
+			return false
+		},
+		migrate: async () => {
+			const objects = await PartInstances.findFetchAsync({
+				'part.expectedDurationWithTransition': { $exists: false },
+				'part.expectedDurationWithPreroll': { $exists: true },
+			})
+
+			for (const partInstance of objects) {
+				await PartInstances.mutableCollection.updateAsync(partInstance._id, {
+					$set: {
+						'part.expectedDurationWithTransition': (partInstance.part as any).expectedDurationWithPreroll,
+					},
+					$unset: {
+						'part.expectedDurationWithPreroll': 1,
+					},
+				})
+			}
+		},
+	},
 ])
 
 function updatePlayoutDeviceTypeInOverride(op: SomeObjectOverrideOp): ObjectOverrideSetOp | undefined {
diff --git a/meteor/server/migration/1_51_0.ts b/meteor/server/migration/1_51_0.ts
new file mode 100644
index 0000000000..c21ea432a2
--- /dev/null
+++ b/meteor/server/migration/1_51_0.ts
@@ -0,0 +1,164 @@
+import { addMigrationSteps } from './databaseMigration'
+
+import { PieceInstances, Pieces, Rundowns } from '../collections'
+import { RundownOrphanedReason, RundownSource } from '@sofie-automation/corelib/dist/dataModel/Rundown'
+import { PeripheralDeviceId, RundownId } from '@sofie-automation/corelib/dist/dataModel/Ids'
+import { JSONBlobStringify } from '@sofie-automation/blueprints-integration'
+
+// Release 51
+
+interface RemovedRundownProps {
+	/** The peripheral device the rundown originates from */
+	peripheralDeviceId?: PeripheralDeviceId
+	restoredFromSnapshotId?: RundownId
+	externalNRCSName: string
+}
+
+export const addSteps = addMigrationSteps('1.51.0', [
+	{
+		id: `Rundowns without source`,
+		canBeRunAutomatically: true,
+		validate: async () => {
+			const objects = await Rundowns.findFetchAsync({
+				source: { $exists: false },
+			})
+
+			if (objects.length > 0) {
+				return `object needs to be updated`
+			}
+			return false
+		},
+		migrate: async () => {
+			const objects = await Rundowns.findFetchAsync({
+				source: { $exists: false },
+			})
+			for (const obj of objects) {
+				const oldPartialObj = obj as any as RemovedRundownProps
+
+				let newSource: RundownSource = {
+					type: 'http', // Fallback
+				}
+				if (oldPartialObj.peripheralDeviceId) {
+					newSource = {
+						type: 'nrcs',
+						peripheralDeviceId: oldPartialObj.peripheralDeviceId,
+						nrcsName: oldPartialObj.externalNRCSName,
+					}
+				} else if (oldPartialObj.restoredFromSnapshotId) {
+					newSource = {
+						type: 'snapshot',
+						rundownId: oldPartialObj.restoredFromSnapshotId,
+					}
+				}
+
+				await Rundowns.mutableCollection.updateAsync(obj._id, {
+					$set: {
+						source: newSource,
+					},
+					$unset: {
+						peripheralDeviceId: 1,
+						externalNrcsName: 1,
+						restoredFromSnapshotId: 1,
+					},
+				})
+			}
+		},
+	},
+	{
+		id: `Rundowns remove orphaned FROM_SNAPSHOT`,
+		canBeRunAutomatically: true,
+		validate: async () => {
+			const objects = await Rundowns.findFetchAsync({
+				orphaned: 'from-snapshot' as any,
+			})
+
+			if (objects.length > 0) {
+				return `object needs to be updated`
+			}
+			return false
+		},
+		migrate: async () => {
+			await Rundowns.mutableCollection.updateAsync(
+				{
+					orphaned: 'from-snapshot' as any,
+				},
+				{
+					$set: {
+						orphaned: RundownOrphanedReason.DELETED,
+					},
+				},
+				{
+					multi: true,
+				}
+			)
+		},
+	},
+	{
+		id: `Pieces update NoraContent`,
+		canBeRunAutomatically: true,
+		validate: async () => {
+			const objects = await Pieces.findFetchAsync({
+				'content.previewRenderer': { $exists: true },
+				'content.payload': { $exists: true },
+				'content.previewPayload': { $exists: false },
+			})
+
+			if (objects.length > 0) {
+				return `object needs to be updated`
+			}
+			return false
+		},
+		migrate: async () => {
+			const objects = await Pieces.findFetchAsync({
+				'content.previewRenderer': { $exists: true },
+				'content.payload': { $exists: true },
+				'content.previewPayload': { $exists: false },
+			})
+
+			for (const piece of objects) {
+				await Pieces.mutableCollection.updateAsync(piece._id, {
+					$set: {
+						'content.previewPayload': JSONBlobStringify((piece.content as any).payload),
+					},
+					$unset: {
+						'content.payload': 1,
+					},
+				})
+			}
+		},
+	},
+	{
+		id: `PieceInstances update NoraContent`,
+		canBeRunAutomatically: true,
+		validate: async () => {
+			const objects = await PieceInstances.findFetchAsync({
+				'piece.content.previewRenderer': { $exists: true },
+				'piece.content.payload': { $exists: true },
+				'piece.content.previewPayload': { $exists: false },
+			})
+
+			if (objects.length > 0) {
+				return `object needs to be updated`
+			}
+			return false
+		},
+		migrate: async () => {
+			const objects = await PieceInstances.findFetchAsync({
+				'piece.content.previewRenderer': { $exists: true },
+				'piece.content.payload': { $exists: true },
+				'piece.content.previewPayload': { $exists: false },
+			})
+
+			for (const piece of objects) {
+				await PieceInstances.mutableCollection.updateAsync(piece._id, {
+					$set: {
+						'piece.content.previewPayload': JSONBlobStringify((piece.piece.content as any).payload),
+					},
+					$unset: {
+						'piece.content.payload': 1,
+					},
+				})
+			}
+		},
+	},
+])
diff --git a/meteor/server/migration/X_X_X.ts b/meteor/server/migration/X_X_X.ts
index 7a68db2c2c..37862b391d 100644
--- a/meteor/server/migration/X_X_X.ts
+++ b/meteor/server/migration/X_X_X.ts
@@ -1,8 +1,12 @@
 import { addMigrationSteps } from './databaseMigration'
 import { CURRENT_SYSTEM_VERSION } from './currentSystemVersion'
-import { Rundowns } from '../collections'
-import { RundownSource } from '@sofie-automation/corelib/dist/dataModel/Rundown'
-import { PeripheralDeviceId, RundownId } from '@sofie-automation/corelib/dist/dataModel/Ids'
+import { Studios } from '../collections'
+import { convertObjectIntoOverrides } from '@sofie-automation/corelib/dist/settings/objectWithOverrides'
+import {
+	StudioRouteSet,
+	StudioRouteSetExclusivityGroup,
+	StudioPackageContainer,
+} from '@sofie-automation/corelib/dist/dataModel/Studio'
 
 /*
  * **************************************************************************************
@@ -14,58 +18,170 @@ import { PeripheralDeviceId, RundownId } from '@sofie-automation/corelib/dist/da
  * **************************************************************************************
  */
 
-interface RemovedRundownProps {
-	/** The peripheral device the rundown originates from */
-	peripheralDeviceId?: PeripheralDeviceId
-	restoredFromSnapshotId?: RundownId
-	externalNRCSName: string
-}
-
 export const addSteps = addMigrationSteps(CURRENT_SYSTEM_VERSION, [
+	// Add your migration here
+
 	{
-		id: `Rundowns without source`,
+		id: `convert routesets to ObjectWithOverrides`,
 		canBeRunAutomatically: true,
 		validate: async () => {
-			const objects = await Rundowns.findFetchAsync({
-				source: { $exists: false },
+			const studios = await Studios.findFetchAsync({
+				routeSets: { $exists: true },
+				routeSetsWithOverrides: { $exists: false },
 			})
 
-			if (objects.length > 0) {
-				return `object needs to be updated`
+			for (const studio of studios) {
+				//@ts-expect-error routeSets is not typed as ObjectWithOverrides
+				if (studio.routeSets) {
+					return 'routesets must be converted to an ObjectWithOverrides'
+				}
 			}
+
 			return false
 		},
 		migrate: async () => {
-			const objects = await Rundowns.findFetchAsync({
-				source: { $exists: false },
+			const studios = await Studios.findFetchAsync({
+				routeSets: { $exists: true },
+				routeSetsWithOverrides: { $exists: false },
 			})
-			for (const obj of objects) {
-				const oldPartialObj = obj as any as RemovedRundownProps
 
-				let newSource: RundownSource = {
-					type: 'http', // Fallback
-				}
-				if (oldPartialObj.peripheralDeviceId) {
-					newSource = {
-						type: 'nrcs',
-						peripheralDeviceId: oldPartialObj.peripheralDeviceId,
-						nrcsName: oldPartialObj.externalNRCSName,
+			for (const studio of studios) {
+				//@ts-expect-error routeSets is typed as Record<string, StudioRouteSet>
+				const oldRouteSets = studio.routeSets
+
+				const newRouteSets = convertObjectIntoOverrides<StudioRouteSet>(oldRouteSets || {})
+
+				await Studios.updateAsync(studio._id, {
+					$set: {
+						routeSetsWithOverrides: newRouteSets,
+					},
+					$unset: {
+						routeSets: 1,
+					},
+				})
+			}
+		},
+	},
+	{
+		id: `add abPlayers object`,
+		canBeRunAutomatically: true,
+		validate: async () => {
+			const studios = await Studios.findFetchAsync({ routeSetsWithOverrides: { $exists: true } })
+
+			for (const studio of studios) {
+				const routeSetsDefaults = studio.routeSetsWithOverrides.defaults as any as Record<
+					string,
+					StudioRouteSet
+				>
+				for (const key of Object.keys(routeSetsDefaults)) {
+					if (!routeSetsDefaults[key].abPlayers) {
+						return 'AB players must be added to routeSetsWithOverrides'
 					}
-				} else if (oldPartialObj.restoredFromSnapshotId) {
-					newSource = {
-						type: 'snapshot',
-						rundownId: oldPartialObj.restoredFromSnapshotId,
+				}
+			}
+
+			return false
+		},
+		migrate: async () => {
+			const studios = await Studios.findFetchAsync({ routeSetsWithOverrides: { $exists: true } })
+
+			for (const studio of studios) {
+				const newRouteSetswithOverrides = studio.routeSetsWithOverrides
+				for (const key of Object.keys(newRouteSetswithOverrides.defaults)) {
+					if (!newRouteSetswithOverrides.defaults[key].abPlayers) {
+						newRouteSetswithOverrides.defaults[key].abPlayers = []
 					}
 				}
 
-				await Rundowns.mutableCollection.updateAsync(obj._id, {
+				await Studios.updateAsync(studio._id, {
+					$set: {
+						routeSetsWithOverrides: newRouteSetswithOverrides,
+					},
+				})
+			}
+		},
+	},
+	{
+		id: `convert routeSetExclusivityGroups to ObjectWithOverrides`,
+		canBeRunAutomatically: true,
+		validate: async () => {
+			const studios = await Studios.findFetchAsync({
+				routeSetExclusivityGroups: { $exists: true },
+				routeSetExclusivityGroupsWithOverrides: { $exists: false },
+			})
+
+			for (const studio of studios) {
+				//@ts-expect-error routeSetExclusivityGroups is not typed as ObjectWithOverrides
+				if (studio.routeSetExclusivityGroups) {
+					return 'routesets must be converted to an ObjectWithOverrides'
+				}
+			}
+
+			return false
+		},
+		migrate: async () => {
+			const studios = await Studios.findFetchAsync({
+				routeSetExclusivityGroups: { $exists: true },
+				routeSetExclusivityGroupsWithOverrides: { $exists: false },
+			})
+
+			for (const studio of studios) {
+				//@ts-expect-error routeSets is typed as Record<string, StudioRouteSetExclusivityGroup>
+				const oldRouteSetExclusivityGroups = studio.routeSetExclusivityGroups
+
+				const newRouteSetExclusivityGroups = convertObjectIntoOverrides<StudioRouteSetExclusivityGroup>(
+					oldRouteSetExclusivityGroups || {}
+				)
+
+				await Studios.updateAsync(studio._id, {
+					$set: {
+						routeSetExclusivityGroupsWithOverrides: newRouteSetExclusivityGroups,
+					},
+					$unset: {
+						routeSetExclusivityGroups: 1,
+					},
+				})
+			}
+		},
+	},
+	{
+		id: `convert packageContainers to ObjectWithOverrides`,
+		canBeRunAutomatically: true,
+		validate: async () => {
+			const studios = await Studios.findFetchAsync({
+				packageContainers: { $exists: true },
+				packageContainersWithOverrides: { $exists: false },
+			})
+
+			for (const studio of studios) {
+				// @ts-expect-error packageContainers is typed as Record<string, StudioPackageContainer>
+				if (studio.packageContainers) {
+					return 'packageContainers must be converted to an ObjectWithOverrides'
+				}
+			}
+
+			return false
+		},
+		migrate: async () => {
+			const studios = await Studios.findFetchAsync({
+				packageContainers: { $exists: true },
+				packageContainersWithOverrides: { $exists: false },
+			})
+
+			for (const studio of studios) {
+				// @ts-expect-error packageContainers is typed as Record<string, StudioPackageContainer>
+				const oldPackageContainers = studio.packageContainers
+
+				const newPackageContainers = convertObjectIntoOverrides<StudioPackageContainer>(
+					oldPackageContainers || {}
+				)
+
+				await Studios.updateAsync(studio._id, {
 					$set: {
-						source: newSource,
+						packageContainersWithOverrides: newPackageContainers,
 					},
 					$unset: {
-						peripheralDeviceId: 1,
-						externalNrcsName: 1,
-						restoredFromSnapshotId: 1,
+						packageContainers: 1,
 					},
 				})
 			}
diff --git a/meteor/server/migration/__tests__/migrations.test.ts b/meteor/server/migration/__tests__/migrations.test.ts
index bb0362cc4d..f4ec9ac82c 100644
--- a/meteor/server/migration/__tests__/migrations.test.ts
+++ b/meteor/server/migration/__tests__/migrations.test.ts
@@ -1,11 +1,11 @@
 import * as _ from 'underscore'
 import { setupEmptyEnvironment } from '../../../__mocks__/helpers/database'
 import { testInFiber } from '../../../__mocks__/helpers/jest'
-import { ICoreSystem, GENESIS_SYSTEM_VERSION } from '../../../lib/collections/CoreSystem'
+import { ICoreSystem, GENESIS_SYSTEM_VERSION } from '@sofie-automation/meteor-lib/dist/collections/CoreSystem'
 import { clearMigrationSteps, addMigrationSteps, prepareMigration, PreparedMigration } from '../databaseMigration'
 import { CURRENT_SYSTEM_VERSION } from '../currentSystemVersion'
-import { RunMigrationResult, GetMigrationStatusResult } from '../../../lib/api/migration'
-import { literal, protectString } from '../../../lib/lib'
+import { RunMigrationResult, GetMigrationStatusResult } from '@sofie-automation/meteor-lib/dist/api/migration'
+import { literal, protectString } from '../../lib/tempLib'
 import {
 	MigrationStepInputResult,
 	BlueprintManifestType,
@@ -18,7 +18,7 @@ import {
 } from '@sofie-automation/blueprints-integration'
 import { DBStudio } from '@sofie-automation/corelib/dist/dataModel/Studio'
 import { generateFakeBlueprint } from '../../api/blueprints/__tests__/lib'
-import { MeteorCall } from '../../../lib/api/methods'
+import { MeteorCall } from '../../api/methods'
 import { wrapDefaultObject } from '@sofie-automation/corelib/dist/settings/objectWithOverrides'
 import { Blueprints, ShowStyleBases, ShowStyleVariants, Studios } from '../../collections'
 import { getCoreSystemAsync } from '../../coreSystem/collection'
@@ -130,9 +130,9 @@ describe('Migrations', () => {
 						mappingsWithOverrides: wrapDefaultObject({}),
 						blueprintConfigWithOverrides: wrapDefaultObject({}),
 						_rundownVersionHash: '',
-						routeSets: {},
-						routeSetExclusivityGroups: {},
-						packageContainers: {},
+						routeSetsWithOverrides: wrapDefaultObject({}),
+						routeSetExclusivityGroupsWithOverrides: wrapDefaultObject({}),
+						packageContainersWithOverrides: wrapDefaultObject({}),
 						previewContainerIds: [],
 						thumbnailContainerIds: [],
 						peripheralDeviceSettings: {
@@ -168,9 +168,9 @@ describe('Migrations', () => {
 						mappingsWithOverrides: wrapDefaultObject({}),
 						blueprintConfigWithOverrides: wrapDefaultObject({}),
 						_rundownVersionHash: '',
-						routeSets: {},
-						routeSetExclusivityGroups: {},
-						packageContainers: {},
+						routeSetsWithOverrides: wrapDefaultObject({}),
+						routeSetExclusivityGroupsWithOverrides: wrapDefaultObject({}),
+						packageContainersWithOverrides: wrapDefaultObject({}),
 						previewContainerIds: [],
 						thumbnailContainerIds: [],
 						peripheralDeviceSettings: {
@@ -206,9 +206,9 @@ describe('Migrations', () => {
 						mappingsWithOverrides: wrapDefaultObject({}),
 						blueprintConfigWithOverrides: wrapDefaultObject({}),
 						_rundownVersionHash: '',
-						routeSets: {},
-						routeSetExclusivityGroups: {},
-						packageContainers: {},
+						routeSetsWithOverrides: wrapDefaultObject({}),
+						routeSetExclusivityGroupsWithOverrides: wrapDefaultObject({}),
+						packageContainersWithOverrides: wrapDefaultObject({}),
 						previewContainerIds: [],
 						thumbnailContainerIds: [],
 						peripheralDeviceSettings: {
diff --git a/meteor/server/migration/api.ts b/meteor/server/migration/api.ts
index d01a756fa5..fd4fac48e1 100644
--- a/meteor/server/migration/api.ts
+++ b/meteor/server/migration/api.ts
@@ -1,14 +1,14 @@
-import { check, Match } from '../../lib/check'
+import { check, Match } from '../lib/check'
 import { registerClassToMeteorMethods } from '../methods'
 import {
 	MigrationChunk,
 	NewMigrationAPI,
 	MigrationAPIMethods,
 	BlueprintFixUpConfigMessage,
-} from '../../lib/api/migration'
+} from '@sofie-automation/meteor-lib/dist/api/migration'
 import * as Migrations from './databaseMigration'
 import { MigrationStepInputResult } from '@sofie-automation/blueprints-integration'
-import { MethodContextAPI } from '../../lib/api/methods'
+import { MethodContextAPI } from '../api/methodContext'
 import { SystemWriteAccess } from '../security/system'
 import {
 	fixupConfigForShowStyleBase,
diff --git a/meteor/server/migration/currentSystemVersion.ts b/meteor/server/migration/currentSystemVersion.ts
index 9486960d8b..6a2a3c3b0c 100644
--- a/meteor/server/migration/currentSystemVersion.ts
+++ b/meteor/server/migration/currentSystemVersion.ts
@@ -49,7 +49,9 @@
  * 1.47.0: Release 47 (?)
  * 1.49.0: Release 49 (?)
  * 1.50.0: Release 50 (2024-02-23)
+ * 1.51.0: Release 51 (TBD)
+ * 1.52.0: Release 52 (TBD)
  */
 
 // Note: Only set this to release versions, (ie X.Y.Z), not pre-releases (ie X.Y.Z-0-pre-release)
-export const CURRENT_SYSTEM_VERSION = '1.51.0'
+export const CURRENT_SYSTEM_VERSION = '1.52.0'
diff --git a/meteor/server/migration/databaseMigration.ts b/meteor/server/migration/databaseMigration.ts
index ff485fedf1..b01bdfe5fe 100644
--- a/meteor/server/migration/databaseMigration.ts
+++ b/meteor/server/migration/databaseMigration.ts
@@ -35,11 +35,12 @@ import {
 	MigrationChunk,
 	MigrationStepType,
 	RunMigrationResult,
-} from '../../lib/api/migration'
-import { logger } from '../../lib/logging'
+} from '@sofie-automation/meteor-lib/dist/api/migration'
+import { logger } from '../logging'
 import { internalStoreSystemSnapshot } from '../api/snapshot'
-import { GENESIS_SYSTEM_VERSION, parseVersion, Version } from '../../lib/collections/CoreSystem'
-import { clone, getHash, omit, protectString, unprotectString } from '../../lib/lib'
+import { parseVersion, Version } from '../systemStatus/semverUtils'
+import { GENESIS_SYSTEM_VERSION } from '@sofie-automation/meteor-lib/dist/collections/CoreSystem'
+import { clone, getHash, omit, protectString, unprotectString } from '../lib/tempLib'
 import { stringifyError } from '@sofie-automation/shared-lib/dist/lib/stringifyError'
 import { evalBlueprint } from '../api/blueprints/cache'
 import {
diff --git a/meteor/server/migration/lib.ts b/meteor/server/migration/lib.ts
index 58e48b16f5..93441a9cc8 100644
--- a/meteor/server/migration/lib.ts
+++ b/meteor/server/migration/lib.ts
@@ -1,6 +1,6 @@
 import * as _ from 'underscore'
 import { MigrationStepCore } from '@sofie-automation/blueprints-integration'
-import { objectPathGet, ProtectedString } from '../../lib/lib'
+import { objectPathGet, ProtectedString } from '../lib/tempLib'
 import { Meteor } from 'meteor/meteor'
 import { logger } from '../logging'
 import { CollectionName } from '@sofie-automation/corelib/dist/dataModel/Collections'
diff --git a/meteor/server/migration/migrations.ts b/meteor/server/migration/migrations.ts
index 0a0b004913..7a7d45f2f5 100644
--- a/meteor/server/migration/migrations.ts
+++ b/meteor/server/migration/migrations.ts
@@ -12,8 +12,7 @@ addSteps1_40_0()
 import { addSteps as addSteps1_41_0 } from './1_41_0'
 addSteps1_41_0()
 
-import { addSteps as addSteps1_42_0 } from './1_42_0'
-addSteps1_42_0()
+// Note: There where no migrations for Release 42
 
 import { addSteps as addSteps1_44_0 } from './1_44_0'
 addSteps1_44_0()
@@ -35,6 +34,9 @@ addSteps1_49_0()
 import { addSteps as addSteps1_50_0 } from './1_50_0'
 addSteps1_50_0()
 
+import { addSteps as addSteps1_51_0 } from './1_51_0'
+addSteps1_51_0()
+
 // Migrations for the in-development release:
 import { addSteps as addStepsX_X_X } from './X_X_X'
 addStepsX_X_X()
diff --git a/meteor/server/migration/upgrades/__tests__/showStyleBase.test.ts b/meteor/server/migration/upgrades/__tests__/showStyleBase.test.ts
index e5c7346d8f..5b1c43632d 100644
--- a/meteor/server/migration/upgrades/__tests__/showStyleBase.test.ts
+++ b/meteor/server/migration/upgrades/__tests__/showStyleBase.test.ts
@@ -12,7 +12,7 @@ import {
 	SourceLayerType,
 	TriggerType,
 } from '@sofie-automation/blueprints-integration'
-import { clone, generateTranslation, getRandomString, normalizeArray, omit } from '../../../../lib/lib'
+import { clone, generateTranslation, getRandomString, normalizeArray, omit } from '../../../lib/tempLib'
 import { literal } from '@sofie-automation/shared-lib/dist/lib/lib'
 import { BlueprintValidateConfigForStudioResult } from '@sofie-automation/corelib/dist/worker/studio'
 import { wrapTranslatableMessageFromBlueprints } from '@sofie-automation/corelib/dist/TranslatableMessage'
diff --git a/meteor/server/migration/upgrades/showStyleBase.ts b/meteor/server/migration/upgrades/showStyleBase.ts
index 7cbab024cd..d2281043ae 100644
--- a/meteor/server/migration/upgrades/showStyleBase.ts
+++ b/meteor/server/migration/upgrades/showStyleBase.ts
@@ -14,14 +14,14 @@ import { BlueprintValidateConfigForStudioResult } from '@sofie-automation/coreli
 import { Meteor } from 'meteor/meteor'
 import { Blueprints, ShowStyleBases, TriggeredActions } from '../../collections'
 import { DBShowStyleBase } from '@sofie-automation/corelib/dist/dataModel/ShowStyleBase'
-import { DBTriggeredActions } from '../../../lib/collections/TriggeredActions'
+import { DBTriggeredActions } from '@sofie-automation/meteor-lib/dist/collections/TriggeredActions'
 import { evalBlueprint } from '../../api/blueprints/cache'
 import { logger } from '../../logging'
 import { CommonContext } from './context'
 import type { AnyBulkWriteOperation } from 'mongodb'
 import { FixUpBlueprintConfigContext } from '@sofie-automation/corelib/dist/fixUpBlueprintConfig/context'
 import { Blueprint } from '@sofie-automation/corelib/dist/dataModel/Blueprint'
-import { BlueprintFixUpConfigMessage } from '../../../lib/api/migration'
+import { BlueprintFixUpConfigMessage } from '@sofie-automation/meteor-lib/dist/api/migration'
 
 export async function fixupConfigForShowStyleBase(
 	showStyleBaseId: ShowStyleBaseId
diff --git a/meteor/server/migration/upgrades/studio.ts b/meteor/server/migration/upgrades/studio.ts
index 5d31602f2f..e52bcf1b77 100644
--- a/meteor/server/migration/upgrades/studio.ts
+++ b/meteor/server/migration/upgrades/studio.ts
@@ -6,7 +6,7 @@ import { profiler } from '../../api/profiler'
 import { Studios } from '../../collections'
 import { logger } from '../../logging'
 import { QueueStudioJob } from '../../worker/worker'
-import { BlueprintFixUpConfigMessage } from '../../../lib/api/migration'
+import { BlueprintFixUpConfigMessage } from '@sofie-automation/meteor-lib/dist/api/migration'
 
 async function getStudio(studioId: StudioId): Promise<Pick<DBStudio, '_id'>> {
 	const studio = (await Studios.findOneAsync(studioId, {
diff --git a/meteor/server/performanceMonitor.ts b/meteor/server/performanceMonitor.ts
index adef99f244..ea875c300f 100644
--- a/meteor/server/performanceMonitor.ts
+++ b/meteor/server/performanceMonitor.ts
@@ -1,6 +1,6 @@
 import { Meteor } from 'meteor/meteor'
 import * as _ from 'underscore'
-import { MeteorStartupAsync } from '../lib/lib'
+import { MeteorStartupAsync } from './lib/lib'
 import { getCoreSystemAsync } from './coreSystem/collection'
 import { logger } from './logging'
 import { getRunningMethods, resetRunningMethods } from './methods'
diff --git a/meteor/server/publications/_publications.ts b/meteor/server/publications/_publications.ts
index 2fa6145728..30d002268b 100644
--- a/meteor/server/publications/_publications.ts
+++ b/meteor/server/publications/_publications.ts
@@ -9,6 +9,8 @@ import './packageManager/playoutContext'
 import './pieceContentStatusUI/bucket/publication'
 import './pieceContentStatusUI/rundown/publication'
 import './organization'
+import './partsUI/publication'
+import './partInstancesUI/publication'
 import './peripheralDevice'
 import './peripheralDeviceForDevice'
 import './rundown'
@@ -25,7 +27,7 @@ import './triggeredActionsUI'
 import './mountedTriggers'
 import './deviceTriggersPreview'
 
-import { AllPubSubNames } from '../../lib/api/pubsub'
+import { AllPubSubNames } from '@sofie-automation/meteor-lib/dist/api/pubsub'
 import { MeteorPublications } from './lib'
 import { logger } from '../logging'
 
diff --git a/meteor/server/publications/blueprintUpgradeStatus/checkStatus.ts b/meteor/server/publications/blueprintUpgradeStatus/checkStatus.ts
index 752fc62764..5567ab0fb3 100644
--- a/meteor/server/publications/blueprintUpgradeStatus/checkStatus.ts
+++ b/meteor/server/publications/blueprintUpgradeStatus/checkStatus.ts
@@ -14,11 +14,11 @@ import { DBShowStyleBase } from '@sofie-automation/corelib/dist/dataModel/ShowSt
 import { DBStudio } from '@sofie-automation/corelib/dist/dataModel/Studio'
 import { joinObjectPathFragments, objectPathGet } from '@sofie-automation/corelib/dist/lib'
 import { applyAndValidateOverrides } from '@sofie-automation/corelib/dist/settings/objectWithOverrides'
-import { generateTranslation } from '../../../lib/lib'
+import { generateTranslation } from '../../lib/tempLib'
 import { logger } from '../../logging'
 import { ShowStyleBaseFields, StudioFields } from './reactiveContentCache'
 import _ from 'underscore'
-import { UIBlueprintUpgradeStatusBase } from '../../../lib/api/upgradeStatus'
+import { UIBlueprintUpgradeStatusBase } from '@sofie-automation/meteor-lib/dist/api/upgradeStatus'
 import { stringifyError } from '@sofie-automation/shared-lib/dist/lib/stringifyError'
 
 export interface BlueprintMapEntry {
diff --git a/meteor/server/publications/blueprintUpgradeStatus/publication.ts b/meteor/server/publications/blueprintUpgradeStatus/publication.ts
index 14eb13a12b..0218e93e90 100644
--- a/meteor/server/publications/blueprintUpgradeStatus/publication.ts
+++ b/meteor/server/publications/blueprintUpgradeStatus/publication.ts
@@ -1,7 +1,7 @@
 import { BlueprintId, ShowStyleBaseId, StudioId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import { ReadonlyDeep } from 'type-fest'
-import { CustomCollectionName, MeteorPubSub } from '../../../lib/api/pubsub'
-import { ProtectedString, protectString } from '../../../lib/lib'
+import { CustomCollectionName, MeteorPubSub } from '@sofie-automation/meteor-lib/dist/api/pubsub'
+import { ProtectedString, protectString } from '../../lib/tempLib'
 import {
 	CustomPublish,
 	CustomPublishCollection,
@@ -19,7 +19,10 @@ import { BlueprintMapEntry, checkDocUpgradeStatus } from './checkStatus'
 import { BlueprintManifestType } from '@sofie-automation/blueprints-integration'
 import { DBShowStyleBase } from '@sofie-automation/corelib/dist/dataModel/ShowStyleBase'
 import { DBStudio } from '@sofie-automation/corelib/dist/dataModel/Studio'
-import { UIBlueprintUpgradeStatus, UIBlueprintUpgradeStatusId } from '../../../lib/api/upgradeStatus'
+import {
+	UIBlueprintUpgradeStatus,
+	UIBlueprintUpgradeStatusId,
+} from '@sofie-automation/meteor-lib/dist/api/upgradeStatus'
 
 type BlueprintUpgradeStatusArgs = Record<string, never>
 
diff --git a/meteor/server/publications/blueprintUpgradeStatus/systemStatus.ts b/meteor/server/publications/blueprintUpgradeStatus/systemStatus.ts
index f1df572202..f77199b4b0 100644
--- a/meteor/server/publications/blueprintUpgradeStatus/systemStatus.ts
+++ b/meteor/server/publications/blueprintUpgradeStatus/systemStatus.ts
@@ -1,7 +1,7 @@
 import { createManualPromise } from '@sofie-automation/corelib/dist/lib'
 import { ProtectedString } from '@sofie-automation/corelib/dist/protectedString'
 import { Meteor } from 'meteor/meteor'
-import { UIBlueprintUpgradeStatus } from '../../../lib/api/upgradeStatus'
+import { UIBlueprintUpgradeStatus } from '@sofie-automation/meteor-lib/dist/api/upgradeStatus'
 import { CustomPublish, CustomPublishChanges } from '../../lib/customPublication'
 import { createBlueprintUpgradeStatusSubscriptionHandle } from './publication'
 
diff --git a/meteor/server/publications/buckets.ts b/meteor/server/publications/buckets.ts
index 9e3b5b612b..8db38ce907 100644
--- a/meteor/server/publications/buckets.ts
+++ b/meteor/server/publications/buckets.ts
@@ -1,8 +1,8 @@
-import { FindOptions } from '../../lib/collections/lib'
+import { FindOptions } from '@sofie-automation/meteor-lib/dist/collections/lib'
 import { BucketSecurity } from '../security/buckets'
 import { meteorPublish } from './lib'
-import { MeteorPubSub } from '../../lib/api/pubsub'
-import { Bucket } from '../../lib/collections/Buckets'
+import { MeteorPubSub } from '@sofie-automation/meteor-lib/dist/api/pubsub'
+import { Bucket } from '@sofie-automation/meteor-lib/dist/collections/Buckets'
 import { StudioReadAccess } from '../security/studio'
 import { isProtectedString } from '@sofie-automation/corelib/dist/protectedString'
 import { BucketAdLibActions, BucketAdLibs, Buckets } from '../collections'
diff --git a/meteor/server/publications/deviceTriggersPreview.ts b/meteor/server/publications/deviceTriggersPreview.ts
index d6fea73f2e..c5aeed97a5 100644
--- a/meteor/server/publications/deviceTriggersPreview.ts
+++ b/meteor/server/publications/deviceTriggersPreview.ts
@@ -1,32 +1,21 @@
 import { PeripheralDeviceId, StudioId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import { getRandomId } from '@sofie-automation/corelib/dist/lib'
-import { ProtectedString, unprotectString } from '@sofie-automation/corelib/dist/protectedString'
+import { unprotectString } from '@sofie-automation/corelib/dist/protectedString'
 import { check } from 'meteor/check'
 import { Meteor } from 'meteor/meteor'
 import { ReadonlyDeep } from 'type-fest'
-import { CustomCollectionName, MeteorPubSub } from '../../lib/api/pubsub'
-import { DeviceTriggerArguments } from '../../lib/api/triggers/MountedTriggers'
-import { getCurrentTime } from '../../lib/lib'
+import { CustomCollectionName, MeteorPubSub } from '@sofie-automation/meteor-lib/dist/api/pubsub'
+import { DeviceTriggerArguments, UIDeviceTriggerPreview } from '@sofie-automation/meteor-lib/dist/api/MountedTriggers'
+import { getCurrentTime } from '../lib/lib'
 import { setUpOptimizedObserverArray, TriggerUpdate } from '../lib/customPublication'
 import { CustomPublish, meteorCustomPublish } from '../lib/customPublication/publish'
 import { StudioReadAccess } from '../security/studio'
 import { PeripheralDevices } from '../collections'
 
-type DeviceTriggerPreviewId = ProtectedString<'deviceTriggerPreviewId'>
-
 /** IDEA: This could potentially be a Capped Collection, thus enabling scaling Core horizontally:
  *  https://www.mongodb.com/docs/manual/core/capped-collections/ */
 const lastTriggers: Record<string, { triggers: UIDeviceTriggerPreview[]; updated?: (() => void) | undefined }> = {}
 
-export interface UIDeviceTriggerPreview {
-	_id: DeviceTriggerPreviewId
-	peripheralDeviceId: PeripheralDeviceId
-	triggerDeviceId: string
-	triggerId: string
-	timestamp: number
-	values?: DeviceTriggerArguments
-}
-
 meteorCustomPublish(
 	MeteorPubSub.deviceTriggersPreview,
 	CustomCollectionName.UIDeviceTriggerPreviews,
diff --git a/meteor/server/publications/lib.ts b/meteor/server/publications/lib.ts
index a42bd210fe..ee05a9b56e 100644
--- a/meteor/server/publications/lib.ts
+++ b/meteor/server/publications/lib.ts
@@ -1,18 +1,19 @@
 import { Meteor, Subscription } from 'meteor/meteor'
-import { AllPubSubCollections, AllPubSubTypes } from '../../lib/api/pubsub'
+import { AllPubSubCollections, AllPubSubTypes } from '@sofie-automation/meteor-lib/dist/api/pubsub'
 import { extractFunctionSignature } from '../lib'
 import { MongoQuery } from '@sofie-automation/corelib/dist/mongo'
 import { ResolvedCredentials, resolveCredentials } from '../security/lib/credentials'
-import { Settings } from '../../lib/Settings'
+import { Settings } from '../Settings'
 import { PeripheralDevice } from '@sofie-automation/corelib/dist/dataModel/PeripheralDevice'
-import { MongoCursor } from '../../lib/collections/lib'
+import { MongoCursor } from '@sofie-automation/meteor-lib/dist/collections/lib'
 import {
 	OrganizationId,
 	PeripheralDeviceId,
 	ShowStyleBaseId,
 	UserId,
 } from '@sofie-automation/corelib/dist/dataModel/Ids'
-import { protectStringObject, waitForPromise } from '../../lib/lib'
+import { protectStringObject } from '../lib/tempLib'
+import { waitForPromise } from '../lib/lib'
 import { DBShowStyleBase } from '@sofie-automation/corelib/dist/dataModel/ShowStyleBase'
 import { PeripheralDevices, ShowStyleBases } from '../collections'
 import { MetricsGauge } from '@sofie-automation/corelib/dist/prometheus'
diff --git a/meteor/server/publications/lib/ReactiveCacheCollection.ts b/meteor/server/publications/lib/ReactiveCacheCollection.ts
index 294430cab1..e78a3e1827 100644
--- a/meteor/server/publications/lib/ReactiveCacheCollection.ts
+++ b/meteor/server/publications/lib/ReactiveCacheCollection.ts
@@ -1,7 +1,7 @@
 import { omit } from '@sofie-automation/corelib/dist/lib'
 import { ProtectedString } from '@sofie-automation/corelib/dist/protectedString'
 import { Mongo } from 'meteor/mongo'
-import { ObserveChangesCallbacks } from '../../../lib/collections/lib'
+import { ObserveChangesCallbacks } from '@sofie-automation/meteor-lib/dist/collections/lib'
 import { MongoModifier, MongoQuery } from '@sofie-automation/corelib/dist/mongo'
 
 type Reaction = () => void
diff --git a/meteor/server/publications/lib/__tests__/observerGroup.test.ts b/meteor/server/publications/lib/__tests__/observerGroup.test.ts
index b7332753e8..20a880af98 100644
--- a/meteor/server/publications/lib/__tests__/observerGroup.test.ts
+++ b/meteor/server/publications/lib/__tests__/observerGroup.test.ts
@@ -1,8 +1,7 @@
 import '../../../../__mocks__/_extendJest'
 
-import { sleep } from '@sofie-automation/corelib/dist/lib'
 import { ReactiveMongoObserverGroup } from '..//observerGroup'
-import { LiveQueryHandle } from '../../../lib/lib'
+import { LiveQueryHandle, sleep } from '../../../lib/lib'
 
 describe('ReactiveMongoObserverGroup', () => {
 	beforeEach(() => {
diff --git a/meteor/server/publications/lib/observerChain.ts b/meteor/server/publications/lib/observerChain.ts
index 244e14bdb3..4b51df340a 100644
--- a/meteor/server/publications/lib/observerChain.ts
+++ b/meteor/server/publications/lib/observerChain.ts
@@ -1,8 +1,9 @@
 import { ProtectedString } from '@sofie-automation/corelib/dist/protectedString'
 import { Meteor } from 'meteor/meteor'
-import { MongoCursor } from '../../../lib/collections/lib'
+import { MongoCursor } from '@sofie-automation/meteor-lib/dist/collections/lib'
 import { Simplify } from 'type-fest'
-import { assertNever, waitForPromise } from '../../../lib/lib'
+import { assertNever } from '../../lib/tempLib'
+import { waitForPromise } from '../../lib/lib'
 
 /**
  * https://stackoverflow.com/a/66011942
diff --git a/meteor/server/publications/lib/observerGroup.ts b/meteor/server/publications/lib/observerGroup.ts
index 8f2235c6bb..cce4654e43 100644
--- a/meteor/server/publications/lib/observerGroup.ts
+++ b/meteor/server/publications/lib/observerGroup.ts
@@ -1,7 +1,6 @@
 import { ManualPromise, createManualPromise, getRandomString } from '@sofie-automation/corelib/dist/lib'
 import { Meteor } from 'meteor/meteor'
-import { lazyIgnore } from '../../../lib/lib'
-import { LiveQueryHandle } from '../../lib/lib'
+import { LiveQueryHandle, lazyIgnore } from '../../lib/lib'
 
 export interface ReactiveMongoObserverGroupHandle extends LiveQueryHandle {
 	/**
diff --git a/meteor/server/publications/lib/quickLoop.ts b/meteor/server/publications/lib/quickLoop.ts
new file mode 100644
index 0000000000..272a554ac9
--- /dev/null
+++ b/meteor/server/publications/lib/quickLoop.ts
@@ -0,0 +1,148 @@
+import { DBPart } from '@sofie-automation/corelib/dist/dataModel/Part'
+import {
+	DBRundownPlaylist,
+	ForceQuickLoopAutoNext,
+	QuickLoopMarker,
+	QuickLoopMarkerType,
+} from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
+import { MarkerPosition, compareMarkerPositions } from '@sofie-automation/corelib/dist/playout/playlist'
+import { ProtectedString, unprotectString } from '@sofie-automation/corelib/dist/protectedString'
+import { DEFAULT_FALLBACK_PART_DURATION } from '@sofie-automation/shared-lib/dist/core/constants'
+import { getCurrentTime } from '../../lib/lib'
+import { generateTranslation } from '@sofie-automation/corelib/dist/lib'
+import { DBStudio } from '@sofie-automation/corelib/dist/dataModel/Studio'
+import { DBPartInstance } from '@sofie-automation/corelib/dist/dataModel/PartInstance'
+import { DBSegment } from '@sofie-automation/corelib/dist/dataModel/Segment'
+import { ReadonlyObjectDeep } from 'type-fest/source/readonly-deep'
+import { ReactiveCacheCollection } from './ReactiveCacheCollection'
+
+export function findPartPosition(
+	part: DBPart,
+	segmentRanks: Record<string, number>,
+	rundownRanks: Record<string, number>
+): MarkerPosition {
+	return {
+		rundownRank: rundownRanks[part.rundownId as unknown as string] ?? 0,
+		segmentRank: segmentRanks[part.segmentId as unknown as string] ?? 0,
+		partRank: part._rank,
+	}
+}
+
+export function stringsToIndexLookup(strings: string[]): Record<string, number> {
+	return strings.reduce((result, str, index) => {
+		result[str] = index
+		return result
+	}, {} as Record<string, number>)
+}
+
+export function extractRanks(docs: { _id: ProtectedString<any>; _rank: number }[]): Record<string, number> {
+	return docs.reduce((result, doc) => {
+		result[doc._id as unknown as string] = doc._rank
+		return result
+	}, {} as Record<string, number>)
+}
+
+export function modifyPartForQuickLoop(
+	part: DBPart,
+	segmentRanks: Record<string, number>,
+	rundownRanks: Record<string, number>,
+	playlist: Pick<DBRundownPlaylist, 'quickLoop'>,
+	studio: Pick<DBStudio, 'settings'>,
+	quickLoopStartPosition: MarkerPosition | undefined,
+	quickLoopEndPosition: MarkerPosition | undefined,
+	canSetAutoNext = () => true
+): void {
+	const partPosition = findPartPosition(part, segmentRanks, rundownRanks)
+	const isLoopDefined = quickLoopStartPosition && quickLoopEndPosition
+	const isLoopingOverriden =
+		isLoopDefined &&
+		playlist.quickLoop?.forceAutoNext !== ForceQuickLoopAutoNext.DISABLED &&
+		compareMarkerPositions(quickLoopStartPosition, partPosition) >= 0 &&
+		compareMarkerPositions(partPosition, quickLoopEndPosition) >= 0
+
+	const fallbackPartDuration = studio.settings.fallbackPartDuration ?? DEFAULT_FALLBACK_PART_DURATION
+
+	if (isLoopingOverriden && (part.expectedDuration ?? 0) < fallbackPartDuration) {
+		if (playlist.quickLoop?.forceAutoNext === ForceQuickLoopAutoNext.ENABLED_FORCING_MIN_DURATION) {
+			part.expectedDuration = fallbackPartDuration
+			part.expectedDurationWithTransition = fallbackPartDuration
+		} else if (playlist.quickLoop?.forceAutoNext === ForceQuickLoopAutoNext.ENABLED_WHEN_VALID_DURATION) {
+			part.invalid = true
+			part.invalidReason = {
+				message: generateTranslation('Part duration is 0.'),
+			}
+		}
+	}
+	if (!canSetAutoNext()) return
+	part.autoNext = part.autoNext || (isLoopingOverriden && (part.expectedDuration ?? 0) > 0)
+}
+
+export function modifyPartInstanceForQuickLoop(
+	partInstance: Omit<DBPartInstance, 'part.privateData'>,
+	segmentRanks: Record<string, number>,
+	rundownRanks: Record<string, number>,
+	playlist: Pick<DBRundownPlaylist, 'quickLoop'>,
+	studio: Pick<DBStudio, 'settings'>,
+	quickLoopStartPosition: MarkerPosition | undefined,
+	quickLoopEndPosition: MarkerPosition | undefined
+): void {
+	// note that the logic for when a part does not do autonext in quickloop should reflect the logic in the QuickLoopService in job worker
+	const canAutoNext = () => {
+		const start = partInstance.timings?.plannedStartedPlayback
+		if (start !== undefined && partInstance.part.expectedDuration) {
+			// date.now - start = playback duration, duration + offset gives position in part
+			const playbackDuration = getCurrentTime() - start
+
+			// If there is an auto next planned soon or was in the past
+			if (partInstance.part.expectedDuration - playbackDuration < 0) {
+				return false
+			}
+		}
+
+		return true
+	}
+
+	modifyPartForQuickLoop(
+		partInstance.part,
+		segmentRanks,
+		rundownRanks,
+		playlist,
+		studio,
+		quickLoopStartPosition,
+		quickLoopEndPosition,
+		canAutoNext // do not adjust the part instance if we have passed the time where we can still enable auto next
+	)
+}
+
+export function findMarkerPosition(
+	marker: QuickLoopMarker,
+	fallback: number,
+	segmentCache: ReadonlyObjectDeep<ReactiveCacheCollection<Pick<DBSegment, '_id' | '_rank' | 'rundownId'>>>,
+	partCache:
+		| { parts: ReadonlyObjectDeep<ReactiveCacheCollection<Pick<DBPart, '_id' | '_rank' | 'segmentId'>>> }
+		| { partInstances: ReadonlyObjectDeep<ReactiveCacheCollection<DBPartInstance>> },
+	rundownRanks: Record<string, number>
+): MarkerPosition {
+	const part =
+		marker.type === QuickLoopMarkerType.PART
+			? 'parts' in partCache
+				? partCache.parts.findOne(marker.id)
+				: partCache.partInstances.findOne({ 'part._id': marker.id })?.part
+			: undefined
+	const partRank = part?._rank ?? fallback
+
+	const segmentId = marker.type === QuickLoopMarkerType.SEGMENT ? marker.id : part?.segmentId
+	const segment = segmentId && segmentCache.findOne(segmentId)
+	const segmentRank = segment?._rank ?? fallback
+
+	const rundownId = marker.type === QuickLoopMarkerType.RUNDOWN ? marker.id : segment?.rundownId
+	let rundownRank = rundownId ? rundownRanks[unprotectString(rundownId)] : fallback
+
+	if (marker.type === QuickLoopMarkerType.PLAYLIST) rundownRank = fallback
+
+	return {
+		rundownRank: rundownRank,
+		segmentRank: segmentRank,
+		partRank: partRank,
+	}
+}
diff --git a/meteor/server/publications/mountedTriggers.ts b/meteor/server/publications/mountedTriggers.ts
index c6d8743d9d..9976677de6 100644
--- a/meteor/server/publications/mountedTriggers.ts
+++ b/meteor/server/publications/mountedTriggers.ts
@@ -13,6 +13,7 @@ import {
 	PeripheralDevicePubSub,
 	PeripheralDevicePubSubCollectionsNames,
 } from '@sofie-automation/shared-lib/dist/pubsub/peripheralDevice'
+import { stringifyError } from '@sofie-automation/shared-lib/dist/lib/stringifyError'
 
 const PUBLICATION_DEBOUNCE = 20
 
@@ -100,7 +101,7 @@ function cursorCustomPublish<T extends { _id: ProtectedString<any> }>(pub: Custo
 				removed: Array.from(bufferToSend.removed.values()),
 			})
 		} catch (e) {
-			logger.error(`Error while updating publication: ${e}`, e as any)
+			logger.error(`Error while updating publication: ${stringifyError(e)}`)
 		}
 	}, PUBLICATION_DEBOUNCE)
 
diff --git a/meteor/server/publications/organization.ts b/meteor/server/publications/organization.ts
index 50e4479128..58d1305891 100644
--- a/meteor/server/publications/organization.ts
+++ b/meteor/server/publications/organization.ts
@@ -1,19 +1,19 @@
 import { meteorPublish, AutoFillSelector } from './lib'
-import { MeteorPubSub } from '../../lib/api/pubsub'
+import { MeteorPubSub } from '@sofie-automation/meteor-lib/dist/api/pubsub'
 import { Blueprint } from '@sofie-automation/corelib/dist/dataModel/Blueprint'
-import { Evaluation } from '../../lib/collections/Evaluations'
-import { SnapshotItem } from '../../lib/collections/Snapshots'
-import { UserActionsLogItem } from '../../lib/collections/UserActionsLog'
+import { Evaluation } from '@sofie-automation/meteor-lib/dist/collections/Evaluations'
+import { SnapshotItem } from '@sofie-automation/meteor-lib/dist/collections/Snapshots'
+import { UserActionsLogItem } from '@sofie-automation/meteor-lib/dist/collections/UserActionsLog'
 import { OrganizationReadAccess } from '../security/organization'
-import { FindOptions } from '../../lib/collections/lib'
-import { DBOrganization } from '../../lib/collections/Organization'
+import { FindOptions } from '@sofie-automation/meteor-lib/dist/collections/lib'
+import { DBOrganization } from '@sofie-automation/meteor-lib/dist/collections/Organization'
 import { isProtectedString } from '@sofie-automation/corelib/dist/protectedString'
 import { Blueprints, Evaluations, Organizations, Snapshots, UserActionsLog } from '../collections'
 import { MongoQuery } from '@sofie-automation/corelib/dist/mongo'
 import { BlueprintId, OrganizationId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import { CorelibPubSub } from '@sofie-automation/corelib/dist/pubsub'
-import { check, Match } from '../../lib/check'
-import { getCurrentTime } from '../../lib/lib'
+import { check, Match } from '../lib/check'
+import { getCurrentTime } from '../lib/lib'
 
 meteorPublish(
 	MeteorPubSub.organization,
@@ -102,7 +102,9 @@ meteorPublish(
 			token
 		)
 		if (!cred || (await OrganizationReadAccess.organizationContent(selector.organizationId, cred))) {
-			return UserActionsLog.findWithCursor(selector)
+			return UserActionsLog.findWithCursor(selector, {
+				limit: 10_000, // this is to prevent having a publication that produces a very large array
+			})
 		}
 		return null
 	}
diff --git a/meteor/server/publications/packageManager/expectedPackages/contentObserver.ts b/meteor/server/publications/packageManager/expectedPackages/contentObserver.ts
index 4507bc47b3..dcb2488a82 100644
--- a/meteor/server/publications/packageManager/expectedPackages/contentObserver.ts
+++ b/meteor/server/publications/packageManager/expectedPackages/contentObserver.ts
@@ -7,9 +7,10 @@ import {
 	pieceInstanceFieldsSpecifier,
 } from './contentCache'
 import { ExpectedPackages, PieceInstances, RundownPlaylists } from '../../../collections'
-import { equivalentArrays, waitForPromise } from '../../../../lib/lib'
+import { waitForPromise } from '../../../lib/lib'
 import { ReactiveMongoObserverGroup, ReactiveMongoObserverGroupHandle } from '../../lib/observerGroup'
 import _ from 'underscore'
+import { equivalentArrays } from '@sofie-automation/shared-lib/dist/lib/lib'
 
 const REACTIVITY_DEBOUNCE = 20
 
diff --git a/meteor/server/publications/packageManager/expectedPackages/generate.ts b/meteor/server/publications/packageManager/expectedPackages/generate.ts
index 7d2194eca5..cdc21bf353 100644
--- a/meteor/server/publications/packageManager/expectedPackages/generate.ts
+++ b/meteor/server/publications/packageManager/expectedPackages/generate.ts
@@ -10,9 +10,9 @@ import {
 import deepExtend from 'deep-extend'
 import { ReadonlyDeep } from 'type-fest'
 import _ from 'underscore'
-import { getSideEffect } from '../../../../lib/collections/ExpectedPackages'
+import { getSideEffect } from '@sofie-automation/meteor-lib/dist/collections/ExpectedPackages'
 import { DBStudio, StudioLight, StudioPackageContainer } from '@sofie-automation/corelib/dist/dataModel/Studio'
-import { clone, omit } from '../../../../lib/lib'
+import { clone, omit } from '../../../lib/tempLib'
 import { CustomPublishCollection } from '../../../lib/customPublication'
 import { logger } from '../../../logging'
 import { ExpectedPackagesContentCache } from './contentCache'
@@ -31,6 +31,7 @@ export async function updateCollectionForExpectedPackageIds(
 	contentCache: ReadonlyDeep<ExpectedPackagesContentCache>,
 	studio: Pick<DBStudio, StudioFields>,
 	layerNameToDeviceIds: Map<string, PeripheralDeviceId[]>,
+	packageContainers: Record<string, StudioPackageContainer>,
 	collection: CustomPublishCollection<PackageManagerExpectedPackage>,
 	filterPlayoutDeviceIds: ReadonlyDeep<PeripheralDeviceId[]> | undefined,
 	regenerateIds: Set<ExpectedPackageId>
@@ -66,7 +67,8 @@ export async function updateCollectionForExpectedPackageIds(
 				},
 				deviceId,
 				null,
-				Priorities.OTHER // low priority
+				Priorities.OTHER, // low priority
+				packageContainers
 			)
 
 			updatedDocIds.add(routedPackage._id)
@@ -99,6 +101,7 @@ export async function updateCollectionForPieceInstanceIds(
 	contentCache: ReadonlyDeep<ExpectedPackagesContentCache>,
 	studio: Pick<DBStudio, StudioFields>,
 	layerNameToDeviceIds: Map<string, PeripheralDeviceId[]>,
+	packageContainers: Record<string, StudioPackageContainer>,
 	collection: CustomPublishCollection<PackageManagerExpectedPackage>,
 	filterPlayoutDeviceIds: ReadonlyDeep<PeripheralDeviceId[]> | undefined,
 	regenerateIds: Set<PieceInstanceId>
@@ -140,7 +143,8 @@ export async function updateCollectionForPieceInstanceIds(
 					},
 					deviceId,
 					pieceInstanceId,
-					Priorities.OTHER // low priority
+					Priorities.OTHER, // low priority
+					packageContainers
 				)
 
 				updatedDocIds.add(routedPackage._id)
@@ -172,17 +176,21 @@ enum Priorities {
 }
 
 function generateExpectedPackageForDevice(
-	studio: Pick<StudioLight, '_id' | 'packageContainers' | 'previewContainerIds' | 'thumbnailContainerIds'>,
+	studio: Pick<
+		StudioLight,
+		'_id' | 'packageContainersWithOverrides' | 'previewContainerIds' | 'thumbnailContainerIds'
+	>,
 	expectedPackage: PackageManagerExpectedPackageBase,
 	deviceId: PeripheralDeviceId,
 	pieceInstanceId: PieceInstanceId | null,
-	priority: Priorities
+	priority: Priorities,
+	packageContainers: Record<string, StudioPackageContainer>
 ): PackageManagerExpectedPackage {
 	// Lookup Package sources:
 	const combinedSources: PackageContainerOnPackage[] = []
 
 	for (const packageSource of expectedPackage.sources) {
-		const lookedUpSource = studio.packageContainers[packageSource.containerId]
+		const lookedUpSource = packageContainers[packageSource.containerId]
 		if (lookedUpSource) {
 			combinedSources.push(calculateCombinedSource(packageSource, lookedUpSource))
 		} else {
@@ -199,7 +207,7 @@ function generateExpectedPackageForDevice(
 	}
 
 	// Lookup Package targets:
-	const combinedTargets = calculateCombinedTargets(studio, expectedPackage, deviceId)
+	const combinedTargets = calculateCombinedTargets(expectedPackage, deviceId, packageContainers)
 
 	if (!combinedSources.length && expectedPackage.sources.length !== 0) {
 		logger.warn(`Pub.expectedPackagesForDevice: No sources found for "${expectedPackage._id}"`)
@@ -253,14 +261,14 @@ function calculateCombinedSource(
 	return combinedSource
 }
 function calculateCombinedTargets(
-	studio: Pick<StudioLight, '_id' | 'packageContainers'>,
 	expectedPackage: PackageManagerExpectedPackageBase,
-	deviceId: PeripheralDeviceId
+	deviceId: PeripheralDeviceId,
+	packageContainers: Record<string, StudioPackageContainer>
 ): PackageContainerOnPackage[] {
 	const mappingDeviceId = unprotectString(deviceId)
 
 	let packageContainerId: string | undefined
-	for (const [containerId, packageContainer] of Object.entries<StudioPackageContainer>(studio.packageContainers)) {
+	for (const [containerId, packageContainer] of Object.entries<StudioPackageContainer>(packageContainers)) {
 		if (packageContainer.deviceIds.includes(mappingDeviceId)) {
 			// TODO: how to handle if a device has multiple containers?
 			packageContainerId = containerId
@@ -270,7 +278,7 @@ function calculateCombinedTargets(
 
 	const combinedTargets: PackageContainerOnPackage[] = []
 	if (packageContainerId) {
-		const lookedUpTarget = studio.packageContainers[packageContainerId]
+		const lookedUpTarget = packageContainers[packageContainerId]
 		if (lookedUpTarget) {
 			// Todo: should the be any combination of properties here?
 			combinedTargets.push({
diff --git a/meteor/server/publications/packageManager/expectedPackages/publication.ts b/meteor/server/publications/packageManager/expectedPackages/publication.ts
index ca05666441..e315421b76 100644
--- a/meteor/server/publications/packageManager/expectedPackages/publication.ts
+++ b/meteor/server/publications/packageManager/expectedPackages/publication.ts
@@ -1,13 +1,13 @@
 import { Meteor } from 'meteor/meteor'
 import { PeripheralDeviceReadAccess } from '../../../security/peripheralDevice'
-import { DBStudio } from '@sofie-automation/corelib/dist/dataModel/Studio'
+import { DBStudio, StudioPackageContainer } from '@sofie-automation/corelib/dist/dataModel/Studio'
 import {
 	TriggerUpdate,
 	meteorCustomPublish,
 	setUpCollectionOptimizedObserver,
 	CustomPublishCollection,
 } from '../../../lib/customPublication'
-import { literal, omit, protectString } from '../../../../lib/lib'
+import { literal, omit, protectString } from '../../../lib/tempLib'
 import { logger } from '../../../logging'
 import { ReadonlyDeep } from 'type-fest'
 import { applyAndValidateOverrides } from '@sofie-automation/corelib/dist/settings/objectWithOverrides'
@@ -48,22 +48,23 @@ interface ExpectedPackagesPublicationUpdateProps {
 interface ExpectedPackagesPublicationState {
 	studio: Pick<DBStudio, StudioFields> | undefined
 	layerNameToDeviceIds: Map<string, PeripheralDeviceId[]>
+	packageContainers: Record<string, StudioPackageContainer>
 
 	contentCache: ReadonlyDeep<ExpectedPackagesContentCache>
 }
 
 export type StudioFields =
 	| '_id'
-	| 'routeSets'
+	| 'routeSetsWithOverrides'
 	| 'mappingsWithOverrides'
-	| 'packageContainers'
+	| 'packageContainersWithOverrides'
 	| 'previewContainerIds'
 	| 'thumbnailContainerIds'
 const studioFieldSpecifier = literal<MongoFieldSpecifierOnesStrict<Pick<DBStudio, StudioFields>>>({
 	_id: 1,
-	routeSets: 1,
+	routeSetsWithOverrides: 1,
 	mappingsWithOverrides: 1,
-	packageContainers: 1,
+	packageContainersWithOverrides: 1,
 	previewContainerIds: 1,
 	thumbnailContainerIds: 1,
 })
@@ -102,7 +103,7 @@ async function setupExpectedPackagesPublicationObservers(
 			{
 				fields: {
 					// mappingsHash gets updated when either of these omitted fields changes
-					...omit(studioFieldSpecifier, 'mappingsWithOverrides', 'routeSets'),
+					...omit(studioFieldSpecifier, 'mappingsWithOverrides', 'routeSetsWithOverrides'),
 					mappingsHash: 1,
 				},
 			}
@@ -122,6 +123,7 @@ async function manipulateExpectedPackagesPublicationData(
 	const invalidateAllItems = !updateProps || updateProps.newCache || updateProps.invalidateStudio
 
 	if (!state.layerNameToDeviceIds) state.layerNameToDeviceIds = new Map()
+	if (!state.packageContainers) state.packageContainers = {}
 
 	if (invalidateAllItems) {
 		// Everything is invalid, reset everything
@@ -141,9 +143,14 @@ async function manipulateExpectedPackagesPublicationData(
 		if (!state.studio) {
 			logger.warn(`Pub.expectedPackagesForDevice: studio "${args.studioId}" not found!`)
 			state.layerNameToDeviceIds = new Map()
+			state.packageContainers = {}
 		} else {
 			const studioMappings = applyAndValidateOverrides(state.studio.mappingsWithOverrides).obj
-			state.layerNameToDeviceIds = buildMappingsToDeviceIdMap(state.studio.routeSets, studioMappings)
+			state.layerNameToDeviceIds = buildMappingsToDeviceIdMap(
+				applyAndValidateOverrides(state.studio.routeSetsWithOverrides).obj,
+				studioMappings
+			)
+			state.packageContainers = applyAndValidateOverrides(state.studio.packageContainersWithOverrides).obj
 		}
 	}
 
@@ -170,6 +177,7 @@ async function manipulateExpectedPackagesPublicationData(
 		state.contentCache,
 		state.studio,
 		state.layerNameToDeviceIds,
+		state.packageContainers,
 		collection,
 		args.filterPlayoutDeviceIds,
 		regenerateExpectedPackageIds
@@ -178,6 +186,7 @@ async function manipulateExpectedPackagesPublicationData(
 		state.contentCache,
 		state.studio,
 		state.layerNameToDeviceIds,
+		state.packageContainers,
 		collection,
 		args.filterPlayoutDeviceIds,
 		regeneratePieceInstanceIds
diff --git a/meteor/server/publications/packageManager/expectedPackages/util.ts b/meteor/server/publications/packageManager/expectedPackages/util.ts
index 5df52ad314..08fe01ab56 100644
--- a/meteor/server/publications/packageManager/expectedPackages/util.ts
+++ b/meteor/server/publications/packageManager/expectedPackages/util.ts
@@ -1,7 +1,7 @@
 import { PeripheralDeviceId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import { MappingExt, MappingsExt, StudioRouteSet } from '@sofie-automation/corelib/dist/dataModel/Studio'
 import { ReadonlyDeep } from 'type-fest'
-import { getActiveRoutes, getRoutedMappings } from '../../../../lib/collections/Studios'
+import { getActiveRoutes, getRoutedMappings } from '@sofie-automation/meteor-lib/dist/collections/Studios'
 
 type MappingExtWithOriginalName = MappingExt & { originalLayerName: string }
 type MappingsExtWithOriginalName = {
diff --git a/meteor/server/publications/packageManager/packageContainers.ts b/meteor/server/publications/packageManager/packageContainers.ts
index a479f8d66a..8c43c0a611 100644
--- a/meteor/server/publications/packageManager/packageContainers.ts
+++ b/meteor/server/publications/packageManager/packageContainers.ts
@@ -15,11 +15,12 @@ import {
 	PeripheralDevicePubSub,
 	PeripheralDevicePubSubCollectionsNames,
 } from '@sofie-automation/shared-lib/dist/pubsub/peripheralDevice'
+import { applyAndValidateOverrides } from '@sofie-automation/corelib/dist/settings/objectWithOverrides'
 
-type StudioFields = '_id' | 'packageContainers'
+type StudioFields = '_id' | 'packageContainersWithOverrides'
 const studioFieldSpecifier = literal<MongoFieldSpecifierOnesStrict<Pick<DBStudio, StudioFields>>>({
 	_id: 1,
-	packageContainers: 1,
+	packageContainersWithOverrides: 1,
 })
 
 interface PackageManagerPackageContainersArgs {
@@ -68,8 +69,9 @@ async function manipulateExpectedPackagesPublicationData(
 
 	const packageContainers: { [containerId: string]: PackageContainer } = {}
 	if (studio) {
+		const studioPackageContainers = applyAndValidateOverrides(studio.packageContainersWithOverrides).obj
 		for (const [containerId, studioPackageContainer] of Object.entries<StudioPackageContainer>(
-			studio.packageContainers
+			studioPackageContainers
 		)) {
 			packageContainers[containerId] = studioPackageContainer.container
 		}
diff --git a/meteor/server/publications/partInstancesUI/publication.ts b/meteor/server/publications/partInstancesUI/publication.ts
new file mode 100644
index 0000000000..e85c9b8ec0
--- /dev/null
+++ b/meteor/server/publications/partInstancesUI/publication.ts
@@ -0,0 +1,236 @@
+import {
+	PartInstanceId,
+	RundownId,
+	RundownPlaylistActivationId,
+	SegmentId,
+} from '@sofie-automation/corelib/dist/dataModel/Ids'
+import { check } from 'meteor/check'
+import {
+	CustomPublishCollection,
+	TriggerUpdate,
+	meteorCustomPublish,
+	setUpCollectionOptimizedObserver,
+} from '../../lib/customPublication'
+import { logger } from '../../logging'
+import { CustomCollectionName, MeteorPubSub } from '@sofie-automation/meteor-lib/dist/api/pubsub'
+import { resolveCredentials } from '../../security/lib/credentials'
+import { NoSecurityReadAccess } from '../../security/noSecurity'
+import { ContentCache, PartInstanceOmitedFields, createReactiveContentCache } from './reactiveContentCache'
+import { ReadonlyDeep } from 'type-fest'
+import { LiveQueryHandle } from '../../lib/lib'
+import { RundownPlaylists } from '../../collections'
+import { literal } from '@sofie-automation/corelib/dist/lib'
+import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
+import { MongoFieldSpecifierOnesStrict } from '@sofie-automation/corelib/dist/mongo'
+import { RundownsObserver } from '../lib/rundownsObserver'
+import { RundownContentObserver } from './rundownContentObserver'
+import { protectString } from '@sofie-automation/corelib/dist/protectedString'
+import { Match } from '../../lib/check'
+import { RundownReadAccess } from '../../security/rundown'
+import { DBPartInstance } from '@sofie-automation/corelib/dist/dataModel/PartInstance'
+import {
+	extractRanks,
+	findMarkerPosition,
+	modifyPartInstanceForQuickLoop,
+	stringsToIndexLookup,
+} from '../lib/quickLoop'
+
+interface UIPartInstancesArgs {
+	readonly playlistActivationId: RundownPlaylistActivationId
+	readonly rundownIds: RundownId[]
+}
+
+export interface UIPartInstancesState {
+	contentCache: ReadonlyDeep<ContentCache>
+}
+
+interface UIPartInstancesUpdateProps {
+	newCache: ContentCache
+
+	invalidateSegmentIds: SegmentId[]
+	invalidatePartInstanceIds: PartInstanceId[]
+
+	invalidateQuickLoop: boolean
+}
+
+type RundownPlaylistFields = '_id' | 'studioId' | 'rundownIdsInOrder'
+const rundownPlaylistFieldSpecifier = literal<
+	MongoFieldSpecifierOnesStrict<Pick<DBRundownPlaylist, RundownPlaylistFields>>
+>({
+	_id: 1,
+	studioId: 1,
+	rundownIdsInOrder: 1,
+})
+
+async function setupUIPartInstancesPublicationObservers(
+	args: ReadonlyDeep<UIPartInstancesArgs>,
+	triggerUpdate: TriggerUpdate<UIPartInstancesUpdateProps>
+): Promise<LiveQueryHandle[]> {
+	const playlist = (await RundownPlaylists.findOneAsync(
+		{ activationId: args.playlistActivationId },
+		{
+			projection: rundownPlaylistFieldSpecifier,
+		}
+	)) as Pick<DBRundownPlaylist, RundownPlaylistFields> | undefined
+	if (!playlist) throw new Error(`RundownPlaylist with activationId="${args.playlistActivationId}" not found!`)
+
+	const rundownsObserver = new RundownsObserver(playlist.studioId, playlist._id, (rundownIds) => {
+		logger.silly(`Creating new RundownContentObserver`)
+
+		const cache = createReactiveContentCache()
+
+		// Push update
+		triggerUpdate({ newCache: cache })
+
+		const obs1 = new RundownContentObserver(playlist.studioId, args.playlistActivationId, rundownIds, cache)
+
+		const innerQueries = [
+			cache.Segments.find({}).observeChanges({
+				added: (id) => triggerUpdate({ invalidateSegmentIds: [protectString(id)] }),
+				changed: (id) => triggerUpdate({ invalidateSegmentIds: [protectString(id)] }),
+				removed: (id) => triggerUpdate({ invalidateSegmentIds: [protectString(id)] }),
+			}),
+			cache.PartInstances.find({}).observe({
+				added: (doc) => triggerUpdate({ invalidatePartInstanceIds: [doc._id] }),
+				changed: (doc, oldDoc) => {
+					if (doc.part._rank !== oldDoc.part._rank) {
+						// with part rank change we need to invalidate the entire segment,
+						// as the order may affect which unchanged parts are/aren't in quickLoop
+						triggerUpdate({ invalidateSegmentIds: [doc.segmentId] })
+					} else {
+						triggerUpdate({ invalidatePartInstanceIds: [doc._id] })
+					}
+				},
+				removed: (doc) => triggerUpdate({ invalidatePartInstanceIds: [doc._id] }),
+			}),
+			cache.RundownPlaylists.find({}).observeChanges({
+				added: () => triggerUpdate({ invalidateQuickLoop: true }),
+				changed: () => triggerUpdate({ invalidateQuickLoop: true }),
+				removed: () => triggerUpdate({ invalidateQuickLoop: true }),
+			}),
+			cache.Studios.find({}).observeChanges({
+				added: () => triggerUpdate({ invalidateQuickLoop: true }),
+				changed: () => triggerUpdate({ invalidateQuickLoop: true }),
+				removed: () => triggerUpdate({ invalidateQuickLoop: true }),
+			}),
+		]
+
+		return () => {
+			obs1.dispose()
+
+			for (const query of innerQueries) {
+				query.stop()
+			}
+		}
+	})
+
+	// Set up observers:
+	return [rundownsObserver]
+}
+
+export async function manipulateUIPartInstancesPublicationData(
+	_args: ReadonlyDeep<UIPartInstancesArgs>,
+	state: Partial<UIPartInstancesState>,
+	collection: CustomPublishCollection<DBPartInstance>,
+	updateProps: Partial<ReadonlyDeep<UIPartInstancesUpdateProps>> | undefined
+): Promise<void> {
+	// Prepare data for publication:
+
+	if (updateProps?.newCache !== undefined) {
+		state.contentCache = updateProps.newCache ?? undefined
+	}
+
+	if (!state.contentCache) {
+		// Remove all the partInstances
+		collection.remove(null)
+
+		return
+	}
+
+	const playlist = state.contentCache.RundownPlaylists.findOne({})
+	if (!playlist) return
+
+	const studio = state.contentCache.Studios.findOne({})
+	if (!studio) return
+
+	const rundownRanks = stringsToIndexLookup(playlist.rundownIdsInOrder as unknown as string[])
+	const segmentRanks = extractRanks(state.contentCache.Segments.find({}).fetch())
+
+	const quickLoopStartPosition =
+		playlist.quickLoop?.start &&
+		findMarkerPosition(
+			playlist.quickLoop.start,
+			-Infinity,
+			state.contentCache.Segments,
+			{ partInstances: state.contentCache.PartInstances },
+			rundownRanks
+		)
+	const quickLoopEndPosition =
+		playlist.quickLoop?.end &&
+		findMarkerPosition(
+			playlist.quickLoop.end,
+			Infinity,
+			state.contentCache.Segments,
+			{ partInstances: state.contentCache.PartInstances },
+			rundownRanks
+		)
+
+	updateProps?.invalidatePartInstanceIds?.forEach((partId) => {
+		collection.remove(partId) // if it still exists, it will be replaced in the next step
+	})
+
+	const invalidatedSegmentsSet = new Set(updateProps?.invalidateSegmentIds ?? [])
+	const invalidatedPartInstancesSet = new Set(updateProps?.invalidatePartInstanceIds ?? [])
+
+	state.contentCache.PartInstances.find({}).forEach((partInstance) => {
+		if (
+			updateProps?.invalidateQuickLoop ||
+			invalidatedSegmentsSet.has(partInstance.segmentId) ||
+			invalidatedPartInstancesSet.has(partInstance._id)
+		) {
+			modifyPartInstanceForQuickLoop(
+				partInstance,
+				segmentRanks,
+				rundownRanks,
+				playlist,
+				studio,
+				quickLoopStartPosition,
+				quickLoopEndPosition
+			)
+			collection.replace(partInstance)
+		}
+	})
+}
+
+meteorCustomPublish(
+	MeteorPubSub.uiPartInstances,
+	CustomCollectionName.UIPartInstances,
+	async function (pub, rundownIds: RundownId[], playlistActivationId: RundownPlaylistActivationId | null) {
+		check(rundownIds, [String])
+		check(playlistActivationId, Match.Maybe(String))
+
+		const credentials = await resolveCredentials({ userId: this.userId, token: undefined })
+
+		if (
+			playlistActivationId &&
+			(!credentials ||
+				NoSecurityReadAccess.any() ||
+				(await RundownReadAccess.rundownContent({ $in: rundownIds }, credentials)))
+		) {
+			await setUpCollectionOptimizedObserver<
+				Omit<DBPartInstance, PartInstanceOmitedFields>,
+				UIPartInstancesArgs,
+				UIPartInstancesState,
+				UIPartInstancesUpdateProps
+			>(
+				`pub_${MeteorPubSub.uiPartInstances}_${rundownIds.join(',')}_${playlistActivationId}`,
+				{ rundownIds, playlistActivationId },
+				setupUIPartInstancesPublicationObservers,
+				manipulateUIPartInstancesPublicationData,
+				pub
+			)
+		} else {
+			logger.warn(`Pub.uiPartInstances: Not allowed: [${rundownIds.join(',')}] "${playlistActivationId}"`)
+		}
+	}
+)
diff --git a/meteor/server/publications/partInstancesUI/reactiveContentCache.ts b/meteor/server/publications/partInstancesUI/reactiveContentCache.ts
new file mode 100644
index 0000000000..b9356fb6a1
--- /dev/null
+++ b/meteor/server/publications/partInstancesUI/reactiveContentCache.ts
@@ -0,0 +1,52 @@
+import { DBSegment } from '@sofie-automation/corelib/dist/dataModel/Segment'
+import { ReactiveCacheCollection } from '../lib/ReactiveCacheCollection'
+import { literal } from '@sofie-automation/corelib/dist/lib'
+import { MongoFieldSpecifierOnesStrict, MongoFieldSpecifierZeroes } from '@sofie-automation/corelib/dist/mongo'
+import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
+import { DBStudio } from '@sofie-automation/corelib/dist/dataModel/Studio'
+import { DBPartInstance } from '@sofie-automation/corelib/dist/dataModel/PartInstance'
+
+export type RundownPlaylistCompact = Pick<DBRundownPlaylist, '_id' | 'activationId' | 'quickLoop' | 'rundownIdsInOrder'>
+export const rundownPlaylistFieldSpecifier = literal<MongoFieldSpecifierOnesStrict<RundownPlaylistCompact>>({
+	_id: 1,
+	activationId: 1,
+	quickLoop: 1, // so that it invalidates when the markers or state of the loop change
+	rundownIdsInOrder: 1,
+})
+
+export type SegmentFields = '_id' | '_rank' | 'rundownId'
+export const segmentFieldSpecifier = literal<MongoFieldSpecifierOnesStrict<Pick<DBSegment, SegmentFields>>>({
+	_id: 1,
+	_rank: 1,
+	rundownId: 1,
+})
+
+export type PartInstanceOmitedFields = 'part.privateData'
+export const partInstanceFieldSpecifier = literal<MongoFieldSpecifierZeroes<DBPartInstance>>({
+	// @ts-expect-error Mongo typings aren't clever enough yet
+	'part.privateData': 0,
+})
+
+export type StudioFields = '_id' | 'settings'
+export const studioFieldSpecifier = literal<MongoFieldSpecifierOnesStrict<Pick<DBStudio, StudioFields>>>({
+	_id: 1,
+	settings: 1,
+})
+
+export interface ContentCache {
+	Studios: ReactiveCacheCollection<Pick<DBStudio, StudioFields>>
+	Segments: ReactiveCacheCollection<Pick<DBSegment, SegmentFields>>
+	PartInstances: ReactiveCacheCollection<Omit<DBPartInstance, PartInstanceOmitedFields>>
+	RundownPlaylists: ReactiveCacheCollection<RundownPlaylistCompact>
+}
+
+export function createReactiveContentCache(): ContentCache {
+	const cache: ContentCache = {
+		Studios: new ReactiveCacheCollection<Pick<DBStudio, StudioFields>>('studios'),
+		Segments: new ReactiveCacheCollection<Pick<DBSegment, SegmentFields>>('segments'),
+		PartInstances: new ReactiveCacheCollection<Omit<DBPartInstance, PartInstanceOmitedFields>>('partInstances'),
+		RundownPlaylists: new ReactiveCacheCollection<RundownPlaylistCompact>('rundownPlaylists'),
+	}
+
+	return cache
+}
diff --git a/meteor/server/publications/partInstancesUI/rundownContentObserver.ts b/meteor/server/publications/partInstancesUI/rundownContentObserver.ts
new file mode 100644
index 0000000000..aa405e9071
--- /dev/null
+++ b/meteor/server/publications/partInstancesUI/rundownContentObserver.ts
@@ -0,0 +1,79 @@
+import { Meteor } from 'meteor/meteor'
+import { RundownId, RundownPlaylistActivationId, StudioId } from '@sofie-automation/corelib/dist/dataModel/Ids'
+import { logger } from '../../logging'
+import {
+	ContentCache,
+	partInstanceFieldSpecifier,
+	rundownPlaylistFieldSpecifier,
+	segmentFieldSpecifier,
+	studioFieldSpecifier,
+} from './reactiveContentCache'
+import { PartInstances, RundownPlaylists, Segments, Studios } from '../../collections'
+
+export class RundownContentObserver {
+	#observers: Meteor.LiveQueryHandle[] = []
+	#cache: ContentCache
+
+	constructor(
+		studioId: StudioId,
+		playlistActivationId: RundownPlaylistActivationId,
+		rundownIds: RundownId[],
+		cache: ContentCache
+	) {
+		logger.silly(`Creating RundownContentObserver for rundowns "${rundownIds.join(',')}"`)
+		this.#cache = cache
+
+		this.#observers = [
+			Studios.observeChanges(
+				{
+					_id: studioId,
+				},
+				cache.Studios.link(),
+				{
+					fields: studioFieldSpecifier,
+				}
+			),
+			RundownPlaylists.observeChanges(
+				{
+					activationId: playlistActivationId,
+				},
+				cache.RundownPlaylists.link(),
+				{
+					fields: rundownPlaylistFieldSpecifier,
+				}
+			),
+			Segments.observeChanges(
+				{
+					rundownId: {
+						$in: rundownIds,
+					},
+				},
+				cache.Segments.link(),
+				{
+					projection: segmentFieldSpecifier,
+				}
+			),
+			PartInstances.observeChanges(
+				{
+					rundownId: {
+						$in: rundownIds,
+					},
+					playlistActivationId,
+					reset: { $ne: true },
+				},
+				cache.PartInstances.link(),
+				{
+					projection: partInstanceFieldSpecifier,
+				}
+			),
+		]
+	}
+
+	public get cache(): ContentCache {
+		return this.#cache
+	}
+
+	public dispose = (): void => {
+		this.#observers.forEach((observer) => observer.stop())
+	}
+}
diff --git a/meteor/server/publications/partsUI/publication.ts b/meteor/server/publications/partsUI/publication.ts
new file mode 100644
index 0000000000..1b36fe86a3
--- /dev/null
+++ b/meteor/server/publications/partsUI/publication.ts
@@ -0,0 +1,219 @@
+import { PartId, RundownPlaylistId, SegmentId } from '@sofie-automation/corelib/dist/dataModel/Ids'
+import { check } from 'meteor/check'
+import {
+	CustomPublishCollection,
+	TriggerUpdate,
+	meteorCustomPublish,
+	setUpCollectionOptimizedObserver,
+} from '../../lib/customPublication'
+import { logger } from '../../logging'
+import { CustomCollectionName, MeteorPubSub } from '@sofie-automation/meteor-lib/dist/api/pubsub'
+import { RundownPlaylistReadAccess } from '../../security/rundownPlaylist'
+import { resolveCredentials } from '../../security/lib/credentials'
+import { NoSecurityReadAccess } from '../../security/noSecurity'
+import { DBPart } from '@sofie-automation/corelib/dist/dataModel/Part'
+import { ContentCache, PartOmitedFields, createReactiveContentCache } from './reactiveContentCache'
+import { ReadonlyDeep } from 'type-fest'
+import { LiveQueryHandle } from '../../lib/lib'
+import { RundownPlaylists } from '../../collections'
+import { literal } from '@sofie-automation/corelib/dist/lib'
+import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
+import { MongoFieldSpecifierOnesStrict } from '@sofie-automation/corelib/dist/mongo'
+import { RundownsObserver } from '../lib/rundownsObserver'
+import { RundownContentObserver } from './rundownContentObserver'
+import { protectString } from '@sofie-automation/corelib/dist/protectedString'
+import { extractRanks, findMarkerPosition, modifyPartForQuickLoop, stringsToIndexLookup } from '../lib/quickLoop'
+
+interface UIPartsArgs {
+	readonly playlistId: RundownPlaylistId
+}
+
+export interface UIPartsState {
+	contentCache: ReadonlyDeep<ContentCache>
+}
+
+interface UIPartsUpdateProps {
+	newCache: ContentCache
+
+	invalidateSegmentIds: SegmentId[]
+	invalidatePartIds: PartId[]
+
+	invalidateQuickLoop: boolean
+}
+
+type RundownPlaylistFields = '_id' | 'studioId' | 'rundownIdsInOrder'
+const rundownPlaylistFieldSpecifier = literal<
+	MongoFieldSpecifierOnesStrict<Pick<DBRundownPlaylist, RundownPlaylistFields>>
+>({
+	_id: 1,
+	studioId: 1,
+	rundownIdsInOrder: 1,
+})
+
+async function setupUIPartsPublicationObservers(
+	args: ReadonlyDeep<UIPartsArgs>,
+	triggerUpdate: TriggerUpdate<UIPartsUpdateProps>
+): Promise<LiveQueryHandle[]> {
+	const playlist = (await RundownPlaylists.findOneAsync(args.playlistId, {
+		projection: rundownPlaylistFieldSpecifier,
+	})) as Pick<DBRundownPlaylist, RundownPlaylistFields> | undefined
+	if (!playlist) throw new Error(`RundownPlaylist "${args.playlistId}" not found!`)
+
+	const rundownsObserver = new RundownsObserver(playlist.studioId, playlist._id, (rundownIds) => {
+		logger.silly(`Creating new RundownContentObserver`)
+
+		const cache = createReactiveContentCache()
+
+		// Push update
+		triggerUpdate({ newCache: cache })
+
+		const obs1 = new RundownContentObserver(playlist.studioId, playlist._id, rundownIds, cache)
+
+		const innerQueries = [
+			cache.Segments.find({}).observeChanges({
+				added: (id) => triggerUpdate({ invalidateSegmentIds: [protectString(id)] }),
+				changed: (id) => triggerUpdate({ invalidateSegmentIds: [protectString(id)] }),
+				removed: (id) => triggerUpdate({ invalidateSegmentIds: [protectString(id)] }),
+			}),
+			cache.Parts.find({}).observe({
+				added: (doc) => triggerUpdate({ invalidatePartIds: [doc._id] }),
+				changed: (doc, oldDoc) => {
+					if (doc._rank !== oldDoc._rank) {
+						// with part rank change we need to invalidate the entire segment,
+						// as the order may affect which unchanged parts are/aren't in quickLoop
+						triggerUpdate({ invalidateSegmentIds: [doc.segmentId] })
+					} else {
+						triggerUpdate({ invalidatePartIds: [doc._id] })
+					}
+				},
+				removed: (doc) => triggerUpdate({ invalidatePartIds: [doc._id] }),
+			}),
+			cache.RundownPlaylists.find({}).observeChanges({
+				added: () => triggerUpdate({ invalidateQuickLoop: true }),
+				changed: () => triggerUpdate({ invalidateQuickLoop: true }),
+				removed: () => triggerUpdate({ invalidateQuickLoop: true }),
+			}),
+			cache.Studios.find({}).observeChanges({
+				added: () => triggerUpdate({ invalidateQuickLoop: true }),
+				changed: () => triggerUpdate({ invalidateQuickLoop: true }),
+				removed: () => triggerUpdate({ invalidateQuickLoop: true }),
+			}),
+		]
+
+		return () => {
+			obs1.dispose()
+
+			for (const query of innerQueries) {
+				query.stop()
+			}
+		}
+	})
+
+	// Set up observers:
+	return [rundownsObserver]
+}
+
+export async function manipulateUIPartsPublicationData(
+	_args: UIPartsArgs,
+	state: Partial<UIPartsState>,
+	collection: CustomPublishCollection<DBPart>,
+	updateProps: Partial<ReadonlyDeep<UIPartsUpdateProps>> | undefined
+): Promise<void> {
+	// Prepare data for publication:
+
+	if (updateProps?.newCache !== undefined) {
+		state.contentCache = updateProps.newCache ?? undefined
+	}
+
+	if (!state.contentCache) {
+		// Remove all the parts
+		collection.remove(null)
+
+		return
+	}
+
+	const playlist = state.contentCache.RundownPlaylists.findOne({})
+	if (!playlist) return
+
+	const studio = state.contentCache.Studios.findOne({})
+	if (!studio) return
+
+	const rundownRanks = stringsToIndexLookup(playlist.rundownIdsInOrder as unknown as string[])
+	const segmentRanks = extractRanks(state.contentCache.Segments.find({}).fetch())
+
+	const quickLoopStartPosition =
+		playlist.quickLoop?.start &&
+		findMarkerPosition(
+			playlist.quickLoop.start,
+			-Infinity,
+			state.contentCache.Segments,
+			{ parts: state.contentCache.Parts },
+			rundownRanks
+		)
+	const quickLoopEndPosition =
+		playlist.quickLoop?.end &&
+		findMarkerPosition(
+			playlist.quickLoop.end,
+			Infinity,
+			state.contentCache.Segments,
+			{ parts: state.contentCache.Parts },
+			rundownRanks
+		)
+
+	updateProps?.invalidatePartIds?.forEach((partId) => {
+		collection.remove(partId) // if it still exists, it will be replaced in the next step
+	})
+
+	const invalidatedSegmentsSet = new Set(updateProps?.invalidateSegmentIds ?? [])
+	const invalidatedPartsSet = new Set(updateProps?.invalidatePartIds ?? [])
+
+	state.contentCache.Parts.find({}).forEach((part) => {
+		if (
+			updateProps?.invalidateQuickLoop ||
+			invalidatedSegmentsSet.has(part.segmentId) ||
+			invalidatedPartsSet.has(part._id)
+		) {
+			modifyPartForQuickLoop(
+				part,
+				segmentRanks,
+				rundownRanks,
+				playlist,
+				studio,
+				quickLoopStartPosition,
+				quickLoopEndPosition
+			)
+			collection.replace(part)
+		}
+	})
+}
+
+meteorCustomPublish(
+	MeteorPubSub.uiParts,
+	CustomCollectionName.UIParts,
+	async function (pub, playlistId: RundownPlaylistId) {
+		check(playlistId, String)
+
+		const credentials = await resolveCredentials({ userId: this.userId, token: undefined })
+
+		if (
+			!credentials ||
+			NoSecurityReadAccess.any() ||
+			(await RundownPlaylistReadAccess.rundownPlaylistContent(playlistId, credentials))
+		) {
+			await setUpCollectionOptimizedObserver<
+				Omit<DBPart, PartOmitedFields>,
+				UIPartsArgs,
+				UIPartsState,
+				UIPartsUpdateProps
+			>(
+				`pub_${MeteorPubSub.uiParts}_${playlistId}`,
+				{ playlistId },
+				setupUIPartsPublicationObservers,
+				manipulateUIPartsPublicationData,
+				pub
+			)
+		} else {
+			logger.warn(`Pub.uiParts: Not allowed: "${playlistId}"`)
+		}
+	}
+)
diff --git a/meteor/server/publications/partsUI/reactiveContentCache.ts b/meteor/server/publications/partsUI/reactiveContentCache.ts
new file mode 100644
index 0000000000..13361fd51c
--- /dev/null
+++ b/meteor/server/publications/partsUI/reactiveContentCache.ts
@@ -0,0 +1,51 @@
+import { DBPart } from '@sofie-automation/corelib/dist/dataModel/Part'
+import { DBSegment } from '@sofie-automation/corelib/dist/dataModel/Segment'
+import { ReactiveCacheCollection } from '../lib/ReactiveCacheCollection'
+import { literal } from '@sofie-automation/corelib/dist/lib'
+import { MongoFieldSpecifierOnesStrict, MongoFieldSpecifierZeroes } from '@sofie-automation/corelib/dist/mongo'
+import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
+import { DBStudio } from '@sofie-automation/corelib/dist/dataModel/Studio'
+
+export type RundownPlaylistCompact = Pick<DBRundownPlaylist, '_id' | 'activationId' | 'quickLoop' | 'rundownIdsInOrder'>
+export const rundownPlaylistFieldSpecifier = literal<MongoFieldSpecifierOnesStrict<RundownPlaylistCompact>>({
+	_id: 1,
+	activationId: 1,
+	quickLoop: 1, // so that it invalidates when the markers or state of the loop change
+	rundownIdsInOrder: 1,
+})
+
+export type SegmentFields = '_id' | '_rank' | 'rundownId'
+export const segmentFieldSpecifier = literal<MongoFieldSpecifierOnesStrict<Pick<DBSegment, SegmentFields>>>({
+	_id: 1,
+	_rank: 1,
+	rundownId: 1,
+})
+
+export type PartOmitedFields = 'privateData'
+export const partFieldSpecifier = literal<MongoFieldSpecifierZeroes<Pick<DBPart, PartOmitedFields>>>({
+	privateData: 0,
+})
+
+export type StudioFields = '_id' | 'settings'
+export const studioFieldSpecifier = literal<MongoFieldSpecifierOnesStrict<Pick<DBStudio, StudioFields>>>({
+	_id: 1,
+	settings: 1,
+})
+
+export interface ContentCache {
+	Studios: ReactiveCacheCollection<Pick<DBStudio, StudioFields>>
+	Segments: ReactiveCacheCollection<Pick<DBSegment, SegmentFields>>
+	Parts: ReactiveCacheCollection<Omit<DBPart, PartOmitedFields>>
+	RundownPlaylists: ReactiveCacheCollection<RundownPlaylistCompact>
+}
+
+export function createReactiveContentCache(): ContentCache {
+	const cache: ContentCache = {
+		Studios: new ReactiveCacheCollection<Pick<DBStudio, StudioFields>>('studios'),
+		Segments: new ReactiveCacheCollection<Pick<DBSegment, SegmentFields>>('segments'),
+		Parts: new ReactiveCacheCollection<Omit<DBPart, PartOmitedFields>>('parts'),
+		RundownPlaylists: new ReactiveCacheCollection<RundownPlaylistCompact>('rundownPlaylists'),
+	}
+
+	return cache
+}
diff --git a/meteor/server/publications/partsUI/rundownContentObserver.ts b/meteor/server/publications/partsUI/rundownContentObserver.ts
new file mode 100644
index 0000000000..e9de9dd780
--- /dev/null
+++ b/meteor/server/publications/partsUI/rundownContentObserver.ts
@@ -0,0 +1,72 @@
+import { Meteor } from 'meteor/meteor'
+import { RundownId, RundownPlaylistId, StudioId } from '@sofie-automation/corelib/dist/dataModel/Ids'
+import { logger } from '../../logging'
+import {
+	ContentCache,
+	partFieldSpecifier,
+	rundownPlaylistFieldSpecifier,
+	segmentFieldSpecifier,
+	studioFieldSpecifier,
+} from './reactiveContentCache'
+import { Parts, RundownPlaylists, Segments, Studios } from '../../collections'
+
+export class RundownContentObserver {
+	#observers: Meteor.LiveQueryHandle[] = []
+	#cache: ContentCache
+
+	constructor(studioId: StudioId, playlistId: RundownPlaylistId, rundownIds: RundownId[], cache: ContentCache) {
+		logger.silly(`Creating RundownContentObserver for rundowns "${rundownIds.join(',')}"`)
+		this.#cache = cache
+
+		this.#observers = [
+			Studios.observeChanges(
+				{
+					_id: studioId,
+				},
+				cache.Studios.link(),
+				{
+					fields: studioFieldSpecifier,
+				}
+			),
+			RundownPlaylists.observeChanges(
+				{
+					_id: playlistId,
+				},
+				cache.RundownPlaylists.link(),
+				{
+					fields: rundownPlaylistFieldSpecifier,
+				}
+			),
+			Segments.observeChanges(
+				{
+					rundownId: {
+						$in: rundownIds,
+					},
+				},
+				cache.Segments.link(),
+				{
+					projection: segmentFieldSpecifier,
+				}
+			),
+			Parts.observeChanges(
+				{
+					rundownId: {
+						$in: rundownIds,
+					},
+				},
+				cache.Parts.link(),
+				{
+					projection: partFieldSpecifier,
+				}
+			),
+		]
+	}
+
+	public get cache(): ContentCache {
+		return this.#cache
+	}
+
+	public dispose = (): void => {
+		this.#observers.forEach((observer) => observer.stop())
+	}
+}
diff --git a/meteor/server/publications/peripheralDevice.ts b/meteor/server/publications/peripheralDevice.ts
index d4faa320be..61588d0e90 100644
--- a/meteor/server/publications/peripheralDevice.ts
+++ b/meteor/server/publications/peripheralDevice.ts
@@ -1,7 +1,7 @@
 import { Meteor } from 'meteor/meteor'
-import { check, Match } from '../../lib/check'
+import { check, Match } from '../lib/check'
 import { meteorPublish, AutoFillSelector } from './lib'
-import { MeteorPubSub } from '../../lib/api/pubsub'
+import { MeteorPubSub } from '@sofie-automation/meteor-lib/dist/api/pubsub'
 import { PeripheralDeviceReadAccess } from '../security/peripheralDevice'
 import { PeripheralDevice } from '@sofie-automation/corelib/dist/dataModel/PeripheralDevice'
 import { OrganizationReadAccess } from '../security/organization'
diff --git a/meteor/server/publications/pieceContentStatusUI/__tests__/checkPieceContentStatus.test.ts b/meteor/server/publications/pieceContentStatusUI/__tests__/checkPieceContentStatus.test.ts
index 2bccbdc04d..f0d34355f5 100644
--- a/meteor/server/publications/pieceContentStatusUI/__tests__/checkPieceContentStatus.test.ts
+++ b/meteor/server/publications/pieceContentStatusUI/__tests__/checkPieceContentStatus.test.ts
@@ -5,6 +5,7 @@ import {
 	getMediaObjectMediaId,
 	PieceContentStreamInfo,
 	checkPieceContentStatusAndDependencies,
+	PieceContentStatusStudio,
 } from '../checkPieceContentStatus'
 import {
 	PackageInfo,
@@ -31,12 +32,10 @@ import {
 	MediaStream,
 	MediaStreamType,
 } from '@sofie-automation/shared-lib/dist/core/model/MediaObjects'
-import { UIStudio } from '../../../../lib/api/studios'
 import { defaultStudio } from '../../../../__mocks__/defaultCollectionObjects'
 import { testInFiber } from '../../../../__mocks__/helpers/jest'
 import { MediaObjects } from '../../../collections'
 import { PieceDependencies } from '../common'
-import { DBStudio } from '@sofie-automation/corelib/dist/dataModel/Studio'
 import { DEFAULT_MINIMUM_TAKE_SPAN } from '@sofie-automation/shared-lib/dist/core/constants'
 
 const mockMediaObjectsCollection = MongoMock.getInnerMockCollection<MediaObject>(MediaObjects)
@@ -174,20 +173,14 @@ describe('lib/mediaObjects', () => {
 		}
 
 		const mockDefaultStudio = defaultStudio(protectString('studio0'))
-		const mockStudio: Complete<
-			Pick<
-				DBStudio,
-				'_id' | 'settings' | 'packageContainers' | 'previewContainerIds' | 'thumbnailContainerIds' | 'routeSets'
-			> &
-				Pick<UIStudio, 'mappings'>
-		> = {
+		const mockStudio: Complete<PieceContentStatusStudio> = {
 			_id: mockDefaultStudio._id,
 			settings: mockStudioSettings,
-			packageContainers: mockDefaultStudio.packageContainers,
 			previewContainerIds: ['previews0'],
 			thumbnailContainerIds: ['thumbnails0'],
-			routeSets: mockDefaultStudio.routeSets,
+			routeSets: applyAndValidateOverrides(mockDefaultStudio.routeSetsWithOverrides).obj,
 			mappings: applyAndValidateOverrides(mockDefaultStudio.mappingsWithOverrides).obj,
+			packageContainers: applyAndValidateOverrides(mockDefaultStudio.packageContainersWithOverrides).obj,
 		}
 
 		mockMediaObjectsCollection.insert(
diff --git a/meteor/server/publications/pieceContentStatusUI/bucket/bucketContentObserver.ts b/meteor/server/publications/pieceContentStatusUI/bucket/bucketContentObserver.ts
index f5f116ae78..28ab518c81 100644
--- a/meteor/server/publications/pieceContentStatusUI/bucket/bucketContentObserver.ts
+++ b/meteor/server/publications/pieceContentStatusUI/bucket/bucketContentObserver.ts
@@ -11,7 +11,8 @@ import {
 } from './bucketContentCache'
 import { BucketAdLibActions, BucketAdLibs, ShowStyleBases } from '../../../collections'
 import { DBShowStyleBase } from '@sofie-automation/corelib/dist/dataModel/ShowStyleBase'
-import { equivalentArrays, waitForPromise } from '../../../../lib/lib'
+import { waitForPromise } from '../../../lib/lib'
+import { equivalentArrays } from '@sofie-automation/shared-lib/dist/lib/lib'
 import { applyAndValidateOverrides } from '@sofie-automation/corelib/dist/settings/objectWithOverrides'
 import { ReactiveMongoObserverGroup, ReactiveMongoObserverGroupHandle } from '../../lib/observerGroup'
 import _ from 'underscore'
diff --git a/meteor/server/publications/pieceContentStatusUI/bucket/publication.ts b/meteor/server/publications/pieceContentStatusUI/bucket/publication.ts
index c17f97df46..d1ecc15ed8 100644
--- a/meteor/server/publications/pieceContentStatusUI/bucket/publication.ts
+++ b/meteor/server/publications/pieceContentStatusUI/bucket/publication.ts
@@ -9,10 +9,10 @@ import {
 } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import { MongoFieldSpecifierOnesStrict } from '@sofie-automation/corelib/dist/mongo'
 import { ReadonlyDeep } from 'type-fest'
-import { CustomCollectionName, MeteorPubSub } from '../../../../lib/api/pubsub'
-import { UIBucketContentStatus } from '../../../../lib/api/rundownNotifications'
+import { CustomCollectionName, MeteorPubSub } from '@sofie-automation/meteor-lib/dist/api/pubsub'
+import { UIBucketContentStatus } from '@sofie-automation/meteor-lib/dist/api/rundownNotifications'
 import { Buckets, MediaObjects, PackageContainerPackageStatuses, PackageInfos, Studios } from '../../../collections'
-import { literal, protectString } from '../../../../lib/lib'
+import { literal, protectString } from '../../../lib/tempLib'
 import {
 	CustomPublishCollection,
 	meteorCustomPublish,
@@ -25,7 +25,7 @@ import { NoSecurityReadAccess } from '../../../security/noSecurity'
 import { BucketContentCache, createReactiveContentCache } from './bucketContentCache'
 import { LiveQueryHandle } from '../../../lib/lib'
 import { StudioReadAccess } from '../../../security/studio'
-import { Bucket } from '../../../../lib/collections/Buckets'
+import { Bucket } from '@sofie-automation/meteor-lib/dist/collections/Buckets'
 import {
 	addItemsWithDependenciesChangesToChangedSet,
 	fetchStudio,
diff --git a/meteor/server/publications/pieceContentStatusUI/bucket/regenerateForItem.ts b/meteor/server/publications/pieceContentStatusUI/bucket/regenerateForItem.ts
index 1f24cfb405..28f9996888 100644
--- a/meteor/server/publications/pieceContentStatusUI/bucket/regenerateForItem.ts
+++ b/meteor/server/publications/pieceContentStatusUI/bucket/regenerateForItem.ts
@@ -1,7 +1,7 @@
 import { BucketAdLibActionId, BucketAdLibId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import { ReadonlyDeep } from 'type-fest'
-import { UIBucketContentStatus } from '../../../../lib/api/rundownNotifications'
-import { literal, protectString } from '../../../../lib/lib'
+import { UIBucketContentStatus } from '@sofie-automation/meteor-lib/dist/api/rundownNotifications'
+import { literal, protectString } from '../../../lib/tempLib'
 import { CustomPublishCollection } from '../../../lib/customPublication'
 import { BucketContentCache } from './bucketContentCache'
 import { PieceDependencies } from '../common'
diff --git a/meteor/server/publications/pieceContentStatusUI/checkPieceContentStatus.ts b/meteor/server/publications/pieceContentStatusUI/checkPieceContentStatus.ts
index 4f7ed3e352..987d865031 100644
--- a/meteor/server/publications/pieceContentStatusUI/checkPieceContentStatus.ts
+++ b/meteor/server/publications/pieceContentStatusUI/checkPieceContentStatus.ts
@@ -24,14 +24,15 @@ import {
 	MappingsExt,
 	ResultingMappingRoutes,
 	StudioPackageContainer,
+	StudioRouteSet,
 } from '@sofie-automation/corelib/dist/dataModel/Studio'
 import { literal, Complete, assertNever } from '@sofie-automation/corelib/dist/lib'
 import { ReadonlyDeep } from 'type-fest'
 import _ from 'underscore'
-import { getSideEffect } from '../../../lib/collections/ExpectedPackages'
-import { getActiveRoutes, getRoutedMappings } from '../../../lib/collections/Studios'
-import { ensureHasTrailingSlash, generateTranslation, unprotectString } from '../../../lib/lib'
-import { PieceContentStatusObj } from '../../../lib/api/pieceContentStatus'
+import { getSideEffect } from '@sofie-automation/meteor-lib/dist/collections/ExpectedPackages'
+import { getActiveRoutes, getRoutedMappings } from '@sofie-automation/meteor-lib/dist/collections/Studios'
+import { ensureHasTrailingSlash, generateTranslation, unprotectString } from '../../lib/tempLib'
+import { PieceContentStatusObj } from '@sofie-automation/meteor-lib/dist/api/pieceContentStatus'
 import { MediaObjects, PackageContainerPackageStatuses, PackageInfos } from '../../collections'
 import {
 	mediaObjectFieldSpecifier,
@@ -172,12 +173,15 @@ export type PieceContentStatusPiece = Pick<PieceGeneric, '_id' | 'content' | 'ex
 	pieceInstanceId?: PieceInstanceId
 }
 export interface PieceContentStatusStudio
-	extends Pick<
-		DBStudio,
-		'_id' | 'settings' | 'packageContainers' | 'previewContainerIds' | 'thumbnailContainerIds' | 'routeSets'
-	> {
+	extends Pick<DBStudio, '_id' | 'settings' | 'previewContainerIds' | 'thumbnailContainerIds'> {
 	/** Mappings between the physical devices / outputs and logical ones */
 	mappings: MappingsExt
+	/** Route sets with overrides */
+	routeSets: Record<string, StudioRouteSet>
+	/** Contains settings for which Package Containers are present in the studio.
+	 * (These are used by the Package Manager and the Expected Packages)
+	 */
+	packageContainers: Record<string, StudioPackageContainer>
 }
 
 export async function checkPieceContentStatusAndDependencies(
@@ -557,7 +561,7 @@ async function checkPieceContentExpectedPackageStatus(
 						const sideEffect = getSideEffect(expectedPackage, studio)
 
 						thumbnailUrl = await getAssetUrlFromPackageContainerStatus(
-							studio,
+							studio.packageContainers,
 							getPackageContainerPackageStatus,
 							expectedPackageId,
 							sideEffect.thumbnailContainerId,
@@ -569,7 +573,7 @@ async function checkPieceContentExpectedPackageStatus(
 						const sideEffect = getSideEffect(expectedPackage, studio)
 
 						previewUrl = await getAssetUrlFromPackageContainerStatus(
-							studio,
+							studio.packageContainers,
 							getPackageContainerPackageStatus,
 							expectedPackageId,
 							sideEffect.previewContainerId,
@@ -716,7 +720,7 @@ async function checkPieceContentExpectedPackageStatus(
 }
 
 async function getAssetUrlFromPackageContainerStatus(
-	studio: PieceContentStatusStudio,
+	packageContainers: Record<string, StudioPackageContainer>,
 	getPackageContainerPackageStatus: (
 		packageContainerId: string,
 		expectedPackageId: ExpectedPackageId
@@ -727,7 +731,7 @@ async function getAssetUrlFromPackageContainerStatus(
 ): Promise<string | undefined> {
 	if (!assetContainerId || !packageAssetPath) return
 
-	const assetPackageContainer = studio.packageContainers[assetContainerId]
+	const assetPackageContainer = packageContainers[assetContainerId]
 	if (!assetPackageContainer) return
 
 	const previewPackageOnPackageContainer = await getPackageContainerPackageStatus(assetContainerId, expectedPackageId)
diff --git a/meteor/server/publications/pieceContentStatusUI/common.ts b/meteor/server/publications/pieceContentStatusUI/common.ts
index 962dae251b..591f1eb16e 100644
--- a/meteor/server/publications/pieceContentStatusUI/common.ts
+++ b/meteor/server/publications/pieceContentStatusUI/common.ts
@@ -7,26 +7,26 @@ import { applyAndValidateOverrides } from '@sofie-automation/corelib/dist/settin
 import { MediaObject } from '@sofie-automation/shared-lib/dist/core/model/MediaObjects'
 import { ReadonlyDeep } from 'type-fest'
 import { DBStudio } from '@sofie-automation/corelib/dist/dataModel/Studio'
-import { literal } from '../../../lib/lib'
+import { literal } from '../../lib/tempLib'
 import { Studios } from '../../collections'
 import { PieceContentStatusStudio } from './checkPieceContentStatus'
 
 export type StudioFields =
 	| '_id'
 	| 'settings'
-	| 'packageContainers'
+	| 'packageContainersWithOverrides'
 	| 'previewContainerIds'
 	| 'thumbnailContainerIds'
 	| 'mappingsWithOverrides'
-	| 'routeSets'
+	| 'routeSetsWithOverrides'
 export const studioFieldSpecifier = literal<MongoFieldSpecifierOnesStrict<Pick<DBStudio, StudioFields>>>({
 	_id: 1,
 	settings: 1,
-	packageContainers: 1,
+	packageContainersWithOverrides: 1,
 	previewContainerIds: 1,
 	thumbnailContainerIds: 1,
 	mappingsWithOverrides: 1,
-	routeSets: 1,
+	routeSetsWithOverrides: 1,
 })
 
 export type PackageContainerPackageStatusLight = Pick<PackageContainerPackageStatusDB, '_id' | 'studioId' | 'status'>
@@ -113,10 +113,10 @@ export async function fetchStudio(studioId: StudioId): Promise<PieceContentStatu
 	return {
 		_id: studio._id,
 		settings: studio.settings,
-		packageContainers: studio.packageContainers,
 		previewContainerIds: studio.previewContainerIds,
 		thumbnailContainerIds: studio.thumbnailContainerIds,
 		mappings: applyAndValidateOverrides(studio.mappingsWithOverrides).obj,
-		routeSets: studio.routeSets,
+		routeSets: applyAndValidateOverrides(studio.routeSetsWithOverrides).obj,
+		packageContainers: applyAndValidateOverrides(studio.packageContainersWithOverrides).obj,
 	}
 }
diff --git a/meteor/server/publications/pieceContentStatusUI/rundown/publication.ts b/meteor/server/publications/pieceContentStatusUI/rundown/publication.ts
index 5b1871d32e..9b4941e087 100644
--- a/meteor/server/publications/pieceContentStatusUI/rundown/publication.ts
+++ b/meteor/server/publications/pieceContentStatusUI/rundown/publication.ts
@@ -13,8 +13,8 @@ import {
 } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import { MongoFieldSpecifierOnesStrict } from '@sofie-automation/corelib/dist/mongo'
 import { ReadonlyDeep } from 'type-fest'
-import { CustomCollectionName, MeteorPubSub } from '../../../../lib/api/pubsub'
-import { UIPieceContentStatus } from '../../../../lib/api/rundownNotifications'
+import { CustomCollectionName, MeteorPubSub } from '@sofie-automation/meteor-lib/dist/api/pubsub'
+import { UIPieceContentStatus } from '@sofie-automation/meteor-lib/dist/api/rundownNotifications'
 import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
 import {
 	MediaObjects,
@@ -23,7 +23,7 @@ import {
 	RundownPlaylists,
 	Studios,
 } from '../../../collections'
-import { literal, protectString } from '../../../../lib/lib'
+import { literal, protectString } from '../../../lib/tempLib'
 import {
 	CustomPublishCollection,
 	meteorCustomPublish,
diff --git a/meteor/server/publications/pieceContentStatusUI/rundown/regenerateItems.ts b/meteor/server/publications/pieceContentStatusUI/rundown/regenerateItems.ts
index 8ea1221efc..481b64d978 100644
--- a/meteor/server/publications/pieceContentStatusUI/rundown/regenerateItems.ts
+++ b/meteor/server/publications/pieceContentStatusUI/rundown/regenerateItems.ts
@@ -6,8 +6,8 @@ import {
 	RundownBaselineAdLibActionId,
 } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import { ReadonlyDeep } from 'type-fest'
-import { UIPieceContentStatus } from '../../../../lib/api/rundownNotifications'
-import { literal, protectString } from '../../../../lib/lib'
+import { UIPieceContentStatus } from '@sofie-automation/meteor-lib/dist/api/rundownNotifications'
+import { literal, protectString } from '../../../lib/tempLib'
 import { CustomPublishCollection } from '../../../lib/customPublication'
 import { ContentCache } from './reactiveContentCache'
 import { wrapTranslatableMessageFromBlueprintsIfNotString } from '@sofie-automation/corelib/dist/TranslatableMessage'
diff --git a/meteor/server/publications/pieceContentStatusUI/rundown/rundownContentObserver.ts b/meteor/server/publications/pieceContentStatusUI/rundown/rundownContentObserver.ts
index 383d806528..26d836aaa9 100644
--- a/meteor/server/publications/pieceContentStatusUI/rundown/rundownContentObserver.ts
+++ b/meteor/server/publications/pieceContentStatusUI/rundown/rundownContentObserver.ts
@@ -29,10 +29,11 @@ import {
 	ShowStyleBases,
 } from '../../../collections'
 import { DBShowStyleBase } from '@sofie-automation/corelib/dist/dataModel/ShowStyleBase'
-import { equivalentArrays, waitForPromise } from '../../../../lib/lib'
 import { applyAndValidateOverrides } from '@sofie-automation/corelib/dist/settings/objectWithOverrides'
 import { ReactiveMongoObserverGroup, ReactiveMongoObserverGroupHandle } from '../../lib/observerGroup'
 import _ from 'underscore'
+import { equivalentArrays } from '@sofie-automation/shared-lib/dist/lib/lib'
+import { waitForPromise } from '../../../lib/lib'
 
 const REACTIVITY_DEBOUNCE = 20
 
diff --git a/meteor/server/publications/rundown.ts b/meteor/server/publications/rundown.ts
index 855d9724a2..9c56b681f9 100644
--- a/meteor/server/publications/rundown.ts
+++ b/meteor/server/publications/rundown.ts
@@ -1,6 +1,6 @@
 import { Meteor } from 'meteor/meteor'
 import { meteorPublish, AutoFillSelector } from './lib'
-import { MeteorPubSub } from '../../lib/api/pubsub'
+import { MeteorPubSub } from '@sofie-automation/meteor-lib/dist/api/pubsub'
 import { MongoFieldSpecifierZeroes, MongoQuery } from '@sofie-automation/corelib/dist/mongo'
 import { AdLibPiece } from '@sofie-automation/corelib/dist/dataModel/AdLibPiece'
 import { RundownReadAccess } from '../security/rundown'
@@ -12,7 +12,7 @@ import { NoSecurityReadAccess } from '../security/noSecurity'
 import { OrganizationReadAccess } from '../security/organization'
 import { StudioReadAccess } from '../security/studio'
 import { check, Match } from 'meteor/check'
-import { FindOptions } from '../../lib/collections/lib'
+import { FindOptions } from '@sofie-automation/meteor-lib/dist/collections/lib'
 import {
 	AdLibActions,
 	AdLibPieces,
@@ -39,7 +39,6 @@ import {
 	RundownPlaylistActivationId,
 	RundownPlaylistId,
 	SegmentId,
-	SegmentPlayoutId,
 	ShowStyleBaseId,
 } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import { DBPartInstance } from '@sofie-automation/corelib/dist/dataModel/PartInstance'
@@ -278,36 +277,6 @@ meteorPublish(
 		return null
 	}
 )
-meteorPublish(
-	CorelibPubSub.partInstancesForSegmentPlayout,
-	async function (rundownId: RundownId, segmentPlayoutId: SegmentPlayoutId, token: string | undefined) {
-		if (!rundownId) throw new Meteor.Error(400, 'rundownId argument missing')
-		if (!segmentPlayoutId) throw new Meteor.Error(400, 'segmentPlayoutId argument missing')
-
-		if (
-			NoSecurityReadAccess.any() ||
-			(await RundownReadAccess.rundownContent(rundownId, { userId: this.userId, token }))
-		) {
-			return PartInstances.findWithCursor(
-				{
-					rundownId,
-					segmentPlayoutId,
-				},
-				{
-					fields: {
-						// @ts-expect-error Mongo typings aren't clever enough yet
-						'part.privateData': 0,
-					},
-					sort: {
-						takeCount: 1,
-					},
-					limit: 1,
-				}
-			)
-		}
-		return null
-	}
-)
 
 const piecesSubFields: MongoFieldSpecifierZeroes<Piece> = {
 	privateData: 0,
diff --git a/meteor/server/publications/rundownPlaylist.ts b/meteor/server/publications/rundownPlaylist.ts
index 7fb50d56c7..b8b3cbe69a 100644
--- a/meteor/server/publications/rundownPlaylist.ts
+++ b/meteor/server/publications/rundownPlaylist.ts
@@ -7,10 +7,10 @@ import { isProtectedString } from '@sofie-automation/corelib/dist/protectedStrin
 import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
 import { RundownPlaylists } from '../collections'
 import { CorelibPubSub } from '@sofie-automation/corelib/dist/pubsub'
-import { MeteorPubSub } from '../../lib/api/pubsub'
+import { MeteorPubSub } from '@sofie-automation/meteor-lib/dist/api/pubsub'
 import { RundownPlaylistId, StudioId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import { resolveCredentials } from '../security/lib/credentials'
-import { check, Match } from '../../lib/check'
+import { check, Match } from '../lib/check'
 import { MongoQuery } from '@sofie-automation/corelib/dist/mongo'
 
 meteorPublish(
diff --git a/meteor/server/publications/segmentPartNotesUI/__tests__/generateNotesForSegment.test.ts b/meteor/server/publications/segmentPartNotesUI/__tests__/generateNotesForSegment.test.ts
index 3aad53787b..5c38d01699 100644
--- a/meteor/server/publications/segmentPartNotesUI/__tests__/generateNotesForSegment.test.ts
+++ b/meteor/server/publications/segmentPartNotesUI/__tests__/generateNotesForSegment.test.ts
@@ -6,9 +6,9 @@ import { DBPartInstance } from '@sofie-automation/corelib/dist/dataModel/PartIns
 import { SegmentOrphanedReason } from '@sofie-automation/corelib/dist/dataModel/Segment'
 import { clone, getRandomId, literal } from '@sofie-automation/corelib/dist/lib'
 import { protectString } from '@sofie-automation/corelib/dist/protectedString'
-import { UISegmentPartNote } from '../../../../lib/api/rundownNotifications'
+import { UISegmentPartNote } from '@sofie-automation/meteor-lib/dist/api/rundownNotifications'
 import { DBSegment } from '@sofie-automation/corelib/dist/dataModel/Segment'
-import { generateTranslation } from '../../../../lib/lib'
+import { generateTranslation } from '../../../lib/tempLib'
 import { generateNotesForSegment } from '../generateNotesForSegment'
 import { PartFields, PartInstanceFields, SegmentFields } from '../reactiveContentCache'
 
diff --git a/meteor/server/publications/segmentPartNotesUI/__tests__/publication.test.ts b/meteor/server/publications/segmentPartNotesUI/__tests__/publication.test.ts
index ffefb00ad3..a7f9023aae 100644
--- a/meteor/server/publications/segmentPartNotesUI/__tests__/publication.test.ts
+++ b/meteor/server/publications/segmentPartNotesUI/__tests__/publication.test.ts
@@ -1,6 +1,6 @@
 import { RundownId, RundownPlaylistId, SegmentId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import { ProtectedString, protectString } from '@sofie-automation/corelib/dist/protectedString'
-import { UISegmentPartNote } from '../../../../lib/api/rundownNotifications'
+import { UISegmentPartNote } from '@sofie-automation/meteor-lib/dist/api/rundownNotifications'
 import { testInFiber } from '../../../../__mocks__/helpers/jest'
 import { CustomPublishCollection } from '../../../lib/customPublication'
 import { ReactiveCacheCollection } from '../../lib/ReactiveCacheCollection'
diff --git a/meteor/server/publications/segmentPartNotesUI/generateNotesForSegment.ts b/meteor/server/publications/segmentPartNotesUI/generateNotesForSegment.ts
index 293e32c3a4..6929151848 100644
--- a/meteor/server/publications/segmentPartNotesUI/generateNotesForSegment.ts
+++ b/meteor/server/publications/segmentPartNotesUI/generateNotesForSegment.ts
@@ -6,9 +6,9 @@ import { SegmentOrphanedReason } from '@sofie-automation/corelib/dist/dataModel/
 import { literal } from '@sofie-automation/corelib/dist/lib'
 import { protectString } from '@sofie-automation/corelib/dist/protectedString'
 import { assertNever } from '@sofie-automation/shared-lib/dist/lib/lib'
-import { UISegmentPartNote } from '../../../lib/api/rundownNotifications'
+import { UISegmentPartNote } from '@sofie-automation/meteor-lib/dist/api/rundownNotifications'
 import { DBSegment } from '@sofie-automation/corelib/dist/dataModel/Segment'
-import { generateTranslation } from '../../../lib/lib'
+import { generateTranslation } from '../../lib/tempLib'
 import { SegmentFields, PartFields, PartInstanceFields } from './reactiveContentCache'
 
 export function generateNotesForSegment(
diff --git a/meteor/server/publications/segmentPartNotesUI/publication.ts b/meteor/server/publications/segmentPartNotesUI/publication.ts
index 36c7d0d800..dd71797d5f 100644
--- a/meteor/server/publications/segmentPartNotesUI/publication.ts
+++ b/meteor/server/publications/segmentPartNotesUI/publication.ts
@@ -1,13 +1,13 @@
 import { RundownId, RundownPlaylistId, SegmentId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import { MongoFieldSpecifierOnesStrict } from '@sofie-automation/corelib/dist/mongo'
 import { ReadonlyDeep } from 'type-fest'
-import { CustomCollectionName, MeteorPubSub } from '../../../lib/api/pubsub'
-import { UISegmentPartNote } from '../../../lib/api/rundownNotifications'
+import { CustomCollectionName, MeteorPubSub } from '@sofie-automation/meteor-lib/dist/api/pubsub'
+import { UISegmentPartNote } from '@sofie-automation/meteor-lib/dist/api/rundownNotifications'
 import { DBPartInstance } from '@sofie-automation/corelib/dist/dataModel/PartInstance'
 import { DBPart } from '@sofie-automation/corelib/dist/dataModel/Part'
 import { Rundown, getRundownNrcsName } from '@sofie-automation/corelib/dist/dataModel/Rundown'
 import { DBSegment } from '@sofie-automation/corelib/dist/dataModel/Segment'
-import { groupByToMap, literal, normalizeArrayToMap, protectString } from '../../../lib/lib'
+import { groupByToMap, literal, normalizeArrayToMap, protectString } from '../../lib/tempLib'
 import {
 	CustomPublishCollection,
 	meteorCustomPublish,
diff --git a/meteor/server/publications/segmentPartNotesUI/reactiveContentCache.ts b/meteor/server/publications/segmentPartNotesUI/reactiveContentCache.ts
index ca8b050e01..5c0cb699a3 100644
--- a/meteor/server/publications/segmentPartNotesUI/reactiveContentCache.ts
+++ b/meteor/server/publications/segmentPartNotesUI/reactiveContentCache.ts
@@ -4,7 +4,7 @@ import { ReactiveCacheCollection } from '../lib/ReactiveCacheCollection'
 import { literal } from '@sofie-automation/corelib/dist/lib'
 import { MongoFieldSpecifierOnesStrict } from '@sofie-automation/corelib/dist/mongo'
 import { Rundown } from '@sofie-automation/corelib/dist/dataModel/Rundown'
-import { PartInstance } from '../../../lib/collections/PartInstances'
+import { PartInstance } from '@sofie-automation/meteor-lib/dist/collections/PartInstances'
 
 export type RundownFields = '_id' | 'playlistId' | 'source'
 export const rundownFieldSpecifier = literal<MongoFieldSpecifierOnesStrict<Pick<Rundown, RundownFields>>>({
diff --git a/meteor/server/publications/showStyle.ts b/meteor/server/publications/showStyle.ts
index 3afc531326..bd75548151 100644
--- a/meteor/server/publications/showStyle.ts
+++ b/meteor/server/publications/showStyle.ts
@@ -1,17 +1,17 @@
 import { meteorPublish, AutoFillSelector } from './lib'
-import { MeteorPubSub } from '../../lib/api/pubsub'
+import { MeteorPubSub } from '@sofie-automation/meteor-lib/dist/api/pubsub'
 import { DBShowStyleBase } from '@sofie-automation/corelib/dist/dataModel/ShowStyleBase'
 import { DBShowStyleVariant } from '@sofie-automation/corelib/dist/dataModel/ShowStyleVariant'
-import { RundownLayoutBase } from '../../lib/collections/RundownLayouts'
+import { RundownLayoutBase } from '@sofie-automation/meteor-lib/dist/collections/RundownLayouts'
 import { ShowStyleReadAccess } from '../security/showStyle'
 import { OrganizationReadAccess } from '../security/organization'
 import { NoSecurityReadAccess } from '../security/noSecurity'
 import { RundownLayouts, ShowStyleBases, ShowStyleVariants, TriggeredActions } from '../collections'
 import { MongoQuery } from '@sofie-automation/corelib/dist/mongo'
-import { DBTriggeredActions } from '../../lib/collections/TriggeredActions'
+import { DBTriggeredActions } from '@sofie-automation/meteor-lib/dist/collections/TriggeredActions'
 import { CorelibPubSub } from '@sofie-automation/corelib/dist/pubsub'
 import { ShowStyleBaseId, ShowStyleVariantId } from '@sofie-automation/corelib/dist/dataModel/Ids'
-import { check, Match } from '../../lib/check'
+import { check, Match } from '../lib/check'
 
 meteorPublish(
 	CorelibPubSub.showStyleBases,
diff --git a/meteor/server/publications/showStyleUI.ts b/meteor/server/publications/showStyleUI.ts
index 269ae04700..7888357843 100644
--- a/meteor/server/publications/showStyleUI.ts
+++ b/meteor/server/publications/showStyleUI.ts
@@ -3,10 +3,10 @@ import { MongoFieldSpecifierOnesStrict } from '@sofie-automation/corelib/dist/mo
 import { applyAndValidateOverrides } from '@sofie-automation/corelib/dist/settings/objectWithOverrides'
 import { Meteor } from 'meteor/meteor'
 import { ReadonlyDeep } from 'type-fest'
-import { CustomCollectionName, MeteorPubSub } from '../../lib/api/pubsub'
-import { UIShowStyleBase } from '../../lib/api/showStyles'
+import { CustomCollectionName, MeteorPubSub } from '@sofie-automation/meteor-lib/dist/api/pubsub'
+import { UIShowStyleBase } from '@sofie-automation/meteor-lib/dist/api/showStyles'
 import { DBShowStyleBase } from '@sofie-automation/corelib/dist/dataModel/ShowStyleBase'
-import { Complete, literal } from '../../lib/lib'
+import { Complete, literal } from '../lib/tempLib'
 import { meteorCustomPublish, setUpOptimizedObserverArray, TriggerUpdate } from '../lib/customPublication'
 import { logger } from '../logging'
 import { NoSecurityReadAccess } from '../security/noSecurity'
diff --git a/meteor/server/publications/studio.ts b/meteor/server/publications/studio.ts
index eaef1d5448..43854b763a 100644
--- a/meteor/server/publications/studio.ts
+++ b/meteor/server/publications/studio.ts
@@ -1,8 +1,8 @@
 import { Meteor } from 'meteor/meteor'
-import { check, Match } from '../../lib/check'
+import { check, Match } from '../lib/check'
 import { meteorPublish, AutoFillSelector } from './lib'
-import { MeteorPubSub } from '../../lib/api/pubsub'
-import { getActiveRoutes, getRoutedMappings } from '../../lib/collections/Studios'
+import { MeteorPubSub } from '@sofie-automation/meteor-lib/dist/api/pubsub'
+import { getActiveRoutes, getRoutedMappings } from '@sofie-automation/meteor-lib/dist/collections/Studios'
 import { PeripheralDeviceReadAccess } from '../security/peripheralDevice'
 import { ExternalMessageQueueObj } from '@sofie-automation/corelib/dist/dataModel/ExternalMessageQueue'
 import { StudioReadAccess } from '../security/studio'
@@ -14,9 +14,9 @@ import {
 	setUpOptimizedObserverArray,
 	TriggerUpdate,
 } from '../lib/customPublication'
-import { literal } from '../../lib/lib'
+import { literal } from '../lib/tempLib'
 import { ReadonlyDeep } from 'type-fest'
-import { FindOptions } from '../../lib/collections/lib'
+import { FindOptions } from '@sofie-automation/meteor-lib/dist/collections/lib'
 import { applyAndValidateOverrides } from '@sofie-automation/corelib/dist/settings/objectWithOverrides'
 import { PeripheralDeviceId, StudioId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import {
@@ -202,7 +202,7 @@ async function manipulateMappingsPublicationData(
 	const studio = await Studios.findOneAsync(args.studioId)
 	if (!studio) return []
 
-	const routes = getActiveRoutes(studio.routeSets)
+	const routes = getActiveRoutes(applyAndValidateOverrides(studio.routeSetsWithOverrides).obj)
 	const rawMappings = applyAndValidateOverrides(studio.mappingsWithOverrides)
 	const routedMappings = getRoutedMappings(rawMappings.obj, routes)
 
diff --git a/meteor/server/publications/studioUI.ts b/meteor/server/publications/studioUI.ts
index 6836a20629..6e6ca92b96 100644
--- a/meteor/server/publications/studioUI.ts
+++ b/meteor/server/publications/studioUI.ts
@@ -3,10 +3,10 @@ import { MongoFieldSpecifierOnesStrict } from '@sofie-automation/corelib/dist/mo
 import { applyAndValidateOverrides } from '@sofie-automation/corelib/dist/settings/objectWithOverrides'
 import { Meteor } from 'meteor/meteor'
 import { ReadonlyDeep } from 'type-fest'
-import { CustomCollectionName, MeteorPubSub } from '../../lib/api/pubsub'
-import { UIStudio } from '../../lib/api/studios'
+import { CustomCollectionName, MeteorPubSub } from '@sofie-automation/meteor-lib/dist/api/pubsub'
+import { UIStudio } from '@sofie-automation/meteor-lib/dist/api/studios'
 import { DBStudio } from '@sofie-automation/corelib/dist/dataModel/Studio'
-import { Complete, literal } from '../../lib/lib'
+import { Complete, literal } from '../lib/tempLib'
 import {
 	CustomPublishCollection,
 	meteorCustomPublish,
@@ -38,19 +38,25 @@ function convertDocument(studio: Pick<DBStudio, StudioFields>): UIStudio {
 
 		settings: studio.settings,
 
-		routeSets: studio.routeSets,
-		routeSetExclusivityGroups: studio.routeSetExclusivityGroups,
+		routeSets: applyAndValidateOverrides(studio.routeSetsWithOverrides).obj,
+		routeSetExclusivityGroups: applyAndValidateOverrides(studio.routeSetExclusivityGroupsWithOverrides).obj,
 	})
 }
 
-type StudioFields = '_id' | 'name' | 'mappingsWithOverrides' | 'settings' | 'routeSets' | 'routeSetExclusivityGroups'
+type StudioFields =
+	| '_id'
+	| 'name'
+	| 'mappingsWithOverrides'
+	| 'settings'
+	| 'routeSetsWithOverrides'
+	| 'routeSetExclusivityGroupsWithOverrides'
 const fieldSpecifier = literal<MongoFieldSpecifierOnesStrict<Pick<DBStudio, StudioFields>>>({
 	_id: 1,
 	name: 1,
 	mappingsWithOverrides: 1,
 	settings: 1,
-	routeSets: 1,
-	routeSetExclusivityGroups: 1,
+	routeSetsWithOverrides: 1,
+	routeSetExclusivityGroupsWithOverrides: 1,
 })
 
 async function setupUIStudioPublicationObservers(
diff --git a/meteor/server/publications/system.ts b/meteor/server/publications/system.ts
index 215e0b3b58..bc74aa1ca6 100644
--- a/meteor/server/publications/system.ts
+++ b/meteor/server/publications/system.ts
@@ -1,10 +1,10 @@
 import { Meteor } from 'meteor/meteor'
 import { meteorPublish } from './lib'
-import { MeteorPubSub } from '../../lib/api/pubsub'
+import { MeteorPubSub } from '@sofie-automation/meteor-lib/dist/api/pubsub'
 import { SystemReadAccess } from '../security/system'
 import { OrganizationReadAccess } from '../security/organization'
 import { CoreSystem, Users } from '../collections'
-import { SYSTEM_ID } from '../../lib/collections/CoreSystem'
+import { SYSTEM_ID } from '@sofie-automation/meteor-lib/dist/collections/CoreSystem'
 import { OrganizationId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 
 meteorPublish(MeteorPubSub.coreSystem, async function (token: string | undefined) {
diff --git a/meteor/server/publications/timeline.ts b/meteor/server/publications/timeline.ts
index 16b35dfff4..d4f24d782a 100644
--- a/meteor/server/publications/timeline.ts
+++ b/meteor/server/publications/timeline.ts
@@ -1,5 +1,5 @@
 import { Meteor } from 'meteor/meteor'
-import { getRoutedTimeline } from '../../lib/collections/Timeline'
+import { getRoutedTimeline } from '@sofie-automation/meteor-lib/dist/collections/Timeline'
 import {
 	RoutedTimeline,
 	TimelineComplete,
@@ -9,22 +9,22 @@ import {
 	TimelineBlob,
 } from '@sofie-automation/corelib/dist/dataModel/Timeline'
 import { meteorPublish } from './lib'
-import { MeteorPubSub } from '../../lib/api/pubsub'
-import { FindOptions } from '../../lib/collections/lib'
+import { MeteorPubSub } from '@sofie-automation/meteor-lib/dist/api/pubsub'
+import { FindOptions } from '@sofie-automation/meteor-lib/dist/collections/lib'
 import {
 	CustomPublish,
 	meteorCustomPublish,
 	setUpOptimizedObserverArray,
 	TriggerUpdate,
 } from '../lib/customPublication'
-import { getActiveRoutes } from '../../lib/collections/Studios'
+import { getActiveRoutes } from '@sofie-automation/meteor-lib/dist/collections/Studios'
 import { PeripheralDeviceReadAccess } from '../security/peripheralDevice'
 import { StudioReadAccess } from '../security/studio'
 import { fetchStudioLight } from '../optimizations'
 import { FastTrackObservers, setupFastTrackObserver } from './fastTrack'
 import { logger } from '../logging'
 import { getRandomId, literal } from '@sofie-automation/corelib/dist/lib'
-import { Time } from '../../lib/lib'
+import { Time } from '../lib/tempLib'
 import { ReadonlyDeep } from 'type-fest'
 import { PeripheralDeviceId, StudioId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import { DBTimelineDatastoreEntry } from '@sofie-automation/corelib/dist/dataModel/TimelineDatastore'
@@ -36,6 +36,7 @@ import {
 	PeripheralDevicePubSub,
 	PeripheralDevicePubSubCollectionsNames,
 } from '@sofie-automation/shared-lib/dist/pubsub/peripheralDevice'
+import { applyAndValidateOverrides } from '@sofie-automation/corelib/dist/settings/objectWithOverrides'
 
 meteorPublish(CorelibPubSub.timelineDatastore, async function (studioId: StudioId, token: string | undefined) {
 	if (!studioId) throw new Meteor.Error(400, 'selector argument missing')
@@ -209,7 +210,7 @@ async function manipulateTimelinePublicationData(
 
 	if (!state.routes) {
 		// Routes need recalculating
-		state.routes = getActiveRoutes(state.studio.routeSets)
+		state.routes = getActiveRoutes(applyAndValidateOverrides(state.studio.routeSetsWithOverrides).obj)
 		invalidateTimeline = true
 	}
 
diff --git a/meteor/server/publications/translationsBundles.ts b/meteor/server/publications/translationsBundles.ts
index f1ef3bf8c4..55e98e9503 100644
--- a/meteor/server/publications/translationsBundles.ts
+++ b/meteor/server/publications/translationsBundles.ts
@@ -1,9 +1,9 @@
 import { TranslationsBundlesSecurity } from '../security/translationsBundles'
 import { meteorPublish } from './lib'
-import { MeteorPubSub } from '../../lib/api/pubsub'
+import { MeteorPubSub } from '@sofie-automation/meteor-lib/dist/api/pubsub'
 import { TranslationsBundles } from '../collections'
 import { MongoQuery } from '@sofie-automation/corelib/dist/mongo'
-import { TranslationsBundle } from '../../lib/collections/TranslationsBundles'
+import { TranslationsBundle } from '@sofie-automation/meteor-lib/dist/collections/TranslationsBundles'
 
 meteorPublish(MeteorPubSub.translationsBundles, async (token: string | undefined) => {
 	const selector: MongoQuery<TranslationsBundle> = {}
diff --git a/meteor/server/publications/triggeredActionsUI.ts b/meteor/server/publications/triggeredActionsUI.ts
index 95d4af2687..854c20450a 100644
--- a/meteor/server/publications/triggeredActionsUI.ts
+++ b/meteor/server/publications/triggeredActionsUI.ts
@@ -2,9 +2,12 @@ import { ShowStyleBaseId, TriggeredActionId } from '@sofie-automation/corelib/di
 import { applyAndValidateOverrides } from '@sofie-automation/corelib/dist/settings/objectWithOverrides'
 import { Meteor } from 'meteor/meteor'
 import { ReadonlyDeep } from 'type-fest'
-import { CustomCollectionName, MeteorPubSub } from '../../lib/api/pubsub'
-import { DBTriggeredActions, UITriggeredActionsObj } from '../../lib/collections/TriggeredActions'
-import { Complete, literal } from '../../lib/lib'
+import { CustomCollectionName, MeteorPubSub } from '@sofie-automation/meteor-lib/dist/api/pubsub'
+import {
+	DBTriggeredActions,
+	UITriggeredActionsObj,
+} from '@sofie-automation/meteor-lib/dist/collections/TriggeredActions'
+import { Complete, literal } from '../lib/tempLib'
 import {
 	CustomPublishCollection,
 	meteorCustomPublish,
diff --git a/meteor/server/security/__tests__/security.test.ts b/meteor/server/security/__tests__/security.test.ts
index fcca243f48..ebecf11b98 100644
--- a/meteor/server/security/__tests__/security.test.ts
+++ b/meteor/server/security/__tests__/security.test.ts
@@ -1,10 +1,10 @@
 import '../../../__mocks__/_extendJest'
 
-import { MethodContext } from '../../../lib/api/methods'
-import { DBOrganization } from '../../../lib/collections/Organization'
-import { User } from '../../../lib/collections/Users'
-import { protectString } from '../../../lib/lib'
-import { Settings } from '../../../lib/Settings'
+import { MethodContext } from '../../api/methodContext'
+import { DBOrganization } from '@sofie-automation/meteor-lib/dist/collections/Organization'
+import { User } from '@sofie-automation/meteor-lib/dist/collections/Users'
+import { protectString } from '../../lib/tempLib'
+import { Settings } from '../../Settings'
 import { DefaultEnvironment, setupDefaultStudioEnvironment } from '../../../__mocks__/helpers/database'
 import { beforeAllInFiber, testInFiber } from '../../../__mocks__/helpers/jest'
 import { BucketsAPI } from '../../api/buckets'
@@ -18,7 +18,7 @@ import { OrganizationId, UserId } from '@sofie-automation/corelib/dist/dataModel
 import { Organizations, Users } from '../../collections'
 import { SupressLogMessages } from '../../../__mocks__/suppressLogging'
 import { generateToken } from '../../api/singleUseTokens'
-import { hashSingleUseToken } from '../../../lib/api/userActions'
+import { hashSingleUseToken } from '../../api/deviceTriggers/triggersContext'
 
 describe('Security', () => {
 	function getContext(cred: Credentials): MethodContext {
diff --git a/meteor/server/security/buckets.ts b/meteor/server/security/buckets.ts
index aa7e4c7589..d7160f974c 100644
--- a/meteor/server/security/buckets.ts
+++ b/meteor/server/security/buckets.ts
@@ -1,7 +1,7 @@
-import { Bucket } from '../../lib/collections/Buckets'
+import { Bucket } from '@sofie-automation/meteor-lib/dist/collections/Buckets'
 import { Credentials, ResolvedCredentials } from './lib/credentials'
 import { triggerWriteAccess } from './lib/securityVerify'
-import { check } from '../../lib/check'
+import { check } from '../lib/check'
 import { Meteor } from 'meteor/meteor'
 import { StudioReadAccess, StudioContentWriteAccess, StudioContentAccess } from './studio'
 import { BucketAdLib } from '@sofie-automation/corelib/dist/dataModel/BucketAdLibPiece'
diff --git a/meteor/server/security/lib/credentials.ts b/meteor/server/security/lib/credentials.ts
index c7a1dc66eb..b9b480a712 100644
--- a/meteor/server/security/lib/credentials.ts
+++ b/meteor/server/security/lib/credentials.ts
@@ -1,10 +1,11 @@
-import { User } from '../../../lib/collections/Users'
+import { User } from '@sofie-automation/meteor-lib/dist/collections/Users'
 import { PeripheralDevice } from '@sofie-automation/corelib/dist/dataModel/PeripheralDevice'
-import { cacheResult, isProtectedString, clearCacheResult } from '../../../lib/lib'
+import { cacheResult, clearCacheResult } from '../../lib/cacheResult'
 import { LIMIT_CACHE_TIME } from './security'
 import { profiler } from '../../api/profiler'
 import { OrganizationId, UserId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import { PeripheralDevices, Users } from '../../collections'
+import { isProtectedString } from '@sofie-automation/shared-lib/dist/lib/protectedString'
 
 export interface Credentials {
 	userId: UserId | null
diff --git a/meteor/server/security/lib/lib.ts b/meteor/server/security/lib/lib.ts
index b4ee3df75d..a5c0d244d9 100644
--- a/meteor/server/security/lib/lib.ts
+++ b/meteor/server/security/lib/lib.ts
@@ -1,4 +1,4 @@
-import { FieldNames } from '../../../lib/collections/lib'
+import { FieldNames } from '@sofie-automation/meteor-lib/dist/collections/lib'
 import { logger } from '../../logging'
 /**
  * Allow only edits to the fields specified. Edits to any other fields will be rejected
diff --git a/meteor/server/security/lib/security.ts b/meteor/server/security/lib/security.ts
index ce2af553ab..2406c6430e 100644
--- a/meteor/server/security/lib/security.ts
+++ b/meteor/server/security/lib/security.ts
@@ -1,12 +1,12 @@
 import * as _ from 'underscore'
 import { MongoQueryKey } from '@sofie-automation/corelib/dist/mongo'
-import { Settings } from '../../../lib/Settings'
+import { Settings } from '../../Settings'
 import { resolveCredentials, ResolvedCredentials, Credentials, isResolvedCredentials } from './credentials'
 import { allAccess, noAccess, combineAccess, Access } from './access'
 import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
 import { Rundown } from '@sofie-automation/corelib/dist/dataModel/Rundown'
-import { isProtectedString } from '../../../lib/lib'
-import { DBOrganization } from '../../../lib/collections/Organization'
+import { isProtectedString } from '../../lib/tempLib'
+import { DBOrganization } from '@sofie-automation/meteor-lib/dist/collections/Organization'
 import { PeripheralDevice } from '@sofie-automation/corelib/dist/dataModel/PeripheralDevice'
 import { DBShowStyleVariant } from '@sofie-automation/corelib/dist/dataModel/ShowStyleVariant'
 import { profiler } from '../../api/profiler'
diff --git a/meteor/server/security/lib/securityVerify.ts b/meteor/server/security/lib/securityVerify.ts
index e17a1d1b93..7124987417 100644
--- a/meteor/server/security/lib/securityVerify.ts
+++ b/meteor/server/security/lib/securityVerify.ts
@@ -1,6 +1,6 @@
 import { Meteor } from 'meteor/meteor'
 import { AllMeteorMethods, suppressExtraErrorLogging } from '../../methods'
-import { disableChecks, enableChecks as restoreChecks } from '../../../lib/check'
+import { disableChecks, enableChecks as restoreChecks } from '../../lib/check'
 import { stringifyError } from '@sofie-automation/shared-lib/dist/lib/stringifyError'
 
 /** These function are used to verify that all methods defined are using security functions */
diff --git a/meteor/server/security/organization.ts b/meteor/server/security/organization.ts
index 45d13853fc..8fd686c20a 100644
--- a/meteor/server/security/organization.ts
+++ b/meteor/server/security/organization.ts
@@ -1,14 +1,14 @@
 import { Meteor } from 'meteor/meteor'
-import { SnapshotItem } from '../../lib/collections/Snapshots'
+import { SnapshotItem } from '@sofie-automation/meteor-lib/dist/collections/Snapshots'
 import { Blueprint } from '@sofie-automation/corelib/dist/dataModel/Blueprint'
 import { logNotAllowed } from './lib/lib'
 import { MongoQueryKey } from '@sofie-automation/corelib/dist/mongo'
 import { allowAccessToOrganization } from './lib/security'
 import { Credentials, ResolvedCredentials, resolveCredentials } from './lib/credentials'
-import { Settings } from '../../lib/Settings'
-import { MethodContext } from '../../lib/api/methods'
+import { Settings } from '../Settings'
+import { MethodContext } from '../api/methodContext'
 import { triggerWriteAccess } from './lib/securityVerify'
-import { isProtectedString } from '../../lib/lib'
+import { isProtectedString } from '../lib/tempLib'
 import { fetchShowStyleBaseLight, fetchStudioLight, ShowStyleBaseLight } from '../optimizations'
 import {
 	BlueprintId,
diff --git a/meteor/server/security/peripheralDevice.ts b/meteor/server/security/peripheralDevice.ts
index 39c715777f..a773b199d1 100644
--- a/meteor/server/security/peripheralDevice.ts
+++ b/meteor/server/security/peripheralDevice.ts
@@ -1,13 +1,13 @@
 import { Meteor } from 'meteor/meteor'
-import { check } from '../../lib/check'
+import { check } from '../lib/check'
 import { PeripheralDevice } from '@sofie-automation/corelib/dist/dataModel/PeripheralDevice'
-import { isProtectedString } from '../../lib/lib'
+import { isProtectedString } from '../lib/tempLib'
 import { logNotAllowed } from './lib/lib'
 import { MediaWorkFlow } from '@sofie-automation/shared-lib/dist/core/model/MediaWorkFlows'
 import { MongoQueryKey } from '@sofie-automation/corelib/dist/mongo'
 import { Credentials, ResolvedCredentials, resolveCredentials } from './lib/credentials'
 import { allowAccessToPeripheralDevice, allowAccessToPeripheralDeviceContent } from './lib/security'
-import { Settings } from '../../lib/Settings'
+import { Settings } from '../Settings'
 import { triggerWriteAccess } from './lib/securityVerify'
 import { profiler } from '../api/profiler'
 import { StudioContentWriteAccess } from './studio'
diff --git a/meteor/server/security/rundown.ts b/meteor/server/security/rundown.ts
index b7e0e1066a..8f4bf30ba9 100644
--- a/meteor/server/security/rundown.ts
+++ b/meteor/server/security/rundown.ts
@@ -1,5 +1,5 @@
 import { Meteor } from 'meteor/meteor'
-import { check } from '../../lib/check'
+import { check } from '../lib/check'
 import * as _ from 'underscore'
 import { Credentials, ResolvedCredentials } from './lib/credentials'
 import { logNotAllowed } from './lib/lib'
@@ -8,7 +8,7 @@ import { DBSegment } from '@sofie-automation/corelib/dist/dataModel/Segment'
 import { ExpectedMediaItem } from '@sofie-automation/corelib/dist/dataModel/ExpectedMediaItem'
 import { PeripheralDeviceType, PeripheralDevice } from '@sofie-automation/corelib/dist/dataModel/PeripheralDevice'
 import { ExpectedPlayoutItem } from '@sofie-automation/corelib/dist/dataModel/ExpectedPlayoutItem'
-import { Settings } from '../../lib/Settings'
+import { Settings } from '../Settings'
 import { RundownId, SegmentId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import { PeripheralDevices, Segments } from '../collections'
 import { getStudioIdFromDevice } from '../api/studio/lib'
diff --git a/meteor/server/security/rundownPlaylist.ts b/meteor/server/security/rundownPlaylist.ts
index 7740b65f22..4666e718f8 100644
--- a/meteor/server/security/rundownPlaylist.ts
+++ b/meteor/server/security/rundownPlaylist.ts
@@ -1,13 +1,13 @@
 import { Meteor } from 'meteor/meteor'
-import { check } from '../../lib/check'
+import { check } from '../lib/check'
 import { logNotAllowed } from './lib/lib'
 import { allowAccessToRundownPlaylist } from './lib/security'
 import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
 import { Credentials, ResolvedCredentials, resolveCredentials } from './lib/credentials'
 import { triggerWriteAccess } from './lib/securityVerify'
-import { isProtectedString } from '../../lib/lib'
+import { isProtectedString } from '../lib/tempLib'
 import { Rundown } from '@sofie-automation/corelib/dist/dataModel/Rundown'
-import { Settings } from '../../lib/Settings'
+import { Settings } from '../Settings'
 import {
 	OrganizationId,
 	RundownId,
diff --git a/meteor/server/security/showStyle.ts b/meteor/server/security/showStyle.ts
index 0097216601..bd3e83811c 100644
--- a/meteor/server/security/showStyle.ts
+++ b/meteor/server/security/showStyle.ts
@@ -1,15 +1,15 @@
 import { Meteor } from 'meteor/meteor'
-import { check } from '../../lib/check'
+import { check } from '../lib/check'
 import { logNotAllowed } from './lib/lib'
 import { DBShowStyleVariant } from '@sofie-automation/corelib/dist/dataModel/ShowStyleVariant'
-import { RundownLayoutBase } from '../../lib/collections/RundownLayouts'
+import { RundownLayoutBase } from '@sofie-automation/meteor-lib/dist/collections/RundownLayouts'
 import { MongoQuery, MongoQueryKey } from '@sofie-automation/corelib/dist/mongo'
 import { Credentials, ResolvedCredentials, resolveCredentials } from './lib/credentials'
 import { allowAccessToShowStyleBase, allowAccessToShowStyleVariant } from './lib/security'
 import { triggerWriteAccess } from './lib/securityVerify'
-import { Settings } from '../../lib/Settings'
-import { isProtectedString } from '../../lib/lib'
-import { TriggeredActionsObj } from '../../lib/collections/TriggeredActions'
+import { Settings } from '../Settings'
+import { isProtectedString } from '../lib/tempLib'
+import { TriggeredActionsObj } from '@sofie-automation/meteor-lib/dist/collections/TriggeredActions'
 import { SystemWriteAccess } from './system'
 import { fetchShowStyleBaseLight, ShowStyleBaseLight } from '../optimizations'
 import {
diff --git a/meteor/server/security/studio.ts b/meteor/server/security/studio.ts
index f05b325fdb..3b52624f84 100644
--- a/meteor/server/security/studio.ts
+++ b/meteor/server/security/studio.ts
@@ -5,9 +5,9 @@ import { logNotAllowed } from './lib/lib'
 import { ExternalMessageQueueObj } from '@sofie-automation/corelib/dist/dataModel/ExternalMessageQueue'
 import { Credentials, ResolvedCredentials, resolveCredentials } from './lib/credentials'
 import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
-import { Settings } from '../../lib/Settings'
+import { Settings } from '../Settings'
 import { triggerWriteAccess } from './lib/securityVerify'
-import { isProtectedString } from '../../lib/lib'
+import { isProtectedString } from '../lib/tempLib'
 import { fetchStudioLight } from '../optimizations'
 import {
 	ExternalMessageQueueObjId,
diff --git a/meteor/server/security/system.ts b/meteor/server/security/system.ts
index f0af3adcb7..5163c362e6 100644
--- a/meteor/server/security/system.ts
+++ b/meteor/server/security/system.ts
@@ -2,7 +2,7 @@ import { Meteor } from 'meteor/meteor'
 import { Credentials, resolveAuthenticatedUser, resolveCredentials } from './lib/credentials'
 import { logNotAllowed } from './lib/lib'
 import { allowAccessToCoreSystem, allowAccessToCurrentUser, allowAccessToSystemStatus } from './lib/security'
-import { Settings } from '../../lib/Settings'
+import { Settings } from '../Settings'
 import { triggerWriteAccess } from './lib/securityVerify'
 import { UserId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 
diff --git a/meteor/server/systemStatus/__tests__/api.test.ts b/meteor/server/systemStatus/__tests__/api.test.ts
index cc73898b28..66ade93a28 100644
--- a/meteor/server/systemStatus/__tests__/api.test.ts
+++ b/meteor/server/systemStatus/__tests__/api.test.ts
@@ -1,14 +1,14 @@
 import '../../../__mocks__/_extendJest'
 import { setupDefaultStudioEnvironment, DefaultEnvironment } from '../../../__mocks__/helpers/database'
-import { literal, unprotectString } from '../../../lib/lib'
+import { literal, unprotectString } from '../../lib/tempLib'
 import { MeteorMock } from '../../../__mocks__/meteor'
 import { status2ExternalStatus, setSystemStatus } from '../systemStatus'
-import { StatusResponse } from '../../../lib/api/systemStatus'
+import { StatusResponse } from '@sofie-automation/meteor-lib/dist/api/systemStatus'
 import { StatusCode } from '@sofie-automation/blueprints-integration'
-import { MeteorCall } from '../../../lib/api/methods'
+import { MeteorCall } from '../../api/methods'
 import { callKoaRoute } from '../../../__mocks__/koa-util'
 import { healthRouter } from '../api'
-import { UIBlueprintUpgradeStatus } from '../../../lib/api/upgradeStatus'
+import { UIBlueprintUpgradeStatus } from '@sofie-automation/meteor-lib/dist/api/upgradeStatus'
 
 // we don't want the deviceTriggers observer to start up at this time
 jest.mock('../../api/deviceTriggers/observer')
diff --git a/meteor/server/systemStatus/__tests__/systemStatus.test.ts b/meteor/server/systemStatus/__tests__/systemStatus.test.ts
index 43201feb16..6b62e100b7 100644
--- a/meteor/server/systemStatus/__tests__/systemStatus.test.ts
+++ b/meteor/server/systemStatus/__tests__/systemStatus.test.ts
@@ -1,17 +1,17 @@
 import '../../../__mocks__/_extendJest'
 import { testInFiber } from '../../../__mocks__/helpers/jest'
 import { setupDefaultStudioEnvironment, DefaultEnvironment } from '../../../__mocks__/helpers/database'
-import { generateTranslation, literal, protectString, unprotectString } from '../../../lib/lib'
+import { generateTranslation, literal, protectString, unprotectString } from '../../lib/tempLib'
 import { MeteorMock } from '../../../__mocks__/meteor'
 import { status2ExternalStatus, setSystemStatus } from '../systemStatus'
-import { StatusResponse } from '../../../lib/api/systemStatus'
-import { stripVersion } from '../../../lib/collections/CoreSystem'
+import { StatusResponse } from '@sofie-automation/meteor-lib/dist/api/systemStatus'
+import { stripVersion } from '../semverUtils'
 import semver from 'semver'
 import { StatusCode } from '@sofie-automation/blueprints-integration'
-import { MeteorCall } from '../../../lib/api/methods'
+import { MeteorCall } from '../../api/methods'
 import { PeripheralDeviceStatusObject } from '@sofie-automation/shared-lib/dist/peripheralDevice/peripheralDeviceAPI'
 import { PeripheralDevices } from '../../collections'
-import { UIBlueprintUpgradeStatus } from '../../../lib/api/upgradeStatus'
+import { UIBlueprintUpgradeStatus } from '@sofie-automation/meteor-lib/dist/api/upgradeStatus'
 
 // we don't want the deviceTriggers observer to start up at this time
 jest.mock('../../api/deviceTriggers/observer')
diff --git a/meteor/server/systemStatus/api.ts b/meteor/server/systemStatus/api.ts
index d7803d7e11..d81b351114 100644
--- a/meteor/server/systemStatus/api.ts
+++ b/meteor/server/systemStatus/api.ts
@@ -1,9 +1,13 @@
 import { registerClassToMeteorMethods } from '../methods'
-import { StatusResponse, NewSystemStatusAPI, SystemStatusAPIMethods } from '../../lib/api/systemStatus'
+import {
+	StatusResponse,
+	NewSystemStatusAPI,
+	SystemStatusAPIMethods,
+} from '@sofie-automation/meteor-lib/dist/api/systemStatus'
 import { getDebugStates, getSystemStatus } from './systemStatus'
-import { protectString } from '../../lib/lib'
-import { Settings } from '../../lib/Settings'
-import { MethodContextAPI } from '../../lib/api/methods'
+import { protectString } from '../lib/tempLib'
+import { Settings } from '../Settings'
+import { MethodContextAPI } from '../api/methodContext'
 import { profiler } from '../api/profiler'
 import { PeripheralDeviceId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import { PrometheusHTTPContentType, getPrometheusMetricsString } from '@sofie-automation/corelib/dist/prometheus'
diff --git a/meteor/server/systemStatus/blueprintUpgradeStatus.ts b/meteor/server/systemStatus/blueprintUpgradeStatus.ts
index 0506da5215..2d688c04bb 100644
--- a/meteor/server/systemStatus/blueprintUpgradeStatus.ts
+++ b/meteor/server/systemStatus/blueprintUpgradeStatus.ts
@@ -1,6 +1,6 @@
 import { StatusCode } from '@sofie-automation/blueprints-integration'
 import { literal } from '@sofie-automation/corelib/dist/lib'
-import { Component } from '../../lib/api/systemStatus'
+import { Component } from '@sofie-automation/meteor-lib/dist/api/systemStatus'
 import { status2ExternalStatus } from './systemStatus'
 import { getServerBlueprintUpgradeStatuses } from '../publications/blueprintUpgradeStatus/systemStatus'
 
diff --git a/meteor/lib/collections/CoreSystem.ts b/meteor/server/systemStatus/semverUtils.ts
similarity index 60%
rename from meteor/lib/collections/CoreSystem.ts
rename to meteor/server/systemStatus/semverUtils.ts
index 4e885f720f..0baa9df44d 100644
--- a/meteor/lib/collections/CoreSystem.ts
+++ b/meteor/server/systemStatus/semverUtils.ts
@@ -1,121 +1,7 @@
-import { LogLevel, protectString } from '../lib'
 import { Meteor } from 'meteor/meteor'
 import * as semver from 'semver'
-import _ from 'underscore'
-import { CoreSystemId, BlueprintId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import { StatusCode } from '@sofie-automation/blueprints-integration'
-
-export const SYSTEM_ID: CoreSystemId = protectString('core')
-
-/**
- * Criticality level for service messages. Specification of criticality in server
- * messages from sofie-monitor:
- * https://github.com/nrkno/tv-automation-sofie-monitor/blob/master/src/data/serviceMessages/ServiceMessage.ts
- *
- * @export
- * @enum {number}
- */
-export enum Criticality {
-	/** Subject matter will affect operations. */
-	CRITICAL = 1,
-	/** Operations will not be affected, but non-critical functions may be affected or the result may be undesirable. */
-	WARNING = 2,
-	/** General information */
-	NOTIFICATION = 3,
-}
-
-export interface ServiceMessage {
-	id: string
-	criticality: Criticality
-	message: string
-	sender?: string
-	timestamp: number
-}
-
-export interface ExternalServiceMessage extends Omit<ServiceMessage, 'timestamp'> {
-	timestamp: Date
-}
-
-export enum SofieLogo {
-	Default = 'default',
-	Pride = 'pride',
-	Norway = 'norway',
-	Christmas = 'christmas',
-}
-
-export interface ICoreSystem {
-	_id: CoreSystemId // always is 'core'
-	/** Timestamp of creation, (ie the time the database was created) */
-	created: number
-	/** Last modified time */
-	modified: number
-	/** Database version, on the form x.y.z */
-	version: string
-	/** Previous version, on the form x.y.z */
-	previousVersion: string | null
-
-	/** Id of the blueprint used by this system */
-	blueprintId?: BlueprintId
-
-	/** Support info */
-	support?: {
-		message: string
-	}
-
-	systemInfo?: {
-		message: string
-		enabled: boolean
-	}
-
-	evaluations?: {
-		enabled: boolean
-		heading: string
-		message: string
-	}
-
-	/** A user-defined name for the installation */
-	name?: string
-
-	/** What log-level to set. Defaults to SILLY */
-	logLevel?: LogLevel
-
-	/** Service messages currently valid for this instance */
-	serviceMessages: {
-		[index: string]: ServiceMessage
-	}
-
-	/** elastic APM (application performance monitoring) settings */
-	apm?: {
-		enabled?: boolean
-		/**
-		 * How many of the transactions to monitor.
-		 * Set to:
-		 * -1 to log nothing (max performance),
-		 * 0.5 to log 50% of the transactions,
-		 * 1 to log all transactions
-		 */
-		transactionSampleRate?: number
-	}
-	enableMonitorBlockedThread?: boolean
-
-	/** Cron jobs running nightly */
-	cron?: {
-		casparCGRestart?: {
-			enabled: boolean
-		}
-		storeRundownSnapshots?: {
-			enabled: boolean
-			rundownNames?: string[]
-		}
-	}
-
-	logo?: SofieLogo
-}
-
-/** In the beginning, there was the database, and the database was with Sofie, and the database was Sofie.
- * And Sofie said: The version of the database is to be GENESIS_SYSTEM_VERSION so that the migration scripts will run.
- */
-export const GENESIS_SYSTEM_VERSION = '0.0.0'
+import _ from 'underscore'
 
 export type Version = string
 export type VersionRange = string
diff --git a/meteor/server/systemStatus/systemStatus.ts b/meteor/server/systemStatus/systemStatus.ts
index 50c7002aa7..9e48106430 100644
--- a/meteor/server/systemStatus/systemStatus.ts
+++ b/meteor/server/systemStatus/systemStatus.ts
@@ -1,13 +1,14 @@
 import { Meteor } from 'meteor/meteor'
 import { PeripheralDevice, PERIPHERAL_SUBTYPE_PROCESS } from '@sofie-automation/corelib/dist/dataModel/PeripheralDevice'
-import { getCurrentTime, Time, getRandomId, literal } from '../../lib/lib'
+import { Time, getRandomId, literal } from '../lib/tempLib'
+import { getCurrentTime } from '../lib/lib'
 import {
 	parseVersion,
 	parseCoreIntegrationCompatabilityRange,
 	stripVersion,
 	compareSemverVersions,
 	isPrerelease,
-} from '../../lib/collections/CoreSystem'
+} from './semverUtils'
 import {
 	StatusResponse,
 	CheckObj,
@@ -15,9 +16,9 @@ import {
 	CheckError,
 	SystemInstanceId,
 	Component,
-} from '../../lib/api/systemStatus'
+} from '@sofie-automation/meteor-lib/dist/api/systemStatus'
 import { RelevantSystemVersions } from '../coreSystem'
-import { Settings } from '../../lib/Settings'
+import { Settings } from '../Settings'
 import { StudioReadAccess } from '../security/studio'
 import { OrganizationReadAccess } from '../security/organization'
 import { resolveCredentials, Credentials } from '../security/lib/credentials'
@@ -27,7 +28,7 @@ import { PeripheralDevices, Workers, WorkerThreadStatuses } from '../collections
 import { PeripheralDeviceId, StudioId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import { ServerPeripheralDeviceAPI } from '../api/peripheralDevice'
 import { PeripheralDeviceContentWriteAccess } from '../security/peripheralDevice'
-import { MethodContext } from '../../lib/api/methods'
+import { MethodContext } from '../api/methodContext'
 import { getBlueprintVersions } from './blueprintVersions'
 import { getUpgradeSystemStatusMessages } from './blueprintUpgradeStatus'
 
diff --git a/meteor/server/systemTime.ts b/meteor/server/systemTime.ts
new file mode 100644
index 0000000000..8e359a9cbe
--- /dev/null
+++ b/meteor/server/systemTime.ts
@@ -0,0 +1,56 @@
+import { Meteor } from 'meteor/meteor'
+import { logger } from './logging'
+
+/** How good time sync quality we should strive for [ms] */
+const TARGET_TIME_SYNC_QUALITY = 50 // 50 milliseconds
+
+/** How often we should check if its time has jumped or been skewed [ms] */
+const JUMP_CHECK_INTERVAL = 10 * 1000 // 10 seconds
+
+export class TimeJumpDetector {
+	private wallTime: number = TimeJumpDetector.getWallTime()
+	private monotonicTime: number = TimeJumpDetector.getMonotonicTime()
+
+	constructor(private jumpCheckInterval: number, private onJumpDetected: (syncDiff: number) => void) {}
+
+	public start(): void {
+		Meteor.setInterval(() => {
+			this.detectTimeJump()
+		}, this.jumpCheckInterval)
+	}
+
+	/** Returns the actual time of the OS, which could be influenced (jump) by an NTP sync. */
+	private static getWallTime() {
+		return Date.now()
+	}
+
+	/** Returns a Monotonic Time, which is not influenced by any NTP-sync  */
+	private static getMonotonicTime() {
+		// Future: this should use performance.now() once we are using newer nodejs
+		return Number(process.hrtime.bigint() / BigInt(1000000))
+	}
+
+	private detectTimeJump() {
+		const wallTime = TimeJumpDetector.getWallTime()
+		const monotonicTime = TimeJumpDetector.getMonotonicTime()
+		const currentDiff = wallTime - monotonicTime
+		const previousDiff = this.wallTime - this.monotonicTime
+		const syncDiff = currentDiff - previousDiff
+		if (Math.abs(syncDiff) > TARGET_TIME_SYNC_QUALITY) {
+			this.wallTime = wallTime
+			this.monotonicTime = monotonicTime
+			this.onJumpDetected(syncDiff)
+		}
+	}
+}
+// handled in systemTime, but we want to log jumps anyway
+if (!Meteor.isTest) {
+	Meteor.startup(() => {
+		const timeJumpDetector = new TimeJumpDetector(JUMP_CHECK_INTERVAL * 6, (syncDiff) => {
+			logger.warn(`Time jump or skew of ${Math.round(syncDiff)} ms detected`)
+			// But we're not doing anything more
+			// TODO: Should we trigger peripheralDevices to resync? And clients?
+		})
+		timeJumpDetector.start()
+	})
+}
diff --git a/meteor/lib/typings/webmanifest.d.ts b/meteor/server/typings/webmanifest.d.ts
similarity index 100%
rename from meteor/lib/typings/webmanifest.d.ts
rename to meteor/server/typings/webmanifest.d.ts
diff --git a/meteor/server/webmanifest.ts b/meteor/server/webmanifest.ts
index 86067ef5fb..fa3f1a5dfa 100644
--- a/meteor/server/webmanifest.ts
+++ b/meteor/server/webmanifest.ts
@@ -3,13 +3,13 @@ import type {
 	JSONSchemaForWebApplicationManifestFiles,
 	ManifestImageResource,
 	ShortcutItem,
-} from '../lib/typings/webmanifest'
-import { logger } from '../lib/logging'
+} from './typings/webmanifest'
+import { logger } from './logging'
 import { MongoQuery } from '@sofie-automation/corelib/dist/mongo'
 import { DBStudio } from '@sofie-automation/corelib/dist/dataModel/Studio'
 import { RundownPlaylists, Rundowns, Studios } from './collections'
 import { getLocale, Translations } from './lib'
-import { generateTranslation } from '../lib/lib'
+import { generateTranslation } from './lib/tempLib'
 import { ITranslatableMessage } from '@sofie-automation/blueprints-integration'
 import { interpollateTranslation } from '@sofie-automation/corelib/dist/TranslatableMessage'
 import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
@@ -18,6 +18,7 @@ import Koa from 'koa'
 import KoaRouter from '@koa/router'
 import { Meteor } from 'meteor/meteor'
 import { bindKoaRouter } from './api/rest/koa'
+import { stringifyError } from '@sofie-automation/shared-lib/dist/lib/stringifyError'
 
 const appShortName = 'Sofie'
 const SOFIE_DEFAULT_ICONS: ManifestImageResource[] = [
@@ -198,7 +199,7 @@ webManifestRouter.get('/', async (ctx) => {
 		ctx.response.type = 'application/manifest+json;charset=utf-8'
 		ctx.body = JSON.stringify(manifest)
 	} catch (e) {
-		logger.error(`Could not produce PWA WebManifest`, e)
+		logger.error(`Could not produce PWA WebManifest: ${stringifyError(e)}`)
 		ctx.response.status = 500
 		ctx.body = 'Internal Server Error'
 	}
@@ -238,7 +239,7 @@ nrcsUrlRouter.get('/', async (ctx) => {
 		ctx.body = `Unsupported namespace: "${parsedWebNrcsUrl.host}"`
 		return
 	} catch (e) {
-		logger.error(`Unknown error in /url/nrcs`, e)
+		logger.error(`Unknown error in /url/nrcs: ${stringifyError(e)}`)
 	}
 
 	ctx.response.status = 500
diff --git a/meteor/server/worker/worker.ts b/meteor/server/worker/worker.ts
index 7bfe547e38..f5e3c82885 100644
--- a/meteor/server/worker/worker.ts
+++ b/meteor/server/worker/worker.ts
@@ -8,16 +8,10 @@ import { FORCE_CLEAR_CACHES_JOB, IS_INSPECTOR_ENABLED } from '@sofie-automation/
 import { threadedClass, Promisify, ThreadedClassManager } from 'threadedclass'
 import type { JobSpec } from '@sofie-automation/job-worker/dist/main'
 import type { IpcJobWorker } from '@sofie-automation/job-worker/dist/ipc'
-import {
-	createManualPromise,
-	getCurrentTime,
-	getRandomString,
-	ManualPromise,
-	MeteorStartupAsync,
-	Time,
-} from '../../lib/lib'
+import { createManualPromise, getRandomString, ManualPromise, Time } from '../lib/tempLib'
+import { MeteorStartupAsync, getCurrentTime } from '../lib/lib'
 import { stringifyError } from '@sofie-automation/shared-lib/dist/lib/stringifyError'
-import { UserActionsLogItem } from '../../lib/collections/UserActionsLog'
+import { UserActionsLogItem } from '@sofie-automation/meteor-lib/dist/collections/UserActionsLog'
 import { triggerFastTrackObserver, FastTrackObservers } from '../publications/fastTrack'
 import { TimelineComplete } from '@sofie-automation/corelib/dist/dataModel/Timeline'
 import { fetchStudioLight } from '../optimizations'
diff --git a/meteor/server/worker/workerStatus.ts b/meteor/server/worker/workerStatus.ts
index b0f7aa1653..ec35ba333c 100644
--- a/meteor/server/worker/workerStatus.ts
+++ b/meteor/server/worker/workerStatus.ts
@@ -1,6 +1,6 @@
 import { WorkerId } from '@sofie-automation/corelib/dist/dataModel/Ids'
-import { getWorkerId, WorkerStatus } from '../../lib/collections/Workers'
-import { getCurrentTime } from '../../lib/lib'
+import { getWorkerId, WorkerStatus } from '@sofie-automation/meteor-lib/dist/collections/Workers'
+import { getCurrentTime } from '../lib/lib'
 import { Workers } from '../collections'
 
 export async function initializeWorkerStatus(name: string, instanceId: string): Promise<WorkerId> {
diff --git a/meteor/yarn.lock b/meteor/yarn.lock
index 4216c09816..233d3a8179 100644
--- a/meteor/yarn.lock
+++ b/meteor/yarn.lock
@@ -392,7 +392,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/runtime@npm:^7.1.2, @babel/runtime@npm:^7.11.1, @babel/runtime@npm:^7.11.2, @babel/runtime@npm:^7.12.13, @babel/runtime@npm:^7.14.5, @babel/runtime@npm:^7.17.2, @babel/runtime@npm:^7.18.0, @babel/runtime@npm:^7.18.3, @babel/runtime@npm:^7.19.0, @babel/runtime@npm:^7.20.7, @babel/runtime@npm:^7.21.0, @babel/runtime@npm:^7.22.5, @babel/runtime@npm:^7.23.2, @babel/runtime@npm:^7.23.9, @babel/runtime@npm:^7.9.2":
+"@babel/runtime@npm:^7.17.2, @babel/runtime@npm:^7.21.0, @babel/runtime@npm:^7.22.5, @babel/runtime@npm:^7.23.9":
   version: 7.23.9
   resolution: "@babel/runtime@npm:7.23.9"
   dependencies:
@@ -462,18 +462,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@crello/react-lottie@npm:0.0.9":
-  version: 0.0.9
-  resolution: "@crello/react-lottie@npm:0.0.9"
-  dependencies:
-    lottie-web: 5.5.9
-  peerDependencies:
-    react: ~16.9.0
-    react-dom: ~16.9.0
-  checksum: 3b0a6b3f53efd140a2b72c8b7b225c1933f492edb1d045ca6a3ed8ecf7d0114d237fc47abaee01d336445d05d9ea13d0f03e68e77b235ab5a5407d57468bdbae
-  languageName: node
-  linkType: hard
-
 "@dabh/diagnostics@npm:^2.0.2":
   version: 2.0.3
   resolution: "@dabh/diagnostics@npm:2.0.3"
@@ -545,50 +533,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@fortawesome/fontawesome-common-types@npm:6.4.2":
-  version: 6.4.2
-  resolution: "@fortawesome/fontawesome-common-types@npm:6.4.2"
-  checksum: 4a22932bd0cac65be1d35b739624f366b6c247b60eb5b8f66218957f54ce1cae56e2a20ea88789ede45d1e1c0c1014f160e01c1752122ec174ad0823e60f94bf
-  languageName: node
-  linkType: hard
-
-"@fortawesome/fontawesome-free@npm:^6.4.2":
-  version: 6.4.2
-  resolution: "@fortawesome/fontawesome-free@npm:6.4.2"
-  checksum: 14be8fbb8faa62473c01fe70590e39cdc76a0083b791537fd3d2215a790d2722d917242b1f7948e160876934a8d3823c764af9b8d4ef6dc1ecad55b585e5b776
-  languageName: node
-  linkType: hard
-
-"@fortawesome/fontawesome-svg-core@npm:~6.4.2":
-  version: 6.4.2
-  resolution: "@fortawesome/fontawesome-svg-core@npm:6.4.2"
-  dependencies:
-    "@fortawesome/fontawesome-common-types": 6.4.2
-  checksum: 0c0ecd9058883b128127e2b281c983ba6272be38a17577aaa2293ada58e9b1538357fe44430ded508d49ae3f5cc55aa720a0448d2b9d99689bb912d786f034e5
-  languageName: node
-  linkType: hard
-
-"@fortawesome/free-solid-svg-icons@npm:^6.4.2":
-  version: 6.4.2
-  resolution: "@fortawesome/free-solid-svg-icons@npm:6.4.2"
-  dependencies:
-    "@fortawesome/fontawesome-common-types": 6.4.2
-  checksum: 4a365004990d5b1c970fb30c11b284b0b807903d0ecb193eb9b5a5e41ea7c0b8fff5c60480c580a1e44535cf23c5d9c90cb698189741e40ea3e10ac66290709c
-  languageName: node
-  linkType: hard
-
-"@fortawesome/react-fontawesome@npm:^0.2.0":
-  version: 0.2.0
-  resolution: "@fortawesome/react-fontawesome@npm:0.2.0"
-  dependencies:
-    prop-types: ^15.8.1
-  peerDependencies:
-    "@fortawesome/fontawesome-svg-core": ~1 || ~6
-    react: ">=16.3"
-  checksum: f652a0c2172e7b209e2d9e7e511f9b8c17abad85f55e0bd09bb1175ea1927693215da47eb6cd95b1f3a23bd124368553c677907fa76cb17c5093afc1fcffe338
-  languageName: node
-  linkType: hard
-
 "@gar/promisify@npm:^1.1.3":
   version: 1.1.3
   resolution: "@gar/promisify@npm:1.1.3"
@@ -637,19 +581,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@hypnosphi/create-react-context@npm:^0.3.1":
-  version: 0.3.1
-  resolution: "@hypnosphi/create-react-context@npm:0.3.1"
-  dependencies:
-    gud: ^1.0.0
-    warning: ^4.0.3
-  peerDependencies:
-    prop-types: ^15.0.0
-    react: ">=0.14.0"
-  checksum: d2f069a562e138057aa067e1483e28cea3193bbacd33ca9528131f31e656939cfeb552af760b3be437d3a8074315a8854fc6d5d89878e2746618ad930c817122
-  languageName: node
-  linkType: hard
-
 "@isaacs/cliui@npm:^8.0.2":
   version: 8.0.2
   resolution: "@isaacs/cliui@npm:8.0.2"
@@ -956,20 +887,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@jstarpl/react-contextmenu@npm:^2.15.0":
-  version: 2.15.0
-  resolution: "@jstarpl/react-contextmenu@npm:2.15.0"
-  dependencies:
-    classnames: ^2.2.5
-    object-assign: ^4.1.0
-  peerDependencies:
-    prop-types: ^15.0.0
-    react: ^0.14.0 || ^15.0.0 || ^16.0.1 || ^17 || ^18
-    react-dom: ^0.14.0 || ^15.0.0 || ^16.0.1 || ^17 || ^18
-  checksum: a3b219ac32537db7c5f00a97816260988bf351c3623746d4659a68dff7bd02a1b221dc1b5ddcc2a8743aa40fd82d24e9bb0d80d2c8224e2a3f4ff4e45192d85f
-  languageName: node
-  linkType: hard
-
 "@koa/cors@npm:^5.0.0":
   version: 5.0.0
   resolution: "@koa/cors@npm:5.0.0"
@@ -1020,23 +937,23 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@mos-connection/helper@npm:^4.1.1-nightly-master-20240430-072032-ffb8bf6.0":
-  version: 4.1.1-nightly-master-20240430-072032-ffb8bf6.0
-  resolution: "@mos-connection/helper@npm:4.1.1-nightly-master-20240430-072032-ffb8bf6.0"
+"@mos-connection/helper@npm:v4.2.0-alpha.1":
+  version: 4.2.0-alpha.1
+  resolution: "@mos-connection/helper@npm:4.2.0-alpha.1"
   dependencies:
-    "@mos-connection/model": 4.1.1-nightly-master-20240430-072032-ffb8bf6.0
+    "@mos-connection/model": 4.2.0-alpha.1
     iconv-lite: ^0.6.3
     tslib: ^2.5.3
     xml-js: ^1.6.11
     xmlbuilder: ^15.1.1
-  checksum: dcf7d5e800d08c007a4026b37ddcc6ebe77d020a311809bc379a5c7d15657c2d447b4149682aec17161d17217e2c6d5167c7ef81e954a4ed5a6283a7c75a7e0a
+  checksum: ad809b542065b921e2d16e30f9ce04fba03d39c18a2944af2a440bfa33e05820954e0448cc6f38a3ed3d043b9b6c9b052cb24af0e6504d4c6723e5864c3df780
   languageName: node
   linkType: hard
 
-"@mos-connection/model@npm:4.1.1-nightly-master-20240430-072032-ffb8bf6.0, @mos-connection/model@npm:^4.1.1-nightly-master-20240430-072032-ffb8bf6.0":
-  version: 4.1.1-nightly-master-20240430-072032-ffb8bf6.0
-  resolution: "@mos-connection/model@npm:4.1.1-nightly-master-20240430-072032-ffb8bf6.0"
-  checksum: 07bd3ffc94a8c140d994de445c34158bb9f5f8950f6cea34d59657fe4da1f0f6b5d0c2c7ef1b2ad902b43c846485ab10cb9f19d707233b875fe739d731151bdc
+"@mos-connection/model@npm:4.2.0-alpha.1, @mos-connection/model@npm:v4.2.0-alpha.1":
+  version: 4.2.0-alpha.1
+  resolution: "@mos-connection/model@npm:4.2.0-alpha.1"
+  checksum: d0bbbbe86254cf7d17f52a71d4a6b7241749ee784faf4c1d7079852bdce758562a7b2a7d1d92637dafd5d3de433bff6b04e8a969d426be65b384118028b0f6f8
   languageName: node
   linkType: hard
 
@@ -1096,13 +1013,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@nrk/core-icons@npm:^9.6.0":
-  version: 9.6.0
-  resolution: "@nrk/core-icons@npm:9.6.0"
-  checksum: b8e5737155607f0b6efc4b961a9b545b03f3a780172a8455396a6230f6aca85e3153dce535b46cab735c1c1d078c088a826c5626579f909490ad89f83b38da10
-  languageName: node
-  linkType: hard
-
 "@opentelemetry/api@npm:^1.4.1":
   version: 1.6.0
   resolution: "@opentelemetry/api@npm:1.6.0"
@@ -1160,65 +1070,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@popperjs/core@npm:^2.11.8":
-  version: 2.11.8
-  resolution: "@popperjs/core@npm:2.11.8"
-  checksum: e5c69fdebf52a4012f6a1f14817ca8e9599cb1be73dd1387e1785e2ed5e5f0862ff817f420a87c7fc532add1f88a12e25aeb010ffcbdc98eace3d55ce2139cf0
-  languageName: node
-  linkType: hard
-
-"@rc-component/portal@npm:^1.1.0":
-  version: 1.1.2
-  resolution: "@rc-component/portal@npm:1.1.2"
-  dependencies:
-    "@babel/runtime": ^7.18.0
-    classnames: ^2.3.2
-    rc-util: ^5.24.4
-  peerDependencies:
-    react: ">=16.9.0"
-    react-dom: ">=16.9.0"
-  checksum: bdb14f48d3d0d7391347a4da37e8de1b539ae7b0bc71005beb964036a1fd7874a242ce42d3e06a4979a26d22a12f965357d571c40966cd457736d3c430a5421f
-  languageName: node
-  linkType: hard
-
-"@rc-component/trigger@npm:^1.18.0":
-  version: 1.18.3
-  resolution: "@rc-component/trigger@npm:1.18.3"
-  dependencies:
-    "@babel/runtime": ^7.23.2
-    "@rc-component/portal": ^1.1.0
-    classnames: ^2.3.2
-    rc-motion: ^2.0.0
-    rc-resize-observer: ^1.3.1
-    rc-util: ^5.38.0
-  peerDependencies:
-    react: ">=16.9.0"
-    react-dom: ">=16.9.0"
-  checksum: 272098e67b4c09e8ee8f4fa2e55054c05f2ea5196e26859a2fd1dfb63ee4f02e4ca7b60d15704defb59b34151f042ff906099aee20d67a01066d2f0b76dd0c58
-  languageName: node
-  linkType: hard
-
-"@react-dnd/asap@npm:^4.0.0":
-  version: 4.0.1
-  resolution: "@react-dnd/asap@npm:4.0.1"
-  checksum: 757db3b5c436a95383b74f187f503321092909401ce9665d9cc1999308a44de22809bf8dbe82c9126bd73b72dd6665bbc4a788e864fc3c243c59f65057a4f87f
-  languageName: node
-  linkType: hard
-
-"@react-dnd/invariant@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "@react-dnd/invariant@npm:2.0.0"
-  checksum: ef1e989920d70b15c80dccb01af9b598081d76993311aa22d2e9a3ec41d10a88540eeec4b4de7a8b2a2ea52dfc3495ab45e39192c2d27795a9258bd6b79d000e
-  languageName: node
-  linkType: hard
-
-"@react-dnd/shallowequal@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "@react-dnd/shallowequal@npm:2.0.0"
-  checksum: b5bbdc795d65945bb7ba2322bed5cf8d4c6fe91dced98c3b10e3d16822c438f558751135ff296f8d1aa1eaa9d0037dacab2b522ca5eb812175123b9996966dcb
-  languageName: node
-  linkType: hard
-
 "@shopify/jest-koa-mocks@npm:^5.1.1":
   version: 5.1.1
   resolution: "@shopify/jest-koa-mocks@npm:5.1.1"
@@ -1236,24 +1087,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@sinonjs/commons@npm:^1.7.0":
-  version: 1.8.6
-  resolution: "@sinonjs/commons@npm:1.8.6"
-  dependencies:
-    type-detect: 4.0.8
-  checksum: 7d3f8c1e85f30cd4e83594fc19b7a657f14d49eb8d95a30095631ce15e906c869e0eff96c5b93dffea7490c00418b07f54582ba49c6560feb2a8c34c0b16832d
-  languageName: node
-  linkType: hard
-
-"@sinonjs/commons@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "@sinonjs/commons@npm:2.0.0"
-  dependencies:
-    type-detect: 4.0.8
-  checksum: 5023ba17edf2b85ed58262313b8e9b59e23c6860681a9af0200f239fe939e2b79736d04a260e8270ddd57196851dde3ba754d7230be5c5234e777ae2ca8af137
-  languageName: node
-  linkType: hard
-
 "@sinonjs/commons@npm:^3.0.0":
   version: 3.0.0
   resolution: "@sinonjs/commons@npm:3.0.0"
@@ -1272,33 +1105,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@sinonjs/fake-timers@npm:^9.1.2":
-  version: 9.1.2
-  resolution: "@sinonjs/fake-timers@npm:9.1.2"
-  dependencies:
-    "@sinonjs/commons": ^1.7.0
-  checksum: 7d3aef54e17c1073101cb64d953157c19d62a40e261a30923fa1ee337b049c5f29cc47b1f0c477880f42b5659848ba9ab897607ac8ea4acd5c30ddcfac57fca6
-  languageName: node
-  linkType: hard
-
-"@sinonjs/samsam@npm:^7.0.1":
-  version: 7.0.1
-  resolution: "@sinonjs/samsam@npm:7.0.1"
-  dependencies:
-    "@sinonjs/commons": ^2.0.0
-    lodash.get: ^4.4.2
-    type-detect: ^4.0.8
-  checksum: 291efb158d54c67dee23ddabcb28873d22063449b692aaa3b2a4f1826d2f79d38695574063c92e9c17573cc805cd6acbf0ab0c66c9f3aed7afd0f12a2b905615
-  languageName: node
-  linkType: hard
-
-"@sinonjs/text-encoding@npm:^0.7.1":
-  version: 0.7.2
-  resolution: "@sinonjs/text-encoding@npm:0.7.2"
-  checksum: fe690002a32ba06906cf87e2e8fe84d1590294586f2a7fd180a65355b53660c155c3273d8011a5f2b77209b819aa7306678ae6e4aea0df014bd7ffd4bbbcf1ab
-  languageName: node
-  linkType: hard
-
 "@slack/types@npm:^1.2.1":
   version: 1.10.0
   resolution: "@slack/types@npm:1.10.0"
@@ -1321,7 +1127,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@sofie-automation/blueprints-integration@portal:../packages/blueprints-integration::locator=automation-core%40workspace%3A."
   dependencies:
-    "@sofie-automation/shared-lib": 1.51.0-in-development
+    "@sofie-automation/shared-lib": 1.52.0-in-development
     tslib: ^2.6.2
     type-fest: ^3.13.1
   languageName: node
@@ -1362,8 +1168,8 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@sofie-automation/corelib@portal:../packages/corelib::locator=automation-core%40workspace%3A."
   dependencies:
-    "@sofie-automation/blueprints-integration": 1.51.0-in-development
-    "@sofie-automation/shared-lib": 1.51.0-in-development
+    "@sofie-automation/blueprints-integration": 1.52.0-in-development
+    "@sofie-automation/shared-lib": 1.52.0-in-development
     fast-clone: ^1.5.13
     i18next: ^21.10.0
     influx: ^5.9.3
@@ -1394,9 +1200,9 @@ __metadata:
   resolution: "@sofie-automation/job-worker@portal:../packages/job-worker::locator=automation-core%40workspace%3A."
   dependencies:
     "@slack/webhook": ^6.1.0
-    "@sofie-automation/blueprints-integration": 1.51.0-in-development
-    "@sofie-automation/corelib": 1.51.0-in-development
-    "@sofie-automation/shared-lib": 1.51.0-in-development
+    "@sofie-automation/blueprints-integration": 1.52.0-in-development
+    "@sofie-automation/corelib": 1.52.0-in-development
+    "@sofie-automation/shared-lib": 1.52.0-in-development
     amqplib: ^0.10.3
     deepmerge: ^4.3.1
     elastic-apm-node: ^3.51.0
@@ -1405,7 +1211,7 @@ __metadata:
     node-fetch: ^2.7.0
     p-lazy: ^3.1.0
     p-timeout: ^4.1.0
-    superfly-timeline: 9.0.0
+    superfly-timeline: 9.0.2
     threadedclass: ^1.2.2
     tslib: ^2.6.2
     type-fest: ^3.13.1
@@ -1413,24 +1219,35 @@ __metadata:
   languageName: node
   linkType: soft
 
+"@sofie-automation/meteor-lib@portal:../packages/meteor-lib::locator=automation-core%40workspace%3A.":
+  version: 0.0.0-use.local
+  resolution: "@sofie-automation/meteor-lib@portal:../packages/meteor-lib::locator=automation-core%40workspace%3A."
+  dependencies:
+    "@mos-connection/helper": v4.2.0-alpha.1
+    "@sofie-automation/blueprints-integration": 1.52.0-in-development
+    "@sofie-automation/corelib": 1.52.0-in-development
+    "@sofie-automation/shared-lib": 1.52.0-in-development
+    deep-extend: 0.6.0
+    semver: ^7.5.4
+    type-fest: ^3.13.1
+    underscore: ^1.13.6
+  peerDependencies:
+    i18next: ^21.10.0
+    mongodb: ^5.5.0
+  languageName: node
+  linkType: soft
+
 "@sofie-automation/shared-lib@portal:../packages/shared-lib::locator=automation-core%40workspace%3A.":
   version: 0.0.0-use.local
   resolution: "@sofie-automation/shared-lib@portal:../packages/shared-lib::locator=automation-core%40workspace%3A."
   dependencies:
-    "@mos-connection/model": ^4.1.1-nightly-master-20240430-072032-ffb8bf6.0
-    timeline-state-resolver-types: 9.1.0-nightly-release51-20240228-132329-b7ceb6950.0
+    "@mos-connection/model": v4.2.0-alpha.1
+    timeline-state-resolver-types: 9.2.0-nightly-release52-20240923-122840-58cfbb259.0
     tslib: ^2.6.2
     type-fest: ^3.13.1
   languageName: node
   linkType: soft
 
-"@sofie-automation/sorensen@npm:^1.4.2":
-  version: 1.4.2
-  resolution: "@sofie-automation/sorensen@npm:1.4.2"
-  checksum: 0fb9d945af37a0dc278be05ed16e77ed8a0c69a5dee891ab0430fff7f4aace036baf96c9fe8f7c80e1addaea634e9bf9547f97818f5ba1279c77c32387079844
-  languageName: node
-  linkType: hard
-
 "@tokenizer/token@npm:^0.3.0":
   version: 0.3.0
   resolution: "@tokenizer/token@npm:0.3.0"
@@ -1519,15 +1336,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/classnames@npm:^2.3.1":
-  version: 2.3.1
-  resolution: "@types/classnames@npm:2.3.1"
-  dependencies:
-    classnames: "*"
-  checksum: 09a17ea08fcb83380921efdfdac94cfa162f87025cae0bf6f4ba508c2fa5f436459ce7612905a3f968fdddb68c03b8e6ff08e762ed2d0c110c5c4fceb244dc55
-  languageName: node
-  linkType: hard
-
 "@types/connect@npm:*":
   version: 3.4.36
   resolution: "@types/connect@npm:3.4.36"
@@ -1603,13 +1411,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/history@npm:^4.7.11":
-  version: 4.7.11
-  resolution: "@types/history@npm:4.7.11"
-  checksum: c92e2ba407dcab0581a9afdf98f533aa41b61a71133420a6d92b1ca9839f741ab1f9395b17454ba5b88cb86020b70b22d74a1950ccfbdfd9beeaa5459fdc3464
-  languageName: node
-  linkType: hard
-
 "@types/http-assert@npm:*":
   version: 1.5.3
   resolution: "@types/http-assert@npm:1.5.3"
@@ -1659,17 +1460,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/jsdom@npm:^20.0.0":
-  version: 20.0.1
-  resolution: "@types/jsdom@npm:20.0.1"
-  dependencies:
-    "@types/node": "*"
-    "@types/tough-cookie": "*"
-    parse5: ^7.0.0
-  checksum: d55402c5256ef451f93a6e3d3881f98339fe73a5ac2030588df056d6835df8367b5a857b48d27528289057e26dcdd3f502edc00cb877c79174cb3a4c7f2198c1
-  languageName: node
-  linkType: hard
-
 "@types/json-schema@npm:^7.0.9":
   version: 7.0.13
   resolution: "@types/json-schema@npm:7.0.13"
@@ -1702,6 +1492,25 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/koa-send@npm:*":
+  version: 4.1.6
+  resolution: "@types/koa-send@npm:4.1.6"
+  dependencies:
+    "@types/koa": "*"
+  checksum: d46d207f1d826ccd74bf3a02180d0475be8456eb3a2244244d19cb3f1737251e163d73958fdcd12111e03c7c0545cc89e7888a6ef2ba370ebf2b2e804efaaaf1
+  languageName: node
+  linkType: hard
+
+"@types/koa-static@npm:^4.0.4":
+  version: 4.0.4
+  resolution: "@types/koa-static@npm:4.0.4"
+  dependencies:
+    "@types/koa": "*"
+    "@types/koa-send": "*"
+  checksum: 99087a9b6f4214679932008fbed2d4332fca06cd01f2d333439bd1cf0844c313584c8eb6b805360d1c3d6c6c8a475468a5f4f73ecad551c8cc369e290ad41331
+  languageName: node
+  linkType: hard
+
 "@types/koa@npm:*, @types/koa@npm:^2.14.0":
   version: 2.14.0
   resolution: "@types/koa@npm:2.14.0"
@@ -1778,13 +1587,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/prop-types@npm:*, @types/prop-types@npm:^15.7.11":
-  version: 15.7.11
-  resolution: "@types/prop-types@npm:15.7.11"
-  checksum: 7519ff11d06fbf6b275029fe03fff9ec377b4cb6e864cac34d87d7146c7f5a7560fd164bdc1d2dbe00b60c43713631251af1fd3d34d46c69cd354602bc0c7c54
-  languageName: node
-  linkType: hard
-
 "@types/qs@npm:*":
   version: 6.9.8
   resolution: "@types/qs@npm:6.9.8"
@@ -1799,67 +1601,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/react-circular-progressbar@npm:^1.1.0":
-  version: 1.1.0
-  resolution: "@types/react-circular-progressbar@npm:1.1.0"
-  dependencies:
-    react-circular-progressbar: "*"
-  checksum: 8cfdad2feb1a5e8315474ec3ae4096e803431e394eddc7be4e91dbd4632e3840171efbe2ea55aeba2fbcd3302a488e4514732465f9702211ac81174a5e8b2d58
-  languageName: node
-  linkType: hard
-
-"@types/react-datepicker@npm:^3.1.8":
-  version: 3.1.8
-  resolution: "@types/react-datepicker@npm:3.1.8"
-  dependencies:
-    "@types/react": "*"
-    date-fns: ^2.0.1
-    popper.js: ^1.14.1
-  checksum: dc15817fadcd970c4c4c7368e8b2c498ac7d068fd67505e6960b3b7f0e8859483c9c71278bdacd876fb5d25a81806cc47fa52841a73384d730a24cfdb2df7d8e
-  languageName: node
-  linkType: hard
-
-"@types/react-dom@npm:^18.2.18":
-  version: 18.2.18
-  resolution: "@types/react-dom@npm:18.2.18"
-  dependencies:
-    "@types/react": "*"
-  checksum: 8e3da404c980e2b2a76da3852f812ea6d8b9d0e7f5923fbaf3bfbbbfa1d59116ff91c129de8f68e9b7668a67ae34484fe9df74d5a7518cf8591ec07a0c4dad57
-  languageName: node
-  linkType: hard
-
-"@types/react-router-dom@npm:^5.3.3":
-  version: 5.3.3
-  resolution: "@types/react-router-dom@npm:5.3.3"
-  dependencies:
-    "@types/history": ^4.7.11
-    "@types/react": "*"
-    "@types/react-router": "*"
-  checksum: 28c4ea48909803c414bf5a08502acbb8ba414669b4b43bb51297c05fe5addc4df0b8fd00e0a9d1e3535ec4073ef38aaafac2c4a2b95b787167d113bc059beff3
-  languageName: node
-  linkType: hard
-
-"@types/react-router@npm:*, @types/react-router@npm:^5.1.20":
-  version: 5.1.20
-  resolution: "@types/react-router@npm:5.1.20"
-  dependencies:
-    "@types/history": ^4.7.11
-    "@types/react": "*"
-  checksum: 128764143473a5e9457ddc715436b5d49814b1c214dde48939b9bef23f0e77f52ffcdfa97eb8d3cc27e2c229869c0cdd90f637d887b62f2c9f065a87d6425419
-  languageName: node
-  linkType: hard
-
-"@types/react@npm:*, @types/react@npm:^18.2.51":
-  version: 18.2.51
-  resolution: "@types/react@npm:18.2.51"
-  dependencies:
-    "@types/prop-types": "*"
-    "@types/scheduler": "*"
-    csstype: ^3.0.2
-  checksum: 1ab49e51e6314cefb9a162e9ac3a15a0474c82a0737f12f3a9628ccba555ab6645d2449152e7a5fc3ff650a7139a4718715af2c5ae9bc46b0533e98036706f84
-  languageName: node
-  linkType: hard
-
 "@types/request@npm:^2.48.12":
   version: 2.48.12
   resolution: "@types/request@npm:2.48.12"
@@ -1872,13 +1613,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/scheduler@npm:*":
-  version: 0.16.3
-  resolution: "@types/scheduler@npm:0.16.3"
-  checksum: 2b0aec39c24268e3ce938c5db2f2e77f5c3dd280e05c262d9c2fe7d890929e4632a6b8e94334017b66b45e4f92a5aa42ba3356640c2a1175fa37bef2f5200767
-  languageName: node
-  linkType: hard
-
 "@types/semver@npm:^7.3.12, @types/semver@npm:^7.5.6":
   version: 7.5.6
   resolution: "@types/semver@npm:7.5.6"
@@ -1907,22 +1641,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/sinon@npm:^10.0.20":
-  version: 10.0.20
-  resolution: "@types/sinon@npm:10.0.20"
-  dependencies:
-    "@types/sinonjs__fake-timers": "*"
-  checksum: 7322771345c202b90057f8112e0d34b7339e5ae1827fb1bfe385fc9e38ed6a2f18b4c66e88d27d98c775f7f74fb1167c0c14f61ca64155786534541e6c6eb05f
-  languageName: node
-  linkType: hard
-
-"@types/sinonjs__fake-timers@npm:*":
-  version: 8.1.2
-  resolution: "@types/sinonjs__fake-timers@npm:8.1.2"
-  checksum: bbc73a5ab6c0ec974929392f3d6e1e8db4ebad97ec506d785301e1c3d8a4f98a35b1aa95b97035daef02886fd8efd7788a2fa3ced2ec7105988bfd8dce61eedd
-  languageName: node
-  linkType: hard
-
 "@types/stack-utils@npm:^2.0.0":
   version: 2.0.1
   resolution: "@types/stack-utils@npm:2.0.1"
@@ -1944,7 +1662,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/underscore@npm:1.11.15":
+"@types/underscore@npm:^1.11.15":
   version: 1.11.15
   resolution: "@types/underscore@npm:1.11.15"
   checksum: 25fdf6da96e0d11ca39a4740aab6fa3bd717e57301be4cb9e7893dc0ad6ce330992d0c8e0b02cac5c5ea86df6f8949c5a8f1fb95f3666b85418d399d3b1112e9
@@ -1968,15 +1686,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/xml2js@npm:^0.4.14":
-  version: 0.4.14
-  resolution: "@types/xml2js@npm:0.4.14"
-  dependencies:
-    "@types/node": "*"
-  checksum: df9f106b9953dcdec7ba3304ebc56d6c2f61d49bf556d600bed439f94a1733f73ca0bf2d0f64330b402191622862d9d6058bab9d7e3dcb5b0fe51ebdc4372aac
-  languageName: node
-  linkType: hard
-
 "@types/yargs-parser@npm:*":
   version: 21.0.0
   resolution: "@types/yargs-parser@npm:21.0.0"
@@ -2121,24 +1830,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@welldone-software/why-did-you-render@npm:^4.3.2":
-  version: 4.3.2
-  resolution: "@welldone-software/why-did-you-render@npm:4.3.2"
-  dependencies:
-    lodash: ^4
-  peerDependencies:
-    react: ">=16.13"
-  checksum: 6ec05b8d79cd6f31be75510feda83f3446fac8712717ff1ab3f40b10f57ada4f891ad576fd58035c86b3cd3fc9e79de1b3237844148616b99af82a95a1ecc753
-  languageName: node
-  linkType: hard
-
-"@xmldom/xmldom@npm:^0.8.10":
-  version: 0.8.10
-  resolution: "@xmldom/xmldom@npm:0.8.10"
-  checksum: 4c136aec31fb3b49aaa53b6fcbfe524d02a1dc0d8e17ee35bd3bf35e9ce1344560481cd1efd086ad1a4821541482528672306d5e37cdbd187f33d7fadd3e2cf0
-  languageName: node
-  linkType: hard
-
 "JSONStream@npm:^1.0.4":
   version: 1.3.5
   resolution: "JSONStream@npm:1.3.5"
@@ -2151,13 +1842,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"abab@npm:^2.0.6":
-  version: 2.0.6
-  resolution: "abab@npm:2.0.6"
-  checksum: 6ffc1af4ff315066c62600123990d87551ceb0aafa01e6539da77b0f5987ac7019466780bf480f1787576d4385e3690c81ccc37cfda12819bf510b8ab47e5a3e
-  languageName: node
-  linkType: hard
-
 "abbrev@npm:1, abbrev@npm:^1.0.0":
   version: 1.1.1
   resolution: "abbrev@npm:1.1.1"
@@ -2186,16 +1870,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"acorn-globals@npm:^7.0.0":
-  version: 7.0.1
-  resolution: "acorn-globals@npm:7.0.1"
-  dependencies:
-    acorn: ^8.1.0
-    acorn-walk: ^8.0.2
-  checksum: 2a2998a547af6d0db5f0cdb90acaa7c3cbca6709010e02121fb8b8617c0fbd8bab0b869579903fde358ac78454356a14fadcc1a672ecb97b04b1c2ccba955ce8
-  languageName: node
-  linkType: hard
-
 "acorn-import-assertions@npm:^1.9.0":
   version: 1.9.0
   resolution: "acorn-import-assertions@npm:1.9.0"
@@ -2258,14 +1932,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"acorn-walk@npm:^8.0.0, acorn-walk@npm:^8.0.2":
+"acorn-walk@npm:^8.0.0":
   version: 8.2.0
   resolution: "acorn-walk@npm:8.2.0"
   checksum: 1715e76c01dd7b2d4ca472f9c58968516a4899378a63ad5b6c2d668bba8da21a71976c14ec5f5b75f887b6317c4ae0b897ab141c831d741dc76024d8745f1ad1
   languageName: node
   linkType: hard
 
-"acorn@npm:^8.0.4, acorn@npm:^8.1.0, acorn@npm:^8.8.1, acorn@npm:^8.8.2, acorn@npm:^8.9.0":
+"acorn@npm:^8.0.4, acorn@npm:^8.8.2, acorn@npm:^8.9.0":
   version: 8.10.0
   resolution: "acorn@npm:8.10.0"
   bin:
@@ -2488,19 +2162,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"array-includes@npm:^3.1.6":
-  version: 3.1.7
-  resolution: "array-includes@npm:3.1.7"
-  dependencies:
-    call-bind: ^1.0.2
-    define-properties: ^1.2.0
-    es-abstract: ^1.22.1
-    get-intrinsic: ^1.2.1
-    is-string: ^1.0.7
-  checksum: 06f9e4598fac12a919f7c59a3f04f010ea07f0b7f0585465ed12ef528a60e45f374e79d1bddbb34cdd4338357d00023ddbd0ac18b0be36964f5e726e8965d7fc
-  languageName: node
-  linkType: hard
-
 "array-union@npm:^2.1.0":
   version: 2.1.0
   resolution: "array-union@npm:2.1.0"
@@ -2508,56 +2169,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"array.prototype.flat@npm:^1.3.1":
-  version: 1.3.2
-  resolution: "array.prototype.flat@npm:1.3.2"
-  dependencies:
-    call-bind: ^1.0.2
-    define-properties: ^1.2.0
-    es-abstract: ^1.22.1
-    es-shim-unscopables: ^1.0.0
-  checksum: 5d6b4bf102065fb3f43764bfff6feb3295d372ce89591e6005df3d0ce388527a9f03c909af6f2a973969a4d178ab232ffc9236654149173e0e187ec3a1a6b87b
-  languageName: node
-  linkType: hard
-
-"array.prototype.flatmap@npm:^1.3.1":
-  version: 1.3.2
-  resolution: "array.prototype.flatmap@npm:1.3.2"
-  dependencies:
-    call-bind: ^1.0.2
-    define-properties: ^1.2.0
-    es-abstract: ^1.22.1
-    es-shim-unscopables: ^1.0.0
-  checksum: ce09fe21dc0bcd4f30271f8144083aa8c13d4639074d6c8dc82054b847c7fc9a0c97f857491f4da19d4003e507172a78f4bcd12903098adac8b9cd374f734be3
-  languageName: node
-  linkType: hard
-
-"array.prototype.map@npm:^1.0.5":
-  version: 1.0.6
-  resolution: "array.prototype.map@npm:1.0.6"
-  dependencies:
-    call-bind: ^1.0.2
-    define-properties: ^1.2.0
-    es-abstract: ^1.22.1
-    es-array-method-boxes-properly: ^1.0.0
-    is-string: ^1.0.7
-  checksum: dfba063cdfb5faba9ee32d5836dc23f3963c2bf7c7ea7d745ee0a96bacf663cbb32ab0bf17d8f65ac6e8c91a162efdea8edbc8b36aed9d17687ce482ba60d91f
-  languageName: node
-  linkType: hard
-
-"array.prototype.tosorted@npm:^1.1.1":
-  version: 1.1.2
-  resolution: "array.prototype.tosorted@npm:1.1.2"
-  dependencies:
-    call-bind: ^1.0.2
-    define-properties: ^1.2.0
-    es-abstract: ^1.22.1
-    es-shim-unscopables: ^1.0.0
-    get-intrinsic: ^1.2.1
-  checksum: 3607a7d6b117f0ffa6f4012457b7af0d47d38cf05e01d50e09682fd2fb782a66093a5e5fbbdbad77c8c824794a9d892a51844041641f719ad41e3a974f0764de
-  languageName: node
-  linkType: hard
-
 "arraybuffer.prototype.slice@npm:^1.0.2":
   version: 1.0.2
   resolution: "arraybuffer.prototype.slice@npm:1.0.2"
@@ -2651,15 +2262,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"asynciterator.prototype@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "asynciterator.prototype@npm:1.0.0"
-  dependencies:
-    has-symbols: ^1.0.3
-  checksum: e8ebfd9493ac651cf9b4165e9d64030b3da1d17181bb1963627b59e240cdaf021d9b59d44b827dc1dde4e22387ec04c2d0f8720cf58a1c282e34e40cc12721b3
-  languageName: node
-  linkType: hard
-
 "asynckit@npm:^0.4.0":
   version: 0.4.0
   resolution: "asynckit@npm:0.4.0"
@@ -2681,17 +2283,9 @@ __metadata:
     "@babel/core": ^7.23.9
     "@babel/plugin-transform-modules-commonjs": ^7.23.3
     "@babel/runtime": ^7.23.9
-    "@crello/react-lottie": 0.0.9
-    "@fortawesome/fontawesome-free": ^6.4.2
-    "@fortawesome/fontawesome-svg-core": ~6.4.2
-    "@fortawesome/free-solid-svg-icons": ^6.4.2
-    "@fortawesome/react-fontawesome": ^0.2.0
-    "@jstarpl/react-contextmenu": ^2.15.0
     "@koa/cors": ^5.0.0
     "@koa/router": ^12.0.1
-    "@mos-connection/helper": ^4.1.1-nightly-master-20240430-072032-ffb8bf6.0
-    "@nrk/core-icons": ^9.6.0
-    "@popperjs/core": ^2.11.8
+    "@mos-connection/helper": v4.2.0-alpha.1
     "@shopify/jest-koa-mocks": ^5.1.1
     "@slack/webhook": ^6.1.0
     "@sofie-automation/blueprints-integration": "portal:../packages/blueprints-integration"
@@ -2699,43 +2293,29 @@ __metadata:
     "@sofie-automation/corelib": "portal:../packages/corelib"
     "@sofie-automation/eslint-plugin": ^0.1.1
     "@sofie-automation/job-worker": "portal:../packages/job-worker"
+    "@sofie-automation/meteor-lib": "portal:../packages/meteor-lib"
     "@sofie-automation/shared-lib": "portal:../packages/shared-lib"
-    "@sofie-automation/sorensen": ^1.4.2
     "@types/app-root-path": ^1.2.8
     "@types/body-parser": ^1.19.5
-    "@types/classnames": ^2.3.1
     "@types/deep-extend": ^0.6.2
     "@types/fibers": ^3.1.4
     "@types/jest": ^29.5.11
     "@types/koa": ^2.14.0
     "@types/koa-bodyparser": ^4.3.12
+    "@types/koa-static": ^4.0.4
     "@types/koa__cors": ^5.0.0
     "@types/koa__router": ^12.0.4
     "@types/node": ^14.18.63
-    "@types/prop-types": ^15.7.11
-    "@types/react": ^18.2.51
-    "@types/react-circular-progressbar": ^1.1.0
-    "@types/react-datepicker": ^3.1.8
-    "@types/react-dom": ^18.2.18
-    "@types/react-router": ^5.1.20
-    "@types/react-router-dom": ^5.3.3
     "@types/request": ^2.48.12
     "@types/semver": ^7.5.6
-    "@types/sinon": ^10.0.20
-    "@types/underscore": 1.11.15
-    "@types/xml2js": ^0.4.14
+    "@types/underscore": ^1.11.15
     "@typescript-eslint/eslint-plugin": ^5.62.0
     "@typescript-eslint/parser": ^5.62.0
     "@typescript-eslint/utils": ^5.62.0
-    "@welldone-software/why-did-you-render": ^4.3.2
-    "@xmldom/xmldom": ^0.8.10
     app-root-path: ^3.1.0
     babel-jest: ^29.7.0
     bcrypt: ^5.1.1
     body-parser: ^1.20.2
-    classnames: ^2.5.1
-    core-js: ^3.35.1
-    cubic-spline: ^3.0.3
     deep-extend: 0.6.0
     deepmerge: ^4.3.1
     ejson: ^2.2.3
@@ -2745,23 +2325,18 @@ __metadata:
     eslint-plugin-jest: ^27.6.3
     eslint-plugin-node: ^11.1.0
     eslint-plugin-prettier: ^4.2.1
-    eslint-plugin-react: ^7.33.2
     fast-clone: ^1.5.13
     fibers-npm: "npm:fibers@5.0.3"
     glob: ^8.1.0
     i18next: ^21.10.0
-    i18next-browser-languagedetector: ^6.1.8
     i18next-conv: ^10.2.0
-    i18next-http-backend: ^1.4.5
     i18next-scanner: ^4.4.0
-    immutability-helper: ^3.1.1
     indexof: 0.0.1
     jest: ^29.7.0
-    jest-environment-jsdom: ^29.7.0
     koa: ^2.15.0
     koa-bodyparser: ^4.4.1
+    koa-static: ^5.0.0
     legally: ^3.5.10
-    lottie-web: ^5.12.2
     meteor-node-stubs: ^1.2.7
     meteor-promise: 0.9.0
     moment: ^2.30.1
@@ -2771,42 +2346,17 @@ __metadata:
     object-path: ^0.11.8
     open-cli: ^7.2.0
     p-lazy: ^3.1.0
-    p-queue: ^7.4.1
     prettier: ^2.8.8
-    promise.allsettled: ^1.0.7
-    prop-types: ^15.8.1
-    query-string: ^6.14.1
-    rc-tooltip: ^6.1.3
-    react: ^18.2.0
-    react-circular-progressbar: ^2.1.0
-    react-datepicker: ^3.8.0
-    react-dnd: ^14.0.5
-    react-dnd-html5-backend: ^14.1.0
-    react-dom: ^18.2.0
-    react-focus-bounder: ^1.1.6
-    react-hotkeys: ^2.0.0
-    react-i18next: ^11.18.6
-    react-intersection-observer: ^9.10.3
-    react-moment: ^0.9.7
-    react-popper: ^2.3.0
-    react-router-dom: ^5.3.4
-    react-timer-hoc: ^2.3.0
     semver: ^7.5.4
-    sinon: ^14.0.2
     standard-version: ^9.5.0
-    superfly-timeline: 9.0.0
+    superfly-timeline: 9.0.2
     threadedclass: ^1.2.2
     timecode: 0.0.4
     ts-jest: ^29.1.2
     type-fest: ^3.13.1
     typescript: ^4.9.5
     underscore: ^1.13.6
-    velocity-animate: ^1.5.2
-    velocity-react: ^1.4.3
-    webmidi: ^2.5.3
     winston: ^3.11.0
-    xml2js: ^0.6.2
-    xmlbuilder: ^15.1.1
     yargs: ^17.7.2
   languageName: unknown
   linkType: soft
@@ -3421,13 +2971,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"classnames@npm:*, classnames@npm:^2.2.1, classnames@npm:^2.2.5, classnames@npm:^2.2.6, classnames@npm:^2.3.1, classnames@npm:^2.3.2, classnames@npm:^2.5.1":
-  version: 2.5.1
-  resolution: "classnames@npm:2.5.1"
-  checksum: da424a8a6f3a96a2e87d01a432ba19315503294ac7e025f9fece656db6b6a0f7b5003bb1fbb51cbb0d9624d964f1b9bb35a51c73af9b2434c7b292c42231c1e5
-  languageName: node
-  linkType: hard
-
 "clean-stack@npm:^2.0.0":
   version: 2.2.0
   resolution: "clean-stack@npm:2.2.0"
@@ -3605,7 +3148,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"combined-stream@npm:^1.0.6, combined-stream@npm:^1.0.8":
+"combined-stream@npm:^1.0.6":
   version: 1.0.8
   resolution: "combined-stream@npm:1.0.8"
   dependencies:
@@ -3949,13 +3492,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"core-js@npm:^3.35.1":
-  version: 3.35.1
-  resolution: "core-js@npm:3.35.1"
-  checksum: e246af6b634be3763ffe3ce6ac4601b4dc5b928006fb6c95e5d08ecd82a2413bf36f00ffe178b89c9a8e94000288933a78a9881b2c9498e6cf312b031013b952
-  languageName: node
-  linkType: hard
-
 "core-util-is@npm:^1.0.2, core-util-is@npm:~1.0.0":
   version: 1.0.3
   resolution: "core-util-is@npm:1.0.3"
@@ -4017,15 +3553,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cross-fetch@npm:3.1.5":
-  version: 3.1.5
-  resolution: "cross-fetch@npm:3.1.5"
-  dependencies:
-    node-fetch: 2.6.7
-  checksum: f6b8c6ee3ef993ace6277fd789c71b6acf1b504fd5f5c7128df4ef2f125a429e29cd62dc8c127523f04a5f2fa4771ed80e3f3d9695617f441425045f505cf3bb
-  languageName: node
-  linkType: hard
-
 "cross-spawn@npm:^7.0.0, cross-spawn@npm:^7.0.2, cross-spawn@npm:^7.0.3":
   version: 7.0.3
   resolution: "cross-spawn@npm:7.0.3"
@@ -4065,43 +3592,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cssom@npm:^0.5.0":
-  version: 0.5.0
-  resolution: "cssom@npm:0.5.0"
-  checksum: 823471aa30091c59e0a305927c30e7768939b6af70405808f8d2ce1ca778cddcb24722717392438329d1691f9a87cb0183b64b8d779b56a961546d54854fde01
-  languageName: node
-  linkType: hard
-
-"cssom@npm:~0.3.6":
-  version: 0.3.8
-  resolution: "cssom@npm:0.3.8"
-  checksum: 24beb3087c76c0d52dd458be9ee1fbc80ac771478a9baef35dd258cdeb527c68eb43204dd439692bb2b1ae5272fa5f2946d10946edab0d04f1078f85e06bc7f6
-  languageName: node
-  linkType: hard
-
-"cssstyle@npm:^2.3.0":
-  version: 2.3.0
-  resolution: "cssstyle@npm:2.3.0"
-  dependencies:
-    cssom: ~0.3.6
-  checksum: 5f05e6fd2e3df0b44695c2f08b9ef38b011862b274e320665176467c0725e44a53e341bc4959a41176e83b66064ab786262e7380fd1cabeae6efee0d255bb4e3
-  languageName: node
-  linkType: hard
-
-"csstype@npm:^3.0.2":
-  version: 3.1.2
-  resolution: "csstype@npm:3.1.2"
-  checksum: e1a52e6c25c1314d6beef5168da704ab29c5186b877c07d822bd0806717d9a265e8493a2e35ca7e68d0f5d472d43fac1cdce70fd79fd0853dff81f3028d857b5
-  languageName: node
-  linkType: hard
-
-"cubic-spline@npm:^3.0.3":
-  version: 3.0.3
-  resolution: "cubic-spline@npm:3.0.3"
-  checksum: 860170c5d49b05749cd9de3a5fa4e3c1c1eeee8f0e0235778d178bb48b73db10ec7793ea3e9f25d846dc9cff031b71ab1e5ccccdfea61e22ca605e01b6dde0e1
-  languageName: node
-  linkType: hard
-
 "dargs@npm:^7.0.0":
   version: 7.0.0
   resolution: "dargs@npm:7.0.0"
@@ -4109,18 +3599,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"data-urls@npm:^3.0.2":
-  version: 3.0.2
-  resolution: "data-urls@npm:3.0.2"
-  dependencies:
-    abab: ^2.0.6
-    whatwg-mimetype: ^3.0.0
-    whatwg-url: ^11.0.0
-  checksum: 033fc3dd0fba6d24bc9a024ddcf9923691dd24f90a3d26f6545d6a2f71ec6956f93462f2cdf2183cc46f10dc01ed3bcb36731a8208456eb1a08147e571fe2a76
-  languageName: node
-  linkType: hard
-
-"date-fns@npm:^2.0.1, date-fns@npm:^2.29.3":
+"date-fns@npm:^2.29.3":
   version: 2.30.0
   resolution: "date-fns@npm:2.30.0"
   dependencies:
@@ -4197,20 +3676,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"decimal.js@npm:^10.4.2":
-  version: 10.4.3
-  resolution: "decimal.js@npm:10.4.3"
-  checksum: 796404dcfa9d1dbfdc48870229d57f788b48c21c603c3f6554a1c17c10195fc1024de338b0cf9e1efe0c7c167eeb18f04548979bcc5fdfabebb7cc0ae3287bae
-  languageName: node
-  linkType: hard
-
-"decode-uri-component@npm:^0.2.0":
-  version: 0.2.2
-  resolution: "decode-uri-component@npm:0.2.2"
-  checksum: 95476a7d28f267292ce745eac3524a9079058bbb35767b76e3ee87d42e34cd0275d2eb19d9d08c3e167f97556e8a2872747f5e65cbebcac8b0c98d83e285f139
-  languageName: node
-  linkType: hard
-
 "dedent@npm:^1.0.0":
   version: 1.5.1
   resolution: "dedent@npm:1.5.1"
@@ -4223,20 +3688,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"deep-equal@npm:^1.1.1":
-  version: 1.1.1
-  resolution: "deep-equal@npm:1.1.1"
-  dependencies:
-    is-arguments: ^1.0.4
-    is-date-object: ^1.0.1
-    is-regex: ^1.0.4
-    object-is: ^1.0.1
-    object-keys: ^1.1.1
-    regexp.prototype.flags: ^1.2.0
-  checksum: f92686f2c5bcdf714a75a5fa7a9e47cb374a8ec9307e717b8d1ce61f56a75aaebf5619c2a12b8087a705b5a2f60d0292c35f8b58cb1f72e3268a3a15cab9f78d
-  languageName: node
-  linkType: hard
-
 "deep-equal@npm:~1.0.1":
   version: 1.0.1
   resolution: "deep-equal@npm:1.0.1"
@@ -4305,7 +3756,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"define-properties@npm:^1.1.3, define-properties@npm:^1.1.4, define-properties@npm:^1.2.0, define-properties@npm:^1.2.1":
+"define-properties@npm:^1.1.3, define-properties@npm:^1.1.4, define-properties@npm:^1.2.0":
   version: 1.2.1
   resolution: "define-properties@npm:1.2.1"
   dependencies:
@@ -4408,13 +3859,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"diff@npm:^5.0.0":
-  version: 5.1.0
-  resolution: "diff@npm:5.1.0"
-  checksum: c7bf0df7c9bfbe1cf8a678fd1b2137c4fb11be117a67bc18a0e03ae75105e8533dbfb1cda6b46beb3586ef5aed22143ef9d70713977d5fb1f9114e21455fba90
-  languageName: node
-  linkType: hard
-
 "diffie-hellman@npm:^5.0.0":
   version: 5.0.3
   resolution: "diffie-hellman@npm:5.0.3"
@@ -4435,26 +3879,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"dnd-core@npm:14.0.1":
-  version: 14.0.1
-  resolution: "dnd-core@npm:14.0.1"
-  dependencies:
-    "@react-dnd/asap": ^4.0.0
-    "@react-dnd/invariant": ^2.0.0
-    redux: ^4.1.1
-  checksum: dbc50727f53baad1cb1e0430a2a1b81c5c291389322f90fdc46edeb2fd49cc206ce4fa30a95afb53d88238945228e34866d7465f7ea49285c296baf883551301
-  languageName: node
-  linkType: hard
-
-"doctrine@npm:^2.1.0":
-  version: 2.1.0
-  resolution: "doctrine@npm:2.1.0"
-  dependencies:
-    esutils: ^2.0.2
-  checksum: a45e277f7feaed309fe658ace1ff286c6e2002ac515af0aaf37145b8baa96e49899638c7cd47dccf84c3d32abfc113246625b3ac8f552d1046072adee13b0dc8
-  languageName: node
-  linkType: hard
-
 "doctrine@npm:^3.0.0":
   version: 3.0.0
   resolution: "doctrine@npm:3.0.0"
@@ -4464,15 +3888,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"dom-helpers@npm:^3.4.0":
-  version: 3.4.0
-  resolution: "dom-helpers@npm:3.4.0"
-  dependencies:
-    "@babel/runtime": ^7.1.2
-  checksum: 58d9f1c4a96daf77eddc63ae1236b826e1cddd6db66bbf39b18d7e21896d99365b376593352d52a60969d67fa4a8dbef26adc1439fa2c1b355efa37cacbaf637
-  languageName: node
-  linkType: hard
-
 "domain-browser@npm:^4.22.0":
   version: 4.22.0
   resolution: "domain-browser@npm:4.22.0"
@@ -4480,15 +3895,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"domexception@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "domexception@npm:4.0.0"
-  dependencies:
-    webidl-conversions: ^7.0.0
-  checksum: ddbc1268edf33a8ba02ccc596735ede80375ee0cf124b30d2f05df5b464ba78ef4f49889b6391df4a04954e63d42d5631c7fcf8b1c4f12bc531252977a5f13d5
-  languageName: node
-  linkType: hard
-
 "dot-prop@npm:^5.1.0":
   version: 5.3.0
   resolution: "dot-prop@npm:5.3.0"
@@ -4657,13 +4063,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"entities@npm:^4.4.0":
-  version: 4.5.0
-  resolution: "entities@npm:4.5.0"
-  checksum: 853f8ebd5b425d350bffa97dd6958143179a5938352ccae092c62d1267c4e392a039be1bae7d51b6e4ffad25f51f9617531fedf5237f15df302ccfb452cbf2d7
-  languageName: node
-  linkType: hard
-
 "env-paths@npm:^2.2.0":
   version: 2.2.1
   resolution: "env-paths@npm:2.2.1"
@@ -4757,52 +4156,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"es-array-method-boxes-properly@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "es-array-method-boxes-properly@npm:1.0.0"
-  checksum: 2537fcd1cecf187083890bc6f5236d3a26bf39237433587e5bf63392e88faae929dbba78ff0120681a3f6f81c23fe3816122982c160d63b38c95c830b633b826
-  languageName: node
-  linkType: hard
-
-"es-get-iterator@npm:^1.0.2":
-  version: 1.1.3
-  resolution: "es-get-iterator@npm:1.1.3"
-  dependencies:
-    call-bind: ^1.0.2
-    get-intrinsic: ^1.1.3
-    has-symbols: ^1.0.3
-    is-arguments: ^1.1.1
-    is-map: ^2.0.2
-    is-set: ^2.0.2
-    is-string: ^1.0.7
-    isarray: ^2.0.5
-    stop-iteration-iterator: ^1.0.0
-  checksum: 8fa118da42667a01a7c7529f8a8cca514feeff243feec1ce0bb73baaa3514560bd09d2b3438873cf8a5aaec5d52da248131de153b28e2638a061b6e4df13267d
-  languageName: node
-  linkType: hard
-
-"es-iterator-helpers@npm:^1.0.12":
-  version: 1.0.15
-  resolution: "es-iterator-helpers@npm:1.0.15"
-  dependencies:
-    asynciterator.prototype: ^1.0.0
-    call-bind: ^1.0.2
-    define-properties: ^1.2.1
-    es-abstract: ^1.22.1
-    es-set-tostringtag: ^2.0.1
-    function-bind: ^1.1.1
-    get-intrinsic: ^1.2.1
-    globalthis: ^1.0.3
-    has-property-descriptors: ^1.0.0
-    has-proto: ^1.0.1
-    has-symbols: ^1.0.3
-    internal-slot: ^1.0.5
-    iterator.prototype: ^1.1.2
-    safe-array-concat: ^1.0.1
-  checksum: 50081ae5c549efe62e5c1d244df0194b40b075f7897fc2116b7e1aa437eb3c41f946d2afda18c33f9b31266ec544765932542765af839f76fa6d7b7855d1e0e1
-  languageName: node
-  linkType: hard
-
 "es-set-tostringtag@npm:^2.0.1":
   version: 2.0.1
   resolution: "es-set-tostringtag@npm:2.0.1"
@@ -4814,15 +4167,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"es-shim-unscopables@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "es-shim-unscopables@npm:1.0.0"
-  dependencies:
-    has: ^1.0.3
-  checksum: 83e95cadbb6ee44d3644dfad60dcad7929edbc42c85e66c3e99aefd68a3a5c5665f2686885cddb47dfeabfd77bd5ea5a7060f2092a955a729bbd8834f0d86fa1
-  languageName: node
-  linkType: hard
-
 "es-to-primitive@npm:^1.2.1":
   version: 1.2.1
   resolution: "es-to-primitive@npm:1.2.1"
@@ -4869,24 +4213,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"escodegen@npm:^2.0.0":
-  version: 2.1.0
-  resolution: "escodegen@npm:2.1.0"
-  dependencies:
-    esprima: ^4.0.1
-    estraverse: ^5.2.0
-    esutils: ^2.0.2
-    source-map: ~0.6.1
-  dependenciesMeta:
-    source-map:
-      optional: true
-  bin:
-    escodegen: bin/escodegen.js
-    esgenerate: bin/esgenerate.js
-  checksum: 096696407e161305cd05aebb95134ad176708bc5cb13d0dcc89a5fcbb959b8ed757e7f2591a5f8036f8f4952d4a724de0df14cd419e29212729fa6df5ce16bf6
-  languageName: node
-  linkType: hard
-
 "eslint-config-prettier@npm:^8.10.0, eslint-config-prettier@npm:^8.8.0":
   version: 8.10.0
   resolution: "eslint-config-prettier@npm:8.10.0"
@@ -4965,32 +4291,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"eslint-plugin-react@npm:^7.33.2":
-  version: 7.33.2
-  resolution: "eslint-plugin-react@npm:7.33.2"
-  dependencies:
-    array-includes: ^3.1.6
-    array.prototype.flatmap: ^1.3.1
-    array.prototype.tosorted: ^1.1.1
-    doctrine: ^2.1.0
-    es-iterator-helpers: ^1.0.12
-    estraverse: ^5.3.0
-    jsx-ast-utils: ^2.4.1 || ^3.0.0
-    minimatch: ^3.1.2
-    object.entries: ^1.1.6
-    object.fromentries: ^2.0.6
-    object.hasown: ^1.1.2
-    object.values: ^1.1.6
-    prop-types: ^15.8.1
-    resolve: ^2.0.0-next.4
-    semver: ^6.3.1
-    string.prototype.matchall: ^4.0.8
-  peerDependencies:
-    eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8
-  checksum: b4c3d76390b0ae6b6f9fed78170604cc2c04b48e6778a637db339e8e3911ec9ef22510b0ae77c429698151d0f1b245f282177f384105b6830e7b29b9c9b26610
-  languageName: node
-  linkType: hard
-
 "eslint-scope@npm:^5.1.1":
   version: 5.1.1
   resolution: "eslint-scope@npm:5.1.1"
@@ -5103,7 +4403,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"esprima@npm:^4.0.0, esprima@npm:^4.0.1":
+"esprima@npm:^4.0.0":
   version: 4.0.1
   resolution: "esprima@npm:4.0.1"
   bin:
@@ -5138,7 +4438,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"estraverse@npm:^5.1.0, estraverse@npm:^5.2.0, estraverse@npm:^5.3.0":
+"estraverse@npm:^5.1.0, estraverse@npm:^5.2.0":
   version: 5.3.0
   resolution: "estraverse@npm:5.3.0"
   checksum: 072780882dc8416ad144f8fe199628d2b3e7bbc9989d9ed43795d2c90309a2047e6bc5979d7e2322a341163d22cfad9e21f4110597fe487519697389497e4e2b
@@ -5407,13 +4707,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"filter-obj@npm:^1.1.0":
-  version: 1.1.0
-  resolution: "filter-obj@npm:1.1.0"
-  checksum: cf2104a7c45ff48e7f505b78a3991c8f7f30f28bd8106ef582721f321f1c6277f7751aacd5d83026cb079d9d5091082f588d14a72e7c5d720ece79118fa61e10
-  languageName: node
-  linkType: hard
-
 "find-up@npm:^2.0.0":
   version: 2.1.0
   resolution: "find-up@npm:2.1.0"
@@ -5534,17 +4827,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"form-data@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "form-data@npm:4.0.0"
-  dependencies:
-    asynckit: ^0.4.0
-    combined-stream: ^1.0.8
-    mime-types: ^2.1.12
-  checksum: 01135bf8675f9d5c61ff18e2e2932f719ca4de964e3be90ef4c36aacfc7b9cb2fceb5eca0b7e0190e3383fe51c5b37f4cb80b62ca06a99aaabfcfd6ac7c9328c
-  languageName: node
-  linkType: hard
-
 "forwarded-parse@npm:^2.1.0":
   version: 2.1.2
   resolution: "forwarded-parse@npm:2.1.2"
@@ -5620,7 +4902,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"function.prototype.name@npm:^1.1.5, function.prototype.name@npm:^1.1.6":
+"function.prototype.name@npm:^1.1.6":
   version: 1.1.6
   resolution: "function.prototype.name@npm:1.1.6"
   dependencies:
@@ -5939,13 +5221,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"gud@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "gud@npm:1.0.0"
-  checksum: 3e2eb37cf794364077c18f036d6aa259c821c7fd188f2b7935cb00d589d82a41e0ebb1be809e1a93679417f62f1ad0513e745c3cf5329596e489aef8c5e5feae
-  languageName: node
-  linkType: hard
-
 "gulp-sort@npm:^2.0.0":
   version: 2.0.0
   resolution: "gulp-sort@npm:2.0.0"
@@ -6070,20 +5345,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"history@npm:^4.9.0":
-  version: 4.10.1
-  resolution: "history@npm:4.10.1"
-  dependencies:
-    "@babel/runtime": ^7.1.2
-    loose-envify: ^1.2.0
-    resolve-pathname: ^3.0.0
-    tiny-invariant: ^1.0.2
-    tiny-warning: ^1.0.0
-    value-equal: ^1.0.1
-  checksum: addd84bc4683929bae4400419b5af132ff4e4e9b311a0d4e224579ea8e184a6b80d7f72c55927e4fa117f69076a9e47ce082d8d0b422f1a9ddac7991490ca1d0
-  languageName: node
-  linkType: hard
-
 "hmac-drbg@npm:^1.0.1":
   version: 1.0.1
   resolution: "hmac-drbg@npm:1.0.1"
@@ -6095,15 +5356,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"hoist-non-react-statics@npm:^3.1.0, hoist-non-react-statics@npm:^3.3.2":
-  version: 3.3.2
-  resolution: "hoist-non-react-statics@npm:3.3.2"
-  dependencies:
-    react-is: ^16.7.0
-  checksum: b1538270429b13901ee586aa44f4cc3ecd8831c061d06cb8322e50ea17b3f5ce4d0e2e66394761e6c8e152cd8c34fb3b4b690116c6ce2bd45b18c746516cb9e8
-  languageName: node
-  linkType: hard
-
 "hosted-git-info@npm:^2.1.4":
   version: 2.8.9
   resolution: "hosted-git-info@npm:2.8.9"
@@ -6129,15 +5381,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"html-encoding-sniffer@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "html-encoding-sniffer@npm:3.0.0"
-  dependencies:
-    whatwg-encoding: ^2.0.0
-  checksum: 8d806aa00487e279e5ccb573366a951a9f68f65c90298eac9c3a2b440a7ffe46615aff2995a2f61c6746c639234e6179a97e18ca5ccbbf93d3725ef2099a4502
-  languageName: node
-  linkType: hard
-
 "html-escaper@npm:^2.0.0":
   version: 2.0.2
   resolution: "html-escaper@npm:2.0.2"
@@ -6145,15 +5388,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"html-parse-stringify@npm:^3.0.1":
-  version: 3.0.1
-  resolution: "html-parse-stringify@npm:3.0.1"
-  dependencies:
-    void-elements: 3.1.0
-  checksum: 334fdebd4b5c355dba8e95284cead6f62bf865a2359da2759b039db58c805646350016d2017875718bc3c4b9bf81a0d11be5ee0cf4774a3a5a7b97cde21cfd67
-  languageName: node
-  linkType: hard
-
 "http-assert@npm:^1.3.0":
   version: 1.5.0
   resolution: "http-assert@npm:1.5.0"
@@ -6184,7 +5418,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"http-errors@npm:^1.6.3, http-errors@npm:~1.8.0":
+"http-errors@npm:^1.6.3, http-errors@npm:^1.7.3, http-errors@npm:~1.8.0":
   version: 1.8.1
   resolution: "http-errors@npm:1.8.1"
   dependencies:
@@ -6197,6 +5431,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"http-errors@npm:~1.6.2":
+  version: 1.6.3
+  resolution: "http-errors@npm:1.6.3"
+  dependencies:
+    depd: ~1.1.2
+    inherits: 2.0.3
+    setprototypeof: 1.1.0
+    statuses: ">= 1.4.0 < 2"
+  checksum: a9654ee027e3d5de305a56db1d1461f25709ac23267c6dc28cdab8323e3f96caa58a9a6a5e93ac15d7285cee0c2f019378c3ada9026e7fe19c872d695f27de7c
+  languageName: node
+  linkType: hard
+
 "http-headers@npm:^3.0.2":
   version: 3.0.2
   resolution: "http-headers@npm:3.0.2"
@@ -6224,7 +5470,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"https-proxy-agent@npm:^5.0.0, https-proxy-agent@npm:^5.0.1":
+"https-proxy-agent@npm:^5.0.0":
   version: 5.0.1
   resolution: "https-proxy-agent@npm:5.0.1"
   dependencies:
@@ -6266,15 +5512,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"i18next-browser-languagedetector@npm:^6.1.8":
-  version: 6.1.8
-  resolution: "i18next-browser-languagedetector@npm:6.1.8"
-  dependencies:
-    "@babel/runtime": ^7.19.0
-  checksum: dd84d3c9cb693a70662436b06f5554898815df33b7641249a64876c74c38960f11ef17b4d7f49ee2da7262abe0f3ae73abe7f3a3b435a344d0d07e4ca7cb24c6
-  languageName: node
-  linkType: hard
-
 "i18next-conv@npm:^10.2.0":
   version: 10.2.0
   resolution: "i18next-conv@npm:10.2.0"
@@ -6291,15 +5528,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"i18next-http-backend@npm:^1.4.5":
-  version: 1.4.5
-  resolution: "i18next-http-backend@npm:1.4.5"
-  dependencies:
-    cross-fetch: 3.1.5
-  checksum: 1978a9d7970cc711e96133553e5f3815cf16c3e2f8db7982036f8c913c5a64eb20953e85e0ab48a88ad3c754f51184b67a778655ed65aeaae46430cdc1f673da
-  languageName: node
-  linkType: hard
-
 "i18next-scanner@npm:^4.4.0":
   version: 4.4.0
   resolution: "i18next-scanner@npm:4.4.0"
@@ -6356,7 +5584,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"iconv-lite@npm:0.6.3, iconv-lite@npm:^0.6.2, iconv-lite@npm:^0.6.3":
+"iconv-lite@npm:^0.6.2, iconv-lite@npm:^0.6.3":
   version: 0.6.3
   resolution: "iconv-lite@npm:0.6.3"
   dependencies:
@@ -6379,13 +5607,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"immutability-helper@npm:^3.1.1":
-  version: 3.1.1
-  resolution: "immutability-helper@npm:3.1.1"
-  checksum: 6fdbf6d2123efa567263e904bbaff07aca0e24560d270d34967b03aab8ec20bd3e4057f394d59e50eb6c4718c9415591a6281692bb0aafd522ad72cf4887133f
-  languageName: node
-  linkType: hard
-
 "import-fresh@npm:^3.2.1":
   version: 3.3.0
   resolution: "import-fresh@npm:3.3.0"
@@ -6486,6 +5707,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"inherits@npm:2.0.3":
+  version: 2.0.3
+  resolution: "inherits@npm:2.0.3"
+  checksum: 78cb8d7d850d20a5e9a7f3620db31483aa00ad5f722ce03a55b110e5a723539b3716a3b463e2b96ce3fe286f33afc7c131fa2f91407528ba80cea98a7545d4c0
+  languageName: node
+  linkType: hard
+
 "ini@npm:^1.3.2":
   version: 1.3.8
   resolution: "ini@npm:1.3.8"
@@ -6493,7 +5721,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"internal-slot@npm:^1.0.4, internal-slot@npm:^1.0.5":
+"internal-slot@npm:^1.0.5":
   version: 1.0.5
   resolution: "internal-slot@npm:1.0.5"
   dependencies:
@@ -6511,15 +5739,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"invariant@npm:~2.2.2":
-  version: 2.2.4
-  resolution: "invariant@npm:2.2.4"
-  dependencies:
-    loose-envify: ^1.0.0
-  checksum: cc3182d793aad82a8d1f0af697b462939cb46066ec48bbf1707c150ad5fad6406137e91a262022c269702e01621f35ef60269f6c0d7fd178487959809acdfb14
-  languageName: node
-  linkType: hard
-
 "ip@npm:^2.0.0":
   version: 2.0.0
   resolution: "ip@npm:2.0.0"
@@ -6527,7 +5746,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-arguments@npm:^1.0.4, is-arguments@npm:^1.1.1":
+"is-arguments@npm:^1.0.4":
   version: 1.1.1
   resolution: "is-arguments@npm:1.1.1"
   dependencies:
@@ -6562,15 +5781,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-async-function@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "is-async-function@npm:2.0.0"
-  dependencies:
-    has-tostringtag: ^1.0.0
-  checksum: e3471d95e6c014bf37cad8a93f2f4b6aac962178e0a5041e8903147166964fdc1c5c1d2ef87e86d77322c370ca18f2ea004fa7420581fa747bcaf7c223069dbd
-  languageName: node
-  linkType: hard
-
 "is-bigint@npm:^1.0.1":
   version: 1.0.4
   resolution: "is-bigint@npm:1.0.4"
@@ -6597,7 +5807,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-core-module@npm:^2.13.0, is-core-module@npm:^2.5.0, is-core-module@npm:^2.8.1, is-core-module@npm:^2.9.0":
+"is-core-module@npm:^2.13.0, is-core-module@npm:^2.5.0, is-core-module@npm:^2.8.1":
   version: 2.13.0
   resolution: "is-core-module@npm:2.13.0"
   dependencies:
@@ -6606,7 +5816,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-date-object@npm:^1.0.1, is-date-object@npm:^1.0.5":
+"is-date-object@npm:^1.0.1":
   version: 1.0.5
   resolution: "is-date-object@npm:1.0.5"
   dependencies:
@@ -6640,15 +5850,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-finalizationregistry@npm:^1.0.2":
-  version: 1.0.2
-  resolution: "is-finalizationregistry@npm:1.0.2"
-  dependencies:
-    call-bind: ^1.0.2
-  checksum: 4f243a8e06228cd45bdab8608d2cb7abfc20f6f0189c8ac21ea8d603f1f196eabd531ce0bb8e08cbab047e9845ef2c191a3761c9a17ad5cabf8b35499c4ad35d
-  languageName: node
-  linkType: hard
-
 "is-finite@npm:^1.0.0":
   version: 1.1.0
   resolution: "is-finite@npm:1.1.0"
@@ -6677,7 +5878,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-generator-function@npm:^1.0.10, is-generator-function@npm:^1.0.7":
+"is-generator-function@npm:^1.0.7":
   version: 1.0.10
   resolution: "is-generator-function@npm:1.0.10"
   dependencies:
@@ -6722,13 +5923,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-map@npm:^2.0.1, is-map@npm:^2.0.2":
-  version: 2.0.2
-  resolution: "is-map@npm:2.0.2"
-  checksum: ace3d0ecd667bbdefdb1852de601268f67f2db725624b1958f279316e13fecb8fa7df91fd60f690d7417b4ec180712f5a7ee967008e27c65cfd475cc84337728
-  languageName: node
-  linkType: hard
-
 "is-nan@npm:^1.3.2":
   version: 1.3.2
   resolution: "is-nan@npm:1.3.2"
@@ -6816,14 +6010,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-potential-custom-element-name@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "is-potential-custom-element-name@npm:1.0.1"
-  checksum: ced7bbbb6433a5b684af581872afe0e1767e2d1146b2207ca0068a648fb5cab9d898495d1ac0583524faaf24ca98176a7d9876363097c2d14fee6dd324f3a1ab
-  languageName: node
-  linkType: hard
-
-"is-regex@npm:^1.0.4, is-regex@npm:^1.1.4":
+"is-regex@npm:^1.1.4":
   version: 1.1.4
   resolution: "is-regex@npm:1.1.4"
   dependencies:
@@ -6840,13 +6027,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-set@npm:^2.0.1, is-set@npm:^2.0.2":
-  version: 2.0.2
-  resolution: "is-set@npm:2.0.2"
-  checksum: b64343faf45e9387b97a6fd32be632ee7b269bd8183701f3b3f5b71a7cf00d04450ed8669d0bd08753e08b968beda96fca73a10fd0ff56a32603f64deba55a57
-  languageName: node
-  linkType: hard
-
 "is-shared-array-buffer@npm:^1.0.2":
   version: 1.0.2
   resolution: "is-shared-array-buffer@npm:1.0.2"
@@ -6913,13 +6093,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-weakmap@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "is-weakmap@npm:2.0.1"
-  checksum: 1222bb7e90c32bdb949226e66d26cb7bce12e1e28e3e1b40bfa6b390ba3e08192a8664a703dff2a00a84825f4e022f9cd58c4599ff9981ab72b1d69479f4f7f6
-  languageName: node
-  linkType: hard
-
 "is-weakref@npm:^1.0.2":
   version: 1.0.2
   resolution: "is-weakref@npm:1.0.2"
@@ -6929,16 +6102,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-weakset@npm:^2.0.1":
-  version: 2.0.2
-  resolution: "is-weakset@npm:2.0.2"
-  dependencies:
-    call-bind: ^1.0.2
-    get-intrinsic: ^1.1.1
-  checksum: 5d8698d1fa599a0635d7ca85be9c26d547b317ed8fd83fc75f03efbe75d50001b5eececb1e9971de85fcde84f69ae6f8346bc92d20d55d46201d328e4c74a367
-  languageName: node
-  linkType: hard
-
 "is-wsl@npm:^2.2.0":
   version: 2.2.0
   resolution: "is-wsl@npm:2.2.0"
@@ -7048,36 +6211,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"iterate-iterator@npm:^1.0.1":
-  version: 1.0.2
-  resolution: "iterate-iterator@npm:1.0.2"
-  checksum: 97b3ed4f2bebe038be57d03277879e406b2c537ceeeab7f82d4167f9a3cff872cc2cc5da3dc9920ff544ca247329d2a4d44121bb8ef8d0807a72176bdbc17c84
-  languageName: node
-  linkType: hard
-
-"iterate-value@npm:^1.0.2":
-  version: 1.0.2
-  resolution: "iterate-value@npm:1.0.2"
-  dependencies:
-    es-get-iterator: ^1.0.2
-    iterate-iterator: ^1.0.1
-  checksum: 446a4181657df1872e5020713206806757157db6ab375dee05eb4565b66e1244d7a99cd36ce06862261ad4bd059e66ba8192f62b5d1ff41d788c3b61953af6c3
-  languageName: node
-  linkType: hard
-
-"iterator.prototype@npm:^1.1.2":
-  version: 1.1.2
-  resolution: "iterator.prototype@npm:1.1.2"
-  dependencies:
-    define-properties: ^1.2.1
-    get-intrinsic: ^1.2.1
-    has-symbols: ^1.0.3
-    reflect.getprototypeof: ^1.0.4
-    set-function-name: ^2.0.1
-  checksum: d8a507e2ccdc2ce762e8a1d3f4438c5669160ac72b88b648e59a688eec6bc4e64b22338e74000518418d9e693faf2a092d2af21b9ec7dbf7763b037a54701168
-  languageName: node
-  linkType: hard
-
 "jackspeak@npm:^2.0.3":
   version: 2.3.3
   resolution: "jackspeak@npm:2.3.3"
@@ -7228,27 +6361,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jest-environment-jsdom@npm:^29.7.0":
-  version: 29.7.0
-  resolution: "jest-environment-jsdom@npm:29.7.0"
-  dependencies:
-    "@jest/environment": ^29.7.0
-    "@jest/fake-timers": ^29.7.0
-    "@jest/types": ^29.6.3
-    "@types/jsdom": ^20.0.0
-    "@types/node": "*"
-    jest-mock: ^29.7.0
-    jest-util: ^29.7.0
-    jsdom: ^20.0.0
-  peerDependencies:
-    canvas: ^2.5.0
-  peerDependenciesMeta:
-    canvas:
-      optional: true
-  checksum: 559aac134c196fccc1dfc794d8fc87377e9f78e894bb13012b0831d88dec0abd7ece99abec69da564b8073803be4f04a9eb4f4d1bb80e29eec0cb252c254deb8
-  languageName: node
-  linkType: hard
-
 "jest-environment-node@npm:^29.7.0":
   version: 29.7.0
   resolution: "jest-environment-node@npm:29.7.0"
@@ -7551,7 +6663,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"js-tokens@npm:^3.0.0 || ^4.0.0, js-tokens@npm:^4.0.0":
+"js-tokens@npm:^4.0.0":
   version: 4.0.0
   resolution: "js-tokens@npm:4.0.0"
   checksum: 8a95213a5a77deb6cbe94d86340e8d9ace2b93bc367790b260101d2f36a2eaf4e4e22d9fa9cf459b38af3a32fb4190e638024cf82ec95ef708680e405ea7cc78
@@ -7581,45 +6693,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jsdom@npm:^20.0.0":
-  version: 20.0.3
-  resolution: "jsdom@npm:20.0.3"
-  dependencies:
-    abab: ^2.0.6
-    acorn: ^8.8.1
-    acorn-globals: ^7.0.0
-    cssom: ^0.5.0
-    cssstyle: ^2.3.0
-    data-urls: ^3.0.2
-    decimal.js: ^10.4.2
-    domexception: ^4.0.0
-    escodegen: ^2.0.0
-    form-data: ^4.0.0
-    html-encoding-sniffer: ^3.0.0
-    http-proxy-agent: ^5.0.0
-    https-proxy-agent: ^5.0.1
-    is-potential-custom-element-name: ^1.0.1
-    nwsapi: ^2.2.2
-    parse5: ^7.1.1
-    saxes: ^6.0.0
-    symbol-tree: ^3.2.4
-    tough-cookie: ^4.1.2
-    w3c-xmlserializer: ^4.0.0
-    webidl-conversions: ^7.0.0
-    whatwg-encoding: ^2.0.0
-    whatwg-mimetype: ^3.0.0
-    whatwg-url: ^11.0.0
-    ws: ^8.11.0
-    xml-name-validator: ^4.0.0
-  peerDependencies:
-    canvas: ^2.5.0
-  peerDependenciesMeta:
-    canvas:
-      optional: true
-  checksum: 6e2ae21db397133a061b270c26d2dbc0b9051733ea3b896a7ece78d79f475ff0974f766a413c1198a79c793159119169f2335ddb23150348fbfdcfa6f3105536
-  languageName: node
-  linkType: hard
-
 "jsesc@npm:^2.5.1":
   version: 2.5.2
   resolution: "jsesc@npm:2.5.2"
@@ -7687,28 +6760,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jsx-ast-utils@npm:^2.4.1 || ^3.0.0":
-  version: 3.3.5
-  resolution: "jsx-ast-utils@npm:3.3.5"
-  dependencies:
-    array-includes: ^3.1.6
-    array.prototype.flat: ^1.3.1
-    object.assign: ^4.1.4
-    object.values: ^1.1.6
-  checksum: f4b05fa4d7b5234230c905cfa88d36dc8a58a6666975a3891429b1a8cdc8a140bca76c297225cb7a499fad25a2c052ac93934449a2c31a44fc9edd06c773780a
-  languageName: node
-  linkType: hard
-
-"just-extend@npm:^4.0.2":
-  version: 4.2.1
-  resolution: "just-extend@npm:4.2.1"
-  checksum: ff9fdede240fad313efeeeb68a660b942e5586d99c0058064c78884894a2690dc09bba44c994ad4e077e45d913fef01a9240c14a72c657b53687ac58de53b39c
-  languageName: node
-  linkType: hard
-
-"keygrip@npm:~1.1.0":
-  version: 1.1.0
-  resolution: "keygrip@npm:1.1.0"
+"keygrip@npm:~1.1.0":
+  version: 1.1.0
+  resolution: "keygrip@npm:1.1.0"
   dependencies:
     tsscmp: 1.0.6
   checksum: 078cd16a463d187121f0a27c1c9c95c52ad392b620f823431689f345a0501132cee60f6e96914b07d570105af470b96960402accd6c48a0b1f3cd8fac4fa2cae
@@ -7766,6 +6820,27 @@ __metadata:
   languageName: node
   linkType: hard
 
+"koa-send@npm:^5.0.0":
+  version: 5.0.1
+  resolution: "koa-send@npm:5.0.1"
+  dependencies:
+    debug: ^4.1.1
+    http-errors: ^1.7.3
+    resolve-path: ^1.4.0
+  checksum: a9fbaadbe0f50efd157a733df4a1cc2b3b79b0cdf12e67c718641e6038d1792c0bebe40913e6d4ceb707d970301155be3859b98d1ef08b0fd1766f7326b82853
+  languageName: node
+  linkType: hard
+
+"koa-static@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "koa-static@npm:5.0.0"
+  dependencies:
+    debug: ^3.1.0
+    koa-send: ^5.0.0
+  checksum: 8d9b9c4d2b3b13e8818e804245d784099c4b353b55ddd7dbeeb90f27a2e9f5b6f86bd16a4909e337cb89db4d332d9002e6c0f5056caf75749cab62f93c1f0cc5
+  languageName: node
+  linkType: hard
+
 "koa@npm:^2.13.4, koa@npm:^2.15.0":
   version: 2.15.0
   resolution: "koa@npm:2.15.0"
@@ -8004,7 +7079,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"lodash@npm:^4, lodash@npm:^4.0.0, lodash@npm:^4.17.15, lodash@npm:^4.17.5":
+"lodash@npm:^4.0.0, lodash@npm:^4.17.15":
   version: 4.17.21
   resolution: "lodash@npm:4.17.21"
   checksum: eb835a2e51d381e561e508ce932ea50a8e5a68f4ebdd771ea240d3048244a8d13658acbd502cd4829768c56f2e16bdd4340b9ea141297d472517b83868e677f7
@@ -8038,31 +7113,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"loose-envify@npm:^1.0.0, loose-envify@npm:^1.1.0, loose-envify@npm:^1.2.0, loose-envify@npm:^1.3.1, loose-envify@npm:^1.4.0":
-  version: 1.4.0
-  resolution: "loose-envify@npm:1.4.0"
-  dependencies:
-    js-tokens: ^3.0.0 || ^4.0.0
-  bin:
-    loose-envify: cli.js
-  checksum: 6517e24e0cad87ec9888f500c5b5947032cdfe6ef65e1c1936a0c48a524b81e65542c9c3edc91c97d5bddc806ee2a985dbc79be89215d613b1de5db6d1cfe6f4
-  languageName: node
-  linkType: hard
-
-"lottie-web@npm:5.5.9":
-  version: 5.5.9
-  resolution: "lottie-web@npm:5.5.9"
-  checksum: 9f59197f7a970d0a141fc86602eb3e6de89ba94286a77427b8b262cdb68e10d614757e0b8e8b806eb1e1e050a759a689dc8c1b0aa18d33da6550b556cfeb3376
-  languageName: node
-  linkType: hard
-
-"lottie-web@npm:^5.12.2":
-  version: 5.12.2
-  resolution: "lottie-web@npm:5.12.2"
-  checksum: af5bc3bc405fd760de8b17a36158d5a8c3e8c586c711d0c63681ddf056b65bc6b54ea36b1fcad782fb02dbe12e696a40e0ba72daf41b8f10ab5b5d1113793636
-  languageName: node
-  linkType: hard
-
 "lru-cache@npm:^4.0.0":
   version: 4.1.5
   resolution: "lru-cache@npm:4.1.5"
@@ -8741,19 +7791,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"nise@npm:^5.1.2":
-  version: 5.1.4
-  resolution: "nise@npm:5.1.4"
-  dependencies:
-    "@sinonjs/commons": ^2.0.0
-    "@sinonjs/fake-timers": ^10.0.2
-    "@sinonjs/text-encoding": ^0.7.1
-    just-extend: ^4.0.2
-    path-to-regexp: ^1.7.0
-  checksum: bc57c10eaec28a6a7ddfb2e1e9b21d5e1fe22710e514f8858ae477cf9c7e9c891475674d5241519193403db43d16c3675f4207bc094a7a27b7e4f56584a78c1b
-  languageName: node
-  linkType: hard
-
 "node-addon-api@npm:^5.0.0":
   version: 5.1.0
   resolution: "node-addon-api@npm:5.1.0"
@@ -8763,20 +7800,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"node-fetch@npm:2.6.7":
-  version: 2.6.7
-  resolution: "node-fetch@npm:2.6.7"
-  dependencies:
-    whatwg-url: ^5.0.0
-  peerDependencies:
-    encoding: ^0.1.0
-  peerDependenciesMeta:
-    encoding:
-      optional: true
-  checksum: 8d816ffd1ee22cab8301c7756ef04f3437f18dace86a1dae22cf81db8ef29c0bf6655f3215cb0cdb22b420b6fe141e64b26905e7f33f9377a7fa59135ea3e10b
-  languageName: node
-  linkType: hard
-
 "node-fetch@npm:^2.6.7, node-fetch@npm:^2.7.0":
   version: 2.7.0
   resolution: "node-fetch@npm:2.7.0"
@@ -9018,14 +8041,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"nwsapi@npm:^2.2.2":
-  version: 2.2.7
-  resolution: "nwsapi@npm:2.2.7"
-  checksum: cab25f7983acec7e23490fec3ef7be608041b460504229770e3bfcf9977c41d6fe58f518994d3bd9aa3a101f501089a3d4a63536f4ff8ae4b8c4ca23bdbfda4e
-  languageName: node
-  linkType: hard
-
-"object-assign@npm:^4.1.0, object-assign@npm:^4.1.1":
+"object-assign@npm:^4.1.1":
   version: 4.1.1
   resolution: "object-assign@npm:4.1.1"
   checksum: fcc6e4ea8c7fe48abfbb552578b1c53e0d194086e2e6bbbf59e0a536381a292f39943c6e9628af05b5528aa5e3318bb30d6b2e53cadaf5b8fe9e12c4b69af23f
@@ -9055,7 +8071,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"object-is@npm:^1.0.1, object-is@npm:^1.1.5":
+"object-is@npm:^1.1.5":
   version: 1.1.5
   resolution: "object-is@npm:1.1.5"
   dependencies:
@@ -9091,7 +8107,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"object.entries@npm:^1.0.4, object.entries@npm:^1.1.0, object.entries@npm:^1.1.6":
+"object.entries@npm:^1.0.4, object.entries@npm:^1.1.0":
   version: 1.1.7
   resolution: "object.entries@npm:1.1.7"
   dependencies:
@@ -9102,38 +8118,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"object.fromentries@npm:^2.0.6":
-  version: 2.0.7
-  resolution: "object.fromentries@npm:2.0.7"
-  dependencies:
-    call-bind: ^1.0.2
-    define-properties: ^1.2.0
-    es-abstract: ^1.22.1
-  checksum: 7341ce246e248b39a431b87a9ddd331ff52a454deb79afebc95609f94b1f8238966cf21f52188f2a353f0fdf83294f32f1ebf1f7826aae915ebad21fd0678065
-  languageName: node
-  linkType: hard
-
-"object.hasown@npm:^1.1.2":
-  version: 1.1.3
-  resolution: "object.hasown@npm:1.1.3"
-  dependencies:
-    define-properties: ^1.2.0
-    es-abstract: ^1.22.1
-  checksum: 76bc17356f6124542fb47e5d0e78d531eafa4bba3fc2d6fc4b1a8ce8b6878912366c0d99f37ce5c84ada8fd79df7aa6ea1214fddf721f43e093ad2df51f27da1
-  languageName: node
-  linkType: hard
-
-"object.values@npm:^1.1.6":
-  version: 1.1.7
-  resolution: "object.values@npm:1.1.7"
-  dependencies:
-    call-bind: ^1.0.2
-    define-properties: ^1.2.0
-    es-abstract: ^1.22.1
-  checksum: f3e4ae4f21eb1cc7cebb6ce036d4c67b36e1c750428d7b7623c56a0db90edced63d08af8a316d81dfb7c41a3a5fa81b05b7cc9426e98d7da986b1682460f0777
-  languageName: node
-  linkType: hard
-
 "on-finished@npm:2.4.1, on-finished@npm:^2.3.0":
   version: 2.4.1
   resolution: "on-finished@npm:2.4.1"
@@ -9371,16 +8355,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"p-queue@npm:^7.4.1":
-  version: 7.4.1
-  resolution: "p-queue@npm:7.4.1"
-  dependencies:
-    eventemitter3: ^5.0.1
-    p-timeout: ^5.0.2
-  checksum: 1c6888aa994d399262a9fbdd49c7066f8359732397f7a42ecf03f22875a1d65899797b46413f97e44acc18dddafbcc101eb135c284714c931dbbc83c3967f450
-  languageName: node
-  linkType: hard
-
 "p-timeout@npm:^4.1.0":
   version: 4.1.0
   resolution: "p-timeout@npm:4.1.0"
@@ -9388,13 +8362,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"p-timeout@npm:^5.0.2":
-  version: 5.1.0
-  resolution: "p-timeout@npm:5.1.0"
-  checksum: f5cd4e17301ff1ff1d8dbf2817df0ad88c6bba99349fc24d8d181827176ad4f8aca649190b8a5b1a428dfd6ddc091af4606835d3e0cb0656e04045da5c9e270c
-  languageName: node
-  linkType: hard
-
 "p-try@npm:^1.0.0":
   version: 1.0.0
   resolution: "p-try@npm:1.0.0"
@@ -9467,15 +8434,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"parse5@npm:^7.0.0, parse5@npm:^7.1.1":
-  version: 7.1.2
-  resolution: "parse5@npm:7.1.2"
-  dependencies:
-    entities: ^4.4.0
-  checksum: 59465dd05eb4c5ec87b76173d1c596e152a10e290b7abcda1aecf0f33be49646ea74840c69af975d7887543ea45564801736356c568d6b5e71792fd0f4055713
-  languageName: node
-  linkType: hard
-
 "parseurl@npm:^1.3.2, parseurl@npm:^1.3.3":
   version: 1.3.3
   resolution: "parseurl@npm:1.3.3"
@@ -9511,7 +8469,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"path-is-absolute@npm:^1.0.0":
+"path-is-absolute@npm:1.0.1, path-is-absolute@npm:^1.0.0":
   version: 1.0.1
   resolution: "path-is-absolute@npm:1.0.1"
   checksum: 060840f92cf8effa293bcc1bea81281bd7d363731d214cbe5c227df207c34cd727430f70c6037b5159c8a870b9157cba65e775446b0ab06fd5ecc7e54615a3b8
@@ -9549,15 +8507,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"path-to-regexp@npm:^1.7.0":
-  version: 1.8.0
-  resolution: "path-to-regexp@npm:1.8.0"
-  dependencies:
-    isarray: 0.0.1
-  checksum: 709f6f083c0552514ef4780cb2e7e4cf49b0cc89a97439f2b7cc69a608982b7690fb5d1720a7473a59806508fc2dae0be751ba49f495ecf89fd8fbc62abccbcd
-  languageName: node
-  linkType: hard
-
 "path-to-regexp@npm:^6.2.1":
   version: 6.2.1
   resolution: "path-to-regexp@npm:6.2.1"
@@ -9678,13 +8627,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"popper.js@npm:^1.14.1, popper.js@npm:^1.14.4":
-  version: 1.16.1
-  resolution: "popper.js@npm:1.16.1"
-  checksum: c56ae5001ec50a77ee297a8061a0221d99d25c7348d2e6bcd3e45a0d0f32a1fd81bca29d46cb0d4bdf13efb77685bd6a0ce93f9eb3c608311a461f945fffedbe
-  languageName: node
-  linkType: hard
-
 "prelude-ls@npm:^1.2.1":
   version: 1.2.1
   resolution: "prelude-ls@npm:1.2.1"
@@ -9768,20 +8710,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"promise.allsettled@npm:^1.0.7":
-  version: 1.0.7
-  resolution: "promise.allsettled@npm:1.0.7"
-  dependencies:
-    array.prototype.map: ^1.0.5
-    call-bind: ^1.0.2
-    define-properties: ^1.2.0
-    es-abstract: ^1.22.1
-    get-intrinsic: ^1.2.1
-    iterate-value: ^1.0.2
-  checksum: 96186392286e5ab9aef1a1a725c061c8cf268b6cf141f151daa3834bb8e1680f3b159af6536ce59cf80d4a6a5ad1d8371d05759980cc6c90d58800ddb0a7c119
-  languageName: node
-  linkType: hard
-
 "prompts@npm:^2.0.1":
   version: 2.4.2
   resolution: "prompts@npm:2.4.2"
@@ -9792,17 +8720,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"prop-types@npm:^15.5.8, prop-types@npm:^15.6.0, prop-types@npm:^15.6.1, prop-types@npm:^15.6.2, prop-types@npm:^15.7.2, prop-types@npm:^15.8.1":
-  version: 15.8.1
-  resolution: "prop-types@npm:15.8.1"
-  dependencies:
-    loose-envify: ^1.4.0
-    object-assign: ^4.1.1
-    react-is: ^16.13.1
-  checksum: c056d3f1c057cb7ff8344c645450e14f088a915d078dcda795041765047fa080d38e5d626560ccaac94a4e16e3aa15f3557c1a9a8d1174530955e992c675e459
-  languageName: node
-  linkType: hard
-
 "pseudomap@npm:^1.0.2":
   version: 1.0.2
   resolution: "pseudomap@npm:1.0.2"
@@ -9810,13 +8727,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"psl@npm:^1.1.33":
-  version: 1.9.0
-  resolution: "psl@npm:1.9.0"
-  checksum: 20c4277f640c93d393130673f392618e9a8044c6c7bf61c53917a0fddb4952790f5f362c6c730a9c32b124813e173733f9895add8d26f566ed0ea0654b2e711d
-  languageName: node
-  linkType: hard
-
 "public-encrypt@npm:^4.0.0":
   version: 4.0.3
   resolution: "public-encrypt@npm:4.0.3"
@@ -9877,18 +8787,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"query-string@npm:^6.14.1":
-  version: 6.14.1
-  resolution: "query-string@npm:6.14.1"
-  dependencies:
-    decode-uri-component: ^0.2.0
-    filter-obj: ^1.1.0
-    split-on-first: ^1.0.0
-    strict-uri-encode: ^2.0.0
-  checksum: f2c7347578fa0f3fd4eaace506470cb4e9dc52d409a7ddbd613f614b9a594d750877e193b5d5e843c7477b3b295b857ec328903c943957adc41a3efb6c929449
-  languageName: node
-  linkType: hard
-
 "querystring-es3@npm:^0.2.1":
   version: 0.2.1
   resolution: "querystring-es3@npm:0.2.1"
@@ -9976,337 +8874,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"rc-motion@npm:^2.0.0":
-  version: 2.9.0
-  resolution: "rc-motion@npm:2.9.0"
-  dependencies:
-    "@babel/runtime": ^7.11.1
-    classnames: ^2.2.1
-    rc-util: ^5.21.0
-  peerDependencies:
-    react: ">=16.9.0"
-    react-dom: ">=16.9.0"
-  checksum: 6c7c211a62896a2c443c43f27d13ec84c832884ec1860a40025f6270321e4e8c8a7abaf99d60a09d6e5cadc112e3d9787e0c58970eb69b0bb798eaa6be81dcf5
-  languageName: node
-  linkType: hard
-
-"rc-resize-observer@npm:^1.3.1":
-  version: 1.3.1
-  resolution: "rc-resize-observer@npm:1.3.1"
-  dependencies:
-    "@babel/runtime": ^7.20.7
-    classnames: ^2.2.1
-    rc-util: ^5.27.0
-    resize-observer-polyfill: ^1.5.1
-  peerDependencies:
-    react: ">=16.9.0"
-    react-dom: ">=16.9.0"
-  checksum: cc952e5d3071543e990103ea64b20310e3a09c950a473bf89a3a7e6063bd060c6c041f0333085640676d176c7edd58676a3b3d64dfa17461ea6f3a62f79c4d65
-  languageName: node
-  linkType: hard
-
-"rc-tooltip@npm:^6.1.3":
-  version: 6.1.3
-  resolution: "rc-tooltip@npm:6.1.3"
-  dependencies:
-    "@babel/runtime": ^7.11.2
-    "@rc-component/trigger": ^1.18.0
-    classnames: ^2.3.1
-  peerDependencies:
-    react: ">=16.9.0"
-    react-dom: ">=16.9.0"
-  checksum: f67cf4e409d110f9f4098807303bd4590297f45ffb21d20f3c59a93de45b38c477eeee346e78b9c2e07bffd2ed53e22f435023113a08b553ed10e269754507e2
-  languageName: node
-  linkType: hard
-
-"rc-util@npm:^5.21.0, rc-util@npm:^5.24.4, rc-util@npm:^5.27.0, rc-util@npm:^5.38.0":
-  version: 5.38.1
-  resolution: "rc-util@npm:5.38.1"
-  dependencies:
-    "@babel/runtime": ^7.18.3
-    react-is: ^18.2.0
-  peerDependencies:
-    react: ">=16.9.0"
-    react-dom: ">=16.9.0"
-  checksum: 40d0411fb5d6b0a187e718ff16c18f3d68eae3d7e4def43a9a9b2690b89cfce639077a69d683aa01302f8132394dd633baf76b07e5a3b8438fb706b1abb31937
-  languageName: node
-  linkType: hard
-
-"react-circular-progressbar@npm:*, react-circular-progressbar@npm:^2.1.0":
-  version: 2.1.0
-  resolution: "react-circular-progressbar@npm:2.1.0"
-  peerDependencies:
-    react: ^0.14.0 || ^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0
-  checksum: dc118010a8f94733daafac586c969f7e889ad0736d96a0fda79406ee62e9410848abfd3dee4887bb0ff46b99e1f8c86ee1afabc88dfbf4dcb95107b22de1d6d7
-  languageName: node
-  linkType: hard
-
-"react-datepicker@npm:^3.8.0":
-  version: 3.8.0
-  resolution: "react-datepicker@npm:3.8.0"
-  dependencies:
-    classnames: ^2.2.6
-    date-fns: ^2.0.1
-    prop-types: ^15.7.2
-    react-onclickoutside: ^6.10.0
-    react-popper: ^1.3.8
-  peerDependencies:
-    react: ^16.9.0 || ^17
-    react-dom: ^16.9.0 || ^17
-  checksum: a6ba6d3a920629a1c31631768100c598da3535e267e9de7205fb1ce4c9515f13eecf2a6dff549e53acc37fcc4b2b0d381a035c8f256b5642cb5f823d9f02b7d3
-  languageName: node
-  linkType: hard
-
-"react-dnd-html5-backend@npm:^14.1.0":
-  version: 14.1.0
-  resolution: "react-dnd-html5-backend@npm:14.1.0"
-  dependencies:
-    dnd-core: 14.0.1
-  checksum: 6aa8d62c6b2288893b3f216d476d2f84495b40d33578ba9e3a5051dc093a71dc59700e6927ed7ac596ff8d7aa3b3f29404f7d173f844bd6144ed633403dd8e96
-  languageName: node
-  linkType: hard
-
-"react-dnd@npm:^14.0.5":
-  version: 14.0.5
-  resolution: "react-dnd@npm:14.0.5"
-  dependencies:
-    "@react-dnd/invariant": ^2.0.0
-    "@react-dnd/shallowequal": ^2.0.0
-    dnd-core: 14.0.1
-    fast-deep-equal: ^3.1.3
-    hoist-non-react-statics: ^3.3.2
-  peerDependencies:
-    "@types/hoist-non-react-statics": ">= 3.3.1"
-    "@types/node": ">= 12"
-    "@types/react": ">= 16"
-    react: ">= 16.14"
-  peerDependenciesMeta:
-    "@types/hoist-non-react-statics":
-      optional: true
-    "@types/node":
-      optional: true
-    "@types/react":
-      optional: true
-  checksum: 464e231de8c2b79546049a1600b67b1df0b7f762f23c688d3e9aeddbf334b1e64931ef91d0129df3c8be255f0af76e89426729dbcbefe4bdc09b0f665d2da368
-  languageName: node
-  linkType: hard
-
-"react-dom@npm:^18.2.0":
-  version: 18.2.0
-  resolution: "react-dom@npm:18.2.0"
-  dependencies:
-    loose-envify: ^1.1.0
-    scheduler: ^0.23.0
-  peerDependencies:
-    react: ^18.2.0
-  checksum: 7d323310bea3a91be2965f9468d552f201b1c27891e45ddc2d6b8f717680c95a75ae0bc1e3f5cf41472446a2589a75aed4483aee8169287909fcd59ad149e8cc
-  languageName: node
-  linkType: hard
-
-"react-fast-compare@npm:^3.0.1":
-  version: 3.2.2
-  resolution: "react-fast-compare@npm:3.2.2"
-  checksum: 2071415b4f76a3e6b55c84611c4d24dcb12ffc85811a2840b5a3f1ff2d1a99be1020d9437ee7c6e024c9f4cbb84ceb35e48cf84f28fcb00265ad2dfdd3947704
-  languageName: node
-  linkType: hard
-
-"react-focus-bounder@npm:^1.1.6":
-  version: 1.1.6
-  resolution: "react-focus-bounder@npm:1.1.6"
-  peerDependencies:
-    react: ^16.4.0 || ^17.0.0
-    react-dom: ^16.4.0 || ^17.0.0
-  checksum: 355af7e18e5243bc323e3b6a29cdaa2d19443d514f2dd59377191d91e500b8e3570eb3eec88e9a774d391060ba1cdbd40153874081993072e1c2b2224a965a99
-  languageName: node
-  linkType: hard
-
-"react-hotkeys@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "react-hotkeys@npm:2.0.0"
-  dependencies:
-    prop-types: ^15.6.1
-  peerDependencies:
-    react: ">= 0.14.0"
-  checksum: 1b269159cbae45d8712369a187fb708dc89d0227cd91bdaa83509587e10bd3c5409d8828c5ced7fe0636088de4d63248a6df16e92493d0d89ecaa59e661da5dd
-  languageName: node
-  linkType: hard
-
-"react-i18next@npm:^11.18.6":
-  version: 11.18.6
-  resolution: "react-i18next@npm:11.18.6"
-  dependencies:
-    "@babel/runtime": ^7.14.5
-    html-parse-stringify: ^3.0.1
-  peerDependencies:
-    i18next: ">= 19.0.0"
-    react: ">= 16.8.0"
-  peerDependenciesMeta:
-    react-dom:
-      optional: true
-    react-native:
-      optional: true
-  checksum: 624c0a0313fac4e0d18560b83c99a8bd0a83abc02e5db8d01984e0643ac409d178668aa3a4720d01f7a0d9520d38598dcbff801d6f69a970bae67461de6cd852
-  languageName: node
-  linkType: hard
-
-"react-intersection-observer@npm:^9.10.3":
-  version: 9.10.3
-  resolution: "react-intersection-observer@npm:9.10.3"
-  peerDependencies:
-    react: ^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
-    react-dom: ^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
-  peerDependenciesMeta:
-    react-dom:
-      optional: true
-  checksum: 482c89a432e582749f3cb3dd696e08638a92e41fbcb81bcb3dc3cadebcf8b40bc47e7a52d2a7e8c4f9eb2a3c1c29b4cb0f21007c1540da05893b5abb11d7a761
-  languageName: node
-  linkType: hard
-
-"react-is@npm:^16.13.1, react-is@npm:^16.6.0, react-is@npm:^16.7.0":
-  version: 16.13.1
-  resolution: "react-is@npm:16.13.1"
-  checksum: f7a19ac3496de32ca9ae12aa030f00f14a3d45374f1ceca0af707c831b2a6098ef0d6bdae51bd437b0a306d7f01d4677fcc8de7c0d331eb47ad0f46130e53c5f
-  languageName: node
-  linkType: hard
-
-"react-is@npm:^18.0.0, react-is@npm:^18.2.0":
+"react-is@npm:^18.0.0":
   version: 18.2.0
   resolution: "react-is@npm:18.2.0"
   checksum: e72d0ba81b5922759e4aff17e0252bd29988f9642ed817f56b25a3e217e13eea8a7f2322af99a06edb779da12d5d636e9fda473d620df9a3da0df2a74141d53e
   languageName: node
   linkType: hard
 
-"react-lifecycles-compat@npm:^3.0.4":
-  version: 3.0.4
-  resolution: "react-lifecycles-compat@npm:3.0.4"
-  checksum: a904b0fc0a8eeb15a148c9feb7bc17cec7ef96e71188280061fc340043fd6d8ee3ff233381f0e8f95c1cf926210b2c4a31f38182c8f35ac55057e453d6df204f
-  languageName: node
-  linkType: hard
-
-"react-moment@npm:^0.9.7":
-  version: 0.9.7
-  resolution: "react-moment@npm:0.9.7"
-  peerDependencies:
-    moment: ^2.24.0
-    prop-types: ^15.7.2
-    react: ^15.6.0 || ^16.0.0
-  checksum: cc0e9c6bb1675911a9fc985c3414981fb0bdef6d29f114080644980b19328c6b6f9bbccfb2f0cfcd3e90e6d408f27a5f326549932ea92422702066541791ef56
-  languageName: node
-  linkType: hard
-
-"react-onclickoutside@npm:^6.10.0":
-  version: 6.13.0
-  resolution: "react-onclickoutside@npm:6.13.0"
-  peerDependencies:
-    react: ^15.5.x || ^16.x || ^17.x || ^18.x
-    react-dom: ^15.5.x || ^16.x || ^17.x || ^18.x
-  checksum: a7cfe62e91f7f92891cda7b885d6eec7b2854850f8703ccafcea5c04bb93a210a566a70b51b9fae0cc30c3485e04eb6a3f3ae58f495cac3ec2747b4fc44d1ad2
-  languageName: node
-  linkType: hard
-
-"react-popper@npm:^1.3.8":
-  version: 1.3.11
-  resolution: "react-popper@npm:1.3.11"
-  dependencies:
-    "@babel/runtime": ^7.1.2
-    "@hypnosphi/create-react-context": ^0.3.1
-    deep-equal: ^1.1.1
-    popper.js: ^1.14.4
-    prop-types: ^15.6.1
-    typed-styles: ^0.0.7
-    warning: ^4.0.2
-  peerDependencies:
-    react: 0.14.x || ^15.0.0 || ^16.0.0 || ^17.0.0
-  checksum: a0f5994f5799f1c7364498f74df123dd2561fff4ae834b10fdcca74d9a8e159b523ed1f0708db33bad606933ab4f0d5ce9c90e48cbb671bf30016c890f3c7ea4
-  languageName: node
-  linkType: hard
-
-"react-popper@npm:^2.3.0":
-  version: 2.3.0
-  resolution: "react-popper@npm:2.3.0"
-  dependencies:
-    react-fast-compare: ^3.0.1
-    warning: ^4.0.2
-  peerDependencies:
-    "@popperjs/core": ^2.0.0
-    react: ^16.8.0 || ^17 || ^18
-    react-dom: ^16.8.0 || ^17 || ^18
-  checksum: 837111c98738011c69b3069a464ea5bdcbf487105b6148e8faf90cb7337e134edb1b98b8824322941c378756cca30a15c18c25f558e53b85ed5762fa0dc8e6b2
-  languageName: node
-  linkType: hard
-
-"react-router-dom@npm:^5.3.4":
-  version: 5.3.4
-  resolution: "react-router-dom@npm:5.3.4"
-  dependencies:
-    "@babel/runtime": ^7.12.13
-    history: ^4.9.0
-    loose-envify: ^1.3.1
-    prop-types: ^15.6.2
-    react-router: 5.3.4
-    tiny-invariant: ^1.0.2
-    tiny-warning: ^1.0.0
-  peerDependencies:
-    react: ">=15"
-  checksum: b86a6f2f5222f041e38adf4e4b32c7643d6735a1a915ef25855b2db285fd059d72ba8d62e5bcd5d822b8ef9520a80453209e55077f5a90d0f72e908979b8f535
-  languageName: node
-  linkType: hard
-
-"react-router@npm:5.3.4":
-  version: 5.3.4
-  resolution: "react-router@npm:5.3.4"
-  dependencies:
-    "@babel/runtime": ^7.12.13
-    history: ^4.9.0
-    hoist-non-react-statics: ^3.1.0
-    loose-envify: ^1.3.1
-    path-to-regexp: ^1.7.0
-    prop-types: ^15.6.2
-    react-is: ^16.6.0
-    tiny-invariant: ^1.0.2
-    tiny-warning: ^1.0.0
-  peerDependencies:
-    react: ">=15"
-  checksum: 892d4e274a23bf4f39abc2efca54472fb646d3aed4b584020cf49654d2f50d09a2bacebe7c92b4ec7cb8925077376dfcd0664bad6442a73604397cefec9f01f9
-  languageName: node
-  linkType: hard
-
-"react-timer-hoc@npm:^2.3.0":
-  version: 2.3.0
-  resolution: "react-timer-hoc@npm:2.3.0"
-  dependencies:
-    invariant: ~2.2.2
-    prop-types: ^15.6.0
-  peerDependencies:
-    react: ^15.0.0 || ^16.0.0
-  checksum: 3723ef610b78c1d1b5ed87fba092656dbd77535cce65c8149b5049ff5efb12a8e2b3d5ce33341188bcaa4b0c7e3f69263899a62686540e48c612f830a7e6655d
-  languageName: node
-  linkType: hard
-
-"react-transition-group@npm:^2.0.0":
-  version: 2.9.0
-  resolution: "react-transition-group@npm:2.9.0"
-  dependencies:
-    dom-helpers: ^3.4.0
-    loose-envify: ^1.4.0
-    prop-types: ^15.6.2
-    react-lifecycles-compat: ^3.0.4
-  peerDependencies:
-    react: ">=15.0.0"
-    react-dom: ">=15.0.0"
-  checksum: d8c9e50aabdc2cfc324e5cdb0ad1c6eecb02e1c0cd007b26d5b30ccf49015e900683dd489348c71fba4055858308d9ba7019e0d37d0e8d37bd46ed098788f670
-  languageName: node
-  linkType: hard
-
-"react@npm:^18.2.0":
-  version: 18.2.0
-  resolution: "react@npm:18.2.0"
-  dependencies:
-    loose-envify: ^1.1.0
-  checksum: 88e38092da8839b830cda6feef2e8505dec8ace60579e46aa5490fc3dc9bba0bd50336507dc166f43e3afc1c42939c09fe33b25fae889d6f402721dcd78fca1b
-  languageName: node
-  linkType: hard
-
 "read-installed@npm:~4.0.3":
   version: 4.0.3
   resolution: "read-installed@npm:4.0.3"
@@ -10492,29 +9066,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"redux@npm:^4.1.1":
-  version: 4.2.1
-  resolution: "redux@npm:4.2.1"
-  dependencies:
-    "@babel/runtime": ^7.9.2
-  checksum: f63b9060c3a1d930ae775252bb6e579b42415aee7a23c4114e21a0b4ba7ec12f0ec76936c00f546893f06e139819f0e2855e0d55ebfce34ca9c026241a6950dd
-  languageName: node
-  linkType: hard
-
-"reflect.getprototypeof@npm:^1.0.4":
-  version: 1.0.4
-  resolution: "reflect.getprototypeof@npm:1.0.4"
-  dependencies:
-    call-bind: ^1.0.2
-    define-properties: ^1.2.0
-    es-abstract: ^1.22.1
-    get-intrinsic: ^1.2.1
-    globalthis: ^1.0.3
-    which-builtin-type: ^1.1.3
-  checksum: 16e2361988dbdd23274b53fb2b1b9cefeab876c3941a2543b4cadac6f989e3db3957b07a44aac46cfceb3e06e2871785ec2aac992d824f76292f3b5ee87f66f2
-  languageName: node
-  linkType: hard
-
 "regenerator-runtime@npm:^0.14.0":
   version: 0.14.0
   resolution: "regenerator-runtime@npm:0.14.0"
@@ -10522,7 +9073,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"regexp.prototype.flags@npm:^1.2.0, regexp.prototype.flags@npm:^1.5.0, regexp.prototype.flags@npm:^1.5.1":
+"regexp.prototype.flags@npm:^1.5.1":
   version: 1.5.1
   resolution: "regexp.prototype.flags@npm:1.5.1"
   dependencies:
@@ -10586,13 +9137,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"resize-observer-polyfill@npm:^1.5.1":
-  version: 1.5.1
-  resolution: "resize-observer-polyfill@npm:1.5.1"
-  checksum: 57e7f79489867b00ba43c9c051524a5c8f162a61d5547e99333549afc23e15c44fd43f2f318ea0261ea98c0eb3158cca261e6f48d66e1ed1cd1f340a43977094
-  languageName: node
-  linkType: hard
-
 "resolve-cwd@npm:^3.0.0":
   version: 3.0.0
   resolution: "resolve-cwd@npm:3.0.0"
@@ -10625,10 +9169,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"resolve-pathname@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "resolve-pathname@npm:3.0.0"
-  checksum: 6147241ba42c423dbe83cb067a2b4af4f60908c3af57e1ea567729cc71416c089737fe2a73e9e79e7a60f00f66c91e4b45ad0d37cd4be2d43fec44963ef14368
+"resolve-path@npm:^1.4.0":
+  version: 1.4.0
+  resolution: "resolve-path@npm:1.4.0"
+  dependencies:
+    http-errors: ~1.6.2
+    path-is-absolute: 1.0.1
+  checksum: 1a39f569ee54dd5f8ee8576ef8671c9724bea65d9f9982fbb5352af9fb4e500e1e459c1bfb1ae3ebfd8d43a709c3a01dfa4f46cf5b831e45e2caed4f1a208300
   languageName: node
   linkType: hard
 
@@ -10652,19 +9199,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"resolve@npm:^2.0.0-next.4":
-  version: 2.0.0-next.4
-  resolution: "resolve@npm:2.0.0-next.4"
-  dependencies:
-    is-core-module: ^2.9.0
-    path-parse: ^1.0.7
-    supports-preserve-symlinks-flag: ^1.0.0
-  bin:
-    resolve: bin/resolve
-  checksum: c438ac9a650f2030fd074219d7f12ceb983b475da2d89ad3d6dd05fbf6b7a0a8cd37d4d10b43cb1f632bc19f22246ab7f36ebda54d84a29bfb2910a0680906d3
-  languageName: node
-  linkType: hard
-
 "resolve@patch:resolve@^1.1.6#~builtin<compat/resolve>, resolve@patch:resolve@^1.10.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.10.1#~builtin<compat/resolve>, resolve@patch:resolve@^1.20.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.22.1#~builtin<compat/resolve>":
   version: 1.22.6
   resolution: "resolve@patch:resolve@npm%3A1.22.6#~builtin<compat/resolve>::version=1.22.6&hash=c3c19d"
@@ -10678,19 +9212,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"resolve@patch:resolve@^2.0.0-next.4#~builtin<compat/resolve>":
-  version: 2.0.0-next.4
-  resolution: "resolve@patch:resolve@npm%3A2.0.0-next.4#~builtin<compat/resolve>::version=2.0.0-next.4&hash=c3c19d"
-  dependencies:
-    is-core-module: ^2.9.0
-    path-parse: ^1.0.7
-    supports-preserve-symlinks-flag: ^1.0.0
-  bin:
-    resolve: bin/resolve
-  checksum: 4bf9f4f8a458607af90518ff73c67a4bc1a38b5a23fef2bb0ccbd45e8be89820a1639b637b0ba377eb2be9eedfb1739a84cde24fe4cd670c8207d8fea922b011
-  languageName: node
-  linkType: hard
-
 "restore-cursor@npm:^4.0.0":
   version: 4.0.0
   resolution: "restore-cursor@npm:4.0.0"
@@ -10812,31 +9333,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"sax@npm:>=0.6.0, sax@npm:^1.2.4":
+"sax@npm:^1.2.4":
   version: 1.2.4
   resolution: "sax@npm:1.2.4"
   checksum: d3df7d32b897a2c2f28e941f732c71ba90e27c24f62ee918bd4d9a8cfb3553f2f81e5493c7f0be94a11c1911b643a9108f231dd6f60df3fa9586b5d2e3e9e1fe
   languageName: node
   linkType: hard
 
-"saxes@npm:^6.0.0":
-  version: 6.0.0
-  resolution: "saxes@npm:6.0.0"
-  dependencies:
-    xmlchars: ^2.2.0
-  checksum: d3fa3e2aaf6c65ed52ee993aff1891fc47d5e47d515164b5449cbf5da2cbdc396137e55590472e64c5c436c14ae64a8a03c29b9e7389fc6f14035cf4e982ef3b
-  languageName: node
-  linkType: hard
-
-"scheduler@npm:^0.23.0":
-  version: 0.23.0
-  resolution: "scheduler@npm:0.23.0"
-  dependencies:
-    loose-envify: ^1.1.0
-  checksum: d79192eeaa12abef860c195ea45d37cbf2bbf5f66e3c4dcd16f54a7da53b17788a70d109ee3d3dde1a0fd50e6a8fc171f4300356c5aee4fc0171de526bf35f8a
-  languageName: node
-  linkType: hard
-
 "semver@npm:2 || 3 || 4 || 5, semver@npm:^5.5.0":
   version: 5.7.2
   resolution: "semver@npm:5.7.2"
@@ -10873,7 +9376,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"set-function-name@npm:^2.0.0, set-function-name@npm:^2.0.1":
+"set-function-name@npm:^2.0.0":
   version: 2.0.1
   resolution: "set-function-name@npm:2.0.1"
   dependencies:
@@ -10891,6 +9394,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"setprototypeof@npm:1.1.0":
+  version: 1.1.0
+  resolution: "setprototypeof@npm:1.1.0"
+  checksum: 27cb44304d6c9e1a23bc6c706af4acaae1a7aa1054d4ec13c05f01a99fd4887109a83a8042b67ad90dbfcd100d43efc171ee036eb080667172079213242ca36e
+  languageName: node
+  linkType: hard
+
 "setprototypeof@npm:1.2.0":
   version: 1.2.0
   resolution: "setprototypeof@npm:1.2.0"
@@ -10989,20 +9499,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"sinon@npm:^14.0.2":
-  version: 14.0.2
-  resolution: "sinon@npm:14.0.2"
-  dependencies:
-    "@sinonjs/commons": ^2.0.0
-    "@sinonjs/fake-timers": ^9.1.2
-    "@sinonjs/samsam": ^7.0.1
-    diff: ^5.0.0
-    nise: ^5.1.2
-    supports-color: ^7.2.0
-  checksum: de7730cd7785a457e42f9a93e955780c870296036a13816e3c0c5648360afae82fdc748e36c854cf26fb8abd117855a7211aee49265c334fa61439aae17a1b72
-  languageName: node
-  linkType: hard
-
 "sisteransi@npm:^1.0.5":
   version: 1.0.5
   resolution: "sisteransi@npm:1.0.5"
@@ -11089,7 +9585,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"source-map@npm:^0.6.0, source-map@npm:^0.6.1, source-map@npm:~0.6.1":
+"source-map@npm:^0.6.0, source-map@npm:^0.6.1":
   version: 0.6.1
   resolution: "source-map@npm:0.6.1"
   checksum: 59ce8640cf3f3124f64ac289012c2b8bd377c238e316fb323ea22fbfe83da07d81e000071d7242cad7a23cd91c7de98e4df8830ec3f133cb6133a5f6e9f67bc2
@@ -11177,13 +9673,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"split-on-first@npm:^1.0.0":
-  version: 1.1.0
-  resolution: "split-on-first@npm:1.1.0"
-  checksum: 16ff85b54ddcf17f9147210a4022529b343edbcbea4ce977c8f30e38408b8d6e0f25f92cd35b86a524d4797f455e29ab89eb8db787f3c10708e0b47ebf528d30
-  languageName: node
-  linkType: hard
-
 "split2@npm:^3.0.0":
   version: 3.2.2
   resolution: "split2@npm:3.2.2"
@@ -11288,22 +9777,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"statuses@npm:>= 1.5.0 < 2, statuses@npm:^1.5.0":
+"statuses@npm:>= 1.4.0 < 2, statuses@npm:>= 1.5.0 < 2, statuses@npm:^1.5.0":
   version: 1.5.0
   resolution: "statuses@npm:1.5.0"
   checksum: c469b9519de16a4bb19600205cffb39ee471a5f17b82589757ca7bd40a8d92ebb6ed9f98b5a540c5d302ccbc78f15dc03cc0280dd6e00df1335568a5d5758a5c
   languageName: node
   linkType: hard
 
-"stop-iteration-iterator@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "stop-iteration-iterator@npm:1.0.0"
-  dependencies:
-    internal-slot: ^1.0.4
-  checksum: d04173690b2efa40e24ab70e5e51a3ff31d56d699550cfad084104ab3381390daccb36652b25755e420245f3b0737de66c1879eaa2a8d4fc0a78f9bf892fcb42
-  languageName: node
-  linkType: hard
-
 "stream-browserify@npm:^3.0.0":
   version: 3.0.0
   resolution: "stream-browserify@npm:3.0.0"
@@ -11354,13 +9834,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"strict-uri-encode@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "strict-uri-encode@npm:2.0.0"
-  checksum: eaac4cf978b6fbd480f1092cab8b233c9b949bcabfc9b598dd79a758f7243c28765ef7639c876fa72940dac687181b35486ea01ff7df3e65ce3848c64822c581
-  languageName: node
-  linkType: hard
-
 "string-argv@npm:0.3.2":
   version: 0.3.2
   resolution: "string-argv@npm:0.3.2"
@@ -11407,23 +9880,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"string.prototype.matchall@npm:^4.0.8":
-  version: 4.0.10
-  resolution: "string.prototype.matchall@npm:4.0.10"
-  dependencies:
-    call-bind: ^1.0.2
-    define-properties: ^1.2.0
-    es-abstract: ^1.22.1
-    get-intrinsic: ^1.2.1
-    has-symbols: ^1.0.3
-    internal-slot: ^1.0.5
-    regexp.prototype.flags: ^1.5.0
-    set-function-name: ^2.0.0
-    side-channel: ^1.0.4
-  checksum: 3c78bdeff39360c8e435d7c4c6ea19f454aa7a63eda95fa6fadc3a5b984446a2f9f2c02d5c94171ce22268a573524263fbd0c8edbe3ce2e9890d7cc036cdc3ed
-  languageName: node
-  linkType: hard
-
 "string.prototype.trim@npm:^1.2.8":
   version: 1.2.8
   resolution: "string.prototype.trim@npm:1.2.8"
@@ -11570,12 +10026,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"superfly-timeline@npm:9.0.0":
-  version: 9.0.0
-  resolution: "superfly-timeline@npm:9.0.0"
+"superfly-timeline@npm:9.0.2":
+  version: 9.0.2
+  resolution: "superfly-timeline@npm:9.0.2"
   dependencies:
     tslib: ^2.6.0
-  checksum: bb56fc6d6884f2956cdc1f18edceff48bc693c2329b009170e4d399ce70b8123ef38ddada0f0479eb359690eae39e7e578a9ec4ba326d6e4704653f74cde1a6d
+  checksum: d628d467d5384f5667bc10b877478c5b8b0a91774b5d5c5e9d9d3134b8f1b760225f2fbbb0f9ccd3e55f930c9f3719f81b9347b94ea853fbc0a18bc121d97665
   languageName: node
   linkType: hard
 
@@ -11588,7 +10044,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"supports-color@npm:^7.1.0, supports-color@npm:^7.2.0":
+"supports-color@npm:^7.1.0":
   version: 7.2.0
   resolution: "supports-color@npm:7.2.0"
   dependencies:
@@ -11613,13 +10069,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"symbol-tree@npm:^3.2.4":
-  version: 3.2.4
-  resolution: "symbol-tree@npm:3.2.4"
-  checksum: 6e8fc7e1486b8b54bea91199d9535bb72f10842e40c79e882fc94fb7b14b89866adf2fd79efa5ebb5b658bc07fb459ccce5ac0e99ef3d72f474e74aaf284029d
-  languageName: node
-  linkType: hard
-
 "tar@npm:^6.1.11, tar@npm:^6.1.2":
   version: 6.2.0
   resolution: "tar@npm:6.2.0"
@@ -11748,12 +10197,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"timeline-state-resolver-types@npm:9.1.0-nightly-release51-20240228-132329-b7ceb6950.0":
-  version: 9.1.0-nightly-release51-20240228-132329-b7ceb6950.0
-  resolution: "timeline-state-resolver-types@npm:9.1.0-nightly-release51-20240228-132329-b7ceb6950.0"
+"timeline-state-resolver-types@npm:9.2.0-nightly-release52-20240923-122840-58cfbb259.0":
+  version: 9.2.0-nightly-release52-20240923-122840-58cfbb259.0
+  resolution: "timeline-state-resolver-types@npm:9.2.0-nightly-release52-20240923-122840-58cfbb259.0"
   dependencies:
-    tslib: ^2.6.2
-  checksum: da20544cc1ce9118c318ceccec240cc2f05c7eb415da9365625bdeffafb508b358d4f51842ca7ec9f10f44f25e6c9956cda2d74c22bf138bb869bcceacbbc2f2
+    tslib: ^2.6.3
+  checksum: c041363201bcfc0daac2ebca021b09fddc1f5b12fdeb932d9c19bfadc3ee308aa81f36c74c005edad2e756ed1c6465de779bfca5ed63ffd940878bf015497231
   languageName: node
   linkType: hard
 
@@ -11766,20 +10215,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tiny-invariant@npm:^1.0.2":
-  version: 1.3.1
-  resolution: "tiny-invariant@npm:1.3.1"
-  checksum: 872dbd1ff20a21303a2fd20ce3a15602cfa7fcf9b228bd694a52e2938224313b5385a1078cb667ed7375d1612194feaca81c4ecbe93121ca1baebe344de4f84c
-  languageName: node
-  linkType: hard
-
-"tiny-warning@npm:^1.0.0":
-  version: 1.0.3
-  resolution: "tiny-warning@npm:1.0.3"
-  checksum: da62c4acac565902f0624b123eed6dd3509bc9a8d30c06e017104bedcf5d35810da8ff72864400ad19c5c7806fc0a8323c68baf3e326af7cb7d969f846100d71
-  languageName: node
-  linkType: hard
-
 "titleize@npm:^3.0.0":
   version: 3.0.0
   resolution: "titleize@npm:3.0.0"
@@ -11845,18 +10280,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tough-cookie@npm:^4.1.2":
-  version: 4.1.3
-  resolution: "tough-cookie@npm:4.1.3"
-  dependencies:
-    psl: ^1.1.33
-    punycode: ^2.1.1
-    universalify: ^0.2.0
-    url-parse: ^1.5.3
-  checksum: c9226afff36492a52118432611af083d1d8493a53ff41ec4ea48e5b583aec744b989e4280bcf476c910ec1525a89a4a0f1cae81c08b18fb2ec3a9b3a72b91dcc
-  languageName: node
-  linkType: hard
-
 "tr46@npm:^1.0.1":
   version: 1.0.1
   resolution: "tr46@npm:1.0.1"
@@ -11957,6 +10380,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"tslib@npm:^2.6.3":
+  version: 2.7.0
+  resolution: "tslib@npm:2.7.0"
+  checksum: 1606d5c89f88d466889def78653f3aab0f88692e80bb2066d090ca6112ae250ec1cfa9dbfaab0d17b60da15a4186e8ec4d893801c67896b277c17374e36e1d28
+  languageName: node
+  linkType: hard
+
 "tsscmp@npm:1.0.6":
   version: 1.0.6
   resolution: "tsscmp@npm:1.0.6"
@@ -11991,7 +10421,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"type-detect@npm:4.0.8, type-detect@npm:^4.0.8":
+"type-detect@npm:4.0.8":
   version: 4.0.8
   resolution: "type-detect@npm:4.0.8"
   checksum: 62b5628bff67c0eb0b66afa371bd73e230399a8d2ad30d852716efcc4656a7516904570cd8631a49a3ce57c10225adf5d0cbdcb47f6b0255fe6557c453925a15
@@ -12111,13 +10541,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"typed-styles@npm:^0.0.7":
-  version: 0.0.7
-  resolution: "typed-styles@npm:0.0.7"
-  checksum: 36a6ad6bee008c15ddb8c2425eaf9aee37d2841985b4c44406ea4cf57080a9c30b6f9f3feb842ac952354733ac53299ee44f68d83f734486e8344d413f8c8c0d
-  languageName: node
-  linkType: hard
-
 "typedarray@npm:^0.0.6":
   version: 0.0.6
   resolution: "typedarray@npm:0.0.6"
@@ -12235,13 +10658,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"universalify@npm:^0.2.0":
-  version: 0.2.0
-  resolution: "universalify@npm:0.2.0"
-  checksum: e86134cb12919d177c2353196a4cc09981524ee87abf621f7bc8d249dbbbebaec5e7d1314b96061497981350df786e4c5128dbf442eba104d6e765bc260678b5
-  languageName: node
-  linkType: hard
-
 "unpipe@npm:1.0.0":
   version: 1.0.0
   resolution: "unpipe@npm:1.0.0"
@@ -12279,7 +10695,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"url-parse@npm:^1.5.3, url-parse@npm:~1.5.10":
+"url-parse@npm:~1.5.10":
   version: 1.5.10
   resolution: "url-parse@npm:1.5.10"
   dependencies:
@@ -12347,13 +10763,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"value-equal@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "value-equal@npm:1.0.1"
-  checksum: bb7ae1facc76b5cf8071aeb6c13d284d023fdb370478d10a5d64508e0e6e53bb459c4bbe34258df29d82e6f561f874f0105eba38de0e61fe9edd0bdce07a77a2
-  languageName: node
-  linkType: hard
-
 "value-or-function@npm:^4.0.0":
   version: 4.0.0
   resolution: "value-or-function@npm:4.0.0"
@@ -12368,28 +10777,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"velocity-animate@npm:^1.4.0, velocity-animate@npm:^1.5.2":
-  version: 1.5.2
-  resolution: "velocity-animate@npm:1.5.2"
-  checksum: 9860da93170252478a31dc8814602e28f47183a4852c3e55c27d49ceadf0f16428b1593d50e766791982735db8c3c009d4813353e5ec52b262b37bbe912d7d86
-  languageName: node
-  linkType: hard
-
-"velocity-react@npm:^1.4.3":
-  version: 1.4.3
-  resolution: "velocity-react@npm:1.4.3"
-  dependencies:
-    lodash: ^4.17.5
-    prop-types: ^15.5.8
-    react-transition-group: ^2.0.0
-    velocity-animate: ^1.4.0
-  peerDependencies:
-    react: ^15.3.0 || ^16.0.0
-    react-dom: ^15.3.0 || ^16.0.0
-  checksum: 6d0f98d188c42c5a3f9c4dac1f7ea9bf1865aa57a7f7bcdc41c5abd6dd82d42318fec47c15a4366e8ebd8f32e320292f06ef858f95b5261e4f0f6cd728c19767
-  languageName: node
-  linkType: hard
-
 "vinyl-contents@npm:^2.0.0":
   version: 2.0.0
   resolution: "vinyl-contents@npm:2.0.0"
@@ -12456,22 +10843,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"void-elements@npm:3.1.0":
-  version: 3.1.0
-  resolution: "void-elements@npm:3.1.0"
-  checksum: 0390f818107fa8fce55bb0a5c3f661056001c1d5a2a48c28d582d4d847347c2ab5b7f8272314cac58acf62345126b6b09bea623a185935f6b1c3bbce0dfd7f7f
-  languageName: node
-  linkType: hard
-
-"w3c-xmlserializer@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "w3c-xmlserializer@npm:4.0.0"
-  dependencies:
-    xml-name-validator: ^4.0.0
-  checksum: eba070e78deb408ae8defa4d36b429f084b2b47a4741c4a9be3f27a0a3d1845e277e3072b04391a138f7e43776842627d1334e448ff13ff90ad9fb1214ee7091
-  languageName: node
-  linkType: hard
-
 "walker@npm:^1.0.8":
   version: 1.0.8
   resolution: "walker@npm:1.0.8"
@@ -12481,15 +10852,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"warning@npm:^4.0.2, warning@npm:^4.0.3":
-  version: 4.0.3
-  resolution: "warning@npm:4.0.3"
-  dependencies:
-    loose-envify: ^1.0.0
-  checksum: 4f2cb6a9575e4faf71ddad9ad1ae7a00d0a75d24521c193fa464f30e6b04027bd97aa5d9546b0e13d3a150ab402eda216d59c1d0f2d6ca60124d96cd40dfa35c
-  languageName: node
-  linkType: hard
-
 "webidl-conversions@npm:^3.0.0":
   version: 3.0.1
   resolution: "webidl-conversions@npm:3.0.1"
@@ -12511,29 +10873,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"webmidi@npm:^2.5.3":
-  version: 2.5.3
-  resolution: "webmidi@npm:2.5.3"
-  checksum: efbb9906fd6eb459639267c51f7cc2950ddbe0d9834e69c65cb22abd28d9da191f6272097f7abf0837854cec5e13dcfa42eb32117c89f29debe07fdc872732cb
-  languageName: node
-  linkType: hard
-
-"whatwg-encoding@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "whatwg-encoding@npm:2.0.0"
-  dependencies:
-    iconv-lite: 0.6.3
-  checksum: 7087810c410aa9b689cbd6af8773341a53cdc1f3aae2a882c163bd5522ec8ca4cdfc269aef417a5792f411807d5d77d50df4c24e3abb00bb60192858a40cc675
-  languageName: node
-  linkType: hard
-
-"whatwg-mimetype@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "whatwg-mimetype@npm:3.0.0"
-  checksum: ce08bbb36b6aaf64f3a84da89707e3e6a31e5ab1c1a2379fd68df79ba712a4ab090904f0b50e6693b0dafc8e6343a6157e40bf18fdffd26e513cf95ee2a59824
-  languageName: node
-  linkType: hard
-
 "whatwg-url@npm:^11.0.0":
   version: 11.0.0
   resolution: "whatwg-url@npm:11.0.0"
@@ -12578,39 +10917,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"which-builtin-type@npm:^1.1.3":
-  version: 1.1.3
-  resolution: "which-builtin-type@npm:1.1.3"
-  dependencies:
-    function.prototype.name: ^1.1.5
-    has-tostringtag: ^1.0.0
-    is-async-function: ^2.0.0
-    is-date-object: ^1.0.5
-    is-finalizationregistry: ^1.0.2
-    is-generator-function: ^1.0.10
-    is-regex: ^1.1.4
-    is-weakref: ^1.0.2
-    isarray: ^2.0.5
-    which-boxed-primitive: ^1.0.2
-    which-collection: ^1.0.1
-    which-typed-array: ^1.1.9
-  checksum: 43730f7d8660ff9e33d1d3f9f9451c4784265ee7bf222babc35e61674a11a08e1c2925019d6c03154fcaaca4541df43abe35d2720843b9b4cbcebdcc31408f36
-  languageName: node
-  linkType: hard
-
-"which-collection@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "which-collection@npm:1.0.1"
-  dependencies:
-    is-map: ^2.0.1
-    is-set: ^2.0.1
-    is-weakmap: ^2.0.1
-    is-weakset: ^2.0.1
-  checksum: c815bbd163107ef9cb84f135e6f34453eaf4cca994e7ba85ddb0d27cea724c623fae2a473ceccfd5549c53cc65a5d82692de418166df3f858e1e5dc60818581c
-  languageName: node
-  linkType: hard
-
-"which-typed-array@npm:^1.1.11, which-typed-array@npm:^1.1.2, which-typed-array@npm:^1.1.9":
+"which-typed-array@npm:^1.1.11, which-typed-array@npm:^1.1.2":
   version: 1.1.11
   resolution: "which-typed-array@npm:1.1.11"
   dependencies:
@@ -12719,21 +11026,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ws@npm:^8.11.0":
-  version: 8.14.2
-  resolution: "ws@npm:8.14.2"
-  peerDependencies:
-    bufferutil: ^4.0.1
-    utf-8-validate: ">=5.0.2"
-  peerDependenciesMeta:
-    bufferutil:
-      optional: true
-    utf-8-validate:
-      optional: true
-  checksum: 3ca0dad26e8cc6515ff392b622a1467430814c463b3368b0258e33696b1d4bed7510bc7030f7b72838b9fdeb8dbd8839cbf808367d6aae2e1d668ce741d4308b
-  languageName: node
-  linkType: hard
-
 "xml-js@npm:^1.6.11":
   version: 1.6.11
   resolution: "xml-js@npm:1.6.11"
@@ -12745,23 +11037,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"xml-name-validator@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "xml-name-validator@npm:4.0.0"
-  checksum: af100b79c29804f05fa35aa3683e29a321db9b9685d5e5febda3fa1e40f13f85abc40f45a6b2bf7bee33f68a1dc5e8eaef4cec100a304a9db565e6061d4cb5ad
-  languageName: node
-  linkType: hard
-
-"xml2js@npm:^0.6.2":
-  version: 0.6.2
-  resolution: "xml2js@npm:0.6.2"
-  dependencies:
-    sax: ">=0.6.0"
-    xmlbuilder: ~11.0.0
-  checksum: 458a83806193008edff44562c0bdb982801d61ee7867ae58fd35fab781e69e17f40dfeb8fc05391a4648c9c54012066d3955fe5d993ffbe4dc63399023f32ac2
-  languageName: node
-  linkType: hard
-
 "xmlbuilder@npm:^15.1.1":
   version: 15.1.1
   resolution: "xmlbuilder@npm:15.1.1"
@@ -12769,20 +11044,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"xmlbuilder@npm:~11.0.0":
-  version: 11.0.1
-  resolution: "xmlbuilder@npm:11.0.1"
-  checksum: 7152695e16f1a9976658215abab27e55d08b1b97bca901d58b048d2b6e106b5af31efccbdecf9b07af37c8377d8e7e821b494af10b3a68b0ff4ae60331b415b0
-  languageName: node
-  linkType: hard
-
-"xmlchars@npm:^2.2.0":
-  version: 2.2.0
-  resolution: "xmlchars@npm:2.2.0"
-  checksum: 8c70ac94070ccca03f47a81fcce3b271bd1f37a591bf5424e787ae313fcb9c212f5f6786e1fa82076a2c632c0141552babcd85698c437506dfa6ae2d58723062
-  languageName: node
-  linkType: hard
-
 "xtend@npm:^4.0.2, xtend@npm:~4.0.1":
   version: 4.0.2
   resolution: "xtend@npm:4.0.2"
diff --git a/package.json b/package.json
index e232a83b9f..ae7452cddd 100644
--- a/package.json
+++ b/package.json
@@ -36,9 +36,9 @@
 	"devDependencies": {
 		"concurrently": "^8.2.2",
 		"lint-staged": "^13.3.0",
-		"rimraf": "^5.0.5",
-		"semver": "^7.5.4",
-		"snyk-nodejs-lockfile-parser": "^1.52.11"
+		"rimraf": "^5.0.10",
+		"semver": "^7.6.3",
+		"snyk-nodejs-lockfile-parser": "^1.58.11"
 	},
 	"packageManager": "yarn@3.5.0"
 }
diff --git a/packages/.gitignore b/packages/.gitignore
index c5c60ba507..d52d8b8126 100644
--- a/packages/.gitignore
+++ b/packages/.gitignore
@@ -9,3 +9,5 @@ CHANGELOG.md
 !.yarn/releases
 !.yarn/sdks
 !.yarn/versions
+
+/*/dist
\ No newline at end of file
diff --git a/packages/.yarn/patches/@asyncapi-generator-react-sdk-npm-1.0.20-af18b2f42b.patch b/packages/.yarn/patches/@asyncapi-generator-react-sdk-npm-1.0.20-af18b2f42b.patch
deleted file mode 100644
index 8d71b66241..0000000000
--- a/packages/.yarn/patches/@asyncapi-generator-react-sdk-npm-1.0.20-af18b2f42b.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/lib/transpiler/transpiler.js b/lib/transpiler/transpiler.js
-index 3c26e5852787f0246065f6206ba0901ee32b16a7..370266a29f2c618ae48c50f4acc7462ac6cc0b4f 100644
---- a/lib/transpiler/transpiler.js
-+++ b/lib/transpiler/transpiler.js
-@@ -90,7 +90,8 @@ function transpileFiles(directory, outputDir, options) {
-                             dir: outputDir,
-                             exports: "auto",
-                             paths: {
--                                'react/jsx-runtime': 'react/cjs/react-jsx-runtime.production.min',
-+                                // Make sure it finds the correct version of react https://github.com/asyncapi/generator-react-sdk/pull/242
-+                                'react/jsx-runtime': require.resolve('react/cjs/react-jsx-runtime.production.min'),
-                             },
-                             sanitizeFileName: false,
-                         })];
diff --git a/packages/.yarn/patches/timecode-npm-0.0.4-82bde9e6fe.patch b/packages/.yarn/patches/timecode-npm-0.0.4-82bde9e6fe.patch
new file mode 100644
index 0000000000..ab845f486f
--- /dev/null
+++ b/packages/.yarn/patches/timecode-npm-0.0.4-82bde9e6fe.patch
@@ -0,0 +1,11 @@
+diff --git a/lib/timecode.js b/lib/timecode.js
+index ef4028e2ebc3b5480e93d88a38627454553e3502..a521b33cd239c38dfced835410aa57e8be9246ca 100644
+--- a/lib/timecode.js
++++ b/lib/timecode.js
+@@ -217,3 +217,5 @@ var exports = exports || window;
+ 
+ exports.Timecode = Timecode;
+ 
++// Vite needs a more modern export
++module.exports = { Timecode }
+\ No newline at end of file
diff --git a/packages/blueprints-integration/CHANGELOG.md b/packages/blueprints-integration/CHANGELOG.md
index 07588e73e0..1c3adfcbfe 100644
--- a/packages/blueprints-integration/CHANGELOG.md
+++ b/packages/blueprints-integration/CHANGELOG.md
@@ -3,61 +3,55 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## [1.50.2](https://github.com/nrkno/tv-automation-server-core/compare/v1.49.6...v1.50.2) (2024-05-15)
+## [1.51.1-2](https://github.com/nrkno/sofie-core/compare/v1.51.1-1...v1.51.1-2) (2024-10-24)
 
+**Note:** Version bump only for package @sofie-automation/blueprints-integration
 
 
-## [1.50.1](https://github.com/nrkno/tv-automation-server-core/compare/v1.49.5-0...v1.50.1) (2024-03-11)
 
 
 
-## [1.50.1-0](https://github.com/nrkno/tv-automation-server-core/compare/v1.50.0...v1.50.1-0) (2024-03-05)
+## [1.51.1-2](https://github.com/nrkno/sofie-core/compare/v1.51.1-1...v1.51.1-2) (2024-10-24)
 
+**Note:** Version bump only for package @sofie-automation/blueprints-integration
 
 
-# [1.50.0](https://github.com/nrkno/tv-automation-server-core/compare/v1.49.4...v1.50.0) (2024-02-23)
 
 
-### Features
 
-* allow blueprints to specify a custom resolution for NORA hover preview SOFIE-2840 ([#1123](https://github.com/nrkno/tv-automation-server-core/issues/1123)) ([d2f3cef](https://github.com/nrkno/tv-automation-server-core/commit/d2f3cef03259f594feba8814046614d1ed16cf62))
+## [1.51.1-1](https://github.com/nrkno/sofie-core/compare/v1.51.1-0...v1.51.1-1) (2024-10-18)
+
+**Note:** Version bump only for package @sofie-automation/blueprints-integration
 
 
 
-# [1.50.0-in-testing.5](https://github.com/nrkno/tv-automation-server-core/compare/v1.50.0-in-testing.4...v1.50.0-in-testing.5) (2023-08-25)
 
 
+## [1.51.1-0](https://github.com/nrkno/sofie-core/compare/v1.51.0...v1.51.1-0) (2024-10-18)
 
-# [1.50.0-in-testing.4](https://github.com/nrkno/tv-automation-server-core/compare/v1.49.0-in-testing.7...v1.50.0-in-testing.4) (2023-08-23)
+**Note:** Version bump only for package @sofie-automation/blueprints-integration
 
 
 
-# [1.50.0-in-testing.2](https://github.com/nrkno/tv-automation-server-core/compare/v1.50.0-in-testing.1...v1.50.0-in-testing.2) (2023-07-17)
 
 
-### Bug Fixes
+## [1.51.1-0](https://github.com/nrkno/sofie-core/compare/v1.51.0...v1.51.1-0) (2024-10-18)
 
-* Allow JSON objects in config presets ([#949](https://github.com/nrkno/tv-automation-server-core/issues/949)) ([4e5a797](https://github.com/nrkno/tv-automation-server-core/commit/4e5a79752d6c06f91ce070b1d67e7bed97a4f0f2))
-* expose `deviceType` in `listPlayoutDevices` to blueprints ([2b32c72](https://github.com/nrkno/tv-automation-server-core/commit/2b32c7256762716071d467193f344646af484f18))
-* require blueprint baseline objects to be of type `TimelineObjectCoreExt` instead of `TSR.TSRTimelineObj` [#961](https://github.com/nrkno/tv-automation-server-core/issues/961) ([b8d0cf3](https://github.com/nrkno/tv-automation-server-core/commit/b8d0cf313c88e29fd08f6405b86a55d3579e7692))
+**Note:** Version bump only for package @sofie-automation/blueprints-integration
 
 
-### Features
 
-* add `prompterTitle` property SOFIE-2404 ([#975](https://github.com/nrkno/tv-automation-server-core/issues/975)) ([6f0567d](https://github.com/nrkno/tv-automation-server-core/commit/6f0567de958cede745e918529bae660305ceb66e))
-* add milestone timing ([5950fd5](https://github.com/nrkno/tv-automation-server-core/commit/5950fd5e202cfab5e7f5b36942ffb7525c713e0a))
-* allow getting the Source and Output layers from the ShowStyle context ([#979](https://github.com/nrkno/tv-automation-server-core/issues/979)) ([ab57fb4](https://github.com/nrkno/tv-automation-server-core/commit/ab57fb4871bf23e37b99e73f5f809738fd8fdd1b))
-* blueprint settings overhaul ([#878](https://github.com/nrkno/tv-automation-server-core/issues/878)) ([ee3307c](https://github.com/nrkno/tv-automation-server-core/commit/ee3307cae10076e2d91d624f783e40c54c297b91))
-* fallback to cumetime if no backtime ([2cafbab](https://github.com/nrkno/tv-automation-server-core/commit/2cafbab2f03d49b92c121a7206ddfed62bf770fa))
-* move blueprint ab logic into sofie SOFIE-2403 ([#946](https://github.com/nrkno/tv-automation-server-core/issues/946)) ([cc37b75](https://github.com/nrkno/tv-automation-server-core/commit/cc37b751d674be7f8631d0315e52f8fa29a8d3c4))
-* move gateway settings onto Studio SOFIE-1330 ([#907](https://github.com/nrkno/tv-automation-server-core/issues/907)) ([523c061](https://github.com/nrkno/tv-automation-server-core/commit/523c061c51296e21814deeeabbe9aafca21cd5a6))
-* trs actions in blueprints rundown hooks ([bb5e442](https://github.com/nrkno/tv-automation-server-core/commit/bb5e4422fa32e1af1e520e0c288360b304da4289))
 
 
+# [1.51.0](https://github.com/nrkno/sofie-core/compare/v1.51.0-in-testing.3...v1.51.0) (2024-10-07)
+
+**Note:** Version bump only for package @sofie-automation/blueprints-integration
+
 
 
 
-## [1.50.1](https://github.com/nrkno/tv-automation-server-core/compare/v1.50.1-0...v1.50.1) (2024-03-11)
+
+# [1.51.0](https://github.com/nrkno/sofie-core/compare/v1.51.0-in-testing.3...v1.51.0) (2024-10-07)
 
 **Note:** Version bump only for package @sofie-automation/blueprints-integration
 
@@ -65,7 +59,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-## [1.50.1-0](https://github.com/nrkno/tv-automation-server-core/compare/v1.50.0...v1.50.1-0) (2024-03-05)
+# [1.51.0-in-testing.3](https://github.com/nrkno/sofie-core/compare/v1.51.0-in-testing.2...v1.51.0-in-testing.3) (2024-09-25)
 
 **Note:** Version bump only for package @sofie-automation/blueprints-integration
 
@@ -73,47 +67,181 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-# [1.50.0](https://github.com/nrkno/tv-automation-server-core/compare/v1.49.4...v1.50.0) (2024-02-23)
+# [1.51.0-in-testing.2](https://github.com/nrkno/sofie-core/compare/v1.51.0-in-testing.1...v1.51.0-in-testing.2) (2024-09-24)
+
+**Note:** Version bump only for package @sofie-automation/blueprints-integration
+
+
+
+
+
+# [1.51.0-in-testing.1](https://github.com/nrkno/sofie-core/compare/v1.51.0-in-testing.0...v1.51.0-in-testing.1) (2024-09-06)
 
 
 ### Features
 
-* allow blueprints to specify a custom resolution for NORA hover preview SOFIE-2840 ([#1123](https://github.com/nrkno/tv-automation-server-core/issues/1123)) ([d2f3cef](https://github.com/nrkno/tv-automation-server-core/commit/d2f3cef03259f594feba8814046614d1ed16cf62))
+* stringify piece NoraContent payload SOFIE-3398 ([#1248](https://github.com/nrkno/sofie-core/issues/1248)) ([0613f74](https://github.com/nrkno/sofie-core/commit/0613f740c1e2f740d7d9c39bc72178e301f5f72f))
 
+# [1.51.0-in-testing.1](https://github.com/nrkno/sofie-core/compare/v1.51.0-in-testing.0...v1.51.0-in-testing.1) (2024-09-06)
 
 
-# [1.50.0-in-testing.5](https://github.com/nrkno/tv-automation-server-core/compare/v1.50.0-in-testing.4...v1.50.0-in-testing.5) (2023-08-25)
+### Features
 
+* stringify piece NoraContent payload SOFIE-3398 ([#1248](https://github.com/nrkno/sofie-core/issues/1248)) ([0613f74](https://github.com/nrkno/sofie-core/commit/0613f740c1e2f740d7d9c39bc72178e301f5f72f))
 
 
-# [1.50.0-in-testing.4](https://github.com/nrkno/tv-automation-server-core/compare/v1.49.0-in-testing.7...v1.50.0-in-testing.4) (2023-08-23)
+# [1.51.0-in-testing.0](https://github.com/nrkno/sofie-core/compare/v1.50.4...v1.51.0-in-testing.0) (2024-08-19)
 
+## [1.50.5-LSG-updates](https://github.com/nrkno/sofie-core/compare/v1.50.4-LSG-updates...v1.50.5-LSG-updates) (2024-08-08)
 
+## [1.50.4-LSG-updates](https://github.com/nrkno/sofie-core/compare/v1.50.3-LSG-updates...v1.50.4-LSG-updates) (2024-07-30)
 
-# [1.50.0-in-testing.2](https://github.com/nrkno/tv-automation-server-core/compare/v1.50.0-in-testing.1...v1.50.0-in-testing.2) (2023-07-17)
+### Bug Fixes
+
+- Add missing metadata types ([71eb739](https://github.com/nrkno/sofie-core/commit/71eb739bc87f64db50f06ab4647cb6972e58c7fa))
+- Add missing piece metadata types ([#1133](https://github.com/nrkno/sofie-core/issues/1133)) ([70c5739](https://github.com/nrkno/sofie-core/commit/70c5739c5e9848e57c21bde78ee16d4c78da8e1a))
+- blueprint-integration missed typing in [#1077](https://github.com/nrkno/sofie-core/issues/1077) ([bd5e36f](https://github.com/nrkno/sofie-core/commit/bd5e36f9c0b390999ef465a5e1554b8faa2c456f))
+
+### Features
+
+- A/B player Ids as strings ([#1054](https://github.com/nrkno/sofie-core/issues/1054)) ([d9dee47](https://github.com/nrkno/sofie-core/commit/d9dee473068c4d96d15a6ef799ace830cf1fe1c0))
+- action triggers styleClassNames SOFIE-3138 ([#1192](https://github.com/nrkno/sofie-core/issues/1192)) ([fa306dc](https://github.com/nrkno/sofie-core/commit/fa306dc16d5f6ee31418e282180d4c704f5d9feb))
+- action triggers styleClassNames SOFIE-3138 ([#1192](https://github.com/nrkno/sofie-core/issues/1192)) ([49274d6](https://github.com/nrkno/sofie-core/commit/49274d64bdc0532f294be34b0a4413d848321e40))
+- add onTake and onSetAsNext blueprint callbacks SOFIE-2897 SOFIE-2808 ([#1117](https://github.com/nrkno/sofie-core/issues/1117)) ([0bd621c](https://github.com/nrkno/sofie-core/commit/0bd621c13b08cb20c923ea573baca9db003c7df1))
+- blueprint config fixup step SOFIE-2258 ([#1050](https://github.com/nrkno/sofie-core/issues/1050)) ([ea6c343](https://github.com/nrkno/sofie-core/commit/ea6c3435079172c682dd1e23d7813ae33fcdee78))
+- cleanup deprecations ([#996](https://github.com/nrkno/sofie-core/issues/996)) ([f04f18f](https://github.com/nrkno/sofie-core/commit/f04f18f8e94b706dd1a3da1525feb9787f6eb85f))
+- create adlib testing rundowns SOFIE-2963 ([#1211](https://github.com/nrkno/sofie-core/issues/1211)) ([a831989](https://github.com/nrkno/sofie-core/commit/a8319898c73d7233a2a665fd0bf5b9d6da83d713))
+- **Device Triggers:** add support for setting shift register operations ([aa19fcc](https://github.com/nrkno/sofie-core/commit/aa19fcc3b5bfad05158677701b838673578a4dcb))
+- **Device Triggers:** add support for setting shift register operations SOFIE-3136 ([c5a6292](https://github.com/nrkno/sofie-core/commit/c5a6292a85821d67653eebef75bbd929ff0cd44d))
+- **EAV-31:** add blueprintsData on adlib actions ([114c064](https://github.com/nrkno/sofie-core/commit/114c06466ff1f35660454b66d1e35b3d339b9a80))
+- Editable fields as JSON ([ddfb66a](https://github.com/nrkno/sofie-core/commit/ddfb66a1ef8afbd507535037d12752742c7dfeda))
+- implement `loop` content property for Graphics ([2cf38ba](https://github.com/nrkno/sofie-core/commit/2cf38baadd5e7ba16d624b9ad75cfff9d48297a6))
+- introduce `privateData` and `publicData` ([d94f1aa](https://github.com/nrkno/sofie-core/commit/d94f1aa82cec779c7eebddae42e1c4fab91ac494))
+- remove supertimeline from Parts and Pieces resolving SOFIE-2373 ([#983](https://github.com/nrkno/sofie-core/issues/983)) ([55e02cb](https://github.com/nrkno/sofie-core/commit/55e02cb1a0b6d237ae9bcd02ebf54e06cf08fb26))
+- rename internal 'scratchpad' naming to 'adlib testing' SOFIE-3015 ([afb2f43](https://github.com/nrkno/sofie-core/commit/afb2f43c8f199ff5da4ea6c3ccc3bd1e97a80f4f))
+- rundown scratchpad SOFIE-2432 ([5e16632](https://github.com/nrkno/sofie-core/commit/5e16632908b8dd62e4470a9ba6089a56aa571b9f))
+- support packageinfo update flow for buckets and studio baseline SOFIE-2655 ([#1051](https://github.com/nrkno/sofie-core/issues/1051)) ([df7ed0c](https://github.com/nrkno/sofie-core/commit/df7ed0c653b897774f01a33c9e60a5e22fac99e4))
+- typed publications in gateways/peripheraldevices SOFIE-1183 ([#1056](https://github.com/nrkno/sofie-core/issues/1056)) ([0c3c1bf](https://github.com/nrkno/sofie-core/commit/0c3c1bfd2bb779034976dc34e49aa6e664ea874b))
+- update meteor to 2.12 SOFIE-2368 ([#931](https://github.com/nrkno/sofie-core/issues/931)) ([d7dfb71](https://github.com/nrkno/sofie-core/commit/d7dfb71d19405267cab5e2abc39794a80acb30b1))
+
+# [1.51.0-in-testing.0](https://github.com/nrkno/sofie-core/compare/v1.50.4...v1.51.0-in-testing.0) (2024-08-19)
 
+## [1.50.5-LSG-updates](https://github.com/nrkno/sofie-core/compare/v1.50.4-LSG-updates...v1.50.5-LSG-updates) (2024-08-08)
+
+## [1.50.4-LSG-updates](https://github.com/nrkno/sofie-core/compare/v1.50.3-LSG-updates...v1.50.4-LSG-updates) (2024-07-30)
 
 ### Bug Fixes
 
-* Allow JSON objects in config presets ([#949](https://github.com/nrkno/tv-automation-server-core/issues/949)) ([4e5a797](https://github.com/nrkno/tv-automation-server-core/commit/4e5a79752d6c06f91ce070b1d67e7bed97a4f0f2))
-* expose `deviceType` in `listPlayoutDevices` to blueprints ([2b32c72](https://github.com/nrkno/tv-automation-server-core/commit/2b32c7256762716071d467193f344646af484f18))
-* require blueprint baseline objects to be of type `TimelineObjectCoreExt` instead of `TSR.TSRTimelineObj` [#961](https://github.com/nrkno/tv-automation-server-core/issues/961) ([b8d0cf3](https://github.com/nrkno/tv-automation-server-core/commit/b8d0cf313c88e29fd08f6405b86a55d3579e7692))
+- Add missing metadata types ([71eb739](https://github.com/nrkno/sofie-core/commit/71eb739bc87f64db50f06ab4647cb6972e58c7fa))
+- Add missing piece metadata types ([#1133](https://github.com/nrkno/sofie-core/issues/1133)) ([70c5739](https://github.com/nrkno/sofie-core/commit/70c5739c5e9848e57c21bde78ee16d4c78da8e1a))
+- blueprint-integration missed typing in [#1077](https://github.com/nrkno/sofie-core/issues/1077) ([bd5e36f](https://github.com/nrkno/sofie-core/commit/bd5e36f9c0b390999ef465a5e1554b8faa2c456f))
+
+### Features
+
+- A/B player Ids as strings ([#1054](https://github.com/nrkno/sofie-core/issues/1054)) ([d9dee47](https://github.com/nrkno/sofie-core/commit/d9dee473068c4d96d15a6ef799ace830cf1fe1c0))
+- action triggers styleClassNames SOFIE-3138 ([#1192](https://github.com/nrkno/sofie-core/issues/1192)) ([fa306dc](https://github.com/nrkno/sofie-core/commit/fa306dc16d5f6ee31418e282180d4c704f5d9feb))
+- action triggers styleClassNames SOFIE-3138 ([#1192](https://github.com/nrkno/sofie-core/issues/1192)) ([49274d6](https://github.com/nrkno/sofie-core/commit/49274d64bdc0532f294be34b0a4413d848321e40))
+- add onTake and onSetAsNext blueprint callbacks SOFIE-2897 SOFIE-2808 ([#1117](https://github.com/nrkno/sofie-core/issues/1117)) ([0bd621c](https://github.com/nrkno/sofie-core/commit/0bd621c13b08cb20c923ea573baca9db003c7df1))
+- blueprint config fixup step SOFIE-2258 ([#1050](https://github.com/nrkno/sofie-core/issues/1050)) ([ea6c343](https://github.com/nrkno/sofie-core/commit/ea6c3435079172c682dd1e23d7813ae33fcdee78))
+- cleanup deprecations ([#996](https://github.com/nrkno/sofie-core/issues/996)) ([f04f18f](https://github.com/nrkno/sofie-core/commit/f04f18f8e94b706dd1a3da1525feb9787f6eb85f))
+- create adlib testing rundowns SOFIE-2963 ([#1211](https://github.com/nrkno/sofie-core/issues/1211)) ([a831989](https://github.com/nrkno/sofie-core/commit/a8319898c73d7233a2a665fd0bf5b9d6da83d713))
+- **Device Triggers:** add support for setting shift register operations ([aa19fcc](https://github.com/nrkno/sofie-core/commit/aa19fcc3b5bfad05158677701b838673578a4dcb))
+- **Device Triggers:** add support for setting shift register operations SOFIE-3136 ([c5a6292](https://github.com/nrkno/sofie-core/commit/c5a6292a85821d67653eebef75bbd929ff0cd44d))
+- **EAV-31:** add blueprintsData on adlib actions ([114c064](https://github.com/nrkno/sofie-core/commit/114c06466ff1f35660454b66d1e35b3d339b9a80))
+- Editable fields as JSON ([ddfb66a](https://github.com/nrkno/sofie-core/commit/ddfb66a1ef8afbd507535037d12752742c7dfeda))
+- implement `loop` content property for Graphics ([2cf38ba](https://github.com/nrkno/sofie-core/commit/2cf38baadd5e7ba16d624b9ad75cfff9d48297a6))
+- introduce `privateData` and `publicData` ([d94f1aa](https://github.com/nrkno/sofie-core/commit/d94f1aa82cec779c7eebddae42e1c4fab91ac494))
+- remove supertimeline from Parts and Pieces resolving SOFIE-2373 ([#983](https://github.com/nrkno/sofie-core/issues/983)) ([55e02cb](https://github.com/nrkno/sofie-core/commit/55e02cb1a0b6d237ae9bcd02ebf54e06cf08fb26))
+- rename internal 'scratchpad' naming to 'adlib testing' SOFIE-3015 ([afb2f43](https://github.com/nrkno/sofie-core/commit/afb2f43c8f199ff5da4ea6c3ccc3bd1e97a80f4f))
+- rundown scratchpad SOFIE-2432 ([5e16632](https://github.com/nrkno/sofie-core/commit/5e16632908b8dd62e4470a9ba6089a56aa571b9f))
+- support packageinfo update flow for buckets and studio baseline SOFIE-2655 ([#1051](https://github.com/nrkno/sofie-core/issues/1051)) ([df7ed0c](https://github.com/nrkno/sofie-core/commit/df7ed0c653b897774f01a33c9e60a5e22fac99e4))
+- typed publications in gateways/peripheraldevices SOFIE-1183 ([#1056](https://github.com/nrkno/sofie-core/issues/1056)) ([0c3c1bf](https://github.com/nrkno/sofie-core/commit/0c3c1bfd2bb779034976dc34e49aa6e664ea874b))
+- update meteor to 2.12 SOFIE-2368 ([#931](https://github.com/nrkno/sofie-core/issues/931)) ([d7dfb71](https://github.com/nrkno/sofie-core/commit/d7dfb71d19405267cab5e2abc39794a80acb30b1))
+
+
+## [1.50.5](https://github.com/nrkno/tv-automation-server-core/compare/v1.50.4...v1.50.5) (2024-09-19)
+
+**Note:** Version bump only for package @sofie-automation/blueprints-integration
 
+## [1.50.4](https://github.com/nrkno/tv-automation-server-core/compare/v1.50.3-LSG-updates...v1.50.4) (2024-07-30)
+
+**Note:** Version bump only for package @sofie-automation/blueprints-integration
+
+## [1.50.3](https://github.com/nrkno/tv-automation-server-core/compare/v1.50.2...v1.50.3) (2024-06-24)
+
+**Note:** Version bump only for package @sofie-automation/blueprints-integration
+
+## [1.50.2](https://github.com/nrkno/tv-automation-server-core/compare/v1.49.6...v1.50.2) (2024-05-15)
+
+## [1.50.1](https://github.com/nrkno/tv-automation-server-core/compare/v1.49.5-0...v1.50.1) (2024-03-11)
+
+## [1.50.1-0](https://github.com/nrkno/tv-automation-server-core/compare/v1.50.0...v1.50.1-0) (2024-03-05)
+
+# [1.50.0](https://github.com/nrkno/tv-automation-server-core/compare/v1.49.4...v1.50.0) (2024-02-23)
 
 ### Features
 
-* add `prompterTitle` property SOFIE-2404 ([#975](https://github.com/nrkno/tv-automation-server-core/issues/975)) ([6f0567d](https://github.com/nrkno/tv-automation-server-core/commit/6f0567de958cede745e918529bae660305ceb66e))
-* add milestone timing ([5950fd5](https://github.com/nrkno/tv-automation-server-core/commit/5950fd5e202cfab5e7f5b36942ffb7525c713e0a))
-* allow getting the Source and Output layers from the ShowStyle context ([#979](https://github.com/nrkno/tv-automation-server-core/issues/979)) ([ab57fb4](https://github.com/nrkno/tv-automation-server-core/commit/ab57fb4871bf23e37b99e73f5f809738fd8fdd1b))
-* blueprint settings overhaul ([#878](https://github.com/nrkno/tv-automation-server-core/issues/878)) ([ee3307c](https://github.com/nrkno/tv-automation-server-core/commit/ee3307cae10076e2d91d624f783e40c54c297b91))
-* fallback to cumetime if no backtime ([2cafbab](https://github.com/nrkno/tv-automation-server-core/commit/2cafbab2f03d49b92c121a7206ddfed62bf770fa))
-* move blueprint ab logic into sofie SOFIE-2403 ([#946](https://github.com/nrkno/tv-automation-server-core/issues/946)) ([cc37b75](https://github.com/nrkno/tv-automation-server-core/commit/cc37b751d674be7f8631d0315e52f8fa29a8d3c4))
-* move gateway settings onto Studio SOFIE-1330 ([#907](https://github.com/nrkno/tv-automation-server-core/issues/907)) ([523c061](https://github.com/nrkno/tv-automation-server-core/commit/523c061c51296e21814deeeabbe9aafca21cd5a6))
-* trs actions in blueprints rundown hooks ([bb5e442](https://github.com/nrkno/tv-automation-server-core/commit/bb5e4422fa32e1af1e520e0c288360b304da4289))
+- allow blueprints to specify a custom resolution for NORA hover preview SOFIE-2840 ([#1123](https://github.com/nrkno/tv-automation-server-core/issues/1123)) ([d2f3cef](https://github.com/nrkno/tv-automation-server-core/commit/d2f3cef03259f594feba8814046614d1ed16cf62))
 
+# [1.50.0-in-testing.5](https://github.com/nrkno/tv-automation-server-core/compare/v1.50.0-in-testing.4...v1.50.0-in-testing.5) (2023-08-25)
 
+# [1.50.0-in-testing.4](https://github.com/nrkno/tv-automation-server-core/compare/v1.49.0-in-testing.7...v1.50.0-in-testing.4) (2023-08-23)
 
+# [1.50.0-in-testing.2](https://github.com/nrkno/tv-automation-server-core/compare/v1.50.0-in-testing.1...v1.50.0-in-testing.2) (2023-07-17)
+
+### Bug Fixes
+
+- Allow JSON objects in config presets ([#949](https://github.com/nrkno/tv-automation-server-core/issues/949)) ([4e5a797](https://github.com/nrkno/tv-automation-server-core/commit/4e5a79752d6c06f91ce070b1d67e7bed97a4f0f2))
+- expose `deviceType` in `listPlayoutDevices` to blueprints ([2b32c72](https://github.com/nrkno/tv-automation-server-core/commit/2b32c7256762716071d467193f344646af484f18))
+- require blueprint baseline objects to be of type `TimelineObjectCoreExt` instead of `TSR.TSRTimelineObj` [#961](https://github.com/nrkno/tv-automation-server-core/issues/961) ([b8d0cf3](https://github.com/nrkno/tv-automation-server-core/commit/b8d0cf313c88e29fd08f6405b86a55d3579e7692))
+
+### Features
+
+- add `prompterTitle` property SOFIE-2404 ([#975](https://github.com/nrkno/tv-automation-server-core/issues/975)) ([6f0567d](https://github.com/nrkno/tv-automation-server-core/commit/6f0567de958cede745e918529bae660305ceb66e))
+- add milestone timing ([5950fd5](https://github.com/nrkno/tv-automation-server-core/commit/5950fd5e202cfab5e7f5b36942ffb7525c713e0a))
+- allow getting the Source and Output layers from the ShowStyle context ([#979](https://github.com/nrkno/tv-automation-server-core/issues/979)) ([ab57fb4](https://github.com/nrkno/tv-automation-server-core/commit/ab57fb4871bf23e37b99e73f5f809738fd8fdd1b))
+- blueprint settings overhaul ([#878](https://github.com/nrkno/tv-automation-server-core/issues/878)) ([ee3307c](https://github.com/nrkno/tv-automation-server-core/commit/ee3307cae10076e2d91d624f783e40c54c297b91))
+- fallback to cumetime if no backtime ([2cafbab](https://github.com/nrkno/tv-automation-server-core/commit/2cafbab2f03d49b92c121a7206ddfed62bf770fa))
+- move blueprint ab logic into sofie SOFIE-2403 ([#946](https://github.com/nrkno/tv-automation-server-core/issues/946)) ([cc37b75](https://github.com/nrkno/tv-automation-server-core/commit/cc37b751d674be7f8631d0315e52f8fa29a8d3c4))
+- move gateway settings onto Studio SOFIE-1330 ([#907](https://github.com/nrkno/tv-automation-server-core/issues/907)) ([523c061](https://github.com/nrkno/tv-automation-server-core/commit/523c061c51296e21814deeeabbe9aafca21cd5a6))
+- trs actions in blueprints rundown hooks ([bb5e442](https://github.com/nrkno/tv-automation-server-core/commit/bb5e4422fa32e1af1e520e0c288360b304da4289))
+
+## [1.50.1](https://github.com/nrkno/tv-automation-server-core/compare/v1.50.1-0...v1.50.1) (2024-03-11)
+
+**Note:** Version bump only for package @sofie-automation/blueprints-integration
+
+## [1.50.1-0](https://github.com/nrkno/tv-automation-server-core/compare/v1.50.0...v1.50.1-0) (2024-03-05)
+
+**Note:** Version bump only for package @sofie-automation/blueprints-integration
+
+# [1.50.0](https://github.com/nrkno/tv-automation-server-core/compare/v1.49.4...v1.50.0) (2024-02-23)
+
+### Features
+
+- allow blueprints to specify a custom resolution for NORA hover preview SOFIE-2840 ([#1123](https://github.com/nrkno/tv-automation-server-core/issues/1123)) ([d2f3cef](https://github.com/nrkno/tv-automation-server-core/commit/d2f3cef03259f594feba8814046614d1ed16cf62))
 
+# [1.50.0-in-testing.5](https://github.com/nrkno/tv-automation-server-core/compare/v1.50.0-in-testing.4...v1.50.0-in-testing.5) (2023-08-25)
+
+# [1.50.0-in-testing.4](https://github.com/nrkno/tv-automation-server-core/compare/v1.49.0-in-testing.7...v1.50.0-in-testing.4) (2023-08-23)
+
+# [1.50.0-in-testing.2](https://github.com/nrkno/tv-automation-server-core/compare/v1.50.0-in-testing.1...v1.50.0-in-testing.2) (2023-07-17)
+
+### Bug Fixes
+
+- Allow JSON objects in config presets ([#949](https://github.com/nrkno/tv-automation-server-core/issues/949)) ([4e5a797](https://github.com/nrkno/tv-automation-server-core/commit/4e5a79752d6c06f91ce070b1d67e7bed97a4f0f2))
+- expose `deviceType` in `listPlayoutDevices` to blueprints ([2b32c72](https://github.com/nrkno/tv-automation-server-core/commit/2b32c7256762716071d467193f344646af484f18))
+- require blueprint baseline objects to be of type `TimelineObjectCoreExt` instead of `TSR.TSRTimelineObj` [#961](https://github.com/nrkno/tv-automation-server-core/issues/961) ([b8d0cf3](https://github.com/nrkno/tv-automation-server-core/commit/b8d0cf313c88e29fd08f6405b86a55d3579e7692))
+
+### Features
+
+- add `prompterTitle` property SOFIE-2404 ([#975](https://github.com/nrkno/tv-automation-server-core/issues/975)) ([6f0567d](https://github.com/nrkno/tv-automation-server-core/commit/6f0567de958cede745e918529bae660305ceb66e))
+- add milestone timing ([5950fd5](https://github.com/nrkno/tv-automation-server-core/commit/5950fd5e202cfab5e7f5b36942ffb7525c713e0a))
+- allow getting the Source and Output layers from the ShowStyle context ([#979](https://github.com/nrkno/tv-automation-server-core/issues/979)) ([ab57fb4](https://github.com/nrkno/tv-automation-server-core/commit/ab57fb4871bf23e37b99e73f5f809738fd8fdd1b))
+- blueprint settings overhaul ([#878](https://github.com/nrkno/tv-automation-server-core/issues/878)) ([ee3307c](https://github.com/nrkno/tv-automation-server-core/commit/ee3307cae10076e2d91d624f783e40c54c297b91))
+- fallback to cumetime if no backtime ([2cafbab](https://github.com/nrkno/tv-automation-server-core/commit/2cafbab2f03d49b92c121a7206ddfed62bf770fa))
+- move blueprint ab logic into sofie SOFIE-2403 ([#946](https://github.com/nrkno/tv-automation-server-core/issues/946)) ([cc37b75](https://github.com/nrkno/tv-automation-server-core/commit/cc37b751d674be7f8631d0315e52f8fa29a8d3c4))
+- move gateway settings onto Studio SOFIE-1330 ([#907](https://github.com/nrkno/tv-automation-server-core/issues/907)) ([523c061](https://github.com/nrkno/tv-automation-server-core/commit/523c061c51296e21814deeeabbe9aafca21cd5a6))
+- trs actions in blueprints rundown hooks ([bb5e442](https://github.com/nrkno/tv-automation-server-core/commit/bb5e4422fa32e1af1e520e0c288360b304da4289))
 
 # [1.50.0-in-testing.5](https://github.com/nrkno/tv-automation-server-core/compare/v1.50.0-in-testing.4...v1.50.0-in-testing.5) (2023-08-25)
 
@@ -160,22 +288,15 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 - move blueprint ab logic into sofie SOFIE-2403 ([#946](https://github.com/nrkno/tv-automation-server-core/issues/946)) ([cc37b75](https://github.com/nrkno/tv-automation-server-core/commit/cc37b751d674be7f8631d0315e52f8fa29a8d3c4))
 - move gateway settings onto Studio SOFIE-1330 ([#907](https://github.com/nrkno/tv-automation-server-core/issues/907)) ([523c061](https://github.com/nrkno/tv-automation-server-core/commit/523c061c51296e21814deeeabbe9aafca21cd5a6))
 - trs actions in blueprints rundown hooks ([bb5e442](https://github.com/nrkno/tv-automation-server-core/commit/bb5e4422fa32e1af1e520e0c288360b304da4289))
+
 ## [1.49.3](https://github.com/nrkno/tv-automation-server-core/compare/v1.49.2...v1.49.3) (2023-12-21)
 
 **Note:** Version bump only for package @sofie-automation/blueprints-integration
 
-
-
-
-
 ## [1.49.2](https://github.com/nrkno/tv-automation-server-core/compare/v1.49.1...v1.49.2) (2023-11-29)
 
 **Note:** Version bump only for package @sofie-automation/blueprints-integration
 
-
-
-
-
 ## [1.49.1](https://github.com/nrkno/tv-automation-server-core/compare/v1.49.0...v1.49.1) (2023-10-20)
 
 **Note:** Version bump only for package @sofie-automation/blueprints-integration
diff --git a/packages/blueprints-integration/package.json b/packages/blueprints-integration/package.json
index 03e265af7a..7594583839 100644
--- a/packages/blueprints-integration/package.json
+++ b/packages/blueprints-integration/package.json
@@ -1,19 +1,19 @@
 {
 	"name": "@sofie-automation/blueprints-integration",
-	"version": "1.51.0-in-development",
+	"version": "1.52.0-in-development",
 	"description": "Library to define the interaction between core and the blueprints.",
 	"main": "dist/index.js",
 	"typings": "dist/index.d.ts",
 	"license": "MIT",
 	"repository": {
 		"type": "git",
-		"url": "git+https://github.com/nrkno/tv-automation-server-core.git",
+		"url": "git+https://github.com/nrkno/sofie-core.git",
 		"directory": "packages/blueprints-integration"
 	},
 	"bugs": {
-		"url": "https://github.com/nrkno/tv-automation-server-core/issues"
+		"url": "https://github.com/nrkno/sofie-core/issues"
 	},
-	"homepage": "https://github.com/nrkno/tv-automation-server-core/blob/master/packages/blueprints-integration#readme",
+	"homepage": "https://github.com/nrkno/sofie-core/blob/master/packages/blueprints-integration#readme",
 	"scripts": {
 		"build": "run -T rimraf dist && run build:main",
 		"build:main": "run -T tsc -p tsconfig.build.json",
@@ -38,7 +38,7 @@
 		"/LICENSE"
 	],
 	"dependencies": {
-		"@sofie-automation/shared-lib": "1.51.0-in-development",
+		"@sofie-automation/shared-lib": "1.52.0-in-development",
 		"tslib": "^2.6.2",
 		"type-fest": "^3.13.1"
 	},
diff --git a/packages/blueprints-integration/src/abPlayback.ts b/packages/blueprints-integration/src/abPlayback.ts
index 8a7c782d4b..1cf6943a1b 100644
--- a/packages/blueprints-integration/src/abPlayback.ts
+++ b/packages/blueprints-integration/src/abPlayback.ts
@@ -1,6 +1,9 @@
 import type { TimelineObjectAbSessionInfo } from '@sofie-automation/shared-lib/dist/core/model/Timeline'
 import type { ICommonContext } from './context'
 import type { OnGenerateTimelineObj, TSR } from './timeline'
+import type { AbPlayerId } from '@sofie-automation/shared-lib/dist/core/model/StudioRouteSet'
+
+export type { AbPlayerId }
 
 export interface PieceAbSessionInfo extends TimelineObjectAbSessionInfo {
 	/**
@@ -20,7 +23,7 @@ export const AB_MEDIA_PLAYER_AUTO = '__auto__'
  * Description of a player in an AB pool
  */
 export interface ABPlayerDefinition {
-	playerId: number | string
+	playerId: AbPlayerId
 }
 
 /**
@@ -30,7 +33,7 @@ export interface ABTimelineLayerChangeRule {
 	/** What AB pools can this rule be used for */
 	acceptedPoolNames: string[]
 	/** A function to generate the new layer name for a chosen playerId */
-	newLayerName: (playerId: number | string) => string
+	newLayerName: (playerId: AbPlayerId) => string
 	/** Whether this rule can be used for lookaheadObjects */
 	allowsLookahead: boolean
 }
@@ -60,7 +63,7 @@ export interface ABResolverConfiguration {
 	customApplyToObject?: (
 		context: ICommonContext,
 		poolName: string,
-		playerId: number | string,
+		playerId: AbPlayerId,
 		timelineObject: OnGenerateTimelineObj<TSR.TSRTimelineContent>
 	) => boolean
 }
diff --git a/packages/blueprints-integration/src/api/studio.ts b/packages/blueprints-integration/src/api/studio.ts
index 22d27c6adc..d5e2837b84 100644
--- a/packages/blueprints-integration/src/api/studio.ts
+++ b/packages/blueprints-integration/src/api/studio.ts
@@ -11,6 +11,11 @@ import type { ExpectedPlayoutItemGeneric, IBlueprintResultRundownPlaylist, IBlue
 import type { BlueprintMappings } from '../studio'
 import type { TimelineObjectCoreExt, TSR } from '../timeline'
 import type { ExpectedPackage } from '../package'
+import type {
+	StudioRouteSet,
+	StudioRouteSetExclusivityGroup,
+} from '@sofie-automation/shared-lib/dist/core/model/StudioRouteSet'
+import { StudioPackageContainer } from '@sofie-automation/shared-lib/dist/core/model/PackageContainer'
 
 export interface StudioBlueprintManifest<TRawConfig = IBlueprintConfig, TProcessedConfig = unknown>
 	extends BlueprintManifestBase {
@@ -126,6 +131,12 @@ export interface BlueprintResultApplyStudioConfig {
 	ingestDevices: Record<string, unknown>
 	/** Input-gateway subdevices */
 	inputDevices: Record<string, unknown>
+	/** Route Sets */
+	routeSets?: Record<string, StudioRouteSet>
+	/** Route Set Exclusivity Groups */
+	routeSetExclusivityGroups?: Record<string, StudioRouteSetExclusivityGroup>
+	/** Package Containers */
+	packageContainers?: Record<string, StudioPackageContainer>
 }
 
 export interface IStudioConfigPreset<TConfig = IBlueprintConfig> {
diff --git a/packages/blueprints-integration/src/content.ts b/packages/blueprints-integration/src/content.ts
index 6021424933..67824be905 100644
--- a/packages/blueprints-integration/src/content.ts
+++ b/packages/blueprints-integration/src/content.ts
@@ -1,3 +1,4 @@
+import { JSONBlob } from '@sofie-automation/shared-lib/dist/lib/JSONBlob'
 import { Time } from './common'
 import { TSR, TimelineObjectCoreExt } from './timeline'
 import { SourceLayerType } from '@sofie-automation/shared-lib/dist/core/model/ShowStyle'
@@ -118,18 +119,37 @@ export interface NoraPayload {
 		name: string
 	}
 	metadata?: {
-		templateName: string | undefined
+		templateName: string
 		templateVariant: string | undefined
 	}
 	changed?: Time
 	step?: NoraPayloadStepData
 }
 
+export interface NoraContentSteps {
+	current: number
+	count: number
+}
+
 export interface NoraContent extends BaseContent {
-	payload: NoraPayload
+	/** URL of the preview renderer */
 	previewRenderer: string
+	/** Payload for the preview renderer to display the graphic */
+	previewPayload: JSONBlob<NoraPayload>
 	/** Dimensions of the rendered hover-preview viewport in pixels. Defaults to 1920x1080. */
 	previewRendererDimensions?: { width: number; height: number }
+
+	/** Basic display info about the template */
+	templateInfo?: {
+		name: string
+		variant?: string
+	}
+
+	/** Time the graphic was last changed in the NRCS (if known) */
+	changed?: Time
+
+	/** If set, the graphic supports steps */
+	step?: NoraContentSteps
 }
 
 export interface SplitsContentBoxProperties {
diff --git a/packages/blueprints-integration/src/context/adlibActionContext.ts b/packages/blueprints-integration/src/context/adlibActionContext.ts
index 16feee4903..ec1b19a4bb 100644
--- a/packages/blueprints-integration/src/context/adlibActionContext.ts
+++ b/packages/blueprints-integration/src/context/adlibActionContext.ts
@@ -4,9 +4,10 @@ import type { IShowStyleUserContext } from './showStyleContext'
 import { IPartAndPieceActionContext } from './partsAndPieceActionContext'
 import { IExecuteTSRActionsContext } from './executeTsrActionContext'
 import { IBlueprintPart, IBlueprintPartInstance, IBlueprintPiece } from '..'
+import { IRouteSetMethods } from './routeSetContext'
 
 /** Actions */
-export interface IDataStoreActionExecutionContext extends IShowStyleUserContext, IEventContext {
+export interface IDataStoreMethods {
 	/**
 	 * Setting a value in the datastore allows us to overwrite parts of a timeline content object with that value
 	 * @param key Key to use when referencing from the timeline object
@@ -17,13 +18,15 @@ export interface IDataStoreActionExecutionContext extends IShowStyleUserContext,
 	/** Deletes a previously set value from the datastore */
 	removeTimelineDatastoreValue(key: string): Promise<void>
 }
+export interface IDataStoreActionExecutionContext extends IDataStoreMethods, IShowStyleUserContext, IEventContext {}
 
 export interface IActionExecutionContext
 	extends IShowStyleUserContext,
 		IEventContext,
-		IDataStoreActionExecutionContext,
+		IDataStoreMethods,
 		IPartAndPieceActionContext,
-		IExecuteTSRActionsContext {
+		IExecuteTSRActionsContext,
+		IRouteSetMethods {
 	/** Fetch the showstyle config for the specified part */
 	// getNextShowStyleConfig(): Readonly<{ [key: string]: ConfigItemValue }>
 
diff --git a/packages/blueprints-integration/src/context/routeSetContext.ts b/packages/blueprints-integration/src/context/routeSetContext.ts
new file mode 100644
index 0000000000..616261d1b3
--- /dev/null
+++ b/packages/blueprints-integration/src/context/routeSetContext.ts
@@ -0,0 +1,9 @@
+import { StudioRouteSet } from '@sofie-automation/shared-lib/dist/core/model/StudioRouteSet'
+
+export interface IRouteSetMethods {
+	/** Returns a list of the Routesets */
+	listRouteSets(): Promise<Record<string, StudioRouteSet>>
+
+	/** Switch RouteSet State */
+	switchRouteSet(routeSetId: string, state: boolean | 'toggle'): Promise<void>
+}
diff --git a/packages/blueprints-integration/src/context/rundownContext.ts b/packages/blueprints-integration/src/context/rundownContext.ts
index 0f7c8d7624..fca5c599d8 100644
--- a/packages/blueprints-integration/src/context/rundownContext.ts
+++ b/packages/blueprints-integration/src/context/rundownContext.ts
@@ -2,7 +2,8 @@ import type { IBlueprintSegmentRundown } from '../documents'
 import type { IUserNotesContext } from './baseContext'
 import type { IPackageInfoContext } from './packageInfoContext'
 import type { IShowStyleContext } from './showStyleContext'
-import { IExecuteTSRActionsContext } from './executeTsrActionContext'
+import type { IExecuteTSRActionsContext } from './executeTsrActionContext'
+import type { IDataStoreMethods } from './adlibActionContext'
 
 export interface IRundownContext extends IShowStyleContext {
 	readonly rundownId: string
@@ -12,7 +13,7 @@ export interface IRundownContext extends IShowStyleContext {
 
 export interface IRundownUserContext extends IUserNotesContext, IRundownContext {}
 
-export interface IRundownActivationContext extends IRundownContext, IExecuteTSRActionsContext {}
+export interface IRundownActivationContext extends IRundownContext, IExecuteTSRActionsContext, IDataStoreMethods {}
 
 export interface ISegmentUserContext extends IUserNotesContext, IRundownContext, IPackageInfoContext {
 	/** Display a notification to the user of an error */
diff --git a/packages/blueprints-integration/src/documents/part.ts b/packages/blueprints-integration/src/documents/part.ts
index 652fb88daf..4c6e96b8ea 100644
--- a/packages/blueprints-integration/src/documents/part.ts
+++ b/packages/blueprints-integration/src/documents/part.ts
@@ -54,9 +54,6 @@ export interface IBlueprintMutatablePart<TPrivateData = unknown, TPublicData = u
 	/** Expected duration of the line, in milliseconds */
 	expectedDuration?: number
 
-	/** Budget duration of this part, in milliseconds */
-	budgetDuration?: number
-
 	/** Whether this segment line supports being used in HOLD */
 	holdMode?: PartHoldMode
 
@@ -154,6 +151,7 @@ export interface IBlueprintPart<TPrivateData = unknown, TPublicData = unknown>
 	/** When this part is just a filler to fill space in a segment. Generally, used with invalid: true */
 	gap?: boolean
 }
+
 /** The Part sent from Core */
 export interface IBlueprintPartDB<TPrivateData = unknown, TPublicData = unknown>
 	extends IBlueprintPart<TPrivateData, TPublicData> {
diff --git a/packages/blueprints-integration/src/documents/segment.ts b/packages/blueprints-integration/src/documents/segment.ts
index d78981ff77..e020e59fd4 100644
--- a/packages/blueprints-integration/src/documents/segment.ts
+++ b/packages/blueprints-integration/src/documents/segment.ts
@@ -4,12 +4,25 @@ export enum SegmentDisplayMode {
 	List = 'list',
 }
 
+export enum CountdownType {
+	/** Should count down till the end of the current part */
+	PART_EXPECTED_DURATION = 'part_expected_duration',
+	/** Should count down till the end of the segment's budget */
+	SEGMENT_BUDGET_DURATION = 'segment_budget_duration',
+}
+
 export interface SegmentTimingInfo {
 	/** A unix timestamp of when the segment is expected to begin. Affects rundown timing. */
 	expectedStart?: number
 
 	/** A unix timestamp of when the segment is expected to end. Affects rundown timing. */
 	expectedEnd?: number
+
+	/** Budget duration of this segment, in milliseconds */
+	budgetDuration?: number
+
+	/** Defines the behavior of countdowns during this segment. Default: `CountdownType.PART_EXPECTED_DURATION` */
+	countdownType?: CountdownType
 }
 
 /** The Segment generated from Blueprint */
diff --git a/packages/blueprints-integration/src/index.ts b/packages/blueprints-integration/src/index.ts
index 5353cc2c9e..95246bc308 100644
--- a/packages/blueprints-integration/src/index.ts
+++ b/packages/blueprints-integration/src/index.ts
@@ -25,3 +25,4 @@ export { MOS } from '@sofie-automation/shared-lib/dist/mos'
 export { JSONSchema } from '@sofie-automation/shared-lib/dist/lib/JSONSchemaTypes'
 export * from '@sofie-automation/shared-lib/dist/lib/JSONBlob'
 export * from '@sofie-automation/shared-lib/dist/lib/JSONSchemaUtil'
+export * from '@sofie-automation/shared-lib/dist/core/model/StudioRouteSet'
diff --git a/packages/blueprints-integration/src/migrations.ts b/packages/blueprints-integration/src/migrations.ts
index 514019b0c3..d7eb39e622 100644
--- a/packages/blueprints-integration/src/migrations.ts
+++ b/packages/blueprints-integration/src/migrations.ts
@@ -9,7 +9,7 @@ export interface MigrationStepInput {
 	stepId?: string // automatically filled in later
 	label: string
 	description?: string
-	inputType: 'text' | 'multiline' | 'int' | 'checkbox' | 'dropdown' | 'switch' | null // EditAttribute types, null = dont display edit field
+	inputType: 'text' | 'multiline' | 'int' | 'checkbox' | 'dropdown' | 'toggle' | null // EditAttribute types, null = dont display edit field
 	attribute: string | null
 	defaultValue?: any
 	dropdownOptions?: string[]
diff --git a/packages/blueprints-integration/src/triggers.ts b/packages/blueprints-integration/src/triggers.ts
index 3ebaaa9561..3b7a54db85 100644
--- a/packages/blueprints-integration/src/triggers.ts
+++ b/packages/blueprints-integration/src/triggers.ts
@@ -194,6 +194,13 @@ export interface IRundownPlaylistActivateAdlibTestingAction extends ITriggeredAc
 	filterChain: (IRundownPlaylistFilterLink | IGUIContextFilterLink)[]
 }
 
+export interface ISwitchRouteSetAction extends ITriggeredActionBase {
+	action: PlayoutActions.switchRouteSet
+	filterChain: (IRundownPlaylistFilterLink | IGUIContextFilterLink)[]
+	routeSetId: string
+	state: boolean | 'toggle'
+}
+
 export interface ITakeAction extends ITriggeredActionBase {
 	action: PlayoutActions.take
 	filterChain: (IRundownPlaylistFilterLink | IGUIContextFilterLink)[]
@@ -316,6 +323,7 @@ export type SomeAction =
 	| IShowEntireCurrentSegmentAction
 	| IMiniShelfQueueAdLib
 	| IModifyShiftRegister
+	| ISwitchRouteSetAction
 
 export interface IBlueprintTriggeredActions {
 	_id: string
diff --git a/packages/corelib/package.json b/packages/corelib/package.json
index f9548061bd..5d3fb3a56b 100644
--- a/packages/corelib/package.json
+++ b/packages/corelib/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@sofie-automation/corelib",
-	"version": "1.51.0-in-development",
+	"version": "1.52.0-in-development",
 	"private": true,
 	"description": "Internal library for some types shared by core and workers",
 	"main": "dist/index.js",
@@ -8,13 +8,13 @@
 	"license": "MIT",
 	"repository": {
 		"type": "git",
-		"url": "git+https://github.com/nrkno/tv-automation-server-core.git",
+		"url": "git+https://github.com/nrkno/sofie-core.git",
 		"directory": "packages/corelib"
 	},
 	"bugs": {
-		"url": "https://github.com/nrkno/tv-automation-server-core/issues"
+		"url": "https://github.com/nrkno/sofie-core/issues"
 	},
-	"homepage": "https://github.com/nrkno/tv-automation-server-core/blob/master/packages/corelib#readme",
+	"homepage": "https://github.com/nrkno/sofie-core/blob/master/packages/corelib#readme",
 	"scripts": {
 		"build": "run -T rimraf dist && run build:main",
 		"build:main": "run -T tsc -p tsconfig.build.json",
@@ -39,8 +39,8 @@
 		"/LICENSE"
 	],
 	"dependencies": {
-		"@sofie-automation/blueprints-integration": "1.51.0-in-development",
-		"@sofie-automation/shared-lib": "1.51.0-in-development",
+		"@sofie-automation/blueprints-integration": "1.52.0-in-development",
+		"@sofie-automation/shared-lib": "1.52.0-in-development",
 		"fast-clone": "^1.5.13",
 		"i18next": "^21.10.0",
 		"influx": "^5.9.3",
diff --git a/packages/corelib/src/__tests__/lib.spec.ts b/packages/corelib/src/__tests__/lib.spec.ts
index 01c28d9f9b..6c2afc73df 100644
--- a/packages/corelib/src/__tests__/lib.spec.ts
+++ b/packages/corelib/src/__tests__/lib.spec.ts
@@ -4,10 +4,12 @@ import {
 	formatDateAsTimecode,
 	formatDurationAsTimecode,
 	getHash,
+	getRank,
 	literal,
 	objectPathGet,
 	objectPathSet,
 	removeNullyProperties,
+	stringifyObjects,
 } from '../lib'
 import { UserError, UserErrorMessage } from '../error'
 import { stringifyError } from '@sofie-automation/shared-lib/dist/lib/stringifyError'
@@ -153,4 +155,53 @@ describe('Lib', () => {
 		expect(stringifyError(event)).toMatch(/MyTestEvent.*abc/)
 		expect(stringifyError(obj)).toMatch(/anotherProp.*abc/)
 	})
+	test('getRank', () => {
+		const objs: { _rank: number }[] = [
+			{ _rank: 0 },
+			{ _rank: 10 },
+			{ _rank: 20 },
+			{ _rank: 21 },
+			{ _rank: 22 },
+			{ _rank: 23 },
+		]
+
+		// First:
+		expect(getRank(null, objs[0])).toEqual(-0.5)
+		// Insert two:
+		expect(getRank(null, objs[0], 0, 2)).toEqual(-0.6666666666666667)
+		expect(getRank(null, objs[0], 1, 2)).toEqual(-0.33333333333333337)
+
+		// Center:
+		expect(getRank(objs[1], objs[2])).toEqual(15)
+		// Insert three:
+		expect(getRank(objs[1], objs[2], 0, 3)).toEqual(12.5)
+		expect(getRank(objs[1], objs[2], 1, 3)).toEqual(15)
+		expect(getRank(objs[1], objs[2], 2, 3)).toEqual(17.5)
+
+		// Last:
+		expect(getRank(objs[5], undefined)).toEqual(23.5)
+		// Insert three:
+		expect(getRank(objs[5], undefined, 0, 3)).toEqual(23.25)
+		expect(getRank(objs[5], undefined, 1, 3)).toEqual(23.5)
+		expect(getRank(objs[5], undefined, 2, 3)).toEqual(23.75)
+
+		// Insert in empty list
+		expect(getRank(undefined, undefined)).toEqual(0.5)
+
+		// Insert three:
+		expect(getRank(undefined, undefined, 0, 2)).toEqual(0.3333333333333333)
+		expect(getRank(undefined, undefined, 1, 2)).toEqual(0.6666666666666666)
+	})
+	test('stringifyObjects', () => {
+		const o: any = {
+			a: 1,
+			b: {
+				c: '1',
+				d: {
+					e: 2,
+				},
+			},
+		}
+		expect(stringifyObjects(o)).toEqual(stringifyObjects(o))
+	})
 })
diff --git a/packages/corelib/src/__tests__/mongo.spec.ts b/packages/corelib/src/__tests__/mongo.spec.ts
index 80f2fd477c..5bea16192c 100644
--- a/packages/corelib/src/__tests__/mongo.spec.ts
+++ b/packages/corelib/src/__tests__/mongo.spec.ts
@@ -1,5 +1,5 @@
 import { protectString, ProtectedString } from '../protectedString'
-import { FindOptions, mongoFindOptions } from '../mongo'
+import { FindOptions, mongoFindOptions, MongoQuery, mongoWhere } from '../mongo'
 
 describe('mongoFindOptions', () => {
 	const rawDocs = ['1', '2', '3', '4', '5', '6', '7'].map((s) => ({ _id: protectString(s) }))
@@ -169,3 +169,57 @@ describe('mongoFindOptions', () => {
 		])
 	})
 })
+
+test('mongoWhere', () => {
+	const docs = [
+		{
+			_id: protectString('id0'),
+			name: 'abc',
+			rank: 0,
+		},
+		{
+			_id: protectString('id1'),
+			name: 'abc',
+			rank: 1,
+		},
+		{
+			_id: protectString('id2'),
+			name: 'abcd',
+			rank: 2,
+		},
+		{
+			_id: protectString('id3'),
+			name: 'abcd',
+			rank: 3,
+		},
+		{
+			_id: protectString('id4'),
+			name: 'xyz',
+			rank: 4,
+		},
+		{
+			_id: protectString('id5'),
+			name: 'xyz',
+			rank: 5,
+		},
+	]
+
+	function findFetch(query: MongoQuery<any>) {
+		return docs.filter((doc) => mongoWhere(doc, query))
+	}
+
+	expect(findFetch({})).toHaveLength(6)
+
+	expect(findFetch({ _id: protectString('id3') })).toHaveLength(1)
+	expect(findFetch({ _id: protectString('id99') })).toHaveLength(0)
+
+	expect(findFetch({ name: 'abcd' })).toHaveLength(2)
+	expect(findFetch({ name: 'xyz' })).toHaveLength(2)
+	expect(findFetch({ name: { $in: ['abc', 'xyz'] } })).toHaveLength(4)
+
+	expect(findFetch({ rank: { $gt: 2 } })).toHaveLength(3)
+	expect(findFetch({ rank: { $gte: 2 } })).toHaveLength(4)
+
+	expect(findFetch({ rank: { $lt: 3 } })).toHaveLength(3)
+	expect(findFetch({ rank: { $lte: 3 } })).toHaveLength(4)
+})
diff --git a/packages/corelib/src/dataModel/Notes.ts b/packages/corelib/src/dataModel/Notes.ts
index 280a421a19..7d097323b2 100644
--- a/packages/corelib/src/dataModel/Notes.ts
+++ b/packages/corelib/src/dataModel/Notes.ts
@@ -24,6 +24,11 @@ export interface GenericNote extends INoteBase {
 		name: string
 	}
 }
+export interface RundownPlaylistNote extends INoteBase {
+	origin: {
+		name: string
+	}
+}
 export interface RundownNote extends INoteBase {
 	origin: {
 		name: string
diff --git a/packages/corelib/src/dataModel/Part.ts b/packages/corelib/src/dataModel/Part.ts
index 5ac52a9460..5792e02342 100644
--- a/packages/corelib/src/dataModel/Part.ts
+++ b/packages/corelib/src/dataModel/Part.ts
@@ -33,8 +33,8 @@ export interface DBPart extends IBlueprintPart {
 	/** Human readable unqiue identifier of the part */
 	identifier?: string
 
-	/** A modified expectedDuration with the planned preroll and other timings factored in */
-	expectedDurationWithPreroll: number | undefined
+	/** A modified expectedDuration with the piece/transition derived timings factored in */
+	expectedDurationWithTransition: number | undefined
 }
 
 export function isPartPlayable(part: Pick<ReadonlyDeep<DBPart>, 'invalid' | 'floated'>): boolean {
diff --git a/packages/corelib/src/dataModel/Rundown.ts b/packages/corelib/src/dataModel/Rundown.ts
index c0e47ca652..1907fb8725 100644
--- a/packages/corelib/src/dataModel/Rundown.ts
+++ b/packages/corelib/src/dataModel/Rundown.ts
@@ -12,10 +12,8 @@ import { RundownNote } from './Notes'
 import { ReadonlyDeep } from 'type-fest'
 
 export enum RundownOrphanedReason {
-	/** Rundown is deleted from the NRCS but we still need it */
+	/** Rundown is deleted from the source but we still need it */
 	DELETED = 'deleted',
-	/** Rundown was restored from a snapshot and does not correspond with a rundown in the NRCS */
-	FROM_SNAPSHOT = 'from-snapshot',
 	/** Rundown was unsynced by the user */
 	MANUAL = 'manual',
 }
@@ -29,7 +27,6 @@ export interface RundownImportVersions {
 	core: string
 }
 
-/** This is a very uncomplete mock-up of the Rundown object */
 export interface Rundown {
 	_id: RundownId
 	/** ID of the organization that owns the rundown */
@@ -53,9 +50,10 @@ export interface Rundown {
 	/** Air-status, comes from NCS, examples: "READY" | "NOT READY" */
 	airStatus?: string
 
-	// There should be something like a Owner user here somewhere?
-
-	/** Is the rundown in an unsynced (has been unpublished from ENPS) state? */
+	/**
+	 * Is the rundown in an unsynced state?
+	 * This can be because the rundown was deleted from the source, or because the user manually unsynced it
+	 */
 	orphaned?: RundownOrphanedReason
 
 	/** Last sent storyStatus to ingestDevice (MOS) */
diff --git a/packages/corelib/src/dataModel/RundownPlaylist.ts b/packages/corelib/src/dataModel/RundownPlaylist.ts
index 58511757f2..241e0c3895 100644
--- a/packages/corelib/src/dataModel/RundownPlaylist.ts
+++ b/packages/corelib/src/dataModel/RundownPlaylist.ts
@@ -10,6 +10,7 @@ import {
 	StudioId,
 	RundownId,
 } from './Ids'
+import { RundownPlaylistNote } from './Notes'
 
 /** Details of an ab-session requested by the blueprints in onTimelineGenerate */
 export interface ABSessionInfo {
@@ -17,6 +18,8 @@ export interface ABSessionInfo {
 	id: string
 	/** The name of the session from the blueprints */
 	name: string
+	/** Whether the name is treated as globally unique */
+	isUniqueName: boolean
 	/** Set if the session is being by lookahead for a future part */
 	lookaheadForPartId?: PartId
 	/** Set if the session is being used by an infinite PieceInstance */
@@ -42,6 +45,63 @@ export enum RundownHoldState {
 	COMPLETE = 3, // During full, full is played
 }
 
+export enum QuickLoopMarkerType {
+	PART = 'part',
+	SEGMENT = 'segment',
+	RUNDOWN = 'rundown',
+	PLAYLIST = 'playlist',
+}
+
+interface QuickLoopPartMarker {
+	type: QuickLoopMarkerType.PART
+	id: PartId
+
+	/** When a part is dynamically inserted after the marker, the user selected id gets persisted here for the next iteration */
+	overridenId?: PartId
+}
+
+interface QuickLoopSegmentMarker {
+	type: QuickLoopMarkerType.SEGMENT
+	id: SegmentId
+}
+
+interface QuickLoopRundownMarker {
+	type: QuickLoopMarkerType.RUNDOWN
+	id: RundownId
+}
+
+interface QuickLoopPlaylistMarker {
+	type: QuickLoopMarkerType.PLAYLIST
+}
+
+export type QuickLoopMarker =
+	| QuickLoopPartMarker
+	| QuickLoopSegmentMarker
+	| QuickLoopRundownMarker
+	| QuickLoopPlaylistMarker
+
+export enum ForceQuickLoopAutoNext {
+	/** Parts will auto-next only when explicitly set by the NRCS/blueprints */
+	DISABLED = 'disabled',
+	/** Parts will auto-next when the expected duration is set and within range */
+	ENABLED_WHEN_VALID_DURATION = 'enabled_when_valid_duration',
+	/** All parts will auto-next. If expected duration is undefined or low, the default display duration will be used */
+	ENABLED_FORCING_MIN_DURATION = 'enabled_forcing_min_duration',
+}
+
+export interface QuickLoopProps {
+	/** The Start marker */
+	start?: QuickLoopMarker
+	/** The End marker */
+	end?: QuickLoopMarker
+	/** Whether the user is allowed to make alterations to the Start/End markers */
+	locked: boolean
+	/** Whether the loop has two valid markers and is currently running (the current Part is within the loop) */
+	running: boolean
+	/** Whether the loop has autoNext should force auto-next on contained Parts */
+	forceAutoNext: ForceQuickLoopAutoNext
+}
+
 export interface DBRundownPlaylist {
 	_id: RundownPlaylistId
 	/** External ID (source) of the playlist */
@@ -69,8 +129,6 @@ export interface DBRundownPlaylist {
 	activationId?: RundownPlaylistActivationId
 	/** Timestamp when the playlist was last reset. Used to silence a few errors upon reset.*/
 	resetTime?: Time
-	/** Should the playlist loop at the end */
-	loop?: boolean
 	/** Marker indicating if unplayed parts behind the onAir part, should be treated as "still to be played" or "skipped" in terms of timing calculations */
 	outOfOrderTiming?: boolean
 	/** Should time-of-day clocks be used instead of countdowns by default */
@@ -95,12 +153,22 @@ export interface DBRundownPlaylist {
 	 */
 	queuedSegmentId?: SegmentId
 
+	/** Holds notes (warnings / errors) thrown by the blueprints during creation */
+	notes?: Array<RundownPlaylistNote>
+
+	quickLoop?: QuickLoopProps
+
 	/** Actual time of playback starting */
 	startedPlayback?: Time
 	/** Timestamp for the last time an incorrect part was reported as started */
 	lastIncorrectPartPlaybackReported?: Time
 	/** Actual time of each rundown starting playback */
 	rundownsStartedPlayback?: Record<string, Time>
+	/**
+	 * Actual time of SOME segments starting playback - usually just the previous and current one
+	 * This is not using SegmentId, but SegmentPlayoutId
+	 */
+	segmentsStartedPlayback?: Record<string, Time>
 	/** Time of the last take */
 	lastTakeTime?: Time
 
diff --git a/packages/corelib/src/dataModel/Studio.ts b/packages/corelib/src/dataModel/Studio.ts
index fa3b063c58..78ee077c19 100644
--- a/packages/corelib/src/dataModel/Studio.ts
+++ b/packages/corelib/src/dataModel/Studio.ts
@@ -1,11 +1,37 @@
-import { BlueprintMapping, IBlueprintConfig, PackageContainer, TSR } from '@sofie-automation/blueprints-integration'
+import { IBlueprintConfig, TSR } from '@sofie-automation/blueprints-integration'
 import { ObjectWithOverrides } from '../settings/objectWithOverrides'
 import { StudioId, OrganizationId, BlueprintId, ShowStyleBaseId, MappingsHash, PeripheralDeviceId } from './Ids'
 import { BlueprintHash, LastBlueprintConfig } from './Blueprint'
 import { MappingsExt, MappingExt } from '@sofie-automation/shared-lib/dist/core/model/Timeline'
+import { ForceQuickLoopAutoNext } from './RundownPlaylist'
+import {
+	ResultingMappingRoute,
+	RouteMapping,
+	StudioRouteBehavior,
+	ResultingMappingRoutes,
+	StudioRouteSet,
+	StudioRouteSetExclusivityGroup,
+	StudioRouteType,
+	StudioAbPlayerDisabling,
+} from '@sofie-automation/shared-lib/dist/core/model/StudioRouteSet'
+import { StudioPackageContainer } from '@sofie-automation/shared-lib/dist/core/model/PackageContainer'
 
 export { MappingsExt, MappingExt, MappingsHash }
 
+// RouteSet functions has been moved to shared-lib:
+// So we need to re-export them here:
+export {
+	StudioRouteSetExclusivityGroup,
+	ResultingMappingRoute,
+	RouteMapping,
+	StudioRouteBehavior,
+	ResultingMappingRoutes,
+	StudioRouteSet,
+	StudioRouteType,
+	StudioAbPlayerDisabling,
+	StudioPackageContainer,
+}
+
 export interface IStudioSettings {
 	/** The framerate (frames per second) used to convert internal timing information (in milliseconds)
 	 * into timecodes and timecode-like strings and interpret timecode user input
@@ -50,6 +76,18 @@ export interface IStudioSettings {
 
 	/** Whether to allow adlib testing mode, before a Part is playing in a Playlist */
 	allowAdlibTestingSegment?: boolean
+
+	/** Should QuickLoop context menu options be available to the users. It does not affect Playlist loop enabled by the NRCS. */
+	enableQuickLoop?: boolean
+
+	/** If and how to force auto-nexting in a looping Playlist */
+	forceQuickLoopAutoNext?: ForceQuickLoopAutoNext
+
+	/**
+	 * The duration to apply on too short Parts Within QuickLoop when ForceQuickLoopAutoNext.ENABLED_FORCING_MIN_DURATION is selected
+	 * Default: 3000
+	 */
+	fallbackPartDuration?: number
 }
 
 export type StudioLight = Omit<DBStudio, 'mappingsWithOverrides' | 'blueprintConfigWithOverrides'>
@@ -88,13 +126,13 @@ export interface DBStudio {
 
 	_rundownVersionHash: string
 
-	routeSets: Record<string, StudioRouteSet>
-	routeSetExclusivityGroups: Record<string, StudioRouteSetExclusivityGroup>
+	routeSetsWithOverrides: ObjectWithOverrides<Record<string, StudioRouteSet>>
+	routeSetExclusivityGroupsWithOverrides: ObjectWithOverrides<Record<string, StudioRouteSetExclusivityGroup>>
 
 	/** Contains settings for which Package Containers are present in the studio.
 	 * (These are used by the Package Manager and the Expected Packages)
 	 */
-	packageContainers: Record<string, StudioPackageContainer>
+	packageContainersWithOverrides: ObjectWithOverrides<Record<string, StudioPackageContainer>>
 
 	/** Which package containers is used for media previews in GUI */
 	previewContainerIds: string[]
@@ -148,58 +186,3 @@ export interface StudioPlayoutDevice {
 
 	options: TSR.DeviceOptionsAny
 }
-
-export interface StudioPackageContainer {
-	/** List of which peripheraldevices uses this packageContainer */
-	deviceIds: string[]
-	container: PackageContainer
-}
-export interface StudioRouteSetExclusivityGroup {
-	name: string
-}
-
-export interface StudioRouteSet {
-	/** User-presentable name */
-	name: string
-	/** Whether this group is active or not */
-	active: boolean
-	/** Default state of this group */
-	defaultActive?: boolean
-	/** Only one Route can be active at the same time in the exclusivity-group */
-	exclusivityGroup?: string
-	/** If true, should be displayed and toggleable by user */
-	behavior: StudioRouteBehavior
-
-	routes: RouteMapping[]
-}
-export enum StudioRouteBehavior {
-	HIDDEN = 0,
-	TOGGLE = 1,
-	ACTIVATE_ONLY = 2,
-}
-
-export enum StudioRouteType {
-	/** Default */
-	REROUTE = 0,
-	/** Replace all properties with a new mapping */
-	REMAP = 1,
-}
-
-export interface RouteMapping extends ResultingMappingRoute {
-	/** Which original layer to route. If false, a "new" layer will be inserted during routing */
-	mappedLayer: string | undefined
-}
-export interface ResultingMappingRoutes {
-	/** Routes that route existing layers */
-	existing: {
-		[mappedLayer: string]: ResultingMappingRoute[]
-	}
-	/** Routes that create new layers, from nothing */
-	inserted: ResultingMappingRoute[]
-}
-export interface ResultingMappingRoute {
-	outputMappedLayer: string
-	deviceType?: TSR.DeviceType
-	remapping?: Partial<BlueprintMapping>
-	routeType: StudioRouteType
-}
diff --git a/packages/corelib/src/lib.ts b/packages/corelib/src/lib.ts
index 77a3caa4a5..399db4fead 100644
--- a/packages/corelib/src/lib.ts
+++ b/packages/corelib/src/lib.ts
@@ -7,6 +7,7 @@ import { Timecode } from 'timecode'
 import { iterateDeeply, iterateDeeplyEnum, Time } from '@sofie-automation/blueprints-integration'
 import { IStudioSettings } from './dataModel/Studio'
 import { customAlphabet as createNanoid } from 'nanoid'
+import type { ITranslatableMessage } from './TranslatableMessage'
 
 /**
  * Limited character set to use for id generation
@@ -21,7 +22,8 @@ const nanoid = createNanoid(UNMISTAKABLE_CHARS, 17)
 
 export * from './hash'
 
-export type Subtract<T extends T1, T1 extends object> = Pick<T, Exclude<keyof T, keyof T1>>
+export type { Complete, ArrayElement, Subtract } from '@sofie-automation/shared-lib/dist/lib/types'
+export { assertNever, literal } from '@sofie-automation/shared-lib/dist/lib/lib'
 
 export function getSofieHostUrl(): string {
 	const url = process.env.ROOT_URL
@@ -30,16 +32,6 @@ export function getSofieHostUrl(): string {
 	throw new Error('ROOT_URL must be defined to launch Sofie')
 }
 
-/**
- * Make all optional properties be required and `| undefined`
- * This is useful to ensure that no property is missed, when manually converting between types, but allowing fields to be undefined
- */
-export type Complete<T> = {
-	[P in keyof Required<T>]: Pick<T, P> extends Required<Pick<T, P>> ? T[P] : T[P] | undefined
-}
-
-export type ArrayElement<A> = A extends readonly (infer T)[] ? T : never
-
 export function omit<T, P extends keyof T>(obj: T, ...props: P[]): Omit<T, P> {
 	return _.omit(obj, ...(props as string[])) as any
 }
@@ -67,10 +59,6 @@ export function min<T>(vals: T[] | readonly T[], iterator: _.ListIterator<T, any
 	}
 }
 
-export function assertNever(_never: never): void {
-	// Do nothing. This is a type guard
-}
-
 export function clone<T>(o: ReadonlyDeep<T> | Readonly<T> | T): T {
 	// Use this instead of fast-clone directly, as this retains the type
 	return fastClone(o as any)
@@ -112,14 +100,6 @@ export function getRandomId<T extends ProtectedString<any>>(numberOfChars?: numb
 	return protectString(getRandomString(numberOfChars))
 }
 
-export function literal<T>(o: T): T {
-	return o
-}
-
-export async function sleep(ms: number): Promise<void> {
-	return new Promise((resolve) => setTimeout(resolve, ms))
-}
-
 /**
  * Convert an array to a object, keyed on an id generator function.
  * `undefined` key values will get filtered from the object
@@ -435,3 +415,57 @@ export function deferAsync(fn: () => Promise<void>, catcher: (e: unknown) => voi
 export function joinObjectPathFragments(...fragments: Array<string | number | undefined>): string {
 	return fragments.filter((v) => v !== '' && v !== undefined && v !== null).join('.')
 }
+
+export function ensureHasTrailingSlash(input: string | null): string | undefined {
+	if (input) {
+		return input.endsWith('/') ? input : input + '/'
+	} else {
+		return undefined
+	}
+}
+
+/**
+ * Returns a string that can be used to compare objects for equality
+ * @param objs
+ */
+export function stringifyObjects(objs: unknown): string {
+	if (_.isArray(objs)) {
+		return _.map(objs, (obj) => {
+			if (obj !== undefined) {
+				return stringifyObjects(obj)
+			} else {
+				return undefined
+			}
+		}).join(',')
+	} else if (_.isFunction(objs)) {
+		return ''
+	} else if (_.isObject(objs)) {
+		const objs0 = objs as any
+		const keys = _.sortBy(_.keys(objs), (k) => k)
+
+		return _.compact(
+			_.map(keys, (key) => {
+				if (objs0[key] !== undefined) {
+					return key + '=' + stringifyObjects(objs0[key])
+				} else {
+					return null
+				}
+			})
+		).join(',')
+	} else {
+		return objs + ''
+	}
+}
+
+/** Generate the translation for a string, to be applied later when it gets rendered */
+export function generateTranslation(
+	key: string,
+	args?: { [k: string]: any },
+	namespaces?: string[]
+): ITranslatableMessage {
+	return {
+		key,
+		args,
+		namespaces,
+	}
+}
diff --git a/packages/corelib/src/logging.ts b/packages/corelib/src/logging.ts
new file mode 100644
index 0000000000..e098f0a2e8
--- /dev/null
+++ b/packages/corelib/src/logging.ts
@@ -0,0 +1,33 @@
+// @todo: remove this and do a PR to https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/winston
+// because there's an error in the typings logging.debug() takes any, not only string
+export interface LoggerInstanceFixed {
+	// for cli and npm levels
+	error: LeveledLogMethodFixed
+	warn: LeveledLogMethodFixed
+	// help: LeveledLogMethodFixed
+	data: LeveledLogMethodFixed
+	info: LeveledLogMethodFixed
+	debug: LeveledLogMethodFixed
+	prompt: LeveledLogMethodFixed
+	http: LeveledLogMethodFixed
+	verbose: LeveledLogMethodFixed
+	input: LeveledLogMethodFixed
+	silly: LeveledLogMethodFixed
+
+	// for syslog levels only
+	emerg: LeveledLogMethodFixed
+	alert: LeveledLogMethodFixed
+	crit: LeveledLogMethodFixed
+	warning: LeveledLogMethodFixed
+	notice: LeveledLogMethodFixed
+	log: LeveledLogMethodFixed
+}
+interface LogMeta {
+	[key: string]: any
+}
+type Winston_LogCallback = (error?: any, level?: string, msg?: string, meta?: any) => void
+export interface LeveledLogMethodFixed {
+	(msg: any, callback: Winston_LogCallback): LoggerInstanceFixed
+	(msg: any, meta: LogMeta, callback: Winston_LogCallback): LoggerInstanceFixed
+	(msg: any, ...meta: LogMeta[]): LoggerInstanceFixed
+}
diff --git a/meteor/client/ui/Settings/util/OverrideOpHelper.tsx b/packages/corelib/src/overrideOpHelper.ts
similarity index 80%
rename from meteor/client/ui/Settings/util/OverrideOpHelper.tsx
rename to packages/corelib/src/overrideOpHelper.ts
index 146f962b3c..fd04bc3814 100644
--- a/meteor/client/ui/Settings/util/OverrideOpHelper.tsx
+++ b/packages/corelib/src/overrideOpHelper.ts
@@ -1,4 +1,4 @@
-import { clone, literal, objectPathSet } from '@sofie-automation/corelib/dist/lib'
+import { clone, literal, objectPathSet } from './lib'
 import {
 	SomeObjectOverrideOp,
 	ObjectWithOverrides,
@@ -7,8 +7,7 @@ import {
 	applyAndValidateOverrides,
 	filterOverrideOpsForPrefix,
 	findParentOpToUpdate,
-} from '@sofie-automation/corelib/dist/settings/objectWithOverrides'
-import { useRef, useEffect, useCallback } from 'react'
+} from './settings/objectWithOverrides'
 import { ReadonlyDeep } from 'type-fest'
 
 export interface WrappedOverridableItemDeleted<T extends object> {
@@ -38,8 +37,48 @@ export type WrappedOverridableItem<T extends object> =
  */
 export function getAllCurrentAndDeletedItemsFromOverrides<T extends object>(
 	rawObject: ReadonlyDeep<ObjectWithOverrides<Record<string, T | undefined>>>,
-	comparitor: ((a: [id: string, obj: T | ReadonlyDeep<T>], b: [id: string, obj: T | ReadonlyDeep<T>]) => number) | null
+	comparitor:
+		| ((a: [id: string, obj: T | ReadonlyDeep<T>], b: [id: string, obj: T | ReadonlyDeep<T>]) => number)
+		| null
 ): WrappedOverridableItem<T>[] {
+	// Sort and wrap in the return type
+	const sortedItems = getAllCurrentItemsFromOverrides(rawObject, comparitor)
+
+	const removedOutputLayers: WrappedOverridableItemDeleted<T>[] = []
+
+	// Find the items which have been deleted with an override
+	const computedOutputLayerIds = new Set(sortedItems.map((l) => l.id))
+	for (const [id, output] of Object.entries<ReadonlyDeep<T | undefined>>(rawObject.defaults)) {
+		if (!computedOutputLayerIds.has(id) && output) {
+			removedOutputLayers.push(
+				literal<WrappedOverridableItemDeleted<T>>({
+					type: 'deleted',
+					id: id,
+					computed: undefined,
+					defaults: output,
+					overrideOps: filterOverrideOpsForPrefix(rawObject.overrides, id).opsForPrefix,
+				})
+			)
+		}
+	}
+
+	if (comparitor) removedOutputLayers.sort((a, b) => comparitor([a.id, a.defaults], [b.id, b.defaults]))
+
+	return [...sortedItems, ...removedOutputLayers]
+}
+
+/**
+ * Compile a sorted array of all the items currently active in the ObjectWithOverrides
+ * @param rawObject The ObjectWithOverrides to look at
+ * @param comparitor Comparitor for sorting the items
+ * @returns Sorted items
+ */
+export function getAllCurrentItemsFromOverrides<T extends object>(
+	rawObject: ReadonlyDeep<ObjectWithOverrides<Record<string, T | undefined>>>,
+	comparitor:
+		| ((a: [id: string, obj: T | ReadonlyDeep<T>], b: [id: string, obj: T | ReadonlyDeep<T>]) => number)
+		| null
+): WrappedOverridableItemNormal<T>[] {
 	const resolvedObject = applyAndValidateOverrides(rawObject).obj
 
 	// Convert the items into an array
@@ -61,27 +100,7 @@ export function getAllCurrentAndDeletedItemsFromOverrides<T extends object>(
 		})
 	)
 
-	const removedItems: WrappedOverridableItemDeleted<T>[] = []
-
-	// Find the items which have been deleted with an override
-	const computedOutputLayerIds = new Set(sortedItems.map((l) => l.id))
-	for (const [id, output] of Object.entries<ReadonlyDeep<T | undefined>>(rawObject.defaults)) {
-		if (!computedOutputLayerIds.has(id) && output) {
-			removedItems.push(
-				literal<WrappedOverridableItemDeleted<T>>({
-					type: 'deleted',
-					id: id,
-					computed: undefined,
-					defaults: output,
-					overrideOps: filterOverrideOpsForPrefix(rawObject.overrides, id).opsForPrefix,
-				})
-			)
-		}
-	}
-
-	if (comparitor) removedItems.sort((a, b) => comparitor([a.id, a.defaults], [b.id, b.defaults]))
-
-	return [...sortedItems, ...removedItems]
+	return sortedItems
 }
 
 type SaveOverridesFunction = (newOps: SomeObjectOverrideOp[]) => void
@@ -142,13 +161,16 @@ export interface OverrideOpHelperBatcher extends OverrideOpHelperForItemContents
 
 export type OverrideOpHelper = () => OverrideOpHelperBatcher
 
-class OverrideOpHelperImpl implements OverrideOpHelperBatcher {
-	readonly #saveOverrides: SaveOverridesFunction
+export class OverrideOpHelperImpl implements OverrideOpHelperBatcher {
+	readonly #saveOverrides: SaveOverridesFunction | null
 	readonly #object: ObjectWithOverrides<any>
 
-	constructor(saveOverrides: SaveOverridesFunction, object: ObjectWithOverrides<any>) {
+	constructor(
+		saveOverrides: SaveOverridesFunction | null,
+		object: ObjectWithOverrides<any> | ReadonlyDeep<ObjectWithOverrides<any>>
+	) {
 		this.#saveOverrides = saveOverrides
-		this.#object = { ...object }
+		this.#object = { defaults: object.defaults, overrides: [...object.overrides] }
 	}
 
 	clearItemOverrides = (itemId: string, subPath: string): this => {
@@ -187,7 +209,10 @@ class OverrideOpHelperImpl implements OverrideOpHelperBatcher {
 	}
 
 	changeItemId = (oldItemId: string, newItemId: string): this => {
-		const { otherOps: newOps, opsForPrefix: opsForId } = filterOverrideOpsForPrefix(this.#object.overrides, oldItemId)
+		const { otherOps: newOps, opsForPrefix: opsForId } = filterOverrideOpsForPrefix(
+			this.#object.overrides,
+			oldItemId
+		)
 
 		if (!newItemId || newOps.find((op) => op.path === newItemId) || this.#object.defaults[newItemId]) {
 			throw new Error('Id is invalid or already in use')
@@ -213,9 +238,9 @@ class OverrideOpHelperImpl implements OverrideOpHelperBatcher {
 			}
 
 			this.#object.overrides = newOps
-		}
 
-		return this
+			return this
+		}
 	}
 
 	setItemValue = (itemId: string, subPath: string, value: unknown): this => {
@@ -223,7 +248,10 @@ class OverrideOpHelperImpl implements OverrideOpHelperBatcher {
 			throw new Error('Item id cannot be changed through this helper')
 		} else {
 			// Set a property
-			const { otherOps: newOps, opsForPrefix: opsForId } = filterOverrideOpsForPrefix(this.#object.overrides, itemId)
+			const { otherOps: newOps, opsForPrefix: opsForId } = filterOverrideOpsForPrefix(
+				this.#object.overrides,
+				itemId
+			)
 
 			const setRootOp = opsForId.find((op) => op.path === itemId)
 			if (setRootOp && setRootOp.op === 'set') {
@@ -264,9 +292,9 @@ class OverrideOpHelperImpl implements OverrideOpHelperBatcher {
 			}
 
 			this.#object.overrides = newOps
-		}
 
-		return this
+			return this
+		}
 	}
 
 	replaceItem = (itemId: string, value: unknown): this => {
@@ -288,27 +316,13 @@ class OverrideOpHelperImpl implements OverrideOpHelperBatcher {
 		return this
 	}
 
-	commit = () => {
+	commit = (): void => {
+		if (!this.#saveOverrides) throw new Error('Cannot commit changes without a save function')
+
 		this.#saveOverrides(this.#object.overrides)
 	}
-}
 
-/**
- * A helper to work with modifying an ObjectWithOverrides<T>
- */
-export function useOverrideOpHelper<T extends object>(
-	saveOverrides: (newOps: SomeObjectOverrideOp[]) => void,
-	objectWithOverrides: ObjectWithOverrides<T>
-): OverrideOpHelper {
-	const objectWithOverridesRef = useRef(objectWithOverrides)
-
-	// Use a ref to minimise reactivity when it changes
-	useEffect(() => {
-		objectWithOverridesRef.current = objectWithOverrides
-	}, [objectWithOverrides])
-
-	return useCallback(() => {
-		if (!objectWithOverridesRef.current) throw new Error('No current object!')
-		return new OverrideOpHelperImpl(saveOverrides, objectWithOverridesRef.current)
-	}, [saveOverrides, objectWithOverridesRef])
+	getPendingOps = (): SomeObjectOverrideOp[] => {
+		return this.#object.overrides
+	}
 }
diff --git a/packages/corelib/src/playout/__tests__/processAndPrune.test.ts b/packages/corelib/src/playout/__tests__/processAndPrune.test.ts
index fb8896df7d..53ad35ab02 100644
--- a/packages/corelib/src/playout/__tests__/processAndPrune.test.ts
+++ b/packages/corelib/src/playout/__tests__/processAndPrune.test.ts
@@ -432,6 +432,42 @@ describe('processAndPrunePieceInstanceTimings', () => {
 		// don't expect virtual Pieces in the results, but 'one' should be pruned too
 		expect(resolvedInstances).toEqual([])
 	})
+
+	test('stop onSegmentChange continuation with planned onSegmentEnd start=0', () => {
+		const pieceInstances = [
+			createPieceInstance('one', { start: 0 }, 'one', PieceLifespan.OutOnSegmentChange, false, {
+				fromPreviousPart: true,
+				fromPreviousPlayhead: true,
+				infiniteInstanceId: protectString('one_a'),
+				infiniteInstanceIndex: 1,
+				infinitePieceId: protectString('one_b'),
+			}),
+			createPieceInstance('two', { start: 0 }, 'one', PieceLifespan.OutOnSegmentEnd, false, {
+				fromPreviousPart: false,
+				infiniteInstanceId: protectString('two_a'),
+				infiniteInstanceIndex: 0,
+				infinitePieceId: protectString('two_b'),
+			}),
+		]
+
+		// Set the first as adlibbed during the previous part
+		pieceInstances[0].dynamicallyInserted = 1
+
+		// Pieces should have preroll
+		pieceInstances[0].piece.prerollDuration = 200
+		pieceInstances[1].piece.prerollDuration = 200
+
+		const resolvedInstances = runAndTidyResult(pieceInstances, 500)
+
+		expect(resolvedInstances).toEqual([
+			{
+				_id: 'two',
+				end: undefined,
+				priority: 2,
+				start: 0,
+			},
+		])
+	})
 })
 
 describe('resolvePrunedPieceInstances', () => {
diff --git a/meteor/lib/__tests__/timeline.test.ts b/packages/corelib/src/playout/__tests__/timeline.test.ts
similarity index 89%
rename from meteor/lib/__tests__/timeline.test.ts
rename to packages/corelib/src/playout/__tests__/timeline.test.ts
index 10dba8ddac..83a780f7ab 100644
--- a/meteor/lib/__tests__/timeline.test.ts
+++ b/packages/corelib/src/playout/__tests__/timeline.test.ts
@@ -1,14 +1,9 @@
-import { testInFiber } from '../../__mocks__/helpers/jest'
-import { transformTimeline } from '@sofie-automation/corelib/dist/playout/timeline'
-import {
-	TimelineObjGeneric,
-	TimelineObjType,
-	TimelineObjRundown,
-} from '@sofie-automation/corelib/dist/dataModel/Timeline'
 import { TSR } from '@sofie-automation/blueprints-integration'
+import { TimelineObjGeneric, TimelineObjRundown, TimelineObjType } from '../../dataModel/Timeline'
+import { transformTimeline } from '../timeline'
 
 describe('lib/timeline', () => {
-	testInFiber('transformTimeline', () => {
+	test('transformTimeline', () => {
 		const timeline: TimelineObjRundown[] = [
 			{
 				id: '0',
@@ -136,7 +131,7 @@ describe('lib/timeline', () => {
 			},
 		})
 	})
-	testInFiber('missing id', () => {
+	test('missing id', () => {
 		expect(() => {
 			transformTimeline([
 				// @ts-ignore missing: id
diff --git a/packages/corelib/src/playout/playlist.ts b/packages/corelib/src/playout/playlist.ts
index dd53fa50f6..702e4c3eca 100644
--- a/packages/corelib/src/playout/playlist.ts
+++ b/packages/corelib/src/playout/playlist.ts
@@ -1,3 +1,4 @@
+import { DBRundown } from '../dataModel/Rundown'
 import { DBSegment } from '../dataModel/Segment'
 import { DBPart } from '../dataModel/Part'
 import { DBPartInstance } from '../dataModel/PartInstance'
@@ -89,3 +90,38 @@ export function sortRundownIDsInPlaylist(
 
 	return [...sortedVerifiedExisting, ...missingIds]
 }
+
+export type MarkerPosition = {
+	partRank: number
+	segmentRank: number
+	rundownRank: number
+}
+
+export function compareMarkerPositions(a: MarkerPosition, b: MarkerPosition): number {
+	if (a.rundownRank > b.rundownRank) return -1
+	if (a.rundownRank < b.rundownRank) return 1
+	if (a.segmentRank > b.segmentRank) return -1
+	if (a.segmentRank < b.segmentRank) return 1
+	if (a.partRank > b.partRank) return -1
+	if (a.partRank < b.partRank) return 1
+	return 0
+}
+
+export function sortRundownsWithinPlaylist(
+	sortedPossibleIds: ReadonlyDeep<RundownId[]>,
+	unsortedRundowns: DBRundown[]
+): DBRundown[] {
+	return unsortedRundowns.slice().sort((a, b) => {
+		const indexA = sortedPossibleIds.indexOf(a._id)
+		const indexB = sortedPossibleIds.indexOf(b._id)
+		if (indexA === -1 && indexB === -1) {
+			return a._id.toString().localeCompare(b._id.toString())
+		} else if (indexA === -1) {
+			return 1
+		} else if (indexB === -1) {
+			return -1
+		}
+
+		return indexA - indexB
+	})
+}
diff --git a/packages/corelib/src/playout/processAndPrune.ts b/packages/corelib/src/playout/processAndPrune.ts
index c9cb0f3377..f7269c086f 100644
--- a/packages/corelib/src/playout/processAndPrune.ts
+++ b/packages/corelib/src/playout/processAndPrune.ts
@@ -10,10 +10,22 @@ import { ReadonlyDeep } from 'type-fest'
 /**
  * Get the `enable: { start: ?? }` for the new piece in terms that can be used as an `end` for another object
  */
-function getPieceStartTime(newPieceStart: number | 'now'): number | RelativeResolvedEndCap {
+function getPieceStartTimeAsReference(newPieceStart: number | 'now'): number | RelativeResolvedEndCap {
 	return typeof newPieceStart === 'number' ? newPieceStart : { offsetFromNow: 0 }
 }
 
+function getPieceStartTimeWithinPart(p: ReadonlyDeep<PieceInstance>): 'now' | number {
+	// If the piece is dynamically inserted, then its preroll should be factored into its start time, but not for any infinite continuations
+	const isStartOfAdlib =
+		!!p.dynamicallyInserted && !(p.infinite?.fromPreviousPart || p.infinite?.fromPreviousPlayhead)
+
+	if (isStartOfAdlib && p.piece.enable.start !== 'now') {
+		return p.piece.enable.start + (p.piece.prerollDuration ?? 0)
+	} else {
+		return p.piece.enable.start
+	}
+}
+
 function isClear(piece?: ReadonlyDeep<PieceInstance>): boolean {
 	return !!piece?.piece.virtual
 }
@@ -90,7 +102,7 @@ export function processAndPrunePieceInstanceTimings(
 	for (const pieces of groupedPieces.values()) {
 		// Group and sort the pieces so that we can step through each point in time
 		const piecesByStart: Array<[number | 'now', ReadonlyDeep<PieceInstance[]>]> = _.sortBy(
-			Array.from(groupByToMapFunc(pieces, (p) => p.piece.enable.start).entries()).map(([k, v]) =>
+			Array.from(groupByToMapFunc(pieces, (p) => getPieceStartTimeWithinPart(p)).entries()).map(([k, v]) =>
 				literal<[number | 'now', ReadonlyDeep<PieceInstance[]>]>([k === 'now' ? 'now' : Number(k), v])
 			),
 			([k]) => (k === 'now' ? nowInPart : k)
@@ -125,7 +137,7 @@ function updateWithNewPieces(
 	if (newPiece) {
 		const activePiece = activePieces[key]
 		if (activePiece) {
-			activePiece.resolvedEndCap = getPieceStartTime(newPiecesStart)
+			activePiece.resolvedEndCap = getPieceStartTimeAsReference(newPiecesStart)
 		}
 		// track the new piece
 		activePieces[key] = newPiece
@@ -150,7 +162,7 @@ function updateWithNewPieces(
 					(newPiecesStart !== 0 || isCandidateBetterToBeContinued(activePieces.other, newPiece))
 				) {
 					// These modes should stop the 'other' when they start if not hidden behind a higher priority onEnd
-					activePieces.other.resolvedEndCap = getPieceStartTime(newPiecesStart)
+					activePieces.other.resolvedEndCap = getPieceStartTimeAsReference(newPiecesStart)
 					activePieces.other = undefined
 				}
 			}
diff --git a/packages/corelib/src/playout/timings.ts b/packages/corelib/src/playout/timings.ts
index 3d38b2ff86..77209d90e7 100644
--- a/packages/corelib/src/playout/timings.ts
+++ b/packages/corelib/src/playout/timings.ts
@@ -157,17 +157,14 @@ export function getPartTimingsOrDefaults(
 	}
 }
 
-function calculateExpectedDurationWithPreroll(rawDuration: number, timings: PartCalculatedTimings): number {
-	// toPartDelay is accounted for twice, because it is added to `fromPartRemaining` when the `fromPartRemaining` value is calculated.
-	// If we only do `timings.toPartDelay - timings.fromPartRemaining`, the the values cancel out and the 'from' Part will
-	//  count overtime when prerolling into the 'to' Part.
-	// As a result, the 'to' Part will have a countdown which includes its own preroll.
-	return Math.max(0, rawDuration + timings.toPartDelay - (timings.fromPartRemaining - timings.toPartDelay))
+function calculateExpectedDurationWithTransition(rawDuration: number, timings: PartCalculatedTimings): number {
+	// toPartDelay and fromPartPostroll needs to be subtracted, because it is added to `fromPartRemaining` when the `fromPartRemaining` value is calculated.
+	return Math.max(0, rawDuration - (timings.fromPartRemaining - timings.toPartDelay - timings.fromPartPostroll))
 }
 
 export type CalculateExpectedDurationPart = Pick<DBPart, 'inTransition' | 'expectedDuration'>
 
-export function calculatePartExpectedDurationWithPreroll(
+export function calculatePartExpectedDurationWithTransition(
 	part: CalculateExpectedDurationPart,
 	pieces: ReadonlyDeep<PieceInstancePiece[]>
 ): number | undefined {
@@ -175,23 +172,22 @@ export function calculatePartExpectedDurationWithPreroll(
 
 	const timings = calculatePartTimings(undefined, {}, [], part, pieces)
 
-	return calculateExpectedDurationWithPreroll(part.expectedDuration, timings)
+	return calculateExpectedDurationWithTransition(part.expectedDuration, timings)
 }
 
-export function calculatePartInstanceExpectedDurationWithPreroll(
+export function calculatePartInstanceExpectedDurationWithTransition(
 	partInstance: Pick<DBPartInstance, 'part' | 'partPlayoutTimings'>
 	// pieces: CalculateTimingsPiece[]
 ): number | undefined {
 	if (partInstance.part.expectedDuration === undefined) return undefined
 
 	if (partInstance.partPlayoutTimings) {
-		return calculateExpectedDurationWithPreroll(partInstance.part.expectedDuration, partInstance.partPlayoutTimings)
-	} else {
-		const timings = calculatePartTimings(undefined, {}, [], partInstance.part, []) // TODO: Piece timings should be taken into account
-
-		return calculateExpectedDurationWithPreroll(
-			partInstance.part.expectedDurationWithPreroll ?? partInstance.part.expectedDuration,
-			timings
+		// The timings needed are known, we can ensure that live data is used
+		return calculateExpectedDurationWithTransition(
+			partInstance.part.expectedDuration,
+			partInstance.partPlayoutTimings
 		)
+	} else {
+		return partInstance.part.expectedDurationWithTransition
 	}
 }
diff --git a/packages/corelib/src/pubsub.ts b/packages/corelib/src/pubsub.ts
index 5a81f29c82..9f4cbebc39 100644
--- a/packages/corelib/src/pubsub.ts
+++ b/packages/corelib/src/pubsub.ts
@@ -35,14 +35,7 @@ import {
 	ShowStyleBaseId,
 	StudioId,
 } from '@sofie-automation/shared-lib/dist/core/model/Ids'
-import {
-	BlueprintId,
-	BucketId,
-	RundownPlaylistActivationId,
-	SegmentId,
-	SegmentPlayoutId,
-	ShowStyleVariantId,
-} from './dataModel/Ids'
+import { BlueprintId, BucketId, RundownPlaylistActivationId, SegmentId, ShowStyleVariantId } from './dataModel/Ids'
 import { PackageInfoDB } from './dataModel/PackageInfos'
 
 /**
@@ -102,11 +95,6 @@ export enum CorelibPubSub {
 	 * This provides a simplified form of the PartInstance, with any timing information omitted to reduce data churn
 	 */
 	partInstancesSimple = 'partInstancesSimple',
-	/**
-	 * Fetch the most recent PartInstance in a Rundown with the SegmentPlayoutId, including reset instances
-	 * This provides a simplified form of the PartInstance, with any timing information omitted to reduce data churn
-	 */
-	partInstancesForSegmentPlayout = 'partInstancesForSegmentPlayout',
 	/**
 	 * Fetch Pieces belonging to the specified Rundowns, optionally limiting the result to the specified Parts
 	 */
@@ -283,11 +271,6 @@ export interface CorelibPubSubTypes {
 		playlistActivationId: RundownPlaylistActivationId | null,
 		token?: string
 	) => CollectionName.PartInstances
-	[CorelibPubSub.partInstancesForSegmentPlayout]: (
-		rundownId: RundownId,
-		segmentPlayoutId: SegmentPlayoutId,
-		token?: string
-	) => CollectionName.PartInstances
 	[CorelibPubSub.segments]: (
 		rundownIds: RundownId[],
 		filter: {
diff --git a/packages/corelib/src/settings/objectWithOverrides.ts b/packages/corelib/src/settings/objectWithOverrides.ts
index 228234eae7..03783ab565 100644
--- a/packages/corelib/src/settings/objectWithOverrides.ts
+++ b/packages/corelib/src/settings/objectWithOverrides.ts
@@ -51,6 +51,10 @@ export function wrapDefaultObject<T extends object>(obj: T): ObjectWithOverrides
 		overrides: [],
 	}
 }
+export function isObjectWithOverrides<T extends object>(o: ObjectWithOverrides<T> | T): o is ObjectWithOverrides<T> {
+	const oAny = o as any
+	return typeof oAny.defaults === 'object' && Array.isArray(oAny.overrides)
+}
 /**
  * In some cases, an ObjectWithOverrides should have no defaults. This is common for when the user owns the object containing the ObjectWithOverrides.
  * This helper takes an ObjectWithOverrides, and converts it to have no defaults, and have each contained object as an override
diff --git a/packages/corelib/src/worker/studio.ts b/packages/corelib/src/worker/studio.ts
index 4825df50fb..c86324ed4a 100644
--- a/packages/corelib/src/worker/studio.ts
+++ b/packages/corelib/src/worker/studio.ts
@@ -18,6 +18,7 @@ import { JSONBlob } from '@sofie-automation/shared-lib/dist/lib/JSONBlob'
 import { CoreRundownPlaylistSnapshot } from '../snapshots'
 import { NoteSeverity } from '@sofie-automation/blueprints-integration'
 import { ITranslatableMessage } from '../TranslatableMessage'
+import { QuickLoopMarker } from '../dataModel/RundownPlaylist'
 
 /** List of all Jobs performed by the Worker related to a certain Studio */
 export enum StudioJobs {
@@ -187,6 +188,17 @@ export enum StudioJobs {
 	 * Activate AdlibTesting (Rehearsal Mode) mode for the Rundown containing the nexted Part.
 	 */
 	ActivateAdlibTesting = 'activateAdlibTesting',
+
+	/**
+	 * Set QuickLoop marker
+	 */
+	SetQuickLoopMarker = 'setQuickLoopMarker',
+
+	/**
+	 * Switch the route of the studio
+	 * for use in ad.lib actions and other triggers
+	 */
+	SwitchRouteSet = 'switchRouteSet',
 }
 
 export interface RundownPlayoutPropsBase {
@@ -334,6 +346,16 @@ export interface ActivateAdlibTestingProps extends RundownPlayoutPropsBase {
 	rundownId: RundownId
 }
 
+export interface SetQuickLoopMarkerProps extends RundownPlayoutPropsBase {
+	type: 'start' | 'end'
+	marker: QuickLoopMarker | null
+}
+
+export interface SwitchRouteSetProps {
+	routeSetId: string
+	state: boolean | 'toggle'
+}
+
 /**
  * Set of valid functions, of form:
  * `id: (data) => return`
@@ -385,6 +407,10 @@ export type StudioJobFunc = {
 	[StudioJobs.BlueprintIgnoreFixUpConfigForStudio]: () => void
 
 	[StudioJobs.ActivateAdlibTesting]: (data: ActivateAdlibTestingProps) => void
+
+	[StudioJobs.SetQuickLoopMarker]: (data: SetQuickLoopMarkerProps) => void
+
+	[StudioJobs.SwitchRouteSet]: (data: SwitchRouteSetProps) => void
 }
 
 export function getStudioQueueName(id: StudioId): string {
diff --git a/packages/documentation/docs/for-developers/contribution-guidelines.md b/packages/documentation/docs/for-developers/contribution-guidelines.md
index 4e6ffadc97..f97118ca00 100644
--- a/packages/documentation/docs/for-developers/contribution-guidelines.md
+++ b/packages/documentation/docs/for-developers/contribution-guidelines.md
@@ -7,6 +7,8 @@ sidebar_position: 2
 
 # Contribution Guidelines
 
+_Last updated september 2024_
+
 ## About the Sofie TV Studio Automation Project
 
 The Sofie project includes a number of open source applications and libraries developed and maintained by the Norwegian public service broadcaster, [NRK](https://www.nrk.no/about/). Sofie has been used to produce live shows at NRK since September 2018.
@@ -35,8 +37,8 @@ However, Sofie is a big project with many differing users and use cases. **Large
 3. (If needed) NRK establishes contact with the RFC author, who will be invited to a workshop where the RFC is discussed. Meeting notes are published publicly on the RFC thread.
 4. The contributor references the RFC when a pull request is ready.
 
-### Base contributions on the in-development branch (or the master branch)
-In order to facilitate merging, we ask that contributions are based on the latest (at the time of the pull request) _in-development_ branch (often named `release*`), alternatively the stable (eg. `master`) branch. NRK will take responsibility for rebasing stable contributions to the latest in-development branch if needed.
+### Base contributions on the in-development branch
+In order to facilitate merging, we ask that contributions are based on the latest (at the time of the pull request) _in-development_ branch (often named `release*`).
 See **CONTRIBUTING.md** in each official repository for details on which branch to use as a base for contributions.
 
 ## Developer Guidelines
diff --git a/packages/documentation/docs/user-guide/features/prompter.md b/packages/documentation/docs/user-guide/features/prompter.md
index 893e43f7af..a64cd7e641 100644
--- a/packages/documentation/docs/user-guide/features/prompter.md
+++ b/packages/documentation/docs/user-guide/features/prompter.md
@@ -28,7 +28,7 @@ The prompter UI can be configured using query parameters:
 | `showmarker`    | 0 / 1  | If the marker is not set to "hide", control if the marker is hidden or not                                                                                          | `1`     |
 | `showscroll`    | 0 / 1  | Whether the scroll bar should be shown                                                                                                                              | `1`     |
 | `followtake`    | 0 / 1  | Whether the prompter should automatically scroll to current segment when the operator TAKE:s it                                                                     | `1`     |
-| `showoverunder`    | 0 / 1  | The timer in the top-right of the prompter, showing the overtime/undertime of the current show.                                                                     | `1`     |
+| `showoverunder` | 0 / 1  | The timer in the top-right of the prompter, showing the overtime/undertime of the current show.                                                                     | `1`     |
 | `debug`         | 0 / 1  | Whether to display a debug box showing controller input values and the calculated speed the prompter is currently scrolling at. Used to tweak speedMaps and ranges. | `0`     |
 
 Example: [http://127.0.0.1/prompter/studio0/?mode=mouse&followtake=0&fontsize=20](http://127.0.0.1/prompter/studio0/?mode=mouse&followtake=0&fontsize=20)
@@ -37,9 +37,9 @@ Example: [http://127.0.0.1/prompter/studio0/?mode=mouse&followtake=0&fontsize=20
 
 The prompter can be controlled by different types of controllers. The control mode is set by a query parameter, like so: `?mode=mouse`.
 
-| Query parameter         | Description                                                                                                                                                                                                                                 |
-| :---------------------- | :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
-| Default                 | Controlled by both mouse and keyboard                                                                                                                                                                                                       |
+| Query parameter         | Description                                                                                                                                                                                                                                    |
+| :---------------------- | :--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| Default                 | Controlled by both mouse and keyboard                                                                                                                                                                                                          |
 | `?mode=mouse`           | Controlled by mouse only. [See configuration details](prompter.md#control-using-mouse-scroll-wheel)                                                                                                                                            |
 | `?mode=keyboard`        | Controlled by keyboard only. [See configuration details](prompter.md#control-using-keyboard)                                                                                                                                                   |
 | `?mode=shuttlekeyboard` | Controlled by a Contour Design ShuttleXpress, X-keys Jog and Shuttle or any compatible, configured as keyboard-ish device. [See configuration details](prompter.md#control-using-contour-shuttlexpress-or-x-keys)                              |
@@ -117,7 +117,7 @@ If you want to use traditional analogue pedals with 5 volt TRS connection, a con
 - `pedal_rangeNeutralMax` has to be greater than `pedal_rangeNeutralMin`
 - `pedal_rangeFwdMax` has to be greater than `pedal_rangeNeutralMax`
 
-![Yamaha FC7 mapped for both a forward \(80-127\) and backwards \(0-35\) range.](/img/docs/main/features/yamaha-fc7.jpg)
+![Yamaha FC7 mapped for both a forward (80-127) and backwards (0-35) range.](/img/docs/main/features/yamaha-fc7.jpg)
 
 The default values allow for both going forwards and backwards. This matches the _Yamaha FC7_ expression pedal. The default values create a forward-range from 80-127, a neutral zone from 35-80 and a reverse-range from 0-35.
 
@@ -158,6 +158,7 @@ The Joycons can operate in 3 modes, the L-stick, the R-stick or both L+R sticks
 | `joycon_rangeNeutralMin` | number           | The beginning of the backwards-range.                                                                                                                                                                                                                                                      | `-0.25`                      |
 | `joycon_rangeNeutralMax` | number           | The minimum input to run forward, the start of the forward-range \(min speed\). This is also the end of any "deadband" you want filter out before starting moving forwards.                                                                                                                | `0.25`                       |
 | `joycon_rangeFwdMax`     | number           | The maximum input, the end of the forward-range \(max speed\)                                                                                                                                                                                                                              | `1`                          |
+| `joycon_rightHandOffset` | number           | A ratio to increase or decrease the R Joycon joystick sensitivity relative to the L Joycon.                                                                                                                                                                                                | `1.4`                        |
 
 - `joycon_rangeNeutralMin` has to be greater than `joycon_rangeRevMin`
 - `joycon_rangeNeutralMax` has to be greater than `joycon_rangeNeutralMin`
diff --git a/packages/documentation/docs/user-guide/features/sofie-views.mdx b/packages/documentation/docs/user-guide/features/sofie-views.mdx
index 1a4ccfdea6..d4e0cebd4b 100644
--- a/packages/documentation/docs/user-guide/features/sofie-views.mdx
+++ b/packages/documentation/docs/user-guide/features/sofie-views.mdx
@@ -70,7 +70,7 @@ Another mode available to display a Segment is the List View. In this mode, each
 
 ![List View Mode](/img/docs/main/list_view.png)
 
-In this mode, the focus is on the "main" Piece of the Part. Additional _Lower-Third_ content that is not spanning the entire Part (is not infinite) will be displayed on top of the main Piece. All other content can be displayed to the right of the mini-timeline as a set of indicators, one per every Layer. Clicking on those indicators will show a pop-up with the Pieces so that they can be investigated using _hover-scrub_. Indicators can be also shown for Ad-Libs assigned to a Part, for easier discovery by the User. Which Layers should be shown in the columns can be decided in the [Settings ● Layers](../configuration/settings-view.md#show-style) area. A special, larger indicator is reserved for the Script piece, which can be useful to display so-called _out-words_.
+In this mode, the focus is on the "main" Piece of the Part. Additional _Lower-Third_ Pieces will be displayed on top of the main Piece. Infinite _Lower-Third_ Pieces and all other content can be displayed to the right of the mini-timeline as a set of indicators, one per every Layer. Clicking on those indicators will show a pop-up with the Pieces so that they can be investigated using _hover-scrub_. Indicators can be also shown for Ad-Libs assigned to a Part, for easier discovery by the User. Which Layers should be shown in the columns can be decided in the [Settings ● Layers](../configuration/settings-view.md#show-style) area. A special, larger indicator is reserved for the Script piece, which can be useful to display so-called _out-words_.
 
 If a Part has an _in-transition_ Piece, it will be displayed to the left of the Part's Take Point.
 
diff --git a/packages/documentation/docusaurus.config.js b/packages/documentation/docusaurus.config.js
index ceb68cec4c..55b9288d88 100644
--- a/packages/documentation/docusaurus.config.js
+++ b/packages/documentation/docusaurus.config.js
@@ -70,7 +70,7 @@ module.exports = {
 					items: [
 						{
 							label: 'Sofie Slack Community',
-							href: 'https://join.slack.com/t/sofietv/shared_invite/enQtNTk2Mzc3MTQ1NzAzLTJkZjMyMDg3OGM0YWU3MmU4YzBhZDAyZWI1YmJmNmRiYWQ1OTZjYTkzOTkzMTA2YTE1YjgxMmVkM2U1OGZlNWI',
+							href: 'https://join.slack.com/t/sofietv/shared_invite/zt-2bfz8l9lw-azLeDB55cvN2wvMgqL1alA',
 						},
 					],
 				},
diff --git a/packages/documentation/package.json b/packages/documentation/package.json
index 2db1628111..d144d94516 100644
--- a/packages/documentation/package.json
+++ b/packages/documentation/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "sofie-documentation",
-	"version": "1.51.0-in-development",
+	"version": "1.52.0-in-development",
 	"private": true,
 	"scripts": {
 		"docusaurus": "docusaurus",
diff --git a/packages/job-worker/package.json b/packages/job-worker/package.json
index cb481aae79..4f42b539d2 100644
--- a/packages/job-worker/package.json
+++ b/packages/job-worker/package.json
@@ -1,19 +1,19 @@
 {
 	"name": "@sofie-automation/job-worker",
-	"version": "1.51.0-in-development",
+	"version": "1.52.0-in-development",
 	"description": "Worker for things",
 	"main": "dist/index.js",
 	"license": "MIT",
 	"private": true,
 	"repository": {
 		"type": "git",
-		"url": "git+https://github.com/nrkno/tv-automation-server-core.git",
+		"url": "git+https://github.com/nrkno/sofie-core.git",
 		"directory": "packages/job-worker"
 	},
 	"bugs": {
-		"url": "https://github.com/nrkno/tv-automation-server-core/issues"
+		"url": "https://github.com/nrkno/sofie-core/issues"
 	},
-	"homepage": "https://github.com/nrkno/tv-automation-server-core/blob/master/packages/job-worker#readme",
+	"homepage": "https://github.com/nrkno/sofie-core/blob/master/packages/job-worker#readme",
 	"scripts": {
 		"dev": "run -T nodemon --config nodemon.json src/index.ts",
 		"dev:debug": "run -T nodemon --config nodemon.json --inspect-brk src/index.ts",
@@ -41,9 +41,9 @@
 	],
 	"dependencies": {
 		"@slack/webhook": "^6.1.0",
-		"@sofie-automation/blueprints-integration": "1.51.0-in-development",
-		"@sofie-automation/corelib": "1.51.0-in-development",
-		"@sofie-automation/shared-lib": "1.51.0-in-development",
+		"@sofie-automation/blueprints-integration": "1.52.0-in-development",
+		"@sofie-automation/corelib": "1.52.0-in-development",
+		"@sofie-automation/shared-lib": "1.52.0-in-development",
 		"amqplib": "^0.10.3",
 		"deepmerge": "^4.3.1",
 		"elastic-apm-node": "^3.51.0",
@@ -52,7 +52,7 @@
 		"node-fetch": "^2.7.0",
 		"p-lazy": "^3.1.0",
 		"p-timeout": "^4.1.0",
-		"superfly-timeline": "9.0.0",
+		"superfly-timeline": "9.0.2",
 		"threadedclass": "^1.2.2",
 		"tslib": "^2.6.2",
 		"type-fest": "^3.13.1",
diff --git a/packages/job-worker/src/__mocks__/context.ts b/packages/job-worker/src/__mocks__/context.ts
index 9e2751de4e..15082d9d67 100644
--- a/packages/job-worker/src/__mocks__/context.ts
+++ b/packages/job-worker/src/__mocks__/context.ts
@@ -226,6 +226,18 @@ export class MockJobContext implements JobContext {
 		// throw new Error('Method not implemented.')
 	}
 
+	setRouteSetActive(_routeSetId: string, _isActive: boolean | 'toggle'): boolean {
+		throw new Error('Method not implemented.')
+	}
+
+	async saveRouteSetChanges(): Promise<void> {
+		// throw new Error('Method not implemented.')
+	}
+
+	discardRouteSetChanges(): void {
+		// throw new Error('Method not implemented.')
+	}
+
 	/**
 	 * Mock methods
 	 */
diff --git a/packages/job-worker/src/__mocks__/defaultCollectionObjects.ts b/packages/job-worker/src/__mocks__/defaultCollectionObjects.ts
index 5425173e60..171a929dba 100644
--- a/packages/job-worker/src/__mocks__/defaultCollectionObjects.ts
+++ b/packages/job-worker/src/__mocks__/defaultCollectionObjects.ts
@@ -108,9 +108,9 @@ export function defaultStudio(_id: StudioId): DBStudio {
 			minimumTakeSpan: DEFAULT_MINIMUM_TAKE_SPAN,
 			allowAdlibTestingSegment: true,
 		},
-		routeSets: {},
-		routeSetExclusivityGroups: {},
-		packageContainers: {},
+		routeSetsWithOverrides: wrapDefaultObject({}),
+		routeSetExclusivityGroupsWithOverrides: wrapDefaultObject({}),
+		packageContainersWithOverrides: wrapDefaultObject({}),
 		previewContainerIds: [],
 		thumbnailContainerIds: [],
 		peripheralDeviceSettings: {
@@ -143,7 +143,7 @@ export function defaultPart(_id: PartId, rundownId: RundownId, segmentId: Segmen
 		_rank: 0,
 		externalId: unprotectString(_id),
 		title: 'Default Part',
-		expectedDurationWithPreroll: undefined,
+		expectedDurationWithTransition: undefined,
 	}
 }
 export function defaultPiece(_id: PieceId, rundownId: RundownId, segmentId: SegmentId, partId: PartId): Piece {
diff --git a/packages/job-worker/src/__mocks__/presetCollections.ts b/packages/job-worker/src/__mocks__/presetCollections.ts
index 4779f7f140..68feee6b7a 100644
--- a/packages/job-worker/src/__mocks__/presetCollections.ts
+++ b/packages/job-worker/src/__mocks__/presetCollections.ts
@@ -234,7 +234,7 @@ export async function setupDefaultRundown(
 		_rank: 0,
 		externalId: 'MOCK_PART_0_0',
 		title: 'Part 0 0',
-		expectedDurationWithPreroll: undefined,
+		expectedDurationWithTransition: undefined,
 	}
 	await context.mockCollections.Parts.insertOne(part00)
 
@@ -302,7 +302,7 @@ export async function setupDefaultRundown(
 		_rank: 1,
 		externalId: 'MOCK_PART_0_1',
 		title: 'Part 0 1',
-		expectedDurationWithPreroll: undefined,
+		expectedDurationWithTransition: undefined,
 	}
 	await context.mockCollections.Parts.insertOne(part01)
 
@@ -342,7 +342,7 @@ export async function setupDefaultRundown(
 		_rank: 0,
 		externalId: 'MOCK_PART_1_0',
 		title: 'Part 1 0',
-		expectedDurationWithPreroll: undefined,
+		expectedDurationWithTransition: undefined,
 	}
 	await context.mockCollections.Parts.insertOne(part10)
 
@@ -353,7 +353,7 @@ export async function setupDefaultRundown(
 		_rank: 1,
 		externalId: 'MOCK_PART_1_1',
 		title: 'Part 1 1',
-		expectedDurationWithPreroll: undefined,
+		expectedDurationWithTransition: undefined,
 	}
 	await context.mockCollections.Parts.insertOne(part11)
 
@@ -364,7 +364,7 @@ export async function setupDefaultRundown(
 		_rank: 2,
 		externalId: 'MOCK_PART_1_2',
 		title: 'Part 1 2',
-		expectedDurationWithPreroll: undefined,
+		expectedDurationWithTransition: undefined,
 	}
 	await context.mockCollections.Parts.insertOne(part12)
 
diff --git a/packages/job-worker/src/__tests__/rundown-updatePartInstanceRanks.test.ts b/packages/job-worker/src/__tests__/rundown-updatePartInstanceRanks.test.ts
index 55f5c5eb24..663964a937 100644
--- a/packages/job-worker/src/__tests__/rundown-updatePartInstanceRanks.test.ts
+++ b/packages/job-worker/src/__tests__/rundown-updatePartInstanceRanks.test.ts
@@ -130,7 +130,7 @@ describe('updatePartInstanceRanks', () => {
 			segmentId: customSegmentId ?? segmentId,
 			externalId: id,
 			title: id,
-			expectedDurationWithPreroll: undefined,
+			expectedDurationWithTransition: undefined,
 		}
 	}
 
diff --git a/packages/job-worker/src/blueprints/context/OnTimelineGenerateContext.ts b/packages/job-worker/src/blueprints/context/OnTimelineGenerateContext.ts
index 21a87eed19..9b7af560d3 100644
--- a/packages/job-worker/src/blueprints/context/OnTimelineGenerateContext.ts
+++ b/packages/job-worker/src/blueprints/context/OnTimelineGenerateContext.ts
@@ -85,13 +85,13 @@ export class OnTimelineGenerateContext extends RundownContext implements ITimeli
 		const partInstanceId = pieceInstance?.partInstanceId
 		if (!partInstanceId) throw new Error('Missing partInstanceId in call to getPieceABSessionId')
 
-		return this.abSessionsHelper.getPieceABSessionId(pieceInstance, sessionName)
+		return this.abSessionsHelper.getPieceABSessionIdFromSessionName(pieceInstance, sessionName)
 	}
 
 	/**
 	 * @deprecated Use core provided AB resolving
 	 */
 	getTimelineObjectAbSessionId(tlObj: OnGenerateTimelineObjExt, sessionName: string): string | undefined {
-		return this.abSessionsHelper.getTimelineObjectAbSessionId(tlObj, sessionName)
+		return this.abSessionsHelper.getTimelineObjectAbSessionIdFromSessionName(tlObj, sessionName)
 	}
 }
diff --git a/packages/job-worker/src/blueprints/context/RundownActivationContext.ts b/packages/job-worker/src/blueprints/context/RundownActivationContext.ts
index 3e64bade68..cda732d42a 100644
--- a/packages/job-worker/src/blueprints/context/RundownActivationContext.ts
+++ b/packages/job-worker/src/blueprints/context/RundownActivationContext.ts
@@ -1,4 +1,9 @@
-import { IBlueprintPlayoutDevice, IRundownActivationContext, TSR } from '@sofie-automation/blueprints-integration'
+import {
+	DatastorePersistenceMode,
+	IBlueprintPlayoutDevice,
+	IRundownActivationContext,
+	TSR,
+} from '@sofie-automation/blueprints-integration'
 import { PeripheralDeviceId } from '@sofie-automation/shared-lib/dist/core/model/Ids'
 import { ReadonlyDeep } from 'type-fest'
 import { JobContext, ProcessedShowStyleCompound } from '../../jobs'
@@ -6,6 +11,7 @@ import { executePeripheralDeviceAction, listPlayoutDevices } from '../../periphe
 import { PlayoutModel } from '../../playout/model/PlayoutModel'
 import { RundownEventContext } from './RundownEventContext'
 import { DBRundown } from '@sofie-automation/corelib/dist/dataModel/Rundown'
+import { setTimelineDatastoreValue, removeTimelineDatastoreValue } from '../../playout/datastore'
 
 export class RundownActivationContext extends RundownEventContext implements IRundownActivationContext {
 	private readonly _playoutModel: PlayoutModel
@@ -40,4 +46,15 @@ export class RundownActivationContext extends RundownEventContext implements IRu
 	): Promise<TSR.ActionExecutionResult> {
 		return executePeripheralDeviceAction(this._context, deviceId, null, actionId, payload)
 	}
+
+	async setTimelineDatastoreValue(key: string, value: unknown, mode: DatastorePersistenceMode): Promise<void> {
+		this._playoutModel.deferAfterSave(async () => {
+			await setTimelineDatastoreValue(this._context, key, value, mode)
+		})
+	}
+	async removeTimelineDatastoreValue(key: string): Promise<void> {
+		this._playoutModel.deferAfterSave(async () => {
+			await removeTimelineDatastoreValue(this._context, key)
+		})
+	}
 }
diff --git a/packages/job-worker/src/blueprints/context/StudioUserContext.ts b/packages/job-worker/src/blueprints/context/StudioUserContext.ts
index 1ed5a483cb..be2c471dc4 100644
--- a/packages/job-worker/src/blueprints/context/StudioUserContext.ts
+++ b/packages/job-worker/src/blueprints/context/StudioUserContext.ts
@@ -3,20 +3,18 @@ import { ReadonlyDeep } from 'type-fest'
 import { DBStudio } from '@sofie-automation/corelib/dist/dataModel/Studio'
 import { ProcessedStudioConfig } from '../config'
 import { INoteBase } from '@sofie-automation/corelib/dist/dataModel/Notes'
-import { UserContextInfo } from './CommonContext'
+import { ContextInfo } from './CommonContext'
 import { StudioContext } from './StudioContext'
 
 export class StudioUserContext extends StudioContext implements IStudioUserContext {
 	public readonly notes: INoteBase[] = []
-	private readonly tempSendNotesIntoBlackHole: boolean
 
 	constructor(
-		contextInfo: UserContextInfo,
+		contextInfo: ContextInfo,
 		studio: ReadonlyDeep<DBStudio>,
 		studioBlueprintConfig: ProcessedStudioConfig
 	) {
 		super(contextInfo, studio, studioBlueprintConfig)
-		this.tempSendNotesIntoBlackHole = contextInfo.tempSendUserNotesIntoBlackHole ?? false
 	}
 
 	notifyUserError(message: string, params?: { [key: string]: any }): void {
@@ -30,16 +28,12 @@ export class StudioUserContext extends StudioContext implements IStudioUserConte
 		this.addNote(NoteSeverity.INFO, message, params)
 	}
 	private addNote(type: NoteSeverity, message: string, params?: { [key: string]: any }) {
-		if (this.tempSendNotesIntoBlackHole) {
-			this.logNote(`UserNotes: "${message}", ${JSON.stringify(params)}`, type)
-		} else {
-			this.notes.push({
-				type: type,
-				message: {
-					key: message,
-					args: params,
-				},
-			})
-		}
+		this.notes.push({
+			type: type,
+			message: {
+				key: message,
+				args: params,
+			},
+		})
 	}
 }
diff --git a/packages/job-worker/src/blueprints/context/SyncIngestUpdateToPartInstanceContext.ts b/packages/job-worker/src/blueprints/context/SyncIngestUpdateToPartInstanceContext.ts
index 7d28375728..6b4d4a137a 100644
--- a/packages/job-worker/src/blueprints/context/SyncIngestUpdateToPartInstanceContext.ts
+++ b/packages/job-worker/src/blueprints/context/SyncIngestUpdateToPartInstanceContext.ts
@@ -165,10 +165,12 @@ export class SyncIngestUpdateToPartInstanceContext
 		if (!this.partInstance) throw new Error(`PartInstance has been removed`)
 
 		// for autoNext, the new expectedDuration cannot be shorter than the time a part has been on-air for
-		if (updatePart.expectedDuration && (updatePart.autoNext ?? this.partInstance.partInstance.part.autoNext)) {
+		const expectedDuration = updatePart.expectedDuration ?? this.partInstance.partInstance.part.expectedDuration
+		const autoNext = updatePart.autoNext ?? this.partInstance.partInstance.part.autoNext
+		if (expectedDuration && autoNext) {
 			const onAir = this.partInstance.partInstance.timings?.reportedStartedPlayback
 			const minTime = Date.now() - (onAir ?? 0) + EXPECTED_INGEST_TO_PLAYOUT_TIME
-			if (onAir && minTime > updatePart.expectedDuration) {
+			if (onAir && minTime > expectedDuration) {
 				updatePart.expectedDuration = minTime
 			}
 		}
diff --git a/packages/job-worker/src/blueprints/context/adlibActions.ts b/packages/job-worker/src/blueprints/context/adlibActions.ts
index e7f9249721..7ed297a64a 100644
--- a/packages/job-worker/src/blueprints/context/adlibActions.ts
+++ b/packages/job-worker/src/blueprints/context/adlibActions.ts
@@ -13,6 +13,7 @@ import {
 	Time,
 	TSR,
 	IBlueprintPlayoutDevice,
+	StudioRouteSet,
 } from '@sofie-automation/blueprints-integration'
 import { PartInstanceId, PeripheralDeviceId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import { ReadonlyDeep } from 'type-fest'
@@ -21,14 +22,14 @@ import { UserContextInfo } from './CommonContext'
 import { ShowStyleUserContext } from './ShowStyleUserContext'
 import { WatchedPackagesHelper } from './watchedPackages'
 import { getCurrentTime } from '../../lib'
-import { protectString } from '@sofie-automation/corelib/dist/protectedString'
 import { JobContext, ProcessedShowStyleCompound } from '../../jobs'
 import { moveNextPart } from '../../playout/moveNextPart'
 import { ProcessedShowStyleConfig } from '../config'
 import { DatastorePersistenceMode } from '@sofie-automation/shared-lib/dist/core/model/TimelineDatastore'
-import { getDatastoreId } from '../../playout/datastore'
+import { removeTimelineDatastoreValue, setTimelineDatastoreValue } from '../../playout/datastore'
 import { executePeripheralDeviceAction, listPlayoutDevices } from '../../peripheralDevice'
 import { ActionPartChange, PartAndPieceInstanceActionService } from './services/PartAndPieceInstanceActionService'
+import { applyAndValidateOverrides } from '@sofie-automation/corelib/dist/settings/objectWithOverrides'
 
 export class DatastoreActionExecutionContext
 	extends ShowStyleUserContext
@@ -47,28 +48,11 @@ export class DatastoreActionExecutionContext
 	}
 
 	async setTimelineDatastoreValue(key: string, value: unknown, mode: DatastorePersistenceMode): Promise<void> {
-		const studioId = this._context.studioId
-		const id = protectString(`${studioId}_${key}`)
-		const collection = this._context.directCollections.TimelineDatastores
-
-		await collection.replace({
-			_id: id,
-			studioId: studioId,
-
-			key,
-			value,
-
-			modified: Date.now(),
-			mode,
-		})
+		await setTimelineDatastoreValue(this._context, key, value, mode)
 	}
 
 	async removeTimelineDatastoreValue(key: string): Promise<void> {
-		const studioId = this._context.studioId
-		const id = getDatastoreId(studioId, key)
-		const collection = this._context.directCollections.TimelineDatastores
-
-		await collection.remove({ _id: id })
+		await removeTimelineDatastoreValue(this._context, key)
 	}
 
 	getCurrentTime(): number {
@@ -78,7 +62,15 @@ export class DatastoreActionExecutionContext
 
 /** Actions */
 export class ActionExecutionContext extends ShowStyleUserContext implements IActionExecutionContext, IEventContext {
-	public takeAfterExecute: boolean
+	/**
+	 * Whether the blueprints requested a take to be performed at the end of this action
+	 * */
+	public takeAfterExecute = false
+	/**
+	 * Whether the blueprints performed an action that explicitly requires the timeline to be regenerated
+	 * This isn't the only indicator that it should be regenerated
+	 */
+	public forceRegenerateTimeline = false
 
 	public get currentPartState(): ActionPartChange {
 		return this.partAndPieceInstanceService.currentPartState
@@ -102,7 +94,6 @@ export class ActionExecutionContext extends ShowStyleUserContext implements IAct
 		private readonly partAndPieceInstanceService: PartAndPieceInstanceActionService
 	) {
 		super(contextInfo, _context, showStyle, watchedPackages)
-		this.takeAfterExecute = false
 	}
 
 	async getPartInstance(part: 'current' | 'next'): Promise<IBlueprintPartInstance | undefined> {
@@ -202,6 +193,15 @@ export class ActionExecutionContext extends ShowStyleUserContext implements IAct
 		partInstance.blockTakeUntil(time)
 	}
 
+	async listRouteSets(): Promise<Record<string, StudioRouteSet>> {
+		return applyAndValidateOverrides(this._context.studio.routeSetsWithOverrides).obj
+	}
+
+	async switchRouteSet(routeSetId: string, state: boolean | 'toggle'): Promise<void> {
+		const affectsTimeline = this._playoutModel.switchRouteSet(routeSetId, state)
+		this.forceRegenerateTimeline = this.forceRegenerateTimeline || affectsTimeline
+	}
+
 	async hackGetMediaObjectDuration(mediaId: string): Promise<number | undefined> {
 		return this.partAndPieceInstanceService.hackGetMediaObjectDuration(mediaId)
 	}
@@ -219,31 +219,14 @@ export class ActionExecutionContext extends ShowStyleUserContext implements IAct
 	}
 
 	async setTimelineDatastoreValue(key: string, value: unknown, mode: DatastorePersistenceMode): Promise<void> {
-		const studioId = this._context.studioId
-		const id = protectString(`${studioId}_${key}`)
-		const collection = this._context.directCollections.TimelineDatastores
-
 		this._playoutModel.deferAfterSave(async () => {
-			await collection.replace({
-				_id: id,
-				studioId: studioId,
-
-				key,
-				value,
-
-				modified: Date.now(),
-				mode,
-			})
+			await setTimelineDatastoreValue(this._context, key, value, mode)
 		})
 	}
 
 	async removeTimelineDatastoreValue(key: string): Promise<void> {
-		const studioId = this._context.studioId
-		const id = getDatastoreId(studioId, key)
-		const collection = this._context.directCollections.TimelineDatastores
-
 		this._playoutModel.deferAfterSave(async () => {
-			await collection.remove({ _id: id })
+			await removeTimelineDatastoreValue(this._context, key)
 		})
 	}
 
diff --git a/packages/job-worker/src/blueprints/context/lib.ts b/packages/job-worker/src/blueprints/context/lib.ts
index 19811519d1..df66dd54fd 100644
--- a/packages/job-worker/src/blueprints/context/lib.ts
+++ b/packages/job-worker/src/blueprints/context/lib.ts
@@ -43,7 +43,7 @@ import {
 	RundownPlaylistTiming,
 } from '@sofie-automation/blueprints-integration'
 import { JobContext, ProcessedShowStyleBase, ProcessedShowStyleVariant } from '../../jobs'
-import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
+import { DBRundownPlaylist, QuickLoopMarkerType } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
 
 /**
  * Convert an object to have all the values of all keys (including optionals) be 'true'
@@ -94,7 +94,6 @@ export const IBlueprintMutatablePartSampleKeys = allKeysOfObject<IBlueprintMutat
 	disableNextInTransition: true,
 	outTransition: true,
 	expectedDuration: true,
-	budgetDuration: true,
 	holdMode: true,
 	shouldNotifyCurrentPlayingPart: true,
 	classes: true,
@@ -251,7 +250,6 @@ export function convertPartToBlueprints(part: ReadonlyDeep<DBPart>): IBlueprintP
 		disableNextInTransition: part.disableNextInTransition,
 		outTransition: clone(part.outTransition),
 		expectedDuration: part.expectedDuration,
-		budgetDuration: part.budgetDuration,
 		holdMode: part.holdMode,
 		shouldNotifyCurrentPlayingPart: part.shouldNotifyCurrentPlayingPart,
 		classes: clone<string[] | undefined>(part.classes),
@@ -392,7 +390,9 @@ export function convertRundownPlaylistToBlueprints(
 
 		timing: clone<RundownPlaylistTiming>(playlist.timing),
 		outOfOrderTiming: playlist.outOfOrderTiming,
-		loop: playlist.loop,
+		loop:
+			playlist.quickLoop?.start?.type === QuickLoopMarkerType.PLAYLIST &&
+			playlist.quickLoop.end?.type === QuickLoopMarkerType.PLAYLIST,
 		timeOfDayCountdowns: playlist.timeOfDayCountdowns,
 
 		privateData: clone(playlist.privateData),
diff --git a/packages/job-worker/src/blueprints/context/services/PartAndPieceInstanceActionService.ts b/packages/job-worker/src/blueprints/context/services/PartAndPieceInstanceActionService.ts
index e855bec5df..095fdaa114 100644
--- a/packages/job-worker/src/blueprints/context/services/PartAndPieceInstanceActionService.ts
+++ b/packages/job-worker/src/blueprints/context/services/PartAndPieceInstanceActionService.ts
@@ -52,7 +52,6 @@ import { getCurrentTime } from '../../../lib'
 import _ = require('underscore')
 import { syncPlayheadInfinitesForNextPartInstance } from '../../../playout/infinites'
 import { validateAdlibTestingPartInstanceProperties } from '../../../playout/adlibTesting'
-import { isTooCloseToAutonext } from '../../../playout/lib'
 import { DBPart, isPartPlayable } from '@sofie-automation/corelib/dist/dataModel/Part'
 import { PlayoutRundownModel } from '../../../playout/model/PlayoutRundownModel'
 
@@ -368,7 +367,7 @@ export class PartAndPieceInstanceActionService {
 			throw new Error('Cannot queue part when next part has already been modified')
 		}
 
-		if (isTooCloseToAutonext(currentPartInstance.partInstance, true)) {
+		if (currentPartInstance.isTooCloseToAutonext(true)) {
 			throw new Error('Too close to an autonext to queue a part')
 		}
 
@@ -384,7 +383,7 @@ export class PartAndPieceInstanceActionService {
 			invalid: false,
 			invalidReason: undefined,
 			floated: false,
-			expectedDurationWithPreroll: undefined, // Filled in later
+			expectedDurationWithTransition: undefined, // Filled in later
 		}
 
 		const pieces = postProcessPieces(
@@ -526,7 +525,7 @@ export async function applyActionSideEffects(
 	if (actionContext.nextPartState !== ActionPartChange.NONE) {
 		const nextPartInstance = playoutModel.nextPartInstance
 		if (nextPartInstance) {
-			nextPartInstance.recalculateExpectedDurationWithPreroll()
+			nextPartInstance.recalculateExpectedDurationWithTransition()
 
 			validateAdlibTestingPartInstanceProperties(context, playoutModel, nextPartInstance)
 		}
diff --git a/packages/job-worker/src/blueprints/context/services/__tests__/PartAndPieceInstanceActionService.test.ts b/packages/job-worker/src/blueprints/context/services/__tests__/PartAndPieceInstanceActionService.test.ts
index 35f7922fff..5c4179fe72 100644
--- a/packages/job-worker/src/blueprints/context/services/__tests__/PartAndPieceInstanceActionService.test.ts
+++ b/packages/job-worker/src/blueprints/context/services/__tests__/PartAndPieceInstanceActionService.test.ts
@@ -55,7 +55,8 @@ const getResolvedPiecesForCurrentPartInstanceMock =
 jest.mock('../../../postProcess')
 import { postProcessPieces, postProcessTimelineObjects } from '../../../postProcess'
 import { ActionPartChange, PartAndPieceInstanceActionService } from '../PartAndPieceInstanceActionService'
-import { isTooCloseToAutonext } from '../../../../playout/lib'
+import { mock } from 'jest-mock-extended'
+import { QuickLoopService } from '../../../../playout/model/services/QuickLoopService'
 const { postProcessPieces: postProcessPiecesOrig, postProcessTimelineObjects: postProcessTimelineObjectsOrig } =
 	jest.requireActual('../../../postProcess')
 
@@ -138,7 +139,7 @@ describe('Test blueprint api context', () => {
 				const pieceInstances = await context.mockCollections.PieceInstances.findFetch({
 					partInstanceId: partInstance._id,
 				})
-				return new PlayoutPartInstanceModelImpl(partInstance, pieceInstances, false)
+				return new PlayoutPartInstanceModelImpl(partInstance, pieceInstances, false, mock<QuickLoopService>())
 			})
 		)
 	}
@@ -1126,7 +1127,7 @@ describe('Test blueprint api context', () => {
 					})
 					partInstanceModel.setPlannedStartedPlayback(getCurrentTime())
 
-					expect(isTooCloseToAutonext(partInstanceModel.partInstance, true)).toBeTruthy()
+					expect(partInstanceModel.isTooCloseToAutonext(true)).toBeTruthy()
 					await expect(service.queuePart({} as any, [{}] as any)).rejects.toThrow(
 						'Too close to an autonext to queue a part'
 					)
diff --git a/packages/job-worker/src/blueprints/postProcess.ts b/packages/job-worker/src/blueprints/postProcess.ts
index 6e9d2f8fca..651bb8ed2a 100644
--- a/packages/job-worker/src/blueprints/postProcess.ts
+++ b/packages/job-worker/src/blueprints/postProcess.ts
@@ -397,6 +397,7 @@ export function postProcessBucketAdLib(
 	blueprintId: BlueprintId,
 	bucketId: BucketId,
 	rank: number | undefined,
+	name: string | undefined,
 	importVersions: RundownImportVersions
 ): BucketAdLib {
 	const id: PieceId = protectString(
@@ -416,6 +417,7 @@ export function postProcessBucketAdLib(
 		importVersions,
 		ingestInfo,
 		_rank: rank || itemOrig._rank,
+		name: name || itemOrig.name,
 		timelineObjectsString: EmptyPieceTimelineObjectsBlob,
 	}
 	// Fill in ids of unnamed expectedPackages
@@ -446,6 +448,7 @@ export function postProcessBucketAction(
 	blueprintId: BlueprintId,
 	bucketId: BucketId,
 	rank: number | undefined,
+	label: string | undefined,
 	importVersions: RundownImportVersions
 ): BucketAdLibAction {
 	const id: AdLibActionId = protectString(
@@ -463,7 +466,7 @@ export function postProcessBucketAction(
 		bucketId,
 		importVersions,
 		ingestInfo,
-		...processAdLibActionITranslatableMessages(itemOrig, blueprintId, rank),
+		...processAdLibActionITranslatableMessages(itemOrig, blueprintId, rank, label),
 	}
 
 	// Fill in ids of unnamed expectedPackages
@@ -498,12 +501,12 @@ function processAdLibActionITranslatableMessages<
 		})[]
 	},
 	T extends IBlueprintActionManifest
->(itemOrig: T, blueprintId: BlueprintId, rank?: number): Pick<K, 'display' | 'triggerModes'> {
+>(itemOrig: T, blueprintId: BlueprintId, rank?: number, label?: string): Pick<K, 'display' | 'triggerModes'> {
 	return {
 		display: {
 			...itemOrig.display,
 			_rank: rank ?? itemOrig.display._rank,
-			label: wrapTranslatableMessageFromBlueprints(itemOrig.display.label, [blueprintId]),
+			label: (label as any) ?? wrapTranslatableMessageFromBlueprints(itemOrig.display.label, [blueprintId]),
 			triggerLabel:
 				itemOrig.display.triggerLabel &&
 				wrapTranslatableMessageFromBlueprints(itemOrig.display.triggerLabel, [blueprintId]),
diff --git a/packages/job-worker/src/events/ExternalMessageQueue.ts b/packages/job-worker/src/events/ExternalMessageQueue.ts
index 879131955d..13accd115f 100644
--- a/packages/job-worker/src/events/ExternalMessageQueue.ts
+++ b/packages/job-worker/src/events/ExternalMessageQueue.ts
@@ -79,7 +79,7 @@ export class ExternalMessageQueueRunner {
 			try {
 				await this.#changesStream.close()
 			} catch (e) {
-				logger.warn(`Failed to stop changes stream: ${e}`)
+				logger.warn(`Failed to stop changes stream: ${stringifyError(e)}`)
 			}
 		}
 
@@ -112,7 +112,7 @@ export class ExternalMessageQueueRunner {
 			try {
 				await this.#changesStream.close()
 			} catch (e) {
-				logger.warn(`Failed to stop changes stream: ${e}`)
+				logger.warn(`Failed to stop changes stream: ${stringifyError(e)}`)
 			}
 		}
 
diff --git a/packages/job-worker/src/events/handle.ts b/packages/job-worker/src/events/handle.ts
index ba5a2eb4a0..d9efe5387f 100644
--- a/packages/job-worker/src/events/handle.ts
+++ b/packages/job-worker/src/events/handle.ts
@@ -184,7 +184,7 @@ export async function queueExternalMessages(
 					}
 				}
 			} catch (e) {
-				logger.error(`Failed to save ExternalMessage: ${e} (${JSON.stringify(message)})`)
+				logger.error(`Failed to save ExternalMessage: ${stringifyError(e)} (${JSON.stringify(message)})`)
 			}
 		})
 	)
diff --git a/packages/job-worker/src/ingest/__tests__/ingest.test.ts b/packages/job-worker/src/ingest/__tests__/ingest.test.ts
index ce6f20d4fa..76aacf22b5 100644
--- a/packages/job-worker/src/ingest/__tests__/ingest.test.ts
+++ b/packages/job-worker/src/ingest/__tests__/ingest.test.ts
@@ -1649,7 +1649,7 @@ describe('Test ingest actions for rundowns and segments', () => {
 							_rank: 0,
 							externalId: `after_${currentPartInstance.partInstance._id}_externalId`,
 							title: 'New part',
-							expectedDurationWithPreroll: undefined,
+							expectedDurationWithTransition: undefined,
 						},
 						[],
 						undefined
diff --git a/packages/job-worker/src/ingest/__tests__/selectShowStyleVariant.test.ts b/packages/job-worker/src/ingest/__tests__/selectShowStyleVariant.test.ts
index 9fd132c416..003379d9aa 100644
--- a/packages/job-worker/src/ingest/__tests__/selectShowStyleVariant.test.ts
+++ b/packages/job-worker/src/ingest/__tests__/selectShowStyleVariant.test.ts
@@ -22,7 +22,6 @@ describe('selectShowStyleVariant', () => {
 			{
 				name: 'test',
 				identifier: 'test',
-				tempSendUserNotesIntoBlackHole: true,
 			},
 			context.studio,
 			context.getStudioBlueprintConfig()
diff --git a/packages/job-worker/src/ingest/__tests__/updateNext.test.ts b/packages/job-worker/src/ingest/__tests__/updateNext.test.ts
index 8058837f34..4df4a21361 100644
--- a/packages/job-worker/src/ingest/__tests__/updateNext.test.ts
+++ b/packages/job-worker/src/ingest/__tests__/updateNext.test.ts
@@ -115,7 +115,7 @@ async function createMockRO(context: MockJobContext): Promise<RundownId> {
 				segmentId: protectString('mock_segment1'),
 				externalId: 'p1',
 				title: 'Part 1',
-				expectedDurationWithPreroll: undefined,
+				expectedDurationWithTransition: undefined,
 			}),
 		}),
 		literal<DBPartInstance>({
@@ -133,7 +133,7 @@ async function createMockRO(context: MockJobContext): Promise<RundownId> {
 				segmentId: protectString('mock_segment1'),
 				externalId: 'p2',
 				title: 'Part 2',
-				expectedDurationWithPreroll: undefined,
+				expectedDurationWithTransition: undefined,
 			}),
 		}),
 		literal<DBPartInstance>({
@@ -151,7 +151,7 @@ async function createMockRO(context: MockJobContext): Promise<RundownId> {
 				segmentId: protectString('mock_segment1'),
 				externalId: 'p3',
 				title: 'Part 3',
-				expectedDurationWithPreroll: undefined,
+				expectedDurationWithTransition: undefined,
 			}),
 		}),
 		// Segment 2
@@ -170,7 +170,7 @@ async function createMockRO(context: MockJobContext): Promise<RundownId> {
 				segmentId: protectString('mock_segment2'),
 				externalId: 'p4',
 				title: 'Part 4',
-				expectedDurationWithPreroll: undefined,
+				expectedDurationWithTransition: undefined,
 			}),
 		}),
 		literal<DBPartInstance>({
@@ -188,7 +188,7 @@ async function createMockRO(context: MockJobContext): Promise<RundownId> {
 				segmentId: protectString('mock_segment2'),
 				externalId: 'p5',
 				title: 'Part 5',
-				expectedDurationWithPreroll: undefined,
+				expectedDurationWithTransition: undefined,
 			}),
 		}),
 		// Segment 3
@@ -207,7 +207,7 @@ async function createMockRO(context: MockJobContext): Promise<RundownId> {
 				segmentId: protectString('mock_segment3'),
 				externalId: 'p6',
 				title: 'Part 6',
-				expectedDurationWithPreroll: undefined,
+				expectedDurationWithTransition: undefined,
 			}),
 		}),
 		// Segment 4
@@ -226,7 +226,7 @@ async function createMockRO(context: MockJobContext): Promise<RundownId> {
 				segmentId: protectString('mock_segment4'),
 				externalId: 'p7',
 				title: 'Part 7',
-				expectedDurationWithPreroll: undefined,
+				expectedDurationWithTransition: undefined,
 			}),
 		}),
 		literal<DBPartInstance>({
@@ -245,7 +245,7 @@ async function createMockRO(context: MockJobContext): Promise<RundownId> {
 				externalId: 'p8',
 				title: 'Part 8',
 				floated: true,
-				expectedDurationWithPreroll: undefined,
+				expectedDurationWithTransition: undefined,
 			}),
 		}),
 		literal<DBPartInstance>({
@@ -263,7 +263,7 @@ async function createMockRO(context: MockJobContext): Promise<RundownId> {
 				segmentId: protectString('mock_segment4'),
 				externalId: 'p9',
 				title: 'Part 9',
-				expectedDurationWithPreroll: undefined,
+				expectedDurationWithTransition: undefined,
 			}),
 		}),
 
@@ -282,7 +282,7 @@ async function createMockRO(context: MockJobContext): Promise<RundownId> {
 				segmentId: protectString('mock_segment4'),
 				externalId: 'o1',
 				title: 'Orphan 1',
-				expectedDurationWithPreroll: undefined,
+				expectedDurationWithTransition: undefined,
 			}),
 			orphaned: 'adlib-part',
 		}),
@@ -345,7 +345,7 @@ describe('ensureNextPartIsValid', () => {
 		})
 	}
 	async function ensureNextPartIsValid() {
-		await runJobWithPlayoutModel(context, { playlistId: rundownPlaylistId }, null, async (playoutModel) =>
+		return runJobWithPlayoutModel(context, { playlistId: rundownPlaylistId }, null, async (playoutModel) =>
 			ensureNextPartIsValidRaw(context, playoutModel)
 		)
 	}
@@ -353,7 +353,7 @@ describe('ensureNextPartIsValid', () => {
 	test('Start with null', async () => {
 		await resetPartIds(null, null)
 
-		await ensureNextPartIsValid()
+		await expect(ensureNextPartIsValid()).resolves.toBeTruthy()
 
 		expect(setNextPartMock).toHaveBeenCalledTimes(1)
 		expect(setNextPartMock).toHaveBeenCalledWith(
@@ -366,7 +366,7 @@ describe('ensureNextPartIsValid', () => {
 	test('Missing next PartInstance', async () => {
 		await resetPartIds('mock_part_instance3', 'fake_part')
 
-		await ensureNextPartIsValid()
+		await expect(ensureNextPartIsValid()).resolves.toBeTruthy()
 
 		expect(setNextPartMock).toHaveBeenCalledTimes(1)
 		expect(setNextPartMock).toHaveBeenCalledWith(
@@ -381,14 +381,14 @@ describe('ensureNextPartIsValid', () => {
 	test('Missing current PartInstance with valid next', async () => {
 		await resetPartIds('fake_part', 'mock_part_instance4')
 
-		await ensureNextPartIsValid()
+		await expect(ensureNextPartIsValid()).resolves.toBeFalsy()
 
 		expect(setNextPartMock).toHaveBeenCalledTimes(0)
 	})
 	test('Missing current and next PartInstance', async () => {
 		await resetPartIds('fake_part', 'not_real_either')
 
-		await ensureNextPartIsValid()
+		await expect(ensureNextPartIsValid()).resolves.toBeTruthy()
 
 		expect(setNextPartMock).toHaveBeenCalledTimes(1)
 		expect(setNextPartMock).toHaveBeenCalledWith(
@@ -401,21 +401,21 @@ describe('ensureNextPartIsValid', () => {
 	test('Ensure correct PartInstance doesnt change', async () => {
 		await resetPartIds('mock_part_instance3', 'mock_part_instance4')
 
-		await ensureNextPartIsValid()
+		await expect(ensureNextPartIsValid()).resolves.toBeFalsy()
 
 		expect(setNextPartMock).not.toHaveBeenCalled()
 	})
 	test('Ensure manual PartInstance doesnt change', async () => {
 		await resetPartIds('mock_part_instance3', 'mock_part_instance5', true)
 
-		await ensureNextPartIsValid()
+		await expect(ensureNextPartIsValid()).resolves.toBeFalsy()
 
 		expect(setNextPartMock).not.toHaveBeenCalled()
 	})
 	test('Ensure non-manual PartInstance does change', async () => {
 		await resetPartIds('mock_part_instance3', 'mock_part_instance5', false)
 
-		await ensureNextPartIsValid()
+		await expect(ensureNextPartIsValid()).resolves.toBeTruthy()
 
 		expect(setNextPartMock).toHaveBeenCalledTimes(1)
 		expect(setNextPartMock).toHaveBeenCalledWith(
@@ -428,7 +428,7 @@ describe('ensureNextPartIsValid', () => {
 	test('Ensure manual but missing PartInstance does change', async () => {
 		await resetPartIds('mock_part_instance3', 'fake_part', true)
 
-		await ensureNextPartIsValid()
+		await expect(ensureNextPartIsValid()).resolves.toBeTruthy()
 
 		expect(setNextPartMock).toHaveBeenCalledTimes(1)
 		expect(setNextPartMock).toHaveBeenCalledWith(
@@ -441,7 +441,7 @@ describe('ensureNextPartIsValid', () => {
 	test('Ensure manual but floated PartInstance does change', async () => {
 		await resetPartIds('mock_part_instance7', 'mock_part_instance8', true)
 
-		await ensureNextPartIsValid()
+		await expect(ensureNextPartIsValid()).resolves.toBeTruthy()
 
 		expect(setNextPartMock).toHaveBeenCalledTimes(1)
 		expect(setNextPartMock).toHaveBeenCalledWith(
@@ -454,7 +454,7 @@ describe('ensureNextPartIsValid', () => {
 	test('Ensure floated PartInstance does change', async () => {
 		await resetPartIds('mock_part_instance7', 'mock_part_instance8', false)
 
-		await ensureNextPartIsValid()
+		await expect(ensureNextPartIsValid()).resolves.toBeTruthy()
 
 		expect(setNextPartMock).toHaveBeenCalledTimes(1)
 		expect(setNextPartMock).toHaveBeenCalledWith(
@@ -483,7 +483,7 @@ describe('ensureNextPartIsValid', () => {
 					segmentId: protectString('mock_segment1'),
 					externalId: 'o1',
 					title: 'Orphan 1',
-					expectedDurationWithPreroll: undefined,
+					expectedDurationWithTransition: undefined,
 				}),
 				orphaned: 'deleted',
 			})
@@ -491,7 +491,7 @@ describe('ensureNextPartIsValid', () => {
 
 		await resetPartIds(null, instanceId, false)
 
-		await ensureNextPartIsValid()
+		await expect(ensureNextPartIsValid()).resolves.toBeTruthy()
 
 		expect(setNextPartMock).toHaveBeenCalledTimes(1)
 		expect(setNextPartMock).toHaveBeenCalledWith(
@@ -520,7 +520,7 @@ describe('ensureNextPartIsValid', () => {
 					segmentId: protectString('mock_segment1'),
 					externalId: 'o1',
 					title: 'Orphan 1',
-					expectedDurationWithPreroll: undefined,
+					expectedDurationWithTransition: undefined,
 				}),
 				orphaned: 'deleted',
 			})
@@ -528,7 +528,7 @@ describe('ensureNextPartIsValid', () => {
 
 		await resetPartIds(null, instanceId, true)
 
-		await ensureNextPartIsValid()
+		await expect(ensureNextPartIsValid()).resolves.toBeTruthy()
 
 		expect(setNextPartMock).toHaveBeenCalledTimes(1)
 		expect(setNextPartMock).toHaveBeenCalledWith(
@@ -548,7 +548,7 @@ describe('ensureNextPartIsValid', () => {
 			segmentId: protectString('mock_segment1'),
 			externalId: 'o1',
 			title: 'Orphan 1',
-			expectedDurationWithPreroll: undefined,
+			expectedDurationWithTransition: undefined,
 		})
 		await context.mockCollections.PartInstances.insertOne(
 			literal<DBPartInstance>({
@@ -569,7 +569,7 @@ describe('ensureNextPartIsValid', () => {
 
 		await resetPartIds('mock_part_instance1', instanceId, false)
 
-		await ensureNextPartIsValid()
+		await expect(ensureNextPartIsValid()).resolves.toBeFalsy()
 
 		expect(setNextPartMock).toHaveBeenCalledTimes(0)
 	})
@@ -583,7 +583,7 @@ describe('ensureNextPartIsValid', () => {
 			segmentId: protectString('mock_segment4'),
 			externalId: 'tmp1',
 			title: 'Tmp Part 1',
-			expectedDurationWithPreroll: undefined,
+			expectedDurationWithTransition: undefined,
 		})
 		await context.mockCollections.PartInstances.insertOne(
 			literal<DBPartInstance>({
@@ -602,7 +602,7 @@ describe('ensureNextPartIsValid', () => {
 		try {
 			// make sure it finds the part we expect
 			await resetPartIds('mock_part_instance9', null, false)
-			await ensureNextPartIsValid()
+			await expect(ensureNextPartIsValid()).resolves.toBeTruthy()
 
 			expect(setNextPartMock).toHaveBeenCalledTimes(1)
 			expect(setNextPartMock).toHaveBeenCalledWith(
@@ -620,7 +620,7 @@ describe('ensureNextPartIsValid', () => {
 			await context.mockCollections.Parts.remove(part._id)
 
 			// make sure the next part gets cleared
-			await ensureNextPartIsValid()
+			await expect(ensureNextPartIsValid()).resolves.toBeTruthy()
 
 			expect(setNextPartMock).toHaveBeenCalledTimes(1)
 			expect(setNextPartMock).toHaveBeenCalledWith(
@@ -635,4 +635,26 @@ describe('ensureNextPartIsValid', () => {
 			await context.mockCollections.Parts.remove(part._id)
 		}
 	})
+
+	test('Current part is last in rundown, next is missing', async () => {
+		await resetPartIds('mock_part_instance9', 'fake_part_instance', false)
+
+		await expect(ensureNextPartIsValid()).resolves.toBeTruthy()
+
+		expect(setNextPartMock).toHaveBeenCalledTimes(1)
+		expect(setNextPartMock).toHaveBeenCalledWith(
+			expect.objectContaining({}),
+			expect.objectContaining({ playlistId: rundownPlaylistId }),
+			null,
+			false
+		)
+	})
+
+	test('Current part is last in rundown, no-op to update', async () => {
+		await resetPartIds('mock_part_instance9', null, false)
+
+		await expect(ensureNextPartIsValid()).resolves.toBeFalsy()
+
+		expect(setNextPartMock).toHaveBeenCalledTimes(0)
+	})
 })
diff --git a/packages/job-worker/src/ingest/bucket/import.ts b/packages/job-worker/src/ingest/bucket/import.ts
index e2d44faac2..c7216ef48f 100644
--- a/packages/job-worker/src/ingest/bucket/import.ts
+++ b/packages/job-worker/src/ingest/bucket/import.ts
@@ -30,10 +30,17 @@ import { BucketId, ShowStyleBaseId } from '@sofie-automation/corelib/dist/dataMo
 import { ExpectedPackageDBType } from '@sofie-automation/corelib/dist/dataModel/ExpectedPackages'
 
 export async function handleBucketItemImport(context: JobContext, data: BucketItemImportProps): Promise<void> {
-	await regenerateBucketItemFromIngestInfo(context, data.bucketId, data.showStyleBaseId, {
-		limitToShowStyleVariantIds: data.showStyleVariantIds,
-		payload: data.payload,
-	})
+	await regenerateBucketItemFromIngestInfo(
+		context,
+		data.bucketId,
+		data.showStyleBaseId,
+		{
+			limitToShowStyleVariantIds: data.showStyleVariantIds,
+			payload: data.payload,
+		},
+		undefined,
+		undefined
+	)
 }
 
 export async function handleBucketItemRegenerate(context: JobContext, data: BucketItemRegenerateProps): Promise<void> {
@@ -49,9 +56,11 @@ export async function handleBucketItemRegenerate(context: JobContext, data: Buck
 				projection: {
 					showStyleBaseId: 1,
 					ingestInfo: 1,
+					name: 1,
+					_rank: 1,
 				},
 			}
-		) as Promise<Pick<BucketAdLib, 'showStyleBaseId' | 'ingestInfo'>> | undefined,
+		) as Promise<Pick<BucketAdLib, 'showStyleBaseId' | 'ingestInfo' | 'name' | '_rank'>> | undefined,
 		context.directCollections.BucketAdLibActions.findOne(
 			{
 				externalId: data.externalId,
@@ -62,9 +71,10 @@ export async function handleBucketItemRegenerate(context: JobContext, data: Buck
 				projection: {
 					showStyleBaseId: 1,
 					ingestInfo: 1,
+					display: 1,
 				},
 			}
-		) as Promise<Pick<BucketAdLibAction, 'showStyleBaseId' | 'ingestInfo'>> | undefined,
+		) as Promise<Pick<BucketAdLibAction, 'showStyleBaseId' | 'ingestInfo' | 'display'>> | undefined,
 	])
 
 	// TODO - UserErrors?
@@ -74,7 +84,9 @@ export async function handleBucketItemRegenerate(context: JobContext, data: Buck
 			context,
 			data.bucketId,
 			adlibAction.showStyleBaseId,
-			adlibAction.ingestInfo
+			adlibAction.ingestInfo,
+			adlibAction.display._rank,
+			typeof adlibAction.display.label === 'string' ? adlibAction.display.label : undefined
 		)
 	} else if (adlibPiece) {
 		if (!adlibPiece.ingestInfo) throw new Error(`Bucket AdLibPiece cannot be resynced, it has no ingest data`)
@@ -82,7 +94,9 @@ export async function handleBucketItemRegenerate(context: JobContext, data: Buck
 			context,
 			data.bucketId,
 			adlibPiece.showStyleBaseId,
-			adlibPiece.ingestInfo
+			adlibPiece.ingestInfo,
+			adlibPiece._rank,
+			adlibPiece.name
 		)
 	} else {
 		throw new Error(`No Bucket Items with externalId "${data.externalId}" were found`)
@@ -93,7 +107,9 @@ async function regenerateBucketItemFromIngestInfo(
 	context: JobContext,
 	bucketId: BucketId,
 	showStyleBaseId: ShowStyleBaseId,
-	ingestInfo: BucketAdLibIngestInfo
+	ingestInfo: BucketAdLibIngestInfo,
+	oldRank: number | undefined,
+	oldLabel: string | undefined
 ): Promise<void> {
 	const [showStyleBase, allShowStyleVariants, allOldAdLibPieces, allOldAdLibActions, blueprint] = await Promise.all([
 		context.getShowStyleBase(showStyleBaseId),
@@ -130,7 +146,7 @@ async function regenerateBucketItemFromIngestInfo(
 	const actionIdsToRemove = new Set(allOldAdLibActions.map((p) => p._id))
 
 	let isFirstShowStyleVariant = true
-	let newRank: number | undefined = undefined
+	const newRank: number | undefined = oldRank ?? (await calculateHighestRankInBucket(context, bucketId)) + 1
 	let onlyGenerateOneItem = false
 
 	const ps: Promise<any>[] = []
@@ -150,13 +166,6 @@ async function regenerateBucketItemFromIngestInfo(
 				core: getSystemVersion(),
 			}
 
-			// Cache the newRank, so we only have to calculate it once:
-			if (newRank === undefined) {
-				newRank = (await calculateHighestRankInBucket(context, bucketId)) + 1
-			} else {
-				newRank++
-			}
-
 			if (isAdlibAction(rawAdlib)) {
 				if (isFirstShowStyleVariant) {
 					if (rawAdlib.allVariants) {
@@ -174,6 +183,7 @@ async function regenerateBucketItemFromIngestInfo(
 					blueprint.blueprintId,
 					bucketId,
 					newRank,
+					oldLabel,
 					importVersions
 				)
 
@@ -194,6 +204,7 @@ async function regenerateBucketItemFromIngestInfo(
 					blueprint.blueprintId,
 					bucketId,
 					newRank,
+					oldLabel,
 					importVersions
 				)
 
diff --git a/packages/job-worker/src/ingest/commit.ts b/packages/job-worker/src/ingest/commit.ts
index fd1bcc40f1..069e96aea0 100644
--- a/packages/job-worker/src/ingest/commit.ts
+++ b/packages/job-worker/src/ingest/commit.ts
@@ -10,7 +10,6 @@ import { unprotectString, protectString } from '@sofie-automation/corelib/dist/p
 import { logger } from '../logging'
 import { PlayoutModel } from '../playout/model/PlayoutModel'
 import { PlayoutRundownModel } from '../playout/model/PlayoutRundownModel'
-import { isTooCloseToAutonext } from '../playout/lib'
 import { allowedToMoveRundownOutOfPlaylist } from '../rundown'
 import { updatePartInstanceRanksAndOrphanedState } from '../updatePartInstanceRanksAndOrphanedState'
 import {
@@ -42,6 +41,7 @@ import { createPlayoutModelFromIngestModel } from '../playout/model/implementati
 import { DBPart } from '@sofie-automation/corelib/dist/dataModel/Part'
 import { DatabasePersistedModel } from '../modelBase'
 import { updateSegmentIdsForAdlibbedPartInstances } from './commit/updateSegmentIdsForAdlibbedPartInstances'
+import { stringifyError } from '@sofie-automation/shared-lib/dist/lib/stringifyError'
 
 export type BeforePartMapItem = { id: PartId; rank: number }
 export type BeforeIngestOperationPartMap = ReadonlyMap<SegmentId, Array<BeforePartMapItem>>
@@ -221,6 +221,9 @@ export async function CommitIngestOperation(
 				// sync changes to the 'selected' partInstances
 				await syncChangesToPartInstances(context, playoutModel, ingestModel)
 
+				// update the quickloop in case we did any changes to things involving marker
+				playoutModel.updateQuickLoopState()
+
 				playoutModel.deferAfterSave(() => {
 					// Run in the background, we don't want to hold onto the lock to do this
 					context
@@ -229,7 +232,7 @@ export async function CommitIngestOperation(
 							rundownId: ingestModel.rundownId,
 						})
 						.catch((e) => {
-							logger.error(`Queue RundownDataChanged failed: ${e}`)
+							logger.error(`Queue RundownDataChanged failed: ${stringifyError(e)}`)
 						})
 
 					triggerUpdateTimelineAfterIngestData(context, playoutModel.playlistId)
@@ -239,6 +242,7 @@ export async function CommitIngestOperation(
 				await pSaveIngest
 
 				// do some final playout checks, which may load back some Parts data
+				// Note: This should trigger a timeline update, one is already queued in the `deferAfterSave` above
 				await ensureNextPartIsValid(context, playoutModel)
 
 				// save the final playout changes
@@ -261,10 +265,7 @@ function canRemoveSegment(
 	nextPartInstance: ReadonlyDeep<DBPartInstance> | undefined,
 	segmentId: SegmentId
 ): boolean {
-	if (
-		currentPartInstance?.segmentId === segmentId ||
-		(nextPartInstance?.segmentId === segmentId && isTooCloseToAutonext(currentPartInstance, false))
-	) {
+	if (currentPartInstance?.segmentId === segmentId || nextPartInstance?.segmentId === segmentId) {
 		// Don't allow removing an active rundown
 		logger.warn(`Not allowing removal of current playing segment "${segmentId}", making segment unsynced instead`)
 		return false
@@ -533,9 +534,9 @@ export async function updatePlayoutAfterChangingRundownInPlaylist(
 			}
 		}
 
-		await ensureNextPartIsValid(context, playoutModel)
+		const shouldUpdateTimeline = await ensureNextPartIsValid(context, playoutModel)
 
-		if (playoutModel.playlist.activationId) {
+		if (playoutModel.playlist.activationId || shouldUpdateTimeline) {
 			triggerUpdateTimelineAfterIngestData(context, playoutModel.playlistId)
 		}
 	})
@@ -563,7 +564,7 @@ export function triggerUpdateTimelineAfterIngestData(context: JobContext, playli
 					playlistId,
 				})
 				.catch((e) => {
-					logger.error(`triggerUpdateTimelineAfterIngestData: Execution failed: ${e}`)
+					logger.error(`triggerUpdateTimelineAfterIngestData: Execution failed: ${stringifyError(e)}`)
 				})
 		}
 	}, 1000)
diff --git a/packages/job-worker/src/ingest/generationRundown.ts b/packages/job-worker/src/ingest/generationRundown.ts
index f41ed7db49..daf23cfd53 100644
--- a/packages/job-worker/src/ingest/generationRundown.ts
+++ b/packages/job-worker/src/ingest/generationRundown.ts
@@ -58,12 +58,11 @@ export async function updateRundownFromIngestData(
 		{
 			name: 'selectShowStyleVariant',
 			identifier: `studioId=${context.studio._id},rundownId=${ingestModel.rundownId},ingestRundownId=${ingestModel.rundownExternalId}`,
-			tempSendUserNotesIntoBlackHole: true,
 		},
 		context.studio,
 		context.getStudioBlueprintConfig()
 	)
-	// TODO-CONTEXT save any user notes from selectShowStyleContext
+
 	const showStyle = await selectShowStyleVariant(
 		context,
 		selectShowStyleContext,
@@ -80,6 +79,14 @@ export async function updateRundownFromIngestData(
 	const showStyleBlueprint = await context.getShowStyleBlueprint(showStyle.base._id)
 	const allRundownWatchedPackages = await pAllRundownWatchedPackages
 
+	const extraRundownNotes: RundownNote[] = selectShowStyleContext.notes.map((note) => ({
+		type: note.type,
+		message: wrapTranslatableMessageFromBlueprints(note.message, [showStyleBlueprint.blueprintId]),
+		origin: {
+			name: 'selectShowStyleVariant',
+		},
+	}))
+
 	// Call blueprints, get rundown
 	const dbRundown = await regenerateRundownAndBaselineFromIngestData(
 		context,
@@ -88,7 +95,8 @@ export async function updateRundownFromIngestData(
 		rundownSource,
 		showStyle,
 		showStyleBlueprint,
-		allRundownWatchedPackages
+		allRundownWatchedPackages,
+		extraRundownNotes
 	)
 	if (!dbRundown) {
 		// We got no rundown, abort:
@@ -147,13 +155,11 @@ export async function updateRundownMetadataFromIngestData(
 		{
 			name: 'selectShowStyleVariant',
 			identifier: `studioId=${context.studio._id},rundownId=${ingestModel.rundownId},ingestRundownId=${ingestModel.rundownExternalId}`,
-			tempSendUserNotesIntoBlackHole: true,
 		},
 		context.studio,
 		context.getStudioBlueprintConfig()
 	)
 
-	// TODO-CONTEXT save any user notes from selectShowStyleContext
 	const showStyle = await selectShowStyleVariant(
 		context,
 		selectShowStyleContext,
@@ -170,6 +176,14 @@ export async function updateRundownMetadataFromIngestData(
 	const showStyleBlueprint = await context.getShowStyleBlueprint(showStyle.base._id)
 	const allRundownWatchedPackages = await pAllRundownWatchedPackages
 
+	const extraRundownNotes: RundownNote[] = selectShowStyleContext.notes.map((note) => ({
+		type: note.type,
+		message: wrapTranslatableMessageFromBlueprints(note.message, [showStyleBlueprint.blueprintId]),
+		origin: {
+			name: 'selectShowStyleVariant',
+		},
+	}))
+
 	// Call blueprints, get rundown
 	const dbRundown = await regenerateRundownAndBaselineFromIngestData(
 		context,
@@ -178,7 +192,8 @@ export async function updateRundownMetadataFromIngestData(
 		rundownSource,
 		showStyle,
 		showStyleBlueprint,
-		allRundownWatchedPackages
+		allRundownWatchedPackages,
+		extraRundownNotes
 	)
 	if (!dbRundown) {
 		// We got no rundown, abort:
@@ -225,6 +240,7 @@ export async function updateRundownMetadataFromIngestData(
  * @param showStyle ShowStyle to regenerate for
  * @param showStyleBlueprint ShowStyle Blueprint to regenerate with
  * @param allRundownWatchedPackages WatchedPackagesHelper for all packages belonging to the rundown
+ * @param extraRundownNotes Additional notes to add to the Rundown, produced earlier in the ingest process
  * @returns Generated documents or null if Blueprints reject the Rundown
  */
 export async function regenerateRundownAndBaselineFromIngestData(
@@ -234,7 +250,8 @@ export async function regenerateRundownAndBaselineFromIngestData(
 	rundownSource: RundownSource,
 	showStyle: SelectedShowStyleVariant,
 	showStyleBlueprint: ReadonlyDeep<WrappedShowStyleBlueprint>,
-	allRundownWatchedPackages: WatchedPackagesHelper
+	allRundownWatchedPackages: WatchedPackagesHelper,
+	extraRundownNotes: RundownNote[]
 ): Promise<ReadonlyDeep<DBRundown> | null> {
 	const rundownBaselinePackages = allRundownWatchedPackages.filter(
 		context,
@@ -297,15 +314,17 @@ export async function regenerateRundownAndBaselineFromIngestData(
 	}
 
 	// Ensure the ids in the notes are clean
-	const rundownNotes = blueprintContext.notes.map((note) =>
-		literal<RundownNote>({
-			type: note.type,
-			message: wrapTranslatableMessageFromBlueprints(note.message, translationNamespaces),
-			origin: {
-				name: `${showStyle.base.name}-${showStyle.variant.name}`,
-			},
-		})
-	)
+	const rundownNotes = blueprintContext.notes
+		.map((note) =>
+			literal<RundownNote>({
+				type: note.type,
+				message: wrapTranslatableMessageFromBlueprints(note.message, translationNamespaces),
+				origin: {
+					name: `${showStyle.base.name}-${showStyle.variant.name}`,
+				},
+			})
+		)
+		.concat(extraRundownNotes)
 
 	ingestModel.setRundownData(
 		rundownRes.rundown,
diff --git a/packages/job-worker/src/ingest/lock.ts b/packages/job-worker/src/ingest/lock.ts
index 381c0e2ef5..67999b33be 100644
--- a/packages/job-worker/src/ingest/lock.ts
+++ b/packages/job-worker/src/ingest/lock.ts
@@ -35,6 +35,7 @@ export interface CommitIngestData {
 }
 
 export enum UpdateIngestRundownAction {
+	REJECT = 'reject',
 	DELETE = 'delete',
 }
 
@@ -77,9 +78,9 @@ export async function runIngestJob(
 		const updatedIngestRundown = updateCacheFcn(clone(oldIngestRundown))
 		let newIngestRundown: LocalIngestRundown | undefined
 		switch (updatedIngestRundown) {
-			// case UpdateIngestRundownAction.REJECT:
-			// 	// Reject change
-			// 	return
+			case UpdateIngestRundownAction.REJECT:
+				// Reject change
+				return rundownId
 			case UpdateIngestRundownAction.DELETE:
 				ingestObjCache.delete()
 				newIngestRundown = undefined
diff --git a/packages/job-worker/src/ingest/model/IngestSegmentModel.ts b/packages/job-worker/src/ingest/model/IngestSegmentModel.ts
index 74546c424f..d708cb5228 100644
--- a/packages/job-worker/src/ingest/model/IngestSegmentModel.ts
+++ b/packages/job-worker/src/ingest/model/IngestSegmentModel.ts
@@ -92,4 +92,4 @@ export interface IngestSegmentModel extends IngestSegmentModelReadonly {
 	): IngestPartModel
 }
 
-export type IngestReplacePartType = Omit<DBPart, '_id' | 'rundownId' | 'segmentId' | 'expectedDurationWithPreroll'>
+export type IngestReplacePartType = Omit<DBPart, '_id' | 'rundownId' | 'segmentId' | 'expectedDurationWithTransition'>
diff --git a/packages/job-worker/src/ingest/model/implementation/IngestSegmentModelImpl.ts b/packages/job-worker/src/ingest/model/implementation/IngestSegmentModelImpl.ts
index a80978445e..aae742db65 100644
--- a/packages/job-worker/src/ingest/model/implementation/IngestSegmentModelImpl.ts
+++ b/packages/job-worker/src/ingest/model/implementation/IngestSegmentModelImpl.ts
@@ -9,7 +9,7 @@ import { AdLibAction } from '@sofie-automation/corelib/dist/dataModel/AdlibActio
 import { AdLibPiece } from '@sofie-automation/corelib/dist/dataModel/AdLibPiece'
 import { DBPart } from '@sofie-automation/corelib/dist/dataModel/Part'
 import { Piece } from '@sofie-automation/corelib/dist/dataModel/Piece'
-import { calculatePartExpectedDurationWithPreroll } from '@sofie-automation/corelib/dist/playout/timings'
+import { calculatePartExpectedDurationWithTransition } from '@sofie-automation/corelib/dist/playout/timings'
 import { clone } from '@sofie-automation/corelib/dist/lib'
 import { getPartId } from '../../lib'
 
@@ -215,7 +215,7 @@ export class IngestSegmentModelImpl implements IngestSegmentModel {
 			_id: this.getPartIdFromExternalId(rawPart.externalId),
 			rundownId: this.segment.rundownId,
 			segmentId: this.segment._id,
-			expectedDurationWithPreroll: calculatePartExpectedDurationWithPreroll(rawPart, pieces),
+			expectedDurationWithTransition: calculatePartExpectedDurationWithTransition(rawPart, pieces),
 		}
 
 		// We don't need to worry about this being present on other Segments. The caller must make sure it gets removed if needed,
diff --git a/packages/job-worker/src/ingest/mosDevice/__tests__/__snapshots__/mosIngest.test.ts.snap b/packages/job-worker/src/ingest/mosDevice/__tests__/__snapshots__/mosIngest.test.ts.snap
index 6f656432b1..651d6405e1 100644
--- a/packages/job-worker/src/ingest/mosDevice/__tests__/__snapshots__/mosIngest.test.ts.snap
+++ b/packages/job-worker/src/ingest/mosDevice/__tests__/__snapshots__/mosIngest.test.ts.snap
@@ -9,6 +9,7 @@ exports[`Test recieved mos ingest payloads mosRoCreate 1`] = `
   "modified": 0,
   "name": "All effect1 into clip combinations",
   "nextPartInfo": null,
+  "notes": [],
   "organizationId": null,
   "previousPartInfo": null,
   "rundownIdsInOrder": [
@@ -54,11 +55,11 @@ exports[`Test recieved mos ingest payloads mosRoCreate 2`] = `
       "MosExternalMetaData": [
         {
           "MosPayload": {
-            "AllowExternalMod": 1,
+            "AllowExternalMod": "1",
             "AnsvRed": "DKSL",
-            "AutoArchiveClips": 1,
+            "AutoArchiveClips": "1",
             "Clipnames": "Klipp 1;\\Klipp 2;\\Klipp 3;\\Klipp 4;",
-            "ENPSItemType": 2,
+            "ENPSItemType": "2",
             "EndTime": "2018-09-07T07:09:00",
             "Kanal": "NRK1",
             "LocalStartTime": "2018-10-07T07:00:00",
@@ -306,6 +307,7 @@ exports[`Test recieved mos ingest payloads mosRoCreate: replace existing 1`] = `
   "modified": 0,
   "name": "All effect1 into clip combinations",
   "nextPartInfo": null,
+  "notes": [],
   "organizationId": null,
   "previousPartInfo": null,
   "rundownIdsInOrder": [
@@ -351,11 +353,11 @@ exports[`Test recieved mos ingest payloads mosRoCreate: replace existing 2`] = `
       "MosExternalMetaData": [
         {
           "MosPayload": {
-            "AllowExternalMod": 1,
+            "AllowExternalMod": "1",
             "AnsvRed": "DKSL",
-            "AutoArchiveClips": 1,
+            "AutoArchiveClips": "1",
             "Clipnames": "Klipp 1;\\Klipp 2;\\Klipp 3;\\Klipp 4;",
-            "ENPSItemType": 2,
+            "ENPSItemType": "2",
             "EndTime": "2018-09-07T07:09:00",
             "Kanal": "NRK1",
             "LocalStartTime": "2018-10-07T07:00:00",
@@ -594,6 +596,7 @@ exports[`Test recieved mos ingest payloads mosRoFullStory: Valid data 1`] = `
   "modified": 0,
   "name": "All effect1 into clip combinations",
   "nextPartInfo": null,
+  "notes": [],
   "organizationId": null,
   "previousPartInfo": null,
   "rundownIdsInOrder": [
@@ -641,11 +644,11 @@ exports[`Test recieved mos ingest payloads mosRoFullStory: Valid data 2`] = `
       "MosExternalMetaData": [
         {
           "MosPayload": {
-            "AllowExternalMod": 1,
+            "AllowExternalMod": "1",
             "AnsvRed": "DKSL",
-            "AutoArchiveClips": 1,
+            "AutoArchiveClips": "1",
             "Clipnames": "Klipp 1;\\Klipp 2;\\Klipp 3;\\Klipp 4;",
-            "ENPSItemType": 2,
+            "ENPSItemType": "2",
             "EndTime": "2018-09-07T07:09:00",
             "Kanal": "NRK1",
             "LocalStartTime": "2018-10-07T07:00:00",
@@ -904,6 +907,7 @@ exports[`Test recieved mos ingest payloads mosRoReadyToAir: Update ro 1`] = `
   "modified": 0,
   "name": "All effect1 into clip combinations",
   "nextPartInfo": null,
+  "notes": [],
   "organizationId": null,
   "previousPartInfo": null,
   "rundownIdsInOrder": [
@@ -951,11 +955,11 @@ exports[`Test recieved mos ingest payloads mosRoReadyToAir: Update ro 2`] = `
       "MosExternalMetaData": [
         {
           "MosPayload": {
-            "AllowExternalMod": 1,
+            "AllowExternalMod": "1",
             "AnsvRed": "DKSL",
-            "AutoArchiveClips": 1,
+            "AutoArchiveClips": "1",
             "Clipnames": "Klipp 1;\\Klipp 2;\\Klipp 3;\\Klipp 4;",
-            "ENPSItemType": 2,
+            "ENPSItemType": "2",
             "EndTime": "2018-09-07T07:09:00",
             "Kanal": "NRK1",
             "LocalStartTime": "2018-10-07T07:00:00",
@@ -1204,6 +1208,7 @@ exports[`Test recieved mos ingest payloads mosRoStatus: Update ro 1`] = `
   "modified": 0,
   "name": "All effect1 into clip combinations",
   "nextPartInfo": null,
+  "notes": [],
   "organizationId": null,
   "previousPartInfo": null,
   "rundownIdsInOrder": [
@@ -1249,11 +1254,11 @@ exports[`Test recieved mos ingest payloads mosRoStatus: Update ro 2`] = `
       "MosExternalMetaData": [
         {
           "MosPayload": {
-            "AllowExternalMod": 1,
+            "AllowExternalMod": "1",
             "AnsvRed": "DKSL",
-            "AutoArchiveClips": 1,
+            "AutoArchiveClips": "1",
             "Clipnames": "Klipp 1;\\Klipp 2;\\Klipp 3;\\Klipp 4;",
-            "ENPSItemType": 2,
+            "ENPSItemType": "2",
             "EndTime": "2018-09-07T07:09:00",
             "Kanal": "NRK1",
             "LocalStartTime": "2018-10-07T07:00:00",
@@ -1502,6 +1507,7 @@ exports[`Test recieved mos ingest payloads mosRoStoryDelete: Remove segment 1`]
   "modified": 0,
   "name": "All effect1 into clip combinations",
   "nextPartInfo": null,
+  "notes": [],
   "organizationId": null,
   "previousPartInfo": null,
   "rundownIdsInOrder": [
@@ -1549,11 +1555,11 @@ exports[`Test recieved mos ingest payloads mosRoStoryDelete: Remove segment 2`]
       "MosExternalMetaData": [
         {
           "MosPayload": {
-            "AllowExternalMod": 1,
+            "AllowExternalMod": "1",
             "AnsvRed": "DKSL",
-            "AutoArchiveClips": 1,
+            "AutoArchiveClips": "1",
             "Clipnames": "Klipp 1;\\Klipp 2;\\Klipp 3;\\Klipp 4;",
-            "ENPSItemType": 2,
+            "ENPSItemType": "2",
             "EndTime": "2018-09-07T07:09:00",
             "Kanal": "NRK1",
             "LocalStartTime": "2018-10-07T07:00:00",
@@ -1766,6 +1772,7 @@ exports[`Test recieved mos ingest payloads mosRoStoryInsert: Into segment 1`] =
   "modified": 0,
   "name": "All effect1 into clip combinations",
   "nextPartInfo": null,
+  "notes": [],
   "organizationId": null,
   "previousPartInfo": null,
   "rundownIdsInOrder": [
@@ -1813,11 +1820,11 @@ exports[`Test recieved mos ingest payloads mosRoStoryInsert: Into segment 2`] =
       "MosExternalMetaData": [
         {
           "MosPayload": {
-            "AllowExternalMod": 1,
+            "AllowExternalMod": "1",
             "AnsvRed": "DKSL",
-            "AutoArchiveClips": 1,
+            "AutoArchiveClips": "1",
             "Clipnames": "Klipp 1;\\Klipp 2;\\Klipp 3;\\Klipp 4;",
-            "ENPSItemType": 2,
+            "ENPSItemType": "2",
             "EndTime": "2018-09-07T07:09:00",
             "Kanal": "NRK1",
             "LocalStartTime": "2018-10-07T07:00:00",
@@ -2077,6 +2084,7 @@ exports[`Test recieved mos ingest payloads mosRoStoryInsert: New segment 1`] = `
   "modified": 0,
   "name": "All effect1 into clip combinations",
   "nextPartInfo": null,
+  "notes": [],
   "organizationId": null,
   "previousPartInfo": null,
   "rundownIdsInOrder": [
@@ -2124,11 +2132,11 @@ exports[`Test recieved mos ingest payloads mosRoStoryInsert: New segment 2`] = `
       "MosExternalMetaData": [
         {
           "MosPayload": {
-            "AllowExternalMod": 1,
+            "AllowExternalMod": "1",
             "AnsvRed": "DKSL",
-            "AutoArchiveClips": 1,
+            "AutoArchiveClips": "1",
             "Clipnames": "Klipp 1;\\Klipp 2;\\Klipp 3;\\Klipp 4;",
-            "ENPSItemType": 2,
+            "ENPSItemType": "2",
             "EndTime": "2018-09-07T07:09:00",
             "Kanal": "NRK1",
             "LocalStartTime": "2018-10-07T07:00:00",
@@ -2397,6 +2405,7 @@ exports[`Test recieved mos ingest payloads mosRoStoryMove: Move whole segment to
   "modified": 0,
   "name": "All effect1 into clip combinations",
   "nextPartInfo": null,
+  "notes": [],
   "organizationId": null,
   "previousPartInfo": null,
   "rundownIdsInOrder": [
@@ -2444,11 +2453,11 @@ exports[`Test recieved mos ingest payloads mosRoStoryMove: Move whole segment to
       "MosExternalMetaData": [
         {
           "MosPayload": {
-            "AllowExternalMod": 1,
+            "AllowExternalMod": "1",
             "AnsvRed": "DKSL",
-            "AutoArchiveClips": 1,
+            "AutoArchiveClips": "1",
             "Clipnames": "Klipp 1;\\Klipp 2;\\Klipp 3;\\Klipp 4;",
-            "ENPSItemType": 2,
+            "ENPSItemType": "2",
             "EndTime": "2018-09-07T07:09:00",
             "Kanal": "NRK1",
             "LocalStartTime": "2018-10-07T07:00:00",
@@ -2699,6 +2708,7 @@ exports[`Test recieved mos ingest payloads mosRoStoryMove: Within segment 1`] =
   "modified": 0,
   "name": "All effect1 into clip combinations",
   "nextPartInfo": null,
+  "notes": [],
   "organizationId": null,
   "previousPartInfo": null,
   "rundownIdsInOrder": [
@@ -2746,11 +2756,11 @@ exports[`Test recieved mos ingest payloads mosRoStoryMove: Within segment 2`] =
       "MosExternalMetaData": [
         {
           "MosPayload": {
-            "AllowExternalMod": 1,
+            "AllowExternalMod": "1",
             "AnsvRed": "DKSL",
-            "AutoArchiveClips": 1,
+            "AutoArchiveClips": "1",
             "Clipnames": "Klipp 1;\\Klipp 2;\\Klipp 3;\\Klipp 4;",
-            "ENPSItemType": 2,
+            "ENPSItemType": "2",
             "EndTime": "2018-09-07T07:09:00",
             "Kanal": "NRK1",
             "LocalStartTime": "2018-10-07T07:00:00",
@@ -3001,6 +3011,7 @@ exports[`Test recieved mos ingest payloads mosRoStoryReplace: Same segment 1`] =
   "modified": 0,
   "name": "All effect1 into clip combinations",
   "nextPartInfo": null,
+  "notes": [],
   "organizationId": null,
   "previousPartInfo": null,
   "rundownIdsInOrder": [
@@ -3048,11 +3059,11 @@ exports[`Test recieved mos ingest payloads mosRoStoryReplace: Same segment 2`] =
       "MosExternalMetaData": [
         {
           "MosPayload": {
-            "AllowExternalMod": 1,
+            "AllowExternalMod": "1",
             "AnsvRed": "DKSL",
-            "AutoArchiveClips": 1,
+            "AutoArchiveClips": "1",
             "Clipnames": "Klipp 1;\\Klipp 2;\\Klipp 3;\\Klipp 4;",
-            "ENPSItemType": 2,
+            "ENPSItemType": "2",
             "EndTime": "2018-09-07T07:09:00",
             "Kanal": "NRK1",
             "LocalStartTime": "2018-10-07T07:00:00",
@@ -3302,6 +3313,7 @@ exports[`Test recieved mos ingest payloads mosRoStorySwap: Swap across segments
   "modified": 0,
   "name": "All effect1 into clip combinations",
   "nextPartInfo": null,
+  "notes": [],
   "organizationId": null,
   "previousPartInfo": null,
   "rundownIdsInOrder": [
@@ -3349,11 +3361,11 @@ exports[`Test recieved mos ingest payloads mosRoStorySwap: Swap across segments
       "MosExternalMetaData": [
         {
           "MosPayload": {
-            "AllowExternalMod": 1,
+            "AllowExternalMod": "1",
             "AnsvRed": "DKSL",
-            "AutoArchiveClips": 1,
+            "AutoArchiveClips": "1",
             "Clipnames": "Klipp 1;\\Klipp 2;\\Klipp 3;\\Klipp 4;",
-            "ENPSItemType": 2,
+            "ENPSItemType": "2",
             "EndTime": "2018-09-07T07:09:00",
             "Kanal": "NRK1",
             "LocalStartTime": "2018-10-07T07:00:00",
@@ -3595,6 +3607,7 @@ exports[`Test recieved mos ingest payloads mosRoStorySwap: Swap across segments2
   "modified": 0,
   "name": "All effect1 into clip combinations",
   "nextPartInfo": null,
+  "notes": [],
   "organizationId": null,
   "previousPartInfo": null,
   "rundownIdsInOrder": [
@@ -3642,11 +3655,11 @@ exports[`Test recieved mos ingest payloads mosRoStorySwap: Swap across segments2
       "MosExternalMetaData": [
         {
           "MosPayload": {
-            "AllowExternalMod": 1,
+            "AllowExternalMod": "1",
             "AnsvRed": "DKSL",
-            "AutoArchiveClips": 1,
+            "AutoArchiveClips": "1",
             "Clipnames": "Klipp 1;\\Klipp 2;\\Klipp 3;\\Klipp 4;",
-            "ENPSItemType": 2,
+            "ENPSItemType": "2",
             "EndTime": "2018-09-07T07:09:00",
             "Kanal": "NRK1",
             "LocalStartTime": "2018-10-07T07:00:00",
@@ -3924,6 +3937,7 @@ exports[`Test recieved mos ingest payloads mosRoStorySwap: With first in same se
   "modified": 0,
   "name": "All effect1 into clip combinations",
   "nextPartInfo": null,
+  "notes": [],
   "organizationId": null,
   "previousPartInfo": null,
   "rundownIdsInOrder": [
@@ -3971,11 +3985,11 @@ exports[`Test recieved mos ingest payloads mosRoStorySwap: With first in same se
       "MosExternalMetaData": [
         {
           "MosPayload": {
-            "AllowExternalMod": 1,
+            "AllowExternalMod": "1",
             "AnsvRed": "DKSL",
-            "AutoArchiveClips": 1,
+            "AutoArchiveClips": "1",
             "Clipnames": "Klipp 1;\\Klipp 2;\\Klipp 3;\\Klipp 4;",
-            "ENPSItemType": 2,
+            "ENPSItemType": "2",
             "EndTime": "2018-09-07T07:09:00",
             "Kanal": "NRK1",
             "LocalStartTime": "2018-10-07T07:00:00",
@@ -4226,6 +4240,7 @@ exports[`Test recieved mos ingest payloads mosRoStorySwap: Within same segment 1
   "modified": 0,
   "name": "All effect1 into clip combinations",
   "nextPartInfo": null,
+  "notes": [],
   "organizationId": null,
   "previousPartInfo": null,
   "rundownIdsInOrder": [
@@ -4273,11 +4288,11 @@ exports[`Test recieved mos ingest payloads mosRoStorySwap: Within same segment 2
       "MosExternalMetaData": [
         {
           "MosPayload": {
-            "AllowExternalMod": 1,
+            "AllowExternalMod": "1",
             "AnsvRed": "DKSL",
-            "AutoArchiveClips": 1,
+            "AutoArchiveClips": "1",
             "Clipnames": "Klipp 1;\\Klipp 2;\\Klipp 3;\\Klipp 4;",
-            "ENPSItemType": 2,
+            "ENPSItemType": "2",
             "EndTime": "2018-09-07T07:09:00",
             "Kanal": "NRK1",
             "LocalStartTime": "2018-10-07T07:00:00",
diff --git a/packages/job-worker/src/ingest/mosDevice/__tests__/mock-mos-data.ts b/packages/job-worker/src/ingest/mosDevice/__tests__/mock-mos-data.ts
index ea0aa1693f..3dadee7153 100644
--- a/packages/job-worker/src/ingest/mosDevice/__tests__/mock-mos-data.ts
+++ b/packages/job-worker/src/ingest/mosDevice/__tests__/mock-mos-data.ts
@@ -14,7 +14,7 @@ export const mockRO = {
 				{
 					MosSchema: 'http://SLENPS01:10505/schema/enpsro.dtd',
 					MosPayload: {
-						AllowExternalMod: 1,
+						AllowExternalMod: '1',
 						EndTime: '2018-09-07T07:09:00',
 						MOSroBlock: 'VIZ.DKOA.MOS;VIZ.NPRO.MOS;VIZ.TPRO.MOS',
 						MOSROStatus: 'PLAY',
@@ -25,13 +25,13 @@ export const mockRO = {
 						RundownDuration: '09:00',
 						StartTime: '2018-10-07T07:00:00',
 						AnsvRed: 'DKSL',
-						AutoArchiveClips: 1,
+						AutoArchiveClips: '1',
 						Clipnames: 'Klipp 1;\\Klipp 2;\\Klipp 3;\\Klipp 4;',
 						Kanal: 'NRK1',
 						ProdNr: 'DKSL99090618',
 						Regionalsend: 'SL',
 						LocalStartTime: '2018-10-07T07:00:00',
-						ENPSItemType: 2,
+						ENPSItemType: '2',
 						roLayout:
 							'PageNum_450|RowStatus_150|Slug_1920|SegStatus_210|Segment_2595|mosartType_1110|mosartVariant_1290|mosartTransition_825|ip1_460|ip2_535|MOSObjSlugs_8295|Estimated_555|Actual_570|MOSItemDurations_630|Float_600|Tekniske-opplysninger_1875|FrontTime_1005|ElapsedTime_1000',
 					},
diff --git a/packages/job-worker/src/ingest/packageInfo.ts b/packages/job-worker/src/ingest/packageInfo.ts
index 8015744f02..a669f65d19 100644
--- a/packages/job-worker/src/ingest/packageInfo.ts
+++ b/packages/job-worker/src/ingest/packageInfo.ts
@@ -7,7 +7,7 @@ import {
 import { logger } from '../logging'
 import { JobContext } from '../jobs'
 import { regenerateSegmentsFromIngestData } from './generationSegment'
-import { runIngestJob, runWithRundownLock } from './lock'
+import { UpdateIngestRundownAction, runIngestJob, runWithRundownLock } from './lock'
 import { updateExpectedPackagesForPartModel, updateExpectedPackagesForRundownBaseline } from './expectedPackages'
 import { loadIngestModelFromRundown } from './model/implementation/LoadIngestModel'
 
@@ -48,11 +48,16 @@ export async function handleUpdatedPackageInfoForRundown(
 		context,
 		data,
 		(ingestRundown) => {
-			if (!ingestRundown) throw new Error('onUpdatedPackageInfoForRundown called but ingestData is undefined')
+			if (!ingestRundown) {
+				logger.error(
+					`onUpdatedPackageInfoForRundown called but ingestRundown is undefined (rundownExternalId: "${data.rundownExternalId}")`
+				)
+				return UpdateIngestRundownAction.REJECT
+			}
 			return ingestRundown // don't mutate any ingest data
 		},
 		async (context, ingestModel, ingestRundown) => {
-			if (!ingestRundown) throw new Error('onUpdatedPackageInfoForRundown called but ingestData is undefined')
+			if (!ingestRundown) throw new Error('onUpdatedPackageInfoForRundown called but ingestRundown is undefined')
 
 			/** All segments that need updating */
 			const segmentsToUpdate = new Set<SegmentId>()
diff --git a/packages/job-worker/src/ingest/syncChangesToPartInstance.ts b/packages/job-worker/src/ingest/syncChangesToPartInstance.ts
index 14de904a33..9cb61b334b 100644
--- a/packages/job-worker/src/ingest/syncChangesToPartInstance.ts
+++ b/packages/job-worker/src/ingest/syncChangesToPartInstance.ts
@@ -19,7 +19,6 @@ import {
 	getPieceInstancesForPart,
 	syncPlayheadInfinitesForNextPartInstance,
 } from '../playout/infinites'
-import { isTooCloseToAutonext } from '../playout/lib'
 import _ = require('underscore')
 import { SyncIngestUpdateToPartInstanceContext } from '../blueprints/context'
 import {
@@ -32,6 +31,7 @@ import {
 import { validateAdlibTestingPartInstanceProperties } from '../playout/adlibTesting'
 import { ReadonlyDeep } from 'type-fest'
 import { convertIngestModelToPlayoutRundownWithSegments } from './commit'
+import { PlayoutRundownModel } from '../playout/model/PlayoutRundownModel'
 
 type PlayStatus = 'previous' | 'current' | 'next'
 type SyncedInstance = {
@@ -113,7 +113,7 @@ export async function syncChangesToPartInstances(
 					ingestModel,
 					nextPartInstance,
 					currentPartInstance,
-					isTooCloseToAutonext(currentPartInstance?.partInstance, false) ? 'current' : 'next'
+					currentPartInstance?.isTooCloseToAutonext(false) ? 'current' : 'next'
 				)
 			}
 
@@ -132,12 +132,22 @@ export async function syncChangesToPartInstances(
 					pieceInstances: pieceInstancesInPart.map((p) => convertPieceInstanceToBlueprints(p.pieceInstance)),
 				}
 
+				const part = newPart ?? existingPartInstance.partInstance.part
+
+				let playoutRundownModelForPart: PlayoutRundownModel | undefined = playoutRundownModel
+				// Handle a case where the part is in a different rundown than the playoutRundownModel:
+				if (playoutRundownModel.rundown._id !== part.rundownId) {
+					playoutRundownModelForPart = playoutModel.getRundown(part.rundownId)
+				}
+				if (!playoutRundownModelForPart)
+					throw new Error(`Internal Error: playoutRundownModelForPart is undefined (it should never be)`)
+
 				const proposedPieceInstances = getPieceInstancesForPart(
 					context,
 					playoutModel,
 					previousPartInstance,
-					playoutRundownModel,
-					newPart ?? existingPartInstance.partInstance.part,
+					playoutRundownModelForPart,
+					part,
 					await piecesThatMayBeActive,
 					existingPartInstance.partInstance._id
 				)
@@ -192,7 +202,7 @@ export async function syncChangesToPartInstances(
 				}
 
 				if (playStatus === 'next') {
-					existingPartInstance.recalculateExpectedDurationWithPreroll()
+					existingPartInstance.recalculateExpectedDurationWithTransition()
 				}
 
 				// Save notes:
@@ -212,10 +222,11 @@ export async function syncChangesToPartInstances(
 					// TODO - these dont get shown to the user currently
 					// TODO - old notes from the sync may need to be pruned, or we will end up with duplicates and 'stuck' notes?+
 					existingPartInstance.appendNotes(newNotes)
-
-					validateAdlibTestingPartInstanceProperties(context, playoutModel, existingPartInstance)
 				}
 
+				// Make sure an adlib-testing part is still labeled correctly. This could happen if the partInstance used any recently updated adlibs
+				validateAdlibTestingPartInstanceProperties(context, playoutModel, existingPartInstance)
+
 				if (existingPartInstance.partInstance._id === playoutModel.playlist.currentPartInfo?.partInstanceId) {
 					// This should be run after 'current', before 'next':
 					await syncPlayheadInfinitesForNextPartInstance(
diff --git a/packages/job-worker/src/ingest/updateNext.ts b/packages/job-worker/src/ingest/updateNext.ts
index 369713b39a..b2bcd4ca08 100644
--- a/packages/job-worker/src/ingest/updateNext.ts
+++ b/packages/job-worker/src/ingest/updateNext.ts
@@ -1,85 +1,99 @@
-import { isTooCloseToAutonext } from '../playout/lib'
 import { selectNextPart } from '../playout/selectNextPart'
 import { PlayoutModel } from '../playout/model/PlayoutModel'
 import { JobContext } from '../jobs'
 import { setNextPart } from '../playout/setNext'
 import { isPartPlayable } from '@sofie-automation/corelib/dist/dataModel/Part'
-import { updateTimeline } from '../playout/timeline/generate'
 
 /**
  * Make sure that the nextPartInstance for the current Playlist is still correct
  * This will often change the nextPartInstance
  * @param context Context of the job being run
  * @param playoutModel Playout Model to operate on
+ * @returns Whether the timeline should be updated following this operation
  */
-export async function ensureNextPartIsValid(context: JobContext, playoutModel: PlayoutModel): Promise<void> {
+export async function ensureNextPartIsValid(context: JobContext, playoutModel: PlayoutModel): Promise<boolean> {
 	const span = context.startSpan('api.ingest.ensureNextPartIsValid')
 
 	// Ensure the next-id is still valid
 	const playlist = playoutModel.playlist
-	if (playlist?.activationId) {
-		const currentPartInstance = playoutModel.currentPartInstance
-		const nextPartInstance = playoutModel.nextPartInstance
+	if (!playlist?.activationId) {
+		span?.end()
+		return false
+	}
+
+	const currentPartInstance = playoutModel.currentPartInstance
+	const nextPartInstance = playoutModel.nextPartInstance
+
+	if (
+		playlist.nextPartInfo?.manuallySelected &&
+		nextPartInstance &&
+		isPartPlayable(nextPartInstance.partInstance.part) &&
+		nextPartInstance.partInstance.orphaned !== 'deleted'
+	) {
+		// Manual next part is almost always valid. This includes orphaned (adlib-part) partinstances
+		span?.end()
+		return false
+	}
+
+	// If we are close to an autonext, then leave it to avoid glitches
+	if (currentPartInstance?.isTooCloseToAutonext(false) && nextPartInstance) {
+		span?.end()
+		return false
+	}
+
+	const orderedSegments = playoutModel.getAllOrderedSegments()
+	const orderedParts = playoutModel.getAllOrderedParts()
+
+	if (currentPartInstance && nextPartInstance) {
+		// Check if the part is the same
+		const newNextPart = selectNextPart(
+			context,
+			playlist,
+			currentPartInstance.partInstance,
+			nextPartInstance.partInstance,
+			orderedSegments,
+			orderedParts,
+			{ ignoreUnplayable: true, ignoreQuickLoop: false }
+		)
 
 		if (
-			playlist.nextPartInfo?.manuallySelected &&
-			nextPartInstance &&
-			isPartPlayable(nextPartInstance.partInstance.part) &&
-			nextPartInstance.partInstance.orphaned !== 'deleted'
+			// Nothing should be nexted
+			!newNextPart ||
+			// The nexted-part should be different to what is selected
+			newNextPart.part._id !== nextPartInstance.partInstance.part._id ||
+			// The nexted-part Instance is no longer playable
+			!isPartPlayable(nextPartInstance.partInstance.part)
 		) {
-			// Manual next part is almost always valid. This includes orphaned (adlib-part) partinstances
+			// The 'new' next part is before the current next, so move the next point
+			await setNextPart(context, playoutModel, newNextPart ?? null, false)
+
 			span?.end()
-			return
+			return true
 		}
+	} else if (!nextPartInstance || nextPartInstance.partInstance.orphaned === 'deleted') {
+		// Don't have a nextPart or it has been deleted, so autoselect something
+		const newNextPart = selectNextPart(
+			context,
+			playlist,
+			currentPartInstance?.partInstance ?? null,
+			nextPartInstance?.partInstance ?? null,
+			orderedSegments,
+			orderedParts,
+			{ ignoreUnplayable: true, ignoreQuickLoop: false }
+		)
 
-		// If we are close to an autonext, then leave it to avoid glitches
-		if (isTooCloseToAutonext(currentPartInstance?.partInstance) && nextPartInstance) {
+		if (!newNextPart && !playoutModel.playlist.nextPartInfo) {
+			// No currently nexted part, and nothing was selected, so nothing to update
 			span?.end()
-			return
+			return false
 		}
 
-		const orderedSegments = playoutModel.getAllOrderedSegments()
-		const orderedParts = playoutModel.getAllOrderedParts()
-
-		if (currentPartInstance && nextPartInstance) {
-			// Check if the part is the same
-			const newNextPart = selectNextPart(
-				context,
-				playlist,
-				currentPartInstance.partInstance,
-				nextPartInstance.partInstance,
-				orderedSegments,
-				orderedParts
-			)
-
-			if (
-				// Nothing should be nexted
-				!newNextPart ||
-				// The nexted-part should be different to what is selected
-				newNextPart.part._id !== nextPartInstance.partInstance.part._id ||
-				// The nexted-part Instance is no longer playable
-				!isPartPlayable(nextPartInstance.partInstance.part)
-			) {
-				// The 'new' next part is before the current next, so move the next point
-				await setNextPart(context, playoutModel, newNextPart ?? null, false)
+		await setNextPart(context, playoutModel, newNextPart ?? null, false)
 
-				await updateTimeline(context, playoutModel)
-			}
-		} else if (!nextPartInstance || nextPartInstance.partInstance.orphaned === 'deleted') {
-			// Don't have a nextPart or it has been deleted, so autoselect something
-			const newNextPart = selectNextPart(
-				context,
-				playlist,
-				currentPartInstance?.partInstance ?? null,
-				nextPartInstance?.partInstance ?? null,
-				orderedSegments,
-				orderedParts
-			)
-			await setNextPart(context, playoutModel, newNextPart ?? null, false)
-
-			await updateTimeline(context, playoutModel)
-		}
+		span?.end()
+		return true
 	}
 
 	span?.end()
+	return false
 }
diff --git a/packages/job-worker/src/ipc.ts b/packages/job-worker/src/ipc.ts
index 4d586ae2d2..8e29d82e43 100644
--- a/packages/job-worker/src/ipc.ts
+++ b/packages/job-worker/src/ipc.ts
@@ -1,3 +1,4 @@
+import { stringifyError } from '@sofie-automation/shared-lib/dist/lib/stringifyError'
 import { interceptLogging, LogEntry, logger } from './logging'
 import { FastTrackTimelineFunc, JobSpec, JobWorkerBase } from './main'
 import { JobManager, JobStream } from './manager'
@@ -28,7 +29,7 @@ class IpcJobManager implements JobManager {
 			pop: async () => this.getNextJob(queueName),
 			interrupt: () => {
 				this.interruptJobStream(queueName).catch((e) =>
-					logger.error(`Failed to interupt job queue ${queueName}: ${e}`)
+					logger.error(`Failed to interupt job queue ${queueName}: ${stringifyError(e)}`)
 				)
 			},
 			close: async () => Promise.resolve(),
diff --git a/packages/job-worker/src/jobs/index.ts b/packages/job-worker/src/jobs/index.ts
index c2e71c4ec9..f8ab90e9f4 100644
--- a/packages/job-worker/src/jobs/index.ts
+++ b/packages/job-worker/src/jobs/index.ts
@@ -64,6 +64,26 @@ export interface JobContext extends StudioCacheContext {
 
 	/** Hack: fast-track the timeline out to the playout-gateway. */
 	hackPublishTimelineToFastTrack(newTimeline: TimelineComplete): void
+
+	/**
+	 * Set whether a routeset for this studio is active.
+	 * Any routeset `exclusivityGroup` will be respected.
+	 * The changes will be immediately visible in subsequent calls to the `studio` getter
+	 * @param routeSetId The routeSetId to change
+	 * @param isActive Whether the routeSet should be active, or toggle
+	 * @returns Whether the change could affect playout
+	 */
+	setRouteSetActive(routeSetId: string, isActive: boolean | 'toggle'): boolean
+
+	/**
+	 * Save any changes to the routesets for this studio to the database
+	 */
+	saveRouteSetChanges(): Promise<void>
+
+	/**
+	 * Discard any unsaved changes to the routesets for this studio
+	 */
+	discardRouteSetChanges(): void
 }
 
 /**
diff --git a/packages/job-worker/src/locks.ts b/packages/job-worker/src/locks.ts
index c7d9ca9860..512e560eee 100644
--- a/packages/job-worker/src/locks.ts
+++ b/packages/job-worker/src/locks.ts
@@ -1,6 +1,7 @@
 import { assertNever } from '@sofie-automation/corelib/dist/lib'
 import { logger } from './logging'
 import { AnyLockEvent } from './workers/locks'
+import { stringifyError } from '@sofie-automation/shared-lib/dist/lib/stringifyError'
 
 type OwnerAndLockIds = [string, string]
 
@@ -47,7 +48,7 @@ export class LocksManager {
 
 				this.#lockChanged(nextWorker[0], nextWorker[1], true)
 					.catch(async (e) => {
-						logger.error(`Failed to report lock to worker: ${e}`)
+						logger.error(`Failed to report lock to worker: ${stringifyError(e)}`)
 
 						// It failed, so next worker should be attempted
 						return Promise.resolve(false)
@@ -67,7 +68,7 @@ export class LocksManager {
 						}
 					})
 					.catch((e) => {
-						logger.error(`Failed to lock next worker: ${e}`)
+						logger.error(`Failed to lock next worker: ${stringifyError(e)}`)
 					})
 			}
 		}
@@ -96,7 +97,7 @@ export class LocksManager {
 							)
 
 							this.#lockChanged(threadId, e.lockId, false).catch((e) => {
-								logger.error(`Failed to report lock change back to worker: ${e}`)
+								logger.error(`Failed to report lock change back to worker: ${stringifyError(e)}`)
 							})
 						} else {
 							logger.warn(`Worker tried to unlock a lock it doesnt own`)
@@ -109,7 +110,7 @@ export class LocksManager {
 						break
 				}
 			} catch (e) {
-				logger.error(`Unexpected error in lock handler: ${e}`)
+				logger.error(`Unexpected error in lock handler: ${stringifyError(e)}`)
 			}
 		})
 	}
diff --git a/packages/job-worker/src/peripheralDevice.ts b/packages/job-worker/src/peripheralDevice.ts
index 41bf718a44..7ac13b0747 100644
--- a/packages/job-worker/src/peripheralDevice.ts
+++ b/packages/job-worker/src/peripheralDevice.ts
@@ -14,6 +14,7 @@ import { logger } from './logging'
 import { PlayoutModel } from './playout/model/PlayoutModel'
 import { literal } from '@sofie-automation/shared-lib/dist/lib/lib'
 import { SubdeviceAction } from '@sofie-automation/corelib/dist/deviceConfig'
+import { stringifyError } from '@sofie-automation/shared-lib/dist/lib/stringifyError'
 
 export async function executePeripheralDeviceAction(
 	context: JobContext,
@@ -95,10 +96,14 @@ async function executePeripheralDeviceGenericFunction(
 					}
 
 					Promise.resolve(watcher.close()).catch((e) => {
-						logger.error(`Cleanup PeripheralDeviceCommand "${commandId}" watcher failed: ${e}`)
+						logger.error(
+							`Cleanup PeripheralDeviceCommand "${commandId}" watcher failed: ${stringifyError(e)}`
+						)
 					})
 					context.directCollections.PeripheralDeviceCommands.remove(cmdId).catch((e) => {
-						logger.error(`Cleanup PeripheralDeviceCommand "${commandId}" document failed: ${e}`)
+						logger.error(
+							`Cleanup PeripheralDeviceCommand "${commandId}" document failed: ${stringifyError(e)}`
+						)
 					})
 				}
 
@@ -144,7 +149,7 @@ async function executePeripheralDeviceGenericFunction(
 
 	const doCheckReply = () => {
 		checkReply().catch((e) => {
-			logger.error(`PeripheralDeviceCommand "${commandId}" check failed: ${e}`)
+			logger.error(`PeripheralDeviceCommand "${commandId}" check failed: ${stringifyError(e)}`)
 		})
 	}
 
@@ -159,7 +164,7 @@ async function executePeripheralDeviceGenericFunction(
 	})
 	watcher.on('error', (err) => {
 		Promise.resolve(watcher.close()).catch((e) => {
-			logger.error(`Cleanup PeripheralDeviceCommand "${commandId}" watcher failed: ${e}`)
+			logger.error(`Cleanup PeripheralDeviceCommand "${commandId}" watcher failed: ${stringifyError(e)}`)
 		})
 
 		if (!completed) {
@@ -180,7 +185,7 @@ async function executePeripheralDeviceGenericFunction(
 		})
 	} catch (e) {
 		Promise.resolve(watcher.close()).catch((e) => {
-			logger.error(`Cleanup PeripheralDeviceCommand "${commandId}" watcher failed: ${e}`)
+			logger.error(`Cleanup PeripheralDeviceCommand "${commandId}" watcher failed: ${stringifyError(e)}`)
 		})
 		throw e
 	}
diff --git a/packages/job-worker/src/playout/__tests__/__snapshots__/playout.test.ts.snap b/packages/job-worker/src/playout/__tests__/__snapshots__/playout.test.ts.snap
index ecb20c7178..570be55e51 100644
--- a/packages/job-worker/src/playout/__tests__/__snapshots__/playout.test.ts.snap
+++ b/packages/job-worker/src/playout/__tests__/__snapshots__/playout.test.ts.snap
@@ -12,7 +12,7 @@ exports[`Playout API Basic rundown control 1`] = `
       "studio": "asdf",
     },
     "timelineBlob": "[{"id":"playlist_randomId9000_status","objectType":"rundown","enable":{"while":1},"layer":"rundown_status","content":{"deviceType":"ABSTRACT"},"classes":["rundown_active"],"priority":0},{"id":"part_group_randomId9000_part0_0_randomId9003","objectType":"rundown","enable":{"start":"now"},"priority":5,"layer":"","content":{"deviceType":"ABSTRACT","type":"group"},"children":[],"isGroup":true,"metaData":{"isPieceTimeline":true}},{"id":"part_group_firstobject_randomId9000_part0_0_randomId9003","objectType":"rundown","enable":{"start":0},"layer":"group_first_object","content":{"deviceType":"ABSTRACT","type":"callback","callBack":"partPlaybackStarted","callBackData":{"rundownPlaylistId":"playlist_randomId9000","partInstanceId":"randomId9000_part0_0_randomId9003"},"callBackStopped":"partPlaybackStopped"},"inGroup":"part_group_randomId9000_part0_0_randomId9003","classes":[],"priority":0},{"id":"piece_group_control_randomId9000_part0_0_randomId9003_randomId9000_piece001","objectType":"rundown","enable":{"start":0},"layer":"vt0","priority":5,"content":{"deviceType":"ABSTRACT","type":"callback","callBack":"piecePlaybackStarted","callBackData":{"rundownPlaylistId":"playlist_randomId9000","partInstanceId":"randomId9000_part0_0_randomId9003","pieceInstanceId":"randomId9000_part0_0_randomId9003_randomId9000_piece001","dynamicallyInserted":false},"callBackStopped":"piecePlaybackStopped"},"classes":["current_part"],"inGroup":"part_group_randomId9000_part0_0_randomId9003","metaData":{"isPieceTimeline":true,"triggerPieceInstanceId":"randomId9000_part0_0_randomId9003_randomId9000_piece001"}},{"id":"piece_group_randomId9000_part0_0_randomId9003_randomId9000_piece001","content":{"deviceType":"ABSTRACT","type":"group"},"children":[],"inGroup":"part_group_randomId9000_part0_0_randomId9003","isGroup":true,"objectType":"rundown","enable":{"start":"#piece_group_control_randomId9000_part0_0_randomId9003_randomId9000_piece001.start - 0","end":"#piece_group_control_randomId9000_part0_0_randomId9003_randomId9000_piece001.end + 0"},"layer":"","metaData":{"isPieceTimeline":true,"pieceInstanceGroupId":"randomId9000_part0_0_randomId9003_randomId9000_piece001"},"priority":0}]",
-    "timelineHash": "randomId9008",
+    "timelineHash": "randomId9006",
   },
 ]
 `;
@@ -57,7 +57,7 @@ exports[`Playout API Basic rundown control 3`] = `
       "studio": "asdf",
     },
     "timelineBlob": "[]",
-    "timelineHash": "randomId9010",
+    "timelineHash": "randomId9007",
   },
 ]
 `;
diff --git a/packages/job-worker/src/playout/__tests__/__snapshots__/timeline.test.ts.snap b/packages/job-worker/src/playout/__tests__/__snapshots__/timeline.test.ts.snap
index ef48638e9a..69c95348f7 100644
--- a/packages/job-worker/src/playout/__tests__/__snapshots__/timeline.test.ts.snap
+++ b/packages/job-worker/src/playout/__tests__/__snapshots__/timeline.test.ts.snap
@@ -12,7 +12,7 @@ exports[`Timeline Adlib pieces Current part with preroll 1`] = `
       "studio": "asdf",
     },
     "timelineBlob": "[]",
-    "timelineHash": "randomId9022",
+    "timelineHash": "randomId9013",
   },
 ]
 `;
@@ -29,7 +29,7 @@ exports[`Timeline Adlib pieces Current part with preroll and adlib preroll 1`] =
       "studio": "asdf",
     },
     "timelineBlob": "[]",
-    "timelineHash": "randomId9022",
+    "timelineHash": "randomId9013",
   },
 ]
 `;
@@ -46,7 +46,7 @@ exports[`Timeline Basic rundown 1`] = `
       "studio": "asdf",
     },
     "timelineBlob": "[{"id":"playlist_randomId9000_status","objectType":"rundown","enable":{"while":1},"layer":"rundown_status","content":{"deviceType":"ABSTRACT"},"classes":["rundown_active"],"priority":0},{"id":"part_group_randomId9000_part0_0_randomId9003","objectType":"rundown","enable":{"start":"now"},"priority":5,"layer":"","content":{"deviceType":"ABSTRACT","type":"group"},"children":[],"isGroup":true,"metaData":{"isPieceTimeline":true}},{"id":"part_group_firstobject_randomId9000_part0_0_randomId9003","objectType":"rundown","enable":{"start":0},"layer":"group_first_object","content":{"deviceType":"ABSTRACT","type":"callback","callBack":"partPlaybackStarted","callBackData":{"rundownPlaylistId":"playlist_randomId9000","partInstanceId":"randomId9000_part0_0_randomId9003"},"callBackStopped":"partPlaybackStopped"},"inGroup":"part_group_randomId9000_part0_0_randomId9003","classes":[],"priority":0},{"id":"piece_group_control_randomId9000_part0_0_randomId9003_randomId9000_piece001","objectType":"rundown","enable":{"start":0},"layer":"vt0","priority":5,"content":{"deviceType":"ABSTRACT","type":"callback","callBack":"piecePlaybackStarted","callBackData":{"rundownPlaylistId":"playlist_randomId9000","partInstanceId":"randomId9000_part0_0_randomId9003","pieceInstanceId":"randomId9000_part0_0_randomId9003_randomId9000_piece001","dynamicallyInserted":false},"callBackStopped":"piecePlaybackStopped"},"classes":["current_part"],"inGroup":"part_group_randomId9000_part0_0_randomId9003","metaData":{"isPieceTimeline":true,"triggerPieceInstanceId":"randomId9000_part0_0_randomId9003_randomId9000_piece001"}},{"id":"piece_group_randomId9000_part0_0_randomId9003_randomId9000_piece001","content":{"deviceType":"ABSTRACT","type":"group"},"children":[],"inGroup":"part_group_randomId9000_part0_0_randomId9003","isGroup":true,"objectType":"rundown","enable":{"start":"#piece_group_control_randomId9000_part0_0_randomId9003_randomId9000_piece001.start - 0","end":"#piece_group_control_randomId9000_part0_0_randomId9003_randomId9000_piece001.end + 0"},"layer":"","metaData":{"isPieceTimeline":true,"pieceInstanceGroupId":"randomId9000_part0_0_randomId9003_randomId9000_piece001"},"priority":0}]",
-    "timelineHash": "randomId9010",
+    "timelineHash": "randomId9007",
   },
 ]
 `;
@@ -63,7 +63,7 @@ exports[`Timeline Basic rundown 2`] = `
       "studio": "asdf",
     },
     "timelineBlob": "[]",
-    "timelineHash": "randomId9012",
+    "timelineHash": "randomId9008",
   },
 ]
 `;
@@ -80,7 +80,7 @@ exports[`Timeline In transitions Basic inTransition 1`] = `
       "studio": "asdf",
     },
     "timelineBlob": "[]",
-    "timelineHash": "randomId9014",
+    "timelineHash": "randomId9009",
   },
 ]
 `;
@@ -97,7 +97,7 @@ exports[`Timeline In transitions Basic inTransition with contentDelay + preroll
       "studio": "asdf",
     },
     "timelineBlob": "[]",
-    "timelineHash": "randomId9014",
+    "timelineHash": "randomId9009",
   },
 ]
 `;
@@ -114,7 +114,7 @@ exports[`Timeline In transitions Basic inTransition with contentDelay 1`] = `
       "studio": "asdf",
     },
     "timelineBlob": "[]",
-    "timelineHash": "randomId9014",
+    "timelineHash": "randomId9009",
   },
 ]
 `;
@@ -131,7 +131,7 @@ exports[`Timeline In transitions Basic inTransition with planned pieces 1`] = `
       "studio": "asdf",
     },
     "timelineBlob": "[]",
-    "timelineHash": "randomId9014",
+    "timelineHash": "randomId9009",
   },
 ]
 `;
@@ -148,7 +148,7 @@ exports[`Timeline In transitions Preroll 1`] = `
       "studio": "asdf",
     },
     "timelineBlob": "[]",
-    "timelineHash": "randomId9014",
+    "timelineHash": "randomId9009",
   },
 ]
 `;
@@ -165,7 +165,7 @@ exports[`Timeline In transitions inTransition disabled 1`] = `
       "studio": "asdf",
     },
     "timelineBlob": "[]",
-    "timelineHash": "randomId9014",
+    "timelineHash": "randomId9009",
   },
 ]
 `;
@@ -182,7 +182,7 @@ exports[`Timeline In transitions inTransition is disabled during hold 1`] = `
       "studio": "asdf",
     },
     "timelineBlob": "[]",
-    "timelineHash": "randomId9016",
+    "timelineHash": "randomId9010",
   },
 ]
 `;
@@ -199,7 +199,7 @@ exports[`Timeline In transitions inTransition with existing infinites 1`] = `
       "studio": "asdf",
     },
     "timelineBlob": "[]",
-    "timelineHash": "randomId9015",
+    "timelineHash": "randomId9010",
   },
 ]
 `;
@@ -216,7 +216,7 @@ exports[`Timeline In transitions inTransition with new infinite 1`] = `
       "studio": "asdf",
     },
     "timelineBlob": "[]",
-    "timelineHash": "randomId9015",
+    "timelineHash": "randomId9010",
   },
 ]
 `;
@@ -233,7 +233,7 @@ exports[`Timeline Infinite Pieces Infinite Piece has stable timing across timeli
       "studio": "asdf",
     },
     "timelineBlob": "[]",
-    "timelineHash": "randomId9016",
+    "timelineHash": "randomId9010",
   },
 ]
 `;
@@ -250,7 +250,7 @@ exports[`Timeline Out transitions Basic outTransition 1`] = `
       "studio": "asdf",
     },
     "timelineBlob": "[]",
-    "timelineHash": "randomId9014",
+    "timelineHash": "randomId9009",
   },
 ]
 `;
@@ -267,7 +267,7 @@ exports[`Timeline Out transitions outTransition + inTransition 1`] = `
       "studio": "asdf",
     },
     "timelineBlob": "[]",
-    "timelineHash": "randomId9014",
+    "timelineHash": "randomId9009",
   },
 ]
 `;
@@ -284,7 +284,7 @@ exports[`Timeline Out transitions outTransition + preroll (2) 1`] = `
       "studio": "asdf",
     },
     "timelineBlob": "[]",
-    "timelineHash": "randomId9014",
+    "timelineHash": "randomId9009",
   },
 ]
 `;
@@ -301,7 +301,7 @@ exports[`Timeline Out transitions outTransition + preroll 1`] = `
       "studio": "asdf",
     },
     "timelineBlob": "[]",
-    "timelineHash": "randomId9014",
+    "timelineHash": "randomId9009",
   },
 ]
 `;
@@ -318,7 +318,7 @@ exports[`Timeline Out transitions outTransition is disabled during hold 1`] = `
       "studio": "asdf",
     },
     "timelineBlob": "[]",
-    "timelineHash": "randomId9016",
+    "timelineHash": "randomId9010",
   },
 ]
 `;
diff --git a/packages/job-worker/src/playout/__tests__/helpers/rundowns.ts b/packages/job-worker/src/playout/__tests__/helpers/rundowns.ts
index 6cb21b9ba8..bc410b2897 100644
--- a/packages/job-worker/src/playout/__tests__/helpers/rundowns.ts
+++ b/packages/job-worker/src/playout/__tests__/helpers/rundowns.ts
@@ -71,7 +71,7 @@ export async function setupRundownBase(
 		_rank: 0,
 		externalId: 'MOCK_PART_0_0',
 		title: 'Part 0 0',
-		expectedDurationWithPreroll: undefined,
+		expectedDurationWithTransition: undefined,
 
 		...partPropsOverride,
 	}
@@ -141,7 +141,7 @@ export async function setupPart2(
 		_rank: 1,
 		externalId: 'MOCK_PART_0_1',
 		title: 'Part 0 1',
-		expectedDurationWithPreroll: undefined,
+		expectedDurationWithTransition: undefined,
 
 		...partPropsOverride,
 	}
diff --git a/packages/job-worker/src/playout/__tests__/playout.test.ts b/packages/job-worker/src/playout/__tests__/playout.test.ts
index 8a22271ee2..01c63b2d17 100644
--- a/packages/job-worker/src/playout/__tests__/playout.test.ts
+++ b/packages/job-worker/src/playout/__tests__/playout.test.ts
@@ -25,7 +25,6 @@ import { getSelectedPartInstances } from './lib'
 import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
 import { UserErrorMessage } from '@sofie-automation/corelib/dist/error'
 import * as peripheralDeviceLib from '../../peripheralDevice'
-import { sleep } from '@sofie-automation/corelib/dist/lib'
 import { protectString, unprotectString } from '@sofie-automation/corelib/dist/protectedString'
 import { AdLibPiece } from '@sofie-automation/corelib/dist/dataModel/AdLibPiece'
 import { DBPart } from '@sofie-automation/corelib/dist/dataModel/Part'
@@ -47,6 +46,7 @@ import { PieceLifespan } from '@sofie-automation/blueprints-integration'
 import { PlayoutChangedType } from '@sofie-automation/shared-lib/dist/peripheralDevice/peripheralDeviceAPI'
 import { ProcessedShowStyleCompound } from '../../jobs'
 import { handleOnPlayoutPlaybackChanged } from '../timings'
+import { sleep } from '@sofie-automation/shared-lib/dist/lib/lib'
 
 // const mockGetCurrentTime = jest.spyOn(lib, 'getCurrentTime')
 const mockExecutePeripheralDeviceFunction = jest
diff --git a/packages/job-worker/src/playout/__tests__/resolvedPieces.test.ts b/packages/job-worker/src/playout/__tests__/resolvedPieces.test.ts
index b748acfb01..32f6abde36 100644
--- a/packages/job-worker/src/playout/__tests__/resolvedPieces.test.ts
+++ b/packages/job-worker/src/playout/__tests__/resolvedPieces.test.ts
@@ -390,7 +390,7 @@ describe('Resolved Pieces', () => {
 					externalId: '',
 					title: '',
 
-					expectedDurationWithPreroll: undefined,
+					expectedDurationWithTransition: undefined,
 
 					...partProps,
 				},
diff --git a/packages/job-worker/src/playout/__tests__/selectNextPart.test.ts b/packages/job-worker/src/playout/__tests__/selectNextPart.test.ts
index ed8d44cd7f..2d5f84d4be 100644
--- a/packages/job-worker/src/playout/__tests__/selectNextPart.test.ts
+++ b/packages/job-worker/src/playout/__tests__/selectNextPart.test.ts
@@ -8,13 +8,15 @@ import { MockJobContext, setupDefaultJobEnvironment } from '../../__mocks__/cont
 import { PlayoutSegmentModelImpl } from '../model/implementation/PlayoutSegmentModelImpl'
 import { PlayoutSegmentModel } from '../model/PlayoutSegmentModel'
 import { selectNextPart } from '../selectNextPart'
+import { ForceQuickLoopAutoNext, QuickLoopMarkerType } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
 
 class MockPart {
 	constructor(
 		public _id: string,
 		public _rank: number,
 		public segmentId: SegmentId,
-		public playable: boolean = true
+		public playable: boolean = true,
+		public expectedDuration: number | undefined = undefined
 	) {}
 
 	get invalid(): boolean {
@@ -48,7 +50,7 @@ describe('selectNextPart', () => {
 
 		defaultPlaylist = {
 			queuedSegmentId: undefined,
-			loop: false,
+			quickLoop: undefined,
 		}
 
 		defaultParts = [
@@ -68,7 +70,8 @@ describe('selectNextPart', () => {
 	function selectNextPart2(
 		previousPartInstance: ReadonlyDeep<DBPartInstance> | null,
 		currentlySelectedPartInstance: ReadonlyDeep<DBPartInstance> | null,
-		ignoreUnplayabale = true
+		ignoreUnplayable = true,
+		ignoreQuickLoop = false
 	) {
 		const parts = [...(defaultParts as unknown as DBPart[])]
 		const segments: readonly PlayoutSegmentModel[] = defaultSegments.map(
@@ -86,7 +89,7 @@ describe('selectNextPart', () => {
 			currentlySelectedPartInstance,
 			segments,
 			parts,
-			ignoreUnplayabale
+			{ ignoreUnplayable, ignoreQuickLoop }
 		)
 	}
 
@@ -206,7 +209,13 @@ describe('selectNextPart', () => {
 
 		{
 			// no parts after, but looping
-			defaultPlaylist.loop = true
+			defaultPlaylist.quickLoop = {
+				start: { type: QuickLoopMarkerType.PLAYLIST },
+				end: { type: QuickLoopMarkerType.PLAYLIST },
+				running: true,
+				forceAutoNext: ForceQuickLoopAutoNext.DISABLED,
+				locked: false,
+			}
 			defaultParts = defaultParts.filter((p) => p.segmentId !== segment3)
 			const nextPart = selectNextPart2(previousPartInstance, null)
 			expect(nextPart).toEqual({ index: 0, part: defaultParts[0], consumesQueuedSegmentId: false })
@@ -228,4 +237,184 @@ describe('selectNextPart', () => {
 			expect(nextPart).toEqual({ index: 5, part: defaultParts[5], consumesQueuedSegmentId: false })
 		}
 	})
+
+	test('from End part in QuickLoop', () => {
+		const previousPartInstance = defaultParts[5].toPartInstance()
+		{
+			// Start in previous segment
+			defaultPlaylist.quickLoop = {
+				forceAutoNext: ForceQuickLoopAutoNext.DISABLED,
+				locked: false,
+				running: true,
+				start: {
+					type: QuickLoopMarkerType.PART,
+					id: protectString(defaultParts[2]._id),
+				},
+				end: {
+					type: QuickLoopMarkerType.PART,
+					id: protectString(defaultParts[5]._id),
+				},
+			}
+			const nextPart = selectNextPart2(previousPartInstance, null)
+			expect(nextPart).toEqual({ index: 2, part: defaultParts[2], consumesQueuedSegmentId: false })
+		}
+
+		{
+			// Start in the same segment
+			defaultPlaylist.quickLoop = {
+				forceAutoNext: ForceQuickLoopAutoNext.DISABLED,
+				locked: false,
+				running: true,
+				start: {
+					type: QuickLoopMarkerType.PART,
+					id: protectString(defaultParts[4]._id),
+				},
+				end: {
+					type: QuickLoopMarkerType.PART,
+					id: protectString(defaultParts[5]._id),
+				},
+			}
+			const nextPart = selectNextPart2(previousPartInstance, null)
+			expect(nextPart).toEqual({ index: 4, part: defaultParts[4], consumesQueuedSegmentId: false })
+		}
+
+		{
+			// Start is End
+			defaultPlaylist.quickLoop = {
+				forceAutoNext: ForceQuickLoopAutoNext.DISABLED,
+				locked: false,
+				running: true,
+				start: {
+					type: QuickLoopMarkerType.PART,
+					id: protectString(defaultParts[5]._id),
+				},
+				end: {
+					type: QuickLoopMarkerType.PART,
+					id: protectString(defaultParts[5]._id),
+				},
+			}
+			const nextPart = selectNextPart2(previousPartInstance, null)
+			expect(nextPart).toEqual({ index: 5, part: defaultParts[5], consumesQueuedSegmentId: false })
+		}
+
+		{
+			// Start is the Playlist
+			defaultPlaylist.quickLoop = {
+				forceAutoNext: ForceQuickLoopAutoNext.DISABLED,
+				locked: false,
+				running: true,
+				start: {
+					type: QuickLoopMarkerType.PLAYLIST,
+				},
+				end: {
+					type: QuickLoopMarkerType.PART,
+					id: protectString(defaultParts[5]._id),
+				},
+			}
+			const nextPart = selectNextPart2(previousPartInstance, null)
+			expect(nextPart).toEqual({ index: 0, part: defaultParts[0], consumesQueuedSegmentId: false })
+		}
+	})
+
+	test('from last part when End Marker is PLAYLIST', () => {
+		const previousPartInstance = defaultParts[defaultParts.length - 1].toPartInstance()
+
+		{
+			// Start is a Part
+			defaultPlaylist.quickLoop = {
+				forceAutoNext: ForceQuickLoopAutoNext.DISABLED,
+				locked: false,
+				running: true,
+				start: {
+					type: QuickLoopMarkerType.PART,
+					id: protectString(defaultParts[2]._id),
+				},
+				end: {
+					type: QuickLoopMarkerType.PLAYLIST,
+				},
+			}
+			const nextPart = selectNextPart2(previousPartInstance, null)
+			expect(nextPart).toEqual({ index: 2, part: defaultParts[2], consumesQueuedSegmentId: false })
+		}
+
+		{
+			// Start is Playlist
+			defaultPlaylist.quickLoop = {
+				forceAutoNext: ForceQuickLoopAutoNext.DISABLED,
+				locked: false,
+				running: true,
+				start: {
+					type: QuickLoopMarkerType.PLAYLIST,
+				},
+				end: {
+					type: QuickLoopMarkerType.PLAYLIST,
+				},
+			}
+			const nextPart = selectNextPart2(previousPartInstance, null)
+			expect(nextPart).toEqual({ index: 0, part: defaultParts[0], consumesQueuedSegmentId: false })
+		}
+	})
+
+	test('from within QuickLoop', () => {
+		const previousPartInstance = defaultParts[4].toPartInstance()
+		{
+			// default
+			defaultPlaylist.quickLoop = {
+				forceAutoNext: ForceQuickLoopAutoNext.DISABLED,
+				locked: false,
+				running: true,
+				start: {
+					type: QuickLoopMarkerType.PART,
+					id: protectString(defaultParts[2]._id),
+				},
+				end: {
+					type: QuickLoopMarkerType.PART,
+					id: protectString(defaultParts[5]._id),
+				},
+			}
+			const nextPart = selectNextPart2(previousPartInstance, null)
+			expect(nextPart).toEqual({ index: 5, part: defaultParts[5], consumesQueuedSegmentId: false })
+		}
+
+		{
+			// next is unplayable
+			defaultPlaylist.quickLoop = {
+				forceAutoNext: ForceQuickLoopAutoNext.DISABLED,
+				locked: false,
+				running: true,
+				start: {
+					type: QuickLoopMarkerType.PART,
+					id: protectString(defaultParts[4]._id),
+				},
+				end: {
+					type: QuickLoopMarkerType.PART,
+					id: protectString(defaultParts[6]._id),
+				},
+			}
+			defaultParts[5].playable = false
+			const nextPart = selectNextPart2(previousPartInstance, null)
+			expect(nextPart).toEqual({ index: 6, part: defaultParts[6], consumesQueuedSegmentId: false })
+		}
+
+		{
+			// next does not have valid duration for ENABLED_WHEN_VALID_DURATION
+			defaultPlaylist.quickLoop = {
+				forceAutoNext: ForceQuickLoopAutoNext.ENABLED_WHEN_VALID_DURATION,
+				locked: false,
+				running: true,
+				start: {
+					type: QuickLoopMarkerType.PART,
+					id: protectString(defaultParts[4]._id),
+				},
+				end: {
+					type: QuickLoopMarkerType.PART,
+					id: protectString(defaultParts[6]._id),
+				},
+			}
+			defaultParts[5].expectedDuration = undefined
+			defaultParts[6].expectedDuration = 1000
+			const nextPart = selectNextPart2(previousPartInstance, null)
+			expect(nextPart).toEqual({ index: 6, part: defaultParts[6], consumesQueuedSegmentId: false })
+		}
+	})
 })
diff --git a/packages/job-worker/src/playout/__tests__/timeline.test.ts b/packages/job-worker/src/playout/__tests__/timeline.test.ts
index db9aa4453d..4727283ecb 100644
--- a/packages/job-worker/src/playout/__tests__/timeline.test.ts
+++ b/packages/job-worker/src/playout/__tests__/timeline.test.ts
@@ -65,6 +65,8 @@ import * as _ from 'underscore'
 import { PlayoutRundownModel } from '../model/PlayoutRundownModel'
 import { PlayoutPartInstanceModel } from '../model/PlayoutPartInstanceModel'
 import { PlayoutPartInstanceModelImpl } from '../model/implementation/PlayoutPartInstanceModelImpl'
+import { mock } from 'jest-mock-extended'
+import { QuickLoopService } from '../model/services/QuickLoopService'
 
 /**
  * An object used to represent the simplified timeline structure.
@@ -710,7 +712,7 @@ describe('Timeline', () => {
 				const pieceInstances = await context.directCollections.PieceInstances.findFetch({
 					partInstanceId: partInstance?._id,
 				})
-				return new PlayoutPartInstanceModelImpl(partInstance, pieceInstances, false)
+				return new PlayoutPartInstanceModelImpl(partInstance, pieceInstances, false, mock<QuickLoopService>())
 			}
 
 			return {
@@ -1240,7 +1242,7 @@ describe('Timeline', () => {
 						})
 					)
 
-					const adlibbedPieceId = 'randomId9010'
+					const adlibbedPieceId = 'randomId9007'
 
 					// The adlib should be starting at 'now'
 					await checkTimings({
@@ -1406,7 +1408,7 @@ describe('Timeline', () => {
 						})
 					)
 
-					const adlibbedPieceId = 'randomId9010'
+					const adlibbedPieceId = 'randomId9007'
 
 					// The adlib should be starting at 'now'
 					await checkTimings({
@@ -1454,6 +1456,8 @@ describe('Timeline', () => {
 					// Simulate the piece timing confirmation from playout-gateway
 					await doSimulatePiecePlaybackTimings(playlistId, pieceOffset, 2)
 
+					const pieceOffsetWithPreroll = pieceOffset + 340
+
 					// Now we have a concrete time
 					await checkTimings({
 						previousPart: null,
@@ -1461,7 +1465,7 @@ describe('Timeline', () => {
 							piece000: {
 								controlObj: {
 									start: 500, // This one gave the preroll
-									end: pieceOffset,
+									end: pieceOffsetWithPreroll,
 								},
 								childGroup: {
 									preroll: 500,
@@ -1480,7 +1484,7 @@ describe('Timeline', () => {
 							[adlibbedPieceId]: {
 								// Our adlibbed piece
 								controlObj: {
-									start: pieceOffset,
+									start: pieceOffsetWithPreroll,
 								},
 								childGroup: {
 									preroll: 340,
diff --git a/packages/job-worker/src/playout/abPlayback/__tests__/abPlayback.spec.ts b/packages/job-worker/src/playout/abPlayback/__tests__/abPlayback.spec.ts
index 186593aeca..e6ac20f779 100644
--- a/packages/job-worker/src/playout/abPlayback/__tests__/abPlayback.spec.ts
+++ b/packages/job-worker/src/playout/abPlayback/__tests__/abPlayback.spec.ts
@@ -1,4 +1,10 @@
-import { ABResolverOptions, IBlueprintPieceType, PieceLifespan } from '@sofie-automation/blueprints-integration'
+import {
+	AbPlayerId,
+	ABResolverOptions,
+	IBlueprintPieceType,
+	PieceAbSessionInfo,
+	PieceLifespan,
+} from '@sofie-automation/blueprints-integration'
 import { EmptyPieceTimelineObjectsBlob } from '@sofie-automation/corelib/dist/dataModel/Piece'
 import { PieceInstancePiece, ResolvedPieceInstance } from '@sofie-automation/corelib/dist/dataModel/PieceInstance'
 import { ABSessionAssignments } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
@@ -21,7 +27,8 @@ function createBasicResolvedPieceInstance(
 	start: number,
 	duration: number | undefined,
 	reqId: string | undefined,
-	optional?: boolean
+	optional?: boolean,
+	uniqueSessionName?: boolean
 ): ResolvedPieceInstance {
 	const piece = literal<PieceInstancePiece>({
 		_id: protectString(id),
@@ -47,6 +54,7 @@ function createBasicResolvedPieceInstance(
 				sessionName: reqId,
 				poolName: POOL_NAME,
 				optional: optional,
+				sessionNameIsGloballyUnique: uniqueSessionName,
 			},
 		]
 	}
@@ -72,7 +80,7 @@ function resolveAbSessions(
 	timelineObjs: OnGenerateTimelineObjExt[],
 	previousAssignmentMap: ABSessionAssignments,
 	sessionPool: string,
-	playerIds: Array<number | string>,
+	playerIds: Array<AbPlayerId>,
 	now: number
 ): AssignmentResult {
 	const sessionRequests = calculateSessionTimeRanges(
@@ -120,7 +128,9 @@ describe('resolveMediaPlayers', () => {
 			createBasicResolvedPieceInstance('2', 800, 4000, 'ghi'),
 		]
 
-		mockGetPieceSessionId.mockImplementation((piece, name) => `${piece._id}_${name}`)
+		mockGetPieceSessionId.mockImplementation(
+			(piece, session) => `${piece._id}_${session.poolName}_${session.sessionName}`
+		)
 
 		const assignments = resolveAbSessions(
 			abSessionHelper,
@@ -143,9 +153,18 @@ describe('resolveMediaPlayers', () => {
 
 		expect(mockGetPieceSessionId).toHaveBeenCalledTimes(3)
 		expect(mockGetObjectSessionId).toHaveBeenCalledTimes(0)
-		expect(mockGetPieceSessionId).toHaveBeenNthCalledWith(1, pieces[0].instance, 'clip_abc')
-		expect(mockGetPieceSessionId).toHaveBeenNthCalledWith(2, pieces[1].instance, 'clip_def')
-		expect(mockGetPieceSessionId).toHaveBeenNthCalledWith(3, pieces[2].instance, 'clip_ghi')
+		expect(mockGetPieceSessionId).toHaveBeenNthCalledWith(1, pieces[0].instance, {
+			poolName: 'clip',
+			sessionName: 'abc',
+		} satisfies PieceAbSessionInfo)
+		expect(mockGetPieceSessionId).toHaveBeenNthCalledWith(2, pieces[1].instance, {
+			poolName: 'clip',
+			sessionName: 'def',
+		} satisfies PieceAbSessionInfo)
+		expect(mockGetPieceSessionId).toHaveBeenNthCalledWith(3, pieces[2].instance, {
+			poolName: 'clip',
+			sessionName: 'ghi',
+		} satisfies PieceAbSessionInfo)
 	})
 
 	test('basic pieces - players with string Ids', () => {
@@ -156,7 +175,9 @@ describe('resolveMediaPlayers', () => {
 			createBasicResolvedPieceInstance('2', 800, 4000, 'ghi'),
 		]
 
-		mockGetPieceSessionId.mockImplementation((piece, name) => `${piece._id}_${name}`)
+		mockGetPieceSessionId.mockImplementation(
+			(piece, session) => `${piece._id}_${session.poolName}_${session.sessionName}`
+		)
 
 		const assignments = resolveAbSessions(
 			abSessionHelper,
@@ -179,9 +200,18 @@ describe('resolveMediaPlayers', () => {
 
 		expect(mockGetPieceSessionId).toHaveBeenCalledTimes(3)
 		expect(mockGetObjectSessionId).toHaveBeenCalledTimes(0)
-		expect(mockGetPieceSessionId).toHaveBeenNthCalledWith(1, pieces[0].instance, 'clip_abc')
-		expect(mockGetPieceSessionId).toHaveBeenNthCalledWith(2, pieces[1].instance, 'clip_def')
-		expect(mockGetPieceSessionId).toHaveBeenNthCalledWith(3, pieces[2].instance, 'clip_ghi')
+		expect(mockGetPieceSessionId).toHaveBeenNthCalledWith(1, pieces[0].instance, {
+			poolName: 'clip',
+			sessionName: 'abc',
+		} satisfies PieceAbSessionInfo)
+		expect(mockGetPieceSessionId).toHaveBeenNthCalledWith(2, pieces[1].instance, {
+			poolName: 'clip',
+			sessionName: 'def',
+		} satisfies PieceAbSessionInfo)
+		expect(mockGetPieceSessionId).toHaveBeenNthCalledWith(3, pieces[2].instance, {
+			poolName: 'clip',
+			sessionName: 'ghi',
+		} satisfies PieceAbSessionInfo)
 	})
 
 	test('basic pieces - players with number and string Ids', () => {
@@ -192,7 +222,9 @@ describe('resolveMediaPlayers', () => {
 			createBasicResolvedPieceInstance('2', 800, 4000, 'ghi'),
 		]
 
-		mockGetPieceSessionId.mockImplementation((piece, name) => `${piece._id}_${name}`)
+		mockGetPieceSessionId.mockImplementation(
+			(piece, session) => `${piece._id}_${session.poolName}_${session.sessionName}`
+		)
 
 		const assignments = resolveAbSessions(
 			abSessionHelper,
@@ -215,9 +247,18 @@ describe('resolveMediaPlayers', () => {
 
 		expect(mockGetPieceSessionId).toHaveBeenCalledTimes(3)
 		expect(mockGetObjectSessionId).toHaveBeenCalledTimes(0)
-		expect(mockGetPieceSessionId).toHaveBeenNthCalledWith(1, pieces[0].instance, 'clip_abc')
-		expect(mockGetPieceSessionId).toHaveBeenNthCalledWith(2, pieces[1].instance, 'clip_def')
-		expect(mockGetPieceSessionId).toHaveBeenNthCalledWith(3, pieces[2].instance, 'clip_ghi')
+		expect(mockGetPieceSessionId).toHaveBeenNthCalledWith(1, pieces[0].instance, {
+			poolName: 'clip',
+			sessionName: 'abc',
+		} satisfies PieceAbSessionInfo)
+		expect(mockGetPieceSessionId).toHaveBeenNthCalledWith(2, pieces[1].instance, {
+			poolName: 'clip',
+			sessionName: 'def',
+		} satisfies PieceAbSessionInfo)
+		expect(mockGetPieceSessionId).toHaveBeenNthCalledWith(3, pieces[2].instance, {
+			poolName: 'clip',
+			sessionName: 'ghi',
+		} satisfies PieceAbSessionInfo)
 	})
 
 	test('Multiple pieces same id', () => {
@@ -229,7 +270,7 @@ describe('resolveMediaPlayers', () => {
 			createBasicResolvedPieceInstance('3', 6400, 1000, 'abc'), // Gap before
 		]
 
-		mockGetPieceSessionId.mockImplementation((_piece, name) => `tmp_${name}`)
+		mockGetPieceSessionId.mockImplementation((_piece, session) => `tmp_${session.poolName}_${session.sessionName}`)
 
 		const assignments = resolveAbSessions(
 			abSessionHelper,
@@ -250,10 +291,22 @@ describe('resolveMediaPlayers', () => {
 
 		expect(mockGetPieceSessionId).toHaveBeenCalledTimes(4)
 		expect(mockGetObjectSessionId).toHaveBeenCalledTimes(0)
-		expect(mockGetPieceSessionId).toHaveBeenNthCalledWith(1, pieces[0].instance, 'clip_abc')
-		expect(mockGetPieceSessionId).toHaveBeenNthCalledWith(2, pieces[1].instance, 'clip_abc')
-		expect(mockGetPieceSessionId).toHaveBeenNthCalledWith(3, pieces[2].instance, 'clip_abc')
-		expect(mockGetPieceSessionId).toHaveBeenNthCalledWith(4, pieces[3].instance, 'clip_abc')
+		expect(mockGetPieceSessionId).toHaveBeenNthCalledWith(1, pieces[0].instance, {
+			poolName: 'clip',
+			sessionName: 'abc',
+		} satisfies PieceAbSessionInfo)
+		expect(mockGetPieceSessionId).toHaveBeenNthCalledWith(2, pieces[1].instance, {
+			poolName: 'clip',
+			sessionName: 'abc',
+		} satisfies PieceAbSessionInfo)
+		expect(mockGetPieceSessionId).toHaveBeenNthCalledWith(3, pieces[2].instance, {
+			poolName: 'clip',
+			sessionName: 'abc',
+		} satisfies PieceAbSessionInfo)
+		expect(mockGetPieceSessionId).toHaveBeenNthCalledWith(4, pieces[3].instance, {
+			poolName: 'clip',
+			sessionName: 'abc',
+		} satisfies PieceAbSessionInfo)
 	})
 
 	test('Reuse after gap', () => {
@@ -264,7 +317,9 @@ describe('resolveMediaPlayers', () => {
 			createBasicResolvedPieceInstance('3', 6400, 1000, 'ghi'), // Wait, then reuse first
 		]
 
-		mockGetPieceSessionId.mockImplementation((piece, name) => `${piece._id}_${name}`)
+		mockGetPieceSessionId.mockImplementation(
+			(piece, session) => `${piece._id}_${session.poolName}_${session.sessionName}`
+		)
 
 		const assignments = resolveAbSessions(
 			abSessionHelper,
@@ -287,9 +342,18 @@ describe('resolveMediaPlayers', () => {
 
 		expect(mockGetPieceSessionId).toHaveBeenCalledTimes(3)
 		expect(mockGetObjectSessionId).toHaveBeenCalledTimes(0)
-		expect(mockGetPieceSessionId).toHaveBeenNthCalledWith(1, pieces[0].instance, 'clip_abc')
-		expect(mockGetPieceSessionId).toHaveBeenNthCalledWith(2, pieces[1].instance, 'clip_def')
-		expect(mockGetPieceSessionId).toHaveBeenNthCalledWith(3, pieces[2].instance, 'clip_ghi')
+		expect(mockGetPieceSessionId).toHaveBeenNthCalledWith(1, pieces[0].instance, {
+			poolName: 'clip',
+			sessionName: 'abc',
+		} satisfies PieceAbSessionInfo)
+		expect(mockGetPieceSessionId).toHaveBeenNthCalledWith(2, pieces[1].instance, {
+			poolName: 'clip',
+			sessionName: 'def',
+		} satisfies PieceAbSessionInfo)
+		expect(mockGetPieceSessionId).toHaveBeenNthCalledWith(3, pieces[2].instance, {
+			poolName: 'clip',
+			sessionName: 'ghi',
+		} satisfies PieceAbSessionInfo)
 	})
 
 	test('Reuse immediately', () => {
@@ -300,7 +364,9 @@ describe('resolveMediaPlayers', () => {
 			createBasicResolvedPieceInstance('3', 5400, 1000, 'ghi'), // Wait, then reuse first
 		]
 
-		mockGetPieceSessionId.mockImplementation((piece, name) => `${piece._id}_${name}`)
+		mockGetPieceSessionId.mockImplementation(
+			(piece, session) => `${piece._id}_${session.poolName}_${session.sessionName}`
+		)
 
 		const assignments = resolveAbSessions(
 			abSessionHelper,
@@ -323,9 +389,18 @@ describe('resolveMediaPlayers', () => {
 
 		expect(mockGetPieceSessionId).toHaveBeenCalledTimes(3)
 		expect(mockGetObjectSessionId).toHaveBeenCalledTimes(0)
-		expect(mockGetPieceSessionId).toHaveBeenNthCalledWith(1, pieces[0].instance, 'clip_abc')
-		expect(mockGetPieceSessionId).toHaveBeenNthCalledWith(2, pieces[1].instance, 'clip_def')
-		expect(mockGetPieceSessionId).toHaveBeenNthCalledWith(3, pieces[2].instance, 'clip_ghi')
+		expect(mockGetPieceSessionId).toHaveBeenNthCalledWith(1, pieces[0].instance, {
+			poolName: 'clip',
+			sessionName: 'abc',
+		} satisfies PieceAbSessionInfo)
+		expect(mockGetPieceSessionId).toHaveBeenNthCalledWith(2, pieces[1].instance, {
+			poolName: 'clip',
+			sessionName: 'def',
+		} satisfies PieceAbSessionInfo)
+		expect(mockGetPieceSessionId).toHaveBeenNthCalledWith(3, pieces[2].instance, {
+			poolName: 'clip',
+			sessionName: 'ghi',
+		} satisfies PieceAbSessionInfo)
 	})
 
 	test('Reuse immediately dense', () => {
@@ -336,7 +411,9 @@ describe('resolveMediaPlayers', () => {
 			createBasicResolvedPieceInstance('3', 5400, 1000, 'ghi'), // Wait, then reuse first
 		]
 
-		mockGetPieceSessionId.mockImplementation((piece, name) => `${piece._id}_${name}`)
+		mockGetPieceSessionId.mockImplementation(
+			(piece, session) => `${piece._id}_${session.poolName}_${session.sessionName}`
+		)
 
 		const assignments = resolveAbSessions(
 			abSessionHelper,
@@ -359,9 +436,18 @@ describe('resolveMediaPlayers', () => {
 
 		expect(mockGetPieceSessionId).toHaveBeenCalledTimes(3)
 		expect(mockGetObjectSessionId).toHaveBeenCalledTimes(0)
-		expect(mockGetPieceSessionId).toHaveBeenNthCalledWith(1, pieces[0].instance, 'clip_abc')
-		expect(mockGetPieceSessionId).toHaveBeenNthCalledWith(2, pieces[1].instance, 'clip_def')
-		expect(mockGetPieceSessionId).toHaveBeenNthCalledWith(3, pieces[2].instance, 'clip_ghi')
+		expect(mockGetPieceSessionId).toHaveBeenNthCalledWith(1, pieces[0].instance, {
+			poolName: 'clip',
+			sessionName: 'abc',
+		} satisfies PieceAbSessionInfo)
+		expect(mockGetPieceSessionId).toHaveBeenNthCalledWith(2, pieces[1].instance, {
+			poolName: 'clip',
+			sessionName: 'def',
+		} satisfies PieceAbSessionInfo)
+		expect(mockGetPieceSessionId).toHaveBeenNthCalledWith(3, pieces[2].instance, {
+			poolName: 'clip',
+			sessionName: 'ghi',
+		} satisfies PieceAbSessionInfo)
 	})
 
 	test('basic reassignment', () => {
@@ -373,7 +459,7 @@ describe('resolveMediaPlayers', () => {
 			},
 			inst_1_clip_def: {
 				sessionId: 'inst_1_clip_def',
-				playerId: 3,
+				playerId: 1,
 				lookahead: true,
 			},
 		}
@@ -383,7 +469,9 @@ describe('resolveMediaPlayers', () => {
 			createBasicResolvedPieceInstance('2', 2800, 4000, 'ghi'),
 		]
 
-		mockGetPieceSessionId.mockImplementation((piece, name) => `${piece._id}_${name}`)
+		mockGetPieceSessionId.mockImplementation(
+			(piece, session) => `${piece._id}_${session.poolName}_${session.sessionName}`
+		)
 
 		const assignments = resolveAbSessions(
 			abSessionHelper,
@@ -395,20 +483,29 @@ describe('resolveMediaPlayers', () => {
 			[1, 2],
 			0
 		)
-		expect(assignments.failedRequired).toHaveLength(0)
+		expect(assignments.failedRequired).toEqual(['inst_2_clip_ghi'])
 		expect(assignments.failedOptional).toHaveLength(0)
 		expect(assignments.requests).toHaveLength(3)
 		expect(assignments.requests).toEqual([
-			{ end: 7400, id: 'inst_0_clip_abc', playerId: 5, start: 2400, optional: false },
-			{ end: 7400, id: 'inst_1_clip_def', playerId: 3, start: 2400, optional: false },
-			{ end: 6800, id: 'inst_2_clip_ghi', playerId: 1, start: 2800, optional: false },
+			{ end: 7400, id: 'inst_0_clip_abc', playerId: 2, start: 2400, optional: false },
+			{ end: 7400, id: 'inst_1_clip_def', playerId: 1, start: 2400, optional: false },
+			{ end: 6800, id: 'inst_2_clip_ghi', playerId: undefined, start: 2800, optional: false },
 		])
 
 		expect(mockGetPieceSessionId).toHaveBeenCalledTimes(3)
 		expect(mockGetObjectSessionId).toHaveBeenCalledTimes(0)
-		expect(mockGetPieceSessionId).toHaveBeenNthCalledWith(1, pieces[0].instance, 'clip_abc')
-		expect(mockGetPieceSessionId).toHaveBeenNthCalledWith(2, pieces[1].instance, 'clip_def')
-		expect(mockGetPieceSessionId).toHaveBeenNthCalledWith(3, pieces[2].instance, 'clip_ghi')
+		expect(mockGetPieceSessionId).toHaveBeenNthCalledWith(1, pieces[0].instance, {
+			poolName: 'clip',
+			sessionName: 'abc',
+		} satisfies PieceAbSessionInfo)
+		expect(mockGetPieceSessionId).toHaveBeenNthCalledWith(2, pieces[1].instance, {
+			poolName: 'clip',
+			sessionName: 'def',
+		} satisfies PieceAbSessionInfo)
+		expect(mockGetPieceSessionId).toHaveBeenNthCalledWith(3, pieces[2].instance, {
+			poolName: 'clip',
+			sessionName: 'ghi',
+		} satisfies PieceAbSessionInfo)
 	})
 
 	test('optional gets discarded', () => {
@@ -430,7 +527,9 @@ describe('resolveMediaPlayers', () => {
 			createBasicResolvedPieceInstance('2', 2800, 4000, 'ghi'),
 		]
 
-		mockGetPieceSessionId.mockImplementation((piece, name) => `${piece._id}_${name}`)
+		mockGetPieceSessionId.mockImplementation(
+			(piece, session) => `${piece._id}_${session.poolName}_${session.sessionName}`
+		)
 
 		const assignments = resolveAbSessions(
 			abSessionHelper,
@@ -453,9 +552,19 @@ describe('resolveMediaPlayers', () => {
 
 		expect(mockGetPieceSessionId).toHaveBeenCalledTimes(3)
 		expect(mockGetObjectSessionId).toHaveBeenCalledTimes(0)
-		expect(mockGetPieceSessionId).toHaveBeenNthCalledWith(1, pieces[0].instance, 'clip_abc')
-		expect(mockGetPieceSessionId).toHaveBeenNthCalledWith(2, pieces[1].instance, 'clip_def')
-		expect(mockGetPieceSessionId).toHaveBeenNthCalledWith(3, pieces[2].instance, 'clip_ghi')
+		expect(mockGetPieceSessionId).toHaveBeenNthCalledWith(1, pieces[0].instance, {
+			poolName: 'clip',
+			sessionName: 'abc',
+		} satisfies PieceAbSessionInfo)
+		expect(mockGetPieceSessionId).toHaveBeenNthCalledWith(2, pieces[1].instance, {
+			poolName: 'clip',
+			sessionName: 'def',
+			optional: true,
+		} satisfies PieceAbSessionInfo)
+		expect(mockGetPieceSessionId).toHaveBeenNthCalledWith(3, pieces[2].instance, {
+			poolName: 'clip',
+			sessionName: 'ghi',
+		} satisfies PieceAbSessionInfo)
 	})
 
 	// TODO add some tests which check lookahead
diff --git a/packages/job-worker/src/playout/abPlayback/__tests__/abPlaybackResolver.spec.ts b/packages/job-worker/src/playout/abPlayback/__tests__/abPlaybackResolver.spec.ts
index 7b35da41d8..cf961f0490 100644
--- a/packages/job-worker/src/playout/abPlayback/__tests__/abPlaybackResolver.spec.ts
+++ b/packages/job-worker/src/playout/abPlayback/__tests__/abPlaybackResolver.spec.ts
@@ -394,6 +394,47 @@ describe('resolveAbAssignmentsFromRequests', () => {
 		expectGotPlayer(res, 'c', undefined)
 		expectGotPlayer(res, 'd', undefined)
 	})
+	test('Run timed adlib bts', () => {
+		const requests: SessionRequest[] = [
+			// current part
+			{
+				id: 'a',
+				start: 1000,
+				end: 10500,
+				playerId: 2,
+			},
+			// adlib
+			{
+				id: 'b',
+				start: 10000,
+				end: 15000,
+			},
+			// lookaheads (in order of future use)
+			{
+				id: 'c',
+				start: Number.POSITIVE_INFINITY,
+				end: undefined,
+				playerId: 1,
+				lookaheadRank: 1,
+			},
+			{
+				id: 'd',
+				start: Number.POSITIVE_INFINITY,
+				end: undefined,
+				playerId: 2,
+				lookaheadRank: 2,
+			},
+		]
+
+		const res = resolveAbAssignmentsFromRequests(resolverOptions, TWO_SLOTS, requests, 10000)
+		expect(res).toBeTruthy()
+		expect(res.failedOptional).toEqual([])
+		expect(res.failedRequired).toEqual([])
+		expectGotPlayer(res, 'a', 2)
+		expectGotPlayer(res, 'b', 1)
+		expectGotPlayer(res, 'c', 2) // moved so that it alternates
+		expectGotPlayer(res, 'd', 1)
+	})
 
 	test('Autonext run bts', () => {
 		const requests: SessionRequest[] = [
@@ -587,4 +628,149 @@ describe('resolveAbAssignmentsFromRequests', () => {
 		expectGotPlayer(res, 'e', 3)
 		expectGotPlayer(res, 'f', undefined)
 	})
+
+	describe('add/remove players', () => {
+		test('reshuffle lookahead when removing player', () => {
+			const requests: SessionRequest[] = [
+				// current clip
+				{
+					id: 'a',
+					start: 1000,
+					end: undefined,
+					playerId: 2,
+				},
+				// previous clip
+				{
+					id: 'b',
+					start: 0,
+					playerId: 1,
+					end: 5000,
+				},
+				// lookaheads
+				{
+					id: 'd',
+					start: Number.POSITIVE_INFINITY,
+					end: undefined,
+					lookaheadRank: 1,
+					playerId: 1,
+				},
+				{
+					id: 'e',
+					start: Number.POSITIVE_INFINITY,
+					playerId: 3, // From before
+					end: undefined,
+					lookaheadRank: 2,
+				},
+				{
+					id: 'f',
+					start: Number.POSITIVE_INFINITY,
+					end: undefined,
+					lookaheadRank: 3,
+					playerId: 2,
+				},
+			]
+
+			const res = resolveAbAssignmentsFromRequests(resolverOptions, TWO_SLOTS, requests, 10000)
+			expect(res).toBeTruthy()
+			expect(res.failedOptional).toEqual([])
+			expect(res.failedRequired).toEqual([])
+			expectGotPlayer(res, 'a', 2)
+			expectGotPlayer(res, 'b', 1)
+			expectGotPlayer(res, 'd', 1)
+			expectGotPlayer(res, 'e', undefined)
+			expectGotPlayer(res, 'f', undefined)
+		})
+
+		test('reshuffle current when removing player', () => {
+			const requests: SessionRequest[] = [
+				// current clip
+				{
+					id: 'a',
+					start: 1000,
+					end: undefined,
+					playerId: 3,
+				},
+				// previous clip
+				{
+					id: 'b',
+					start: 0,
+					playerId: 1,
+					end: 5000,
+				},
+				// lookaheads
+				{
+					id: 'd',
+					start: Number.POSITIVE_INFINITY,
+					end: undefined,
+					lookaheadRank: 1,
+					playerId: 1,
+				},
+				{
+					id: 'e',
+					start: Number.POSITIVE_INFINITY,
+					playerId: 2,
+					end: undefined,
+					lookaheadRank: 2,
+				},
+			]
+
+			const res = resolveAbAssignmentsFromRequests(resolverOptions, TWO_SLOTS, requests, 10000)
+			expect(res).toBeTruthy()
+			expect(res.failedOptional).toEqual([])
+			expect(res.failedRequired).toEqual([])
+			expectGotPlayer(res, 'a', 2)
+			expectGotPlayer(res, 'b', 1)
+			expectGotPlayer(res, 'd', 1)
+			expectGotPlayer(res, 'e', undefined)
+		})
+
+		test('add player allows distributing timed clips', () => {
+			const requests: SessionRequest[] = [
+				// current clip
+				{
+					id: 'a',
+					start: 1000,
+					end: 11000,
+					playerId: 1,
+				},
+				{
+					id: 'b',
+					start: 13000, // soon
+					end: undefined,
+					playerId: 1,
+				},
+				{
+					id: 'c',
+					start: 1000,
+					end: undefined,
+					playerId: 2,
+				},
+				// lookaheads
+				{
+					id: 'd',
+					start: Number.POSITIVE_INFINITY,
+					end: undefined,
+					lookaheadRank: 1,
+					playerId: 1,
+				},
+				{
+					id: 'e',
+					start: Number.POSITIVE_INFINITY,
+					playerId: 2,
+					end: undefined,
+					lookaheadRank: 2,
+				},
+			]
+
+			const res = resolveAbAssignmentsFromRequests(resolverOptions, THREE_SLOTS, requests, 10000)
+			expect(res).toBeTruthy()
+			expect(res.failedOptional).toEqual([])
+			expect(res.failedRequired).toEqual([])
+			expectGotPlayer(res, 'a', 1)
+			expectGotPlayer(res, 'b', 3)
+			expectGotPlayer(res, 'c', 2)
+			expectGotPlayer(res, 'd', 1)
+			expectGotPlayer(res, 'e', undefined)
+		})
+	})
 })
diff --git a/packages/job-worker/src/playout/abPlayback/__tests__/abSessionHelper.spec.ts b/packages/job-worker/src/playout/abPlayback/__tests__/abSessionHelper.spec.ts
index b3d494fb4a..87936ee58b 100644
--- a/packages/job-worker/src/playout/abPlayback/__tests__/abSessionHelper.spec.ts
+++ b/packages/job-worker/src/playout/abPlayback/__tests__/abSessionHelper.spec.ts
@@ -10,6 +10,7 @@ import _ = require('underscore')
 import { setupDefaultRundownPlaylist, setupMockShowStyleCompound } from '../../../__mocks__/presetCollections'
 import { AbSessionHelper } from '../abSessionHelper'
 import { PieceInstance } from '@sofie-automation/corelib/dist/dataModel/PieceInstance'
+import { TimelineObjectAbSessionInfo } from '@sofie-automation/shared-lib/dist/core/model/Timeline'
 
 describe('AbSessionHelper', () => {
 	let jobContext: MockJobContext
@@ -22,11 +23,9 @@ describe('AbSessionHelper', () => {
 	const getSessionId = (n: number): string => `session#${n}`
 	function getSessionHelper(
 		trackedAbSessions: ABSessionInfo[],
-		previousPartInstance: DBPartInstance | undefined,
-		currentPartInstance: DBPartInstance | undefined,
-		nextPartInstance: DBPartInstance | undefined
+		...sortedPartInstances: Array<DBPartInstance | undefined>
 	) {
-		const partInstances = _.compact([previousPartInstance, currentPartInstance, nextPartInstance])
+		const partInstances = _.compact(sortedPartInstances)
 
 		const abSessionHelper = new AbSessionHelper(partInstances, clone<ABSessionInfo[]>(trackedAbSessions ?? []))
 
@@ -82,6 +81,28 @@ describe('AbSessionHelper', () => {
 		} as any
 	}
 
+	const testSession0: TimelineObjectAbSessionInfo = {
+		poolName: 'pool0',
+		sessionName: 'name0',
+	}
+	const testSession1: TimelineObjectAbSessionInfo = {
+		poolName: 'pool0',
+		sessionName: 'name1',
+	}
+	const testSession2: TimelineObjectAbSessionInfo = {
+		poolName: 'pool0',
+		sessionName: 'name2',
+	}
+
+	const unqiueSession0: TimelineObjectAbSessionInfo = {
+		...testSession0,
+		sessionNameIsGloballyUnique: true,
+	}
+	const unqiueSession1: TimelineObjectAbSessionInfo = {
+		...testSession1,
+		sessionNameIsGloballyUnique: true,
+	}
+
 	test('getPieceABSessionId - knownSessions basic', async () => {
 		const { rundownId } = await setupDefaultRundownPlaylist(jobContext)
 		const rundown = (await jobContext.mockCollections.Rundowns.findOne(rundownId)) as DBRundown
@@ -89,16 +110,16 @@ describe('AbSessionHelper', () => {
 
 		// No sessions
 		{
-			const abSessionHelper = getSessionHelper([], undefined, undefined, undefined)
+			const abSessionHelper = getSessionHelper([])
 			expect(abSessionHelper.knownSessions).toEqual([])
 		}
 
 		// some sessions
 		{
-			const sessions: ABSessionInfo[] = [{ id: 'abc', name: 'no' }]
+			const sessions: ABSessionInfo[] = [{ id: 'abc', name: 'no', isUniqueName: false }]
 			// Mod the sessions to be returned by knownSessions
 			const moddedSessions = sessions.map((s) => ({ ...s, keep: true }))
-			const abSessionHelper = getSessionHelper(moddedSessions, undefined, undefined, undefined)
+			const abSessionHelper = getSessionHelper(moddedSessions)
 			expect(abSessionHelper.knownSessions).toEqual(sessions)
 		}
 	})
@@ -109,30 +130,30 @@ describe('AbSessionHelper', () => {
 		expect(rundown).toBeTruthy()
 
 		{
-			const abSessionHelper = getSessionHelper([], undefined, undefined, undefined)
+			const abSessionHelper = getSessionHelper([])
 
 			const piece1 = createPieceInstance(undefined as any)
-			expect(() => abSessionHelper.getPieceABSessionId(piece1, 'name0')).toThrow(
+			expect(() => abSessionHelper.getPieceABSessionId(piece1, testSession0)).toThrow(
 				'Unknown partInstanceId in call to getPieceABSessionId'
 			)
 
 			const piece2 = createPieceInstance('defdef')
-			expect(() => abSessionHelper.getPieceABSessionId(piece2, 'name0')).toThrow(
+			expect(() => abSessionHelper.getPieceABSessionId(piece2, testSession0)).toThrow(
 				'Unknown partInstanceId in call to getPieceABSessionId'
 			)
 		}
 
 		{
 			const tmpPartInstance = createPartInstance('abcdef', 'aaa', 1)
-			const abSessionHelper = getSessionHelper([], undefined, undefined, tmpPartInstance)
+			const abSessionHelper = getSessionHelper([], tmpPartInstance)
 
 			const piece0 = createPieceInstance('defdef')
-			expect(() => abSessionHelper.getPieceABSessionId(piece0, 'name0')).toThrow(
+			expect(() => abSessionHelper.getPieceABSessionId(piece0, testSession0)).toThrow(
 				'Unknown partInstanceId in call to getPieceABSessionId'
 			)
 
 			const piece1 = createPieceInstance('abcdef')
-			expect(abSessionHelper.getPieceABSessionId(piece1, 'name0')).toBeTruthy()
+			expect(abSessionHelper.getPieceABSessionId(piece1, testSession0)).toBeTruthy()
 		}
 	})
 
@@ -143,7 +164,7 @@ describe('AbSessionHelper', () => {
 
 		const nextPartInstance = createPartInstance('abcdef', 'aaa', 1)
 		const currentPartInstance = createPartInstance('12345', 'bbb', 0)
-		const abSessionHelper = getSessionHelper([], undefined, currentPartInstance, nextPartInstance)
+		const abSessionHelper = getSessionHelper([], currentPartInstance, nextPartInstance)
 
 		// Get the id
 		const piece0 = createPieceInstance(nextPartInstance._id)
@@ -151,31 +172,32 @@ describe('AbSessionHelper', () => {
 			{
 				id: getSessionId(0),
 				infiniteInstanceId: undefined,
-				name: 'name0',
+				name: 'pool0_name0',
+				isUniqueName: false,
 				partInstanceIds: [nextPartInstance._id],
 			},
 		]
-		expect(abSessionHelper.getPieceABSessionId(piece0, 'name0')).toEqual(expectedSessions[0].id)
+		expect(abSessionHelper.getPieceABSessionId(piece0, testSession0)).toEqual(expectedSessions[0].id)
 		expect(getAllKnownSessions(abSessionHelper)).toEqual(expectedSessions)
 		expect(abSessionHelper.knownSessions).toHaveLength(1)
 
 		// Should get the same id again
-		expect(abSessionHelper.getPieceABSessionId(piece0, 'name0')).toEqual(expectedSessions[0].id)
+		expect(abSessionHelper.getPieceABSessionId(piece0, testSession0)).toEqual(expectedSessions[0].id)
 		expect(getAllKnownSessions(abSessionHelper)).toEqual(expectedSessions)
 		expect(abSessionHelper.knownSessions).toHaveLength(1)
 
 		const piece1 = createPieceInstance(nextPartInstance._id)
-		expect(abSessionHelper.getPieceABSessionId(piece1, 'name0')).toEqual(expectedSessions[0].id)
+		expect(abSessionHelper.getPieceABSessionId(piece1, testSession0)).toEqual(expectedSessions[0].id)
 		expect(getAllKnownSessions(abSessionHelper)).toEqual(expectedSessions)
 		expect(abSessionHelper.knownSessions).toHaveLength(1)
 
 		// Try for the other part
 		const piece2 = createPieceInstance(currentPartInstance._id)
-		expect(abSessionHelper.getPieceABSessionId(piece2, 'name0')).not.toEqual(expectedSessions[0].id)
+		expect(abSessionHelper.getPieceABSessionId(piece2, testSession0)).not.toEqual(expectedSessions[0].id)
 		expect(abSessionHelper.knownSessions).toHaveLength(2)
 
 		// Or another name
-		expect(abSessionHelper.getPieceABSessionId(piece1, 'name1')).not.toEqual(expectedSessions[0].id)
+		expect(abSessionHelper.getPieceABSessionId(piece1, testSession1)).not.toEqual(expectedSessions[0].id)
 		expect(abSessionHelper.knownSessions).toHaveLength(3)
 	})
 
@@ -190,36 +212,39 @@ describe('AbSessionHelper', () => {
 		const expectedSessions: ABSessionInfo[] = [
 			{
 				id: 'current0',
-				name: 'name0',
+				name: 'pool0_name0',
+				isUniqueName: false,
 				partInstanceIds: [currentPartInstance._id],
 			},
 			{
 				id: 'current1',
-				name: 'name1',
+				name: 'pool0_name1',
+				isUniqueName: false,
 				partInstanceIds: [currentPartInstance._id],
 			},
 			{
 				id: 'next0',
-				name: 'name0',
+				name: 'pool0_name0',
+				isUniqueName: false,
 				partInstanceIds: [nextPartInstance._id],
 			},
 		]
 
-		const abSessionHelper = getSessionHelper(expectedSessions, undefined, currentPartInstance, nextPartInstance)
+		const abSessionHelper = getSessionHelper(expectedSessions, currentPartInstance, nextPartInstance)
 
 		// Reuse the ids
 		const piece0 = createPieceInstance(currentPartInstance._id)
-		expect(abSessionHelper.getPieceABSessionId(piece0, 'name0')).toEqual(expectedSessions[0].id)
+		expect(abSessionHelper.getPieceABSessionId(piece0, testSession0)).toEqual(expectedSessions[0].id)
 		expect(getAllKnownSessions(abSessionHelper)).toEqual(expectedSessions)
 		expect(abSessionHelper.knownSessions).toHaveLength(1)
 
 		const piece1 = createPieceInstance(currentPartInstance._id)
-		expect(abSessionHelper.getPieceABSessionId(piece1, 'name1')).toEqual(expectedSessions[1].id)
+		expect(abSessionHelper.getPieceABSessionId(piece1, testSession1)).toEqual(expectedSessions[1].id)
 		expect(getAllKnownSessions(abSessionHelper)).toEqual(expectedSessions)
 		expect(abSessionHelper.knownSessions).toHaveLength(2)
 
 		const piece2 = createPieceInstance(nextPartInstance._id)
-		expect(abSessionHelper.getPieceABSessionId(piece2, 'name0')).toEqual(expectedSessions[2].id)
+		expect(abSessionHelper.getPieceABSessionId(piece2, testSession0)).toEqual(expectedSessions[2].id)
 		expect(getAllKnownSessions(abSessionHelper)).toEqual(expectedSessions)
 		expect(abSessionHelper.knownSessions).toHaveLength(3)
 	})
@@ -232,15 +257,15 @@ describe('AbSessionHelper', () => {
 		const nextPartInstance = createPartInstance('abcdef', 'aaa', 1)
 		const currentPartInstance = createPartInstance('12345', 'bbb', 0)
 
-		const abSessionHelper = getSessionHelper([], undefined, currentPartInstance, nextPartInstance)
+		const abSessionHelper = getSessionHelper([], currentPartInstance, nextPartInstance)
 
 		const sessionId = getSessionId(0)
 		const piece0 = createPieceInstance(currentPartInstance._id)
-		expect(abSessionHelper.getPieceABSessionId(piece0, 'name0')).toEqual(sessionId)
+		expect(abSessionHelper.getPieceABSessionId(piece0, testSession0)).toEqual(sessionId)
 		expect(abSessionHelper.knownSessions).toHaveLength(1)
 
 		const piece2 = createPieceInstance(nextPartInstance._id)
-		expect(abSessionHelper.getPieceABSessionId(piece2, 'name0')).toEqual(sessionId)
+		expect(abSessionHelper.getPieceABSessionId(piece2, testSession0)).toEqual(sessionId)
 		expect(abSessionHelper.knownSessions).toHaveLength(1)
 	})
 
@@ -256,45 +281,43 @@ describe('AbSessionHelper', () => {
 		const lookaheadSessions: ABSessionInfo[] = [
 			{
 				id: 'lookahead0',
-				name: 'name0',
+				name: 'pool0_name0',
+				isUniqueName: false,
 				lookaheadForPartId: currentPartInstance.part._id,
 				partInstanceIds: [currentPartInstance._id],
 			},
 			{
 				id: 'lookahead1',
-				name: 'name1',
+				name: 'pool0_name1',
+				isUniqueName: false,
 				lookaheadForPartId: currentPartInstance.part._id,
 				partInstanceIds: undefined,
 			},
 			{
 				id: 'lookahead2',
-				name: 'name2',
+				name: 'pool0_name2',
+				isUniqueName: false,
 				lookaheadForPartId: distantPartId,
 				partInstanceIds: undefined,
 			},
 		]
 
-		const abSessionHelper = getSessionHelper(
-			lookaheadSessions,
-			previousPartInstance,
-			currentPartInstance,
-			undefined
-		)
+		const abSessionHelper = getSessionHelper(lookaheadSessions, previousPartInstance, currentPartInstance)
 
 		// lookahead0 is for us
 		const piece0 = createPieceInstance(currentPartInstance._id)
-		expect(abSessionHelper.getPieceABSessionId(piece0, 'name0')).toEqual('lookahead0')
+		expect(abSessionHelper.getPieceABSessionId(piece0, testSession0)).toEqual('lookahead0')
 		expect(abSessionHelper.knownSessions).toHaveLength(1)
 
 		// lookahead1 is for us
 		const piece1 = createPieceInstance(currentPartInstance._id)
-		expect(abSessionHelper.getPieceABSessionId(piece1, 'name1')).toEqual('lookahead1')
+		expect(abSessionHelper.getPieceABSessionId(piece1, testSession1)).toEqual('lookahead1')
 		expect(abSessionHelper.knownSessions).toHaveLength(2)
 
 		// lookahead2 is not for us, so we shouldnt get it
 		const sessionId = getSessionId(0)
 		const piece2 = createPieceInstance(currentPartInstance._id)
-		expect(abSessionHelper.getPieceABSessionId(piece2, 'name2')).toEqual(sessionId)
+		expect(abSessionHelper.getPieceABSessionId(piece2, testSession2)).toEqual(sessionId)
 		expect(abSessionHelper.knownSessions).toHaveLength(3)
 	})
 
@@ -306,28 +329,72 @@ describe('AbSessionHelper', () => {
 		const nextPartInstance = createPartInstance('abcdef', 'aaa', 1)
 		const currentPartInstance = createPartInstance('12345', 'bbb', 10)
 
-		const abSessionHelper = getSessionHelper([], undefined, currentPartInstance, nextPartInstance)
+		const abSessionHelper = getSessionHelper([], currentPartInstance, nextPartInstance)
 
 		// Start a new infinite session
 		const sessionId0 = getSessionId(0)
 		const infinite0 = protectString('infinite0')
 		const piece0 = createPieceInstance(currentPartInstance._id, infinite0)
-		expect(abSessionHelper.getPieceABSessionId(piece0, 'name0')).toEqual(sessionId0)
+		expect(abSessionHelper.getPieceABSessionId(piece0, testSession0)).toEqual(sessionId0)
 		expect(abSessionHelper.knownSessions).toHaveLength(1)
 
 		// Double check the reuslt
-		expect(abSessionHelper.getPieceABSessionId(piece0, 'name0')).toEqual(sessionId0)
+		expect(abSessionHelper.getPieceABSessionId(piece0, testSession0)).toEqual(sessionId0)
 		expect(abSessionHelper.knownSessions).toHaveLength(1)
 
 		// Normal piece in the same part gets different id
 		const sessionId1 = getSessionId(1)
 		const piece1 = createPieceInstance(currentPartInstance._id)
-		expect(abSessionHelper.getPieceABSessionId(piece1, 'name0')).toEqual(sessionId1)
+		expect(abSessionHelper.getPieceABSessionId(piece1, testSession0)).toEqual(sessionId1)
 		expect(abSessionHelper.knownSessions).toHaveLength(2)
 
 		// Span session to a part with a lower rank
 		const piece2 = createPieceInstance(nextPartInstance._id, infinite0)
-		expect(abSessionHelper.getPieceABSessionId(piece2, 'name0')).toEqual(sessionId0)
+		expect(abSessionHelper.getPieceABSessionId(piece2, testSession0)).toEqual(sessionId0)
+		expect(abSessionHelper.knownSessions).toHaveLength(2)
+	})
+
+	test('getPieceABSessionId - unique session', async () => {
+		const { rundownId } = await setupDefaultRundownPlaylist(jobContext)
+		const rundown = (await jobContext.mockCollections.Rundowns.findOne(rundownId)) as DBRundown
+		expect(rundown).toBeTruthy()
+
+		const nextPartInstance = createPartInstance('abcdef', 'aaa', 1)
+		const currentPartInstance = createPartInstance('12345', 'bbb', 0)
+		const abSessionHelper = getSessionHelper([], currentPartInstance, nextPartInstance)
+
+		// Get the id
+		const piece0 = createPieceInstance(nextPartInstance._id)
+		const expectedSessions: ABSessionInfo[] = [
+			{
+				id: getSessionId(0),
+				name: 'pool0_name0',
+				isUniqueName: true,
+			},
+		]
+		expect(abSessionHelper.getPieceABSessionId(piece0, unqiueSession0)).toEqual(expectedSessions[0].id)
+		expect(getAllKnownSessions(abSessionHelper)).toEqual(expectedSessions)
+		expect(abSessionHelper.knownSessions).toHaveLength(1)
+
+		// Should get the same id again
+		expect(abSessionHelper.getPieceABSessionId(piece0, unqiueSession0)).toEqual(expectedSessions[0].id)
+		expect(getAllKnownSessions(abSessionHelper)).toEqual(expectedSessions)
+		expect(abSessionHelper.knownSessions).toHaveLength(1)
+
+		const piece1 = createPieceInstance(nextPartInstance._id)
+		expect(abSessionHelper.getPieceABSessionId(piece1, unqiueSession0)).toEqual(expectedSessions[0].id)
+		expect(getAllKnownSessions(abSessionHelper)).toEqual(expectedSessions)
+		expect(abSessionHelper.knownSessions).toHaveLength(1)
+
+		// Try for the other part
+		const piece2 = createPieceInstance(currentPartInstance._id)
+		expect(abSessionHelper.getPieceABSessionId(piece2, unqiueSession0)).toEqual(expectedSessions[0].id)
+		expect(abSessionHelper.knownSessions).toHaveLength(1)
+
+		// Or the non-unique version
+		expect(
+			abSessionHelper.getPieceABSessionId(piece1, { ...unqiueSession0, sessionNameIsGloballyUnique: false })
+		).not.toEqual(expectedSessions[0].id)
 		expect(abSessionHelper.knownSessions).toHaveLength(2)
 	})
 
@@ -336,14 +403,14 @@ describe('AbSessionHelper', () => {
 		const rundown = (await jobContext.mockCollections.Rundowns.findOne(rundownId)) as DBRundown
 		expect(rundown).toBeTruthy()
 
-		const abSessionHelper = getSessionHelper([], undefined, undefined, undefined)
+		const abSessionHelper = getSessionHelper([])
 
 		// no session needed
-		expect(abSessionHelper.getTimelineObjectAbSessionId({} as any, 'name0')).toBeUndefined()
+		expect(abSessionHelper.getTimelineObjectAbSessionId({} as any, testSession0)).toBeUndefined()
 
 		// unknown partInstance
 		const obj1 = createTimelineObject('abcd')
-		expect(abSessionHelper.getTimelineObjectAbSessionId(obj1, 'name0')).toBeUndefined()
+		expect(abSessionHelper.getTimelineObjectAbSessionId(obj1, testSession0)).toBeUndefined()
 	})
 
 	function generateGetTimelineObjectAbSessionIdSessions(
@@ -356,45 +423,53 @@ describe('AbSessionHelper', () => {
 		return [
 			{
 				id: 'current0',
-				name: 'name0',
+				name: 'pool0_name0',
+				isUniqueName: false,
 				partInstanceIds: [currentPartInstance._id],
 			},
 			{
 				id: 'current1',
-				name: 'name1',
+				name: 'pool0_name1',
+				isUniqueName: false,
 				partInstanceIds: [currentPartInstance._id],
 			},
 			{
 				id: 'next0',
-				name: 'name0',
+				name: 'pool0_name0',
+				isUniqueName: false,
 				partInstanceIds: [nextPartInstance._id],
 			},
 			{
 				id: 'lookahead0',
-				name: 'name0',
+				name: 'pool0_name0',
+				isUniqueName: false,
 				lookaheadForPartId: currentPartInstance.part._id,
 				partInstanceIds: [currentPartInstance._id],
 			},
 			{
 				id: 'lookahead1',
-				name: 'name1',
+				name: 'pool0_name1',
+				isUniqueName: false,
 				lookaheadForPartId: currentPartInstance.part._id,
 				partInstanceIds: undefined,
 			},
 			{
 				id: 'lookahead2',
-				name: 'name2',
+				name: 'pool0_name2',
+				isUniqueName: false,
 				lookaheadForPartId: distantPartId,
 				partInstanceIds: undefined,
 			},
 			{
 				id: 'inf0',
-				name: 'name0',
+				name: 'pool0_name0',
+				isUniqueName: false,
 				infiniteInstanceId: infinite0,
 			},
 			{
 				id: 'inf1',
-				name: 'name0',
+				name: 'pool0_name0',
+				isUniqueName: false,
 				infiniteInstanceId: infinite1,
 			},
 		]
@@ -416,22 +491,22 @@ describe('AbSessionHelper', () => {
 			protectString('infinite1')
 		)
 
-		const abSessionHelper = getSessionHelper(existingSessions, undefined, currentPartInstance, nextPartInstance)
+		const abSessionHelper = getSessionHelper(existingSessions, currentPartInstance, nextPartInstance)
 
 		// no session recorded for partInstance
 		const obj1 = createTimelineObject(nextPartInstance._id)
-		expect(abSessionHelper.getTimelineObjectAbSessionId(obj1, 'name0')).toBeUndefined()
+		expect(abSessionHelper.getTimelineObjectAbSessionId(obj1, testSession0)).toBeUndefined()
 
 		// partInstance with session
 		const obj2 = createTimelineObject(currentPartInstance._id)
-		expect(abSessionHelper.getTimelineObjectAbSessionId(obj2, 'name0')).toEqual('current0')
-		expect(abSessionHelper.getTimelineObjectAbSessionId(obj2, 'name1')).toEqual('current1')
+		expect(abSessionHelper.getTimelineObjectAbSessionId(obj2, testSession0)).toEqual('current0')
+		expect(abSessionHelper.getTimelineObjectAbSessionId(obj2, testSession1)).toEqual('current1')
 
 		// // define a session now
 		// overwriteKnownSessions(context, [{
 		// 	{
 		// 		id: 'current0',
-		// 		name: 'name0',
+		// 		name: 'pool0_name0',
 		// 		partInstanceIds: [currentPartInstance._id],
 		// 	},
 		// }])
@@ -457,52 +532,49 @@ describe('AbSessionHelper', () => {
 			protectString('infinite1')
 		)
 
-		const abSessionHelper = getSessionHelper(
-			[...existingSessions],
-			undefined,
-			currentPartInstance,
-			nextPartInstance
-		)
+		const abSessionHelper = getSessionHelper([...existingSessions], currentPartInstance, nextPartInstance)
 
 		// no session if no partId
 		const obj1 = createTimelineObject(null, undefined, true)
-		expect(abSessionHelper.getTimelineObjectAbSessionId(obj1, 'name0')).toBeUndefined()
+		expect(abSessionHelper.getTimelineObjectAbSessionId(obj1, testSession0)).toBeUndefined()
 		expect(abSessionHelper.knownSessions).toHaveLength(0)
 
 		// existing 'distant' lookahead session
 		const obj2 = createTimelineObject(unprotectString(distantPartId), undefined, true)
-		expect(abSessionHelper.getTimelineObjectAbSessionId(obj2, 'name2')).toEqual('lookahead2')
+		expect(abSessionHelper.getTimelineObjectAbSessionId(obj2, testSession2)).toEqual('lookahead2')
 		expect(abSessionHelper.knownSessions).toHaveLength(1)
 
 		// new 'distant' lookahead session
 		const obj2a = createTimelineObject(unprotectString(distantPartId), undefined, true)
-		expect(abSessionHelper.getTimelineObjectAbSessionId(obj2a, 'name0')).toEqual(getSessionId(0))
+		expect(abSessionHelper.getTimelineObjectAbSessionId(obj2a, testSession0)).toEqual(getSessionId(0))
 		expect(abSessionHelper.knownSessions).toHaveLength(2)
 		existingSessions.push({
 			id: getSessionId(0),
 			lookaheadForPartId: distantPartId,
-			name: 'name0',
+			name: 'pool0_name0',
+			isUniqueName: false,
 		})
 
 		// current partInstance session
 		const obj3 = createTimelineObject(currentPartInstance._id, undefined, true)
-		expect(abSessionHelper.getTimelineObjectAbSessionId(obj3, 'name1')).toEqual('current1')
+		expect(abSessionHelper.getTimelineObjectAbSessionId(obj3, testSession1)).toEqual('current1')
 		expect(abSessionHelper.knownSessions).toHaveLength(3)
 
 		// next partInstance session
 		const obj4 = createTimelineObject(nextPartInstance._id, undefined, true)
-		expect(abSessionHelper.getTimelineObjectAbSessionId(obj4, 'name0')).toEqual('next0')
+		expect(abSessionHelper.getTimelineObjectAbSessionId(obj4, testSession0)).toEqual('next0')
 		expect(abSessionHelper.knownSessions).toHaveLength(4)
 
 		// next partInstance new session
 		const obj5 = createTimelineObject(nextPartInstance._id, undefined, true)
-		expect(abSessionHelper.getTimelineObjectAbSessionId(obj5, 'name1')).toEqual(getSessionId(1))
+		expect(abSessionHelper.getTimelineObjectAbSessionId(obj5, testSession1)).toEqual(getSessionId(1))
 		expect(abSessionHelper.knownSessions).toHaveLength(5)
 
 		existingSessions.push({
 			id: getSessionId(1),
 			lookaheadForPartId: nextPartInstance.part._id,
-			name: 'name1',
+			name: 'pool0_name1',
+			isUniqueName: false,
 			partInstanceIds: [nextPartInstance._id],
 		})
 
@@ -529,26 +601,67 @@ describe('AbSessionHelper', () => {
 			infinite1
 		)
 
-		const abSessionHelper = getSessionHelper(
-			[...existingSessions],
-			undefined,
-			currentPartInstance,
-			nextPartInstance
-		)
+		const abSessionHelper = getSessionHelper([...existingSessions], currentPartInstance, nextPartInstance)
 
 		const obj1 = createTimelineObject(currentPartInstance._id, infinite0)
-		expect(abSessionHelper.getTimelineObjectAbSessionId(obj1, 'name0')).toEqual('inf0')
+		expect(abSessionHelper.getTimelineObjectAbSessionId(obj1, testSession0)).toEqual('inf0')
 		expect(abSessionHelper.knownSessions).toHaveLength(1)
 
 		const obj2 = createTimelineObject(null, infinite1)
-		expect(abSessionHelper.getTimelineObjectAbSessionId(obj2, 'name0')).toEqual('inf1')
+		expect(abSessionHelper.getTimelineObjectAbSessionId(obj2, testSession0)).toEqual('inf1')
 		expect(abSessionHelper.knownSessions).toHaveLength(2)
 
 		const obj3 = createTimelineObject(null, protectString('fake'))
-		expect(abSessionHelper.getTimelineObjectAbSessionId(obj3, 'name0')).toBeUndefined()
+		expect(abSessionHelper.getTimelineObjectAbSessionId(obj3, testSession0)).toBeUndefined()
 		expect(abSessionHelper.knownSessions).toHaveLength(2)
 
 		// Ensure the sessions havent changed
 		expect(getAllKnownSessions(abSessionHelper)).toEqual(existingSessions)
 	})
+
+	test('getTimelineObjectAbSessionId - unique session', async () => {
+		const { rundownId } = await setupDefaultRundownPlaylist(jobContext)
+		const rundown = (await jobContext.mockCollections.Rundowns.findOne(rundownId)) as DBRundown
+		expect(rundown).toBeTruthy()
+
+		const nextPartInstance = createPartInstance('abcdef', 'aaa', 1)
+		const currentPartInstance = createPartInstance('12345', 'bbb', 10)
+
+		const existingSessions: ABSessionInfo[] = [
+			{
+				id: 'unique0',
+				name: 'pool0_name0',
+				isUniqueName: true,
+			},
+			{
+				id: 'unique1',
+				name: 'pool0_name1',
+				isUniqueName: true,
+			},
+			{
+				id: 'normal0',
+				name: 'pool0_name0',
+				isUniqueName: false,
+				partInstanceIds: [currentPartInstance._id],
+			},
+		]
+
+		const abSessionHelper = getSessionHelper(existingSessions, currentPartInstance, nextPartInstance)
+
+		// no session recorded for partInstance
+		const obj1 = createTimelineObject(nextPartInstance._id)
+		expect(abSessionHelper.getTimelineObjectAbSessionId(obj1, unqiueSession0)).toEqual('unique0')
+
+		// partInstance with session
+		const obj2 = createTimelineObject(currentPartInstance._id)
+		expect(abSessionHelper.getTimelineObjectAbSessionId(obj2, unqiueSession0)).toEqual('unique0')
+		expect(abSessionHelper.getTimelineObjectAbSessionId(obj2, unqiueSession1)).toEqual('unique1')
+
+		// Non unique sessions
+		expect(abSessionHelper.getTimelineObjectAbSessionId(obj2, testSession0)).toEqual('normal0')
+		expect(abSessionHelper.getTimelineObjectAbSessionId(obj1, testSession0)).toBeUndefined()
+
+		// Ensure the sessions havent changed
+		expect(getAllKnownSessions(abSessionHelper)).toEqual(existingSessions)
+	})
 })
diff --git a/packages/job-worker/src/playout/abPlayback/__tests__/applyAssignments.spec.ts b/packages/job-worker/src/playout/abPlayback/__tests__/applyAssignments.spec.ts
index 16e2305492..af6a9a4e0b 100644
--- a/packages/job-worker/src/playout/abPlayback/__tests__/applyAssignments.spec.ts
+++ b/packages/job-worker/src/playout/abPlayback/__tests__/applyAssignments.spec.ts
@@ -75,7 +75,9 @@ describe('applyMediaPlayersAssignments', () => {
 		const pieceInstanceId = 'piece0'
 		const partInstanceId = protectString('part0')
 
-		mockGetObjectSessionId.mockImplementation((obj, name) => `${obj.pieceInstanceId}_${name}`)
+		mockGetObjectSessionId.mockImplementation(
+			(obj, session) => `${obj.pieceInstanceId}_${session.poolName}_${session.sessionName}`
+		)
 
 		const objects = [
 			literal<OnGenerateTimelineObjExt>({
diff --git a/packages/job-worker/src/playout/abPlayback/__tests__/routeSetDisabling.spec.ts b/packages/job-worker/src/playout/abPlayback/__tests__/routeSetDisabling.spec.ts
new file mode 100644
index 0000000000..88228e04ec
--- /dev/null
+++ b/packages/job-worker/src/playout/abPlayback/__tests__/routeSetDisabling.spec.ts
@@ -0,0 +1,211 @@
+import { StudioRouteBehavior, StudioRouteSet } from '@sofie-automation/corelib/dist/dataModel/Studio'
+import { abPoolFilterDisabled, findPlayersInRouteSets } from '../routeSetDisabling'
+import { ABPlayerDefinition } from '@sofie-automation/blueprints-integration'
+import { clone } from '@sofie-automation/corelib/dist/lib'
+
+describe('route set disabling ab players', () => {
+	const POOL_NAME = '_test_'
+	function runDisablePlayersFiltering(
+		routeSets: Record<string, StudioRouteSet>,
+		players: ABPlayerDefinition[]
+	): ABPlayerDefinition[] {
+		const members = findPlayersInRouteSets(routeSets)
+		return abPoolFilterDisabled(POOL_NAME, players, members)
+	}
+
+	const DEFAULT_PLAYERS: ABPlayerDefinition[] = [
+		{ playerId: 1 },
+		{ playerId: 2 },
+		{ playerId: 3 },
+		{ playerId: 4 },
+		{ playerId: 5 },
+	]
+
+	test('no routesets', () => {
+		const result = runDisablePlayersFiltering({}, DEFAULT_PLAYERS)
+		expect(result).toEqual(DEFAULT_PLAYERS)
+	})
+
+	test('mismatch of playerId types', () => {
+		const routesets: Record<string, StudioRouteSet> = {
+			route1: {
+				name: '',
+				active: false,
+				behavior: StudioRouteBehavior.TOGGLE,
+				routes: [],
+				abPlayers: [
+					{
+						poolName: POOL_NAME,
+						playerId: '1', // because ui field is always a string
+					},
+				],
+			},
+		}
+
+		const players: ABPlayerDefinition[] = [
+			{
+				playerId: 1, // number because blueprint defined it as such
+			},
+			{ playerId: 2 },
+		]
+
+		const result = runDisablePlayersFiltering(routesets, players)
+
+		const expectedPlayers = players.filter((p) => p.playerId !== 1)
+		expect(result).toEqual(expectedPlayers)
+	})
+
+	describe('single routeset per player', () => {
+		const ROUTESETS_SEPARATE: Record<string, StudioRouteSet> = {
+			pl1: {
+				name: '',
+				active: true,
+				behavior: StudioRouteBehavior.TOGGLE,
+				routes: [],
+				abPlayers: [
+					{
+						poolName: POOL_NAME,
+						playerId: 1,
+					},
+				],
+			},
+			pl2: {
+				name: '',
+				active: true,
+				behavior: StudioRouteBehavior.TOGGLE,
+				routes: [],
+				abPlayers: [
+					{
+						poolName: POOL_NAME,
+						playerId: 2,
+					},
+				],
+			},
+			pl3: {
+				name: '',
+				active: true,
+				behavior: StudioRouteBehavior.TOGGLE,
+				routes: [],
+				abPlayers: [
+					{
+						poolName: POOL_NAME,
+						playerId: 3,
+					},
+				],
+			},
+		}
+
+		test('active routes', () => {
+			const result = runDisablePlayersFiltering(ROUTESETS_SEPARATE, DEFAULT_PLAYERS)
+			expect(result).toEqual(DEFAULT_PLAYERS)
+		})
+
+		test('inactive routes', () => {
+			const routesets = clone(ROUTESETS_SEPARATE)
+			routesets['pl3'].active = false
+
+			// deactivate this, but for a different pool
+			routesets['pl2'].active = false
+			routesets['pl2'].abPlayers[0].poolName = 'ANOTHER'
+
+			const result = runDisablePlayersFiltering(routesets, DEFAULT_PLAYERS)
+
+			const expectedPlayers = DEFAULT_PLAYERS.filter((p) => p.playerId !== 3)
+			expect(result).toEqual(expectedPlayers)
+		})
+	})
+
+	describe('multiple routesets per player', () => {
+		/**
+		 * This is testing the scenario of these 3 routesets where only one can be active at a time
+		 */
+		const ROUTESETS_GROUPED: Record<string, StudioRouteSet> = {
+			all: {
+				name: '',
+				active: true,
+				behavior: StudioRouteBehavior.TOGGLE,
+				exclusivityGroup: 'ab',
+				routes: [],
+				abPlayers: [
+					{
+						poolName: POOL_NAME,
+						playerId: 1,
+					},
+					{
+						poolName: POOL_NAME,
+						playerId: 2,
+					},
+					{
+						poolName: POOL_NAME,
+						playerId: 3,
+					},
+					{
+						poolName: POOL_NAME,
+						playerId: 4,
+					},
+				],
+			},
+			first: {
+				name: '',
+				active: false,
+				behavior: StudioRouteBehavior.TOGGLE,
+				exclusivityGroup: 'ab',
+				routes: [],
+				abPlayers: [
+					{
+						poolName: POOL_NAME,
+						playerId: 1,
+					},
+					{
+						poolName: POOL_NAME,
+						playerId: 2,
+					},
+				],
+			},
+			second: {
+				name: '',
+				active: false,
+				behavior: StudioRouteBehavior.TOGGLE,
+				exclusivityGroup: 'ab',
+				routes: [],
+				abPlayers: [
+					{
+						poolName: POOL_NAME,
+						playerId: 3,
+					},
+					{
+						poolName: POOL_NAME,
+						playerId: 4,
+					},
+				],
+			},
+		}
+
+		test('all', () => {
+			const result = runDisablePlayersFiltering(ROUTESETS_GROUPED, DEFAULT_PLAYERS)
+			expect(result).toEqual(DEFAULT_PLAYERS)
+		})
+
+		test('first', () => {
+			const routesets = clone(ROUTESETS_GROUPED)
+			routesets['all'].active = false
+			routesets['first'].active = true
+
+			const result = runDisablePlayersFiltering(routesets, DEFAULT_PLAYERS)
+
+			const expectedPlayers = DEFAULT_PLAYERS.filter((p) => p.playerId !== 3 && p.playerId !== 4)
+			expect(result).toEqual(expectedPlayers)
+		})
+
+		test('second', () => {
+			const routesets = clone(ROUTESETS_GROUPED)
+			routesets['all'].active = false
+			routesets['second'].active = true
+
+			const result = runDisablePlayersFiltering(routesets, DEFAULT_PLAYERS)
+
+			const expectedPlayers = DEFAULT_PLAYERS.filter((p) => p.playerId !== 1 && p.playerId !== 2)
+			expect(result).toEqual(expectedPlayers)
+		})
+	})
+})
diff --git a/packages/job-worker/src/playout/abPlayback/abPlaybackResolver.ts b/packages/job-worker/src/playout/abPlayback/abPlaybackResolver.ts
index 7d8cc16c26..217f9bab51 100644
--- a/packages/job-worker/src/playout/abPlayback/abPlaybackResolver.ts
+++ b/packages/job-worker/src/playout/abPlayback/abPlaybackResolver.ts
@@ -1,4 +1,4 @@
-import { ABResolverOptions } from '@sofie-automation/blueprints-integration'
+import type { AbPlayerId, ABResolverOptions } from '@sofie-automation/blueprints-integration'
 import { clone } from '@sofie-automation/corelib/dist/lib'
 import * as _ from 'underscore'
 
@@ -8,7 +8,7 @@ export interface SessionRequest {
 	readonly end: number | undefined
 	readonly optional?: boolean
 	readonly lookaheadRank?: number
-	playerId?: number | string
+	playerId?: AbPlayerId
 }
 
 export interface AssignmentResult {
@@ -21,7 +21,7 @@ export interface AssignmentResult {
 }
 
 interface SlotAvailability {
-	id: number | string
+	id: AbPlayerId
 	before: (SessionRequest & { end: number }) | null
 	after: SessionRequest | null
 	clashes: SessionRequest[]
@@ -55,10 +55,26 @@ function safeMin<T>(arr: T[], func: (val: T) => number): T | undefined {
  */
 export function resolveAbAssignmentsFromRequests(
 	resolverOptions: ABResolverOptions,
-	playerIds: Array<number | string>,
+	playerIds: AbPlayerId[],
 	rawRequests: SessionRequest[],
 	now: number // Current time
 ): AssignmentResult {
+	// Check that the player assigned still exists
+	const validPlayerIdsSet = new Set(playerIds)
+	for (const req of rawRequests) {
+		if (req.playerId !== undefined && !validPlayerIdsSet.has(req.playerId)) {
+			delete req.playerId
+		}
+	}
+
+	const originalLookaheadAssignments: Record<string, AbPlayerId> = {}
+	for (const req of rawRequests) {
+		if (req.lookaheadRank !== undefined && req.playerId !== undefined) {
+			originalLookaheadAssignments[req.id] = req.playerId
+			delete req.playerId
+		}
+	}
+
 	const res: AssignmentResult = {
 		requests: _.sortBy(rawRequests, (r) => r.start).map((v) => clone(v)),
 		failedRequired: [],
@@ -80,14 +96,6 @@ export function resolveAbAssignmentsFromRequests(
 		return res
 	}
 
-	const originalLookaheadAssignments: Record<string, number | string> = {}
-	for (const req of rawRequests) {
-		if (req.lookaheadRank !== undefined && req.playerId !== undefined) {
-			originalLookaheadAssignments[req.id] = req.playerId
-			delete req.playerId
-		}
-	}
-
 	const safeNow = now + resolverOptions.nowWindow // Treat now + nowWindow as now, as it is likely that anything changed within that window will be late to air
 
 	// Clear assignments for anything which has no chance of being preloaded yet
@@ -104,7 +112,7 @@ export function resolveAbAssignmentsFromRequests(
 	pendingRequests = grouped[undefined as any]
 
 	// build map of slots and what they already have assigned
-	const slots: Map<number | string, SessionRequest[]> = new Map()
+	const slots = new Map<AbPlayerId, SessionRequest[]>()
 	_.each(playerIds, (id) => slots.set(id, grouped[id] || []))
 
 	const beforeHasGap = (p: SlotAvailability, req: SessionRequest): boolean =>
@@ -311,16 +319,27 @@ export function resolveAbAssignmentsFromRequests(
 		}
 	}
 
+	assignPlayersForLookahead(slots, res, originalLookaheadAssignments, safeNow)
+
+	return res
+}
+
+function assignPlayersForLookahead(
+	slots: Map<AbPlayerId, SessionRequest[]>,
+	res: AssignmentResult,
+	originalLookaheadAssignments: Record<string, AbPlayerId>,
+	safeNow: number
+) {
 	// Ensure lookahead gets assigned based on priority not some randomness
 	// Includes slots which have either no sessions, or the last has a known end time
-	const lastSessionPerSlot: Record<number | string, number | undefined> = {} // playerId, end
+	const lastSessionPerSlot = new Map<AbPlayerId, number>() // playerId, end
 	for (const [playerId, sessions] of slots) {
 		const last = _.last(sessions.filter((s) => s.lookaheadRank === undefined))
 		if (!last) {
-			lastSessionPerSlot[playerId] = Number.NEGATIVE_INFINITY
+			lastSessionPerSlot.set(playerId, Number.NEGATIVE_INFINITY)
 		} else if (last.end !== undefined) {
 			// If there is a defined end, then it can be useful after that point of time
-			lastSessionPerSlot[playerId] = last.end
+			lastSessionPerSlot.set(playerId, last.end)
 		}
 	}
 
@@ -328,56 +347,39 @@ export function resolveAbAssignmentsFromRequests(
 	const lookaheadsToAssign = _.sortBy(
 		res.requests.filter((r) => r.lookaheadRank !== undefined),
 		(r) => r.lookaheadRank
-	).slice(0, Object.keys(lastSessionPerSlot).length)
-
-	// Persist previous players if possible
-	const remainingLookaheads: SessionRequest[] = []
-	for (const req of lookaheadsToAssign) {
-		delete req.playerId
-
+	).slice(0, lastSessionPerSlot.size)
+
+	const [playersClearNow, playersClearSoon] = _.partition(
+		Array.from(lastSessionPerSlot.entries()),
+		(session) => session[1] < safeNow
+	)
+
+	// Assign the players which are clear right now
+	const playersClearNowIds = new Set(playersClearNow.map((p) => p[0]))
+	// First persist any previous players
+	const lookaheadsToAssignNow = lookaheadsToAssign.slice(0, playersClearNow.length)
+	for (const req of lookaheadsToAssignNow) {
 		const prevPlayer = originalLookaheadAssignments[req.id]
-		if (prevPlayer === undefined) {
-			remainingLookaheads.push(req)
-		} else {
-			// Ensure the assignment is ok
-			const slotEnd = lastSessionPerSlot[prevPlayer]
-			if (slotEnd === undefined || slotEnd >= safeNow) {
-				// It isnt available for this lookahead, or isnt visible yet
-				remainingLookaheads.push(req)
-			} else {
-				// It is ours, so remove the player from the pool
-				req.playerId = prevPlayer
-				delete lastSessionPerSlot[req.playerId]
-			}
-		}
-	}
-
-	// Assign any remaining lookaheads
-	const sortedSlots = _.sortBy(Object.entries<number | undefined>(lastSessionPerSlot), (s) => s[1] ?? 0)
-	for (let i = 0; i < remainingLookaheads.length; i++) {
-		const slot = sortedSlots[i]
-		const req = remainingLookaheads[i]
-
-		if (slot) {
-			// Check if we were originally given a player index rather than a string Id
-			if (playerIds.find((id) => typeof id === 'number' && id === Number(slot[0]))) {
-				req.playerId = Number(slot[0])
-			} else {
-				req.playerId = slot[0]
-			}
+		if (prevPlayer !== undefined && playersClearNowIds.delete(prevPlayer)) {
+			req.playerId = prevPlayer
 		} else {
 			delete req.playerId
 		}
 	}
+	// Then fill in the blanks
+	const playersClearNowRemainingIds = Array.from(playersClearNowIds)
+	for (const req of lookaheadsToAssignNow) {
+		if (req.playerId === undefined) req.playerId = playersClearNowRemainingIds.shift()
+	}
 
-	return res
+	// Assign the players which are clear soon. These aren't visible, so don't need to preserve anything
+	const lookaheadsToAssignSoon = lookaheadsToAssign.slice(playersClearNow.length)
+	for (const req of lookaheadsToAssignSoon) {
+		req.playerId = playersClearSoon.shift()?.[0]
+	}
 }
 
-function getAvailability(
-	id: number | string,
-	thisReq: SessionRequest,
-	orderedRequests: SessionRequest[]
-): SlotAvailability {
+function getAvailability(id: AbPlayerId, thisReq: SessionRequest, orderedRequests: SessionRequest[]): SlotAvailability {
 	const res: SlotAvailability = {
 		id,
 		before: null,
diff --git a/packages/job-worker/src/playout/abPlayback/abPlaybackSessions.ts b/packages/job-worker/src/playout/abPlayback/abPlaybackSessions.ts
index 757db512ad..1a9fd75e50 100644
--- a/packages/job-worker/src/playout/abPlayback/abPlaybackSessions.ts
+++ b/packages/job-worker/src/playout/abPlayback/abPlaybackSessions.ts
@@ -5,6 +5,7 @@ import { OnGenerateTimelineObjExt } from '@sofie-automation/corelib/dist/dataMod
 import * as _ from 'underscore'
 import { SessionRequest } from './abPlaybackResolver'
 import { AbSessionHelper } from './abSessionHelper'
+import { ReadonlyDeep } from 'type-fest'
 
 /**
  * Calculate all of the AB-playback sessions currently on the timeline
@@ -19,7 +20,7 @@ export function calculateSessionTimeRanges(
 	abSessionHelper: AbSessionHelper,
 	resolvedPieces: ResolvedPieceInstance[],
 	timelineObjects: OnGenerateTimelineObjExt[],
-	previousAssignmentMap: ABSessionAssignments,
+	previousAssignmentMap: ReadonlyDeep<ABSessionAssignments> | undefined,
 	poolName: string
 ): SessionRequest[] {
 	const sessionRequests: { [sessionId: string]: SessionRequest | undefined } = {}
@@ -35,10 +36,7 @@ export function calculateSessionTimeRanges(
 		for (const session of abSessions) {
 			if (session.poolName !== poolName) continue
 
-			const sessionId = abSessionHelper.getPieceABSessionId(
-				p.instance,
-				abSessionHelper.validateSessionName(p.instance._id, session)
-			)
+			const sessionId = abSessionHelper.getPieceABSessionId(p.instance, session)
 
 			// Note: multiple generated sessionIds for a single piece will not work as there will not be enough info to assign objects to different players. TODO is this still true?
 			const val = sessionRequests[sessionId]
@@ -50,7 +48,7 @@ export function calculateSessionTimeRanges(
 					end: val.end === undefined || end === undefined ? undefined : Math.max(val.end, end),
 					optional: val.optional && (session.optional ?? false),
 					lookaheadRank: undefined,
-					playerId: previousAssignmentMap[sessionId]?.playerId, // Persist previous assignments
+					playerId: previousAssignmentMap?.[sessionId]?.playerId, // Persist previous assignments
 				}
 			} else {
 				// New session
@@ -60,7 +58,7 @@ export function calculateSessionTimeRanges(
 					end,
 					optional: session.optional ?? false,
 					lookaheadRank: undefined,
-					playerId: previousAssignmentMap[sessionId]?.playerId, // Persist previous assignments
+					playerId: previousAssignmentMap?.[sessionId]?.playerId, // Persist previous assignments
 				}
 			}
 		}
@@ -81,10 +79,7 @@ export function calculateSessionTimeRanges(
 		) {
 			for (const session of obj.abSessions) {
 				if (session.poolName === poolName) {
-					const sessionId = abSessionHelper.getTimelineObjectAbSessionId(
-						obj,
-						abSessionHelper.validateSessionName(obj.pieceInstanceId, session)
-					)
+					const sessionId = abSessionHelper.getTimelineObjectAbSessionId(obj, session)
 					if (sessionId) {
 						const existing = groupedLookaheadMap.get(sessionId)
 						groupedLookaheadMap.set(sessionId, existing ? [...existing, obj] : [obj])
@@ -108,7 +103,7 @@ export function calculateSessionTimeRanges(
 				start: Number.MAX_SAFE_INTEGER, // Distant future
 				end: undefined,
 				lookaheadRank: i + 1, // This is so that we can easily work out which to use first
-				playerId: previousAssignmentMap[grp.id]?.playerId,
+				playerId: previousAssignmentMap?.[grp.id]?.playerId,
 			})
 		}
 	})
diff --git a/packages/job-worker/src/playout/abPlayback/abSessionHelper.ts b/packages/job-worker/src/playout/abPlayback/abSessionHelper.ts
index 5b97bd619b..18df420b07 100644
--- a/packages/job-worker/src/playout/abPlayback/abSessionHelper.ts
+++ b/packages/job-worker/src/playout/abPlayback/abSessionHelper.ts
@@ -40,11 +40,50 @@ export class AbSessionHelper {
 		return getRandomString()
 	}
 
+	/**
+	 * Get the full session id for an ab playback session with a globally unique sessionName
+	 */
+	getUniqueSessionId(session: TimelineObjectAbSessionInfo): string {
+		const sessionName = `${session.poolName}_${session.sessionName}`
+
+		const uniqueNameSession = this.#knownSessions.find((s) => s.isUniqueName && s.name === sessionName)
+		if (uniqueNameSession) {
+			uniqueNameSession.keep = true
+			return uniqueNameSession.id
+		}
+
+		// Otherwise define a new session
+		const sessionId = this.getNewSessionId()
+		const newSession: ABSessionInfoExt = {
+			id: sessionId,
+			name: sessionName,
+			isUniqueName: true,
+			keep: true,
+		}
+		this.#knownSessions.push(newSession)
+		return sessionId
+	}
+
+	/**
+	 * Get the full session id for an ab playback session.
+	 * Note: If sessionNameIsGloballyUnique is set, then the sessionName every reference will be treated as the same session,
+	 * otherwise sessionName should be unique within the segment unless pieces want to share a session
+	 */
+	getPieceABSessionId(pieceInstance: ReadonlyDeep<PieceInstance>, session: TimelineObjectAbSessionInfo): string {
+		if (session.sessionNameIsGloballyUnique) return this.getUniqueSessionId(session)
+
+		return this.getPieceABSessionIdFromSessionName(
+			pieceInstance,
+			this.#validateSessionName(pieceInstance._id, session)
+		)
+	}
+
 	/**
 	 * Get the full session id for an ab playback session.
 	 * Note: sessionName should be unique within the segment unless pieces want to share a session
+	 * Future: This should be private, but is exposed as a deprecated method to blueprints
 	 */
-	getPieceABSessionId(pieceInstance: ReadonlyDeep<PieceInstance>, sessionName: string): string {
+	getPieceABSessionIdFromSessionName(pieceInstance: ReadonlyDeep<PieceInstance>, sessionName: string): string {
 		const partInstanceIndex = this.#partInstances.findIndex((p) => p._id === pieceInstance.partInstanceId)
 		const partInstance = partInstanceIndex >= 0 ? this.#partInstances[partInstanceIndex] : undefined
 		if (!partInstance) throw new Error('Unknown partInstanceId in call to getPieceABSessionId')
@@ -57,19 +96,20 @@ export class AbSessionHelper {
 			return session.id
 		}
 
+		// Sessions to consider are those with the same name
+		const sessionsToConsider = this.#knownSessions.filter((s) => !s.isUniqueName && s.name === sessionName)
+
 		// If this is an infinite continuation, then reuse that
 		if (infiniteId) {
-			const infiniteSession = this.#knownSessions.find(
-				(s) => s.infiniteInstanceId === infiniteId && s.name === sessionName
-			)
+			const infiniteSession = sessionsToConsider.find((s) => s.infiniteInstanceId === infiniteId)
 			if (infiniteSession) {
 				return preserveSession(infiniteSession)
 			}
 		}
 
 		// We only want to consider sessions already tagged to this partInstance
-		const existingSession = this.#knownSessions.find(
-			(s) => s.partInstanceIds?.includes(pieceInstance.partInstanceId) && s.name === sessionName
+		const existingSession = sessionsToConsider.find((s) =>
+			s.partInstanceIds?.includes(pieceInstance.partInstanceId)
 		)
 		if (existingSession) {
 			return preserveSession(existingSession)
@@ -82,9 +122,7 @@ export class AbSessionHelper {
 		if (canReuseFromPartInstanceBefore) {
 			// Try and find a session from the part before that we can use
 			const previousPartInstanceId = this.#partInstances[partInstanceIndex - 1]._id
-			const continuedSession = this.#knownSessions.find(
-				(s) => s.partInstanceIds?.includes(previousPartInstanceId) && s.name === sessionName
-			)
+			const continuedSession = sessionsToConsider.find((s) => s.partInstanceIds?.includes(previousPartInstanceId))
 			if (continuedSession) {
 				continuedSession.partInstanceIds = [
 					...(continuedSession.partInstanceIds || []),
@@ -96,9 +134,7 @@ export class AbSessionHelper {
 
 		// Find an existing lookahead session to convert
 		const partId = partInstance.part._id
-		const lookaheadSession = this.#knownSessions.find(
-			(s) => s.name === sessionName && s.lookaheadForPartId === partId
-		)
+		const lookaheadSession = sessionsToConsider.find((s) => s.lookaheadForPartId === partId)
 		if (lookaheadSession) {
 			lookaheadSession.partInstanceIds = [pieceInstance.partInstanceId]
 			return preserveSession(lookaheadSession)
@@ -109,6 +145,7 @@ export class AbSessionHelper {
 		const newSession: ABSessionInfoExt = {
 			id: sessionId,
 			name: sessionName,
+			isUniqueName: false,
 			infiniteInstanceId: unpartialString(infiniteId),
 			partInstanceIds: !infiniteId ? [pieceInstance.partInstanceId] : [],
 			keep: true,
@@ -117,17 +154,38 @@ export class AbSessionHelper {
 		return sessionId
 	}
 
+	/**
+	 * Get the full session id for a timelineobject that belongs to an ab playback session
+	 * The same session should also be used in calls for the owning piece
+	 */
+	getTimelineObjectAbSessionId(
+		tlObj: OnGenerateTimelineObjExt,
+		session: TimelineObjectAbSessionInfo
+	): string | undefined {
+		if (session.sessionNameIsGloballyUnique) return this.getUniqueSessionId(session)
+
+		return this.getTimelineObjectAbSessionIdFromSessionName(
+			tlObj,
+			this.#validateSessionName(tlObj.pieceInstanceId || session.sessionName, session)
+		)
+	}
+
 	/**
 	 * Get the full session id for a timelineobject that belongs to an ab playback session
 	 * sessionName should also be used in calls to getPieceABSessionId for the owning piece
+	 * Future: This should be private, but is exposed as a deprecated method to blueprints
 	 */
-	getTimelineObjectAbSessionId(tlObj: OnGenerateTimelineObjExt, sessionName: string): string | undefined {
+	getTimelineObjectAbSessionIdFromSessionName(
+		tlObj: OnGenerateTimelineObjExt,
+		sessionName: string
+	): string | undefined {
+		// Sessions to consider are those with the same name
+		const sessionsToConsider = this.#knownSessions.filter((s) => !s.isUniqueName && s.name === sessionName)
+
 		// Find an infinite
 		const searchId = tlObj.infinitePieceInstanceId
 		if (searchId) {
-			const infiniteSession = this.#knownSessions.find(
-				(s) => s.infiniteInstanceId === searchId && s.name === sessionName
-			)
+			const infiniteSession = sessionsToConsider.find((s) => s.infiniteInstanceId === searchId)
 			if (infiniteSession) {
 				infiniteSession.keep = true
 				return infiniteSession.id
@@ -137,9 +195,7 @@ export class AbSessionHelper {
 		// Find an normal partInstance
 		const partInstanceId = tlObj.partInstanceId
 		if (partInstanceId) {
-			const partInstanceSession = this.#knownSessions.find(
-				(s) => s.partInstanceIds?.includes(partInstanceId) && s.name === sessionName
-			)
+			const partInstanceSession = sessionsToConsider.find((s) => s.partInstanceIds?.includes(partInstanceId))
 			if (partInstanceSession) {
 				partInstanceSession.keep = true
 				return partInstanceSession.id
@@ -153,9 +209,7 @@ export class AbSessionHelper {
 			const partInstance = this.#partInstances.find((p) => p._id === partInstanceId)
 			if (partInstance) partId = partInstance.part._id
 
-			const lookaheadSession = this.#knownSessions.find(
-				(s) => s.lookaheadForPartId === partId && s.name === sessionName
-			)
+			const lookaheadSession = sessionsToConsider.find((s) => s.lookaheadForPartId === partId)
 			if (lookaheadSession) {
 				lookaheadSession.keep = true
 				if (partInstance) {
@@ -167,6 +221,7 @@ export class AbSessionHelper {
 				this.#knownSessions.push({
 					id: sessionId,
 					name: sessionName,
+					isUniqueName: false,
 					lookaheadForPartId: partId,
 					partInstanceIds: partInstance ? [partInstanceId] : undefined,
 					keep: true,
@@ -181,7 +236,7 @@ export class AbSessionHelper {
 	/**
 	 * Make the sessionName unique for the pool, and ensure it isn't set to AUTO
 	 */
-	validateSessionName(pieceInstanceId: PieceInstanceId | string, session: TimelineObjectAbSessionInfo): string {
+	#validateSessionName(pieceInstanceId: PieceInstanceId | string, session: TimelineObjectAbSessionInfo): string {
 		const newName = session.sessionName === AB_MEDIA_PLAYER_AUTO ? pieceInstanceId : session.sessionName
 		return `${session.poolName}_${newName}`
 	}
diff --git a/packages/job-worker/src/playout/abPlayback/applyAssignments.ts b/packages/job-worker/src/playout/abPlayback/applyAssignments.ts
index 03e240df9a..62cae611fc 100644
--- a/packages/job-worker/src/playout/abPlayback/applyAssignments.ts
+++ b/packages/job-worker/src/playout/abPlayback/applyAssignments.ts
@@ -4,13 +4,15 @@ import {
 	ABResolverConfiguration,
 	ICommonContext,
 	ABTimelineLayerChangeRules,
+	AbPlayerId,
 } from '@sofie-automation/blueprints-integration'
-import { ABSessionAssignments } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
+import { ABSessionAssignment, ABSessionAssignments } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
 import { OnGenerateTimelineObjExt } from '@sofie-automation/corelib/dist/dataModel/Timeline'
 import { logger } from '../../logging'
 import * as _ from 'underscore'
 import { SessionRequest } from './abPlaybackResolver'
 import { AbSessionHelper } from './abSessionHelper'
+import { ReadonlyDeep } from 'type-fest'
 
 /**
  * Apply the ab assignments for a pool to the timeline
@@ -28,12 +30,12 @@ export function applyAbPlayerObjectAssignments(
 	blueprintContext: ICommonContext,
 	abConfiguration: Pick<ABResolverConfiguration, 'timelineObjectLayerChangeRules' | 'customApplyToObject'>,
 	timelineObjs: OnGenerateTimelineObjExt[],
-	previousAssignmentMap: ABSessionAssignments,
+	previousAssignmentMap: ReadonlyDeep<ABSessionAssignments> | undefined,
 	resolvedAssignments: Readonly<SessionRequest[]>,
 	poolName: string
 ): ABSessionAssignments {
 	const newAssignments: ABSessionAssignments = {}
-	const persistAssignment = (sessionId: string, playerId: number | string, lookahead: boolean): void => {
+	const persistAssignment = (sessionId: string, playerId: AbPlayerId, lookahead: boolean): void => {
 		// Track the assignment, so that the next onTimelineGenerate can try to reuse the same session
 		if (newAssignments[sessionId]) {
 			// TODO - warn?
@@ -47,10 +49,7 @@ export function applyAbPlayerObjectAssignments(
 		if (obj.abSessions && obj.pieceInstanceId) {
 			for (const session of obj.abSessions) {
 				if (session.poolName === poolName) {
-					const sessionId = abSessionHelper.getTimelineObjectAbSessionId(
-						obj,
-						abSessionHelper.validateSessionName(obj.pieceInstanceId, session)
-					)
+					const sessionId = abSessionHelper.getTimelineObjectAbSessionId(obj, session)
 					if (sessionId) {
 						const existing = groupedObjectsMap.get(sessionId)
 						groupedObjectsMap.set(sessionId, existing ? [...existing, obj] : [obj])
@@ -89,7 +88,7 @@ export function applyAbPlayerObjectAssignments(
 			unexpectedSessions.push(`${sessionId}(${objs.map((obj) => obj.id).join(',')})`)
 
 			// If there was a previous assignment, hopefully that is better than nothing
-			const prev = previousAssignmentMap[sessionId]
+			const prev = previousAssignmentMap?.[sessionId]
 			if (prev) {
 				failedObjects.push(
 					...updateObjectsToAbPlayer(blueprintContext, abConfiguration, poolName, prev.playerId, objs)
@@ -108,7 +107,12 @@ export function applyAbPlayerObjectAssignments(
 		logger.debug(`Unexpected sessions are: ${unexpectedSessions.join(', ')}`)
 	}
 
-	logger.silly(`ABPlayback calculated assignments for "${poolName}": ${JSON.stringify(newAssignments)}`)
+	for (const assignment of Object.values<ABSessionAssignment | undefined>(newAssignments)) {
+		if (!assignment) continue
+		logger.silly(
+			`ABPlayback: Assigned session "${poolName}"-"${assignment.sessionId}" to player "${assignment.playerId}" (lookahead: ${assignment.lookahead})`
+		)
+	}
 
 	return newAssignments
 }
@@ -117,7 +121,7 @@ function updateObjectsToAbPlayer(
 	context: ICommonContext,
 	abConfiguration: Pick<ABResolverConfiguration, 'timelineObjectLayerChangeRules' | 'customApplyToObject'>,
 	poolName: string,
-	playerId: number | string,
+	playerId: AbPlayerId,
 	objs: OnGenerateTimelineObj<TSR.TSRTimelineContent>[]
 ): OnGenerateTimelineObj<TSR.TSRTimelineContent>[] {
 	const failedObjects: OnGenerateTimelineObj<TSR.TSRTimelineContent>[] = []
@@ -140,7 +144,7 @@ function updateObjectsToAbPlayer(
 
 function applyUpdateToKeyframes(
 	poolName: string,
-	playerId: number | string,
+	playerId: AbPlayerId,
 	obj: OnGenerateTimelineObj<TSR.TSRTimelineContent>
 ): boolean {
 	if (!obj.keyframes) return false
@@ -172,7 +176,7 @@ function applyUpdateToKeyframes(
 function applylayerMoveRule(
 	timelineObjectLayerChangeRules: ABTimelineLayerChangeRules | undefined,
 	poolName: string,
-	playerId: number | string,
+	playerId: AbPlayerId,
 	obj: OnGenerateTimelineObj<TSR.TSRTimelineContent>
 ): boolean {
 	const ruleId = obj.isLookahead ? obj.lookaheadForLayer || obj.layer : obj.layer
diff --git a/packages/job-worker/src/playout/abPlayback/index.ts b/packages/job-worker/src/playout/abPlayback/index.ts
index b27d0bbb03..d803ecac46 100644
--- a/packages/job-worker/src/playout/abPlayback/index.ts
+++ b/packages/job-worker/src/playout/abPlayback/index.ts
@@ -1,18 +1,24 @@
 import { ResolvedPieceInstance } from '@sofie-automation/corelib/dist/dataModel/PieceInstance'
-import { ABSessionAssignments, DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
+import {
+	ABSessionAssignment,
+	ABSessionAssignments,
+	DBRundownPlaylist,
+} from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
 import { OnGenerateTimelineObjExt } from '@sofie-automation/corelib/dist/dataModel/Timeline'
 import { endTrace, sendTrace, startTrace } from '@sofie-automation/corelib/dist/influxdb'
 import { WrappedShowStyleBlueprint } from '../../blueprints/cache'
 import { ReadonlyDeep } from 'type-fest'
 import { JobContext, ProcessedShowStyleCompound } from '../../jobs'
 import { getCurrentTime } from '../../lib'
-import { resolveAbAssignmentsFromRequests } from './abPlaybackResolver'
+import { resolveAbAssignmentsFromRequests, SessionRequest } from './abPlaybackResolver'
 import { calculateSessionTimeRanges } from './abPlaybackSessions'
 import { applyAbPlayerObjectAssignments } from './applyAssignments'
 import { AbSessionHelper } from './abSessionHelper'
 import { ShowStyleContext } from '../../blueprints/context'
 import { logger } from '../../logging'
 import { ABPlayerDefinition } from '@sofie-automation/blueprints-integration'
+import { applyAndValidateOverrides } from '@sofie-automation/corelib/dist/settings/objectWithOverrides'
+import { abPoolFilterDisabled, findPlayersInRouteSets } from './routeSetDisabling'
 
 /**
  * Resolve and apply AB-playback for the given timeline
@@ -48,6 +54,17 @@ export function applyAbPlaybackForTimeline(
 	)
 
 	const previousAbSessionAssignments: Record<string, ABSessionAssignments> = playlist.assignedAbSessions || {}
+	logger.silly(`ABPlayback: Starting AB playback resolver ----------------------------`)
+	for (const [pool, assignments] of Object.entries<ABSessionAssignments>(previousAbSessionAssignments)) {
+		for (const assignment of Object.values<ABSessionAssignment | undefined>(assignments)) {
+			if (assignment) {
+				logger.silly(
+					`ABPlayback: Previous assignment "${pool}"-"${assignment.sessionId}" to player "${assignment.playerId}"`
+				)
+			}
+		}
+	}
+
 	const newAbSessionsResult: Record<string, ABSessionAssignments> = {}
 
 	const span = context.startSpan('blueprint.abPlaybackResolver')
@@ -56,8 +73,14 @@ export function applyAbPlaybackForTimeline(
 	const now = getCurrentTime()
 
 	const abConfiguration = blueprint.blueprint.getAbResolverConfiguration(blueprintContext)
+	const routeSetMembers = findPlayersInRouteSets(applyAndValidateOverrides(context.studio.routeSetsWithOverrides).obj)
+
 	for (const [poolName, players] of Object.entries<ABPlayerDefinition[]>(abConfiguration.pools)) {
-		const previousAssignmentMap: ABSessionAssignments = previousAbSessionAssignments[poolName] || {}
+		// Filter out offline devices
+		const filteredPlayers = abPoolFilterDisabled(poolName, players, routeSetMembers)
+
+		const previousAssignmentMap: ReadonlyDeep<ABSessionAssignments> | undefined =
+			playlist.assignedAbSessions?.[poolName]
 		const sessionRequests = calculateSessionTimeRanges(
 			abSessionHelper,
 			resolvedPieces,
@@ -68,12 +91,18 @@ export function applyAbPlaybackForTimeline(
 
 		const assignments = resolveAbAssignmentsFromRequests(
 			abConfiguration.resolverOptions,
-			players.map((player) => player.playerId),
+			filteredPlayers.map((player) => player.playerId),
 			sessionRequests,
 			now
 		)
 
-		logger.silly(`ABPlayback resolved sessions for "${poolName}": ${JSON.stringify(assignments)}`)
+		for (const assignment of Object.values<SessionRequest>(assignments.requests)) {
+			logger.silly(
+				`ABPlayback resolved session "${poolName}"-"${assignment.id}" to player "${
+					assignment.playerId
+				}" (${JSON.stringify(assignment)})`
+			)
+		}
 		if (assignments.failedRequired.length > 0) {
 			logger.warn(
 				`ABPlayback failed to assign sessions for "${poolName}": ${JSON.stringify(assignments.failedRequired)}`
diff --git a/packages/job-worker/src/playout/abPlayback/routeSetDisabling.ts b/packages/job-worker/src/playout/abPlayback/routeSetDisabling.ts
new file mode 100644
index 0000000000..d6be0a4ab6
--- /dev/null
+++ b/packages/job-worker/src/playout/abPlayback/routeSetDisabling.ts
@@ -0,0 +1,47 @@
+import type { ABPlayerDefinition } from '@sofie-automation/blueprints-integration'
+import type { StudioRouteSet } from '@sofie-automation/corelib/dist/dataModel/Studio'
+import { logger } from '../../logging'
+
+/**
+ * Map<poolName, Map<playerId, disablePlayer>>
+ * Note: this explicitly uses a string for the playerId, to avoid issues with types for values from the ui
+ */
+type MembersOfRouteSets = Map<string, Map<string, boolean>>
+
+export function findPlayersInRouteSets(routeSets: Record<string, StudioRouteSet>): MembersOfRouteSets {
+	const routeSetEnabledPlayers: MembersOfRouteSets = new Map()
+	for (const [_key, routeSet] of Object.entries<StudioRouteSet>(routeSets)) {
+		for (const abPlayer of routeSet.abPlayers) {
+			let poolEntry = routeSetEnabledPlayers.get(abPlayer.poolName)
+			if (!poolEntry) {
+				poolEntry = new Map()
+				routeSetEnabledPlayers.set(abPlayer.poolName, poolEntry)
+			}
+
+			// Make sure player is marked as enabled
+			const currentState = poolEntry.get(String(abPlayer.playerId))
+			poolEntry.set(String(abPlayer.playerId), currentState || routeSet.active)
+		}
+	}
+	return routeSetEnabledPlayers
+}
+
+export function abPoolFilterDisabled(
+	poolName: string,
+	players: ABPlayerDefinition[],
+	membersOfRouteSets: MembersOfRouteSets
+): ABPlayerDefinition[] {
+	const poolRouteSetEnabledPlayers = membersOfRouteSets.get(poolName)
+	if (!poolRouteSetEnabledPlayers || poolRouteSetEnabledPlayers.size == 0) return players
+
+	// Filter out any disabled players:
+	return players.filter((player) => {
+		const playerState = poolRouteSetEnabledPlayers.get(String(player.playerId))
+		if (playerState === false) {
+			logger.silly(`AB Pool ${poolName} playerId : ${player.playerId} are disabled`)
+			return false
+		}
+
+		return true
+	})
+}
diff --git a/packages/job-worker/src/playout/activePlaylistActions.ts b/packages/job-worker/src/playout/activePlaylistActions.ts
index 5807047523..a1594b3ec9 100644
--- a/packages/job-worker/src/playout/activePlaylistActions.ts
+++ b/packages/job-worker/src/playout/activePlaylistActions.ts
@@ -70,7 +70,8 @@ export async function activateRundownPlaylist(
 			null,
 			null,
 			playoutModel.getAllOrderedSegments(),
-			playoutModel.getAllOrderedParts()
+			playoutModel.getAllOrderedParts(),
+			{ ignoreUnplayable: true, ignoreQuickLoop: false }
 		)
 		await setNextPart(context, playoutModel, firstPart, false)
 
diff --git a/packages/job-worker/src/playout/adlibAction.ts b/packages/job-worker/src/playout/adlibAction.ts
index 736825c3ba..2168ba716c 100644
--- a/packages/job-worker/src/playout/adlibAction.ts
+++ b/packages/job-worker/src/playout/adlibAction.ts
@@ -195,10 +195,11 @@ export async function executeActionInner(
 	// If any action cannot be done due to timings, that needs to be rejected by the context
 	if (!blueprint.blueprint.executeAction) throw UserError.create(UserErrorMessage.ActionsNotSupported)
 
-	logger.info(
-		`Executing AdlibAction "${actionParameters.actionId}": ${JSON.stringify(actionParameters.userData)} (${
-			actionParameters.triggerMode
-		})`
+	logger.info(`Executing AdlibAction "${actionParameters.actionId}"`)
+	logger.silly(
+		`Executing AdlibAction Payload "${actionParameters.actionId}" Payload: ${JSON.stringify(
+			actionParameters.userData
+		)} (${actionParameters.triggerMode})`
 	)
 
 	try {
@@ -233,6 +234,7 @@ async function applyAnyExecutionSideEffects(
 	if (actionContext.takeAfterExecute) {
 		await performTakeToNextedPart(context, playoutModel, now)
 	} else if (
+		actionContext.forceRegenerateTimeline ||
 		actionContext.currentPartState !== ActionPartChange.NONE ||
 		actionContext.nextPartState !== ActionPartChange.NONE
 	) {
@@ -264,11 +266,9 @@ async function executeDataStoreAction(
 			showStyle,
 			watchedPackages
 		)
-
-		logger.info(
-			`Executing Datastore AdlibAction "${actionParameters.actionId}": ${JSON.stringify(
-				actionParameters.userData
-			)}`
+		logger.info(`Executing Datastore AdlibAction "${actionParameters.actionId}"`)
+		logger.silly(
+			`Datastore AdlibAction "${actionParameters.actionId}" Payload: ${JSON.stringify(actionParameters.userData)}`
 		)
 
 		try {
diff --git a/packages/job-worker/src/playout/adlibTesting.ts b/packages/job-worker/src/playout/adlibTesting.ts
index f87e7a6963..7ff135389d 100644
--- a/packages/job-worker/src/playout/adlibTesting.ts
+++ b/packages/job-worker/src/playout/adlibTesting.ts
@@ -39,7 +39,7 @@ export async function handleActivateAdlibTesting(context: JobContext, data: Acti
 				externalId: '',
 				title: 'Adlib Testing',
 				expectedDuration: 0,
-				expectedDurationWithPreroll: 0, // Filled in later
+				expectedDurationWithTransition: 0, // Filled in later
 				untimed: true,
 			})
 
diff --git a/packages/job-worker/src/playout/adlibUtils.ts b/packages/job-worker/src/playout/adlibUtils.ts
index f826a44a39..8392d9ec51 100644
--- a/packages/job-worker/src/playout/adlibUtils.ts
+++ b/packages/job-worker/src/playout/adlibUtils.ts
@@ -27,6 +27,7 @@ import { ReadonlyDeep } from 'type-fest'
 import { PlayoutRundownModel } from './model/PlayoutRundownModel'
 import { DBPart } from '@sofie-automation/corelib/dist/dataModel/Part'
 import { protectString } from '@sofie-automation/corelib/dist/protectedString'
+import { QuickLoopMarkerType } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
 
 export async function innerStartOrQueueAdLibPiece(
 	context: JobContext,
@@ -45,7 +46,7 @@ export async function innerStartOrQueueAdLibPiece(
 			externalId: '',
 			title: adLibPiece.name,
 			expectedDuration: adLibPiece.expectedDuration,
-			expectedDurationWithPreroll: adLibPiece.expectedDuration, // Filled in later
+			expectedDurationWithTransition: adLibPiece.expectedDuration, // Filled in later
 		}
 
 		const genericAdlibPiece = convertAdLibToGenericPiece(adLibPiece, true)
@@ -246,11 +247,34 @@ export async function insertQueuedPartWithPieces(
 
 	await setNextPart(context, playoutModel, newPartInstance, false)
 
+	temporarilyExtendQuickLoop(playoutModel, currentPartInstance, newPartInstance)
+
 	if (span) span.end()
 
 	return newPartInstance
 }
 
+function temporarilyExtendQuickLoop(
+	playoutModel: PlayoutModel,
+	currentPartInstance: PlayoutPartInstanceModel,
+	newPartInstance: PlayoutPartInstanceModel
+) {
+	const existingQuickLoopEnd = playoutModel.playlist.quickLoop?.end
+	if (!existingQuickLoopEnd) return
+
+	if (
+		existingQuickLoopEnd.type === QuickLoopMarkerType.PART &&
+		(currentPartInstance.partInstance.part._id === existingQuickLoopEnd.id ||
+			currentPartInstance.partInstance.part._id === existingQuickLoopEnd.overridenId)
+	) {
+		playoutModel.setQuickLoopMarker('end', {
+			type: QuickLoopMarkerType.PART,
+			id: newPartInstance.partInstance.part._id,
+			overridenId: existingQuickLoopEnd.overridenId ?? existingQuickLoopEnd.id,
+		})
+	}
+}
+
 export function innerStopPieces(
 	context: JobContext,
 	playoutModel: PlayoutModel,
@@ -274,61 +298,69 @@ export function innerStopPieces(
 
 	for (const resolvedPieceInstance of resolvedPieces) {
 		const pieceInstance = resolvedPieceInstance.instance
-		if (
-			!pieceInstance.userDuration &&
-			!pieceInstance.piece.virtual &&
-			filter(pieceInstance) &&
-			resolvedPieceInstance.resolvedStart !== undefined &&
-			resolvedPieceInstance.resolvedStart <= relativeStopAt &&
-			!pieceInstance.plannedStoppedPlayback
-		) {
-			switch (pieceInstance.piece.lifespan) {
-				case PieceLifespan.WithinPart:
-				case PieceLifespan.OutOnSegmentChange:
-				case PieceLifespan.OutOnRundownChange: {
-					logger.info(`Blueprint action: Cropping PieceInstance "${pieceInstance._id}" to ${stopAt}`)
-
-					const pieceInstanceModel = playoutModel.findPieceInstance(pieceInstance._id)
-					if (pieceInstanceModel) {
-						const newDuration: Required<PieceInstance>['userDuration'] = playoutModel.isMultiGatewayMode
-							? {
-									endRelativeToNow: offsetRelativeToNow,
-							  }
-							: {
-									endRelativeToPart: relativeStopAt,
-							  }
-
-						pieceInstanceModel.pieceInstance.setDuration(newDuration)
-
-						stoppedInstances.push(pieceInstance._id)
-					} else {
-						logger.warn(
-							`Blueprint action: Failed to crop PieceInstance "${pieceInstance._id}", it was not found`
-						)
-					}
-
-					break
-				}
-				case PieceLifespan.OutOnSegmentEnd:
-				case PieceLifespan.OutOnRundownEnd:
-				case PieceLifespan.OutOnShowStyleEnd: {
-					logger.info(
-						`Blueprint action: Cropping PieceInstance "${pieceInstance._id}" to ${stopAt} with a virtual`
-					)
 
-					currentPartInstance.insertVirtualPiece(
-						relativeStopAt,
-						pieceInstance.piece.lifespan,
-						pieceInstance.piece.sourceLayerId,
-						pieceInstance.piece.outputLayerId
-					)
+		// Virtual pieces aren't allowed a timed end
+		if (pieceInstance.piece.virtual) continue
+
+		// Check if piece has already had an end defined
+		if (pieceInstance.userDuration) continue
+
+		// Caller can filter out pieces
+		if (!filter(pieceInstance)) continue
+
+		// Check if piece has started yet
+		if (resolvedPieceInstance.resolvedStart == undefined || resolvedPieceInstance.resolvedStart > relativeStopAt)
+			continue
+
+		// If there end time of the piece is already known, make sure it is in the future
+		if (pieceInstance.plannedStoppedPlayback && pieceInstance.plannedStoppedPlayback <= stopAt) continue
+
+		switch (pieceInstance.piece.lifespan) {
+			case PieceLifespan.WithinPart:
+			case PieceLifespan.OutOnSegmentChange:
+			case PieceLifespan.OutOnRundownChange: {
+				logger.info(`Blueprint action: Cropping PieceInstance "${pieceInstance._id}" to ${stopAt}`)
+
+				const pieceInstanceModel = playoutModel.findPieceInstance(pieceInstance._id)
+				if (pieceInstanceModel) {
+					const newDuration: Required<PieceInstance>['userDuration'] = playoutModel.isMultiGatewayMode
+						? {
+								endRelativeToNow: offsetRelativeToNow,
+						  }
+						: {
+								endRelativeToPart: relativeStopAt,
+						  }
+
+					pieceInstanceModel.pieceInstance.setDuration(newDuration)
 
 					stoppedInstances.push(pieceInstance._id)
-					break
+				} else {
+					logger.warn(
+						`Blueprint action: Failed to crop PieceInstance "${pieceInstance._id}", it was not found`
+					)
 				}
-				default:
-					assertNever(pieceInstance.piece.lifespan)
+
+				break
+			}
+			case PieceLifespan.OutOnSegmentEnd:
+			case PieceLifespan.OutOnRundownEnd:
+			case PieceLifespan.OutOnShowStyleEnd: {
+				logger.info(
+					`Blueprint action: Cropping PieceInstance "${pieceInstance._id}" to ${stopAt} with a virtual`
+				)
+
+				currentPartInstance.insertVirtualPiece(
+					relativeStopAt,
+					pieceInstance.piece.lifespan,
+					pieceInstance.piece.sourceLayerId,
+					pieceInstance.piece.outputLayerId
+				)
+
+				stoppedInstances.push(pieceInstance._id)
+				break
 			}
+			default:
+				assertNever(pieceInstance.piece.lifespan)
 		}
 	}
 
diff --git a/packages/job-worker/src/playout/datastore.ts b/packages/job-worker/src/playout/datastore.ts
index 9e7d6c13fd..4ac971ce33 100644
--- a/packages/job-worker/src/playout/datastore.ts
+++ b/packages/job-worker/src/playout/datastore.ts
@@ -34,3 +34,33 @@ export async function cleanTimelineDatastore(context: JobContext, playoutModel:
 		mode: DatastorePersistenceMode.Temporary,
 	})
 }
+
+export async function setTimelineDatastoreValue(
+	context: JobContext,
+	key: string,
+	value: unknown,
+	mode: DatastorePersistenceMode
+): Promise<void> {
+	const studioId = context.studioId
+	const id = protectString(`${studioId}_${key}`)
+	const collection = context.directCollections.TimelineDatastores
+
+	await collection.replace({
+		_id: id,
+		studioId: studioId,
+
+		key,
+		value,
+
+		modified: Date.now(),
+		mode,
+	})
+}
+
+export async function removeTimelineDatastoreValue(context: JobContext, key: string): Promise<void> {
+	const studioId = context.studioId
+	const id = getDatastoreId(studioId, key)
+	const collection = context.directCollections.TimelineDatastores
+
+	await collection.remove({ _id: id })
+}
diff --git a/packages/job-worker/src/playout/debug.ts b/packages/job-worker/src/playout/debug.ts
index 596a0941b6..b46cadcad5 100644
--- a/packages/job-worker/src/playout/debug.ts
+++ b/packages/job-worker/src/playout/debug.ts
@@ -8,7 +8,8 @@ import { logger } from '../logging'
 import { syncPlayheadInfinitesForNextPartInstance } from './infinites'
 import { setNextPart } from './setNext'
 import { runJobWithPlayoutModel } from './lock'
-import { updateStudioTimeline, updateTimeline } from './timeline/generate'
+import { updateTimeline } from './timeline/generate'
+import { updateTimelineFromStudioPlayoutModel } from './lib'
 
 /**
  * Ensure that the infinite pieces on the nexted-part are correct
@@ -80,17 +81,6 @@ export async function handleDebugCrash(context: JobContext, data: DebugRegenerat
  */
 export async function handleDebugUpdateTimeline(context: JobContext, _data: void): Promise<void> {
 	await runJobWithStudioPlayoutModel(context, async (studioPlayoutModel) => {
-		const activePlaylists = studioPlayoutModel.getActiveRundownPlaylists()
-		if (activePlaylists.length > 1) {
-			throw new Error(`Too many active playlists`)
-		} else if (activePlaylists.length > 0) {
-			const playlist = activePlaylists[0]
-
-			await runJobWithPlayoutModel(context, { playlistId: playlist._id }, null, async (playoutModel) => {
-				await updateTimeline(context, playoutModel)
-			})
-		} else {
-			await updateStudioTimeline(context, studioPlayoutModel)
-		}
+		await updateTimelineFromStudioPlayoutModel(context, studioPlayoutModel)
 	})
 }
diff --git a/packages/job-worker/src/playout/lib.ts b/packages/job-worker/src/playout/lib.ts
index d677898e75..c2c67bf0e2 100644
--- a/packages/job-worker/src/playout/lib.ts
+++ b/packages/job-worker/src/playout/lib.ts
@@ -4,14 +4,15 @@ import { TSR } from '@sofie-automation/blueprints-integration'
 import { JobContext } from '../jobs'
 import { DBPartInstance } from '@sofie-automation/corelib/dist/dataModel/PartInstance'
 import { PartInstanceId } from '@sofie-automation/corelib/dist/dataModel/Ids'
-import { ReadonlyDeep } from 'type-fest'
 import { PlayoutModel } from './model/PlayoutModel'
 import { logger } from '../logging'
-import { getCurrentTime } from '../lib'
 import { MongoQuery } from '../db'
 import { mongoWhere } from '@sofie-automation/corelib/dist/mongo'
 import { setNextPart } from './setNext'
 import { selectNextPart } from './selectNextPart'
+import { StudioPlayoutModel } from '../studio/model/StudioPlayoutModel'
+import { runJobWithPlayoutModel } from './lock'
+import { updateTimeline, updateStudioTimeline } from './timeline/generate'
 
 /**
  * Reset the rundownPlaylist (all of the rundowns within the playlist):
@@ -40,7 +41,8 @@ export async function resetRundownPlaylist(context: JobContext, playoutModel: Pl
 			null,
 			null,
 			playoutModel.getAllOrderedSegments(),
-			playoutModel.getAllOrderedParts()
+			playoutModel.getAllOrderedParts(),
+			{ ignoreUnplayable: true, ignoreQuickLoop: false }
 		)
 		await setNextPart(context, playoutModel, firstPart, false)
 	} else {
@@ -177,30 +179,20 @@ export function prefixAllObjectIds<T extends TimelineObjGeneric>(objList: T[], p
 	})
 }
 
-/**
- * time in ms before an autotake when we don't accept takes/updates
- */
-const AUTOTAKE_UPDATE_DEBOUNCE = 5000
-const AUTOTAKE_TAKE_DEBOUNCE = 1000
-
-export function isTooCloseToAutonext(
-	currentPartInstance: ReadonlyDeep<DBPartInstance> | undefined,
-	isTake?: boolean
-): boolean {
-	if (!currentPartInstance?.part?.autoNext) return false
-
-	const debounce = isTake ? AUTOTAKE_TAKE_DEBOUNCE : AUTOTAKE_UPDATE_DEBOUNCE
-
-	const start = currentPartInstance.timings?.plannedStartedPlayback
-	if (start !== undefined && currentPartInstance.part.expectedDuration) {
-		// date.now - start = playback duration, duration + offset gives position in part
-		const playbackDuration = getCurrentTime() - start
-
-		// If there is an auto next planned
-		if (Math.abs(currentPartInstance.part.expectedDuration - playbackDuration) < debounce) {
-			return true
-		}
+export async function updateTimelineFromStudioPlayoutModel(
+	context: JobContext,
+	studioPlayoutModel: StudioPlayoutModel
+): Promise<void> {
+	const activePlaylists = studioPlayoutModel.getActiveRundownPlaylists()
+	if (activePlaylists.length > 1) {
+		throw new Error(`Too many active playlists`)
+	} else if (activePlaylists.length > 0) {
+		const playlist = activePlaylists[0]
+
+		await runJobWithPlayoutModel(context, { playlistId: playlist._id }, null, async (playoutModel) => {
+			await updateTimeline(context, playoutModel)
+		})
+	} else {
+		await updateStudioTimeline(context, studioPlayoutModel)
 	}
-
-	return false
 }
diff --git a/packages/job-worker/src/playout/lookahead/__tests__/lookahead.test.ts b/packages/job-worker/src/playout/lookahead/__tests__/lookahead.test.ts
index f0a76e3978..c3f7d174a7 100644
--- a/packages/job-worker/src/playout/lookahead/__tests__/lookahead.test.ts
+++ b/packages/job-worker/src/playout/lookahead/__tests__/lookahead.test.ts
@@ -98,7 +98,7 @@ describe('Lookahead', () => {
 				_rank: index,
 				externalId: 'MOCK_PART_' + index,
 				title: 'Part ' + index,
-				expectedDurationWithPreroll: undefined,
+				expectedDurationWithTransition: undefined,
 			}
 		}
 
diff --git a/packages/job-worker/src/playout/lookahead/__tests__/util.test.ts b/packages/job-worker/src/playout/lookahead/__tests__/util.test.ts
index 7140e4dbea..b1762bce98 100644
--- a/packages/job-worker/src/playout/lookahead/__tests__/util.test.ts
+++ b/packages/job-worker/src/playout/lookahead/__tests__/util.test.ts
@@ -11,6 +11,7 @@ import { defaultRundownPlaylist } from '../../../__mocks__/defaultCollectionObje
 import _ = require('underscore')
 import { wrapPartToTemporaryInstance } from '../../../__mocks__/partinstance'
 import { wrapDefaultObject } from '@sofie-automation/corelib/dist/settings/objectWithOverrides'
+import { ForceQuickLoopAutoNext, QuickLoopMarkerType } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
 
 describe('getOrderedPartsAfterPlayhead', () => {
 	let context!: MockJobContext
@@ -116,7 +117,7 @@ describe('getOrderedPartsAfterPlayhead', () => {
 				_rank: index,
 				externalId: 'MOCK_PART_' + index,
 				title: 'Part ' + index,
-				expectedDurationWithPreroll: undefined,
+				expectedDurationWithTransition: undefined,
 			}
 		}
 
@@ -236,7 +237,17 @@ describe('getOrderedPartsAfterPlayhead', () => {
 		expect(parts.map((p) => p._id)).toEqual([])
 
 		// Playlist could loop
-		await context.mockCollections.RundownPlaylists.update(playlistId, { $set: { loop: true } })
+		await context.mockCollections.RundownPlaylists.update(playlistId, {
+			$set: {
+				quickLoop: {
+					start: { type: QuickLoopMarkerType.PLAYLIST },
+					end: { type: QuickLoopMarkerType.PLAYLIST },
+					running: true,
+					forceAutoNext: ForceQuickLoopAutoNext.DISABLED,
+					locked: false,
+				},
+			},
+		})
 		const parts2 = await runJobWithPlayoutModel(context, { playlistId }, null, async (playoutModel) =>
 			getOrderedPartsAfterPlayhead(context, playoutModel, 5)
 		)
diff --git a/packages/job-worker/src/playout/lookahead/index.ts b/packages/job-worker/src/playout/lookahead/index.ts
index f8dda2afe7..893d6eb174 100644
--- a/packages/job-worker/src/playout/lookahead/index.ts
+++ b/packages/job-worker/src/playout/lookahead/index.ts
@@ -43,6 +43,22 @@ function findLargestLookaheadDistance(mappings: Array<[string, MappingExt]>): nu
 
 type ValidLookaheadMode = LookaheadMode.PRELOAD | LookaheadMode.WHEN_CLEAR
 
+function getPrunedEndedPieceInstances(info: SelectedPartInstanceTimelineInfo) {
+	if (!info.partInstance.timings?.plannedStartedPlayback) {
+		return info.pieceInstances
+	} else {
+		return info.pieceInstances.filter((p) => !hasPieceInstanceDefinitelyEnded(p, info.nowInPart))
+	}
+}
+function removeInfiniteContinuations(info: PartInstanceAndPieceInstances): PartInstanceAndPieceInstances {
+	const partId = info.part.part._id
+	return {
+		...info,
+		// Ignore PieceInstances that continue from the previous part, as they will not need lookahead
+		allPieces: info.allPieces.filter((inst) => !inst.infinite || inst.piece.startPartId === partId),
+	}
+}
+
 export async function getLookeaheadObjects(
 	context: JobContext,
 	playoutModel: PlayoutModel,
@@ -75,22 +91,6 @@ export async function getLookeaheadObjects(
 		},
 	})
 
-	function removeInfiniteContinuations(info: PartInstanceAndPieceInstances): PartInstanceAndPieceInstances {
-		const partId = info.part.part._id
-		return {
-			...info,
-			// Ignore PieceInstances that continue from the previous part, as they will not need lookahead
-			allPieces: info.allPieces.filter((inst) => !inst.infinite || inst.piece.startPartId === partId),
-		}
-	}
-
-	function getPrunedEndedPieceInstances(info: SelectedPartInstanceTimelineInfo) {
-		if (!info.partInstance.timings?.plannedStartedPlayback) {
-			return info.pieceInstances
-		} else {
-			return info.pieceInstances.filter((p) => !hasPieceInstanceDefinitelyEnded(p, info.nowInPart))
-		}
-	}
 	const partInstancesInfo: PartInstanceAndPieceInstances[] = _.compact([
 		partInstancesInfo0.current
 			? removeInfiniteContinuations({
@@ -104,7 +104,7 @@ export async function getLookeaheadObjects(
 		partInstancesInfo0.next
 			? removeInfiniteContinuations({
 					part: partInstancesInfo0.next.partInstance,
-					onTimeline: !!partInstancesInfo0.current?.partInstance?.part?.autoNext,
+					onTimeline: !!partInstancesInfo0.current?.partInstance?.part?.autoNext, //TODO -QL
 					nowInPart: partInstancesInfo0.next.nowInPart,
 					allPieces: partInstancesInfo0.next.pieceInstances,
 					calculatedTimings: partInstancesInfo0.next.calculatedTimings,
diff --git a/packages/job-worker/src/playout/lookahead/util.ts b/packages/job-worker/src/playout/lookahead/util.ts
index 3e3de1cbce..1300ae6f69 100644
--- a/packages/job-worker/src/playout/lookahead/util.ts
+++ b/packages/job-worker/src/playout/lookahead/util.ts
@@ -57,7 +57,7 @@ export function getOrderedPartsAfterPlayhead(
 
 	const strippedPlaylist = {
 		queuedSegmentId: alreadyConsumedQueuedSegmentId ? undefined : playlist.queuedSegmentId,
-		loop: playlist.loop,
+		quickLoop: playlist.quickLoop,
 	}
 	const nextNextPart = selectNextPart(
 		context,
@@ -65,7 +65,8 @@ export function getOrderedPartsAfterPlayhead(
 		nextPartInstance ?? currentPartInstance ?? null,
 		null,
 		orderedSegments,
-		orderedParts
+		orderedParts,
+		{ ignoreUnplayable: true, ignoreQuickLoop: false }
 	)
 	if (!nextNextPart) {
 		// We don't know where to begin searching, so we can't do anything
@@ -95,18 +96,7 @@ export function getOrderedPartsAfterPlayhead(
 		res.push(...playablePartsSlice)
 	}
 
-	if (res.length < partCount && playlist.loop) {
-		// The rundown would loop here, so lets run with that
-		const playableParts = orderedParts.filter((p) => isPartPlayable(p))
-		// Note: We only add it once, as lookahead is unlikely to show anything new in a second pass
-		res.push(...playableParts)
-
-		if (span) span.end()
-		// Final trim to ensure it is within bounds
-		return res.slice(0, partCount)
-	} else {
-		if (span) span.end()
-		// We reached the target or ran out of parts
-		return res.slice(0, partCount)
-	}
+	if (span) span.end()
+	// We reached the target or ran out of parts
+	return res.slice(0, partCount)
 }
diff --git a/packages/job-worker/src/playout/model/PlayoutModel.ts b/packages/job-worker/src/playout/model/PlayoutModel.ts
index 93390558ee..a48d17ce9f 100644
--- a/packages/job-worker/src/playout/model/PlayoutModel.ts
+++ b/packages/job-worker/src/playout/model/PlayoutModel.ts
@@ -7,12 +7,14 @@ import {
 	RundownPlaylistActivationId,
 	RundownPlaylistId,
 	SegmentId,
+	SegmentPlayoutId,
 } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import { BaseModel } from '../../modelBase'
 import {
 	ABSessionAssignments,
 	ABSessionInfo,
 	DBRundownPlaylist,
+	QuickLoopMarker,
 	RundownHoldState,
 } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
 import { ReadonlyDeep } from 'type-fest'
@@ -26,6 +28,8 @@ import { PlayoutPartInstanceModel } from './PlayoutPartInstanceModel'
 import { PeripheralDevice } from '@sofie-automation/corelib/dist/dataModel/PeripheralDevice'
 import { DBRundown } from '@sofie-automation/corelib/dist/dataModel/Rundown'
 import { PlayoutPieceInstanceModel } from './PlayoutPieceInstanceModel'
+import { PieceInstanceWithTimings } from '@sofie-automation/corelib/dist/playout/processAndPrune'
+import { PartCalculatedTimings } from '@sofie-automation/corelib/dist/playout/timings'
 
 export type DeferredFunction = (playoutModel: PlayoutModel) => void | Promise<void>
 export type DeferredAfterSaveFunction = (playoutModel: PlayoutModelReadonly) => void | Promise<void>
@@ -188,6 +192,14 @@ export interface PlayoutModel extends PlayoutModelReadonly, StudioPlayoutModelBa
 	 */
 	activatePlaylist(rehearsal: boolean): RundownPlaylistActivationId
 
+	/**
+	 * Update the active state of a RouteSet
+	 * @param routeSetId
+	 * @param isActive
+	 * @returns Whether the change may affect timeline generation
+	 */
+	switchRouteSet(routeSetId: string, isActive: boolean | 'toggle'): boolean
+
 	/**
 	 * Clear the currently selected PartInstances, so that nothing is selected for playback
 	 */
@@ -234,6 +246,11 @@ export interface PlayoutModel extends PlayoutModelReadonly, StudioPlayoutModelBa
 	 */
 	cycleSelectedPartInstances(): void
 
+	/**
+	 * Update loop markers anytime something sinificant occurs that could result in entering or exiting the mode.
+	 */
+	updateQuickLoopState(): void
+
 	/**
 	 * Set the RundownPlaylist as deactivated
 	 */
@@ -308,11 +325,39 @@ export interface PlayoutModel extends PlayoutModelReadonly, StudioPlayoutModelBa
 
 	/**
 	 * Track a Rundown as having started playback
-	 * @param rundownId If of the Rundown
+	 * @param rundownId Id of the Rundown
 	 * @param timestamp Timestamp playback started
 	 */
 	setRundownStartedPlayback(rundownId: RundownId, timestamp: number): void
 
+	/**
+	 * Track a Segment as having started playback
+	 * @param segmentPlayoutId Playout id of the Segment
+	 * @param timestamp Timestamp playback started
+	 */
+	setSegmentStartedPlayback(segmentPlayoutId: SegmentPlayoutId, timestamp: number): void
+
+	/**
+	 * Set or clear a QuickLoop Marker
+	 * @param type
+	 * @param marker
+	 */
+	setQuickLoopMarker(type: 'start' | 'end', marker: QuickLoopMarker | null): void
+
+	/**
+	 * Returns any segmentId's that are found between 2 quickloop markers, none will be returned if
+	 * the end is before the start.
+	 * @param start A quickloop marker
+	 * @param end A quickloop marker
+	 */
+	getSegmentsBetweenQuickLoopMarker(start: QuickLoopMarker, end: QuickLoopMarker): SegmentId[]
+
+	calculatePartTimings(
+		fromPartInstance: PlayoutPartInstanceModel | null,
+		toPartInstance: PlayoutPartInstanceModel,
+		toPieceInstances: PieceInstanceWithTimings[]
+	): PartCalculatedTimings
+
 	/** Lifecycle */
 
 	/**
diff --git a/packages/job-worker/src/playout/model/PlayoutPartInstanceModel.ts b/packages/job-worker/src/playout/model/PlayoutPartInstanceModel.ts
index 020130dc98..1359ac5309 100644
--- a/packages/job-worker/src/playout/model/PlayoutPartInstanceModel.ts
+++ b/packages/job-worker/src/playout/model/PlayoutPartInstanceModel.ts
@@ -111,10 +111,10 @@ export interface PlayoutPartInstanceModel {
 	markAsReset(): void
 
 	/**
-	 * Recalculate the `expectedDurationWithPreroll` property for this PartInstance
+	 * Recalculate the `expectedDurationWithTransition` property for this PartInstance
 	 * Future: is this needed? should this be handled internally?
 	 */
-	recalculateExpectedDurationWithPreroll(): void
+	recalculateExpectedDurationWithTransition(): void
 
 	/**
 	 * Remove a PieceInstance from the model.
@@ -176,6 +176,11 @@ export interface PlayoutPartInstanceModel {
 	 * @param time Reported stopped time
 	 */
 	setReportedStoppedPlayback(time: Time): boolean
+	/**
+	 * Set the Reported stopped playback time, including still-playing PieceInstances
+	 * @param time Reported stopped time on all available objects
+	 */
+	setReportedStoppedPlaybackWithPieceInstances(time: Time): boolean
 
 	/**
 	 * Set the rank of this PartInstance, to update it's position in the Segment
@@ -213,4 +218,15 @@ export interface PlayoutPartInstanceModel {
 	 * Ensure that this PartInstance is setup correctly for being in the AdlibTesting Segment
 	 */
 	validateAdlibTestingSegmentProperties(): void
+
+	/**
+	 * Whether this part instance is too close to autoNexting out of, to perform operations that might cause glitches
+	 * @param isTake
+	 */
+	isTooCloseToAutonext(isTake: boolean): boolean
+
+	/**
+	 * Returns the contained partInstance, with QuickLoop overrides applied, if needed
+	 */
+	getPartInstanceWithQuickLoopOverrides(): ReadonlyDeep<DBPartInstance>
 }
diff --git a/packages/job-worker/src/playout/model/implementation/LoadPlayoutModel.ts b/packages/job-worker/src/playout/model/implementation/LoadPlayoutModel.ts
index 769c911a7e..24a2e0fc4c 100644
--- a/packages/job-worker/src/playout/model/implementation/LoadPlayoutModel.ts
+++ b/packages/job-worker/src/playout/model/implementation/LoadPlayoutModel.ts
@@ -7,7 +7,7 @@ import { ReadonlyDeep } from 'type-fest'
 import { JobContext } from '../../../jobs'
 import { PlayoutModelImpl } from './PlayoutModelImpl'
 import { PlayoutRundownModelImpl } from './PlayoutRundownModelImpl'
-import { RundownId } from '@sofie-automation/corelib/dist/dataModel/Ids'
+import { PartInstanceId, RundownId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import { DBPartInstance } from '@sofie-automation/corelib/dist/dataModel/PartInstance'
 import { PieceInstance } from '@sofie-automation/corelib/dist/dataModel/PieceInstance'
 import { DBSegment, SegmentOrphanedReason } from '@sofie-automation/corelib/dist/dataModel/Segment'
@@ -17,11 +17,11 @@ import _ = require('underscore')
 import { clone, Complete, groupByToMap, groupByToMapFunc, literal } from '@sofie-automation/corelib/dist/lib'
 import { PlayoutSegmentModelImpl } from './PlayoutSegmentModelImpl'
 import { protectString, unprotectString } from '@sofie-automation/corelib/dist/protectedString'
-import { PlayoutPartInstanceModelImpl } from './PlayoutPartInstanceModelImpl'
 import { PeripheralDevice } from '@sofie-automation/corelib/dist/dataModel/PeripheralDevice'
 import { PlayoutModel, PlayoutModelPreInit } from '../PlayoutModel'
 import { DBPart } from '@sofie-automation/corelib/dist/dataModel/Part'
 import { RundownBaselineObj } from '@sofie-automation/corelib/dist/dataModel/RundownBaselineObj'
+import { sortRundownsWithinPlaylist } from '@sofie-automation/corelib/dist/playout/playlist'
 
 /**
  * Load a PlayoutModelPreInit for the given RundownPlaylist
@@ -59,7 +59,7 @@ export async function loadPlayoutModelPreInit(
 		peripheralDevices: PeripheralDevices,
 
 		playlist: Playlist,
-		rundowns: Rundowns,
+		rundowns: sortRundownsWithinPlaylist(Playlist.rundownIdsInOrder, Rundowns),
 
 		getRundown: (id: RundownId) => Rundowns.find((rd) => rd._id === id),
 	}
@@ -87,7 +87,7 @@ export async function createPlayoutModelFromIngestModel(
 	const [peripheralDevices, playlist, rundowns] = await loadInitData(context, loadedPlaylist, false, newRundowns)
 	const rundownIds = rundowns.map((r) => r._id)
 
-	const [partInstances, rundownsWithContent, timeline] = await Promise.all([
+	const [{ partInstances, groupedPieceInstances }, rundownsWithContent, timeline] = await Promise.all([
 		loadPartInstances(context, loadedPlaylist, rundownIds),
 		loadRundowns(context, ingestModel, rundowns),
 		loadTimeline(context),
@@ -100,6 +100,7 @@ export async function createPlayoutModelFromIngestModel(
 		peripheralDevices,
 		playlist,
 		partInstances,
+		groupedPieceInstances,
 		rundownsWithContent,
 		timeline
 	)
@@ -150,7 +151,7 @@ export async function createPlayoutModelfromInitModel(
 
 	const rundownIds = initModel.rundowns.map((r) => r._id)
 
-	const [partInstances, rundownsWithContent, timeline] = await Promise.all([
+	const [{ partInstances, groupedPieceInstances }, rundownsWithContent, timeline] = await Promise.all([
 		loadPartInstances(context, initModel.playlist, rundownIds),
 		loadRundowns(context, null, initModel.rundowns),
 		loadTimeline(context),
@@ -163,6 +164,7 @@ export async function createPlayoutModelfromInitModel(
 		initModel.peripheralDevices,
 		clone<DBRundownPlaylist>(initModel.playlist),
 		partInstances,
+		groupedPieceInstances,
 		rundownsWithContent,
 		timeline
 	)
@@ -246,7 +248,7 @@ async function loadPartInstances(
 	context: JobContext,
 	playlist: ReadonlyDeep<DBRundownPlaylist>,
 	rundownIds: RundownId[]
-): Promise<PlayoutPartInstanceModelImpl[]> {
+): Promise<{ partInstances: DBPartInstance[]; groupedPieceInstances: Map<PartInstanceId, PieceInstance[]> }> {
 	const selectedPartInstanceIds = _.compact([
 		playlist.currentPartInfo?.partInstanceId,
 		playlist.nextPartInfo?.partInstanceId,
@@ -302,15 +304,5 @@ async function loadPartInstances(
 
 	const groupedPieceInstances = groupByToMap(pieceInstances, 'partInstanceId')
 
-	const allPartInstances: PlayoutPartInstanceModelImpl[] = []
-	for (const partInstance of partInstances) {
-		const wrappedPartInstance = new PlayoutPartInstanceModelImpl(
-			partInstance,
-			groupedPieceInstances.get(partInstance._id) ?? [],
-			false
-		)
-		allPartInstances.push(wrappedPartInstance)
-	}
-
-	return allPartInstances
+	return { partInstances, groupedPieceInstances }
 }
diff --git a/packages/job-worker/src/playout/model/implementation/PlayoutModelImpl.ts b/packages/job-worker/src/playout/model/implementation/PlayoutModelImpl.ts
index 0b866afc20..f602d63fbe 100644
--- a/packages/job-worker/src/playout/model/implementation/PlayoutModelImpl.ts
+++ b/packages/job-worker/src/playout/model/implementation/PlayoutModelImpl.ts
@@ -14,6 +14,7 @@ import {
 	ABSessionAssignments,
 	ABSessionInfo,
 	DBRundownPlaylist,
+	QuickLoopMarker,
 	RundownHoldState,
 	SelectedPartInstance,
 } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
@@ -36,7 +37,8 @@ import _ = require('underscore')
 import { unprotectString } from '@sofie-automation/corelib/dist/protectedString'
 import { PlaylistLock } from '../../../jobs/lock'
 import { logger } from '../../../logging'
-import { clone, getRandomId, literal, normalizeArrayToMapFunc, sleep } from '@sofie-automation/corelib/dist/lib'
+import { clone, getRandomId, literal, normalizeArrayToMapFunc } from '@sofie-automation/corelib/dist/lib'
+import { sleep } from '@sofie-automation/shared-lib/dist/lib/lib'
 import { sortRundownIDsInPlaylist } from '@sofie-automation/corelib/dist/playout/playlist'
 import { PlayoutRundownModel } from '../PlayoutRundownModel'
 import { PlayoutRundownModelImpl } from './PlayoutRundownModelImpl'
@@ -55,6 +57,10 @@ import { ExpectedPackageDBFromStudioBaselineObjects } from '@sofie-automation/co
 import { ExpectedPlayoutItemStudio } from '@sofie-automation/corelib/dist/dataModel/ExpectedPlayoutItem'
 import { StudioBaselineHelper } from '../../../studio/model/StudioBaselineHelper'
 import { EventsJobs } from '@sofie-automation/corelib/dist/worker/events'
+import { QuickLoopService } from '../services/QuickLoopService'
+import { calculatePartTimings, PartCalculatedTimings } from '@sofie-automation/corelib/dist/playout/timings'
+import { PieceInstanceWithTimings } from '@sofie-automation/corelib/dist/playout/processAndPrune'
+import { stringifyError } from '@sofie-automation/shared-lib/dist/lib/stringifyError'
 
 export class PlayoutModelReadonlyImpl implements PlayoutModelReadonly {
 	public readonly playlistId: RundownPlaylistId
@@ -78,7 +84,9 @@ export class PlayoutModelReadonlyImpl implements PlayoutModelReadonly {
 		return this.timelineImpl
 	}
 
-	protected allPartInstances: Map<PartInstanceId, PlayoutPartInstanceModelImpl | null>
+	protected allPartInstances: Map<PartInstanceId, PlayoutPartInstanceModelImpl | null> = new Map()
+
+	protected quickLoopService: QuickLoopService
 
 	public constructor(
 		protected readonly context: JobContext,
@@ -86,7 +94,8 @@ export class PlayoutModelReadonlyImpl implements PlayoutModelReadonly {
 		playlistId: RundownPlaylistId,
 		peripheralDevices: ReadonlyDeep<PeripheralDevice[]>,
 		playlist: DBRundownPlaylist,
-		partInstances: PlayoutPartInstanceModelImpl[],
+		partInstances: DBPartInstance[],
+		groupedPieceInstances: Map<PartInstanceId, PieceInstance[]>,
 		rundowns: PlayoutRundownModelImpl[],
 		timeline: TimelineComplete | undefined
 	) {
@@ -96,11 +105,34 @@ export class PlayoutModelReadonlyImpl implements PlayoutModelReadonly {
 		this.peripheralDevices = peripheralDevices
 		this.playlistImpl = playlist
 
+		this.quickLoopService = new QuickLoopService(context, this)
+
+		this.allPartInstances = normalizeArrayToMapFunc(
+			this.createPartInstanceModelImpls(partInstances, groupedPieceInstances),
+			(p) => p.partInstance._id
+		)
+
 		this.rundownsImpl = rundowns
 
 		this.timelineImpl = timeline ?? null
+	}
 
-		this.allPartInstances = normalizeArrayToMapFunc(partInstances, (p) => p.partInstance._id)
+	private createPartInstanceModelImpls(
+		partInstances: DBPartInstance[],
+		groupedPieceInstances: Map<PartInstanceId, PieceInstance[]>
+	) {
+		const allPartInstances: PlayoutPartInstanceModelImpl[] = []
+		for (const partInstance of partInstances) {
+			const wrappedPartInstance = new PlayoutPartInstanceModelImpl(
+				partInstance,
+				groupedPieceInstances.get(partInstance._id) ?? [],
+				false,
+				this.quickLoopService
+			)
+			allPartInstances.push(wrappedPartInstance)
+		}
+
+		return allPartInstances
 	}
 
 	public get olderPartInstances(): PlayoutPartInstanceModel[] {
@@ -255,11 +287,22 @@ export class PlayoutModelImpl extends PlayoutModelReadonlyImpl implements Playou
 		playlistId: RundownPlaylistId,
 		peripheralDevices: ReadonlyDeep<PeripheralDevice[]>,
 		playlist: DBRundownPlaylist,
-		partInstances: PlayoutPartInstanceModelImpl[],
+		partInstances: DBPartInstance[],
+		groupedPieceInstances: Map<PartInstanceId, PieceInstance[]>,
 		rundowns: PlayoutRundownModelImpl[],
 		timeline: TimelineComplete | undefined
 	) {
-		super(context, playlistLock, playlistId, peripheralDevices, playlist, partInstances, rundowns, timeline)
+		super(
+			context,
+			playlistLock,
+			playlistId,
+			peripheralDevices,
+			playlist,
+			partInstances,
+			groupedPieceInstances,
+			rundowns,
+			timeline
+		)
 		context.trackCache(this)
 
 		this.#baselineHelper = new StudioBaselineHelper(context)
@@ -290,6 +333,20 @@ export class PlayoutModelImpl extends PlayoutModelReadonlyImpl implements Playou
 		this.#playlistHasChanged = true
 	}
 
+	calculatePartTimings(
+		fromPartInstance: PlayoutPartInstanceModel | null,
+		toPartInstance: PlayoutPartInstanceModel,
+		toPieceInstances: PieceInstanceWithTimings[]
+	): PartCalculatedTimings {
+		return calculatePartTimings(
+			this.playlist.holdState,
+			fromPartInstance?.getPartInstanceWithQuickLoopOverrides()?.part,
+			fromPartInstance?.pieceInstances.map((p) => p.pieceInstance.piece) ?? [],
+			toPartInstance?.getPartInstanceWithQuickLoopOverrides()?.part,
+			toPieceInstances.filter((p) => !p.infinite || p.infinite.infiniteInstanceIndex === 0).map((p) => p.piece)
+		)
+	}
+
 	#fixupPieceInstancesForPartInstance(partInstance: DBPartInstance, pieceInstances: PieceInstance[]): void {
 		for (const pieceInstance of pieceInstances) {
 			// Future: should these be PieceInstance already, or should that be handled here?
@@ -325,13 +382,18 @@ export class PlayoutModelImpl extends PlayoutModelReadonlyImpl implements Playou
 
 		this.#fixupPieceInstancesForPartInstance(newPartInstance, infinitePieceInstances)
 
-		const partInstance = new PlayoutPartInstanceModelImpl(newPartInstance, infinitePieceInstances, true)
+		const partInstance = new PlayoutPartInstanceModelImpl(
+			newPartInstance,
+			infinitePieceInstances,
+			true,
+			this.quickLoopService
+		)
 
 		for (const piece of pieces) {
 			partInstance.insertAdlibbedPiece(piece, fromAdlibId)
 		}
 
-		partInstance.recalculateExpectedDurationWithPreroll()
+		partInstance.recalculateExpectedDurationWithTransition()
 
 		this.allPartInstances.set(newPartInstance._id, partInstance)
 
@@ -366,8 +428,13 @@ export class PlayoutModelImpl extends PlayoutModelReadonlyImpl implements Playou
 
 		this.#fixupPieceInstancesForPartInstance(newPartInstance, pieceInstances)
 
-		const partInstance = new PlayoutPartInstanceModelImpl(newPartInstance, pieceInstances, true)
-		partInstance.recalculateExpectedDurationWithPreroll()
+		const partInstance = new PlayoutPartInstanceModelImpl(
+			newPartInstance,
+			pieceInstances,
+			true,
+			this.quickLoopService
+		)
+		partInstance.recalculateExpectedDurationWithTransition()
 
 		this.allPartInstances.set(newPartInstance._id, partInstance)
 
@@ -405,14 +472,18 @@ export class PlayoutModelImpl extends PlayoutModelReadonlyImpl implements Playou
 			},
 		}
 
-		const partInstance = new PlayoutPartInstanceModelImpl(newPartInstance, [], true)
-		partInstance.recalculateExpectedDurationWithPreroll()
+		const partInstance = new PlayoutPartInstanceModelImpl(newPartInstance, [], true, this.quickLoopService)
+		partInstance.recalculateExpectedDurationWithTransition()
 
 		this.allPartInstances.set(newPartInstance._id, partInstance)
 
 		return partInstance
 	}
 
+	switchRouteSet(routeSetId: string, isActive: boolean | 'toggle'): boolean {
+		return this.context.setRouteSetActive(routeSetId, isActive)
+	}
+
 	cycleSelectedPartInstances(): void {
 		this.playlistImpl.previousPartInfo = this.playlistImpl.currentPartInfo
 		this.playlistImpl.currentPartInfo = this.playlistImpl.nextPartInfo
@@ -431,7 +502,13 @@ export class PlayoutModelImpl extends PlayoutModelReadonlyImpl implements Playou
 	deactivatePlaylist(): void {
 		delete this.playlistImpl.activationId
 
+		if (this.currentPartInstance) {
+			this.currentPartInstance.setReportedStoppedPlaybackWithPieceInstances(getCurrentTime())
+			this.queuePartInstanceTimingEvent(this.currentPartInstance.partInstance._id)
+		}
+
 		this.clearSelectedPartInstances()
+		this.playlistImpl.quickLoop = this.quickLoopService.getUpdatedPropsByClearingMarkers()
 
 		this.#playlistHasChanged = true
 	}
@@ -515,12 +592,19 @@ export class PlayoutModelImpl extends PlayoutModelReadonlyImpl implements Playou
 		delete this.playlistImpl.lastTakeTime
 		delete this.playlistImpl.startedPlayback
 		delete this.playlistImpl.rundownsStartedPlayback
+		delete this.playlistImpl.segmentsStartedPlayback
 		delete this.playlistImpl.previousPersistentState
 		delete this.playlistImpl.trackedAbSessions
 		delete this.playlistImpl.queuedSegmentId
 
 		if (regenerateActivationId) this.playlistImpl.activationId = getRandomId()
 
+		// reset quickloop if applicable:
+		if (this.playlist.quickLoop && !this.playlist.quickLoop.locked) {
+			this.setQuickLoopMarker('start', null)
+			this.setQuickLoopMarker('end', null)
+		}
+
 		this.#playlistHasChanged = true
 	}
 
@@ -561,6 +645,7 @@ export class PlayoutModelImpl extends PlayoutModelReadonlyImpl implements Playou
 			...writePartInstancesAndPieceInstances(this.context, this.allPartInstances),
 			writeAdlibTestingSegments(this.context, this.rundownsImpl),
 			this.#baselineHelper.saveAllToDatabase(),
+			this.context.saveRouteSetChanges(),
 		])
 
 		this.#playlistHasChanged = false
@@ -587,7 +672,7 @@ export class PlayoutModelImpl extends PlayoutModelReadonlyImpl implements Playou
 					partExternalId: partExternalId,
 				})
 				.catch((e) => {
-					logger.warn(`Failed to queue NotifyCurrentlyPlayingPart job: ${e}`)
+					logger.warn(`Failed to queue NotifyCurrentlyPlayingPart job: ${stringifyError(e)}`)
 				})
 		}
 		this.#pendingNotifyCurrentlyPlayingPartEvent.clear()
@@ -666,7 +751,28 @@ export class PlayoutModelImpl extends PlayoutModelReadonlyImpl implements Playou
 		this.#playlistHasChanged = true
 	}
 
-	setTimeline(timelineObjs: TimelineObjGeneric[], generationVersions: TimelineCompleteGenerationVersions): void {
+	setSegmentStartedPlayback(segmentPlayoutId: SegmentPlayoutId, timestamp: number): void {
+		const segmentPlayoutIdsToKeep: string[] = []
+		if (this.previousPartInstance) {
+			segmentPlayoutIdsToKeep.push(unprotectString(this.previousPartInstance.partInstance.segmentPlayoutId))
+		}
+		if (this.currentPartInstance) {
+			segmentPlayoutIdsToKeep.push(unprotectString(this.currentPartInstance.partInstance.segmentPlayoutId))
+		}
+
+		this.playlistImpl.segmentsStartedPlayback = this.playlistImpl.segmentsStartedPlayback
+			? _.pick(this.playlistImpl.segmentsStartedPlayback, segmentPlayoutIdsToKeep)
+			: {}
+
+		const segmentPlayoutIdStr = unprotectString(segmentPlayoutId)
+		this.playlistImpl.segmentsStartedPlayback[segmentPlayoutIdStr] = timestamp
+		this.#playlistHasChanged = true
+	}
+
+	setTimeline(
+		timelineObjs: TimelineObjGeneric[],
+		generationVersions: TimelineCompleteGenerationVersions
+	): ReadonlyDeep<TimelineComplete> {
 		this.timelineImpl = {
 			_id: this.context.studioId,
 			timelineHash: getRandomId(), // randomized on every timeline change
@@ -675,6 +781,8 @@ export class PlayoutModelImpl extends PlayoutModelReadonlyImpl implements Playou
 			generationVersions: generationVersions,
 		}
 		this.#timelineHasChanged = true
+
+		return this.timelineImpl
 	}
 
 	setExpectedPackagesForStudioBaseline(packages: ExpectedPackageDBFromStudioBaselineObjects[]): void {
@@ -684,6 +792,21 @@ export class PlayoutModelImpl extends PlayoutModelReadonlyImpl implements Playou
 		this.#baselineHelper.setExpectedPlayoutItems(playoutItems)
 	}
 
+	setQuickLoopMarker(type: 'start' | 'end', marker: QuickLoopMarker | null): void {
+		this.playlistImpl.quickLoop = this.quickLoopService.getUpdatedPropsBySettingAMarker(type, marker)
+		this.playlistImpl.quickLoop = this.quickLoopService.getUpdatedProps(type)
+		this.#playlistHasChanged = true
+	}
+
+	updateQuickLoopState(): void {
+		this.playlistImpl.quickLoop = this.quickLoopService.getUpdatedProps()
+		this.#playlistHasChanged = true
+	}
+
+	getSegmentsBetweenQuickLoopMarker(start: QuickLoopMarker, end: QuickLoopMarker): SegmentId[] {
+		return this.quickLoopService.getSegmentsBetweenMarkers(start, end)
+	}
+
 	/** Lifecycle */
 
 	/** @deprecated */
diff --git a/packages/job-worker/src/playout/model/implementation/PlayoutPartInstanceModelImpl.ts b/packages/job-worker/src/playout/model/implementation/PlayoutPartInstanceModelImpl.ts
index ec82ccab1f..6347f89378 100644
--- a/packages/job-worker/src/playout/model/implementation/PlayoutPartInstanceModelImpl.ts
+++ b/packages/job-worker/src/playout/model/implementation/PlayoutPartInstanceModelImpl.ts
@@ -11,7 +11,7 @@ import { clone, getRandomId } from '@sofie-automation/corelib/dist/lib'
 import { getCurrentTime } from '../../../lib'
 import { setupPieceInstanceInfiniteProperties } from '../../pieces'
 import {
-	calculatePartExpectedDurationWithPreroll,
+	calculatePartExpectedDurationWithTransition,
 	PartCalculatedTimings,
 } from '@sofie-automation/corelib/dist/playout/timings'
 import { PartNote } from '@sofie-automation/corelib/dist/dataModel/Notes'
@@ -29,6 +29,13 @@ import { EmptyPieceTimelineObjectsBlob } from '@sofie-automation/corelib/dist/da
 import _ = require('underscore')
 import { DBPart } from '@sofie-automation/corelib/dist/dataModel/Part'
 import { IBlueprintMutatablePartSampleKeys } from '../../../blueprints/context/lib'
+import { QuickLoopService } from '../services/QuickLoopService'
+
+/**
+ * time in ms before an autotake when we don't accept takes/updates
+ */
+const AUTOTAKE_UPDATE_DEBOUNCE = 5000
+const AUTOTAKE_TAKE_DEBOUNCE = 1000
 
 interface PlayoutPieceInstanceModelSnapshotImpl {
 	PieceInstance: PieceInstance
@@ -64,6 +71,7 @@ class PlayoutPartInstanceModelSnapshotImpl implements PlayoutPartInstanceModelSn
 export class PlayoutPartInstanceModelImpl implements PlayoutPartInstanceModel {
 	partInstanceImpl: DBPartInstance
 	pieceInstancesImpl: Map<PieceInstanceId, PlayoutPieceInstanceModelImpl | null>
+	quickLoopService: QuickLoopService
 
 	#setPartInstanceValue<T extends keyof DBPartInstance>(key: T, newValue: DBPartInstance[T]): void {
 		if (newValue === undefined) {
@@ -154,9 +162,15 @@ export class PlayoutPartInstanceModelImpl implements PlayoutPartInstanceModel {
 		return result
 	}
 
-	constructor(partInstance: DBPartInstance, pieceInstances: PieceInstance[], hasChanges: boolean) {
+	constructor(
+		partInstance: DBPartInstance,
+		pieceInstances: PieceInstance[],
+		hasChanges: boolean,
+		quickLoopService: QuickLoopService
+	) {
 		this.partInstanceImpl = partInstance
 		this.#partInstanceHasChanges = hasChanges
+		this.quickLoopService = quickLoopService
 
 		this.pieceInstancesImpl = new Map()
 		for (const pieceInstance of pieceInstances) {
@@ -164,6 +178,14 @@ export class PlayoutPartInstanceModelImpl implements PlayoutPartInstanceModel {
 		}
 	}
 
+	getPartInstanceWithQuickLoopOverrides(): ReadonlyDeep<DBPartInstance> {
+		if (!this.quickLoopService.isPartWithinQuickLoop(this)) return this.partInstance
+		const overrides = this.quickLoopService.getOverridenValues(this)
+		const part = { ...this.partInstance.part, ...overrides }
+		const partInstance = { ...this.partInstance, part }
+		return partInstance
+	}
+
 	snapshotMakeCopy(): PlayoutPartInstanceModelSnapshot {
 		return new PlayoutPartInstanceModelSnapshotImpl(this)
 	}
@@ -350,13 +372,13 @@ export class PlayoutPartInstanceModelImpl implements PlayoutPartInstanceModel {
 		}
 	}
 
-	recalculateExpectedDurationWithPreroll(): void {
-		const newDuration = calculatePartExpectedDurationWithPreroll(
+	recalculateExpectedDurationWithTransition(): void {
+		const newDuration = calculatePartExpectedDurationWithTransition(
 			this.partInstanceImpl.part,
 			this.pieceInstances.map((p) => p.pieceInstance.piece)
 		)
 
-		this.#compareAndSetPartValue('expectedDurationWithPreroll', newDuration)
+		this.#compareAndSetPartValue('expectedDurationWithTransition', newDuration)
 	}
 
 	removePieceInstance(id: PieceInstanceId): boolean {
@@ -471,6 +493,19 @@ export class PlayoutPartInstanceModelImpl implements PlayoutPartInstanceModel {
 		}
 		return false
 	}
+	setReportedStoppedPlaybackWithPieceInstances(time: number): boolean {
+		if (!this.partInstance.timings?.reportedStartedPlayback) return false
+
+		let setOnAll = this.setReportedStoppedPlayback(time)
+
+		for (const model of this.pieceInstances) {
+			if (model.pieceInstance.reportedStartedPlayback) {
+				setOnAll &&= model.setReportedStoppedPlayback(time)
+			}
+		}
+
+		return setOnAll
+	}
 
 	setRank(rank: number): void {
 		this.#compareAndSetPartValue('_rank', rank)
@@ -507,7 +542,7 @@ export class PlayoutPartInstanceModelImpl implements PlayoutPartInstanceModel {
 		// Future: this could do some better validation
 
 		// filter the submission to the allowed ones
-		const trimmedProps: Partial<IBlueprintMutatablePart> = _.pick(props, [...IBlueprintMutatablePartSampleKeys])
+		const trimmedProps: Partial<IBlueprintMutatablePart> = filterPropsToAllowed(props)
 		if (Object.keys(trimmedProps).length === 0) return false
 
 		this.#compareAndSetPartInstanceValue(
@@ -531,4 +566,30 @@ export class PlayoutPartInstanceModelImpl implements PlayoutPartInstanceModel {
 		// Force this to not affect rundown timing
 		this.#compareAndSetPartValue('untimed', true)
 	}
+
+	isTooCloseToAutonext(isTake?: boolean): boolean {
+		const partInstance = this.getPartInstanceWithQuickLoopOverrides()
+		if (!partInstance.part.autoNext) return false
+
+		const debounce = isTake ? AUTOTAKE_TAKE_DEBOUNCE : AUTOTAKE_UPDATE_DEBOUNCE
+
+		const start = partInstance.timings?.plannedStartedPlayback
+		if (start !== undefined && partInstance.part.expectedDuration) {
+			// date.now - start = playback duration, duration + offset gives position in part
+			const playbackDuration = getCurrentTime() - start
+
+			// If there is an auto next planned
+			if (Math.abs(partInstance.part.expectedDuration - playbackDuration) < debounce) {
+				return true
+			}
+		}
+
+		return false
+	}
+}
+
+function filterPropsToAllowed(
+	props: Partial<IBlueprintMutatablePart<unknown>>
+): Partial<IBlueprintMutatablePart<unknown>> {
+	return _.pick(props, [...IBlueprintMutatablePartSampleKeys])
 }
diff --git a/packages/job-worker/src/playout/model/implementation/__tests__/LoadPlayoutModel.spec.ts b/packages/job-worker/src/playout/model/implementation/__tests__/LoadPlayoutModel.spec.ts
new file mode 100644
index 0000000000..76f136429e
--- /dev/null
+++ b/packages/job-worker/src/playout/model/implementation/__tests__/LoadPlayoutModel.spec.ts
@@ -0,0 +1,97 @@
+import {
+	setupDefaultRundown,
+	setupDefaultRundownPlaylist,
+	setupMockShowStyleCompound,
+} from '../../../../__mocks__/presetCollections'
+import { MockJobContext, setupDefaultJobEnvironment } from '../../../../__mocks__/context'
+import { ProcessedShowStyleCompound } from '../../../../jobs'
+import { ReadonlyDeep } from 'type-fest'
+import { protectString } from '@sofie-automation/corelib/dist/protectedString'
+import { loadPlayoutModelPreInit } from '../LoadPlayoutModel'
+import { runWithPlaylistLock } from '../../../../playout/lock'
+
+describe('LoadPlayoutModel', () => {
+	let context: MockJobContext
+	let showStyleCompound: ReadonlyDeep<ProcessedShowStyleCompound>
+
+	beforeAll(async () => {
+		context = setupDefaultJobEnvironment()
+
+		showStyleCompound = await setupMockShowStyleCompound(context)
+	})
+
+	describe('loadPlayoutModelPreInit', () => {
+		afterEach(async () =>
+			Promise.all([
+				context.mockCollections.RundownBaselineAdLibPieces.remove({}),
+				context.mockCollections.RundownBaselineAdLibActions.remove({}),
+				context.mockCollections.RundownBaselineObjects.remove({}),
+				context.mockCollections.AdLibActions.remove({}),
+				context.mockCollections.AdLibPieces.remove({}),
+				context.mockCollections.Pieces.remove({}),
+				context.mockCollections.Parts.remove({}),
+				context.mockCollections.Segments.remove({}),
+				context.mockCollections.Rundowns.remove({}),
+				context.mockCollections.RundownPlaylists.remove({}),
+			])
+		)
+
+		test('Rundowns are in order specified in RundownPlaylist', async () => {
+			// Set up a playlist:
+			const { rundownId: rundownId00, playlistId: playlistId0 } = await setupDefaultRundownPlaylist(
+				context,
+				showStyleCompound,
+				protectString('rundown00')
+			)
+			const rundownId01 = protectString('rundown01')
+			await setupDefaultRundown(context, showStyleCompound, playlistId0, rundownId01)
+			const rundownId02 = protectString('rundown02')
+			await setupDefaultRundown(context, showStyleCompound, playlistId0, rundownId02)
+
+			const playlist0 = await context.mockCollections.RundownPlaylists.findOne(playlistId0)
+			expect(playlist0).toBeTruthy()
+
+			if (!playlist0) throw new Error(`Playlist "${playlistId0}" not found!`)
+
+			const rundownIdsInOrder = [rundownId01, rundownId02, rundownId00]
+
+			await context.mockCollections.RundownPlaylists.update(playlistId0, {
+				rundownIdsInOrder,
+			})
+
+			await runWithPlaylistLock(context, playlistId0, async (lock) => {
+				const model = await loadPlayoutModelPreInit(context, lock, playlist0)
+				expect(model.rundowns.map((r) => r._id)).toMatchObject([rundownId01, rundownId02, rundownId00])
+			})
+		})
+
+		test('Rundowns not ordered in RundownPlaylist are at the end', async () => {
+			// Set up a playlist:
+			const { rundownId: rundownId00, playlistId: playlistId0 } = await setupDefaultRundownPlaylist(
+				context,
+				showStyleCompound,
+				protectString('rundown00')
+			)
+			const rundownId01 = protectString('rundown01')
+			await setupDefaultRundown(context, showStyleCompound, playlistId0, rundownId01)
+			const rundownId02 = protectString('rundown02')
+			await setupDefaultRundown(context, showStyleCompound, playlistId0, rundownId02)
+
+			const playlist0 = await context.mockCollections.RundownPlaylists.findOne(playlistId0)
+			expect(playlist0).toBeTruthy()
+
+			if (!playlist0) throw new Error(`Playlist "${playlistId0}" not found!`)
+
+			const rundownIdsInOrder = [rundownId01]
+
+			await context.mockCollections.RundownPlaylists.update(playlistId0, {
+				rundownIdsInOrder,
+			})
+
+			await runWithPlaylistLock(context, playlistId0, async (lock) => {
+				const model = await loadPlayoutModelPreInit(context, lock, playlist0)
+				expect(model.rundowns.map((r) => r._id)).toMatchObject([rundownId01, rundownId00, rundownId02])
+			})
+		})
+	})
+})
diff --git a/packages/job-worker/src/playout/model/implementation/__tests__/PlayoutPartInstanceModelImpl.spec.ts b/packages/job-worker/src/playout/model/implementation/__tests__/PlayoutPartInstanceModelImpl.spec.ts
new file mode 100644
index 0000000000..6913a33208
--- /dev/null
+++ b/packages/job-worker/src/playout/model/implementation/__tests__/PlayoutPartInstanceModelImpl.spec.ts
@@ -0,0 +1,117 @@
+import { protectString } from '@sofie-automation/corelib/dist/protectedString'
+import { DBPartInstance } from '@sofie-automation/corelib/dist/dataModel/PartInstance'
+import { getRandomId, literal } from '@sofie-automation/corelib/dist/lib'
+import { PlayoutPartInstanceModelImpl } from '../PlayoutPartInstanceModelImpl'
+import { PieceInstance, PieceInstancePiece } from '@sofie-automation/corelib/dist/dataModel/PieceInstance'
+import { IBlueprintPieceType, PieceLifespan } from '@sofie-automation/blueprints-integration'
+
+describe('PlayoutPartInstanceModelImpl', () => {
+	function createBasicDBPartInstance(): DBPartInstance {
+		return {
+			_id: getRandomId(),
+			rundownId: protectString(''),
+			segmentId: protectString(''),
+			playlistActivationId: protectString(''),
+			segmentPlayoutId: protectString(''),
+			rehearsal: false,
+
+			takeCount: 0,
+
+			part: {
+				_id: getRandomId(),
+				_rank: 0,
+				rundownId: protectString(''),
+				segmentId: protectString(''),
+				externalId: '',
+				title: '',
+
+				expectedDurationWithTransition: undefined,
+			},
+		}
+	}
+
+	function createPieceInstanceAsInfinite(id: string, fromPreviousPlayhead: boolean): PieceInstance {
+		return literal<PieceInstance>({
+			_id: protectString(id),
+			rundownId: protectString(''),
+			partInstanceId: protectString(''),
+			playlistActivationId: protectString('active'),
+			piece: literal<PieceInstancePiece>({
+				_id: protectString(`${id}_p`),
+				externalId: '',
+				startPartId: protectString(''),
+				enable: { start: 0 },
+				name: '',
+				lifespan: PieceLifespan.OutOnRundownChange,
+				sourceLayerId: '',
+				outputLayerId: '',
+				invalid: false,
+				content: {},
+				timelineObjectsString: protectString(''),
+				pieceType: IBlueprintPieceType.Normal,
+			}),
+			infinite: {
+				infiniteInstanceId: protectString(`${id}_inf`),
+				infiniteInstanceIndex: 0,
+				infinitePieceId: protectString(`${id}_p`),
+				fromPreviousPart: false,
+				fromPreviousPlayhead,
+			},
+		})
+	}
+
+	describe('replaceInfinitesFromPreviousPlayhead', () => {
+		it('works for an empty part', async () => {
+			const partInstance = createBasicDBPartInstance()
+			// note: QuickLoopService not implemented as it is not required for the test
+			const model = new PlayoutPartInstanceModelImpl(partInstance, [], false, {} as any)
+
+			expect(() => model.replaceInfinitesFromPreviousPlayhead([])).not.toThrow()
+			expect(model.pieceInstances).toEqual([])
+		})
+
+		it('keeps pieceInstance with fromPreviousPlayhead=false', async () => {
+			const partInstance = createBasicDBPartInstance()
+			// note: QuickLoopService not implemented as it is not required for the test
+			const model = new PlayoutPartInstanceModelImpl(
+				partInstance,
+				[createPieceInstanceAsInfinite('p1', false)],
+				false,
+				{} as any
+			)
+
+			expect(() => model.replaceInfinitesFromPreviousPlayhead([])).not.toThrow()
+			expect(model.pieceInstances.map((p) => p.pieceInstance._id)).toEqual(['p1'])
+		})
+
+		it('deleted pieceInstance with fromPreviousPlayhead=true if no replacement provided', async () => {
+			const partInstance = createBasicDBPartInstance()
+			// note: QuickLoopService not implemented as it is not required for the test
+			const model = new PlayoutPartInstanceModelImpl(
+				partInstance,
+				[createPieceInstanceAsInfinite('p1', true)],
+				false,
+				{} as any
+			)
+
+			expect(() => model.replaceInfinitesFromPreviousPlayhead([])).not.toThrow()
+			expect(model.pieceInstances.map((p) => p.pieceInstance._id)).toEqual([])
+		})
+
+		it('replaces pieceInstance with fromPreviousPlayhead=true if replacement provided', async () => {
+			const partInstance = createBasicDBPartInstance()
+			// note: QuickLoopService not implemented as it is not required for the test
+			const model = new PlayoutPartInstanceModelImpl(
+				partInstance,
+				[createPieceInstanceAsInfinite('p1', true)],
+				false,
+				{} as any
+			)
+
+			expect(() =>
+				model.replaceInfinitesFromPreviousPlayhead([createPieceInstanceAsInfinite('p1', true)])
+			).not.toThrow()
+			expect(model.pieceInstances.map((p) => p.pieceInstance._id)).toEqual(['p1'])
+		})
+	})
+})
diff --git a/packages/job-worker/src/playout/model/implementation/__tests__/SavePlayoutModel.spec.ts b/packages/job-worker/src/playout/model/implementation/__tests__/SavePlayoutModel.spec.ts
index 5d756c5600..92b2f7498c 100644
--- a/packages/job-worker/src/playout/model/implementation/__tests__/SavePlayoutModel.spec.ts
+++ b/packages/job-worker/src/playout/model/implementation/__tests__/SavePlayoutModel.spec.ts
@@ -8,6 +8,8 @@ import { writePartInstancesAndPieceInstances, writeAdlibTestingSegments } from '
 import { PlayoutPartInstanceModelImpl } from '../PlayoutPartInstanceModelImpl'
 import { PartInstanceId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import { PieceInstance } from '@sofie-automation/corelib/dist/dataModel/PieceInstance'
+import { mock } from 'jest-mock-extended'
+import { QuickLoopService } from '../../services/QuickLoopService'
 
 describe('SavePlayoutModel', () => {
 	function createRundownModel(segments?: DBSegment[]): PlayoutRundownModelImpl {
@@ -191,7 +193,12 @@ describe('SavePlayoutModel', () => {
 			const context = setupDefaultJobEnvironment()
 
 			const pieceInstance = { _id: 'test0' } as unknown as PieceInstance
-			const partInstanceModel = new PlayoutPartInstanceModelImpl(null as any, [pieceInstance], false)
+			const partInstanceModel = new PlayoutPartInstanceModelImpl(
+				null as any,
+				[pieceInstance],
+				false,
+				mock<QuickLoopService>()
+			)
 			expect(partInstanceModel.removePieceInstance(pieceInstance._id)).toBeTruthy()
 
 			const partInstances = new Map<PartInstanceId, PlayoutPartInstanceModelImpl | null>()
@@ -229,7 +236,12 @@ describe('SavePlayoutModel', () => {
 		it('update PartInstance', async () => {
 			const context = setupDefaultJobEnvironment()
 
-			const partInstanceModel = new PlayoutPartInstanceModelImpl({ _id: 'id0' } as any, [], false)
+			const partInstanceModel = new PlayoutPartInstanceModelImpl(
+				{ _id: 'id0' } as any,
+				[],
+				false,
+				mock<QuickLoopService>()
+			)
 			expect(partInstanceModel.partInstance.blockTakeUntil).toBeUndefined()
 			partInstanceModel.blockTakeUntil(10000)
 			expect(partInstanceModel.partInstance.blockTakeUntil).toEqual(10000)
@@ -262,7 +274,12 @@ describe('SavePlayoutModel', () => {
 			const context = setupDefaultJobEnvironment()
 
 			const pieceInstance = { _id: 'test0' } as unknown as PieceInstance
-			const partInstanceModel = new PlayoutPartInstanceModelImpl(null as any, [pieceInstance], false)
+			const partInstanceModel = new PlayoutPartInstanceModelImpl(
+				null as any,
+				[pieceInstance],
+				false,
+				mock<QuickLoopService>()
+			)
 			expect(
 				partInstanceModel.mergeOrInsertPieceInstance({
 					...pieceInstance,
@@ -304,7 +321,8 @@ describe('SavePlayoutModel', () => {
 			const partInstanceModel = new PlayoutPartInstanceModelImpl(
 				{ _id: 'id0' } as any,
 				[pieceInstance, pieceInstance2],
-				false
+				false,
+				mock<QuickLoopService>()
 			)
 			expect(
 				partInstanceModel.mergeOrInsertPieceInstance({
diff --git a/packages/job-worker/src/playout/model/services/QuickLoopService.ts b/packages/job-worker/src/playout/model/services/QuickLoopService.ts
new file mode 100644
index 0000000000..eb7bb0c6e1
--- /dev/null
+++ b/packages/job-worker/src/playout/model/services/QuickLoopService.ts
@@ -0,0 +1,288 @@
+import { MarkerPosition, compareMarkerPositions } from '@sofie-automation/corelib/dist/playout/playlist'
+import { PlayoutModelReadonly } from '../PlayoutModel'
+import {
+	ForceQuickLoopAutoNext,
+	QuickLoopMarker,
+	QuickLoopMarkerType,
+	QuickLoopProps,
+} from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
+import { ReadonlyObjectDeep } from 'type-fest/source/readonly-deep'
+import { DBPart } from '@sofie-automation/corelib/dist/dataModel/Part'
+import { RundownId, SegmentId } from '@sofie-automation/corelib/dist/dataModel/Ids'
+import { DBSegment } from '@sofie-automation/corelib/dist/dataModel/Segment'
+import { PlayoutPartInstanceModel } from '../PlayoutPartInstanceModel'
+import { JobContext } from '../../../jobs'
+import { clone } from '@sofie-automation/corelib/dist/lib'
+import { DEFAULT_FALLBACK_PART_DURATION } from '@sofie-automation/shared-lib/dist/core/constants'
+import { getCurrentTime } from '../../../lib'
+
+export class QuickLoopService {
+	constructor(private readonly context: JobContext, private readonly playoutModel: PlayoutModelReadonly) {}
+
+	isPartWithinQuickLoop(partInstanceModel: PlayoutPartInstanceModel | null): boolean | null {
+		const quickLoopProps = this.playoutModel.playlist.quickLoop
+		if (quickLoopProps?.start == null || quickLoopProps?.end == null) return false
+
+		const orderedParts = this.playoutModel.getAllOrderedParts()
+		const rundownIds = this.playoutModel.getRundownIds()
+
+		const startPosition = this.findQuickLoopMarkerPosition(quickLoopProps.start, 'start', orderedParts, rundownIds)
+		const endPosition = this.findQuickLoopMarkerPosition(quickLoopProps.end, 'end', orderedParts, rundownIds)
+
+		if (this.areMarkersFlipped(startPosition, endPosition)) return null
+
+		const partPosition = this.findPartPosition(partInstanceModel, rundownIds)
+		const isPartBetweenMarkers = partPosition
+			? compareMarkerPositions(startPosition, partPosition) >= 0 &&
+			  compareMarkerPositions(partPosition, endPosition) >= 0
+			: false
+
+		return isPartBetweenMarkers
+	}
+
+	getOverridenValues(partInstanceModel: PlayoutPartInstanceModel): Partial<DBPart> {
+		let { fallbackPartDuration } = this.context.studio.settings
+		const quickLoopProps = this.playoutModel.playlist.quickLoop
+		const isLoopingOverriden = quickLoopProps?.forceAutoNext !== ForceQuickLoopAutoNext.DISABLED
+
+		fallbackPartDuration = fallbackPartDuration ?? DEFAULT_FALLBACK_PART_DURATION
+
+		let { autoNext, expectedDuration, expectedDurationWithTransition } = partInstanceModel.partInstance.part
+
+		if (isLoopingOverriden && (expectedDuration ?? 0) < fallbackPartDuration) {
+			if (quickLoopProps?.forceAutoNext === ForceQuickLoopAutoNext.ENABLED_FORCING_MIN_DURATION) {
+				expectedDuration = fallbackPartDuration
+				expectedDurationWithTransition = fallbackPartDuration
+			}
+		}
+
+		const tooCloseToAutonext = () => {
+			const start = partInstanceModel.partInstance.timings?.plannedStartedPlayback
+			if (start !== undefined && partInstanceModel.partInstance.part.expectedDuration) {
+				// date.now - start = playback duration, duration + offset gives position in part
+				const playbackDuration = getCurrentTime() - start
+
+				// If there is an auto next planned
+				if (partInstanceModel.partInstance.part.expectedDuration - playbackDuration < 0) {
+					return true
+				}
+			}
+
+			return false
+		}
+
+		autoNext = autoNext || (isLoopingOverriden && (expectedDuration ?? 0) > 0 && !tooCloseToAutonext())
+		return { autoNext, expectedDuration, expectedDurationWithTransition }
+	}
+
+	getUpdatedProps(hasJustSetMarker?: 'start' | 'end'): QuickLoopProps | undefined {
+		if (this.playoutModel.playlist.quickLoop == null) return undefined
+		const quickLoopProps = clone(this.playoutModel.playlist.quickLoop)
+		const wasLoopRunning = quickLoopProps.running
+
+		this.resetDynamicallyInsertedPartOverrideIfNoLongerNeeded(quickLoopProps)
+
+		// remove the marker if it no longer exists inside the rundown
+		if (quickLoopProps.start && !this.doesMarkerExist(quickLoopProps.start)) delete quickLoopProps.start
+		if (quickLoopProps.end && !this.doesMarkerExist(quickLoopProps.end)) delete quickLoopProps.end
+
+		if (quickLoopProps.start == null || quickLoopProps.end == null) {
+			quickLoopProps.running = false
+		} else {
+			const isCurrentBetweenMarkers = this.isPartWithinQuickLoop(this.playoutModel.currentPartInstance)
+
+			if (isCurrentBetweenMarkers === null) {
+				if (hasJustSetMarker === 'start') {
+					delete quickLoopProps.end
+				} else if (hasJustSetMarker === 'end') {
+					delete quickLoopProps.start
+				}
+			}
+
+			quickLoopProps.running =
+				quickLoopProps.start != null && quickLoopProps.end != null && !!isCurrentBetweenMarkers
+		}
+
+		if (wasLoopRunning && !quickLoopProps.running) {
+			// clears the loop markers after leaving the loop, as per the requirements, but perhaps it should be optional
+			return undefined
+		}
+
+		return quickLoopProps
+	}
+
+	getUpdatedPropsBySettingAMarker(type: 'start' | 'end', marker: QuickLoopMarker | null): QuickLoopProps | undefined {
+		if (this.playoutModel.playlist.quickLoop?.locked) {
+			throw new Error('Looping is locked')
+		}
+		const quickLoopProps = {
+			running: false,
+			locked: false,
+			...clone(this.playoutModel.playlist.quickLoop),
+			forceAutoNext: this.context.studio.settings.forceQuickLoopAutoNext ?? ForceQuickLoopAutoNext.DISABLED,
+		}
+		if (type === 'start') {
+			if (marker == null) {
+				delete quickLoopProps.start
+			} else {
+				quickLoopProps.start = marker
+			}
+		} else {
+			if (marker == null) {
+				delete quickLoopProps.end
+			} else {
+				quickLoopProps.end = marker
+			}
+		}
+
+		return quickLoopProps
+	}
+
+	getUpdatedPropsByClearingMarkers(): QuickLoopProps | undefined {
+		if (!this.playoutModel.playlist.quickLoop || this.playoutModel.playlist.quickLoop.locked) return undefined
+
+		const quickLoopProps = clone(this.playoutModel.playlist.quickLoop)
+		delete quickLoopProps.start
+		delete quickLoopProps.end
+		quickLoopProps.running = false
+
+		return quickLoopProps
+	}
+
+	getSegmentsBetweenMarkers(startMarker: QuickLoopMarker, endMarker: QuickLoopMarker): SegmentId[] {
+		const segments = this.playoutModel.getAllOrderedSegments()
+		const segmentIds: SegmentId[] = []
+
+		let passedStart = false
+		let seenLastRundown = false
+
+		for (const s of segments) {
+			if (
+				(!passedStart &&
+					((startMarker.type === QuickLoopMarkerType.PART && s.getPart(startMarker.id)) ||
+						(startMarker.type === QuickLoopMarkerType.SEGMENT && s.segment._id === startMarker.id) ||
+						(startMarker.type === QuickLoopMarkerType.RUNDOWN &&
+							s.segment.rundownId === startMarker.id))) ||
+				startMarker.type === QuickLoopMarkerType.PLAYLIST
+			) {
+				// the start marker is inside this segment, is this segment, or this is the first segment that is in the loop
+				// segments from here on are included in the loop
+				passedStart = true
+			}
+
+			if (endMarker.type === QuickLoopMarkerType.RUNDOWN) {
+				// last rundown needs to be inclusive so we need to break once the rundownId is not equal to segment's rundownId
+				if (s.segment.rundownId === endMarker.id) {
+					if (!passedStart) {
+						// we hit the end before the start so quit now:
+						break
+					}
+					seenLastRundown = true
+				} else if (seenLastRundown) {
+					// we have passed the last rundown
+					break
+				}
+			}
+
+			if (passedStart) {
+				// passed the start but we have not seen the end yet
+				segmentIds.push(s.segment._id)
+			}
+
+			if (
+				(endMarker.type === QuickLoopMarkerType.PART && s.getPart(endMarker.id)) ||
+				(endMarker.type === QuickLoopMarkerType.SEGMENT && s.segment._id === endMarker.id)
+			) {
+				// the endMarker is in this segment or this segment is the end marker
+				break
+			}
+		}
+
+		return segmentIds
+	}
+
+	private areMarkersFlipped(startPosition: MarkerPosition, endPosition: MarkerPosition) {
+		return compareMarkerPositions(startPosition, endPosition) < 0
+	}
+
+	private resetDynamicallyInsertedPartOverrideIfNoLongerNeeded(quickLoopProps: QuickLoopProps) {
+		const endMarker = quickLoopProps.end
+		if (
+			endMarker?.type === QuickLoopMarkerType.PART &&
+			endMarker.overridenId &&
+			endMarker.id !== this.playoutModel.currentPartInstance?.partInstance.part._id &&
+			endMarker.id !== this.playoutModel.nextPartInstance?.partInstance.part._id
+		) {
+			endMarker.id = endMarker.overridenId
+			delete endMarker.overridenId
+		}
+	}
+
+	private findQuickLoopMarkerPosition(
+		marker: QuickLoopMarker,
+		type: 'start' | 'end',
+		orderedParts: ReadonlyObjectDeep<DBPart>[],
+		rundownIds: RundownId[]
+	): MarkerPosition {
+		let part: ReadonlyObjectDeep<DBPart> | undefined
+		let segment: ReadonlyObjectDeep<DBSegment> | undefined
+		let rundownRank
+		if (marker.type === QuickLoopMarkerType.PART) {
+			const partId = marker.id
+			const partIndex = orderedParts.findIndex((part) => part._id === partId)
+			part = orderedParts[partIndex]
+		}
+		if (marker.type === QuickLoopMarkerType.SEGMENT) {
+			segment = this.playoutModel.findSegment(marker.id)?.segment
+		} else if (part != null) {
+			segment = this.playoutModel.findSegment(part.segmentId)?.segment
+		}
+		if (marker.type === QuickLoopMarkerType.RUNDOWN) {
+			rundownRank = rundownIds.findIndex((id) => id === marker.id)
+		} else if (part ?? segment != null) {
+			rundownRank = rundownIds.findIndex((id) => id === (part ?? segment)?.rundownId)
+		}
+		const fallback = type === 'start' ? -Infinity : Infinity
+		return {
+			partRank: part?._rank ?? fallback,
+			segmentRank: segment?._rank ?? fallback,
+			rundownRank: rundownRank ?? fallback,
+		}
+	}
+
+	/**
+	 * Check whether the thing a marker references still exists within the playlist
+	 * @param marker Marker to find
+	 */
+	private doesMarkerExist(marker: QuickLoopMarker) {
+		let found = false
+
+		if (marker.type === QuickLoopMarkerType.PART) {
+			found = !!this.playoutModel.findPart(marker.id)
+		} else if (marker.type === QuickLoopMarkerType.SEGMENT) {
+			found = !!this.playoutModel.findSegment(marker.id)
+		} else if (marker.type === QuickLoopMarkerType.RUNDOWN) {
+			found = !!this.playoutModel.getRundown(marker.id)
+		} else {
+			// we can't lose the playlist so that marker is always valid
+			found = true
+		}
+
+		return found
+	}
+
+	private findPartPosition(
+		partInstance: PlayoutPartInstanceModel | null,
+		rundownIds: RundownId[]
+	): MarkerPosition | undefined {
+		if (partInstance == null) return undefined
+		const currentSegment = this.playoutModel.findSegment(partInstance.partInstance.segmentId)?.segment
+		const currentRundownIndex = rundownIds.findIndex((id) => id === partInstance.partInstance.rundownId)
+
+		return {
+			partRank: partInstance.partInstance.part._rank,
+			segmentRank: currentSegment?._rank ?? 0,
+			rundownRank: currentRundownIndex ?? 0,
+		}
+	}
+}
diff --git a/packages/job-worker/src/playout/quickLoopMarkers.ts b/packages/job-worker/src/playout/quickLoopMarkers.ts
new file mode 100644
index 0000000000..51d4d05cf6
--- /dev/null
+++ b/packages/job-worker/src/playout/quickLoopMarkers.ts
@@ -0,0 +1,109 @@
+import { UserError, UserErrorMessage } from '@sofie-automation/corelib/dist/error'
+import { SetQuickLoopMarkerProps } from '@sofie-automation/corelib/dist/worker/studio'
+import { JobContext } from '../jobs'
+import { runJobWithPlayoutModel } from './lock'
+import { updateTimeline } from './timeline/generate'
+import { selectNextPart } from './selectNextPart'
+import { setNextPart } from './setNext'
+import { resetPartInstancesWithPieceInstances } from './lib'
+import { QuickLoopMarker, QuickLoopMarkerType } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
+import { SegmentId } from '@sofie-automation/corelib/dist/dataModel/Ids'
+import { clone } from 'underscore'
+
+export async function handleSetQuickLoopMarker(context: JobContext, data: SetQuickLoopMarkerProps): Promise<void> {
+	return runJobWithPlayoutModel(
+		context,
+		data,
+		async (playoutModel) => {
+			const playlist = playoutModel.playlist
+			if (!playlist.activationId) throw UserError.create(UserErrorMessage.InactiveRundown)
+		},
+		async (playoutModel) => {
+			const playlist = playoutModel.playlist
+			if (!playlist.activationId) throw new Error(`Playlist has no activationId!`)
+			const oldProps = clone(playoutModel.playlist.quickLoop)
+			const wasQuickLoopRunning = oldProps?.running
+			playoutModel.setQuickLoopMarker(data.type, data.marker)
+
+			const markerChanged = (
+				markerA: QuickLoopMarker | undefined,
+				markerB: QuickLoopMarker | undefined
+			): boolean => {
+				if (!markerA || !markerB) return false
+
+				if (
+					(markerA.type === QuickLoopMarkerType.RUNDOWN ||
+						markerA.type === QuickLoopMarkerType.SEGMENT ||
+						markerA.type === QuickLoopMarkerType.PART) &&
+					(markerB.type === QuickLoopMarkerType.RUNDOWN ||
+						markerB.type === QuickLoopMarkerType.SEGMENT ||
+						markerB.type === QuickLoopMarkerType.PART)
+				) {
+					return markerA.id !== markerB.id
+				}
+
+				return false
+			}
+
+			if (playlist.currentPartInfo) {
+				// rundown is on air
+				let segmentsToReset: SegmentId[] = []
+
+				if (
+					playlist.quickLoop?.start &&
+					oldProps?.start &&
+					markerChanged(oldProps.start, playlist.quickLoop.start)
+				) {
+					// start marker changed
+					segmentsToReset = playoutModel.getSegmentsBetweenQuickLoopMarker(
+						playlist.quickLoop.start,
+						oldProps.start
+					)
+				} else if (
+					playlist.quickLoop?.end &&
+					oldProps?.end &&
+					markerChanged(oldProps.end, playlist.quickLoop.end)
+				) {
+					// end marker changed
+					segmentsToReset = playoutModel.getSegmentsBetweenQuickLoopMarker(
+						oldProps.end,
+						playlist.quickLoop.end
+					)
+				} else if (playlist.quickLoop?.start && playlist.quickLoop.end && !(oldProps?.start && oldProps.end)) {
+					// a new loop was created
+					segmentsToReset = playoutModel.getSegmentsBetweenQuickLoopMarker(
+						playlist.quickLoop.start,
+						playlist.quickLoop.end
+					)
+				}
+
+				// reset segments that have been added to the loop and are not on-air
+				resetPartInstancesWithPieceInstances(context, playoutModel, {
+					segmentId: {
+						$in: segmentsToReset.filter(
+							(segmentId) =>
+								segmentId !== playoutModel.currentPartInstance?.partInstance.segmentId &&
+								segmentId !== playoutModel.nextPartInstance?.partInstance.segmentId
+						),
+					},
+				})
+			}
+
+			if (wasQuickLoopRunning) {
+				const nextPart = selectNextPart(
+					context,
+					playoutModel.playlist,
+					playoutModel.currentPartInstance?.partInstance ?? null,
+					playoutModel.nextPartInstance?.partInstance ?? null,
+					playoutModel.getAllOrderedSegments(),
+					playoutModel.getAllOrderedParts(),
+					{ ignoreUnplayable: true, ignoreQuickLoop: false }
+				)
+				if (nextPart?.part._id !== playoutModel.nextPartInstance?.partInstance.part._id) {
+					await setNextPart(context, playoutModel, nextPart, false)
+				}
+			}
+			await updateTimeline(context, playoutModel)
+		}
+	)
+}
diff --git a/packages/job-worker/src/playout/resolvedPieces.ts b/packages/job-worker/src/playout/resolvedPieces.ts
index 46c8c83067..089ea5f83f 100644
--- a/packages/job-worker/src/playout/resolvedPieces.ts
+++ b/packages/job-worker/src/playout/resolvedPieces.ts
@@ -47,13 +47,14 @@ export function getResolvedPiecesForPartInstancesOnTimeline(
 
 	const currentPartStarted = partInstancesInfo.current.partStarted ?? now
 	const nextPartStarted =
+		partInstancesInfo.current.partInstance.part.autoNext &&
 		partInstancesInfo.current.partInstance.part.expectedDuration !== undefined
 			? currentPartStarted + partInstancesInfo.current.partInstance.part.expectedDuration
 			: null
 
 	// Calculate the next part if needed
 	let nextResolvedPieces: ResolvedPieceInstance[] = []
-	if (partInstancesInfo.next && partInstancesInfo.current.partInstance.part.autoNext && nextPartStarted != null) {
+	if (partInstancesInfo.next && nextPartStarted != null) {
 		const nowInPart = partInstancesInfo.next.nowInPart
 		nextResolvedPieces = partInstancesInfo.next.pieceInstances.map((instance) =>
 			resolvePrunedPieceInstance(nowInPart, instance)
diff --git a/packages/job-worker/src/playout/selectNextPart.ts b/packages/job-worker/src/playout/selectNextPart.ts
index 607574c4d1..d07abbf446 100644
--- a/packages/job-worker/src/playout/selectNextPart.ts
+++ b/packages/job-worker/src/playout/selectNextPart.ts
@@ -1,7 +1,11 @@
 import { DBPart, isPartPlayable } from '@sofie-automation/corelib/dist/dataModel/Part'
 import { JobContext } from '../jobs'
 import { DBPartInstance } from '@sofie-automation/corelib/dist/dataModel/PartInstance'
-import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
+import {
+	DBRundownPlaylist,
+	ForceQuickLoopAutoNext,
+	QuickLoopMarkerType,
+} from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
 import { SegmentId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import { ReadonlyDeep } from 'type-fest'
 import { PlayoutSegmentModel } from './model/PlayoutSegmentModel'
@@ -33,12 +37,12 @@ export interface SelectNextPartResult {
 
 export function selectNextPart(
 	context: JobContext,
-	rundownPlaylist: Pick<DBRundownPlaylist, 'queuedSegmentId' | 'loop'>,
+	rundownPlaylist: Pick<DBRundownPlaylist, 'queuedSegmentId' | 'quickLoop'>,
 	previousPartInstance: ReadonlyDeep<DBPartInstance> | null,
 	currentlySelectedPartInstance: ReadonlyDeep<DBPartInstance> | null,
 	segments: readonly PlayoutSegmentModel[],
 	parts0: ReadonlyDeep<DBPart>[],
-	ignoreUnplayabale = true
+	options: { ignoreUnplayable: boolean; ignoreQuickLoop: boolean }
 ): SelectNextPartResult | null {
 	const span = context.startSpan('selectNextPart')
 
@@ -61,13 +65,62 @@ export function selectNextPart(
 		// Filter to after and find the first playabale
 		for (let index = offset; index < (length || parts.length); index++) {
 			const part = parts[index]
-			if ((!ignoreUnplayabale || isPartPlayable(part)) && (!condition || condition(part))) {
-				return { part, index, consumesQueuedSegmentId: false }
+			if (options.ignoreUnplayable && !isPartPlayable(part)) {
+				continue
 			}
+			if (
+				!options.ignoreQuickLoop &&
+				rundownPlaylist.quickLoop?.running &&
+				context.studio.settings.forceQuickLoopAutoNext === ForceQuickLoopAutoNext.ENABLED_WHEN_VALID_DURATION &&
+				!isPartPlayableInQuickLoop(part)
+			) {
+				continue
+			}
+			if (condition && !condition(part)) {
+				continue
+			}
+			return { part, index, consumesQueuedSegmentId: false }
+		}
+		return undefined
+	}
+
+	const findQuickLoopStartPart = (length: number): SelectNextPartResult | undefined => {
+		if (rundownPlaylist.quickLoop?.start?.type === QuickLoopMarkerType.PART) {
+			const startPartId = rundownPlaylist.quickLoop.start.id
+			return findFirstPlayablePart(0, (part) => part._id === startPartId, length)
+		}
+		if (rundownPlaylist.quickLoop?.start?.type === QuickLoopMarkerType.SEGMENT) {
+			const startSegmentId = rundownPlaylist.quickLoop.start.id
+			return findFirstPlayablePart(0, (part) => part.segmentId === startSegmentId, length)
+		}
+		if (rundownPlaylist.quickLoop?.start?.type === QuickLoopMarkerType.PLAYLIST) {
+			return findFirstPlayablePart(0, undefined, length)
 		}
 		return undefined
 	}
 
+	if (!options.ignoreQuickLoop && rundownPlaylist.quickLoop?.running && previousPartInstance) {
+		const currentIndex = parts.findIndex((p) => p._id === previousPartInstance.part._id)
+		if (
+			rundownPlaylist.quickLoop?.end?.type === QuickLoopMarkerType.PART &&
+			(previousPartInstance.part._id === rundownPlaylist.quickLoop.end.id ||
+				previousPartInstance.part._id === rundownPlaylist.quickLoop.end.overridenId)
+		) {
+			return findQuickLoopStartPart(currentIndex + 1) ?? null
+		} else if (
+			rundownPlaylist.quickLoop?.end?.type === QuickLoopMarkerType.SEGMENT &&
+			previousPartInstance.part.segmentId === rundownPlaylist.quickLoop.end.id
+		) {
+			const nextPlayablePart = findFirstPlayablePart(
+				currentIndex + 1,
+				(part) => part.segmentId === previousPartInstance.part.segmentId
+			)
+			if (!nextPlayablePart) {
+				return findQuickLoopStartPart(currentIndex + 1) ?? null
+			}
+		}
+	}
+
 	let searchFromIndex = 0
 	if (previousPartInstance) {
 		const currentIndex = parts.findIndex((p) => p._id === previousPartInstance.part._id)
@@ -139,12 +192,19 @@ export function selectNextPart(
 		}
 	}
 
-	// if playlist should loop, check from 0 to currentPart
-	if (rundownPlaylist.loop && !nextPart && previousPartInstance) {
-		// Search up until the current part
-		nextPart = findFirstPlayablePart(0, undefined, searchFromIndex - 1)
+	if (
+		!options.ignoreQuickLoop &&
+		rundownPlaylist.quickLoop?.end?.type === QuickLoopMarkerType.PLAYLIST &&
+		!nextPart &&
+		previousPartInstance
+	) {
+		nextPart = findQuickLoopStartPart(searchFromIndex - 1)
 	}
 
 	if (span) span.end()
 	return nextPart ?? null
 }
+
+function isPartPlayableInQuickLoop(part: ReadonlyDeep<DBPart>): boolean {
+	return (part.expectedDuration ?? 0) > 0
+}
diff --git a/packages/job-worker/src/playout/setNext.ts b/packages/job-worker/src/playout/setNext.ts
index ab6fcf7514..a6178d3347 100644
--- a/packages/job-worker/src/playout/setNext.ts
+++ b/packages/job-worker/src/playout/setNext.ts
@@ -131,6 +131,8 @@ export async function setNextPart(
 
 	resetPartInstancesWhenChangingSegment(context, playoutModel)
 
+	playoutModel.updateQuickLoopState()
+
 	await cleanupOrphanedItems(context, playoutModel)
 
 	if (span) span.end()
diff --git a/packages/job-worker/src/playout/snapshot.ts b/packages/job-worker/src/playout/snapshot.ts
index ded023007b..5955ce1379 100644
--- a/packages/job-worker/src/playout/snapshot.ts
+++ b/packages/job-worker/src/playout/snapshot.ts
@@ -163,7 +163,7 @@ export async function handleRestorePlaylistSnapshot(
 
 	for (const rd of snapshot.rundowns) {
 		if (!rd.orphaned) {
-			rd.orphaned = RundownOrphanedReason.FROM_SNAPSHOT
+			rd.orphaned = RundownOrphanedReason.MANUAL
 		}
 
 		rd.playlistId = playlistId
@@ -242,12 +242,14 @@ export async function handleRestorePlaylistSnapshot(
 
 		partIdMap.set(oldId, part._id)
 	}
+
 	const partInstanceOldRundownIdMap = new Map<PartInstanceId, RundownId>()
 	const partInstanceIdMap = new Map<PartInstanceId, PartInstanceId>()
 	for (const partInstance of snapshot.partInstances) {
 		const oldId = partInstance._id
 		partInstance._id = getRandomId()
 		partInstanceIdMap.set(oldId, partInstance._id)
+
 		partInstance.part._id = partIdMap.get(partInstance.part._id) || getRandomId()
 		partInstanceOldRundownIdMap.set(oldId, partInstance.rundownId)
 	}
@@ -279,7 +281,6 @@ export async function handleRestorePlaylistSnapshot(
 		...snapshot.baselineAdLibActions,
 	]) {
 		const oldId = adlib._id
-		if (adlib.partId) adlib.partId = partIdMap.get(adlib.partId)
 		adlib._id = getRandomId()
 		pieceIdMap.set(oldId, adlib._id)
 	}
@@ -367,7 +368,7 @@ export async function handleRestorePlaylistSnapshot(
 			piece?: unknown
 		}
 	>(objs: undefined | T[], updateId: boolean): T[] {
-		const updateIds = (obj: T) => {
+		const updateIds = (obj: T, updateOwnId: boolean) => {
 			if (obj.rundownId) {
 				obj.rundownId = getNewRundownId(obj.rundownId)
 			}
@@ -382,20 +383,20 @@ export async function handleRestorePlaylistSnapshot(
 				obj.partInstanceId = partInstanceIdMap.get(obj.partInstanceId) || getRandomId()
 			}
 
-			if (updateId) {
+			if (updateOwnId) {
 				obj._id = getRandomId()
 			}
 
 			if (obj.part) {
-				updateIds(obj.part as any)
+				updateIds(obj.part as any, false)
 			}
 			if (obj.piece) {
-				updateIds(obj.piece as any)
+				updateIds(obj.piece as any, false)
 			}
 
 			return obj
 		}
-		return (objs || []).map((obj) => updateIds(obj))
+		return (objs || []).map((obj) => updateIds(obj, updateId))
 	}
 
 	await Promise.all([
@@ -417,13 +418,13 @@ export async function handleRestorePlaylistSnapshot(
 			context,
 			context.directCollections.RundownBaselineAdLibPieces,
 			{ rundownId: { $in: rundownIds } },
-			updateItemIds(snapshot.baselineAdlibs, true)
+			updateItemIds(snapshot.baselineAdlibs, false)
 		),
 		saveIntoDb(
 			context,
 			context.directCollections.RundownBaselineAdLibActions,
 			{ rundownId: { $in: rundownIds } },
-			updateItemIds(snapshot.baselineAdLibActions, true)
+			updateItemIds(snapshot.baselineAdLibActions, false)
 		),
 		saveIntoDb(
 			context,
@@ -459,13 +460,13 @@ export async function handleRestorePlaylistSnapshot(
 			context,
 			context.directCollections.AdLibPieces,
 			{ rundownId: { $in: rundownIds } },
-			updateItemIds(snapshot.adLibPieces, true)
+			updateItemIds(snapshot.adLibPieces, false)
 		),
 		saveIntoDb(
 			context,
 			context.directCollections.AdLibActions,
 			{ rundownId: { $in: rundownIds } },
-			updateItemIds(snapshot.adLibActions, true)
+			updateItemIds(snapshot.adLibActions, false)
 		),
 		saveIntoDb(
 			context,
@@ -477,13 +478,13 @@ export async function handleRestorePlaylistSnapshot(
 			context,
 			context.directCollections.ExpectedPlayoutItems,
 			{ rundownId: { $in: rundownIds } },
-			updateItemIds(snapshot.expectedPlayoutItems || [], false)
+			updateItemIds(snapshot.expectedPlayoutItems || [], true)
 		),
 		saveIntoDb(
 			context,
 			context.directCollections.ExpectedPackages,
 			{ rundownId: { $in: rundownIds } },
-			updateItemIds(snapshot.expectedPackages || [], false)
+			snapshot.expectedPackages || []
 		),
 	])
 
diff --git a/packages/job-worker/src/playout/take.ts b/packages/job-worker/src/playout/take.ts
index f4a404d993..e8e704296f 100644
--- a/packages/job-worker/src/playout/take.ts
+++ b/packages/job-worker/src/playout/take.ts
@@ -1,16 +1,12 @@
 import { PeripheralDeviceType } from '@sofie-automation/corelib/dist/dataModel/PeripheralDevice'
 import { DBRundown } from '@sofie-automation/corelib/dist/dataModel/Rundown'
-import {
-	DBRundownPlaylist,
-	RundownHoldState,
-	SelectedPartInstance,
-} from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
+import { RundownHoldState, SelectedPartInstance } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
 import { UserError, UserErrorMessage } from '@sofie-automation/corelib/dist/error'
 import { logger } from '../logging'
 import { JobContext, ProcessedShowStyleCompound } from '../jobs'
 import { PlayoutModel } from './model/PlayoutModel'
 import { PlayoutPartInstanceModel } from './model/PlayoutPartInstanceModel'
-import { isTooCloseToAutonext } from './lib'
+import { resetPartInstancesWithPieceInstances } from './lib'
 import { selectNextPart } from './selectNextPart'
 import { setNextPart } from './setNext'
 import { getCurrentTime } from '../lib'
@@ -25,7 +21,6 @@ import { OnTakeContext, PartEventContext, RundownContext } from '../blueprints/c
 import { WrappedShowStyleBlueprint } from '../blueprints/cache'
 import { innerStopPieces } from './adlibUtils'
 import { reportPartInstanceHasStarted, reportPartInstanceHasStopped } from './timings/partPlayback'
-import { calculatePartTimings } from '@sofie-automation/corelib/dist/playout/timings'
 import { convertPartInstanceToBlueprints, convertResolvedPieceInstanceToBlueprints } from '../blueprints/context/lib'
 import { processAndPrunePieceInstanceTimings } from '@sofie-automation/corelib/dist/playout/processAndPrune'
 import { TakeNextPartProps } from '@sofie-automation/corelib/dist/worker/studio'
@@ -173,7 +168,7 @@ export async function performTakeToNextedPart(
 			throw UserError.create(UserErrorMessage.TakeDuringTransition)
 		}
 
-		if (isTooCloseToAutonext(currentPartInstance.partInstance, true)) {
+		if (currentPartInstance.isTooCloseToAutonext(true)) {
 			throw UserError.create(UserErrorMessage.TakeCloseToAutonext)
 		}
 	}
@@ -215,15 +210,6 @@ export async function performTakeToNextedPart(
 
 	clearQueuedSegmentId(playoutModel, takePartInstance.partInstance, playoutModel.playlist.nextPartInfo)
 
-	const nextPart = selectNextPart(
-		context,
-		playoutModel.playlist,
-		takePartInstance.partInstance,
-		null,
-		playoutModel.getAllOrderedSegments(),
-		playoutModel.getAllOrderedParts()
-	)
-
 	if (blueprint.blueprint.onPreTake) {
 		const span = context.startSpan('blueprint.onPreTake')
 		try {
@@ -246,7 +232,7 @@ export async function performTakeToNextedPart(
 
 	updatePartInstanceOnTake(
 		context,
-		playoutModel.playlist,
+		playoutModel,
 		showStyle,
 		blueprint,
 		takeRundown.rundown,
@@ -255,10 +241,24 @@ export async function performTakeToNextedPart(
 	)
 
 	playoutModel.cycleSelectedPartInstances()
+	const wasLooping = playoutModel.playlist.quickLoop?.running
+	playoutModel.updateQuickLoopState()
+
+	const nextPart = selectNextPart(
+		context,
+		playoutModel.playlist,
+		takePartInstance.partInstance,
+		null,
+		playoutModel.getAllOrderedSegments(),
+		playoutModel.getAllOrderedParts(),
+		{ ignoreUnplayable: true, ignoreQuickLoop: false }
+	)
 
 	takePartInstance.setTaken(now, timeOffset)
 
-	resetPreviousSegment(playoutModel)
+	if (wasLooping) {
+		resetPreviousSegmentIfLooping(context, playoutModel)
+	}
 
 	// Once everything is synced, we can choose the next part
 	await setNextPart(context, playoutModel, nextPart, false)
@@ -343,27 +343,23 @@ export function clearQueuedSegmentId(
 }
 
 /**
- * Reset the Segment of the previousPartInstance, if playback has left that Segment and the Rundown is looping
+ * Reset the Segment of the previousPartInstance, if playback has left that Segment and the Playlist is looping
  * @param playoutModel Model for the active Playlist
  */
-export function resetPreviousSegment(playoutModel: PlayoutModel): void {
+export function resetPreviousSegmentIfLooping(context: JobContext, playoutModel: PlayoutModel): void {
 	const previousPartInstance = playoutModel.previousPartInstance
 	const currentPartInstance = playoutModel.currentPartInstance
 
 	// If the playlist is looping and
 	// If the previous and current part are not in the same segment, then we have just left a segment
 	if (
-		playoutModel.playlist.loop &&
+		playoutModel.playlist.quickLoop?.running &&
 		previousPartInstance &&
 		previousPartInstance.partInstance.segmentId !== currentPartInstance?.partInstance?.segmentId
 	) {
 		// Reset the old segment
 		const segmentId = previousPartInstance.partInstance.segmentId
-		for (const partInstance of playoutModel.loadedPartInstances) {
-			if (partInstance.partInstance.segmentId === segmentId) {
-				partInstance.markAsReset()
-			}
-		}
+		resetPartInstancesWithPieceInstances(context, playoutModel, { segmentId })
 	}
 }
 
@@ -451,7 +447,7 @@ async function afterTakeUpdateTimingsAndEvents(
 
 export function updatePartInstanceOnTake(
 	context: JobContext,
-	playlist: ReadonlyDeep<DBRundownPlaylist>,
+	playoutModel: PlayoutModel,
 	showStyle: ReadonlyDeep<ProcessedShowStyleCompound>,
 	blueprint: ReadonlyDeep<WrappedShowStyleBlueprint>,
 	takeRundown: ReadonlyDeep<DBRundown>,
@@ -473,8 +469,8 @@ export function updatePartInstanceOnTake(
 			const span = context.startSpan('blueprint.getEndStateForPart')
 			const context2 = new RundownContext(
 				{
-					name: `${playlist.name}`,
-					identifier: `playlist=${playlist._id},currentPartInstance=${
+					name: `${playoutModel.playlist.name}`,
+					identifier: `playlist=${playoutModel.playlist._id},currentPartInstance=${
 						currentPartInstance.partInstance._id
 					},execution=${getRandomId()}`,
 				},
@@ -486,7 +482,7 @@ export function updatePartInstanceOnTake(
 			)
 			previousPartEndState = blueprint.blueprint.getEndStateForPart(
 				context2,
-				playlist.previousPersistentState,
+				playoutModel.playlist.previousPersistentState,
 				convertPartInstanceToBlueprints(currentPartInstance.partInstance),
 				resolvedPieces.map(convertResolvedPieceInstanceToBlueprints),
 				time
@@ -505,13 +501,7 @@ export function updatePartInstanceOnTake(
 		takePartInstance.pieceInstances.map((p) => p.pieceInstance),
 		0
 	)
-	const partPlayoutTimings = calculatePartTimings(
-		playlist.holdState,
-		currentPartInstance?.partInstance?.part,
-		currentPartInstance?.pieceInstances?.map((p) => p.pieceInstance.piece) ?? [],
-		takePartInstance.partInstance.part,
-		tmpTakePieces.filter((p) => !p.infinite || p.infinite.infiniteInstanceIndex === 0).map((p) => p.piece)
-	)
+	const partPlayoutTimings = playoutModel.calculatePartTimings(currentPartInstance, takePartInstance, tmpTakePieces)
 
 	takePartInstance.storePlayoutTimingsAndPreviousEndState(partPlayoutTimings, previousPartEndState)
 }
diff --git a/packages/job-worker/src/playout/timeline/generate.ts b/packages/job-worker/src/playout/timeline/generate.ts
index ae055d97a1..77856edf60 100644
--- a/packages/job-worker/src/playout/timeline/generate.ts
+++ b/packages/job-worker/src/playout/timeline/generate.ts
@@ -11,8 +11,6 @@ import {
 import {
 	deserializeTimelineBlob,
 	OnGenerateTimelineObjExt,
-	serializeTimelineBlob,
-	TimelineComplete,
 	TimelineCompleteGenerationVersions,
 	TimelineEnableExt,
 	TimelineObjGeneric,
@@ -21,7 +19,7 @@ import {
 } from '@sofie-automation/corelib/dist/dataModel/Timeline'
 import { RundownBaselineObj } from '@sofie-automation/corelib/dist/dataModel/RundownBaselineObj'
 import { DBPartInstance } from '@sofie-automation/corelib/dist/dataModel/PartInstance'
-import { applyToArray, clone, getRandomId, literal, normalizeArray, omit } from '@sofie-automation/corelib/dist/lib'
+import { applyToArray, clone, literal, normalizeArray, omit } from '@sofie-automation/corelib/dist/lib'
 import { PlayoutModel } from '../model/PlayoutModel'
 import { logger } from '../../logging'
 import { getCurrentTime, getSystemVersion } from '../../lib'
@@ -45,11 +43,7 @@ import { buildTimelineObjsForRundown, RundownTimelineTimingContext } from './run
 import { SourceLayers } from '@sofie-automation/corelib/dist/dataModel/ShowStyleBase'
 import { deNowifyMultiGatewayTimeline } from './multi-gateway'
 import { validateTimeline } from 'superfly-timeline'
-import {
-	calculatePartTimings,
-	getPartTimingsOrDefaults,
-	PartCalculatedTimings,
-} from '@sofie-automation/corelib/dist/playout/timings'
+import { getPartTimingsOrDefaults, PartCalculatedTimings } from '@sofie-automation/corelib/dist/playout/timings'
 import { applyAbPlaybackForTimeline } from '../abPlayback'
 import { stringifyError } from '@sofie-automation/shared-lib/dist/lib/stringifyError'
 import { PlayoutPartInstanceModel } from '../model/PlayoutPartInstanceModel'
@@ -238,15 +232,7 @@ export function saveTimeline(
 	timelineObjs: TimelineObjGeneric[],
 	generationVersions: TimelineCompleteGenerationVersions
 ): void {
-	const newTimeline: TimelineComplete = {
-		_id: context.studio._id,
-		timelineHash: getRandomId(), // randomized on every timeline change
-		generated: getCurrentTime(),
-		timelineBlob: serializeTimelineBlob(timelineObjs),
-		generationVersions: generationVersions,
-	}
-
-	studioPlayoutModel.setTimeline(timelineObjs, generationVersions)
+	const newTimeline = studioPlayoutModel.setTimeline(timelineObjs, generationVersions)
 
 	// Also do a fast-track for the timeline to be published faster:
 	context.hackPublishTimelineToFastTrack(newTimeline)
@@ -270,25 +256,24 @@ function getPartInstanceTimelineInfo(
 	sourceLayers: SourceLayers,
 	partInstance: PlayoutPartInstanceModel | null
 ): SelectedPartInstanceTimelineInfo | undefined {
-	if (partInstance) {
-		const partStarted = partInstance.partInstance.timings?.plannedStartedPlayback
-		const nowInPart = partStarted === undefined ? 0 : currentTime - partStarted
-		const pieceInstances = processAndPrunePieceInstanceTimings(
-			sourceLayers,
-			partInstance.pieceInstances.map((p) => p.pieceInstance),
-			nowInPart
-		)
+	if (!partInstance) return undefined
+
+	const partStarted = partInstance.partInstance.timings?.plannedStartedPlayback
+	const nowInPart = partStarted === undefined ? 0 : currentTime - partStarted
+	const pieceInstances = processAndPrunePieceInstanceTimings(
+		sourceLayers,
+		partInstance.pieceInstances.map((p) => p.pieceInstance),
+		nowInPart
+	)
 
-		return {
-			partInstance: partInstance.partInstance,
-			pieceInstances,
-			nowInPart,
-			partStarted,
-			// Approximate `calculatedTimings`, for the partInstances which already have it cached
-			calculatedTimings: getPartTimingsOrDefaults(partInstance.partInstance, pieceInstances),
-		}
-	} else {
-		return undefined
+	const partInstanceWithOverrides = partInstance.getPartInstanceWithQuickLoopOverrides()
+	return {
+		partInstance: partInstanceWithOverrides,
+		pieceInstances,
+		nowInPart,
+		partStarted,
+		// Approximate `calculatedTimings`, for the partInstances which already have it cached
+		calculatedTimings: getPartTimingsOrDefaults(partInstanceWithOverrides, pieceInstances),
 	}
 }
 
@@ -333,16 +318,13 @@ async function getTimelineRundown(
 				next: getPartInstanceTimelineInfo(currentTime, showStyle.sourceLayers, nextPartInstance),
 				previous: getPartInstanceTimelineInfo(currentTime, showStyle.sourceLayers, previousPartInstance),
 			}
-			if (partInstancesInfo.next) {
+
+			if (partInstancesInfo.next && nextPartInstance) {
 				// the nextPartInstance doesn't have accurate cached `calculatedTimings` yet, so calculate a prediction
-				partInstancesInfo.next.calculatedTimings = calculatePartTimings(
-					playoutModel.playlist.holdState,
-					partInstancesInfo.current?.partInstance?.part,
-					partInstancesInfo.current?.pieceInstances?.map?.((p) => p.piece),
-					partInstancesInfo.next.partInstance.part,
-					partInstancesInfo.next.pieceInstances
-						.filter((p) => !p.infinite || p.infinite.infiniteInstanceIndex === 0)
-						.map((p) => p.piece)
+				partInstancesInfo.next.calculatedTimings = playoutModel.calculatePartTimings(
+					currentPartInstance,
+					nextPartInstance,
+					partInstancesInfo.next.pieceInstances // already processed and pruned
 				)
 			}
 
diff --git a/packages/job-worker/src/playout/timeline/part.ts b/packages/job-worker/src/playout/timeline/part.ts
index 745e529fdf..4a20c2ef23 100644
--- a/packages/job-worker/src/playout/timeline/part.ts
+++ b/packages/job-worker/src/playout/timeline/part.ts
@@ -61,7 +61,12 @@ export function transformPartIntoTimeline(
 				}
 				break
 			case IBlueprintPieceType.Normal:
-				pieceEnable = getPieceEnableInsidePart(pieceInstance, partTimings, parentGroup.id)
+				pieceEnable = getPieceEnableInsidePart(
+					pieceInstance,
+					partTimings,
+					parentGroup.id,
+					parentGroup.enable.duration !== undefined || parentGroup.enable.end !== undefined
+				)
 				break
 			default:
 				assertNever(pieceInstance.piece.pieceType)
diff --git a/packages/job-worker/src/playout/timeline/piece.ts b/packages/job-worker/src/playout/timeline/piece.ts
index be9d8b0520..bbaebb02b2 100644
--- a/packages/job-worker/src/playout/timeline/piece.ts
+++ b/packages/job-worker/src/playout/timeline/piece.ts
@@ -90,17 +90,25 @@ export function transformPieceGroupAndObjects(
 export function getPieceEnableInsidePart(
 	pieceInstance: ReadonlyDeep<PieceInstanceWithTimings>,
 	partTimings: PartCalculatedTimings,
-	partGroupId: string
+	partGroupId: string,
+	partHasEndTime: boolean
 ): TSR.Timeline.TimelineEnable {
 	const pieceEnable: TSR.Timeline.TimelineEnable = { ...pieceInstance.piece.enable }
-	if (typeof pieceEnable.start === 'number' && !pieceInstance.dynamicallyInserted) {
-		// timed pieces should be offset based on the preroll of the part
-		pieceEnable.start += partTimings.toPartDelay
+	if (typeof pieceEnable.start === 'number') {
+		if (pieceInstance.dynamicallyInserted) {
+			// timed adlibbed pieces needs to factor in their preroll
+			pieceEnable.start += pieceInstance.piece.prerollDuration || 0
+		} else {
+			// timed planned pieces should be offset based on the preroll of the part
+			pieceEnable.start += partTimings.toPartDelay
+		}
 	}
-	if (partTimings.toPartPostroll) {
+
+	// If the part has an end time, we can consider post-roll
+	if (partHasEndTime && partTimings.toPartPostroll) {
 		if (!pieceEnable.duration) {
 			// make sure that the control object is shortened correctly
-			pieceEnable.duration = `#${partGroupId} - ${partTimings.toPartPostroll}`
+			pieceEnable.end = `#${partGroupId} - ${partTimings.toPartPostroll}`
 		}
 	}
 
diff --git a/packages/job-worker/src/playout/timeline/rundown.ts b/packages/job-worker/src/playout/timeline/rundown.ts
index d8ee36ab7d..0e7a107986 100644
--- a/packages/job-worker/src/playout/timeline/rundown.ts
+++ b/packages/job-worker/src/playout/timeline/rundown.ts
@@ -146,7 +146,20 @@ export function buildTimelineObjsForRundown(
 			// If there is a valid autonext out of the current part, then calculate the duration
 			currentPartEnable.duration =
 				partInstancesInfo.current.partInstance.part.expectedDuration +
-				partInstancesInfo.current.calculatedTimings.toPartDelay
+				partInstancesInfo.current.calculatedTimings.toPartDelay +
+				partInstancesInfo.current.calculatedTimings.toPartPostroll // autonext should have the postroll added to it to not confuse the timeline
+
+			if (
+				typeof currentPartEnable.start === 'number' &&
+				currentPartEnable.start + currentPartEnable.duration < getCurrentTime()
+			) {
+				logger.warn('Prevented setting the end of an autonext in the past')
+				// note - this will cause a small glitch on air where the next part is skipped into because this calculation does not account
+				// for the time it takes between timeline generation and timeline execution. That small glitch is preferable to setting the time
+				// very far in the past however. To do this properly we should support setting the "end" to "now" and have that calculated after
+				// timeline generation as we do for start times.
+				currentPartEnable.duration = getCurrentTime() - currentPartEnable.start
+			}
 		}
 		const currentPartGroup = createPartGroup(partInstancesInfo.current.partInstance, currentPartEnable)
 
@@ -266,7 +279,9 @@ function generateCurrentInfinitePieceObjects(
 	const pieceEnable = getPieceEnableInsidePart(
 		pieceInstance,
 		currentPartInstanceTimings,
-		timingContext.currentPartGroup.id
+		timingContext.currentPartGroup.id,
+		timingContext.currentPartGroup.enable.end !== undefined ||
+			timingContext.currentPartGroup.enable.duration !== undefined
 	)
 
 	let nowInParent = currentPartInfo.nowInPart // Where is 'now' inside of the infiniteGroup?
@@ -313,8 +328,16 @@ function generateCurrentInfinitePieceObjects(
 		infiniteGroup.enable.duration = infiniteInNextPart.piece.enable.duration
 	}
 
-	// If this piece does not continue in the next part, then set it to end with the part it belongs to
-	if (
+	const pieceInstanceWithUpdatedEndCap: PieceInstanceWithTimings = { ...pieceInstance }
+	// Give the infinite group and end cap when the end of the piece is known
+	if (pieceInstance.resolvedEndCap) {
+		// If the cap is a number, it is relative to the part, not the parent group so needs to be handled here
+		if (typeof pieceInstance.resolvedEndCap === 'number') {
+			infiniteGroup.enable.end = `#${timingContext.currentPartGroup.id}.start + ${pieceInstance.resolvedEndCap}`
+			delete pieceInstanceWithUpdatedEndCap.resolvedEndCap
+		}
+	} else if (
+		// If this piece does not continue in the next part, then set it to end with the part it belongs to
 		!infiniteInNextPart &&
 		currentPartInfo.partInstance.part.autoNext &&
 		infiniteGroup.enable.duration === undefined &&
@@ -340,7 +363,7 @@ function generateCurrentInfinitePieceObjects(
 			activePlaylist._id,
 			infiniteGroup,
 			nowInParent,
-			pieceInstance,
+			pieceInstanceWithUpdatedEndCap,
 			pieceEnable,
 			0,
 			groupClasses,
diff --git a/packages/job-worker/src/playout/timings/partPlayback.ts b/packages/job-worker/src/playout/timings/partPlayback.ts
index ad3a582af6..c0dcdd9852 100644
--- a/packages/job-worker/src/playout/timings/partPlayback.ts
+++ b/packages/job-worker/src/playout/timings/partPlayback.ts
@@ -7,7 +7,7 @@ import { selectNextPart } from '../selectNextPart'
 import { setNextPart } from '../setNext'
 import { updateTimeline } from '../timeline/generate'
 import { getCurrentTime } from '../../lib'
-import { afterTake, clearQueuedSegmentId, resetPreviousSegment, updatePartInstanceOnTake } from '../take'
+import { afterTake, clearQueuedSegmentId, resetPreviousSegmentIfLooping, updatePartInstanceOnTake } from '../take'
 import { INCORRECT_PLAYING_PART_DEBOUNCE, RESET_IGNORE_ERRORS } from '../constants'
 import { Time } from '@sofie-automation/blueprints-integration'
 
@@ -73,7 +73,7 @@ export async function onPartPlaybackStarted(
 			const blueprint = await context.getShowStyleBlueprint(showStyle._id)
 			updatePartInstanceOnTake(
 				context,
-				playoutModel.playlist,
+				playoutModel,
 				showStyle,
 				blueprint,
 				rundown.rundown,
@@ -82,7 +82,7 @@ export async function onPartPlaybackStarted(
 			)
 
 			clearQueuedSegmentId(playoutModel, playingPartInstance.partInstance, playlist.nextPartInfo)
-			resetPreviousSegment(playoutModel)
+			resetPreviousSegmentIfLooping(context, playoutModel) // Note: rare edgecase of auto-nexting into a loop causing reset of a segment outside of the loop; is it worth fixing?
 
 			// Update the next partinstance
 			const nextPart = selectNextPart(
@@ -91,9 +91,11 @@ export async function onPartPlaybackStarted(
 				playingPartInstance.partInstance,
 				null,
 				playoutModel.getAllOrderedSegments(),
-				playoutModel.getAllOrderedParts()
+				playoutModel.getAllOrderedParts(),
+				{ ignoreUnplayable: true, ignoreQuickLoop: false }
 			)
 			await setNextPart(context, playoutModel, nextPart, false)
+			playoutModel.updateQuickLoopState()
 
 			// complete the take
 			await afterTake(context, playoutModel, playingPartInstance)
@@ -193,6 +195,13 @@ export function reportPartInstanceHasStarted(
 			playoutModel.setRundownStartedPlayback(partInstance.partInstance.rundownId, timestamp)
 		}
 
+		if (
+			partInstance.partInstance.segmentPlayoutId !==
+			playoutModel.previousPartInstance?.partInstance.segmentPlayoutId
+		) {
+			playoutModel.setSegmentStartedPlayback(partInstance.partInstance.segmentPlayoutId, timestamp)
+		}
+
 		if (timestampUpdated) {
 			playoutModel.queuePartInstanceTimingEvent(partInstance.partInstance._id)
 		}
diff --git a/packages/job-worker/src/playout/upgrade.ts b/packages/job-worker/src/playout/upgrade.ts
index b03dc1d286..66fba34cfa 100644
--- a/packages/job-worker/src/playout/upgrade.ts
+++ b/packages/job-worker/src/playout/upgrade.ts
@@ -1,9 +1,18 @@
-import { BlueprintMapping, BlueprintMappings, JSONBlobParse, TSR } from '@sofie-automation/blueprints-integration'
+import {
+	BlueprintMapping,
+	BlueprintMappings,
+	JSONBlobParse,
+	StudioRouteBehavior,
+	TSR,
+} from '@sofie-automation/blueprints-integration'
 import {
 	MappingsExt,
 	StudioIngestDevice,
 	StudioInputDevice,
+	StudioPackageContainer,
 	StudioPlayoutDevice,
+	StudioRouteSet,
+	StudioRouteSetExclusivityGroup,
 } from '@sofie-automation/corelib/dist/dataModel/Studio'
 import { Complete, clone, literal } from '@sofie-automation/corelib/dist/lib'
 import { protectString } from '@sofie-automation/corelib/dist/protectedString'
@@ -67,6 +76,38 @@ export async function handleBlueprintUpgradeForStudio(context: JobContext, _data
 			}),
 		])
 	)
+	const routeSets = Object.fromEntries(
+		Object.entries<Partial<StudioRouteSet>>(result.routeSets ?? {}).map((dev) => [
+			dev[0],
+			literal<Complete<StudioRouteSet>>({
+				name: dev[1].name ?? '',
+				active: dev[1].active ?? false,
+				defaultActive: dev[1].defaultActive ?? false,
+				behavior: dev[1].behavior ?? StudioRouteBehavior.TOGGLE,
+				exclusivityGroup: dev[1].exclusivityGroup ?? undefined,
+				routes: dev[1].routes ?? [],
+				abPlayers: dev[1].abPlayers ?? [],
+			}),
+		])
+	)
+	const routeSetExclusivityGroups = Object.fromEntries(
+		Object.entries<Partial<StudioRouteSetExclusivityGroup>>(result.routeSetExclusivityGroups ?? {}).map((dev) => [
+			dev[0],
+			literal<Complete<StudioRouteSetExclusivityGroup>>({
+				name: dev[1].name ?? '',
+			}),
+		])
+	)
+
+	const packageContainers = Object.fromEntries(
+		Object.entries<Partial<StudioPackageContainer>>(result.packageContainers ?? {}).map((dev) => [
+			dev[0],
+			literal<Complete<StudioPackageContainer>>({
+				deviceIds: dev[1].deviceIds ?? [],
+				container: dev[1].container as any,
+			}),
+		])
+	)
 
 	await context.directCollections.Studios.update(context.studioId, {
 		$set: {
@@ -74,6 +115,9 @@ export async function handleBlueprintUpgradeForStudio(context: JobContext, _data
 			'peripheralDeviceSettings.playoutDevices.defaults': playoutDevices,
 			'peripheralDeviceSettings.ingestDevices.defaults': ingestDevices,
 			'peripheralDeviceSettings.inputDevices.defaults': inputDevices,
+			'routeSetsWithOverrides.defaults': routeSets,
+			'routeSetExclusivityGroupsWithOverrides.defaults': routeSetExclusivityGroups,
+			'packageContainersWithOverrides.defaults': packageContainers,
 			lastBlueprintConfig: {
 				blueprintHash: blueprint.blueprintDoc.blueprintHash,
 				blueprintId: blueprint.blueprintId,
diff --git a/packages/job-worker/src/rundownPlaylists.ts b/packages/job-worker/src/rundownPlaylists.ts
index 56b93f9501..a8b96d37d0 100644
--- a/packages/job-worker/src/rundownPlaylists.ts
+++ b/packages/job-worker/src/rundownPlaylists.ts
@@ -1,7 +1,17 @@
 import { RundownPlaylistId, StudioId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import { DBRundown, Rundown } from '@sofie-automation/corelib/dist/dataModel/Rundown'
-import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
-import { clone, getHash, getRandomString, normalizeArrayToMap } from '@sofie-automation/corelib/dist/lib'
+import {
+	DBRundownPlaylist,
+	ForceQuickLoopAutoNext,
+	QuickLoopMarkerType,
+} from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
+import {
+	clone,
+	getHash,
+	getRandomString,
+	normalizeArrayToMap,
+	generateTranslation,
+} from '@sofie-automation/corelib/dist/lib'
 import { stringifyError } from '@sofie-automation/shared-lib/dist/lib/stringifyError'
 import { protectString, unprotectString } from '@sofie-automation/corelib/dist/protectedString'
 import { IngestJobs } from '@sofie-automation/corelib/dist/worker/ingest'
@@ -12,7 +22,11 @@ import {
 	RemovePlaylistProps,
 } from '@sofie-automation/corelib/dist/worker/studio'
 import { ReadonlyDeep } from 'type-fest'
-import { BlueprintResultRundownPlaylist, IBlueprintRundown } from '@sofie-automation/blueprints-integration'
+import {
+	BlueprintResultRundownPlaylist,
+	IBlueprintRundown,
+	NoteSeverity,
+} from '@sofie-automation/blueprints-integration'
 import { JobContext } from './jobs'
 import { logger } from './logging'
 import { resetRundownPlaylist } from './playout/lib'
@@ -34,6 +48,7 @@ import { RundownLock } from './jobs/lock'
 import { runWithRundownLock } from './ingest/lock'
 import { convertRundownToBlueprints } from './blueprints/context/lib'
 import { sortRundownIDsInPlaylist } from '@sofie-automation/corelib/dist/playout/playlist'
+import { INoteBase } from '@sofie-automation/corelib/dist/dataModel/Notes'
 
 /**
  * Debug: Remove a Playlist and all its contents
@@ -167,27 +182,38 @@ export function produceRundownPlaylistInfoFromRundown(
 	rundowns: ReadonlyDeep<Array<DBRundown>>
 ): DBRundownPlaylist {
 	let playlistInfo: BlueprintResultRundownPlaylist | null = null
+
+	let notes: INoteBase[] = []
+
 	try {
 		if (studioBlueprint?.blueprint?.getRundownPlaylistInfo) {
+			const blueprintContext = new StudioUserContext(
+				{
+					name: 'produceRundownPlaylistInfoFromRundown',
+					identifier: `studioId=${context.studioId},playlistId=${playlistId},rundownIds=${rundowns
+						.map((r) => r._id)
+						.join(',')}`,
+				},
+				context.studio,
+				context.getStudioBlueprintConfig()
+			)
+
 			playlistInfo = studioBlueprint.blueprint.getRundownPlaylistInfo(
-				new StudioUserContext(
-					{
-						name: 'produceRundownPlaylistInfoFromRundown',
-						identifier: `studioId=${context.studioId},playlistId=${playlistId},rundownIds=${rundowns
-							.map((r) => r._id)
-							.join(',')}`,
-						tempSendUserNotesIntoBlackHole: true,
-					},
-					context.studio,
-					context.getStudioBlueprintConfig()
-				),
+				blueprintContext,
 				rundowns.map(convertRundownToBlueprints),
 				playlistExternalId
 			)
+
+			notes = blueprintContext.notes
 		}
 	} catch (err) {
 		logger.error(`Error in studioBlueprint.getRundownPlaylistInfo: ${stringifyError(err)}`)
 		playlistInfo = null
+
+		notes.push({
+			type: NoteSeverity.ERROR,
+			message: generateTranslation(`Internal Error generating RundownPlaylist`),
+		})
 	}
 
 	const rundownsInDefaultOrder = sortDefaultRundownInPlaylistOrder(rundowns)
@@ -210,8 +236,6 @@ export function produceRundownPlaylistInfoFromRundown(
 			name: playlistInfo.playlist.name,
 			timing: playlistInfo.playlist.timing,
 
-			loop: playlistInfo.playlist.loop,
-
 			outOfOrderTiming: playlistInfo.playlist.outOfOrderTiming,
 			timeOfDayCountdowns: playlistInfo.playlist.timeOfDayCountdowns,
 			privateData: playlistInfo.playlist.privateData,
@@ -219,6 +243,17 @@ export function produceRundownPlaylistInfoFromRundown(
 
 			modified: getCurrentTime(),
 		}
+		if (playlistInfo.playlist.loop) {
+			newPlaylist.quickLoop = {
+				start: { type: QuickLoopMarkerType.PLAYLIST },
+				end: { type: QuickLoopMarkerType.PLAYLIST },
+				locked: true,
+				forceAutoNext: context.studio.settings.forceQuickLoopAutoNext ?? ForceQuickLoopAutoNext.DISABLED,
+				running: existingPlaylist?.quickLoop?.running ?? false,
+			}
+		} else if (existingPlaylist?.quickLoop?.locked) {
+			delete newPlaylist.quickLoop
+		}
 	} else {
 		newPlaylist = {
 			...defaultPlaylistForRundown(rundownsInDefaultOrder[0], context.studio, existingPlaylist),
@@ -227,6 +262,14 @@ export function produceRundownPlaylistInfoFromRundown(
 		}
 	}
 
+	// Update the notes on the playlist
+	newPlaylist.notes = notes.map((note) => ({
+		...note,
+		origin: {
+			name: 'produceRundownPlaylistInfoFromRundown',
+		},
+	}))
+
 	if (!newPlaylist.rundownRanksAreSetInSofie) {
 		if (playlistInfo?.order) {
 			// The blueprints gave us an order
diff --git a/packages/job-worker/src/studio/model/StudioPlayoutModel.ts b/packages/job-worker/src/studio/model/StudioPlayoutModel.ts
index 03d687b728..3a7cdb60c0 100644
--- a/packages/job-worker/src/studio/model/StudioPlayoutModel.ts
+++ b/packages/job-worker/src/studio/model/StudioPlayoutModel.ts
@@ -45,7 +45,10 @@ export interface StudioPlayoutModelBase extends StudioPlayoutModelBaseReadonly {
 	 * @param timelineObjs Timeline objects to be run in the Studio
 	 * @param generationVersions Details about the versions where these objects were generated
 	 */
-	setTimeline(timelineObjs: TimelineObjGeneric[], generationVersions: TimelineCompleteGenerationVersions): void
+	setTimeline(
+		timelineObjs: TimelineObjGeneric[],
+		generationVersions: TimelineCompleteGenerationVersions
+	): ReadonlyDeep<TimelineComplete>
 }
 
 /**
@@ -65,4 +68,12 @@ export interface StudioPlayoutModel extends StudioPlayoutModelBase, BaseModel {
 	 * @param excludeRundownPlaylistId Ignore a given RundownPlaylist, useful to see if any other RundownPlaylists are active
 	 */
 	getActiveRundownPlaylists(excludeRundownPlaylistId?: RundownPlaylistId): ReadonlyDeep<DBRundownPlaylist[]>
+
+	/**
+	 * Update the active state of a RouteSet
+	 * @param routeSetId The RouteSet to update
+	 * @param isActive The new active state of the RouteSet
+	 * @returns Whether the change may affect timeline generation
+	 */
+	switchRouteSet(routeSetId: string, isActive: boolean | 'toggle'): boolean
 }
diff --git a/packages/job-worker/src/studio/model/StudioPlayoutModelImpl.ts b/packages/job-worker/src/studio/model/StudioPlayoutModelImpl.ts
index 65430a2081..8abd587def 100644
--- a/packages/job-worker/src/studio/model/StudioPlayoutModelImpl.ts
+++ b/packages/job-worker/src/studio/model/StudioPlayoutModelImpl.ts
@@ -34,6 +34,7 @@ export class StudioPlayoutModelImpl implements StudioPlayoutModel {
 
 	#timelineHasChanged = false
 	#timeline: TimelineComplete | null
+
 	public get timeline(): TimelineComplete | null {
 		return this.#timeline
 	}
@@ -84,7 +85,10 @@ export class StudioPlayoutModelImpl implements StudioPlayoutModel {
 		this.#baselineHelper.setExpectedPlayoutItems(playoutItems)
 	}
 
-	setTimeline(timelineObjs: TimelineObjGeneric[], generationVersions: TimelineCompleteGenerationVersions): void {
+	setTimeline(
+		timelineObjs: TimelineObjGeneric[],
+		generationVersions: TimelineCompleteGenerationVersions
+	): ReadonlyDeep<TimelineComplete> {
 		this.#timeline = {
 			_id: this.context.studioId,
 			timelineHash: getRandomId(),
@@ -93,6 +97,12 @@ export class StudioPlayoutModelImpl implements StudioPlayoutModel {
 			generationVersions: generationVersions,
 		}
 		this.#timelineHasChanged = true
+
+		return this.#timeline
+	}
+
+	switchRouteSet(routeSetId: string, isActive: boolean | 'toggle'): boolean {
+		return this.context.setRouteSetActive(routeSetId, isActive)
 	}
 
 	/**
@@ -115,7 +125,11 @@ export class StudioPlayoutModelImpl implements StudioPlayoutModel {
 		}
 		this.#timelineHasChanged = false
 
-		await this.#baselineHelper.saveAllToDatabase()
+		await Promise.all([
+			this.#baselineHelper.saveAllToDatabase(),
+			this.context.saveRouteSetChanges(),
+			//
+		])
 
 		if (span) span.end()
 	}
diff --git a/packages/job-worker/src/studio/routeSet.ts b/packages/job-worker/src/studio/routeSet.ts
new file mode 100644
index 0000000000..eba9504062
--- /dev/null
+++ b/packages/job-worker/src/studio/routeSet.ts
@@ -0,0 +1,14 @@
+import { SwitchRouteSetProps } from '@sofie-automation/corelib/dist/worker/studio'
+import { JobContext } from '../jobs'
+import { runJobWithStudioPlayoutModel } from './lock'
+import { updateTimelineFromStudioPlayoutModel } from '../playout/lib'
+
+export async function handleSwitchRouteSet(context: JobContext, data: SwitchRouteSetProps): Promise<void> {
+	await runJobWithStudioPlayoutModel(context, async (studioPlayoutModel) => {
+		const routesetChangeMayAffectTimeline = studioPlayoutModel.switchRouteSet(data.routeSetId, data.state)
+
+		if (routesetChangeMayAffectTimeline) {
+			await updateTimelineFromStudioPlayoutModel(context, studioPlayoutModel)
+		}
+	})
+}
diff --git a/packages/job-worker/src/workers/caches.ts b/packages/job-worker/src/workers/caches.ts
index f816a8f407..f252a9a0de 100644
--- a/packages/job-worker/src/workers/caches.ts
+++ b/packages/job-worker/src/workers/caches.ts
@@ -16,7 +16,7 @@ import { clone, deepFreeze } from '@sofie-automation/corelib/dist/lib'
 import { logger } from '../logging'
 import deepmerge = require('deepmerge')
 import { ProcessedShowStyleBase, ProcessedShowStyleVariant, StudioCacheContext } from '../jobs'
-import { StudioCacheContextImpl } from './context'
+import { StudioCacheContextImpl } from './context/StudioCacheContextImpl'
 
 /**
  * A Wrapper to maintain a cache and provide a context using the cache when appropriate
diff --git a/packages/job-worker/src/workers/context/JobContextImpl.ts b/packages/job-worker/src/workers/context/JobContextImpl.ts
new file mode 100644
index 0000000000..7be35b55f2
--- /dev/null
+++ b/packages/job-worker/src/workers/context/JobContextImpl.ts
@@ -0,0 +1,164 @@
+import { IDirectCollections } from '../../db'
+import { JobContext } from '../../jobs'
+import { WorkerDataCache } from '../caches'
+import { RundownId, RundownPlaylistId } from '@sofie-automation/corelib/dist/dataModel/Ids'
+import { getIngestQueueName, IngestJobFunc } from '@sofie-automation/corelib/dist/worker/ingest'
+import { ApmSpan, ApmTransaction } from '../../profiler'
+import { getRandomString } from '@sofie-automation/corelib/dist/lib'
+import { stringifyError } from '@sofie-automation/shared-lib/dist/lib/stringifyError'
+import { getStudioQueueName, StudioJobFunc } from '@sofie-automation/corelib/dist/worker/studio'
+import { LockBase, PlaylistLock, RundownLock } from '../../jobs/lock'
+import { logger } from '../../logging'
+import { BaseModel } from '../../modelBase'
+import { LocksManager } from '../locks'
+import { unprotectString } from '@sofie-automation/corelib/dist/protectedString'
+import { EventsJobFunc, getEventsQueueName } from '@sofie-automation/corelib/dist/worker/events'
+import { FastTrackTimelineFunc } from '../../main'
+import { TimelineComplete } from '@sofie-automation/corelib/dist/dataModel/Timeline'
+import type { QueueJobFunc } from './util'
+import { StudioCacheContextImpl } from './StudioCacheContextImpl'
+import { PlaylistLockImpl, RundownLockImpl } from './Locks'
+import { StudioRouteSetUpdater } from './StudioRouteSetUpdater'
+import type { DBStudio } from '@sofie-automation/corelib/dist/dataModel/Studio'
+import type { ReadonlyDeep } from 'type-fest'
+
+export class JobContextImpl extends StudioCacheContextImpl implements JobContext {
+	private readonly locks: Array<LockBase> = []
+	private readonly caches: Array<BaseModel> = []
+
+	private readonly studioRouteSetUpdater: StudioRouteSetUpdater
+
+	constructor(
+		directCollections: Readonly<IDirectCollections>,
+		cacheData: WorkerDataCache,
+		private readonly locksManager: LocksManager,
+		private readonly transaction: ApmTransaction | undefined,
+		private readonly queueJob: QueueJobFunc,
+		private readonly fastTrackTimeline: FastTrackTimelineFunc | null
+	) {
+		super(directCollections, cacheData)
+
+		this.studioRouteSetUpdater = new StudioRouteSetUpdater(directCollections, cacheData)
+	}
+
+	get studio(): ReadonlyDeep<DBStudio> {
+		return this.studioRouteSetUpdater.studioWithChanges ?? super.studio
+	}
+
+	trackCache(cache: BaseModel): void {
+		this.caches.push(cache)
+	}
+
+	async lockPlaylist(playlistId: RundownPlaylistId): Promise<PlaylistLock> {
+		const span = this.startSpan('lockPlaylist')
+		if (span) span.setLabel('playlistId', unprotectString(playlistId))
+
+		const lockId = getRandomString()
+		logger.silly(`PlaylistLock: Locking "${playlistId}"`)
+
+		const resourceId = `playlist:${playlistId}`
+		await this.locksManager.aquire(lockId, resourceId)
+
+		const doRelease = async () => {
+			const span = this.startSpan('unlockPlaylist')
+			if (span) span.setLabel('playlistId', unprotectString(playlistId))
+
+			await this.locksManager.release(lockId, resourceId)
+
+			if (span) span.end()
+		}
+		const lock = new PlaylistLockImpl(playlistId, doRelease)
+		this.locks.push(lock)
+
+		logger.silly(`PlaylistLock: Locked "${playlistId}"`)
+
+		if (span) span.end()
+
+		return lock
+	}
+
+	async lockRundown(rundownId: RundownId): Promise<RundownLock> {
+		const span = this.startSpan('lockRundown')
+		if (span) span.setLabel('rundownId', unprotectString(rundownId))
+
+		const lockId = getRandomString()
+		logger.silly(`RundownLock: Locking "${rundownId}"`)
+
+		const resourceId = `rundown:${rundownId}`
+		await this.locksManager.aquire(lockId, resourceId)
+
+		const doRelease = async () => {
+			const span = this.startSpan('unlockRundown')
+			if (span) span.setLabel('rundownId', unprotectString(rundownId))
+
+			await this.locksManager.release(lockId, resourceId)
+
+			if (span) span.end()
+		}
+		const lock = new RundownLockImpl(rundownId, doRelease)
+		this.locks.push(lock)
+
+		logger.silly(`RundownLock: Locked "${rundownId}"`)
+
+		if (span) span.end()
+
+		return lock
+	}
+
+	/** Ensure resources are cleaned up after the job completes */
+	async cleanupResources(): Promise<void> {
+		// Ensure all locks are freed
+		for (const lock of this.locks) {
+			if (lock.isLocked) {
+				logger.warn(`Lock never freed: ${lock}`)
+				await lock.release().catch((e) => {
+					logger.error(`Lock free failed: ${stringifyError(e)}`)
+				})
+			}
+		}
+
+		// Ensure all caches were saved/aborted
+		for (const cache of this.caches) {
+			try {
+				cache.assertNoChanges()
+			} catch (e) {
+				logger.warn(`${cache.displayName} has unsaved changes: ${stringifyError(e)}`)
+			}
+		}
+	}
+
+	startSpan(spanName: string): ApmSpan | null {
+		if (this.transaction) return this.transaction.startSpan(spanName)
+		return null
+	}
+
+	async queueIngestJob<T extends keyof IngestJobFunc>(name: T, data: Parameters<IngestJobFunc[T]>[0]): Promise<void> {
+		await this.queueJob(getIngestQueueName(this.studioId), name, data)
+	}
+	async queueStudioJob<T extends keyof StudioJobFunc>(name: T, data: Parameters<StudioJobFunc[T]>[0]): Promise<void> {
+		await this.queueJob(getStudioQueueName(this.studioId), name, data)
+	}
+	async queueEventJob<T extends keyof EventsJobFunc>(name: T, data: Parameters<EventsJobFunc[T]>[0]): Promise<void> {
+		await this.queueJob(getEventsQueueName(this.studioId), name, data)
+	}
+
+	hackPublishTimelineToFastTrack(newTimeline: TimelineComplete): void {
+		if (this.fastTrackTimeline) {
+			this.fastTrackTimeline(newTimeline).catch((e) => {
+				logger.error(`Failed to publish timeline to fast track: ${stringifyError(e)}`)
+			})
+		}
+	}
+
+	setRouteSetActive(routeSetId: string, isActive: boolean | 'toggle'): boolean {
+		return this.studioRouteSetUpdater.setRouteSetActive(routeSetId, isActive)
+	}
+
+	async saveRouteSetChanges(): Promise<void> {
+		return this.studioRouteSetUpdater.saveRouteSetChanges()
+	}
+
+	discardRouteSetChanges(): void {
+		return this.studioRouteSetUpdater.discardRouteSetChanges()
+	}
+}
diff --git a/packages/job-worker/src/workers/context/Locks.ts b/packages/job-worker/src/workers/context/Locks.ts
new file mode 100644
index 0000000000..55cc72f36d
--- /dev/null
+++ b/packages/job-worker/src/workers/context/Locks.ts
@@ -0,0 +1,67 @@
+import type { RundownId, RundownPlaylistId } from '@sofie-automation/corelib/dist/dataModel/Ids'
+import { PlaylistLock, RundownLock } from '../../jobs/lock'
+import { logger } from '../../logging'
+
+export class PlaylistLockImpl extends PlaylistLock {
+	#isLocked = true
+
+	public constructor(playlistId: RundownPlaylistId, private readonly doRelease: () => Promise<void>) {
+		super(playlistId)
+	}
+
+	get isLocked(): boolean {
+		return this.#isLocked
+	}
+
+	async release(): Promise<void> {
+		if (!this.#isLocked) {
+			logger.warn(`PlaylistLock: Already released "${this.playlistId}"`)
+		} else {
+			logger.silly(`PlaylistLock: Releasing "${this.playlistId}"`)
+
+			this.#isLocked = false
+
+			await this.doRelease()
+
+			logger.silly(`PlaylistLock: Released "${this.playlistId}"`)
+
+			if (this.deferedFunctions.length > 0) {
+				for (const fcn of this.deferedFunctions) {
+					await fcn()
+				}
+			}
+		}
+	}
+}
+
+export class RundownLockImpl extends RundownLock {
+	#isLocked = true
+
+	public constructor(rundownId: RundownId, private readonly doRelease: () => Promise<void>) {
+		super(rundownId)
+	}
+
+	get isLocked(): boolean {
+		return this.#isLocked
+	}
+
+	async release(): Promise<void> {
+		if (!this.#isLocked) {
+			logger.warn(`RundownLock: Already released "${this.rundownId}"`)
+		} else {
+			logger.silly(`RundownLock: Releasing "${this.rundownId}"`)
+
+			this.#isLocked = false
+
+			await this.doRelease()
+
+			logger.silly(`RundownLock: Released "${this.rundownId}"`)
+
+			if (this.deferedFunctions.length > 0) {
+				for (const fcn of this.deferedFunctions) {
+					await fcn()
+				}
+			}
+		}
+	}
+}
diff --git a/packages/job-worker/src/workers/context.ts b/packages/job-worker/src/workers/context/StudioCacheContextImpl.ts
similarity index 57%
rename from packages/job-worker/src/workers/context.ts
rename to packages/job-worker/src/workers/context/StudioCacheContextImpl.ts
index 85e57ad9a6..dff38b6e88 100644
--- a/packages/job-worker/src/workers/context.ts
+++ b/packages/job-worker/src/workers/context/StudioCacheContextImpl.ts
@@ -1,48 +1,28 @@
-import { IDirectCollections } from '../db'
+import { IDirectCollections } from '../../db'
 import {
 	ProcessedShowStyleBase,
 	ProcessedShowStyleVariant,
-	JobContext,
 	ProcessedShowStyleCompound,
 	StudioCacheContext,
-} from '../jobs'
+} from '../../jobs'
 import { ReadonlyDeep } from 'type-fest'
-import { WorkerDataCache } from './caches'
+import { WorkerDataCache } from '../caches'
 import { DBStudio } from '@sofie-automation/corelib/dist/dataModel/Studio'
-import {
-	RundownId,
-	RundownPlaylistId,
-	ShowStyleBaseId,
-	ShowStyleVariantId,
-	StudioId,
-} from '@sofie-automation/corelib/dist/dataModel/Ids'
-import { getIngestQueueName, IngestJobFunc } from '@sofie-automation/corelib/dist/worker/ingest'
-import { parseBlueprintDocument, WrappedShowStyleBlueprint, WrappedStudioBlueprint } from '../blueprints/cache'
+import { ShowStyleBaseId, ShowStyleVariantId, StudioId } from '@sofie-automation/corelib/dist/dataModel/Ids'
+import { parseBlueprintDocument, WrappedShowStyleBlueprint, WrappedStudioBlueprint } from '../../blueprints/cache'
 import { ReadonlyObjectDeep } from 'type-fest/source/readonly-deep'
-import { ApmSpan, ApmTransaction } from '../profiler'
 import { DBShowStyleBase } from '@sofie-automation/corelib/dist/dataModel/ShowStyleBase'
-import { clone, deepFreeze, getRandomString } from '@sofie-automation/corelib/dist/lib'
-import { stringifyError } from '@sofie-automation/shared-lib/dist/lib/stringifyError'
-import { createShowStyleCompound } from '../showStyles'
+import { clone, deepFreeze } from '@sofie-automation/corelib/dist/lib'
+import { createShowStyleCompound } from '../../showStyles'
 import { BlueprintManifestType } from '@sofie-automation/blueprints-integration'
 import {
 	preprocessShowStyleConfig,
 	preprocessStudioConfig,
 	ProcessedShowStyleConfig,
 	ProcessedStudioConfig,
-} from '../blueprints/config'
-import { getStudioQueueName, StudioJobFunc } from '@sofie-automation/corelib/dist/worker/studio'
-import { LockBase, PlaylistLock, RundownLock } from '../jobs/lock'
-import { logger } from '../logging'
-import { BaseModel } from '../modelBase'
-import { LocksManager } from './locks'
-import { unprotectString } from '@sofie-automation/corelib/dist/protectedString'
-import { EventsJobFunc, getEventsQueueName } from '@sofie-automation/corelib/dist/worker/events'
-import { FastTrackTimelineFunc } from '../main'
-import { TimelineComplete } from '@sofie-automation/corelib/dist/dataModel/Timeline'
-import { processShowStyleBase, processShowStyleVariant } from '../jobs/showStyle'
-
-export type QueueJobFunc = (queueName: string, jobName: string, jobData: unknown) => Promise<void>
+} from '../../blueprints/config'
+
+import { processShowStyleBase, processShowStyleVariant } from '../../jobs/showStyle'
 
 export class StudioCacheContextImpl implements StudioCacheContext {
 	constructor(
@@ -276,127 +256,6 @@ export class StudioCacheContextImpl implements StudioCacheContext {
 	}
 }
 
-export class JobContextImpl extends StudioCacheContextImpl implements JobContext {
-	private readonly locks: Array<LockBase> = []
-	private readonly caches: Array<BaseModel> = []
-
-	constructor(
-		directCollections: Readonly<IDirectCollections>,
-		cacheData: WorkerDataCache,
-		private readonly locksManager: LocksManager,
-		private readonly transaction: ApmTransaction | undefined,
-		private readonly queueJob: QueueJobFunc,
-		private readonly fastTrackTimeline: FastTrackTimelineFunc | null
-	) {
-		super(directCollections, cacheData)
-	}
-
-	trackCache(cache: BaseModel): void {
-		this.caches.push(cache)
-	}
-
-	async lockPlaylist(playlistId: RundownPlaylistId): Promise<PlaylistLock> {
-		const span = this.startSpan('lockPlaylist')
-		if (span) span.setLabel('playlistId', unprotectString(playlistId))
-
-		const lockId = getRandomString()
-		logger.silly(`PlaylistLock: Locking "${playlistId}"`)
-
-		const resourceId = `playlist:${playlistId}`
-		await this.locksManager.aquire(lockId, resourceId)
-
-		const doRelease = async () => {
-			const span = this.startSpan('unlockPlaylist')
-			if (span) span.setLabel('playlistId', unprotectString(playlistId))
-
-			await this.locksManager.release(lockId, resourceId)
-
-			if (span) span.end()
-		}
-		const lock = new PlaylistLockImpl(playlistId, doRelease)
-		this.locks.push(lock)
-
-		logger.silly(`PlaylistLock: Locked "${playlistId}"`)
-
-		if (span) span.end()
-
-		return lock
-	}
-
-	async lockRundown(rundownId: RundownId): Promise<RundownLock> {
-		const span = this.startSpan('lockRundown')
-		if (span) span.setLabel('rundownId', unprotectString(rundownId))
-
-		const lockId = getRandomString()
-		logger.silly(`RundownLock: Locking "${rundownId}"`)
-
-		const resourceId = `rundown:${rundownId}`
-		await this.locksManager.aquire(lockId, resourceId)
-
-		const doRelease = async () => {
-			const span = this.startSpan('unlockRundown')
-			if (span) span.setLabel('rundownId', unprotectString(rundownId))
-
-			await this.locksManager.release(lockId, resourceId)
-
-			if (span) span.end()
-		}
-		const lock = new RundownLockImpl(rundownId, doRelease)
-		this.locks.push(lock)
-
-		logger.silly(`RundownLock: Locked "${rundownId}"`)
-
-		if (span) span.end()
-
-		return lock
-	}
-
-	/** Ensure resources are cleaned up after the job completes */
-	async cleanupResources(): Promise<void> {
-		// Ensure all locks are freed
-		for (const lock of this.locks) {
-			if (lock.isLocked) {
-				logger.warn(`Lock never freed: ${lock}`)
-				await lock.release().catch((e) => {
-					logger.error(`Lock free failed: ${e}`)
-				})
-			}
-		}
-
-		// Ensure all caches were saved/aborted
-		for (const cache of this.caches) {
-			try {
-				cache.assertNoChanges()
-			} catch (e) {
-				logger.warn(`${cache.displayName} has unsaved changes: ${stringifyError(e)}`)
-			}
-		}
-	}
-
-	startSpan(spanName: string): ApmSpan | null {
-		if (this.transaction) return this.transaction.startSpan(spanName)
-		return null
-	}
-
-	async queueIngestJob<T extends keyof IngestJobFunc>(name: T, data: Parameters<IngestJobFunc[T]>[0]): Promise<void> {
-		await this.queueJob(getIngestQueueName(this.studioId), name, data)
-	}
-	async queueStudioJob<T extends keyof StudioJobFunc>(name: T, data: Parameters<StudioJobFunc[T]>[0]): Promise<void> {
-		await this.queueJob(getStudioQueueName(this.studioId), name, data)
-	}
-	async queueEventJob<T extends keyof EventsJobFunc>(name: T, data: Parameters<EventsJobFunc[T]>[0]): Promise<void> {
-		await this.queueJob(getEventsQueueName(this.studioId), name, data)
-	}
-
-	hackPublishTimelineToFastTrack(newTimeline: TimelineComplete): void {
-		if (this.fastTrackTimeline) {
-			this.fastTrackTimeline(newTimeline).catch((e) => {
-				logger.error(`Failed to publish timeline to fast track: ${stringifyError(e)}`)
-			})
-		}
-	}
-}
-
 async function loadShowStyleBlueprint(
 	collections: IDirectCollections,
 	showStyleBase: Pick<ReadonlyDeep<DBShowStyleBase>, '_id' | 'blueprintId'>
@@ -424,67 +283,3 @@ async function loadShowStyleBlueprint(
 		blueprint: blueprintManifest,
 	})
 }
-
-class PlaylistLockImpl extends PlaylistLock {
-	#isLocked = true
-
-	public constructor(playlistId: RundownPlaylistId, private readonly doRelease: () => Promise<void>) {
-		super(playlistId)
-	}
-
-	get isLocked(): boolean {
-		return this.#isLocked
-	}
-
-	async release(): Promise<void> {
-		if (!this.#isLocked) {
-			logger.warn(`PlaylistLock: Already released "${this.playlistId}"`)
-		} else {
-			logger.silly(`PlaylistLock: Releasing "${this.playlistId}"`)
-
-			this.#isLocked = false
-
-			await this.doRelease()
-
-			logger.silly(`PlaylistLock: Released "${this.playlistId}"`)
-
-			if (this.deferedFunctions.length > 0) {
-				for (const fcn of this.deferedFunctions) {
-					await fcn()
-				}
-			}
-		}
-	}
-}
-
-class RundownLockImpl extends RundownLock {
-	#isLocked = true
-
-	public constructor(rundownId: RundownId, private readonly doRelease: () => Promise<void>) {
-		super(rundownId)
-	}
-
-	get isLocked(): boolean {
-		return this.#isLocked
-	}
-
-	async release(): Promise<void> {
-		if (!this.#isLocked) {
-			logger.warn(`RundownLock: Already released "${this.rundownId}"`)
-		} else {
-			logger.silly(`RundownLock: Releasing "${this.rundownId}"`)
-
-			this.#isLocked = false
-
-			await this.doRelease()
-
-			logger.silly(`RundownLock: Released "${this.rundownId}"`)
-
-			if (this.deferedFunctions.length > 0) {
-				for (const fcn of this.deferedFunctions) {
-					await fcn()
-				}
-			}
-		}
-	}
-}
diff --git a/packages/job-worker/src/workers/context/StudioRouteSetUpdater.ts b/packages/job-worker/src/workers/context/StudioRouteSetUpdater.ts
new file mode 100644
index 0000000000..cea5c9e53b
--- /dev/null
+++ b/packages/job-worker/src/workers/context/StudioRouteSetUpdater.ts
@@ -0,0 +1,109 @@
+import { StudioRouteBehavior, StudioRouteSet } from '@sofie-automation/blueprints-integration'
+import type { DBStudio } from '@sofie-automation/corelib/dist/dataModel/Studio'
+import { deepFreeze } from '@sofie-automation/corelib/dist/lib'
+import {
+	getAllCurrentItemsFromOverrides,
+	OverrideOpHelperImpl,
+	WrappedOverridableItemNormal,
+} from '@sofie-automation/corelib/dist/overrideOpHelper'
+import { logger } from '../../logging'
+import type { ReadonlyDeep } from 'type-fest'
+import type { WorkerDataCache } from '../caches'
+import type { IDirectCollections } from '../../db'
+
+export class StudioRouteSetUpdater {
+	readonly #directCollections: Readonly<IDirectCollections>
+	readonly #cacheData: Pick<WorkerDataCache, 'studio'>
+
+	constructor(directCollections: Readonly<IDirectCollections>, cacheData: Pick<WorkerDataCache, 'studio'>) {
+		this.#directCollections = directCollections
+		this.#cacheData = cacheData
+	}
+
+	// Future: this could store a Map<string, boolean>, if the context exposed a simplified view of DBStudio
+	#studioWithRouteSetChanges: ReadonlyDeep<DBStudio> | undefined = undefined
+
+	get studioWithChanges(): ReadonlyDeep<DBStudio> | undefined {
+		return this.#studioWithRouteSetChanges
+	}
+
+	setRouteSetActive(routeSetId: string, isActive: boolean | 'toggle'): boolean {
+		const currentStudio = this.#studioWithRouteSetChanges ?? this.#cacheData.studio
+		const currentRouteSets = getAllCurrentItemsFromOverrides(currentStudio.routeSetsWithOverrides, null)
+
+		const routeSet = currentRouteSets.find((routeSet) => routeSet.id === routeSetId)
+		if (!routeSet) throw new Error(`RouteSet "${routeSetId}" not found!`)
+
+		if (isActive === 'toggle') {
+			isActive = !routeSet.computed.active
+		}
+
+		if (routeSet.computed.behavior === StudioRouteBehavior.ACTIVATE_ONLY && !isActive)
+			throw new Error(`RouteSet "${routeSet.id}" is ACTIVATE_ONLY`)
+
+		const overrideHelper = new OverrideOpHelperImpl(null, currentStudio.routeSetsWithOverrides)
+
+		// Update the pending changes
+		logger.debug(`switchRouteSet "${this.#cacheData.studio._id}" "${routeSet.id}"=${isActive}`)
+		overrideHelper.setItemValue(routeSetId, 'active', isActive)
+
+		let mayAffectTimeline = couldRoutesetAffectTimelineGeneration(routeSet)
+
+		// Deactivate other routeSets in the same exclusivity group:
+		if (routeSet.computed.exclusivityGroup && isActive) {
+			for (const otherRouteSet of Object.values<WrappedOverridableItemNormal<StudioRouteSet>>(currentRouteSets)) {
+				if (otherRouteSet.id === routeSet.id) continue
+				if (otherRouteSet.computed?.exclusivityGroup === routeSet.computed.exclusivityGroup) {
+					logger.debug(`switchRouteSet Other ID "${this.#cacheData.studio._id}" "${otherRouteSet.id}"=false`)
+					overrideHelper.setItemValue(otherRouteSet.id, 'active', false)
+
+					mayAffectTimeline = mayAffectTimeline || couldRoutesetAffectTimelineGeneration(otherRouteSet)
+				}
+			}
+		}
+
+		const updatedOverrideOps = overrideHelper.getPendingOps()
+
+		// Update the cached studio
+		this.#studioWithRouteSetChanges = Object.freeze({
+			...currentStudio,
+			routeSetsWithOverrides: Object.freeze({
+				...currentStudio.routeSetsWithOverrides,
+				overrides: deepFreeze(updatedOverrideOps),
+			}),
+		})
+
+		return mayAffectTimeline
+	}
+
+	async saveRouteSetChanges(): Promise<void> {
+		if (!this.#studioWithRouteSetChanges) return
+
+		// Save the changes to the database
+		// This is technically a little bit of a race condition, if someone uses the config pages but no more so than the rest of the system
+		await this.#directCollections.Studios.update(
+			{
+				_id: this.#cacheData.studio._id,
+			},
+			{
+				$set: {
+					'routeSetsWithOverrides.overrides':
+						this.#studioWithRouteSetChanges.routeSetsWithOverrides.overrides,
+				},
+			}
+		)
+
+		// Pretend that the studio as reported by the database has changed, this will be fixed after this job by the ChangeStream firing
+		this.#cacheData.studio = this.#studioWithRouteSetChanges
+		this.#studioWithRouteSetChanges = undefined
+	}
+
+	discardRouteSetChanges(): void {
+		// Discard any pending changes
+		this.#studioWithRouteSetChanges = undefined
+	}
+}
+
+function couldRoutesetAffectTimelineGeneration(routeSet: WrappedOverridableItemNormal<StudioRouteSet>): boolean {
+	return routeSet.computed.abPlayers.length > 0
+}
diff --git a/packages/job-worker/src/workers/context/__tests__/StudioRouteSetUpdater.spec.ts b/packages/job-worker/src/workers/context/__tests__/StudioRouteSetUpdater.spec.ts
new file mode 100644
index 0000000000..77692f4072
--- /dev/null
+++ b/packages/job-worker/src/workers/context/__tests__/StudioRouteSetUpdater.spec.ts
@@ -0,0 +1,403 @@
+import { StudioRouteBehavior, StudioRouteSet } from '@sofie-automation/blueprints-integration'
+import { setupDefaultJobEnvironment } from '../../../__mocks__/context'
+import { StudioRouteSetUpdater } from '../StudioRouteSetUpdater'
+import type { WorkerDataCache } from '../../caches'
+import { wrapDefaultObject } from '@sofie-automation/corelib/dist/settings/objectWithOverrides'
+
+function setupTest(routeSets: Record<string, StudioRouteSet>) {
+	const context = setupDefaultJobEnvironment()
+	const mockCache: Pick<WorkerDataCache, 'studio'> = {
+		studio: {
+			...context.studio,
+			routeSetsWithOverrides: wrapDefaultObject(routeSets),
+		},
+	}
+	const mockCollection = context.mockCollections.Studios
+	const routeSetHelper = new StudioRouteSetUpdater(context.directCollections, mockCache)
+
+	return { context, mockCache, mockCollection, routeSetHelper }
+}
+
+const SINGLE_ROUTESET: Record<string, StudioRouteSet> = {
+	one: {
+		name: 'test',
+		active: false,
+		behavior: StudioRouteBehavior.TOGGLE,
+		routes: [],
+		abPlayers: [],
+	},
+}
+const SINGLE_ROUTESET_WITH_AB: Record<string, StudioRouteSet> = {
+	one: {
+		name: 'test',
+		active: false,
+		behavior: StudioRouteBehavior.TOGGLE,
+		routes: [],
+		abPlayers: [{ playerId: 'test', poolName: 'test' }],
+	},
+}
+const EXCLUSIVE_ROUTESETS: Record<string, StudioRouteSet> = {
+	one: {
+		name: 'test',
+		active: false,
+		behavior: StudioRouteBehavior.TOGGLE,
+		exclusivityGroup: 'main',
+		routes: [],
+		abPlayers: [{ playerId: 'test', poolName: 'test' }],
+	},
+	two: {
+		name: 'test',
+		active: true,
+		behavior: StudioRouteBehavior.TOGGLE,
+		exclusivityGroup: 'main',
+		routes: [],
+		abPlayers: [],
+	},
+	activate: {
+		name: 'test',
+		active: false,
+		behavior: StudioRouteBehavior.ACTIVATE_ONLY,
+		exclusivityGroup: 'main',
+		routes: [],
+		abPlayers: [],
+	},
+}
+
+describe('StudioRouteSetUpdater', () => {
+	it('no changes should not save', async () => {
+		const { mockCollection, routeSetHelper } = setupTest(SINGLE_ROUTESET)
+
+		expect(mockCollection.operations).toHaveLength(0)
+		await routeSetHelper.saveRouteSetChanges()
+		expect(mockCollection.operations).toHaveLength(0)
+	})
+
+	it('no changes when setting missing routeset', async () => {
+		const { mockCollection, routeSetHelper } = setupTest(SINGLE_ROUTESET)
+
+		expect(() => routeSetHelper.setRouteSetActive('missing', true)).toThrow(/not found/)
+
+		expect(mockCollection.operations).toHaveLength(0)
+		await routeSetHelper.saveRouteSetChanges()
+		expect(mockCollection.operations).toHaveLength(0)
+	})
+
+	it('change when setting routeset - true', async () => {
+		const { mockCollection, routeSetHelper } = setupTest(SINGLE_ROUTESET)
+
+		routeSetHelper.setRouteSetActive('one', true)
+
+		expect(mockCollection.operations).toHaveLength(0)
+		await routeSetHelper.saveRouteSetChanges()
+		expect(mockCollection.operations).toEqual([
+			{
+				type: 'update',
+				args: [
+					{ _id: 'mockStudio0' },
+					{
+						$set: {
+							'routeSetsWithOverrides.overrides': [
+								{
+									op: 'set',
+									path: 'one.active',
+									value: true,
+								},
+							],
+						},
+					},
+				],
+			},
+		])
+	})
+	it('change when setting routeset - false', async () => {
+		const { mockCollection, routeSetHelper } = setupTest(SINGLE_ROUTESET)
+
+		routeSetHelper.setRouteSetActive('one', false)
+
+		expect(mockCollection.operations).toHaveLength(0)
+		await routeSetHelper.saveRouteSetChanges()
+		expect(mockCollection.operations).toEqual([
+			{
+				type: 'update',
+				args: [
+					{ _id: 'mockStudio0' },
+					{
+						$set: {
+							'routeSetsWithOverrides.overrides': [
+								{
+									op: 'set',
+									path: 'one.active',
+									value: false,
+								},
+							],
+						},
+					},
+				],
+			},
+		])
+	})
+	it('change when setting routeset - toggle', async () => {
+		const { mockCollection, routeSetHelper } = setupTest(SINGLE_ROUTESET)
+
+		routeSetHelper.setRouteSetActive('one', 'toggle')
+
+		expect(mockCollection.operations).toHaveLength(0)
+		await routeSetHelper.saveRouteSetChanges()
+		expect(mockCollection.operations).toEqual([
+			{
+				type: 'update',
+				args: [
+					{ _id: 'mockStudio0' },
+					{
+						$set: {
+							'routeSetsWithOverrides.overrides': [
+								{
+									op: 'set',
+									path: 'one.active',
+									value: true,
+								},
+							],
+						},
+					},
+				],
+			},
+		])
+	})
+	it('change when setting routeset - toggle twice', async () => {
+		const { mockCollection, routeSetHelper } = setupTest(SINGLE_ROUTESET)
+
+		routeSetHelper.setRouteSetActive('one', 'toggle')
+		routeSetHelper.setRouteSetActive('one', 'toggle')
+
+		expect(mockCollection.operations).toHaveLength(0)
+		await routeSetHelper.saveRouteSetChanges()
+		expect(mockCollection.operations).toEqual([
+			{
+				type: 'update',
+				args: [
+					{ _id: 'mockStudio0' },
+					{
+						$set: {
+							'routeSetsWithOverrides.overrides': [
+								{
+									op: 'set',
+									path: 'one.active',
+									value: false,
+								},
+							],
+						},
+					},
+				],
+			},
+		])
+	})
+
+	it('discard changes should not save', async () => {
+		const { mockCollection, routeSetHelper } = setupTest(SINGLE_ROUTESET)
+
+		routeSetHelper.setRouteSetActive('one', true)
+
+		expect(routeSetHelper.studioWithChanges).toBeTruthy()
+
+		routeSetHelper.discardRouteSetChanges()
+
+		expect(routeSetHelper.studioWithChanges).toBeFalsy()
+
+		expect(mockCollection.operations).toHaveLength(0)
+		await routeSetHelper.saveRouteSetChanges()
+		expect(mockCollection.operations).toHaveLength(0)
+	})
+
+	it('save should update mockCache', async () => {
+		const { mockCache, mockCollection, routeSetHelper } = setupTest(SINGLE_ROUTESET)
+
+		const studioBefore = mockCache.studio
+		expect(routeSetHelper.studioWithChanges).toBeFalsy()
+
+		routeSetHelper.setRouteSetActive('one', true)
+		expect(routeSetHelper.studioWithChanges).toBeTruthy()
+
+		expect(mockCollection.operations).toHaveLength(0)
+		await routeSetHelper.saveRouteSetChanges()
+		expect(mockCollection.operations).toHaveLength(1)
+
+		// Object should have changed
+		expect(mockCache.studio).not.toBe(studioBefore)
+		// Object should not be equal
+		expect(mockCache.studio).not.toEqual(studioBefore)
+		expect(routeSetHelper.studioWithChanges).toBeFalsy()
+	})
+
+	it('no changes should not update mockCache', async () => {
+		const { mockCache, mockCollection, routeSetHelper } = setupTest(SINGLE_ROUTESET)
+
+		const studioBefore = mockCache.studio
+		expect(routeSetHelper.studioWithChanges).toBeFalsy()
+
+		expect(mockCollection.operations).toHaveLength(0)
+		await routeSetHelper.saveRouteSetChanges()
+		expect(mockCollection.operations).toHaveLength(0)
+
+		expect(mockCache.studio).toBe(studioBefore)
+		expect(routeSetHelper.studioWithChanges).toBeFalsy()
+	})
+
+	it('discard changes should not update mockCache', async () => {
+		const { mockCache, mockCollection, routeSetHelper } = setupTest(SINGLE_ROUTESET)
+
+		const studioBefore = mockCache.studio
+		expect(routeSetHelper.studioWithChanges).toBeFalsy()
+
+		routeSetHelper.setRouteSetActive('one', true)
+		expect(routeSetHelper.studioWithChanges).toBeTruthy()
+		routeSetHelper.discardRouteSetChanges()
+		expect(routeSetHelper.studioWithChanges).toBeFalsy()
+
+		expect(mockCollection.operations).toHaveLength(0)
+		await routeSetHelper.saveRouteSetChanges()
+		expect(mockCollection.operations).toHaveLength(0)
+
+		expect(mockCache.studio).toBe(studioBefore)
+		expect(routeSetHelper.studioWithChanges).toBeFalsy()
+	})
+
+	it('ACTIVATE_ONLY routeset can be activated', async () => {
+		const { mockCollection, routeSetHelper } = setupTest(EXCLUSIVE_ROUTESETS)
+
+		routeSetHelper.setRouteSetActive('activate', true)
+
+		expect(mockCollection.operations).toHaveLength(0)
+		await routeSetHelper.saveRouteSetChanges()
+		expect(mockCollection.operations).toHaveLength(1)
+	})
+
+	it('ACTIVATE_ONLY routeset canot be deactivated', async () => {
+		const { mockCollection, routeSetHelper } = setupTest(EXCLUSIVE_ROUTESETS)
+
+		expect(() => routeSetHelper.setRouteSetActive('activate', false)).toThrow(/ACTIVATE_ONLY/)
+
+		expect(mockCollection.operations).toHaveLength(0)
+		await routeSetHelper.saveRouteSetChanges()
+		expect(mockCollection.operations).toHaveLength(0)
+	})
+
+	describe('exclusive groups', () => {
+		it('deactivate member of exclusive group', async () => {
+			const { mockCollection, routeSetHelper } = setupTest(EXCLUSIVE_ROUTESETS)
+
+			routeSetHelper.setRouteSetActive('one', false)
+
+			expect(mockCollection.operations).toHaveLength(0)
+			await routeSetHelper.saveRouteSetChanges()
+			expect(mockCollection.operations).toEqual([
+				{
+					type: 'update',
+					args: [
+						{ _id: 'mockStudio0' },
+						{
+							$set: {
+								'routeSetsWithOverrides.overrides': [
+									{
+										op: 'set',
+										path: 'one.active',
+										value: false,
+									},
+								],
+							},
+						},
+					],
+				},
+			])
+		})
+
+		it('activate member of exclusive group', async () => {
+			const { mockCollection, routeSetHelper } = setupTest(EXCLUSIVE_ROUTESETS)
+
+			routeSetHelper.setRouteSetActive('one', true)
+
+			expect(mockCollection.operations).toHaveLength(0)
+			await routeSetHelper.saveRouteSetChanges()
+			expect(mockCollection.operations).toEqual([
+				{
+					type: 'update',
+					args: [
+						{ _id: 'mockStudio0' },
+						{
+							$set: {
+								'routeSetsWithOverrides.overrides': [
+									{
+										op: 'set',
+										path: 'one.active',
+										value: true,
+									},
+									{
+										op: 'set',
+										path: 'two.active',
+										value: false,
+									},
+									{
+										op: 'set',
+										path: 'activate.active',
+										value: false,
+									},
+								],
+							},
+						},
+					],
+				},
+			])
+		})
+	})
+
+	describe('Return value', () => {
+		it('update player with ab', async () => {
+			const { mockCollection, routeSetHelper } = setupTest(SINGLE_ROUTESET_WITH_AB)
+
+			expect(routeSetHelper.setRouteSetActive('one', false)).toBe(true)
+
+			expect(mockCollection.operations).toHaveLength(0)
+			await routeSetHelper.saveRouteSetChanges()
+			expect(mockCollection.operations).toHaveLength(1)
+		})
+
+		it('update player without ab', async () => {
+			const { mockCollection, routeSetHelper } = setupTest(SINGLE_ROUTESET)
+
+			expect(routeSetHelper.setRouteSetActive('one', false)).toBe(false)
+
+			expect(mockCollection.operations).toHaveLength(0)
+			await routeSetHelper.saveRouteSetChanges()
+			expect(mockCollection.operations).toHaveLength(1)
+		})
+
+		it('update exclusive group - disabling player without ab', async () => {
+			const { mockCollection, routeSetHelper } = setupTest(EXCLUSIVE_ROUTESETS)
+
+			expect(routeSetHelper.setRouteSetActive('two', false)).toBe(false)
+
+			expect(mockCollection.operations).toHaveLength(0)
+			await routeSetHelper.saveRouteSetChanges()
+			expect(mockCollection.operations).toHaveLength(1)
+		})
+
+		it('update exclusive group - disabling player with ab', async () => {
+			const { mockCollection, routeSetHelper } = setupTest(EXCLUSIVE_ROUTESETS)
+
+			expect(routeSetHelper.setRouteSetActive('one', false)).toBe(true)
+
+			expect(mockCollection.operations).toHaveLength(0)
+			await routeSetHelper.saveRouteSetChanges()
+			expect(mockCollection.operations).toHaveLength(1)
+		})
+
+		it('update exclusive group - enabling player without ab', async () => {
+			const { mockCollection, routeSetHelper } = setupTest(EXCLUSIVE_ROUTESETS)
+
+			expect(routeSetHelper.setRouteSetActive('two', true)).toBe(true)
+
+			expect(mockCollection.operations).toHaveLength(0)
+			await routeSetHelper.saveRouteSetChanges()
+			expect(mockCollection.operations).toHaveLength(1)
+		})
+	})
+})
diff --git a/packages/job-worker/src/workers/context/util.ts b/packages/job-worker/src/workers/context/util.ts
new file mode 100644
index 0000000000..38ac084220
--- /dev/null
+++ b/packages/job-worker/src/workers/context/util.ts
@@ -0,0 +1 @@
+export type QueueJobFunc = (queueName: string, jobName: string, jobData: unknown) => Promise<void>
diff --git a/packages/job-worker/src/workers/events/child.ts b/packages/job-worker/src/workers/events/child.ts
index 55745e5331..76d95c4c31 100644
--- a/packages/job-worker/src/workers/events/child.ts
+++ b/packages/job-worker/src/workers/events/child.ts
@@ -11,7 +11,8 @@ import {
 	WorkerDataCache,
 	WorkerDataCacheWrapperImpl,
 } from '../caches'
-import { JobContextImpl, QueueJobFunc } from '../context'
+import { JobContextImpl } from '../context/JobContextImpl'
+import { QueueJobFunc } from '../context/util'
 import { AnyLockEvent, LocksManager } from '../locks'
 import { FastTrackTimelineFunc, LogLineWithSourceFunc } from '../../main'
 import { interceptLogging, logger } from '../../logging'
diff --git a/packages/job-worker/src/workers/ingest/child.ts b/packages/job-worker/src/workers/ingest/child.ts
index d00f8a4ae8..86af4b8634 100644
--- a/packages/job-worker/src/workers/ingest/child.ts
+++ b/packages/job-worker/src/workers/ingest/child.ts
@@ -5,7 +5,8 @@ import { createMongoConnection, getMongoCollections, IDirectCollections } from '
 import { unprotectString } from '@sofie-automation/corelib/dist/protectedString'
 import { setupApmAgent, startTransaction } from '../../profiler'
 import { InvalidateWorkerDataCache, invalidateWorkerDataCache, loadWorkerDataCache, WorkerDataCache } from '../caches'
-import { JobContextImpl, QueueJobFunc } from '../context'
+import { JobContextImpl } from '../context/JobContextImpl'
+import { QueueJobFunc } from '../context/util'
 import { AnyLockEvent, LocksManager } from '../locks'
 import { FastTrackTimelineFunc, LogLineWithSourceFunc } from '../../main'
 import { interceptLogging, logger } from '../../logging'
diff --git a/packages/job-worker/src/workers/locks.ts b/packages/job-worker/src/workers/locks.ts
index 7e991feeac..e97da411c5 100644
--- a/packages/job-worker/src/workers/locks.ts
+++ b/packages/job-worker/src/workers/locks.ts
@@ -1,5 +1,6 @@
 import { createManualPromise, ManualPromise } from '@sofie-automation/corelib/dist/lib'
 import { logger } from '../logging'
+import { stringifyError } from '@sofie-automation/shared-lib/dist/lib/stringifyError'
 
 export type AnyLockEvent = LockEvent | UnLockEvent
 export interface LockEvent {
@@ -36,7 +37,7 @@ export class LocksManager {
 				// Pass on the result for processing
 				lock.manualResolve(locked)
 			} catch (e) {
-				logger.error(`LockChange "${lockId}":${locked} failed: ${e}`)
+				logger.error(`LockChange "${lockId}":${locked} failed: ${stringifyError(e)}`)
 			}
 		})
 	}
@@ -62,7 +63,7 @@ export class LocksManager {
 					completedPromise.manualReject(new Error('Lock aquire timed out!'))
 				}
 			} catch (e) {
-				logger.error(`Unexpected error when timing out acquiring a lock: "${lockId}": ${e}`)
+				logger.error(`Unexpected error when timing out acquiring a lock: "${lockId}": ${stringifyError(e)}`)
 			}
 		}, TimeoutAquireLock)
 
@@ -95,7 +96,7 @@ export class LocksManager {
 					completedPromise.manualResolve(true)
 				}
 			} catch (e) {
-				logger.error(`Unexpected error when timing out releasing a lock: "${lockId}": ${e}`)
+				logger.error(`Unexpected error when timing out releasing a lock: "${lockId}": ${stringifyError(e)}`)
 			}
 		}, TimeoutReleaseLock)
 
diff --git a/packages/job-worker/src/workers/parent-base.ts b/packages/job-worker/src/workers/parent-base.ts
index 23f074b6dd..bb7f2890de 100644
--- a/packages/job-worker/src/workers/parent-base.ts
+++ b/packages/job-worker/src/workers/parent-base.ts
@@ -3,7 +3,6 @@ import {
 	ManualPromise,
 	createManualPromise,
 	assertNever,
-	sleep,
 	getRandomString,
 	deferAsync,
 } from '@sofie-automation/corelib/dist/lib'
@@ -21,6 +20,7 @@ import { StatusCode } from '@sofie-automation/blueprints-integration'
 import { CollectionName } from '@sofie-automation/corelib/dist/dataModel/Collections'
 import { WorkerThreadStatus } from '@sofie-automation/corelib/dist/dataModel/WorkerThreads'
 import { UserError } from '@sofie-automation/corelib/dist/error'
+import { sleep } from '@sofie-automation/shared-lib/dist/lib/lib'
 
 export enum ThreadStatus {
 	Closed = 0,
@@ -278,7 +278,11 @@ export abstract class WorkerParentBase {
 
 								try {
 									logger.verbose(`Starting work ${job.id}: "${job.name}"`)
-									logger.debug(`Payload ${job.id}: ${JSON.stringify(job.data)}`)
+									logger.silly(
+										`Starting work ${job.id}: "${job.name}", payload ${job.id}: ${JSON.stringify(
+											job.data
+										)}`
+									)
 
 									// Future - extend the job lock on an interval
 									let result: WorkerJobResult
diff --git a/packages/job-worker/src/workers/studio/child.ts b/packages/job-worker/src/workers/studio/child.ts
index d582e03e80..40903527c6 100644
--- a/packages/job-worker/src/workers/studio/child.ts
+++ b/packages/job-worker/src/workers/studio/child.ts
@@ -5,7 +5,8 @@ import { createMongoConnection, getMongoCollections, IDirectCollections } from '
 import { unprotectString } from '@sofie-automation/corelib/dist/protectedString'
 import { setupApmAgent, startTransaction } from '../../profiler'
 import { InvalidateWorkerDataCache, invalidateWorkerDataCache, loadWorkerDataCache, WorkerDataCache } from '../caches'
-import { QueueJobFunc, JobContextImpl } from '../context'
+import { JobContextImpl } from '../context/JobContextImpl'
+import { QueueJobFunc } from '../context/util'
 import { AnyLockEvent, LocksManager } from '../locks'
 import { FastTrackTimelineFunc, LogLineWithSourceFunc } from '../../main'
 import { interceptLogging, logger } from '../../logging'
diff --git a/packages/job-worker/src/workers/studio/jobs.ts b/packages/job-worker/src/workers/studio/jobs.ts
index 6eea552a10..a7741e6e56 100644
--- a/packages/job-worker/src/workers/studio/jobs.ts
+++ b/packages/job-worker/src/workers/studio/jobs.ts
@@ -44,8 +44,10 @@ import {
 import { handleTimelineTriggerTime, handleOnPlayoutPlaybackChanged } from '../../playout/timings'
 import { handleExecuteAdlibAction } from '../../playout/adlibAction'
 import { handleTakeNextPart } from '../../playout/take'
+import { handleSetQuickLoopMarker } from '../../playout/quickLoopMarkers'
 import { handleActivateAdlibTesting } from '../../playout/adlibTesting'
 import { handleExecuteBucketAdLibOrAction } from '../../playout/bucketAdlibJobs'
+import { handleSwitchRouteSet } from '../../studio/routeSet'
 
 type ExecutableFunction<T extends keyof StudioJobFunc> = (
 	context: JobContext,
@@ -103,4 +105,8 @@ export const studioJobHandlers: StudioJobHandlers = {
 	[StudioJobs.BlueprintIgnoreFixUpConfigForStudio]: handleBlueprintIgnoreFixUpConfigForStudio,
 
 	[StudioJobs.ActivateAdlibTesting]: handleActivateAdlibTesting,
+
+	[StudioJobs.SetQuickLoopMarker]: handleSetQuickLoopMarker,
+
+	[StudioJobs.SwitchRouteSet]: handleSwitchRouteSet,
 }
diff --git a/packages/lerna.json b/packages/lerna.json
index 0fdc1ad853..c455cb8562 100644
--- a/packages/lerna.json
+++ b/packages/lerna.json
@@ -1,5 +1,5 @@
 {
-	"version": "1.51.0-in-development",
+	"version": "1.52.0-in-development",
 	"npmClient": "yarn",
 	"useWorkspaces": true
 }
diff --git a/packages/live-status-gateway/api/schemas/activePlaylist.yaml b/packages/live-status-gateway/api/schemas/activePlaylist.yaml
index 5b373bfcc3..449e049211 100644
--- a/packages/live-status-gateway/api/schemas/activePlaylist.yaml
+++ b/packages/live-status-gateway/api/schemas/activePlaylist.yaml
@@ -29,7 +29,32 @@ $defs:
         $ref: '#/$defs/part'
       publicData:
         description: Optional arbitrary data
-    required: [event, id, name, rundownIds, currentPart, currentSegment, nextPart]
+      timing:
+        description: Timing information about the active playlist
+        type: object
+        properties:
+          timingMode:
+            description: 'Timing mode for the playlist.'
+            type: string
+            enum:
+              - none
+              - forward-time
+              - back-time
+          startedPlayback:
+            description: Unix timestamp of when the playlist started (milliseconds)
+            type: number
+          expectedStart:
+            description: Unix timestamp of when the playlist is expected to start (milliseconds). Required when the timingMode is set to forward-time.
+            type: number
+          expectedDurationMs:
+            description: Duration of the playlist in ms
+            type: number
+          expectedEnd:
+            description: Unix timestamp of when the playlist is expected to end (milliseconds) Required when the timingMode is set to back-time.
+            type: number
+        required: [timingMode]
+        additionalProperties: false
+    required: [event, id, name, rundownIds, currentPart, currentSegment, nextPart, timing]
     additionalProperties: false
     examples:
       - event: activePlaylist
@@ -44,6 +69,10 @@ $defs:
           $ref: '#/$defs/part/examples/0'
         publicData:
           category: 'Evening News'
+        timing:
+          timingMode: 'forward-time'
+          expectedStart: 1728895750727
+          expectedDurationMs: 180000
   partBase:
     type: object
     properties:
@@ -143,6 +172,12 @@ $defs:
           projectedEndTime:
             description: Unix timestamp of when the segment is projected to end (milliseconds). The time this segment started, offset by its budget duration, if the segment has a defined budget duration. Otherwise, the time the current part started, offset by the difference between expected durations of all parts in this segment and the as-played durations of the parts that already stopped.
             type: number
+          countdownType:
+            description: 'Countdown type within the segment. Default: `part_expected_duration`'
+            type: string
+            enum:
+              - part_expected_duration
+              - segment_budget_duration
         required: [expectedDurationMs, projectedEndTime]
     required: [id, timing]
     additionalProperties: false
@@ -152,6 +187,7 @@ $defs:
           expectedDurationMs: 15000
           budgetDurationMs: 20000
           projectedEndTime: 1600000075000
+          countdownType: segment_budget_duration
   piece:
     type: object
     properties:
diff --git a/packages/live-status-gateway/api/schemas/segments.yaml b/packages/live-status-gateway/api/schemas/segments.yaml
index 29180418ea..ca87639614 100644
--- a/packages/live-status-gateway/api/schemas/segments.yaml
+++ b/packages/live-status-gateway/api/schemas/segments.yaml
@@ -48,6 +48,12 @@ $defs:
           budgetDurationMs:
             description: Budget duration of the segment (milliseconds)
             type: number
+          countdownType:
+            description: 'Countdown type within the segment. Default: `part_expected_duration`'
+            type: string
+            enum:
+              - part_expected_duration
+              - segment_budget_duration
         required: [expectedDurationMs]
       publicData:
         description: Optional arbitrary data
@@ -60,5 +66,6 @@ $defs:
         timing:
           expectedDurationMs: 15000
           budgetDurationMs: 20000
+          countdownType: segment_budget_duration
         publicData:
           containsLiveSource: true
diff --git a/packages/live-status-gateway/package.json b/packages/live-status-gateway/package.json
index 50e8a2e0df..e5d15d6575 100644
--- a/packages/live-status-gateway/package.json
+++ b/packages/live-status-gateway/package.json
@@ -1,18 +1,18 @@
 {
 	"name": "live-status-gateway",
-	"version": "1.51.0-in-development",
+	"version": "1.52.0-in-development",
 	"private": true,
 	"description": "Provides state from Sofie over sockets",
 	"license": "MIT",
 	"repository": {
 		"type": "git",
-		"url": "git+https://github.com/nrkno/tv-automation-server-core.git",
+		"url": "git+https://github.com/nrkno/sofie-core.git",
 		"directory": "packages/live-status-gateway"
 	},
 	"bugs": {
-		"url": "https://github.com/nrkno/tv-automation-server-core/issues"
+		"url": "https://github.com/nrkno/sofie-core/issues"
 	},
-	"homepage": "https://github.com/nrkno/tv-automation-server-core/blob/master/packages/live-status-gateway#readme",
+	"homepage": "https://github.com/nrkno/sofie-core/blob/master/packages/live-status-gateway#readme",
 	"contributors": [],
 	"scripts": {
 		"build": "run -T rimraf dist && run build:main",
@@ -53,10 +53,10 @@
 		"production"
 	],
 	"dependencies": {
-		"@sofie-automation/blueprints-integration": "1.51.0-in-development",
-		"@sofie-automation/corelib": "1.51.0-in-development",
-		"@sofie-automation/server-core-integration": "1.51.0-in-development",
-		"@sofie-automation/shared-lib": "1.51.0-in-development",
+		"@sofie-automation/blueprints-integration": "1.52.0-in-development",
+		"@sofie-automation/corelib": "1.52.0-in-development",
+		"@sofie-automation/server-core-integration": "1.52.0-in-development",
+		"@sofie-automation/shared-lib": "1.52.0-in-development",
 		"debug": "^4.3.4",
 		"fast-clone": "^1.5.13",
 		"influx": "^5.9.3",
diff --git a/packages/live-status-gateway/src/collections/pieceInstancesHandler.ts b/packages/live-status-gateway/src/collections/pieceInstancesHandler.ts
index 732bf79a67..74bff309e2 100644
--- a/packages/live-status-gateway/src/collections/pieceInstancesHandler.ts
+++ b/packages/live-status-gateway/src/collections/pieceInstancesHandler.ts
@@ -10,7 +10,10 @@ import throttleToNextTick from '@sofie-automation/shared-lib/dist/lib/throttleTo
 import _ = require('underscore')
 import { CorelibPubSub } from '@sofie-automation/corelib/dist/pubsub'
 import { PartInstanceId, PieceInstanceId } from '@sofie-automation/corelib/dist/dataModel/Ids'
-import { processAndPrunePieceInstanceTimings } from '@sofie-automation/corelib/dist/playout/processAndPrune'
+import {
+	processAndPrunePieceInstanceTimings,
+	resolvePrunedPieceInstance,
+} from '@sofie-automation/corelib/dist/playout/processAndPrune'
 import { ShowStyleBaseExt, ShowStyleBaseHandler } from './showStyleBaseHandler'
 import { PlaylistHandler } from './playlistHandler'
 import { SourceLayers } from '@sofie-automation/corelib/dist/dataModel/ShowStyleBase'
@@ -44,8 +47,7 @@ export class PieceInstancesHandler
 	private _partInstances: SelectedPartInstances | undefined
 
 	private _throttledUpdateAndNotify = throttleToNextTick(() => {
-		this.updateCollectionData()
-		this.notify(this._collectionData).catch(this._logger.error)
+		this.updateAndNotify().catch(this._logger.error)
 	})
 
 	constructor(logger: Logger, coreHandler: CoreHandler) {
@@ -72,13 +74,33 @@ export class PieceInstancesHandler
 
 	private processAndPrunePieceInstanceTimings(
 		partInstance: DBPartInstance | undefined,
-		pieceInstances: PieceInstance[]
+		pieceInstances: PieceInstance[],
+		filterActive: boolean
 	): ReadonlyDeep<PieceInstance>[] {
 		// Approximate when 'now' is in the PartInstance, so that any adlibbed Pieces will be timed roughly correctly
 		const partStarted = partInstance?.timings?.plannedStartedPlayback
 		const nowInPart = partStarted === undefined ? 0 : Date.now() - partStarted
 
-		return processAndPrunePieceInstanceTimings(this._sourceLayers, pieceInstances, nowInPart, false, false)
+		const prunedPieceInstances = processAndPrunePieceInstanceTimings(
+			this._sourceLayers,
+			pieceInstances,
+			nowInPart,
+			false,
+			false
+		)
+		if (!filterActive) return prunedPieceInstances
+
+		return prunedPieceInstances.filter((pieceInstance) => {
+			const resolvedPieceInstance = resolvePrunedPieceInstance(nowInPart, pieceInstance)
+
+			return (
+				resolvedPieceInstance.resolvedStart <= nowInPart &&
+				(resolvedPieceInstance.resolvedDuration == null ||
+					resolvedPieceInstance.resolvedStart + resolvedPieceInstance.resolvedDuration > nowInPart) &&
+				pieceInstance.piece.virtual !== true &&
+				pieceInstance.disabled !== true
+			)
+		})
 	}
 
 	private updateCollectionData(): boolean {
@@ -89,36 +111,44 @@ export class PieceInstancesHandler
 		const inPreviousPartInstance = this._currentPlaylist?.previousPartInfo?.partInstanceId
 			? this.processAndPrunePieceInstanceTimings(
 					this._partInstances?.previous,
-					collection.find({ partInstanceId: this._currentPlaylist.previousPartInfo.partInstanceId })
+					collection.find({ partInstanceId: this._currentPlaylist.previousPartInfo.partInstanceId }),
+					true
 			  )
 			: []
 		const inCurrentPartInstance = this._currentPlaylist?.currentPartInfo?.partInstanceId
 			? this.processAndPrunePieceInstanceTimings(
 					this._partInstances?.current,
-					collection.find({ partInstanceId: this._currentPlaylist.currentPartInfo.partInstanceId })
+					collection.find({ partInstanceId: this._currentPlaylist.currentPartInfo.partInstanceId }),
+					true
 			  )
 			: []
 		const inNextPartInstance = this._currentPlaylist?.nextPartInfo?.partInstanceId
 			? this.processAndPrunePieceInstanceTimings(
 					undefined,
-					collection.find({ partInstanceId: this._currentPlaylist.nextPartInfo.partInstanceId })
+					collection.find({ partInstanceId: this._currentPlaylist.nextPartInfo.partInstanceId }),
+					false
 			  )
 			: []
 
-		const active = [...inPreviousPartInstance, ...inCurrentPartInstance].filter((pieceInstance) =>
-			this.isPieceInstanceActive(pieceInstance)
-		)
+		const active = [...inCurrentPartInstance]
+		// Only include the pieces from the previous part if the part is still considered to be playing
+		if (
+			this._partInstances?.previous?.timings &&
+			(this._partInstances.previous.timings.plannedStoppedPlayback ?? 0) > Date.now()
+		) {
+			active.push(...inPreviousPartInstance)
+		}
 
 		let hasAnythingChanged = false
-		if (!areElementsShallowEqual(this._collectionData.active, active)) {
+		if (!_.isEqual(this._collectionData.active, active)) {
 			this._collectionData.active = active
 			hasAnythingChanged = true
 		}
 		if (
-			!areElementsShallowEqual(this._collectionData.currentPartInstance, inCurrentPartInstance) &&
+			!_.isEqual(this._collectionData.currentPartInstance, inCurrentPartInstance) &&
 			(this._collectionData.currentPartInstance.length !== inCurrentPartInstance.length ||
 				this._collectionData.currentPartInstance.some((pieceInstance, index) => {
-					return !arePropertiesShallowEqual<ReadonlyDeep<PieceInstance>>(
+					return !arePropertiesDeepEqual<ReadonlyDeep<PieceInstance>>(
 						inCurrentPartInstance[index],
 						pieceInstance,
 						['reportedStartedPlayback', 'reportedStoppedPlayback']
@@ -128,7 +158,7 @@ export class PieceInstancesHandler
 			this._collectionData.currentPartInstance = inCurrentPartInstance
 			hasAnythingChanged = true
 		}
-		if (!areElementsShallowEqual(this._collectionData.nextPartInstance, inNextPartInstance)) {
+		if (!_.isEqual(this._collectionData.nextPartInstance, inNextPartInstance)) {
 			this._collectionData.nextPartInstance = inNextPartInstance
 			hasAnythingChanged = true
 		}
@@ -235,28 +265,9 @@ export class PieceInstancesHandler
 			await this.notify(this._collectionData)
 		}
 	}
-
-	private isPieceInstanceActive(pieceInstance: ReadonlyDeep<PieceInstance>) {
-		return (
-			pieceInstance.reportedStoppedPlayback == null &&
-			pieceInstance.piece.virtual !== true &&
-			pieceInstance.disabled !== true &&
-			(pieceInstance.partInstanceId === this._currentPlaylist?.previousPartInfo?.partInstanceId || // a piece from previous part instance may be active during transition
-				pieceInstance.partInstanceId === this._currentPlaylist?.currentPartInfo?.partInstanceId) &&
-			(pieceInstance.reportedStartedPlayback != null || // has been reported to have started by the Playout Gateway
-				pieceInstance.plannedStartedPlayback != null || // a time to start playing has been set by Core
-				(pieceInstance.partInstanceId === this._currentPlaylist?.currentPartInfo?.partInstanceId &&
-					pieceInstance.piece.enable.start === 0) || // this is to speed things up immediately after a part instance is taken when not yet reported by the Playout Gateway
-				pieceInstance.infinite?.fromPreviousPart) // infinites from previous part also are on air from the start of the current part
-		)
-	}
 }
 
-export function arePropertiesShallowEqual<T extends Record<string, any>>(
-	a: T,
-	b: T,
-	omitProperties: Array<keyof T>
-): boolean {
+function arePropertiesDeepEqual<T extends Record<string, any>>(a: T, b: T, omitProperties: Array<keyof T>): boolean {
 	if (typeof a !== 'object' || a == null || typeof b !== 'object' || b == null) {
 		return false
 	}
@@ -267,7 +278,7 @@ export function arePropertiesShallowEqual<T extends Record<string, any>>(
 	if (keysA.length !== keysB.length) return false
 
 	for (const key of keysA) {
-		if (!keysB.includes(key) || a[key] !== b[key]) {
+		if (!keysB.includes(key) || !_.isEqual(a[key], b[key])) {
 			return false
 		}
 	}
diff --git a/packages/live-status-gateway/src/collections/segmentHandler.ts b/packages/live-status-gateway/src/collections/segmentHandler.ts
index da4c85bcff..830af41e0b 100644
--- a/packages/live-status-gateway/src/collections/segmentHandler.ts
+++ b/packages/live-status-gateway/src/collections/segmentHandler.ts
@@ -31,14 +31,19 @@ export class SegmentHandler
 		if (!collection) throw new Error(`collection '${this._collectionName}' not found!`)
 		const allSegments = collection.find(undefined)
 		await this._segmentsHandler.setSegments(allSegments)
-		if (this._currentSegmentId) {
-			this._collectionData = collection.findOne(this._currentSegmentId)
+		await this.updateAndNotify()
+	}
+
+	private async updateAndNotify() {
+		const collection = this._core.getCollection(this._collectionName)
+		const newData = this._currentSegmentId ? collection.findOne(this._currentSegmentId) : undefined
+		if (this._collectionData !== newData) {
+			this._collectionData = newData
 			await this.notify(this._collectionData)
 		}
 	}
 
 	async update(source: string, data: SelectedPartInstances | DBRundownPlaylist | undefined): Promise<void> {
-		const previousSegmentId = this._currentSegmentId
 		const previousRundownIds = this._rundownIds
 
 		switch (source) {
@@ -91,11 +96,6 @@ export class SegmentHandler
 			const allSegments = collection.find(undefined)
 			await this._segmentsHandler.setSegments(allSegments)
 		}
-		if (previousSegmentId !== this._currentSegmentId) {
-			if (this._currentSegmentId) {
-				this._collectionData = collection.findOne(this._currentSegmentId)
-				await this.notify(this._collectionData)
-			}
-		}
+		await this.updateAndNotify()
 	}
 }
diff --git a/packages/live-status-gateway/src/liveStatusServer.ts b/packages/live-status-gateway/src/liveStatusServer.ts
index 70590e22b0..2998d151b8 100644
--- a/packages/live-status-gateway/src/liveStatusServer.ts
+++ b/packages/live-status-gateway/src/liveStatusServer.ts
@@ -108,6 +108,7 @@ export class LiveStatusServer {
 		await partInstancesHandler.subscribe(activePlaylistTopic)
 		await partsHandler.subscribe(activePlaylistTopic)
 		await pieceInstancesHandler.subscribe(activePlaylistTopic)
+		await segmentHandler.subscribe(activePlaylistTopic)
 
 		await playlistHandler.subscribe(activePiecesTopic)
 		await showStyleBaseHandler.subscribe(activePiecesTopic)
diff --git a/packages/live-status-gateway/src/topics/__tests__/activePlaylist.spec.ts b/packages/live-status-gateway/src/topics/__tests__/activePlaylist.spec.ts
index b50890c6b9..0375a59f4e 100644
--- a/packages/live-status-gateway/src/topics/__tests__/activePlaylist.spec.ts
+++ b/packages/live-status-gateway/src/topics/__tests__/activePlaylist.spec.ts
@@ -9,6 +9,10 @@ import { literal } from '@sofie-automation/corelib/dist/lib'
 import { DBPartInstance } from '@sofie-automation/corelib/dist/dataModel/PartInstance'
 import { PartsHandler } from '../../collections/partsHandler'
 import { DBPart } from '@sofie-automation/corelib/dist/dataModel/Part'
+import { SegmentHandler } from '../../collections/segmentHandler'
+import { DBSegment } from '@sofie-automation/corelib/dist/dataModel/Segment'
+import { CountdownType } from '@sofie-automation/blueprints-integration'
+import { PlaylistTimingType } from '@sofie-automation/blueprints-integration'
 
 function makeEmptyTestPartInstances(): SelectedPartInstances {
 	return {
@@ -46,6 +50,9 @@ describe('ActivePlaylistTopic', () => {
 			currentSegment: null,
 			rundownIds: unprotectStringArray(playlist.rundownIdsInOrder),
 			publicData: undefined,
+			timing: {
+				timingMode: PlaylistTimingType.None,
+			},
 		}
 
 		// eslint-disable-next-line @typescript-eslint/unbound-method
@@ -73,11 +80,13 @@ describe('ActivePlaylistTopic', () => {
 
 		const testShowStyleBase = makeTestShowStyleBase()
 		await topic.update(ShowStyleBaseHandler.name, testShowStyleBase as ShowStyleBaseExt)
+
+		const segment1id = protectString('SEGMENT_1')
 		const part1: Partial<DBPart> = {
 			_id: protectString('PART_1'),
 			title: 'Test Part',
-			segmentId: protectString('SEGMENT_1'),
-			expectedDurationWithPreroll: 10000,
+			segmentId: segment1id,
+			expectedDurationWithTransition: 10000,
 			expectedDuration: 10000,
 			publicData: { b: 'c' },
 		}
@@ -86,6 +95,7 @@ describe('ActivePlaylistTopic', () => {
 				_id: currentPartInstanceId,
 				part: part1,
 				timings: { plannedStartedPlayback: 1600000060000 },
+				segmentId: segment1id,
 			},
 			firstInSegmentPlayout: {},
 			inCurrentSegment: [
@@ -100,6 +110,10 @@ describe('ActivePlaylistTopic', () => {
 
 		await topic.update(PartsHandler.name, [part1] as DBPart[])
 
+		await topic.update(SegmentHandler.name, {
+			_id: segment1id,
+		} as DBSegment)
+
 		topic.addSubscriber(mockSubscriber)
 
 		const expectedStatus: ActivePlaylistStatus = {
@@ -125,6 +139,102 @@ describe('ActivePlaylistTopic', () => {
 			},
 			rundownIds: unprotectStringArray(playlist.rundownIdsInOrder),
 			publicData: { a: 'b' },
+			timing: {
+				timingMode: PlaylistTimingType.None,
+			},
+		}
+
+		// eslint-disable-next-line @typescript-eslint/unbound-method
+		expect(mockSubscriber.send).toHaveBeenCalledTimes(1)
+		expect(JSON.parse(mockSubscriber.send.mock.calls[0][0] as string)).toMatchObject(
+			JSON.parse(JSON.stringify(expectedStatus))
+		)
+	})
+
+	it('provides segment and part with segment timing', async () => {
+		const topic = new ActivePlaylistTopic(makeMockLogger())
+		const mockSubscriber = makeMockSubscriber()
+
+		const currentPartInstanceId = 'CURRENT_PART_INSTANCE_ID'
+
+		const playlist = makeTestPlaylist()
+		playlist.activationId = protectString('somethingRandom')
+		playlist.currentPartInfo = {
+			consumesQueuedSegmentId: false,
+			manuallySelected: false,
+			partInstanceId: protectString(currentPartInstanceId),
+			rundownId: playlist.rundownIdsInOrder[0],
+		}
+		await topic.update(PlaylistHandler.name, playlist)
+
+		const testShowStyleBase = makeTestShowStyleBase()
+		await topic.update(ShowStyleBaseHandler.name, testShowStyleBase as ShowStyleBaseExt)
+
+		const segment1id = protectString('SEGMENT_1')
+		const part1: Partial<DBPart> = {
+			_id: protectString('PART_1'),
+			title: 'Test Part',
+			segmentId: protectString('SEGMENT_1'),
+			expectedDurationWithTransition: 10000,
+			expectedDuration: 10000,
+			publicData: { b: 'c' },
+		}
+		const currentPartInstance = {
+			_id: currentPartInstanceId,
+			part: part1,
+			timings: { plannedStartedPlayback: 1600000060000 },
+			segmentId: segment1id,
+		}
+		const testPartInstances: PartialDeep<SelectedPartInstances> = {
+			current: currentPartInstance,
+			firstInSegmentPlayout: currentPartInstance,
+			inCurrentSegment: [
+				literal<PartialDeep<DBPartInstance>>({
+					_id: protectString(currentPartInstanceId),
+					part: part1,
+					timings: { plannedStartedPlayback: 1600000060000 },
+				}),
+			] as DBPartInstance[],
+		}
+		await topic.update(PartInstancesHandler.name, testPartInstances as SelectedPartInstances)
+
+		await topic.update(PartsHandler.name, [part1] as DBPart[])
+
+		await topic.update(SegmentHandler.name, {
+			_id: segment1id,
+			segmentTiming: { budgetDuration: 12300, countdownType: CountdownType.SEGMENT_BUDGET_DURATION },
+		} as DBSegment)
+
+		topic.addSubscriber(mockSubscriber)
+
+		const expectedStatus: ActivePlaylistStatus = {
+			event: 'activePlaylist',
+			name: playlist.name,
+			id: unprotectString(playlist._id),
+			currentPart: {
+				id: 'PART_1',
+				name: 'Test Part',
+				segmentId: 'SEGMENT_1',
+				timing: { startTime: 1600000060000, expectedDurationMs: 10000, projectedEndTime: 1600000070000 },
+				pieces: [],
+				autoNext: undefined,
+				publicData: { b: 'c' },
+			},
+			nextPart: null,
+			currentSegment: {
+				id: 'SEGMENT_1',
+				timing: {
+					expectedDurationMs: 10000,
+					budgetDurationMs: 12300,
+					projectedEndTime: 1600000072300,
+					countdownType: 'segment_budget_duration',
+				},
+			},
+			rundownIds: unprotectStringArray(playlist.rundownIdsInOrder),
+			publicData: { a: 'b' },
+			timing: {
+				timingMode: PlaylistTimingType.None,
+			},
 		}
 
 		// eslint-disable-next-line @typescript-eslint/unbound-method
diff --git a/packages/live-status-gateway/src/topics/__tests__/segmentsTopic.spec.ts b/packages/live-status-gateway/src/topics/__tests__/segmentsTopic.spec.ts
index 05d7a1649f..781e4b4adc 100644
--- a/packages/live-status-gateway/src/topics/__tests__/segmentsTopic.spec.ts
+++ b/packages/live-status-gateway/src/topics/__tests__/segmentsTopic.spec.ts
@@ -11,7 +11,7 @@ const RUNDOWN_1_ID = 'RUNDOWN_1'
 const RUNDOWN_2_ID = 'RUNDOWN_2'
 const THROTTLE_PERIOD_MS = 205
 
-function makeTestSegment(id: string, rank: number, rundownId: string): DBSegment {
+function makeTestSegment(id: string, rank: number, rundownId: string, segmentProps?: Partial<DBSegment>): DBSegment {
 	return {
 		_id: protectString(id),
 		externalId: `NCS_SEGMENT_${id}`,
@@ -19,6 +19,7 @@ function makeTestSegment(id: string, rank: number, rundownId: string): DBSegment
 		_rank: rank,
 		rundownId: protectString(rundownId),
 		externalModified: 1695799420147,
+		...segmentProps,
 	}
 }
 
@@ -27,7 +28,7 @@ function makeTestPart(
 	rank: number,
 	rundownId: string,
 	segmentId: string,
-	partProps: Partial<DBPart>
+	partProps?: Partial<DBPart>
 ): DBPart {
 	return {
 		_id: protectString(id),
@@ -36,7 +37,7 @@ function makeTestPart(
 		_rank: rank,
 		rundownId: protectString(rundownId),
 		segmentId: protectString(segmentId),
-		expectedDurationWithPreroll: undefined,
+		expectedDurationWithTransition: undefined,
 		...partProps,
 	}
 }
@@ -260,33 +261,19 @@ describe('SegmentsTopic', () => {
 		const segment_2_2_id = '2_2'
 		await topic.update(SegmentsHandler.name, [
 			makeTestSegment('2_1', 1, RUNDOWN_2_ID),
-			makeTestSegment(segment_2_2_id, 2, RUNDOWN_2_ID),
-			makeTestSegment(segment_1_2_id, 2, RUNDOWN_1_ID),
-			makeTestSegment(segment_1_1_id, 1, RUNDOWN_1_ID),
+			makeTestSegment(segment_2_2_id, 2, RUNDOWN_2_ID, { segmentTiming: { budgetDuration: 51000 } }),
+			makeTestSegment(segment_1_2_id, 2, RUNDOWN_1_ID, { segmentTiming: { budgetDuration: 15000 } }),
+			makeTestSegment(segment_1_1_id, 1, RUNDOWN_1_ID, { segmentTiming: { budgetDuration: 5000 } }),
 		])
 		mockSubscriber.send.mockClear()
 		await topic.update(PartsHandler.name, [
-			makeTestPart('1_2_1', 1, RUNDOWN_1_ID, segment_1_2_id, {
-				budgetDuration: 10000,
-			}),
-			makeTestPart('2_2_1', 1, RUNDOWN_1_ID, segment_2_2_id, {
-				budgetDuration: 40000,
-			}),
-			makeTestPart('1_2_2', 2, RUNDOWN_1_ID, segment_1_2_id, {
-				budgetDuration: 5000,
-			}),
-			makeTestPart('1_1_2', 2, RUNDOWN_1_ID, segment_1_1_id, {
-				budgetDuration: 1000,
-			}),
-			makeTestPart('1_1_1', 1, RUNDOWN_1_ID, segment_1_1_id, {
-				budgetDuration: 3000,
-			}),
-			makeTestPart('2_2_2', 2, RUNDOWN_1_ID, segment_2_2_id, {
-				budgetDuration: 11000,
-			}),
-			makeTestPart('1_1_2', 2, RUNDOWN_1_ID, segment_1_1_id, {
-				budgetDuration: 1000,
-			}),
+			makeTestPart('1_2_1', 1, RUNDOWN_1_ID, segment_1_2_id),
+			makeTestPart('2_2_1', 1, RUNDOWN_1_ID, segment_2_2_id),
+			makeTestPart('1_2_2', 2, RUNDOWN_1_ID, segment_1_2_id),
+			makeTestPart('1_1_2', 2, RUNDOWN_1_ID, segment_1_1_id),
+			makeTestPart('1_1_1', 1, RUNDOWN_1_ID, segment_1_1_id),
+			makeTestPart('2_2_2', 2, RUNDOWN_1_ID, segment_2_2_id),
+			makeTestPart('1_1_2', 2, RUNDOWN_1_ID, segment_1_1_id),
 		])
 		jest.advanceTimersByTime(THROTTLE_PERIOD_MS)
 
@@ -354,25 +341,25 @@ describe('SegmentsTopic', () => {
 		mockSubscriber.send.mockClear()
 		await topic.update(PartsHandler.name, [
 			makeTestPart('1_2_1', 1, RUNDOWN_1_ID, segment_1_2_id, {
-				expectedDurationWithPreroll: 10000,
+				expectedDurationWithTransition: 10000,
 			}),
 			makeTestPart('2_2_1', 1, RUNDOWN_1_ID, segment_2_2_id, {
-				expectedDurationWithPreroll: 40000,
+				expectedDurationWithTransition: 40000,
 			}),
 			makeTestPart('1_2_2', 2, RUNDOWN_1_ID, segment_1_2_id, {
-				expectedDurationWithPreroll: 5000,
+				expectedDurationWithTransition: 5000,
 			}),
 			makeTestPart('1_1_2', 2, RUNDOWN_1_ID, segment_1_1_id, {
-				expectedDurationWithPreroll: 1000,
+				expectedDurationWithTransition: 1000,
 			}),
 			makeTestPart('1_1_1', 1, RUNDOWN_1_ID, segment_1_1_id, {
-				expectedDurationWithPreroll: 3000,
+				expectedDurationWithTransition: 3000,
 			}),
 			makeTestPart('2_2_2', 2, RUNDOWN_1_ID, segment_2_2_id, {
-				expectedDurationWithPreroll: 11000,
+				expectedDurationWithTransition: 11000,
 			}),
 			makeTestPart('1_1_2', 2, RUNDOWN_1_ID, segment_1_1_id, {
-				expectedDurationWithPreroll: 1000,
+				expectedDurationWithTransition: 1000,
 			}),
 		])
 		jest.advanceTimersByTime(THROTTLE_PERIOD_MS)
diff --git a/packages/live-status-gateway/src/topics/__tests__/utils.ts b/packages/live-status-gateway/src/topics/__tests__/utils.ts
index fffea9f56a..f3fb929a09 100644
--- a/packages/live-status-gateway/src/topics/__tests__/utils.ts
+++ b/packages/live-status-gateway/src/topics/__tests__/utils.ts
@@ -53,7 +53,7 @@ export function makeTestParts(): DBPart[] {
 			segmentId: protectString('segment0'),
 			notes: [],
 			externalId: 'NCS_PART_0',
-			expectedDurationWithPreroll: 1000,
+			expectedDurationWithTransition: 1000,
 			title: 'Part 0',
 		},
 	]
diff --git a/packages/live-status-gateway/src/topics/activePlaylistTopic.ts b/packages/live-status-gateway/src/topics/activePlaylistTopic.ts
index a9a9bb5d2d..6be22ae8c6 100644
--- a/packages/live-status-gateway/src/topics/activePlaylistTopic.ts
+++ b/packages/live-status-gateway/src/topics/activePlaylistTopic.ts
@@ -15,6 +15,9 @@ import _ = require('underscore')
 import { PartTiming, calculateCurrentPartTiming } from './helpers/partTiming'
 import { SelectedPieceInstances, PieceInstancesHandler, PieceInstanceMin } from '../collections/pieceInstancesHandler'
 import { PieceStatus, toPieceStatus } from './helpers/pieceStatus'
+import { DBSegment } from '@sofie-automation/corelib/dist/dataModel/Segment'
+import { SegmentHandler } from '../collections/segmentHandler'
+import { PlaylistTimingType } from '@sofie-automation/blueprints-integration'
 
 const THROTTLE_PERIOD_MS = 100
 
@@ -45,6 +48,13 @@ export interface ActivePlaylistStatus {
 	currentSegment: CurrentSegmentStatus | null
 	nextPart: PartStatus | null
 	publicData: unknown
+	timing: {
+		timingMode: PlaylistTimingType
+		startedPlayback?: number
+		expectedStart?: number
+		expectedDurationMs?: number
+		expectedEnd?: number
+	}
 }
 
 export class ActivePlaylistTopic
@@ -55,7 +65,8 @@ export class ActivePlaylistTopic
 		CollectionObserver<ShowStyleBaseExt>,
 		CollectionObserver<SelectedPartInstances>,
 		CollectionObserver<DBPart[]>,
-		CollectionObserver<SelectedPieceInstances>
+		CollectionObserver<SelectedPieceInstances>,
+		CollectionObserver<DBSegment>
 {
 	public observerName = ActivePlaylistTopic.name
 	private _activePlaylist: DBRundownPlaylist | undefined
@@ -67,6 +78,7 @@ export class ActivePlaylistTopic
 	private _pieceInstancesInCurrentPartInstance: PieceInstanceMin[] | undefined
 	private _pieceInstancesInNextPartInstance: PieceInstanceMin[] | undefined
 	private _showStyleBaseExt: ShowStyleBaseExt | undefined
+	private _currentSegment: DBSegment | undefined
 	private throttledSendStatusToAll: () => void
 
 	constructor(logger: Logger) {
@@ -116,10 +128,11 @@ export class ActivePlaylistTopic
 							  })
 							: null,
 					currentSegment:
-						this._currentPartInstance && currentPart
+						this._currentPartInstance && currentPart && this._currentSegment
 							? literal<CurrentSegmentStatus>({
 									id: unprotectString(currentPart.segmentId),
 									timing: calculateCurrentSegmentTiming(
+										this._currentSegment,
 										this._currentPartInstance,
 										this._firstInstanceInSegmentPlayout,
 										this._partInstancesInCurrentSegment,
@@ -141,6 +154,19 @@ export class ActivePlaylistTopic
 						  })
 						: null,
 					publicData: this._activePlaylist.publicData,
+					timing: {
+						timingMode: this._activePlaylist.timing.type,
+						startedPlayback: this._activePlaylist.startedPlayback,
+						expectedDurationMs: this._activePlaylist.timing.expectedDuration,
+						expectedStart:
+							this._activePlaylist.timing.type !== PlaylistTimingType.None
+								? this._activePlaylist.timing.expectedStart
+								: undefined,
+						expectedEnd:
+							this._activePlaylist.timing.type !== PlaylistTimingType.None
+								? this._activePlaylist.timing.expectedEnd
+								: undefined,
+					},
 			  })
 			: literal<ActivePlaylistStatus>({
 					event: 'activePlaylist',
@@ -151,6 +177,9 @@ export class ActivePlaylistTopic
 					currentSegment: null,
 					nextPart: null,
 					publicData: undefined,
+					timing: {
+						timingMode: PlaylistTimingType.None,
+					},
 			  })
 
 		this.sendMessage(subscribers, message)
@@ -159,6 +188,7 @@ export class ActivePlaylistTopic
 	private isDataInconsistent() {
 		return (
 			this._currentPartInstance?._id !== this._activePlaylist?.currentPartInfo?.partInstanceId ||
+			this._currentPartInstance?.segmentId !== this._currentSegment?._id ||
 			this._nextPartInstance?._id !== this._activePlaylist?.nextPartInfo?.partInstanceId ||
 			(this._pieceInstancesInCurrentPartInstance?.[0] &&
 				this._pieceInstancesInCurrentPartInstance?.[0].partInstanceId !== this._currentPartInstance?._id) ||
@@ -175,6 +205,7 @@ export class ActivePlaylistTopic
 			| SelectedPartInstances
 			| DBPart[]
 			| SelectedPieceInstances
+			| DBSegment
 			| undefined
 	): Promise<void> {
 		let hasAnythingChanged = false
@@ -230,6 +261,12 @@ export class ActivePlaylistTopic
 				this._pieceInstancesInNextPartInstance = pieceInstances.nextPartInstance
 				break
 			}
+			case SegmentHandler.name: {
+				this._currentSegment = data as DBSegment
+				this.logUpdateReceived('segment', source)
+				hasAnythingChanged = true
+				break
+			}
 			default:
 				throw new Error(`${this._name} received unsupported update from ${source}}`)
 		}
diff --git a/packages/live-status-gateway/src/topics/helpers/partTiming.ts b/packages/live-status-gateway/src/topics/helpers/partTiming.ts
index 6ef75c355e..949ba89bfb 100644
--- a/packages/live-status-gateway/src/topics/helpers/partTiming.ts
+++ b/packages/live-status-gateway/src/topics/helpers/partTiming.ts
@@ -21,7 +21,7 @@ export function calculateCurrentPartTiming(
 			(partInstance) => partInstance.part.displayDurationGroup === currentPartInstance.part.displayDurationGroup
 		)
 		const groupDuration = displayDurationGroup.reduce((sum, partInstance) => {
-			return sum + (partInstance.part.expectedDurationWithPreroll ?? 0)
+			return sum + (partInstance.part.expectedDurationWithTransition ?? 0)
 		}, 0)
 		const groupPlayed = displayDurationGroup.reduce((sum, partInstance) => {
 			return (partInstance.timings?.duration ?? 0) + sum
diff --git a/packages/live-status-gateway/src/topics/helpers/segmentTiming.ts b/packages/live-status-gateway/src/topics/helpers/segmentTiming.ts
index 966354e6d9..693dff9555 100644
--- a/packages/live-status-gateway/src/topics/helpers/segmentTiming.ts
+++ b/packages/live-status-gateway/src/topics/helpers/segmentTiming.ts
@@ -1,9 +1,11 @@
 import { DBPart } from '@sofie-automation/corelib/dist/dataModel/Part'
 import { DBPartInstance } from '@sofie-automation/corelib/dist/dataModel/PartInstance'
+import { DBSegment } from '@sofie-automation/corelib/dist/dataModel/Segment'
 
 export interface SegmentTiming {
 	budgetDurationMs?: number
 	expectedDurationMs: number
+	countdownType?: 'part_expected_duration' | 'segment_budget_duration'
 }
 
 export interface CurrentSegmentTiming extends SegmentTiming {
@@ -11,12 +13,13 @@ export interface CurrentSegmentTiming extends SegmentTiming {
 }
 
 export function calculateCurrentSegmentTiming(
+	segment: DBSegment,
 	currentPartInstance: DBPartInstance,
 	firstInstanceInSegmentPlayout: DBPartInstance | undefined,
 	segmentPartInstances: DBPartInstance[],
 	segmentParts: DBPart[]
 ): CurrentSegmentTiming {
-	const segmentTiming = calculateSegmentTiming(segmentParts)
+	const segmentTiming = calculateSegmentTiming(segment, segmentParts)
 	const playedDurations = segmentPartInstances.reduce((sum, partInstance) => {
 		return (partInstance.timings?.duration ?? 0) + sum
 	}, 0)
@@ -29,22 +32,21 @@ export function calculateCurrentSegmentTiming(
 	const projectedBudgetEndTime =
 		(firstInstanceInSegmentPlayout?.timings?.reportedStartedPlayback ??
 			firstInstanceInSegmentPlayout?.timings?.plannedStartedPlayback ??
-			0) + (segmentTiming.budgetDurationMs ?? 0)
+			Date.now()) + (segmentTiming.budgetDurationMs ?? 0)
 	return {
 		...segmentTiming,
 		projectedEndTime: segmentTiming.budgetDurationMs != null ? projectedBudgetEndTime : projectedEndTime,
 	}
 }
 
-export function calculateSegmentTiming(segmentParts: DBPart[]): SegmentTiming {
+export function calculateSegmentTiming(segment: DBSegment, segmentParts: DBPart[]): SegmentTiming {
 	return {
-		budgetDurationMs: segmentParts.reduce<number | undefined>((sum, part): number | undefined => {
-			return part.budgetDuration != null && !part.untimed ? (sum ?? 0) + part.budgetDuration : sum
-		}, undefined),
+		budgetDurationMs: segment.segmentTiming?.budgetDuration,
 		expectedDurationMs: segmentParts.reduce<number>((sum, part): number => {
-			return part.expectedDurationWithPreroll != null && !part.untimed
-				? sum + part.expectedDurationWithPreroll
+			return part.expectedDurationWithTransition != null && !part.untimed
+				? sum + part.expectedDurationWithTransition
 				: sum
 		}, 0),
+		countdownType: segment.segmentTiming?.countdownType,
 	}
 }
diff --git a/packages/live-status-gateway/src/topics/segmentsTopic.ts b/packages/live-status-gateway/src/topics/segmentsTopic.ts
index a03a81c72e..3f9e17247a 100644
--- a/packages/live-status-gateway/src/topics/segmentsTopic.ts
+++ b/packages/live-status-gateway/src/topics/segmentsTopic.ts
@@ -68,7 +68,7 @@ export class SegmentsTopic
 					id: segmentId,
 					rundownId: unprotectString(segment.rundownId),
 					name: segment.name,
-					timing: calculateSegmentTiming(this._partsBySegment[segmentId] ?? []),
+					timing: calculateSegmentTiming(segment, this._partsBySegment[segmentId] ?? []),
 					identifier: segment.identifier,
 					publicData: segment.publicData,
 				}
diff --git a/packages/meteor-lib/.eslintrc.json b/packages/meteor-lib/.eslintrc.json
new file mode 100644
index 0000000000..3b809efa88
--- /dev/null
+++ b/packages/meteor-lib/.eslintrc.json
@@ -0,0 +1,3 @@
+{
+	"extends": "../node_modules/@sofie-automation/code-standard-preset/eslint/main"
+}
diff --git a/packages/meteor-lib/.gitignore b/packages/meteor-lib/.gitignore
new file mode 100755
index 0000000000..7902085997
--- /dev/null
+++ b/packages/meteor-lib/.gitignore
@@ -0,0 +1,13 @@
+node_modules
+dist
+test
+src/**.js
+
+/coverage
+/docs
+.nyc_output
+*.log
+
+wallaby.conf.js
+
+.DS_Store
diff --git a/packages/meteor-lib/.prettierignore b/packages/meteor-lib/.prettierignore
new file mode 100644
index 0000000000..02a4d48226
--- /dev/null
+++ b/packages/meteor-lib/.prettierignore
@@ -0,0 +1,3 @@
+package.json
+src/copy
+CHANGELOG.md
\ No newline at end of file
diff --git a/packages/meteor-lib/LICENSE b/packages/meteor-lib/LICENSE
new file mode 100644
index 0000000000..78f0f2dbb8
--- /dev/null
+++ b/packages/meteor-lib/LICENSE
@@ -0,0 +1,21 @@
+MIT License (MIT)
+
+Copyright (c) 2018 Norsk rikskringkasting AS (NRK)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/packages/meteor-lib/jest.config.js b/packages/meteor-lib/jest.config.js
new file mode 100644
index 0000000000..2fe89196ee
--- /dev/null
+++ b/packages/meteor-lib/jest.config.js
@@ -0,0 +1,27 @@
+module.exports = {
+	globals: {},
+	moduleFileExtensions: ['js', 'ts'],
+	transform: {
+		'^.+\\.(ts|tsx)$': [
+			'ts-jest',
+			{
+				tsconfig: 'tsconfig.json',
+			},
+		],
+	},
+	testMatch: ['**/__tests__/**/*.(spec|test).(ts|js)'],
+	testPathIgnorePatterns: ['integrationTests'],
+	testEnvironment: 'node',
+	// coverageThreshold: {
+	// 	global: {
+	// 		branches: 80,
+	// 		functions: 100,
+	// 		lines: 95,
+	// 		statements: 90,
+	// 	},
+	// },
+	coverageDirectory: './coverage/',
+	coverageProvider: 'v8',
+	collectCoverage: true,
+	preset: 'ts-jest',
+}
diff --git a/packages/meteor-lib/package.json b/packages/meteor-lib/package.json
new file mode 100644
index 0000000000..e66255cdfe
--- /dev/null
+++ b/packages/meteor-lib/package.json
@@ -0,0 +1,70 @@
+{
+	"name": "@sofie-automation/meteor-lib",
+	"version": "1.52.0-in-development",
+	"private": true,
+	"description": "Temporary internal library for some types shared by meteor and webui",
+	"main": "dist/index.js",
+	"typings": "dist/index.d.ts",
+	"license": "MIT",
+	"repository": {
+		"type": "git",
+		"url": "git+https://github.com/nrkno/sofie-core.git",
+		"directory": "packages/meteor-lib"
+	},
+	"bugs": {
+		"url": "https://github.com/nrkno/sofie-core/issues"
+	},
+	"homepage": "https://github.com/nrkno/sofie-core/blob/master/packages/corelib#readme",
+	"scripts": {
+		"build": "run -T rimraf dist && run build:main",
+		"build:main": "run -T tsc -p tsconfig.build.json",
+		"lint:raw": "run -T eslint --ext .ts --ext .js --ignore-pattern dist",
+		"lint": "run lint:raw .",
+		"unit": "run -T jest",
+		"test": "run lint && run unit",
+		"watch": "run -T jest --watch --coverage=false",
+		"cov": "run -T jest --coverage; open-cli coverage/lcov-report/index.html",
+		"cov-open": "open-cli coverage/lcov-report/index.html",
+		"validate:dependencies": "yarn npm audit --environment production && run license-validate",
+		"validate:dev-dependencies": "yarn npm audit --environment development",
+		"license-validate": "run -T sofie-licensecheck"
+	},
+	"engines": {
+		"node": "^14.19 || ^16.14 || ^18.12"
+	},
+	"files": [
+		"/dist",
+		"/CHANGELOG.md",
+		"/README.md",
+		"/LICENSE"
+	],
+	"dependencies": {
+		"@mos-connection/helper": "v4.2.0-alpha.1",
+		"@sofie-automation/blueprints-integration": "1.52.0-in-development",
+		"@sofie-automation/corelib": "1.52.0-in-development",
+		"@sofie-automation/shared-lib": "1.52.0-in-development",
+		"deep-extend": "0.6.0",
+		"semver": "^7.5.4",
+		"type-fest": "^3.13.1",
+		"underscore": "^1.13.6"
+	},
+	"devDependencies": {
+		"@types/deep-extend": "^0.6.2",
+		"@types/semver": "^7.5.6",
+		"@types/underscore": "^1.11.15"
+	},
+	"peerDependencies": {
+		"i18next": "^21.10.0",
+		"mongodb": "^5.5.0"
+	},
+	"prettier": "@sofie-automation/code-standard-preset/.prettierrc.json",
+	"lint-staged": {
+		"*.{js,css,json,md,scss}": [
+			"yarn run -T prettier"
+		],
+		"*.{ts,tsx}": [
+			"yarn lint:raw"
+		]
+	},
+	"packageManager": "yarn@3.5.0"
+}
diff --git a/meteor/lib/KeyboardLayout.ts b/packages/meteor-lib/src/KeyboardLayout.ts
similarity index 97%
rename from meteor/lib/KeyboardLayout.ts
rename to packages/meteor-lib/src/KeyboardLayout.ts
index 2c8ce9fff1..14644d819b 100644
--- a/meteor/lib/KeyboardLayout.ts
+++ b/packages/meteor-lib/src/KeyboardLayout.ts
@@ -76,6 +76,7 @@ const STANDARD_102_EXTENDED_TEMPLATE = [
 	'6.16:Numpad0,NumpadDecimal',
 ]
 
+// eslint-disable-next-line @typescript-eslint/no-namespace
 export namespace KeyboardLayouts {
 	// This is a small keyboard layout: 102-Standard keybord, without the Numpad
 	export const STANDARD_102_TKL: PhysicalLayout = createPhysicalLayout(STANDARD_102_TKL_TEMPLATE)
diff --git a/meteor/lib/Settings.ts b/packages/meteor-lib/src/Settings.ts
similarity index 84%
rename from meteor/lib/Settings.ts
rename to packages/meteor-lib/src/Settings.ts
index c6b698ca01..11c26a3a47 100644
--- a/meteor/lib/Settings.ts
+++ b/packages/meteor-lib/src/Settings.ts
@@ -1,5 +1,3 @@
-import { Meteor } from 'meteor/meteor'
-import * as _ from 'underscore'
 import { KeyboardLayouts } from './KeyboardLayout'
 
 /**
@@ -66,7 +64,7 @@ export interface ISettings {
 /**
  * Default values for Settings
  */
-const DEFAULT_SETTINGS = Object.freeze<ISettings>({
+export const DEFAULT_SETTINGS = Object.freeze<ISettings>({
 	autoRewindLeavingSegment: true,
 	disableBlurBorder: false,
 	defaultTimeScale: 1,
@@ -84,19 +82,3 @@ const DEFAULT_SETTINGS = Object.freeze<ISettings>({
 	useCountdownToFreezeFrame: true,
 	confirmKeyCode: 'Enter',
 })
-
-/**
- * This is an object specifying installation-wide, User Interface settings.
- * There are default values for these settings that will be used, unless overriden
- * through Meteor.settings functionality.
- *
- * You can use METEOR_SETTING to inject the settings JSON or you can use the
- * --settings [filename] to provide a JSON file containing the settings
- */
-export let Settings: ISettings
-
-Settings = _.clone(DEFAULT_SETTINGS)
-
-Meteor.startup(() => {
-	Settings = _.extend(Settings, Meteor.settings.public)
-})
diff --git a/packages/meteor-lib/src/__tests__/time.spec.ts b/packages/meteor-lib/src/__tests__/time.spec.ts
new file mode 100644
index 0000000000..738172a964
--- /dev/null
+++ b/packages/meteor-lib/src/__tests__/time.spec.ts
@@ -0,0 +1,22 @@
+import { formatDateTime } from '../time'
+
+test('formatDateTime', () => {
+	expect(formatDateTime(1556194064374)).toMatch(/2019-04-\d{2} \d{2}:\d{2}:\d{2}/)
+})
+
+// test('formatDateTime2', () => {
+// 	if (process.platform === 'win32') {
+// 		// Due to a bug in how timezones are handled in Windows & Node, we just have to skip these tests when running tests locally..
+// 		// eslint-disable-next-line jest/no-conditional-expect
+// 		expect(0).toEqual(0)
+// 		return
+// 	}
+
+// 	expect(new Date().getTimezoneOffset()).toBe(0) // Timezone is UTC
+
+// 	expect(formatDateTime(1578295344070)).toBe('2020-01-06 07:22:24')
+// 	expect(formatDateTime(1578389166594)).toBe('2020-01-07 09:26:06')
+// 	expect(formatDateTime(2579299201000)).toBe('2051-09-26 00:00:01')
+// 	expect(formatDateTime(2579299200000)).toBe('2051-09-26 00:00:00')
+// 	expect(formatDateTime(2579299344070)).toBe('2051-09-26 00:02:24')
+// })
diff --git a/packages/meteor-lib/src/adlibs.ts b/packages/meteor-lib/src/adlibs.ts
new file mode 100644
index 0000000000..0bf6b09959
--- /dev/null
+++ b/packages/meteor-lib/src/adlibs.ts
@@ -0,0 +1,62 @@
+import type { ITranslatableMessage } from '@sofie-automation/blueprints-integration'
+import { isTranslatableMessage } from '@sofie-automation/corelib/dist/TranslatableMessage'
+import type { ProtectedString } from '@sofie-automation/corelib/dist/protectedString'
+
+function compareLabels(a: string | ITranslatableMessage, b: string | ITranslatableMessage) {
+	const actualA = isTranslatableMessage(a) ? a.key : (a as string)
+	const actualB = isTranslatableMessage(b) ? b.key : (b as string)
+	// can't use .localeCompare, because this needs to be locale-independent and always return
+	// the same sorting order, because that's being relied upon by limit & pick/pickEnd.
+	if (actualA > actualB) return 1
+	if (actualA < actualB) return -1
+	return 0
+}
+
+/** Sort a list of adlibs */
+export function sortAdlibs<T>(
+	adlibs: {
+		adlib: T
+		label: string | ITranslatableMessage
+		adlibRank: number
+		adlibId: ProtectedString<any> | string
+		partRank: number | null
+		segmentRank: number | null
+		rundownRank: number | null
+	}[]
+): T[] {
+	adlibs = adlibs.sort((a, b) => {
+		// Sort by rundown rank, where applicable:
+		a.rundownRank = a.rundownRank ?? Number.POSITIVE_INFINITY
+		b.rundownRank = b.rundownRank ?? Number.POSITIVE_INFINITY
+		if (a.rundownRank > b.rundownRank) return 1
+		if (a.rundownRank < b.rundownRank) return -1
+
+		// Sort by segment rank, where applicable:
+		a.segmentRank = a.segmentRank ?? Number.POSITIVE_INFINITY
+		b.segmentRank = b.segmentRank ?? Number.POSITIVE_INFINITY
+		if (a.segmentRank > b.segmentRank) return 1
+		if (a.segmentRank < b.segmentRank) return -1
+
+		// Sort by part rank, where applicable:
+		a.partRank = a.partRank ?? Number.POSITIVE_INFINITY
+		b.partRank = b.partRank ?? Number.POSITIVE_INFINITY
+		if (a.partRank > b.partRank) return 1
+		if (a.partRank < b.partRank) return -1
+
+		// Sort by adlib rank
+		if (a.adlibRank > b.adlibRank) return 1
+		if (a.adlibRank < b.adlibRank) return -1
+
+		// Sort by labels:
+		const r = compareLabels(a.label, b.label)
+		if (r !== 0) return r
+
+		// As a last resort, sort by ids:
+		if (a.adlibId > b.adlibId) return 1
+		if (a.adlibId < b.adlibId) return -1
+
+		return 0
+	})
+
+	return adlibs.map((a) => a.adlib)
+}
diff --git a/meteor/lib/api/ExternalMessageQueue.ts b/packages/meteor-lib/src/api/ExternalMessageQueue.ts
similarity index 100%
rename from meteor/lib/api/ExternalMessageQueue.ts
rename to packages/meteor-lib/src/api/ExternalMessageQueue.ts
diff --git a/meteor/lib/api/triggers/MountedTriggers.ts b/packages/meteor-lib/src/api/MountedTriggers.ts
similarity index 80%
rename from meteor/lib/api/triggers/MountedTriggers.ts
rename to packages/meteor-lib/src/api/MountedTriggers.ts
index 580157595f..ceffd6fd5b 100644
--- a/meteor/lib/api/triggers/MountedTriggers.ts
+++ b/packages/meteor-lib/src/api/MountedTriggers.ts
@@ -1,14 +1,14 @@
 import { ISourceLayer, ITranslatableMessage } from '@sofie-automation/blueprints-integration'
 import {
 	AdLibActionId,
+	PeripheralDeviceId,
 	PieceId,
 	RundownBaselineAdLibActionId,
 	TriggeredActionId,
 } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import { ProtectedString } from '@sofie-automation/corelib/dist/protectedString'
-import { IWrappedAdLib } from './actionFilterChainCompilers'
 
-export {
+export type {
 	DeviceActionId,
 	DeviceTriggerMountedActionId,
 	ShiftRegisterActionArguments,
@@ -54,13 +54,22 @@ interface MountedDeviceMixin {
 	values?: DeviceTriggerArguments
 }
 
+export enum MountedAdLibTriggerType {
+	rundownBaselineAdLibItem = 'rundownBaselineAdLibItem',
+	rundownBaselineAdLibAction = 'rundownBaselineAdLibAction',
+	adLibPiece = 'adLibPiece',
+	adLibAction = 'adLibAction',
+	clearSourceLayer = 'clearSourceLayer',
+	sticky = 'sticky',
+}
+
 /** An AdLib action that will be triggered by hotkeys (can be AdLib, RundownBaselineAdLib, AdLib Action, Clear source layer, Sticky, etc.) */
 export interface MountedAdLibTrigger extends MountedTriggerCommon {
 	_id: MountedAdLibTriggerId
 	/** The ID of the action that will be triggered */
 	triggeredActionId: TriggeredActionId
 	/** The type of the adLib being targeted */
-	type: IWrappedAdLib['type']
+	type: MountedAdLibTriggerType
 	/** The ID in the collection specified by `type` */
 	targetId: AdLibActionId | RundownBaselineAdLibActionId | PieceId | ISourceLayer['_id']
 	/** SourceLayerId of the target, if available */
@@ -70,3 +79,14 @@ export interface MountedAdLibTrigger extends MountedTriggerCommon {
 }
 
 export type MountedAdLibTriggerId = ProtectedString<'mountedAdLibTriggerId'>
+
+export type DeviceTriggerPreviewId = ProtectedString<'deviceTriggerPreviewId'>
+
+export interface UIDeviceTriggerPreview {
+	_id: DeviceTriggerPreviewId
+	peripheralDeviceId: PeripheralDeviceId
+	triggerDeviceId: string
+	triggerId: string
+	timestamp: number
+	values?: DeviceTriggerArguments
+}
diff --git a/meteor/lib/api/__tests__/client.test.ts b/packages/meteor-lib/src/api/__tests__/client.test.ts
similarity index 92%
rename from meteor/lib/api/__tests__/client.test.ts
rename to packages/meteor-lib/src/api/__tests__/client.test.ts
index 1787998e75..5a373df758 100644
--- a/meteor/lib/api/__tests__/client.test.ts
+++ b/packages/meteor-lib/src/api/__tests__/client.test.ts
@@ -1,5 +1,4 @@
 import { ClientAPI } from '../client'
-import { Meteor } from 'meteor/meteor'
 import { UserError, UserErrorMessage } from '@sofie-automation/corelib/dist/error'
 
 describe('ClientAPI', () => {
@@ -57,7 +56,7 @@ describe('ClientAPI', () => {
 			expect(ClientAPI.isClientResponseSuccess(response)).toBe(false)
 		})
 		it('Correctly recognizes that a Meteor.Error is not a success object', () => {
-			expect(ClientAPI.isClientResponseSuccess(new Meteor.Error(404))).toBe(false)
+			expect(ClientAPI.isClientResponseSuccess(new Error('404'))).toBe(false)
 		})
 	})
 	describe('isClientResponseError', () => {
@@ -70,7 +69,7 @@ describe('ClientAPI', () => {
 			expect(ClientAPI.isClientResponseError(response)).toBe(false)
 		})
 		it('Correctly recognizes that a Meteor.Error is not an error object', () => {
-			expect(ClientAPI.isClientResponseError(new Meteor.Error(404))).toBe(false)
+			expect(ClientAPI.isClientResponseError(new Error('404'))).toBe(false)
 		})
 	})
 })
diff --git a/meteor/lib/api/__tests__/pubsub.test.ts b/packages/meteor-lib/src/api/__tests__/pubsub.test.ts
similarity index 100%
rename from meteor/lib/api/__tests__/pubsub.test.ts
rename to packages/meteor-lib/src/api/__tests__/pubsub.test.ts
diff --git a/meteor/lib/api/blueprint.ts b/packages/meteor-lib/src/api/blueprint.ts
similarity index 100%
rename from meteor/lib/api/blueprint.ts
rename to packages/meteor-lib/src/api/blueprint.ts
diff --git a/meteor/lib/api/client.ts b/packages/meteor-lib/src/api/client.ts
similarity index 89%
rename from meteor/lib/api/client.ts
rename to packages/meteor-lib/src/api/client.ts
index 34910deb34..9243d8fe31 100644
--- a/meteor/lib/api/client.ts
+++ b/packages/meteor-lib/src/api/client.ts
@@ -1,19 +1,13 @@
 import * as _ from 'underscore'
-import { Time } from '../lib'
+import { Time } from '@sofie-automation/shared-lib/dist/lib/lib'
 import { UserError } from '@sofie-automation/corelib/dist/error'
-import { NoticeLevel } from '../notifications/notifications'
 import { PeripheralDeviceId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import { TSR } from '@sofie-automation/blueprints-integration'
 
 export interface NewClientAPI {
+	clientLogger(type: string, ...args: string[]): Promise<void>
 	clientErrorReport(timestamp: Time, errorString: string, location: string): Promise<void>
-	clientLogNotification(
-		timestamp: Time,
-		from: string,
-		severity: NoticeLevel,
-		message: string,
-		source?: any
-	): Promise<void>
+	clientLogNotification(timestamp: Time, from: string, severity: number, message: string, source?: any): Promise<void>
 	callPeripheralDeviceFunction(
 		context: string,
 		deviceId: PeripheralDeviceId,
@@ -37,6 +31,7 @@ export interface NewClientAPI {
 }
 
 export enum ClientAPIMethods {
+	'clientLogger' = 'client.clientLogger',
 	'clientErrorReport' = 'client.clientErrorReport',
 	'clientLogNotification' = 'client.clientLogNotification',
 	'callPeripheralDeviceFunction' = 'client.callPeripheralDeviceFunction',
@@ -44,6 +39,7 @@ export enum ClientAPIMethods {
 	'callBackgroundPeripheralDeviceFunction' = 'client.callBackgroundPeripheralDeviceFunction',
 }
 
+// eslint-disable-next-line @typescript-eslint/no-namespace
 export namespace ClientAPI {
 	/** Response from a method that's called from the client */
 	export interface ClientResponseError {
diff --git a/meteor/lib/api/mediaManager.ts b/packages/meteor-lib/src/api/mediaManager.ts
similarity index 84%
rename from meteor/lib/api/mediaManager.ts
rename to packages/meteor-lib/src/api/mediaManager.ts
index 1a5d788930..01843ae319 100644
--- a/meteor/lib/api/mediaManager.ts
+++ b/packages/meteor-lib/src/api/mediaManager.ts
@@ -1,4 +1,6 @@
 import * as Shared from '@sofie-automation/shared-lib/dist/peripheralDevice/mediaManager'
+
+// eslint-disable-next-line @typescript-eslint/no-namespace
 export namespace MediaManagerAPI {
 	export type WorkStepStatus = Shared.WorkStepStatus
 	export const WorkStepStatus = Shared.WorkStepStatus
diff --git a/packages/meteor-lib/src/api/methods.ts b/packages/meteor-lib/src/api/methods.ts
new file mode 100644
index 0000000000..72b6219547
--- /dev/null
+++ b/packages/meteor-lib/src/api/methods.ts
@@ -0,0 +1,85 @@
+import * as _ from 'underscore'
+import { NewBlueprintAPI, BlueprintAPIMethods } from './blueprint'
+import { NewClientAPI, ClientAPIMethods } from './client'
+import { NewExternalMessageQueueAPI, ExternalMessageQueueAPIMethods } from './ExternalMessageQueue'
+import { NewMigrationAPI, MigrationAPIMethods } from './migration'
+import { NewPlayoutAPI, PlayoutAPIMethods } from './playout'
+import { NewRundownAPI, RundownAPIMethods } from './rundown'
+import { NewRundownLayoutsAPI, RundownLayoutsAPIMethods } from './rundownLayouts'
+import { NewShowStylesAPI, ShowStylesAPIMethods } from './showStyles'
+import { NewSnapshotAPI, SnapshotAPIMethods } from './shapshot'
+import { NewSystemStatusAPI, SystemStatusAPIMethods } from './systemStatus'
+import { NewUserActionAPI, UserActionAPIMethods } from './userActions'
+import { StudiosAPIMethods, NewStudiosAPI } from './studios'
+import { NewOrganizationAPI, OrganizationAPIMethods } from './organization'
+import { NewUserAPI, UserAPIMethods } from './user'
+import { SystemAPIMethods, SystemAPI } from './system'
+import { NewTriggeredActionsAPI, TriggeredActionsAPIMethods } from './triggeredActions'
+import {
+	NewPeripheralDeviceAPI,
+	PeripheralDeviceAPIMethods,
+} from '@sofie-automation/shared-lib/dist/peripheralDevice/methodsAPI'
+
+/** All methods typings are defined here, the actual implementation is defined in other places */
+export interface IMeteorCall {
+	blueprint: NewBlueprintAPI
+	client: NewClientAPI
+	externalMessages: NewExternalMessageQueueAPI
+	migration: NewMigrationAPI
+	peripheralDevice: NewPeripheralDeviceAPI
+	playout: NewPlayoutAPI
+	rundown: NewRundownAPI
+	rundownLayout: NewRundownLayoutsAPI
+	snapshot: NewSnapshotAPI
+	showstyles: NewShowStylesAPI
+	triggeredActions: NewTriggeredActionsAPI
+	studio: NewStudiosAPI
+	systemStatus: NewSystemStatusAPI
+	user: NewUserAPI
+	userAction: NewUserActionAPI
+	organization: NewOrganizationAPI
+	system: SystemAPI
+}
+
+export type MakeMeteorMethodCall = (name: string, args: any[], options?: { noRetry?: boolean }) => Promise<any>
+
+export function MakeMeteorCall(makeMethodCall: MakeMeteorMethodCall): IMeteorCall {
+	function makeMethods<Enum extends { [key: string]: string }>(
+		methods: Enum,
+		/** (Optional) An array of methodnames. Calls to these methods won't be retried in the case of a loss-of-connection for the client. */
+		listOfMethodsThatShouldNotRetry?: (keyof Enum)[]
+	): any {
+		const resultingMethods: Record<string, (...args: any[]) => any> = {}
+		_.each(methods, (serverMethodName: any, methodName: string) => {
+			if (listOfMethodsThatShouldNotRetry?.includes(methodName)) {
+				resultingMethods[methodName] = async (...args: any[]) =>
+					makeMethodCall(serverMethodName, args, {
+						noRetry: true,
+					})
+			} else {
+				resultingMethods[methodName] = async (...args: any[]) => makeMethodCall(serverMethodName, args)
+			}
+		})
+		return resultingMethods
+	}
+
+	return {
+		blueprint: makeMethods(BlueprintAPIMethods),
+		client: makeMethods(ClientAPIMethods),
+		externalMessages: makeMethods(ExternalMessageQueueAPIMethods),
+		migration: makeMethods(MigrationAPIMethods),
+		peripheralDevice: makeMethods(PeripheralDeviceAPIMethods),
+		playout: makeMethods(PlayoutAPIMethods),
+		rundown: makeMethods(RundownAPIMethods),
+		rundownLayout: makeMethods(RundownLayoutsAPIMethods),
+		snapshot: makeMethods(SnapshotAPIMethods),
+		showstyles: makeMethods(ShowStylesAPIMethods),
+		triggeredActions: makeMethods(TriggeredActionsAPIMethods),
+		studio: makeMethods(StudiosAPIMethods),
+		systemStatus: makeMethods(SystemStatusAPIMethods),
+		user: makeMethods(UserAPIMethods),
+		userAction: makeMethods(UserActionAPIMethods, ['storeRundownSnapshot']),
+		organization: makeMethods(OrganizationAPIMethods),
+		system: makeMethods(SystemAPIMethods),
+	}
+}
diff --git a/meteor/lib/api/migration.ts b/packages/meteor-lib/src/api/migration.ts
similarity index 100%
rename from meteor/lib/api/migration.ts
rename to packages/meteor-lib/src/api/migration.ts
diff --git a/meteor/lib/api/organization.ts b/packages/meteor-lib/src/api/organization.ts
similarity index 100%
rename from meteor/lib/api/organization.ts
rename to packages/meteor-lib/src/api/organization.ts
diff --git a/meteor/lib/api/pieceContentStatus.ts b/packages/meteor-lib/src/api/pieceContentStatus.ts
similarity index 100%
rename from meteor/lib/api/pieceContentStatus.ts
rename to packages/meteor-lib/src/api/pieceContentStatus.ts
diff --git a/meteor/lib/api/playout.ts b/packages/meteor-lib/src/api/playout.ts
similarity index 100%
rename from meteor/lib/api/playout.ts
rename to packages/meteor-lib/src/api/playout.ts
diff --git a/meteor/lib/api/pubsub.ts b/packages/meteor-lib/src/api/pubsub.ts
similarity index 93%
rename from meteor/lib/api/pubsub.ts
rename to packages/meteor-lib/src/api/pubsub.ts
index 4c7ff3b813..e7e3fb6382 100644
--- a/meteor/lib/api/pubsub.ts
+++ b/packages/meteor-lib/src/api/pubsub.ts
@@ -2,11 +2,12 @@ import {
 	BucketId,
 	OrganizationId,
 	PartId,
+	RundownId,
+	RundownPlaylistActivationId,
 	RundownPlaylistId,
 	ShowStyleBaseId,
 	StudioId,
 } from '@sofie-automation/corelib/dist/dataModel/Ids'
-import { Meteor } from 'meteor/meteor'
 import { Bucket } from '../collections/Buckets'
 import { ICoreSystem } from '../collections/CoreSystem'
 import { Evaluation } from '../collections/Evaluations'
@@ -23,8 +24,7 @@ import { DBUser } from '../collections/Users'
 import { UIBucketContentStatus, UIPieceContentStatus, UISegmentPartNote } from './rundownNotifications'
 import { UIShowStyleBase } from './showStyles'
 import { UIStudio } from './studios'
-import { UIDeviceTriggerPreview } from '../../server/publications/deviceTriggersPreview'
-import { logger } from '../logging'
+import { UIDeviceTriggerPreview } from './MountedTriggers'
 import { UIBlueprintUpgradeStatus } from './upgradeStatus'
 import {
 	PeripheralDevicePubSub,
@@ -34,6 +34,8 @@ import {
 } from '@sofie-automation/shared-lib/dist/pubsub/peripheralDevice'
 import { CorelibPubSub, CorelibPubSubCollections, CorelibPubSubTypes } from '@sofie-automation/corelib/dist/pubsub'
 import { CollectionName } from '@sofie-automation/corelib/dist/dataModel/Collections'
+import { DBPart } from '@sofie-automation/corelib/dist/dataModel/Part'
+import { PartInstance } from '../collections/PartInstances'
 
 /**
  * Ids of possible DDP subscriptions for the UI only
@@ -158,6 +160,14 @@ export enum MeteorPubSub {
 	 * Fetch the Upgrade Statuses of all Blueprints in the system
 	 */
 	uiBlueprintUpgradeStatuses = 'uiBlueprintUpgradeStatuses',
+	/**
+	 * Fetch all Parts with UI overrides
+	 */
+	uiParts = 'uiParts',
+	/**
+	 * Fetch all PartInstances with UI overrides
+	 */
+	uiPartInstances = 'uiPartInstances',
 }
 
 /**
@@ -237,6 +247,11 @@ export interface MeteorPubSubTypes {
 		bucketId: BucketId
 	) => CustomCollectionName.UIBucketContentStatuses
 	[MeteorPubSub.uiBlueprintUpgradeStatuses]: () => CustomCollectionName.UIBlueprintUpgradeStatuses
+	[MeteorPubSub.uiParts]: (playlistId: RundownPlaylistId) => CustomCollectionName.UIParts
+	[MeteorPubSub.uiPartInstances]: (
+		rundownIds: RundownId[],
+		playlistActivationId: RundownPlaylistActivationId | null
+	) => CustomCollectionName.UIPartInstances
 }
 
 export type AllPubSubCollections = PeripheralDevicePubSubCollections &
@@ -255,6 +270,8 @@ export enum CustomCollectionName {
 	UIPieceContentStatuses = 'uiPieceContentStatuses',
 	UIBucketContentStatuses = 'uiBucketContentStatuses',
 	UIBlueprintUpgradeStatuses = 'uiBlueprintUpgradeStatuses',
+	UIParts = 'uiParts',
+	UIPartInstances = 'uiPartInstances',
 }
 
 export type MeteorPubSubCollections = {
@@ -283,25 +300,6 @@ export type MeteorPubSubCustomCollections = {
 	[CustomCollectionName.UIPieceContentStatuses]: UIPieceContentStatus
 	[CustomCollectionName.UIBucketContentStatuses]: UIBucketContentStatus
 	[CustomCollectionName.UIBlueprintUpgradeStatuses]: UIBlueprintUpgradeStatus
-}
-
-/**
- * Type safe wrapper around Meteor.subscribe()
- * @param name name of the subscription
- * @param args arguments to the subscription
- * @returns Meteor subscription handle
- */
-export function meteorSubscribe<K extends keyof AllPubSubTypes>(
-	name: K,
-	...args: Parameters<AllPubSubTypes[K]>
-): Meteor.SubscriptionHandle {
-	if (Meteor.isClient) {
-		const callbacks = {
-			onError: (...errs: any[]) => {
-				logger.error('meteorSubscribe', name, ...args, ...errs)
-			},
-		}
-
-		return Meteor.subscribe(name, ...args, callbacks)
-	} else throw new Meteor.Error(500, 'meteorSubscribe is only available client-side')
+	[CustomCollectionName.UIParts]: DBPart
+	[CustomCollectionName.UIPartInstances]: PartInstance
 }
diff --git a/meteor/lib/api/rundown.ts b/packages/meteor-lib/src/api/rundown.ts
similarity index 100%
rename from meteor/lib/api/rundown.ts
rename to packages/meteor-lib/src/api/rundown.ts
diff --git a/packages/meteor-lib/src/api/rundownLayouts.ts b/packages/meteor-lib/src/api/rundownLayouts.ts
new file mode 100644
index 0000000000..afc0921227
--- /dev/null
+++ b/packages/meteor-lib/src/api/rundownLayouts.ts
@@ -0,0 +1,17 @@
+import { RundownLayoutType } from '../collections/RundownLayouts'
+import { RundownLayoutId, ShowStyleBaseId } from '@sofie-automation/corelib/dist/dataModel/Ids'
+
+export interface NewRundownLayoutsAPI {
+	createRundownLayout(
+		name: string,
+		type: RundownLayoutType,
+		showStyleBaseId: ShowStyleBaseId,
+		regionId: string
+	): Promise<RundownLayoutId>
+	removeRundownLayout(id: RundownLayoutId): Promise<void>
+}
+
+export enum RundownLayoutsAPIMethods {
+	'removeRundownLayout' = 'rundownLayout.removeRundownLayout',
+	'createRundownLayout' = 'rundownLayout.createRundownLayout',
+}
diff --git a/meteor/lib/api/rundownNotifications.ts b/packages/meteor-lib/src/api/rundownNotifications.ts
similarity index 94%
rename from meteor/lib/api/rundownNotifications.ts
rename to packages/meteor-lib/src/api/rundownNotifications.ts
index 03da0e731a..bd21db24c6 100644
--- a/meteor/lib/api/rundownNotifications.ts
+++ b/packages/meteor-lib/src/api/rundownNotifications.ts
@@ -12,8 +12,8 @@ import {
 	RundownPlaylistId,
 	SegmentId,
 } from '@sofie-automation/corelib/dist/dataModel/Ids'
-import { ProtectedString } from '../lib'
 import { PieceContentStatusObj } from './pieceContentStatus'
+import { ProtectedString } from '@sofie-automation/corelib/dist/protectedString'
 import { ITranslatableMessage } from '@sofie-automation/corelib/dist/TranslatableMessage'
 
 export type UISegmentPartNoteId = ProtectedString<'UISegmentPartNote'>
diff --git a/meteor/lib/api/shapshot.ts b/packages/meteor-lib/src/api/shapshot.ts
similarity index 100%
rename from meteor/lib/api/shapshot.ts
rename to packages/meteor-lib/src/api/shapshot.ts
diff --git a/meteor/lib/api/showStyles.ts b/packages/meteor-lib/src/api/showStyles.ts
similarity index 100%
rename from meteor/lib/api/showStyles.ts
rename to packages/meteor-lib/src/api/showStyles.ts
diff --git a/meteor/lib/api/studios.ts b/packages/meteor-lib/src/api/studios.ts
similarity index 100%
rename from meteor/lib/api/studios.ts
rename to packages/meteor-lib/src/api/studios.ts
diff --git a/meteor/lib/api/system.ts b/packages/meteor-lib/src/api/system.ts
similarity index 100%
rename from meteor/lib/api/system.ts
rename to packages/meteor-lib/src/api/system.ts
diff --git a/meteor/lib/api/systemStatus.ts b/packages/meteor-lib/src/api/systemStatus.ts
similarity index 95%
rename from meteor/lib/api/systemStatus.ts
rename to packages/meteor-lib/src/api/systemStatus.ts
index 700893b01d..be14a7bc98 100644
--- a/meteor/lib/api/systemStatus.ts
+++ b/packages/meteor-lib/src/api/systemStatus.ts
@@ -1,4 +1,4 @@
-import { ProtectedString } from '../lib'
+import { ProtectedString } from '@sofie-automation/corelib/dist/protectedString'
 import { StatusCode } from '@sofie-automation/blueprints-integration'
 import { PeripheralDeviceId, SystemInstanceId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 export { SystemInstanceId }
diff --git a/meteor/lib/api/triggeredActions.ts b/packages/meteor-lib/src/api/triggeredActions.ts
similarity index 100%
rename from meteor/lib/api/triggeredActions.ts
rename to packages/meteor-lib/src/api/triggeredActions.ts
diff --git a/meteor/lib/api/upgradeStatus.ts b/packages/meteor-lib/src/api/upgradeStatus.ts
similarity index 93%
rename from meteor/lib/api/upgradeStatus.ts
rename to packages/meteor-lib/src/api/upgradeStatus.ts
index d3a5891d4e..d50fdd81e1 100644
--- a/meteor/lib/api/upgradeStatus.ts
+++ b/packages/meteor-lib/src/api/upgradeStatus.ts
@@ -1,6 +1,6 @@
 import { ITranslatableMessage } from '@sofie-automation/blueprints-integration'
 import { StudioId, ShowStyleBaseId } from '@sofie-automation/corelib/dist/dataModel/Ids'
-import { ProtectedString } from '../lib'
+import { ProtectedString } from '@sofie-automation/corelib/dist/protectedString'
 
 export type UIBlueprintUpgradeStatusId = ProtectedString<'UIBlueprintUpgradeStatus'>
 
diff --git a/meteor/lib/api/user.ts b/packages/meteor-lib/src/api/user.ts
similarity index 71%
rename from meteor/lib/api/user.ts
rename to packages/meteor-lib/src/api/user.ts
index 053ce718e2..f1f737f271 100644
--- a/meteor/lib/api/user.ts
+++ b/packages/meteor-lib/src/api/user.ts
@@ -1,6 +1,4 @@
-import { Accounts } from 'meteor/accounts-base'
-import { UserProfile } from '../../lib/collections/Users'
-import { protectString } from '../lib'
+import { UserProfile } from '../collections/Users'
 import { UserId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 
 export interface NewUserAPI {
@@ -24,11 +22,12 @@ export interface CreateNewUserData {
 		broadcastMediums: string[]
 	}
 }
-export async function createUser(newUser: CreateNewUserData): Promise<UserId> {
+export async function createUser(_newUser: CreateNewUserData): Promise<UserId> {
 	// This is available both client-side and server side.
 	// The reason for that is that the client-side should use Accounts.createUser right away
 	// so that the password aren't sent in "plaintext" to the server.
 
-	const userId = await Accounts.createUserAsync(newUser)
-	return protectString<UserId>(userId)
+	// const userId = await Accounts.createUserAsync(newUser)
+	// return protectString<UserId>(userId)
+	throw new Error('Not implemented')
 }
diff --git a/meteor/lib/api/userActions.ts b/packages/meteor-lib/src/api/userActions.ts
similarity index 93%
rename from meteor/lib/api/userActions.ts
rename to packages/meteor-lib/src/api/userActions.ts
index 735d8fb3a1..91c964bbec 100644
--- a/meteor/lib/api/userActions.ts
+++ b/packages/meteor-lib/src/api/userActions.ts
@@ -1,12 +1,11 @@
-import { ClientAPI } from '../api/client'
-import { MethodContext } from './methods'
+import { ClientAPI } from './client'
 import { EvaluationBase } from '../collections/Evaluations'
 import { Bucket } from '../collections/Buckets'
 import { IngestAdlib, ActionUserData } from '@sofie-automation/blueprints-integration'
 import { BucketAdLib } from '@sofie-automation/corelib/dist/dataModel/BucketAdLibPiece'
 import { AdLibActionCommon } from '@sofie-automation/corelib/dist/dataModel/AdlibAction'
 import { BucketAdLibAction } from '@sofie-automation/corelib/dist/dataModel/BucketAdLibAction'
-import { getHash, Time } from '../lib'
+import { Time } from '@sofie-automation/blueprints-integration'
 import { ExecuteActionResult, QueueNextSegmentResult } from '@sofie-automation/corelib/dist/worker/studio'
 import {
 	AdLibActionId,
@@ -26,8 +25,9 @@ import {
 	SnapshotId,
 	StudioId,
 } from '@sofie-automation/corelib/dist/dataModel/Ids'
+import { QuickLoopMarker } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
 
-export interface NewUserActionAPI extends MethodContext {
+export interface NewUserActionAPI {
 	take(
 		userEvent: string,
 		eventTime: Time,
@@ -255,8 +255,8 @@ export interface NewUserActionAPI extends MethodContext {
 		playlistId: RundownPlaylistId
 	): Promise<ClientAPI.ClientResponse<void>>
 	restartCore(userEvent: string, eventTime: Time, token: string): Promise<ClientAPI.ClientResponse<string>>
-	guiFocused(userEvent: string, eventTime: Time, viewInfo?: any[]): Promise<ClientAPI.ClientResponse<void>>
-	guiBlurred(userEvent: string, eventTime: Time, viewInfo?: any[]): Promise<ClientAPI.ClientResponse<void>>
+	guiFocused(userEvent: string, eventTime: Time, viewInfo?: unknown): Promise<ClientAPI.ClientResponse<void>>
+	guiBlurred(userEvent: string, eventTime: Time, viewInfo?: unknown): Promise<ClientAPI.ClientResponse<void>>
 	bucketsRemoveBucket(userEvent: string, eventTime: Time, id: BucketId): Promise<ClientAPI.ClientResponse<void>>
 	bucketsModifyBucket(
 		userEvent: string,
@@ -301,7 +301,7 @@ export interface NewUserActionAPI extends MethodContext {
 		eventTime: Time,
 		studioId: StudioId,
 		routeSetId: string,
-		state: boolean
+		state: boolean | 'toggle'
 	): Promise<ClientAPI.ClientResponse<void>>
 	moveRundown(
 		userEvent: string,
@@ -335,6 +335,19 @@ export interface NewUserActionAPI extends MethodContext {
 		studioId: StudioId,
 		showStyleVariantId: ShowStyleVariantId
 	): Promise<ClientAPI.ClientResponse<RundownId>>
+
+	setQuickLoopStart(
+		userEvent: string,
+		eventTime: Time,
+		rundownPlaylistId: RundownPlaylistId,
+		marker: QuickLoopMarker | null
+	): Promise<ClientAPI.ClientResponse<void>>
+	setQuickLoopEnd(
+		userEvent: string,
+		eventTime: Time,
+		rundownPlaylistId: RundownPlaylistId,
+		marker: QuickLoopMarker | null
+	): Promise<ClientAPI.ClientResponse<void>>
 }
 
 export enum UserActionAPIMethods {
@@ -417,6 +430,9 @@ export enum UserActionAPIMethods {
 	'activateAdlibTestingMode' = 'userAction.activateAdlibTestingMode',
 
 	'createAdlibTestingRundownForShowStyleVariant' = 'userAction.createAdlibTestingRundownForShowStyleVariant',
+
+	'setQuickLoopStart' = 'userAction.setQuickLoopStart',
+	'setQuickLoopEnd' = 'userAction.setQuickLoopEnd',
 }
 
 export interface ReloadRundownPlaylistResponse {
@@ -436,7 +452,3 @@ export enum TriggerReloadDataResponse {
 }
 
 export const SINGLE_USE_TOKEN_SALT = 'token_'
-
-export function hashSingleUseToken(token: string): string {
-	return getHash(SINGLE_USE_TOKEN_SALT + token)
-}
diff --git a/meteor/lib/collections/Buckets.ts b/packages/meteor-lib/src/collections/Buckets.ts
similarity index 100%
rename from meteor/lib/collections/Buckets.ts
rename to packages/meteor-lib/src/collections/Buckets.ts
diff --git a/packages/meteor-lib/src/collections/CoreSystem.ts b/packages/meteor-lib/src/collections/CoreSystem.ts
new file mode 100644
index 0000000000..5a8f58641b
--- /dev/null
+++ b/packages/meteor-lib/src/collections/CoreSystem.ts
@@ -0,0 +1,115 @@
+import { LogLevel } from '../lib'
+import { CoreSystemId, BlueprintId } from '@sofie-automation/corelib/dist/dataModel/Ids'
+import { protectString } from '@sofie-automation/corelib/dist/protectedString'
+
+export const SYSTEM_ID: CoreSystemId = protectString('core')
+
+/**
+ * Criticality level for service messages. Specification of criticality in server
+ * messages from sofie-monitor:
+ * https://github.com/nrkno/sofie-monitor/blob/master/src/data/serviceMessages/ServiceMessage.ts
+ *
+ * @export
+ * @enum {number}
+ */
+export enum Criticality {
+	/** Subject matter will affect operations. */
+	CRITICAL = 1,
+	/** Operations will not be affected, but non-critical functions may be affected or the result may be undesirable. */
+	WARNING = 2,
+	/** General information */
+	NOTIFICATION = 3,
+}
+
+export interface ServiceMessage {
+	id: string
+	criticality: Criticality
+	message: string
+	sender?: string
+	timestamp: number
+}
+
+export interface ExternalServiceMessage extends Omit<ServiceMessage, 'timestamp'> {
+	timestamp: Date
+}
+
+export enum SofieLogo {
+	Default = 'default',
+	Pride = 'pride',
+	Norway = 'norway',
+	Christmas = 'christmas',
+}
+
+export interface ICoreSystem {
+	_id: CoreSystemId // always is 'core'
+	/** Timestamp of creation, (ie the time the database was created) */
+	created: number
+	/** Last modified time */
+	modified: number
+	/** Database version, on the form x.y.z */
+	version: string
+	/** Previous version, on the form x.y.z */
+	previousVersion: string | null
+
+	/** Id of the blueprint used by this system */
+	blueprintId?: BlueprintId
+
+	/** Support info */
+	support?: {
+		message: string
+	}
+
+	systemInfo?: {
+		message: string
+		enabled: boolean
+	}
+
+	evaluations?: {
+		enabled: boolean
+		heading: string
+		message: string
+	}
+
+	/** A user-defined name for the installation */
+	name?: string
+
+	/** What log-level to set. Defaults to SILLY */
+	logLevel?: LogLevel
+
+	/** Service messages currently valid for this instance */
+	serviceMessages: {
+		[index: string]: ServiceMessage
+	}
+
+	/** elastic APM (application performance monitoring) settings */
+	apm?: {
+		enabled?: boolean
+		/**
+		 * How many of the transactions to monitor.
+		 * Set to:
+		 * -1 to log nothing (max performance),
+		 * 0.5 to log 50% of the transactions,
+		 * 1 to log all transactions
+		 */
+		transactionSampleRate?: number
+	}
+	enableMonitorBlockedThread?: boolean
+
+	/** Cron jobs running nightly */
+	cron?: {
+		casparCGRestart?: {
+			enabled: boolean
+		}
+		storeRundownSnapshots?: {
+			enabled: boolean
+			rundownNames?: string[]
+		}
+	}
+
+	logo?: SofieLogo
+}
+
+/** In the beginning, there was the database, and the database was with Sofie, and the database was Sofie.
+ * And Sofie said: The version of the database is to be GENESIS_SYSTEM_VERSION so that the migration scripts will run.
+ */
+export const GENESIS_SYSTEM_VERSION = '0.0.0'
diff --git a/meteor/lib/collections/Evaluations.ts b/packages/meteor-lib/src/collections/Evaluations.ts
similarity index 87%
rename from meteor/lib/collections/Evaluations.ts
rename to packages/meteor-lib/src/collections/Evaluations.ts
index c182f13243..b58936276d 100644
--- a/meteor/lib/collections/Evaluations.ts
+++ b/packages/meteor-lib/src/collections/Evaluations.ts
@@ -1,4 +1,4 @@
-import { Time } from '../lib'
+import { Time } from '@sofie-automation/shared-lib/dist/lib/lib'
 import {
 	EvaluationId,
 	StudioId,
diff --git a/meteor/lib/collections/ExpectedPackages.ts b/packages/meteor-lib/src/collections/ExpectedPackages.ts
similarity index 52%
rename from meteor/lib/collections/ExpectedPackages.ts
rename to packages/meteor-lib/src/collections/ExpectedPackages.ts
index b4349899cd..1b841c42c0 100644
--- a/meteor/lib/collections/ExpectedPackages.ts
+++ b/packages/meteor-lib/src/collections/ExpectedPackages.ts
@@ -1,49 +1,58 @@
 import { ExpectedPackage } from '@sofie-automation/blueprints-integration'
-import { assertNever, literal } from '../lib'
+import { assertNever, literal } from '@sofie-automation/corelib/dist/lib'
 import { StudioLight } from '@sofie-automation/corelib/dist/dataModel/Studio'
-import deepExtend from 'deep-extend'
+import * as deepExtend from 'deep-extend'
+import {
+	htmlTemplateGetSteps,
+	htmlTemplateGetFileNamesFromSteps,
+} from '@sofie-automation/shared-lib/dist/package-manager/helpers'
 
 export function getPreviewPackageSettings(
 	expectedPackage: ExpectedPackage.Any
 ): ExpectedPackage.SideEffectPreviewSettings | undefined {
-	let packagePath: string | undefined
-
 	if (expectedPackage.type === ExpectedPackage.PackageType.MEDIA_FILE) {
-		packagePath = expectedPackage.content.filePath
+		const packagePath = expectedPackage.content.filePath
+		if (packagePath) return { path: packagePath + '_preview.webm' }
+		return undefined
 	} else if (expectedPackage.type === ExpectedPackage.PackageType.QUANTEL_CLIP) {
-		packagePath = expectedPackage.content.guid || expectedPackage.content.title
+		const packagePath = expectedPackage.content.guid || expectedPackage.content.title
+		if (packagePath) return { path: packagePath + '_preview.webm' }
+		return undefined
 	} else if (expectedPackage.type === ExpectedPackage.PackageType.JSON_DATA) {
-		packagePath = undefined // Not supported
+		return undefined // Not supported
+	} else if (expectedPackage.type === ExpectedPackage.PackageType.HTML_TEMPLATE) {
+		const steps = htmlTemplateGetSteps(expectedPackage.version)
+		const o = htmlTemplateGetFileNamesFromSteps(steps)
+		if (o.mainRecording) return { path: o.mainRecording }
+		return undefined
 	} else {
 		assertNever(expectedPackage)
+		return undefined
 	}
-	if (packagePath) {
-		return {
-			path: packagePath + '_preview.webm',
-		}
-	}
-	return undefined
 }
 export function getThumbnailPackageSettings(
 	expectedPackage: ExpectedPackage.Any
 ): ExpectedPackage.SideEffectThumbnailSettings | undefined {
-	let packagePath: string | undefined
-
 	if (expectedPackage.type === ExpectedPackage.PackageType.MEDIA_FILE) {
-		packagePath = expectedPackage.content.filePath
+		const packagePath = expectedPackage.content.filePath
+		if (packagePath) return { path: packagePath + '_thumbnail.png' }
+		return undefined
 	} else if (expectedPackage.type === ExpectedPackage.PackageType.QUANTEL_CLIP) {
-		packagePath = expectedPackage.content.guid || expectedPackage.content.title
+		const packagePath = expectedPackage.content.guid || expectedPackage.content.title
+		if (packagePath) return { path: packagePath + '_thumbnail.png' }
+		return undefined
 	} else if (expectedPackage.type === ExpectedPackage.PackageType.JSON_DATA) {
-		packagePath = undefined // Not supported
+		return undefined // Not supported
+	} else if (expectedPackage.type === ExpectedPackage.PackageType.HTML_TEMPLATE) {
+		// temporary implementation:
+		const steps = htmlTemplateGetSteps(expectedPackage.version)
+		const o = htmlTemplateGetFileNamesFromSteps(steps)
+		if (o.mainScreenShot) return { path: o.mainScreenShot }
+		return undefined
 	} else {
 		assertNever(expectedPackage)
+		return undefined
 	}
-	if (packagePath) {
-		return {
-			path: packagePath + '_thumbnail.png',
-		}
-	}
-	return undefined
 }
 export function getSideEffect(
 	expectedPackage: ExpectedPackage.Base,
diff --git a/meteor/lib/collections/Organization.ts b/packages/meteor-lib/src/collections/Organization.ts
similarity index 100%
rename from meteor/lib/collections/Organization.ts
rename to packages/meteor-lib/src/collections/Organization.ts
diff --git a/meteor/lib/collections/PartInstances.ts b/packages/meteor-lib/src/collections/PartInstances.ts
similarity index 93%
rename from meteor/lib/collections/PartInstances.ts
rename to packages/meteor-lib/src/collections/PartInstances.ts
index 34a38519cd..d58e0962d7 100644
--- a/meteor/lib/collections/PartInstances.ts
+++ b/packages/meteor-lib/src/collections/PartInstances.ts
@@ -1,4 +1,4 @@
-import { protectString, unprotectString } from '../lib'
+import { protectString, unprotectString } from '@sofie-automation/corelib/dist/protectedString'
 import { DBPart } from '@sofie-automation/corelib/dist/dataModel/Part'
 import { PartId, RundownPlaylistActivationId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 
diff --git a/meteor/lib/collections/RundownLayouts.ts b/packages/meteor-lib/src/collections/RundownLayouts.ts
similarity index 100%
rename from meteor/lib/collections/RundownLayouts.ts
rename to packages/meteor-lib/src/collections/RundownLayouts.ts
diff --git a/meteor/lib/collections/Snapshots.ts b/packages/meteor-lib/src/collections/Snapshots.ts
similarity index 94%
rename from meteor/lib/collections/Snapshots.ts
rename to packages/meteor-lib/src/collections/Snapshots.ts
index 09071feb2e..f6587e9691 100644
--- a/meteor/lib/collections/Snapshots.ts
+++ b/packages/meteor-lib/src/collections/Snapshots.ts
@@ -1,4 +1,4 @@
-import { Time } from '../lib'
+import { Time } from '@sofie-automation/shared-lib/dist/lib/lib'
 import {
 	SnapshotId,
 	StudioId,
diff --git a/meteor/lib/collections/Studios.ts b/packages/meteor-lib/src/collections/Studios.ts
similarity index 87%
rename from meteor/lib/collections/Studios.ts
rename to packages/meteor-lib/src/collections/Studios.ts
index b41c07df57..d7caa2e49f 100644
--- a/meteor/lib/collections/Studios.ts
+++ b/packages/meteor-lib/src/collections/Studios.ts
@@ -1,22 +1,22 @@
-import { omit, protectString } from '../lib'
 import { LookaheadMode } from '@sofie-automation/blueprints-integration'
 import {
 	ResultingMappingRoutes,
 	MappingExt,
 	StudioRouteType,
 	StudioRouteSet,
-	RouteMapping,
 } from '@sofie-automation/corelib/dist/dataModel/Studio'
-import { ReadonlyDeep } from 'type-fest'
+import { omit } from '@sofie-automation/corelib/dist/lib'
+import { protectString } from '@sofie-automation/corelib/dist/protectedString'
 
-export function getActiveRoutes(routeSets: ReadonlyDeep<Record<string, StudioRouteSet>>): ResultingMappingRoutes {
+export function getActiveRoutes(routeSets: Record<string, StudioRouteSet>): ResultingMappingRoutes {
 	const routes: ResultingMappingRoutes = {
 		existing: {},
 		inserted: [],
 	}
 
 	const exclusivityGroups: { [groupId: string]: true } = {}
-	for (const routeSet of Object.values<ReadonlyDeep<StudioRouteSet>>(routeSets)) {
+
+	for (const routeSet of Object.values<StudioRouteSet>(routeSets)) {
 		if (routeSet.active) {
 			let useRoute = true
 			if (routeSet.exclusivityGroup) {
@@ -27,7 +27,7 @@ export function getActiveRoutes(routeSets: ReadonlyDeep<Record<string, StudioRou
 				exclusivityGroups[routeSet.exclusivityGroup] = true
 			}
 			if (useRoute) {
-				for (const routeMapping of Object.values<ReadonlyDeep<RouteMapping>>(routeSet.routes)) {
+				for (const routeMapping of routeSet.routes || []) {
 					if (routeMapping.outputMappedLayer) {
 						if (routeMapping.mappedLayer) {
 							// Route an existing layer
diff --git a/meteor/lib/collections/Timeline.ts b/packages/meteor-lib/src/collections/Timeline.ts
similarity index 100%
rename from meteor/lib/collections/Timeline.ts
rename to packages/meteor-lib/src/collections/Timeline.ts
diff --git a/meteor/lib/collections/TranslationsBundles.ts b/packages/meteor-lib/src/collections/TranslationsBundles.ts
similarity index 100%
rename from meteor/lib/collections/TranslationsBundles.ts
rename to packages/meteor-lib/src/collections/TranslationsBundles.ts
diff --git a/meteor/lib/collections/TriggeredActions.ts b/packages/meteor-lib/src/collections/TriggeredActions.ts
similarity index 100%
rename from meteor/lib/collections/TriggeredActions.ts
rename to packages/meteor-lib/src/collections/TriggeredActions.ts
diff --git a/meteor/lib/collections/UserActionsLog.ts b/packages/meteor-lib/src/collections/UserActionsLog.ts
similarity index 95%
rename from meteor/lib/collections/UserActionsLog.ts
rename to packages/meteor-lib/src/collections/UserActionsLog.ts
index f7e1c422f7..aacce21c60 100644
--- a/meteor/lib/collections/UserActionsLog.ts
+++ b/packages/meteor-lib/src/collections/UserActionsLog.ts
@@ -1,4 +1,4 @@
-import { Time, TimeDuration } from '../lib'
+import { Time, TimeDuration } from '@sofie-automation/shared-lib/dist/lib/lib'
 import { UserActionsLogItemId, OrganizationId, UserId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import { TimelineHash } from '@sofie-automation/corelib/dist/dataModel/Timeline'
 
diff --git a/packages/meteor-lib/src/collections/Users.ts b/packages/meteor-lib/src/collections/Users.ts
new file mode 100644
index 0000000000..04d5b6b887
--- /dev/null
+++ b/packages/meteor-lib/src/collections/Users.ts
@@ -0,0 +1,29 @@
+import { UserId, OrganizationId } from '@sofie-automation/corelib/dist/dataModel/Ids'
+
+export interface UserProfile {
+	name: string
+}
+
+export interface DBUser {
+	// Note: This interface is partly defined by the dataset from the Meteor.users collection
+
+	_id: UserId
+	createdAt: string
+	services: {
+		password: {
+			bcrypt: string
+		}
+	}
+	username: string
+	emails: [
+		{
+			address: string
+			verified: boolean
+		}
+	]
+	profile: UserProfile
+	organizationId: OrganizationId
+	superAdmin?: boolean
+}
+
+export type User = DBUser // to be replaced by a class somet ime later?
diff --git a/meteor/lib/collections/Workers.ts b/packages/meteor-lib/src/collections/Workers.ts
similarity index 91%
rename from meteor/lib/collections/Workers.ts
rename to packages/meteor-lib/src/collections/Workers.ts
index 67c18d6f4b..b06cc21d65 100644
--- a/meteor/lib/collections/Workers.ts
+++ b/packages/meteor-lib/src/collections/Workers.ts
@@ -1,6 +1,6 @@
 import { Time } from '@sofie-automation/blueprints-integration'
 import { WorkerId } from '@sofie-automation/corelib/dist/dataModel/Ids'
-import { protectString } from '../lib'
+import { protectString } from '@sofie-automation/shared-lib/dist/lib/protectedString'
 
 export interface WorkerStatus {
 	_id: WorkerId
diff --git a/packages/meteor-lib/src/collections/lib.ts b/packages/meteor-lib/src/collections/lib.ts
new file mode 100644
index 0000000000..636a56578f
--- /dev/null
+++ b/packages/meteor-lib/src/collections/lib.ts
@@ -0,0 +1,226 @@
+import type { Collection as RawCollection, Db as RawDb } from 'mongodb'
+import { MongoFieldSpecifier, MongoModifier, MongoQuery, SortSpecifier } from '@sofie-automation/corelib/dist/mongo'
+import { ProtectedString } from '@sofie-automation/corelib/dist/protectedString'
+
+export interface MongoReadOnlyCollection<DBInterface extends { _id: ProtectedString<any> }> {
+	/**
+	 * Find the documents in a collection that match the selector.
+	 * @param selector A query describing the documents to find
+	 */
+	find(
+		selector?: MongoQuery<DBInterface> | DBInterface['_id'],
+		options?: FindOptions<DBInterface>
+	): MongoCursor<DBInterface>
+
+	/**
+	 * Finds the first document that matches the selector, as ordered by sort and skip options. Returns `undefined` if no matching document is found.
+	 * @param selector A query describing the documents to find
+	 */
+	findOne(
+		selector?: MongoQuery<DBInterface> | DBInterface['_id'],
+		options?: FindOneOptions<DBInterface>
+	): DBInterface | undefined
+}
+/**
+ * A minimal MongoCollection type based on the Meteor Mongo.Collection type, but with our improved _id type safety.
+ * Note: when updating method signatures, make sure to update the implementions as new properties may not be fed through without additional work
+ */
+export interface MongoCollection<DBInterface extends { _id: ProtectedString<any> }>
+	extends MongoReadOnlyCollection<DBInterface> {
+	/**
+	 * Insert a document in the collection.  Returns its unique _id.
+	 * @param doc The document to insert. May not yet have an _id attribute, in which case Meteor will generate one for you.
+	 */
+	insert(doc: DBInterface): DBInterface['_id']
+
+	/**
+	 * Returns the [`Collection`](http://mongodb.github.io/node-mongodb-native/3.0/api/Collection.html) object corresponding to this collection from the
+	 * [npm `mongodb` driver module](https://www.npmjs.com/package/mongodb) which is wrapped by `Mongo.Collection`.
+	 */
+	rawCollection(): RawCollection<DBInterface>
+
+	/**
+	 * Returns the [`Db`](http://mongodb.github.io/node-mongodb-native/3.0/api/Db.html) object corresponding to this collection's database connection from the
+	 * [npm `mongodb` driver module](https://www.npmjs.com/package/mongodb) which is wrapped by `Mongo.Collection`.
+	 */
+	rawDatabase(): RawDb
+
+	/**
+	 * Remove documents from the collection
+	 * @param selector Specifies which documents to remove
+	 */
+	remove(selector: MongoQuery<DBInterface> | DBInterface['_id']): number
+
+	/**
+	 * Modify one or more documents in the collection. Returns the number of matched documents.
+	 * @param selector Specifies which documents to modify
+	 * @param modifier Specifies how to modify the documents
+	 */
+	update(
+		selector: DBInterface['_id'] | { _id: DBInterface['_id'] },
+		modifier: MongoModifier<DBInterface>,
+		options?: UpdateOptions
+	): number
+	update(
+		selector: MongoQuery<DBInterface>,
+		modifier: MongoModifier<DBInterface>,
+		// Require { multi } to be set when selecting multiple documents to be updated, otherwise only the first found document will be updated
+		options: UpdateOptions & Required<Pick<UpdateOptions, 'multi'>>
+	): number
+
+	/**
+	 * Modify one or more documents in the collection, or insert one if no matching documents were found. Returns an object with keys `numberAffected` (the number of documents modified) and
+	 * `insertedId` (the unique _id of the document that was inserted, if any).
+	 * @param selector Specifies which documents to modify
+	 * @param modifier Specifies how to modify the documents
+	 */
+	upsert(
+		selector: MongoQuery<DBInterface> | DBInterface['_id'],
+		modifier: MongoModifier<DBInterface>,
+		options?: UpsertOptions
+	): {
+		numberAffected?: number
+		insertedId?: DBInterface['_id']
+	}
+}
+
+export interface UpdateOptions {
+	/** True to modify all matching documents; false to only modify one of the matching documents (the default). */
+	multi?: boolean
+	/** True to insert a document if no matching documents are found. */
+	upsert?: boolean
+	/**
+	 * Used in combination with MongoDB [filtered positional operator](https://docs.mongodb.com/manual/reference/operator/update/positional-filtered/) to specify which elements to
+	 * modify in an array field.
+	 */
+	arrayFilters?: { [identifier: string]: any }[]
+}
+export interface UpsertOptions {
+	/** True to modify all matching documents; false to only modify one of the matching documents (the default). */
+	multi?: boolean
+}
+
+export type IndexSpecifier<T> = {
+	[P in keyof T]?: -1 | 1 | string
+}
+
+export interface MongoLiveQueryHandle {
+	stop(): void
+}
+
+// Note: This is a subset of the Meteor Mongo.Cursor type
+export interface MongoCursor<DBInterface extends { _id: ProtectedString<any> }> {
+	/**
+	 * Returns the number of documents that match a query.
+	 * @param applySkipLimit If set to `false`, the value returned will reflect the total number of matching documents, ignoring any value supplied for limit. (Default: true)
+	 */
+	count(applySkipLimit?: boolean): number
+	/**
+	 * Returns the number of documents that match a query.
+	 * @param applySkipLimit If set to `false`, the value returned will reflect the total number of matching documents, ignoring any value supplied for limit. (Default: true)
+	 */
+	countAsync(applySkipLimit?: boolean): Promise<number>
+	/**
+	 * Return all matching documents as an Array.
+	 */
+	fetch(): Array<DBInterface>
+	/**
+	 * Return all matching documents as an Array.
+	 */
+	fetchAsync(): Promise<Array<DBInterface>>
+	/**
+	 * Call `callback` once for each matching document, sequentially and
+	 *          synchronously.
+	 * @param callback Function to call. It will be called with three arguments: the document, a 0-based index, and <em>cursor</em> itself.
+	 * @param thisArg An object which will be the value of `this` inside `callback`.
+	 */
+	forEach(callback: (doc: DBInterface, index: number, cursor: MongoCursor<DBInterface>) => void, thisArg?: any): void
+	/**
+	 * Call `callback` once for each matching document, sequentially and
+	 *          synchronously.
+	 * @param callback Function to call. It will be called with three arguments: the document, a 0-based index, and <em>cursor</em> itself.
+	 * @param thisArg An object which will be the value of `this` inside `callback`.
+	 */
+	forEachAsync(
+		callback: (doc: DBInterface, index: number, cursor: MongoCursor<DBInterface>) => void,
+		thisArg?: any
+	): Promise<void>
+	/**
+	 * Map callback over all matching documents. Returns an Array.
+	 * @param callback Function to call. It will be called with three arguments: the document, a 0-based index, and <em>cursor</em> itself.
+	 * @param thisArg An object which will be the value of `this` inside `callback`.
+	 */
+	map<M>(callback: (doc: DBInterface, index: number, cursor: MongoCursor<DBInterface>) => M, thisArg?: any): Array<M>
+	/**
+	 * Map callback over all matching documents. Returns an Array.
+	 * @param callback Function to call. It will be called with three arguments: the document, a 0-based index, and <em>cursor</em> itself.
+	 * @param thisArg An object which will be the value of `this` inside `callback`.
+	 */
+	mapAsync<M>(
+		callback: (doc: DBInterface, index: number, cursor: MongoCursor<DBInterface>) => M,
+		thisArg?: any
+	): Promise<Array<M>>
+
+	[Symbol.iterator](): Iterator<DBInterface, never, never>
+	[Symbol.asyncIterator](): AsyncIterator<DBInterface, never, never>
+
+	/**
+	 * Watch a query. Receive callbacks as the result set changes.
+	 * @param callbacks Functions to call to deliver the result set as it changes
+	 */
+	observe(callbacks: ObserveCallbacks<DBInterface>): MongoLiveQueryHandle
+	/**
+	 * Watch a query. Receive callbacks as the result set changes. Only the differences between the old and new documents are passed to the callbacks.
+	 * @param callbacks Functions to call to deliver the result set as it changes
+	 */
+	observeChanges(callbacks: ObserveChangesCallbacks<DBInterface>): MongoLiveQueryHandle
+}
+export interface ObserveCallbacks<DBInterface> {
+	added?(document: DBInterface): void
+	addedAt?(document: DBInterface, atIndex: number, before: DBInterface): void
+	changed?(newDocument: DBInterface, oldDocument: DBInterface): void
+	changedAt?(newDocument: DBInterface, oldDocument: DBInterface, indexAt: number): void
+	removed?(oldDocument: DBInterface): void
+	removedAt?(oldDocument: DBInterface, atIndex: number): void
+	movedTo?(document: DBInterface, fromIndex: number, toIndex: number, before: object): void
+}
+export interface ObserveChangesCallbacks<DBInterface extends { _id: ProtectedString<any> }> {
+	added?(id: DBInterface['_id'], fields: object): void
+	addedBefore?(id: DBInterface['_id'], fields: object, before: object): void
+	changed?(id: DBInterface['_id'], fields: object): void
+	movedBefore?(id: DBInterface['_id'], before: object): void
+	removed?(id: DBInterface['_id']): void
+}
+
+export interface FindOneOptions<TRawDoc> {
+	/** Sort order (default: natural order) */
+	sort?: SortSpecifier<TRawDoc>
+	/** Number of results to skip at the beginning */
+	skip?: number
+	/** @deprecated Dictionary of fields to return or exclude. */
+	fields?: MongoFieldSpecifier<TRawDoc>
+	/** Dictionary of fields to return or exclude. */
+	projection?: MongoFieldSpecifier<TRawDoc>
+	/** (Client only) Default `true`; pass `false` to disable reactivity */
+	reactive?: boolean
+	/** Overrides `transform` on the  [`Collection`](#collections) for this cursor.  Pass `null` to disable transformation. */
+	//  transform?: Transform<TRawDoc, TDoc>;
+	/** (Server only) Specifies a custom MongoDB readPreference for this particular cursor. Possible values are primary, primaryPreferred, secondary, secondaryPreferred and nearest. */
+	readPreference?: string
+}
+export interface FindOptions<DBInterface> extends FindOneOptions<DBInterface> {
+	/** Maximum number of results to return */
+	limit?: number
+	/** (Server only) Pass true to disable oplog-tailing on this query. This affects the way server processes calls to observe on this query. Disabling the oplog can be useful when working with data that updates in large batches. */
+	disableOplog?: boolean
+	/** (Server only) When oplog is disabled (through the use of disableOplog or when otherwise not available), the frequency (in milliseconds) of how often to poll this query when observing on the server. Defaults to 10000ms (10 seconds). */
+	pollingIntervalMs?: number
+	/** (Server only) When oplog is disabled (through the use of disableOplog or when otherwise not available), the minimum time (in milliseconds) to allow between re-polling when observing on the server. Increasing this will save CPU and mongo load at the expense of slower updates to users. Decreasing this is not recommended. Defaults to 50ms. */
+	pollingThrottleMs?: number
+	/** (Server only) If set, instructs MongoDB to set a time limit for this cursor's operations. If the operation reaches the specified time limit (in milliseconds) without the having been completed, an exception will be thrown. Useful to prevent an (accidental or malicious) unoptimized query from causing a full collection scan that would disrupt other database users, at the expense of needing to handle the resulting error. */
+	maxTimeMs?: number
+	/** (Server only) Overrides MongoDB's default index selection and query optimization process. Specify an index to force its use, either by its name or index specification. You can also specify { $natural : 1 } to force a forwards collection scan, or { $natural : -1 } for a reverse collection scan. Setting this is only recommended for advanced users. */
+	hint?: string | object
+}
+
+export type FieldNames<DBInterface> = (keyof DBInterface)[]
diff --git a/packages/meteor-lib/src/lib.ts b/packages/meteor-lib/src/lib.ts
new file mode 100644
index 0000000000..bbe5a9daa6
--- /dev/null
+++ b/packages/meteor-lib/src/lib.ts
@@ -0,0 +1,9 @@
+export enum LogLevel {
+	SILLY = 'silly',
+	DEBUG = 'debug',
+	VERBOSE = 'verbose',
+	INFO = 'info',
+	WARN = 'warn',
+	ERROR = 'error',
+	NONE = 'crit',
+}
diff --git a/packages/meteor-lib/src/mos.ts b/packages/meteor-lib/src/mos.ts
new file mode 100644
index 0000000000..121946a315
--- /dev/null
+++ b/packages/meteor-lib/src/mos.ts
@@ -0,0 +1,6 @@
+import { getMosTypes } from '@mos-connection/helper'
+
+export * as MOS from '@mos-connection/helper'
+
+export const MOS_DATA_IS_STRICT = true
+export const mosTypes = getMosTypes(MOS_DATA_IS_STRICT)
diff --git a/packages/meteor-lib/src/time.ts b/packages/meteor-lib/src/time.ts
new file mode 100644
index 0000000000..23e5eea63f
--- /dev/null
+++ b/packages/meteor-lib/src/time.ts
@@ -0,0 +1,33 @@
+import { Time } from '@sofie-automation/shared-lib/dist/lib/lib'
+
+/**
+ * Formats the time as human-readable time "YYYY-MM-DD hh:ii:ss"
+ * @param time
+ */
+export function formatDateTime(time: Time): string {
+	const d = new Date(time)
+
+	const yyyy: any = d.getFullYear()
+	let mm: any = d.getMonth() + 1
+	let dd: any = d.getDate()
+
+	let hh: any = d.getHours()
+	let ii: any = d.getMinutes()
+	let ss: any = d.getSeconds()
+
+	if (mm < 10) mm = '0' + mm
+	if (dd < 10) dd = '0' + dd
+	if (hh < 10) hh = '0' + hh
+	if (ii < 10) ii = '0' + ii
+	if (ss < 10) ss = '0' + ss
+
+	return `${yyyy}-${mm}-${dd} ${hh}:${ii}:${ss}`
+}
+
+export function formatTime(time: number): string {
+	const ss = String(Math.ceil(time / 1000) % 60).padStart(2, '0')
+	const mm = String(Math.floor(time / 60000) % 60).padStart(2, '0')
+	const hh = String(Math.floor(time / 3600000)).padStart(2, '0')
+
+	return `${hh}:${mm}:${ss}`
+}
diff --git a/meteor/lib/api/triggers/README.md b/packages/meteor-lib/src/triggers/README.md
similarity index 100%
rename from meteor/lib/api/triggers/README.md
rename to packages/meteor-lib/src/triggers/README.md
diff --git a/meteor/lib/api/triggers/RundownViewEventBus.ts b/packages/meteor-lib/src/triggers/RundownViewEventBus.ts
similarity index 95%
rename from meteor/lib/api/triggers/RundownViewEventBus.ts
rename to packages/meteor-lib/src/triggers/RundownViewEventBus.ts
index 303db1c10a..8460e67108 100644
--- a/meteor/lib/api/triggers/RundownViewEventBus.ts
+++ b/packages/meteor-lib/src/triggers/RundownViewEventBus.ts
@@ -1,9 +1,5 @@
-import EventEmitter from 'events'
-import { ShelfTabs } from '../../../client/ui/Shelf/Shelf'
-import { PieceUi } from '../../../client/ui/SegmentTimeline/SegmentTimelineContainer'
-import { IAdLibListItem } from '../../../client/ui/Shelf/AdLibListItem'
-import { BucketAdLibItem } from '../../../client/ui/Shelf/RundownViewBuckets'
-import { Bucket } from '../../collections/Buckets'
+import * as EventEmitter from 'events'
+import { Bucket } from '../collections/Buckets'
 import {
 	BucketId,
 	PartId,
@@ -14,6 +10,10 @@ import {
 	SegmentId,
 	TriggeredActionId,
 } from '@sofie-automation/corelib/dist/dataModel/Ids'
+import type { PieceUi } from '../uiTypes/Piece'
+import type { ShelfTabs } from '../uiTypes/ShelfTabs'
+import type { IAdLibListItem } from '../uiTypes/Adlib'
+import type { BucketAdLibItem } from '../uiTypes/Bucket'
 
 export enum RundownViewEvents {
 	ACTIVATE_RUNDOWN_PLAYLIST = 'activateRundownPlaylist',
diff --git a/meteor/lib/api/triggers/actionFactory.ts b/packages/meteor-lib/src/triggers/actionFactory.ts
similarity index 57%
rename from meteor/lib/api/triggers/actionFactory.ts
rename to packages/meteor-lib/src/triggers/actionFactory.ts
index cff5ca6f21..c3ba6d97ba 100644
--- a/meteor/lib/api/triggers/actionFactory.ts
+++ b/packages/meteor-lib/src/triggers/actionFactory.ts
@@ -3,39 +3,32 @@ import {
 	IAdlibPlayoutActionArguments,
 	IBaseFilterLink,
 	IGUIContextFilterLink,
-	IRundownPlaylistFilterLink,
 	ITriggeredActionBase,
 	PlayoutActions,
 	SomeAction,
 	Time,
 } from '@sofie-automation/blueprints-integration'
 import { TFunction } from 'i18next'
-import { Meteor } from 'meteor/meteor'
-import { Tracker } from 'meteor/tracker'
-import { MeteorCall } from '../methods'
-import { PartInstance } from '../../collections/PartInstances'
 import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
 import { DBShowStyleBase, SourceLayers } from '@sofie-automation/corelib/dist/dataModel/ShowStyleBase'
 import { DBStudio } from '@sofie-automation/corelib/dist/dataModel/Studio'
-import { assertNever, DummyReactiveVar } from '../../lib'
-import { logger } from '../../logging'
-import RundownViewEventBus, { RundownViewEvents } from './RundownViewEventBus'
-import { UserAction } from '../../userAction'
-import { doUserAction } from './universalDoUserActionAdapter'
+import RundownViewEventBus, { RundownViewEvents } from '../triggers/RundownViewEventBus'
+import { UserAction } from '../userAction'
+import { AdLibFilterChainLink, compileAdLibFilter, IWrappedAdLib } from './actionFilterChainCompilers'
+import { ClientAPI } from '../api/client'
 import {
-	AdLibFilterChainLink,
-	compileAdLibFilter,
-	rundownPlaylistFilter,
-	IWrappedAdLib,
-} from './actionFilterChainCompilers'
-import { ClientAPI } from '../client'
-import { ReactiveVar } from 'meteor/reactive-var'
-import { PartId, PartInstanceId, RundownId, RundownPlaylistId } from '@sofie-automation/corelib/dist/dataModel/Ids'
-import { PartInstances, Parts } from '../../collections/libCollections'
-import { RundownPlaylistCollectionUtil } from '../../collections/rundownPlaylistUtil'
-import { hashSingleUseToken } from '../userActions'
+	PartId,
+	PartInstanceId,
+	RundownId,
+	RundownPlaylistId,
+	StudioId,
+} from '@sofie-automation/corelib/dist/dataModel/Ids'
 import { DeviceActions } from '@sofie-automation/shared-lib/dist/core/model/ShowStyle'
 import { UserError, UserErrorMessage } from '@sofie-automation/corelib/dist/error'
+import { MountedAdLibTriggerType } from '../api/MountedTriggers'
+import { DummyReactiveVar, ReactiveVar } from './reactive-var'
+import { TriggersContext } from './triggersContext'
+import { assertNever } from '@sofie-automation/corelib/dist/lib'
 
 // as described in this issue: https://github.com/Microsoft/TypeScript/issues/14094
 type Without<T, U> = { [P in Exclude<keyof T, keyof U>]?: never }
@@ -43,6 +36,7 @@ type Without<T, U> = { [P in Exclude<keyof T, keyof U>]?: never }
 type XOR<T, U> = T | U extends object ? (Without<T, U> & U) | (Without<U, T> & T) : T | U
 
 export interface ReactivePlaylistActionContext {
+	studioId: ReactiveVar<StudioId>
 	rundownPlaylistId: ReactiveVar<RundownPlaylistId>
 	rundownPlaylist: ReactiveVar<
 		Pick<DBRundownPlaylist, '_id' | 'name' | 'activationId' | 'nextPartInfo' | 'currentPartInfo'>
@@ -106,6 +100,7 @@ export function isPreviewableAction(action: ExecutableAction): action is Preview
 	return action.action && 'preview' in action && typeof action['preview'] === 'function'
 }
 function createRundownPlaylistContext(
+	triggersContext: TriggersContext,
 	context: ActionContext,
 	filterChain: IBaseFilterLink[]
 ): ReactivePlaylistActionContext | undefined {
@@ -116,6 +111,7 @@ function createRundownPlaylistContext(
 	} else if (filterChain[0].object === 'view' && context.rundownPlaylist) {
 		const playlistContext = context as PlainPlaylistContext
 		return {
+			studioId: new DummyReactiveVar(playlistContext.rundownPlaylist.studioId),
 			rundownPlaylistId: new DummyReactiveVar(playlistContext.rundownPlaylist._id),
 			rundownPlaylist: new DummyReactiveVar(playlistContext.rundownPlaylist),
 			currentRundownId: new DummyReactiveVar(playlistContext.currentRundownId),
@@ -127,56 +123,10 @@ function createRundownPlaylistContext(
 				playlistContext.rundownPlaylist.currentPartInfo?.partInstanceId ?? null
 			),
 		}
-	} else if (filterChain[0].object === 'rundownPlaylist' && context.studio && Meteor.isServer) {
-		const playlist = rundownPlaylistFilter(
-			context.studio._id,
-			filterChain.filter((link) => link.object === 'rundownPlaylist') as IRundownPlaylistFilterLink[]
-		)
-
-		if (playlist) {
-			let currentPartId: PartId | null = null,
-				nextPartId: PartId | null = null,
-				currentPartInstance: PartInstance | null = null,
-				currentSegmentPartIds: PartId[] = [],
-				nextSegmentPartIds: PartId[] = []
-
-			if (playlist.currentPartInfo) {
-				currentPartInstance = PartInstances.findOne(playlist.currentPartInfo.partInstanceId) ?? null
-				const currentPart = currentPartInstance?.part ?? null
-				if (currentPart) {
-					currentPartId = currentPart._id
-					currentSegmentPartIds = Parts.find({
-						segmentId: currentPart.segmentId,
-					}).map((part) => part._id)
-				}
-			}
-			if (playlist.nextPartInfo) {
-				const nextPart = PartInstances.findOne(playlist.nextPartInfo.partInstanceId)?.part ?? null
-				if (nextPart) {
-					nextPartId = nextPart._id
-					nextSegmentPartIds = Parts.find({
-						segmentId: nextPart.segmentId,
-					}).map((part) => part._id)
-				}
-			}
-
-			return {
-				rundownPlaylistId: new DummyReactiveVar(playlist?._id),
-				rundownPlaylist: new DummyReactiveVar(playlist),
-				currentRundownId: new DummyReactiveVar(
-					currentPartInstance?.rundownId ??
-						RundownPlaylistCollectionUtil.getRundownsOrdered(playlist)[0]?._id ??
-						null
-				),
-				currentPartId: new DummyReactiveVar(currentPartId),
-				currentSegmentPartIds: new DummyReactiveVar(currentSegmentPartIds),
-				nextPartId: new DummyReactiveVar(nextPartId),
-				nextSegmentPartIds: new DummyReactiveVar(nextSegmentPartIds),
-				currentPartInstanceId: new DummyReactiveVar(playlist.currentPartInfo?.partInstanceId ?? null),
-			}
-		}
+	} else if (filterChain[0].object === 'rundownPlaylist' && context.studio) {
+		return triggersContext.createContextForRundownPlaylistChain(context.studio._id, filterChain)
 	} else {
-		throw new Meteor.Error(501, 'Invalid filter combination')
+		throw new Error('Invalid filter combination')
 	}
 }
 
@@ -189,22 +139,23 @@ function createRundownPlaylistContext(
  * @return {*}  {ExecutableAdLibAction}
  */
 function createAdLibAction(
+	triggersContext: TriggersContext,
 	filterChain: AdLibFilterChainLink[],
 	sourceLayers: SourceLayers,
 	actionArguments: IAdlibPlayoutActionArguments | undefined
 ): ExecutableAdLibAction {
-	const compiledAdLibFilter = compileAdLibFilter(filterChain, sourceLayers)
+	const compiledAdLibFilter = compileAdLibFilter(triggersContext, filterChain, sourceLayers)
 
 	return {
 		action: PlayoutActions.adlib,
 		preview: (ctx) => {
-			const innerCtx = createRundownPlaylistContext(ctx, filterChain)
+			const innerCtx = createRundownPlaylistContext(triggersContext, ctx, filterChain)
 
 			if (innerCtx) {
 				try {
 					return compiledAdLibFilter(innerCtx)
 				} catch (e) {
-					logger.error(e)
+					triggersContext.logger.error(e)
 					return []
 				}
 			} else {
@@ -212,94 +163,99 @@ function createAdLibAction(
 			}
 		},
 		execute: (t, e, ctx) => {
-			const innerCtx = createRundownPlaylistContext(ctx, filterChain)
+			const innerCtx = createRundownPlaylistContext(triggersContext, ctx, filterChain)
 
 			if (!innerCtx) {
-				logger.warn(`Could not create RundownPlaylist context for executable AdLib Action`, filterChain)
+				triggersContext.logger.warn(
+					`Could not create RundownPlaylist context for executable AdLib Action`,
+					filterChain
+				)
 				return
 			}
 			const currentPartInstanceId = innerCtx.rundownPlaylist.get().currentPartInfo?.partInstanceId
 
 			const sourceLayerIdsToClear: string[] = []
-			Tracker.nonreactive(() => compiledAdLibFilter(innerCtx)).forEach((wrappedAdLib) => {
-				switch (wrappedAdLib.type) {
-					case 'adLibPiece':
-						doUserAction(t, e, UserAction.START_ADLIB, async (e, ts) =>
-							currentPartInstanceId
-								? MeteorCall.userAction.segmentAdLibPieceStart(
-										e,
-										ts,
-										innerCtx.rundownPlaylistId.get(),
-										currentPartInstanceId,
-										wrappedAdLib.item._id,
-										false
-								  )
-								: ClientAPI.responseSuccess<void>(undefined)
-						)
-						break
-					case 'rundownBaselineAdLibItem':
-						doUserAction(t, e, UserAction.START_GLOBAL_ADLIB, async (e, ts) =>
-							currentPartInstanceId
-								? MeteorCall.userAction.baselineAdLibPieceStart(
-										e,
-										ts,
-										innerCtx.rundownPlaylistId.get(),
-										currentPartInstanceId,
-										wrappedAdLib.item._id,
-										false
-								  )
-								: ClientAPI.responseSuccess<void>(undefined)
-						)
-						break
-					case 'adLibAction':
-						doUserAction(t, e, UserAction.START_ADLIB, async (e, ts) =>
-							MeteorCall.userAction.executeAction(
-								e,
-								ts,
-								innerCtx.rundownPlaylistId.get(),
-								wrappedAdLib._id,
-								wrappedAdLib.item.actionId,
-								wrappedAdLib.item.userData,
-								(actionArguments && actionArguments.triggerMode) || undefined
+			triggersContext
+				.nonreactiveTracker(() => compiledAdLibFilter(innerCtx))
+				.forEach((wrappedAdLib) => {
+					switch (wrappedAdLib.type) {
+						case MountedAdLibTriggerType.adLibPiece:
+							triggersContext.doUserAction(t, e, UserAction.START_ADLIB, async (e, ts) =>
+								currentPartInstanceId
+									? triggersContext.MeteorCall.userAction.segmentAdLibPieceStart(
+											e,
+											ts,
+											innerCtx.rundownPlaylistId.get(),
+											currentPartInstanceId,
+											wrappedAdLib.item._id,
+											false
+									  )
+									: ClientAPI.responseSuccess<void>(undefined)
 							)
-						)
-						break
-					case 'rundownBaselineAdLibAction':
-						doUserAction(t, e, UserAction.START_GLOBAL_ADLIB, async (e, ts) =>
-							MeteorCall.userAction.executeAction(
-								e,
-								ts,
-								innerCtx.rundownPlaylistId.get(),
-								wrappedAdLib._id,
-								wrappedAdLib.item.actionId,
-								wrappedAdLib.item.userData,
-								(actionArguments && actionArguments.triggerMode) || undefined
+							break
+						case MountedAdLibTriggerType.rundownBaselineAdLibItem:
+							triggersContext.doUserAction(t, e, UserAction.START_GLOBAL_ADLIB, async (e, ts) =>
+								currentPartInstanceId
+									? triggersContext.MeteorCall.userAction.baselineAdLibPieceStart(
+											e,
+											ts,
+											innerCtx.rundownPlaylistId.get(),
+											currentPartInstanceId,
+											wrappedAdLib.item._id,
+											false
+									  )
+									: ClientAPI.responseSuccess<void>(undefined)
 							)
-						)
-						break
-					case 'clearSourceLayer':
-						// defer this action to send a single clear action all at once
-						sourceLayerIdsToClear.push(wrappedAdLib.sourceLayerId)
-						break
-					case 'sticky':
-						doUserAction(t, e, UserAction.START_STICKY_PIECE, async (e, ts) =>
-							MeteorCall.userAction.sourceLayerStickyPieceStart(
-								e,
-								ts,
-								innerCtx.rundownPlaylistId.get(),
-								wrappedAdLib.sourceLayerId //
+							break
+						case MountedAdLibTriggerType.adLibAction:
+							triggersContext.doUserAction(t, e, UserAction.START_ADLIB, async (e, ts) =>
+								triggersContext.MeteorCall.userAction.executeAction(
+									e,
+									ts,
+									innerCtx.rundownPlaylistId.get(),
+									wrappedAdLib._id,
+									wrappedAdLib.item.actionId,
+									wrappedAdLib.item.userData,
+									(actionArguments && actionArguments.triggerMode) || undefined
+								)
 							)
-						)
-						break
-					default:
-						assertNever(wrappedAdLib)
-						return
-				}
-			})
+							break
+						case MountedAdLibTriggerType.rundownBaselineAdLibAction:
+							triggersContext.doUserAction(t, e, UserAction.START_GLOBAL_ADLIB, async (e, ts) =>
+								triggersContext.MeteorCall.userAction.executeAction(
+									e,
+									ts,
+									innerCtx.rundownPlaylistId.get(),
+									wrappedAdLib._id,
+									wrappedAdLib.item.actionId,
+									wrappedAdLib.item.userData,
+									(actionArguments && actionArguments.triggerMode) || undefined
+								)
+							)
+							break
+						case MountedAdLibTriggerType.clearSourceLayer:
+							// defer this action to send a single clear action all at once
+							sourceLayerIdsToClear.push(wrappedAdLib.sourceLayerId)
+							break
+						case MountedAdLibTriggerType.sticky:
+							triggersContext.doUserAction(t, e, UserAction.START_STICKY_PIECE, async (e, ts) =>
+								triggersContext.MeteorCall.userAction.sourceLayerStickyPieceStart(
+									e,
+									ts,
+									innerCtx.rundownPlaylistId.get(),
+									wrappedAdLib.sourceLayerId //
+								)
+							)
+							break
+						default:
+							assertNever(wrappedAdLib)
+							return
+					}
+				})
 
 			if (currentPartInstanceId && sourceLayerIdsToClear.length > 0) {
-				doUserAction(t, e, UserAction.CLEAR_SOURCELAYER, async (e, ts) =>
-					MeteorCall.userAction.sourceLayerOnPartStop(
+				triggersContext.doUserAction(t, e, UserAction.CLEAR_SOURCELAYER, async (e, ts) =>
+					triggersContext.MeteorCall.userAction.sourceLayerOnPartStop(
 						e,
 						ts,
 						innerCtx.rundownPlaylistId.get(),
@@ -446,6 +402,7 @@ function createTakeRundownSnapshotAction(_filterChain: IGUIContextFilterLink[]):
  * @return {*}  {ExecutableAction}
  */
 function createUserActionWithCtx(
+	triggersContext: TriggersContext,
 	action: SomeAction,
 	userAction: UserAction,
 	userActionExec: (e: string, ts: Time, ctx: ReactivePlaylistActionContext) => Promise<ClientAPI.ClientResponse<any>>
@@ -453,9 +410,11 @@ function createUserActionWithCtx(
 	return {
 		action: action.action,
 		execute: (t, e, ctx) => {
-			const innerCtx = Tracker.nonreactive(() => createRundownPlaylistContext(ctx, action.filterChain))
+			const innerCtx = triggersContext.nonreactiveTracker(() =>
+				createRundownPlaylistContext(triggersContext, ctx, action.filterChain)
+			)
 			if (innerCtx) {
-				doUserAction(t, e, userAction, async (e, ts) => userActionExec(e, ts, innerCtx))
+				triggersContext.doUserAction(t, e, userAction, async (e, ts) => userActionExec(e, ts, innerCtx))
 			}
 		},
 	}
@@ -467,7 +426,11 @@ function createUserActionWithCtx(
  * @param sourceLayers
  * @returns
  */
-export function createAction(action: SomeAction, sourceLayers: SourceLayers): ExecutableAction {
+export function createAction(
+	triggersContext: TriggersContext,
+	action: SomeAction,
+	sourceLayers: SourceLayers
+): ExecutableAction {
 	switch (action.action) {
 		case ClientActions.shelf:
 			return createShelfAction(action.filterChain, action.state)
@@ -476,14 +439,15 @@ export function createAction(action: SomeAction, sourceLayers: SourceLayers): Ex
 		case ClientActions.rewindSegments:
 			return createRewindSegmentsAction(action.filterChain)
 		case PlayoutActions.adlib:
-			return createAdLibAction(action.filterChain, sourceLayers, action.arguments || undefined)
+			return createAdLibAction(triggersContext, action.filterChain, sourceLayers, action.arguments || undefined)
 		case PlayoutActions.activateRundownPlaylist:
 			if (action.force) {
 				return createUserActionWithCtx(
+					triggersContext,
 					action,
 					UserAction.DEACTIVATE_OTHER_RUNDOWN_PLAYLIST,
 					async (e, ts, ctx) =>
-						MeteorCall.userAction.forceResetAndActivate(
+						triggersContext.MeteorCall.userAction.forceResetAndActivate(
 							e,
 							ts,
 							ctx.rundownPlaylistId.get(),
@@ -491,70 +455,107 @@ export function createAction(action: SomeAction, sourceLayers: SourceLayers): Ex
 						)
 				)
 			} else {
-				if (isActionTriggeredFromUiContext(action)) {
+				if (isActionTriggeredFromUiContext(triggersContext, action)) {
 					return createRundownPlaylistSoftActivateAction(
 						action.filterChain as IGUIContextFilterLink[],
 						!!action.rehearsal
 					)
 				} else {
-					return createUserActionWithCtx(action, UserAction.ACTIVATE_RUNDOWN_PLAYLIST, async (e, ts, ctx) =>
-						MeteorCall.userAction.activate(e, ts, ctx.rundownPlaylistId.get(), !!action.rehearsal || false)
+					return createUserActionWithCtx(
+						triggersContext,
+						action,
+						UserAction.ACTIVATE_RUNDOWN_PLAYLIST,
+						async (e, ts, ctx) =>
+							triggersContext.MeteorCall.userAction.activate(
+								e,
+								ts,
+								ctx.rundownPlaylistId.get(),
+								!!action.rehearsal || false
+							)
 					)
 				}
 			}
 		case PlayoutActions.deactivateRundownPlaylist:
-			if (isActionTriggeredFromUiContext(action)) {
+			if (isActionTriggeredFromUiContext(triggersContext, action)) {
 				return createRundownPlaylistSoftDeactivateAction()
 			}
-			return createUserActionWithCtx(action, UserAction.DEACTIVATE_RUNDOWN_PLAYLIST, async (e, ts, ctx) =>
-				MeteorCall.userAction.deactivate(e, ts, ctx.rundownPlaylistId.get())
+			return createUserActionWithCtx(
+				triggersContext,
+				action,
+				UserAction.DEACTIVATE_RUNDOWN_PLAYLIST,
+				async (e, ts, ctx) =>
+					triggersContext.MeteorCall.userAction.deactivate(e, ts, ctx.rundownPlaylistId.get())
 			)
 		case PlayoutActions.activateAdlibTestingMode:
-			return createUserActionWithCtx(action, UserAction.ACTIVATE_ADLIB_TESTING, async (e, ts, ctx) => {
-				const rundownId = ctx.currentRundownId.get()
-				if (rundownId) {
-					return MeteorCall.userAction.activateAdlibTestingMode(e, ts, ctx.rundownPlaylistId.get(), rundownId)
-				} else {
-					return ClientAPI.responseError(UserError.create(UserErrorMessage.InactiveRundown))
+			return createUserActionWithCtx(
+				triggersContext,
+				action,
+				UserAction.ACTIVATE_ADLIB_TESTING,
+				async (e, ts, ctx) => {
+					const rundownId = ctx.currentRundownId.get()
+					if (rundownId) {
+						return triggersContext.MeteorCall.userAction.activateAdlibTestingMode(
+							e,
+							ts,
+							ctx.rundownPlaylistId.get(),
+							rundownId
+						)
+					} else {
+						return ClientAPI.responseError(UserError.create(UserErrorMessage.InactiveRundown))
+					}
 				}
-			})
+			)
 		case PlayoutActions.take:
-			if (isActionTriggeredFromUiContext(action)) {
+			if (isActionTriggeredFromUiContext(triggersContext, action)) {
 				return createRundownPlaylistSoftTakeAction(action.filterChain as IGUIContextFilterLink[])
 			} else {
-				return createUserActionWithCtx(action, UserAction.TAKE, async (e, ts, ctx) =>
-					MeteorCall.userAction.take(e, ts, ctx.rundownPlaylistId.get(), ctx.currentPartInstanceId.get())
+				return createUserActionWithCtx(triggersContext, action, UserAction.TAKE, async (e, ts, ctx) =>
+					triggersContext.MeteorCall.userAction.take(
+						e,
+						ts,
+						ctx.rundownPlaylistId.get(),
+						ctx.currentPartInstanceId.get()
+					)
 				)
 			}
 		case PlayoutActions.hold:
-			return createUserActionWithCtx(action, UserAction.ACTIVATE_HOLD, async (e, ts, ctx) =>
-				MeteorCall.userAction.activateHold(e, ts, ctx.rundownPlaylistId.get(), !!action.undo)
+			return createUserActionWithCtx(triggersContext, action, UserAction.ACTIVATE_HOLD, async (e, ts, ctx) =>
+				triggersContext.MeteorCall.userAction.activateHold(e, ts, ctx.rundownPlaylistId.get(), !!action.undo)
 			)
 		case PlayoutActions.disableNextPiece:
-			return createUserActionWithCtx(action, UserAction.DISABLE_NEXT_PIECE, async (e, ts, ctx) =>
-				MeteorCall.userAction.disableNextPiece(e, ts, ctx.rundownPlaylistId.get(), !!action.undo)
+			return createUserActionWithCtx(triggersContext, action, UserAction.DISABLE_NEXT_PIECE, async (e, ts, ctx) =>
+				triggersContext.MeteorCall.userAction.disableNextPiece(
+					e,
+					ts,
+					ctx.rundownPlaylistId.get(),
+					!!action.undo
+				)
 			)
 		case PlayoutActions.createSnapshotForDebug:
-			if (isActionTriggeredFromUiContext(action)) {
+			if (isActionTriggeredFromUiContext(triggersContext, action)) {
 				return createTakeRundownSnapshotAction(action.filterChain as IGUIContextFilterLink[])
 			} else {
-				return createUserActionWithCtx(action, UserAction.CREATE_SNAPSHOT_FOR_DEBUG, async (e, ts, ctx) =>
-					MeteorCall.system.generateSingleUseToken().then(async (tokenResult) => {
-						if (ClientAPI.isClientResponseError(tokenResult) || !tokenResult.result) throw tokenResult
-						return MeteorCall.userAction.storeRundownSnapshot(
-							e,
-							ts,
-							hashSingleUseToken(tokenResult.result),
-							ctx.rundownPlaylistId.get(),
-							`action`,
-							false
-						)
-					})
+				return createUserActionWithCtx(
+					triggersContext,
+					action,
+					UserAction.CREATE_SNAPSHOT_FOR_DEBUG,
+					async (e, ts, ctx) =>
+						triggersContext.MeteorCall.system.generateSingleUseToken().then(async (tokenResult) => {
+							if (ClientAPI.isClientResponseError(tokenResult) || !tokenResult.result) throw tokenResult
+							return triggersContext.MeteorCall.userAction.storeRundownSnapshot(
+								e,
+								ts,
+								triggersContext.hashSingleUseToken(tokenResult.result),
+								ctx.rundownPlaylistId.get(),
+								`action`,
+								false
+							)
+						})
 				)
 			}
 		case PlayoutActions.moveNext:
-			return createUserActionWithCtx(action, UserAction.MOVE_NEXT, async (e, ts, ctx) =>
-				MeteorCall.userAction.moveNext(
+			return createUserActionWithCtx(triggersContext, action, UserAction.MOVE_NEXT, async (e, ts, ctx) =>
+				triggersContext.MeteorCall.userAction.moveNext(
 					e,
 					ts,
 					ctx.rundownPlaylistId.get(),
@@ -563,26 +564,48 @@ export function createAction(action: SomeAction, sourceLayers: SourceLayers): Ex
 				)
 			)
 		case PlayoutActions.reloadRundownPlaylistData:
-			if (isActionTriggeredFromUiContext(action)) {
+			if (isActionTriggeredFromUiContext(triggersContext, action)) {
 				return createRundownPlaylistSoftResyncAction(action.filterChain as IGUIContextFilterLink[])
 			} else {
-				return createUserActionWithCtx(action, UserAction.RELOAD_RUNDOWN_PLAYLIST_DATA, async (e, ts, ctx) =>
-					// TODO: Needs some handling of the response. Perhaps this should switch to
-					// an event on the RundownViewEventBus, if ran on the client?
-					MeteorCall.userAction.resyncRundownPlaylist(e, ts, ctx.rundownPlaylistId.get())
+				return createUserActionWithCtx(
+					triggersContext,
+					action,
+					UserAction.RELOAD_RUNDOWN_PLAYLIST_DATA,
+					async (e, ts, ctx) =>
+						// TODO: Needs some handling of the response. Perhaps this should switch to
+						// an event on the RundownViewEventBus, if ran on the client?
+						triggersContext.MeteorCall.userAction.resyncRundownPlaylist(e, ts, ctx.rundownPlaylistId.get())
 				)
 			}
 		case PlayoutActions.resetRundownPlaylist:
-			if (isActionTriggeredFromUiContext(action)) {
+			if (isActionTriggeredFromUiContext(triggersContext, action)) {
 				return createRundownPlaylistSoftResetRundownAction(action.filterChain as IGUIContextFilterLink[])
 			} else {
-				return createUserActionWithCtx(action, UserAction.RESET_RUNDOWN_PLAYLIST, async (e, ts, ctx) =>
-					MeteorCall.userAction.resetRundownPlaylist(e, ts, ctx.rundownPlaylistId.get())
+				return createUserActionWithCtx(
+					triggersContext,
+					action,
+					UserAction.RESET_RUNDOWN_PLAYLIST,
+					async (e, ts, ctx) =>
+						triggersContext.MeteorCall.userAction.resetRundownPlaylist(e, ts, ctx.rundownPlaylistId.get())
 				)
 			}
 		case PlayoutActions.resyncRundownPlaylist:
-			return createUserActionWithCtx(action, UserAction.RESYNC_RUNDOWN_PLAYLIST, async (e, ts, ctx) =>
-				MeteorCall.userAction.resyncRundownPlaylist(e, ts, ctx.rundownPlaylistId.get())
+			return createUserActionWithCtx(
+				triggersContext,
+				action,
+				UserAction.RESYNC_RUNDOWN_PLAYLIST,
+				async (e, ts, ctx) =>
+					triggersContext.MeteorCall.userAction.resyncRundownPlaylist(e, ts, ctx.rundownPlaylistId.get())
+			)
+		case PlayoutActions.switchRouteSet:
+			return createUserActionWithCtx(triggersContext, action, UserAction.SWITCH_ROUTE_SET, async (e, ts, ctx) =>
+				triggersContext.MeteorCall.userAction.switchRouteSet(
+					e,
+					ts,
+					ctx.studioId.get(),
+					action.routeSetId,
+					action.state
+				)
 			)
 		case ClientActions.showEntireCurrentSegment:
 			return createShowEntireCurrentSegmentAction(action.filterChain, action.on)
@@ -611,6 +634,6 @@ export function createAction(action: SomeAction, sourceLayers: SourceLayers): Ex
 	}
 }
 
-function isActionTriggeredFromUiContext(action: SomeAction): boolean {
-	return Meteor.isClient && action.filterChain.every((link) => link.object === 'view')
+function isActionTriggeredFromUiContext(triggersContext: TriggersContext, action: SomeAction): boolean {
+	return triggersContext.isClient && action.filterChain.every((link) => link.object === 'view')
 }
diff --git a/meteor/lib/api/triggers/actionFilterChainCompilers.ts b/packages/meteor-lib/src/triggers/actionFilterChainCompilers.ts
similarity index 89%
rename from meteor/lib/api/triggers/actionFilterChainCompilers.ts
rename to packages/meteor-lib/src/triggers/actionFilterChainCompilers.ts
index 6af03bb1dc..eb2b9e47cb 100644
--- a/meteor/lib/api/triggers/actionFilterChainCompilers.ts
+++ b/packages/meteor-lib/src/triggers/actionFilterChainCompilers.ts
@@ -15,26 +15,17 @@ import { RundownBaselineAdLibAction } from '@sofie-automation/corelib/dist/dataM
 import { RundownBaselineAdLibItem } from '@sofie-automation/corelib/dist/dataModel/RundownBaselineAdLibPiece'
 import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
 import { SourceLayers } from '@sofie-automation/corelib/dist/dataModel/ShowStyleBase'
-import { assertNever, generateTranslation } from '../../lib'
 import { MongoQuery } from '@sofie-automation/corelib/dist/mongo'
 import { DBRundown } from '@sofie-automation/corelib/dist/dataModel/Rundown'
 import { DBSegment } from '@sofie-automation/corelib/dist/dataModel/Segment'
-import { sortAdlibs } from '../../Rundown'
+import { sortAdlibs } from '../adlibs'
 import { ReactivePlaylistActionContext } from './actionFactory'
-import { FindOptions } from '../../collections/lib'
-import { PartId, RundownId, SegmentId, StudioId } from '@sofie-automation/corelib/dist/dataModel/Ids'
+import { PartId, RundownId, SegmentId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import { IWrappedAdLibBase } from '@sofie-automation/shared-lib/dist/input-gateway/deviceTriggerPreviews'
-import { memoizedIsolatedAutorun } from '../../memoizedIsolatedAutorun'
-import {
-	AdLibActions,
-	AdLibPieces,
-	Parts,
-	RundownBaselineAdLibActions,
-	RundownBaselineAdLibPieces,
-	RundownPlaylists,
-	Rundowns,
-	Segments,
-} from '../../collections/libCollections'
+import { MountedAdLibTriggerType } from '../api/MountedTriggers'
+import { assertNever, generateTranslation } from '@sofie-automation/corelib/dist/lib'
+import { FindOptions } from '../collections/lib'
+import { TriggersContext } from './triggersContext'
 
 export type AdLibFilterChainLink = IRundownPlaylistFilterLink | IGUIContextFilterLink | IAdLibFilterLink
 
@@ -59,7 +50,7 @@ type CompiledFilter<T> = {
 
 type SomeAdLib = RundownBaselineAdLibItem | RundownBaselineAdLibAction | AdLibPiece | AdLibAction
 
-interface IWrappedAdLibType<T extends SomeAdLib, typeName extends string> extends IWrappedAdLibBase {
+interface IWrappedAdLibType<T extends SomeAdLib, typeName extends MountedAdLibTriggerType> extends IWrappedAdLibBase {
 	_id: T['_id']
 	_rank: number
 	partId: PartId | null
@@ -73,7 +64,7 @@ interface IWrappedAdLibType<T extends SomeAdLib, typeName extends string> extend
 
 /** What follows are utility functions to wrap various AdLib objects to IWrappedAdLib */
 
-function wrapAdLibAction(adLib: AdLibAction, type: 'adLibAction'): IWrappedAdLib {
+function wrapAdLibAction(adLib: AdLibAction, type: MountedAdLibTriggerType.adLibAction): IWrappedAdLib {
 	return {
 		_id: adLib._id,
 		_rank: adLib.display?._rank || 0,
@@ -89,7 +80,7 @@ function wrapAdLibAction(adLib: AdLibAction, type: 'adLibAction'): IWrappedAdLib
 
 function wrapRundownBaselineAdLibAction(
 	adLib: RundownBaselineAdLibAction,
-	type: 'rundownBaselineAdLibAction'
+	type: MountedAdLibTriggerType.rundownBaselineAdLibAction
 ): IWrappedAdLib {
 	return {
 		_id: adLib._id,
@@ -106,7 +97,7 @@ function wrapRundownBaselineAdLibAction(
 
 function wrapAdLibPiece<T extends RundownBaselineAdLibItem | AdLibPiece>(
 	adLib: T,
-	type: 'adLibPiece' | 'rundownBaselineAdLibItem'
+	type: MountedAdLibTriggerType.adLibPiece | MountedAdLibTriggerType.rundownBaselineAdLibItem
 ): IWrappedAdLib {
 	return {
 		_id: adLib._id,
@@ -122,15 +113,15 @@ function wrapAdLibPiece<T extends RundownBaselineAdLibItem | AdLibPiece>(
 }
 
 export type IWrappedAdLib =
-	| IWrappedAdLibType<RundownBaselineAdLibItem, 'rundownBaselineAdLibItem'>
-	| IWrappedAdLibType<RundownBaselineAdLibAction, 'rundownBaselineAdLibAction'>
-	| IWrappedAdLibType<AdLibPiece, 'adLibPiece'>
-	| IWrappedAdLibType<AdLibAction, 'adLibAction'>
+	| IWrappedAdLibType<RundownBaselineAdLibItem, MountedAdLibTriggerType.rundownBaselineAdLibItem>
+	| IWrappedAdLibType<RundownBaselineAdLibAction, MountedAdLibTriggerType.rundownBaselineAdLibAction>
+	| IWrappedAdLibType<AdLibPiece, MountedAdLibTriggerType.adLibPiece>
+	| IWrappedAdLibType<AdLibAction, MountedAdLibTriggerType.adLibAction>
 	| {
 			_id: ISourceLayer['_id']
 			_rank: number
 			partId: PartId | null
-			type: 'clearSourceLayer'
+			type: MountedAdLibTriggerType.clearSourceLayer
 			label: string | ITranslatableMessage
 			sourceLayerId: ISourceLayer['_id']
 			outputLayerId: undefined
@@ -141,7 +132,7 @@ export type IWrappedAdLib =
 			_id: ISourceLayer['_id']
 			_rank: number
 			partId: PartId | null
-			type: 'sticky'
+			type: MountedAdLibTriggerType.sticky
 			label: string | ITranslatableMessage
 			sourceLayerId: ISourceLayer['_id']
 			outputLayerId: undefined
@@ -496,6 +487,7 @@ function compileAdLibPieceFilter(
  * @returns
  */
 export function compileAdLibFilter(
+	triggersContext: TriggersContext,
 	filterChain: AdLibFilterChainLink[],
 	sourceLayers: SourceLayers
 ): (context: ReactivePlaylistActionContext) => IWrappedAdLib[] {
@@ -565,23 +557,23 @@ export function compileAdLibFilter(
 			const currentRundownId = context.currentRundownId.get()
 			if (!skip && currentRundownId) {
 				if (adLibPieceTypeFilter.global === undefined || adLibPieceTypeFilter.global === true)
-					rundownBaselineAdLibItems = RundownBaselineAdLibPieces.find(
+					rundownBaselineAdLibItems = triggersContext.RundownBaselineAdLibPieces.find(
 						{
 							...adLibPieceTypeFilter.selector,
 							...currentNextOverride,
 							rundownId: currentRundownId,
 						} as MongoQuery<RundownBaselineAdLibItem>,
 						adLibPieceTypeFilter.options
-					).map((item) => wrapAdLibPiece(item, 'rundownBaselineAdLibItem'))
+					).map((item) => wrapAdLibPiece(item, MountedAdLibTriggerType.rundownBaselineAdLibItem))
 				if (adLibPieceTypeFilter.global === undefined || adLibPieceTypeFilter.global === false)
-					adLibPieces = AdLibPieces.find(
+					adLibPieces = triggersContext.AdLibPieces.find(
 						{
 							...adLibPieceTypeFilter.selector,
 							...currentNextOverride,
 							rundownId: currentRundownId,
 						} as MongoQuery<AdLibPiece>,
 						adLibPieceTypeFilter.options
-					).map((item) => wrapAdLibPiece(item, 'adLibPiece'))
+					).map((item) => wrapAdLibPiece(item, MountedAdLibTriggerType.adLibPiece))
 			}
 		}
 
@@ -602,23 +594,25 @@ export function compileAdLibFilter(
 			const currentRundownId = context.currentRundownId.get()
 			if (!skip && currentRundownId) {
 				if (adLibActionTypeFilter.global === undefined || adLibActionTypeFilter.global === true)
-					rundownBaselineAdLibActions = RundownBaselineAdLibActions.find(
+					rundownBaselineAdLibActions = triggersContext.RundownBaselineAdLibActions.find(
 						{
 							...adLibActionTypeFilter.selector,
 							...currentNextOverride,
 							rundownId: currentRundownId,
 						} as MongoQuery<RundownBaselineAdLibAction>,
 						adLibActionTypeFilter.options
-					).map((item) => wrapRundownBaselineAdLibAction(item, 'rundownBaselineAdLibAction'))
+					).map((item) =>
+						wrapRundownBaselineAdLibAction(item, MountedAdLibTriggerType.rundownBaselineAdLibAction)
+					)
 				if (adLibActionTypeFilter.global === undefined || adLibActionTypeFilter.global === false)
-					adLibActions = AdLibActions.find(
+					adLibActions = triggersContext.AdLibActions.find(
 						{
 							...adLibActionTypeFilter.selector,
 							...currentNextOverride,
 							rundownId: currentRundownId,
 						} as MongoQuery<AdLibAction>,
 						adLibActionTypeFilter.options
-					).map((item) => wrapAdLibAction(item, 'adLibAction'))
+					).map((item) => wrapAdLibAction(item, MountedAdLibTriggerType.adLibAction))
 			}
 		}
 
@@ -631,8 +625,8 @@ export function compileAdLibFilter(
 				// because _.isEqual (used in memoizedIsolatedAutorun) doesn't work with Maps..
 
 				const rundownPlaylistId = context.rundownPlaylistId.get()
-				const rundownRanks = memoizedIsolatedAutorun(() => {
-					const playlist = RundownPlaylists.findOne(rundownPlaylistId, {
+				const rundownRanks = triggersContext.memoizedIsolatedAutorun(() => {
+					const playlist = triggersContext.RundownPlaylists.findOne(rundownPlaylistId, {
 						projection: {
 							rundownIdsInOrder: 1,
 						},
@@ -641,7 +635,7 @@ export function compileAdLibFilter(
 					if (playlist?.rundownIdsInOrder) {
 						return playlist.rundownIdsInOrder
 					} else {
-						const rundowns = Rundowns.find(
+						const rundowns = triggersContext.Rundowns.find(
 							{
 								playlistId: rundownPlaylistId,
 							},
@@ -659,9 +653,9 @@ export function compileAdLibFilter(
 					rundownRankMap.set(id, index)
 				})
 
-				const segmentRanks = memoizedIsolatedAutorun(
+				const segmentRanks = triggersContext.memoizedIsolatedAutorun(
 					() =>
-						Segments.find(
+						triggersContext.Segments.find(
 							{
 								rundownId: { $in: Array.from(rundownRankMap.keys()) },
 							},
@@ -678,9 +672,9 @@ export function compileAdLibFilter(
 					segmentRankMap.set(segment._id, segment._rank)
 				})
 
-				const partRanks = memoizedIsolatedAutorun(() => {
+				const partRanks = triggersContext.memoizedIsolatedAutorun(() => {
 					if (!partFilter) {
-						return Parts.find(
+						return triggersContext.Parts.find(
 							{
 								rundownId: { $in: Array.from(rundownRankMap.keys()) },
 							},
@@ -694,7 +688,7 @@ export function compileAdLibFilter(
 							}
 						).fetch() as Pick<DBPart, '_id' | '_rank' | 'segmentId' | 'rundownId'>[]
 					} else {
-						return Parts.find(
+						return triggersContext.Parts.find(
 							{ _id: { $in: partFilter } },
 							{
 								fields: {
@@ -760,43 +754,3 @@ export function compileAdLibFilter(
 		return resultingAdLibs.filter(Boolean)
 	}
 }
-
-export function rundownPlaylistFilter(
-	studioId: StudioId,
-	filterChain: IRundownPlaylistFilterLink[]
-): DBRundownPlaylist | undefined {
-	const selector: MongoQuery<DBRundownPlaylist> = {
-		$and: [
-			{
-				studioId,
-			},
-		],
-	}
-
-	filterChain.forEach((link) => {
-		switch (link.field) {
-			case 'activationId':
-				selector['activationId'] = {
-					$exists: link.value,
-				}
-				break
-			case 'name':
-				selector['name'] = {
-					$regex: link.value,
-				}
-				break
-			case 'studioId':
-				selector['$and']?.push({
-					studioId: {
-						$regex: link.value as any,
-					},
-				})
-				break
-			default:
-				assertNever(link)
-				break
-		}
-	})
-
-	return RundownPlaylists.findOne(selector)
-}
diff --git a/packages/meteor-lib/src/triggers/reactive-var.ts b/packages/meteor-lib/src/triggers/reactive-var.ts
new file mode 100644
index 0000000000..f9d7d58758
--- /dev/null
+++ b/packages/meteor-lib/src/triggers/reactive-var.ts
@@ -0,0 +1,25 @@
+// Copied from Meteor
+export interface ReactiveVar<T> {
+	/**
+	 * Returns the current value of the ReactiveVar, establishing a reactive dependency.
+	 */
+	get(): T
+	/**
+	 * Sets the current value of the ReactiveVar, invalidating the Computations that called `get` if `newValue` is different from the old value.
+	 */
+	set(newValue: T): void
+}
+
+/**
+ * This just looks like a ReactiveVar, but is not reactive.
+ * It's used to use the same interface/typings, but when code is run on both client and server side.
+ * */
+export class DummyReactiveVar<T> implements ReactiveVar<T> {
+	constructor(private value: T) {}
+	public get(): T {
+		return this.value
+	}
+	public set(newValue: T): void {
+		this.value = newValue
+	}
+}
diff --git a/meteor/lib/api/triggers/triggerTypeSelectors.ts b/packages/meteor-lib/src/triggers/triggerTypeSelectors.ts
similarity index 100%
rename from meteor/lib/api/triggers/triggerTypeSelectors.ts
rename to packages/meteor-lib/src/triggers/triggerTypeSelectors.ts
diff --git a/packages/meteor-lib/src/triggers/triggersContext.ts b/packages/meteor-lib/src/triggers/triggersContext.ts
new file mode 100644
index 0000000000..4c94b4ac52
--- /dev/null
+++ b/packages/meteor-lib/src/triggers/triggersContext.ts
@@ -0,0 +1,59 @@
+import { UserAction } from '../userAction'
+import { IMeteorCall } from '../api/methods'
+import { Time } from '@sofie-automation/shared-lib/dist/lib/lib'
+import { ClientAPI } from '../api/client'
+import { MongoReadOnlyCollection } from '../collections/lib'
+import { AdLibAction } from '@sofie-automation/corelib/dist/dataModel/AdlibAction'
+import { AdLibPiece } from '@sofie-automation/corelib/dist/dataModel/AdLibPiece'
+import { DBPart } from '@sofie-automation/corelib/dist/dataModel/Part'
+import { RundownBaselineAdLibAction } from '@sofie-automation/corelib/dist/dataModel/RundownBaselineAdLibAction'
+import { RundownBaselineAdLibItem } from '@sofie-automation/corelib/dist/dataModel/RundownBaselineAdLibPiece'
+import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
+import { DBRundown } from '@sofie-automation/corelib/dist/dataModel/Rundown'
+import { DBSegment } from '@sofie-automation/corelib/dist/dataModel/Segment'
+import { LoggerInstanceFixed } from '@sofie-automation/corelib/dist/logging'
+import { IBaseFilterLink } from '@sofie-automation/blueprints-integration'
+import { StudioId } from '@sofie-automation/corelib/dist/dataModel/Ids'
+import { ReactivePlaylistActionContext } from './actionFactory'
+import { TFunction } from 'i18next'
+
+export interface TriggersContext {
+	readonly MeteorCall: IMeteorCall
+
+	readonly logger: LoggerInstanceFixed
+
+	readonly isClient: boolean
+
+	readonly AdLibActions: MongoReadOnlyCollection<AdLibAction>
+	readonly AdLibPieces: MongoReadOnlyCollection<AdLibPiece>
+	readonly Parts: MongoReadOnlyCollection<DBPart>
+	readonly RundownBaselineAdLibActions: MongoReadOnlyCollection<RundownBaselineAdLibAction>
+	readonly RundownBaselineAdLibPieces: MongoReadOnlyCollection<RundownBaselineAdLibItem>
+	readonly RundownPlaylists: MongoReadOnlyCollection<DBRundownPlaylist>
+	readonly Rundowns: MongoReadOnlyCollection<DBRundown>
+	readonly Segments: MongoReadOnlyCollection<DBSegment>
+
+	hashSingleUseToken(token: string): string
+
+	doUserAction<Result>(
+		_t: TFunction,
+		userEvent: string,
+		_action: UserAction,
+		fcn: (event: string, timeStamp: Time) => Promise<ClientAPI.ClientResponse<Result>>,
+		callback?: (err: any, res?: Result) => void | boolean,
+		_okMessage?: string
+	): void
+
+	nonreactiveTracker<T>(func: () => T): T
+
+	memoizedIsolatedAutorun<T extends (...args: any) => any>(
+		fnc: T,
+		functionName: string,
+		...params: Parameters<T>
+	): ReturnType<T>
+
+	createContextForRundownPlaylistChain(
+		_studioId: StudioId,
+		_filterChain: IBaseFilterLink[]
+	): ReactivePlaylistActionContext | undefined
+}
diff --git a/meteor/lib/tv2/AHKkeyboardMap.ts b/packages/meteor-lib/src/tv2/AHKkeyboardMap.ts
similarity index 100%
rename from meteor/lib/tv2/AHKkeyboardMap.ts
rename to packages/meteor-lib/src/tv2/AHKkeyboardMap.ts
diff --git a/packages/meteor-lib/src/uiTypes/Adlib.ts b/packages/meteor-lib/src/uiTypes/Adlib.ts
new file mode 100644
index 0000000000..aa5c144e1c
--- /dev/null
+++ b/packages/meteor-lib/src/uiTypes/Adlib.ts
@@ -0,0 +1,27 @@
+import type { IOutputLayer, ISourceLayer } from '@sofie-automation/shared-lib/dist/core/model/ShowStyle'
+import type { AdLibPiece } from '@sofie-automation/corelib/dist/dataModel/AdLibPiece'
+import type { SegmentId } from '@sofie-automation/corelib/dist/dataModel/Ids'
+import type { AdLibAction } from '@sofie-automation/corelib/dist/dataModel/AdlibAction'
+import type { RundownBaselineAdLibAction } from '@sofie-automation/corelib/dist/dataModel/RundownBaselineAdLibAction'
+
+export interface AdLibPieceUi extends Omit<AdLibPiece, 'timelineObjectsString'> {
+	hotkey?: string
+	sourceLayer?: ISourceLayer
+	outputLayer?: IOutputLayer
+	isGlobal?: boolean
+	isHidden?: boolean
+	isSticky?: boolean
+	isAction?: boolean
+	isClearSourceLayer?: boolean
+	disabled?: boolean
+	adlibAction?: AdLibAction | RundownBaselineAdLibAction
+	segmentId?: SegmentId
+}
+
+export interface IAdLibListItem extends AdLibPieceUi {
+	sourceLayer?: ISourceLayer
+	outputLayer?: IOutputLayer
+	isHidden?: boolean
+	invalid?: boolean
+	floated?: boolean
+}
diff --git a/packages/meteor-lib/src/uiTypes/Bucket.ts b/packages/meteor-lib/src/uiTypes/Bucket.ts
new file mode 100644
index 0000000000..f2d66b150f
--- /dev/null
+++ b/packages/meteor-lib/src/uiTypes/Bucket.ts
@@ -0,0 +1,35 @@
+import type { PieceStatusCode } from '@sofie-automation/corelib/dist/dataModel/Piece'
+import type { BucketAdLib } from '@sofie-automation/corelib/dist/dataModel/BucketAdLibPiece'
+import type { AdLibPiece } from '@sofie-automation/corelib/dist/dataModel/AdLibPiece'
+import type { BucketAdLibAction } from '@sofie-automation/corelib/dist/dataModel/BucketAdLibAction'
+import type { IOutputLayer, ISourceLayer } from '@sofie-automation/shared-lib/dist/core/model/ShowStyle'
+import type {
+	BucketId,
+	ShowStyleBaseId,
+	ShowStyleVariantId,
+	StudioId,
+} from '@sofie-automation/corelib/dist/dataModel/Ids'
+
+export interface BucketAdLibUi extends BucketAdLib {
+	sourceLayer?: ISourceLayer
+	outputLayer?: IOutputLayer
+	status: PieceStatusCode
+}
+
+export interface BucketAdLibActionUi extends Omit<AdLibPiece, 'timelineObjectsString'> {
+	bucketId: BucketId
+	sourceLayer?: ISourceLayer
+	outputLayer?: IOutputLayer
+	isGlobal?: boolean
+	isHidden?: boolean
+	isSticky?: boolean
+	isAction: true
+	isClearSourceLayer?: boolean
+	adlibAction: BucketAdLibAction
+	message?: string | null
+	showStyleBaseId: ShowStyleBaseId
+	showStyleVariantId: ShowStyleVariantId | null
+	studioId: StudioId
+}
+
+export type BucketAdLibItem = BucketAdLibUi | BucketAdLibActionUi
diff --git a/packages/meteor-lib/src/uiTypes/OutputLayer.ts b/packages/meteor-lib/src/uiTypes/OutputLayer.ts
new file mode 100644
index 0000000000..a00540526b
--- /dev/null
+++ b/packages/meteor-lib/src/uiTypes/OutputLayer.ts
@@ -0,0 +1,9 @@
+import type { IOutputLayer } from '@sofie-automation/shared-lib/dist/core/model/ShowStyle'
+import type { ISourceLayerExtended } from './SourceLayer'
+
+export interface IOutputLayerExtended extends IOutputLayer {
+	/** Is this output layer used in this segment */
+	used: boolean
+	/** Source layers that will be used by this output layer */
+	sourceLayers: Array<ISourceLayerExtended>
+}
diff --git a/packages/meteor-lib/src/uiTypes/Piece.ts b/packages/meteor-lib/src/uiTypes/Piece.ts
new file mode 100644
index 0000000000..a25376a5e7
--- /dev/null
+++ b/packages/meteor-lib/src/uiTypes/Piece.ts
@@ -0,0 +1,27 @@
+import type { PieceInstanceWithTimings } from '@sofie-automation/corelib/dist/playout/processAndPrune'
+import type { IOutputLayerExtended } from './OutputLayer'
+import type { ISourceLayerExtended } from './SourceLayer'
+
+export interface PieceExtended {
+	instance: PieceInstanceWithTimings
+
+	/** Source layer that this piece belongs to */
+	sourceLayer?: ISourceLayerExtended
+	/** Output layer that this part uses */
+	outputLayer?: IOutputLayerExtended
+	/** Position in timeline, relative to the beginning of the Part */
+	renderedInPoint: number | null
+	/** Duration in timeline */
+	renderedDuration: number | null
+	/** If set, the item was cropped in runtime by another item following it */
+	cropped?: boolean
+	/** Maximum width of a label so as not to appear underneath the following item */
+	maxLabelWidth?: number
+	/** If this piece has a "buddy" piece in the preceeding part, then it's not neccessary to display it's left label */
+	hasOriginInPreceedingPart?: boolean
+}
+
+export interface PieceUi extends PieceExtended {
+	/** This item has already been linked to the parent item of the spanning item group */
+	linked?: boolean
+}
diff --git a/packages/meteor-lib/src/uiTypes/ShelfTabs.ts b/packages/meteor-lib/src/uiTypes/ShelfTabs.ts
new file mode 100644
index 0000000000..4af600da40
--- /dev/null
+++ b/packages/meteor-lib/src/uiTypes/ShelfTabs.ts
@@ -0,0 +1,6 @@
+export enum ShelfTabs {
+	ADLIB = 'adlib',
+	ADLIB_LAYOUT_FILTER = 'adlib_layout_filter',
+	GLOBAL_ADLIB = 'global_adlib',
+	SYSTEM_HOTKEYS = 'system_hotkeys',
+}
diff --git a/packages/meteor-lib/src/uiTypes/SourceLayer.ts b/packages/meteor-lib/src/uiTypes/SourceLayer.ts
new file mode 100644
index 0000000000..6f509d7584
--- /dev/null
+++ b/packages/meteor-lib/src/uiTypes/SourceLayer.ts
@@ -0,0 +1,8 @@
+import type { ISourceLayer } from '@sofie-automation/shared-lib/dist/core/model/ShowStyle'
+import type { PieceExtended } from './Piece'
+
+export interface ISourceLayerExtended extends ISourceLayer {
+	/** Pieces present on this source layer */
+	pieces: Array<PieceExtended>
+	followingItems: Array<PieceExtended>
+}
diff --git a/meteor/lib/userAction.ts b/packages/meteor-lib/src/userAction.ts
similarity index 96%
rename from meteor/lib/userAction.ts
rename to packages/meteor-lib/src/userAction.ts
index 7b24ec3df9..b9eb3dc262 100644
--- a/meteor/lib/userAction.ts
+++ b/packages/meteor-lib/src/userAction.ts
@@ -51,4 +51,6 @@ export enum UserAction {
 	ACTIVATE_ADLIB_TESTING,
 	QUEUE_NEXT_SEGMENT,
 	CREATE_ADLIB_TESTING_RUNDOWN,
+	SET_QUICK_LOOP_START,
+	SET_QUICK_LOOP_END,
 }
diff --git a/packages/meteor-lib/tsconfig.build.json b/packages/meteor-lib/tsconfig.build.json
new file mode 100755
index 0000000000..761f83db92
--- /dev/null
+++ b/packages/meteor-lib/tsconfig.build.json
@@ -0,0 +1,16 @@
+{
+	"extends": "@sofie-automation/code-standard-preset/ts/tsconfig.lib",
+	"include": ["src/**/*.ts"],
+	"exclude": ["node_modules/**", "src/**/*spec.ts", "src/**/__tests__/*", "src/**/__mocks__/*"],
+	"compilerOptions": {
+		"target": "es2019",
+		"outDir": "./dist",
+		"baseUrl": "./",
+		"paths": {
+			"*": ["./node_modules/*"],
+			"@sofie-automation/corelib": ["./src/index.ts"]
+		},
+		"resolveJsonModule": true,
+		"types": ["node"]
+	}
+}
diff --git a/packages/meteor-lib/tsconfig.json b/packages/meteor-lib/tsconfig.json
new file mode 100755
index 0000000000..39cf9672dc
--- /dev/null
+++ b/packages/meteor-lib/tsconfig.json
@@ -0,0 +1,7 @@
+{
+	"extends": "./tsconfig.build.json",
+	"exclude": ["node_modules/**"],
+	"compilerOptions": {
+		"types": ["jest", "node"]
+	}
+}
diff --git a/packages/mos-gateway/CHANGELOG.md b/packages/mos-gateway/CHANGELOG.md
index dc990ed81e..097ebaf45e 100644
--- a/packages/mos-gateway/CHANGELOG.md
+++ b/packages/mos-gateway/CHANGELOG.md
@@ -3,98 +3,193 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## [1.50.2](https://github.com/nrkno/tv-automation-server-core/compare/v1.49.6...v1.50.2) (2024-05-15)
+## [1.51.1-2](https://github.com/nrkno/sofie-core/compare/v1.51.1-1...v1.51.1-2) (2024-10-24)
 
+**Note:** Version bump only for package mos-gateway
 
 
-## [1.50.1](https://github.com/nrkno/tv-automation-server-core/compare/v1.49.5-0...v1.50.1) (2024-03-11)
 
 
-### Bug Fixes
 
-* strip unused node dependencies from docker images ([#1159](https://github.com/nrkno/tv-automation-server-core/issues/1159)) ([6d86132](https://github.com/nrkno/tv-automation-server-core/commit/6d86132c1bc36219f04f00d5360940dfcbd6df7c))
+## [1.51.1-2](https://github.com/nrkno/sofie-core/compare/v1.51.1-1...v1.51.1-2) (2024-10-24)
 
+**Note:** Version bump only for package mos-gateway
 
 
-## [1.50.1-0](https://github.com/nrkno/tv-automation-server-core/compare/v1.50.0...v1.50.1-0) (2024-03-05)
 
 
 
-# [1.50.0](https://github.com/nrkno/tv-automation-server-core/compare/v1.49.4...v1.50.0) (2024-02-23)
+## [1.51.1-1](https://github.com/nrkno/sofie-core/compare/v1.51.1-0...v1.51.1-1) (2024-10-18)
 
+**Note:** Version bump only for package mos-gateway
 
 
-# [1.50.0-in-testing.5](https://github.com/nrkno/tv-automation-server-core/compare/v1.50.0-in-testing.4...v1.50.0-in-testing.5) (2023-08-25)
 
 
 
-# [1.50.0-in-testing.4](https://github.com/nrkno/tv-automation-server-core/compare/v1.49.0-in-testing.7...v1.50.0-in-testing.4) (2023-08-23)
+## [1.51.1-0](https://github.com/nrkno/sofie-core/compare/v1.51.0...v1.51.1-0) (2024-10-18)
 
+**Note:** Version bump only for package mos-gateway
 
 
-# [1.50.0-in-testing.2](https://github.com/nrkno/tv-automation-server-core/compare/v1.50.0-in-testing.1...v1.50.0-in-testing.2) (2023-07-17)
 
 
+
+## [1.51.1-0](https://github.com/nrkno/sofie-core/compare/v1.51.0...v1.51.1-0) (2024-10-18)
+
+**Note:** Version bump only for package mos-gateway
+
+
+
+
+
+# [1.51.0](https://github.com/nrkno/sofie-core/compare/v1.51.0-in-testing.3...v1.51.0) (2024-10-07)
+
+**Note:** Version bump only for package mos-gateway
+
+
+
+
+
+# [1.51.0](https://github.com/nrkno/sofie-core/compare/v1.51.0-in-testing.3...v1.51.0) (2024-10-07)
+
+**Note:** Version bump only for package mos-gateway
+
+
+
+
+
+# [1.51.0-in-testing.3](https://github.com/nrkno/sofie-core/compare/v1.51.0-in-testing.2...v1.51.0-in-testing.3) (2024-09-25)
+
+**Note:** Version bump only for package mos-gateway
+
+
+
+
+
+# [1.51.0-in-testing.2](https://github.com/nrkno/sofie-core/compare/v1.51.0-in-testing.1...v1.51.0-in-testing.2) (2024-09-24)
+
+**Note:** Version bump only for package mos-gateway
+
+
+
+
+
+# [1.51.0-in-testing.1](https://github.com/nrkno/sofie-core/compare/v1.51.0-in-testing.0...v1.51.0-in-testing.1) (2024-09-06)
+
+
+# [1.51.0-in-testing.1](https://github.com/nrkno/sofie-core/compare/v1.51.0-in-testing.0...v1.51.0-in-testing.1) (2024-09-06)
+
+
+**Note:** Version bump only for package mos-gateway
+
+# [1.51.0-in-testing.0](https://github.com/nrkno/sofie-core/compare/v1.50.4...v1.51.0-in-testing.0) (2024-08-19)
+
 ### Features
 
-* expose MOS ports in mos-gateway settings ([#917](https://github.com/nrkno/tv-automation-server-core/issues/917)) ([4cb1649](https://github.com/nrkno/tv-automation-server-core/commit/4cb16493107c07be9c8a2a804f6bcb7e54072de2))
-* move gateway settings onto Studio SOFIE-1330 ([#907](https://github.com/nrkno/tv-automation-server-core/issues/907)) ([523c061](https://github.com/nrkno/tv-automation-server-core/commit/523c061c51296e21814deeeabbe9aafca21cd5a6))
-* peripheral device tidying ([#906](https://github.com/nrkno/tv-automation-server-core/issues/906)) ([0795ae5](https://github.com/nrkno/tv-automation-server-core/commit/0795ae5c0517114a34e350d5a5afbf7a731e9794))
+- Ensure peripheralDevice subdevice removal when requested ([#1227](https://github.com/nrkno/sofie-core/issues/1227)) ([d5cafe8](https://github.com/nrkno/sofie-core/commit/d5cafe8db5e453f87f8d46262f23e118b580d4d5))
 
+## [1.50.5](https://github.com/nrkno/tv-automation-server-core/compare/v1.50.4...v1.50.5) (2024-09-19)
 
+**Note:** Version bump only for package mos-gateway
 
+## [1.50.4](https://github.com/nrkno/tv-automation-server-core/compare/v1.50.3...v1.50.4) (2024-08-08)
 
+**Note:** Version bump only for package mos-gateway
 
-## [1.50.1](https://github.com/nrkno/tv-automation-server-core/compare/v1.50.1-0...v1.50.1) (2024-03-11)
 
+## [1.50.5-LSG-updates](https://github.com/nrkno/sofie-core/compare/v1.50.4-LSG-updates...v1.50.5-LSG-updates) (2024-08-08)
+
+## [1.50.4-LSG-updates](https://github.com/nrkno/sofie-core/compare/v1.50.3-LSG-updates...v1.50.4-LSG-updates) (2024-07-30)
 
 ### Bug Fixes
 
-* strip unused node dependencies from docker images ([#1159](https://github.com/nrkno/tv-automation-server-core/issues/1159)) ([6d86132](https://github.com/nrkno/tv-automation-server-core/commit/6d86132c1bc36219f04f00d5360940dfcbd6df7c))
+- create new mosTimes correctly ([e8cec88](https://github.com/nrkno/sofie-core/commit/e8cec88f8b9d8c298f1b2ddec8d45f6f80fea9bf))
+- improve error logging: use stringifyError() ([8da63de](https://github.com/nrkno/sofie-core/commit/8da63dec44915439ea436eee9697f3774241537b))
 
+### Features
 
+- backport of release51 live-status-gateway onto release50 ([0a87a95](https://github.com/nrkno/sofie-core/commit/0a87a9519ca1f344429e9b4d47a44c1a9acddff2))
+- refactor server-core-integration subscription handling to reduce duplication ([8eaedd2](https://github.com/nrkno/sofie-core/commit/8eaedd22e8efb9750f00ff472301c6b3f2d0f0af))
+- typed publications in gateways/peripheraldevices SOFIE-1183 ([#1056](https://github.com/nrkno/sofie-core/issues/1056)) ([0c3c1bf](https://github.com/nrkno/sofie-core/commit/0c3c1bfd2bb779034976dc34e49aa6e664ea874b))
+- update meteor to 2.12 SOFIE-2368 ([#931](https://github.com/nrkno/sofie-core/issues/931)) ([d7dfb71](https://github.com/nrkno/sofie-core/commit/d7dfb71d19405267cab5e2abc39794a80acb30b1))
 
+# [1.51.0-in-testing.0](https://github.com/nrkno/sofie-core/compare/v1.50.4...v1.51.0-in-testing.0) (2024-08-19)
 
+### Features
 
-## [1.50.1-0](https://github.com/nrkno/tv-automation-server-core/compare/v1.50.0...v1.50.1-0) (2024-03-05)
+- Ensure peripheralDevice subdevice removal when requested ([#1227](https://github.com/nrkno/sofie-core/issues/1227)) ([d5cafe8](https://github.com/nrkno/sofie-core/commit/d5cafe8db5e453f87f8d46262f23e118b580d4d5))
+
+## [1.50.5-LSG-updates](https://github.com/nrkno/sofie-core/compare/v1.50.4-LSG-updates...v1.50.5-LSG-updates) (2024-08-08)
+
+## [1.50.4-LSG-updates](https://github.com/nrkno/sofie-core/compare/v1.50.3-LSG-updates...v1.50.4-LSG-updates) (2024-07-30)
+
+### Bug Fixes
+
+- create new mosTimes correctly ([e8cec88](https://github.com/nrkno/sofie-core/commit/e8cec88f8b9d8c298f1b2ddec8d45f6f80fea9bf))
+- improve error logging: use stringifyError() ([8da63de](https://github.com/nrkno/sofie-core/commit/8da63dec44915439ea436eee9697f3774241537b))
+
+### Features
+
+- backport of release51 live-status-gateway onto release50 ([0a87a95](https://github.com/nrkno/sofie-core/commit/0a87a9519ca1f344429e9b4d47a44c1a9acddff2))
+- refactor server-core-integration subscription handling to reduce duplication ([8eaedd2](https://github.com/nrkno/sofie-core/commit/8eaedd22e8efb9750f00ff472301c6b3f2d0f0af))
+- typed publications in gateways/peripheraldevices SOFIE-1183 ([#1056](https://github.com/nrkno/sofie-core/issues/1056)) ([0c3c1bf](https://github.com/nrkno/sofie-core/commit/0c3c1bfd2bb779034976dc34e49aa6e664ea874b))
+- update meteor to 2.12 SOFIE-2368 ([#931](https://github.com/nrkno/sofie-core/issues/931)) ([d7dfb71](https://github.com/nrkno/sofie-core/commit/d7dfb71d19405267cab5e2abc39794a80acb30b1))
+
+## [1.50.5](https://github.com/nrkno/tv-automation-server-core/compare/v1.50.4-LSG-updates...v1.50.5) (2024-08-08)
 
 **Note:** Version bump only for package mos-gateway
 
+## [1.50.4](https://github.com/nrkno/tv-automation-server-core/compare/v1.50.3-LSG-updates...v1.50.4) (2024-07-30)
 
+### Bug Fixes
 
+- improve error logging: use stringifyError() ([8da63de](https://github.com/nrkno/tv-automation-server-core/commit/8da63dec44915439ea436eee9697f3774241537b))
 
+## [1.50.3](https://github.com/nrkno/tv-automation-server-core/compare/v1.50.2...v1.50.3) (2024-06-24)
 
-# [1.50.0](https://github.com/nrkno/tv-automation-server-core/compare/v1.49.4...v1.50.0) (2024-02-23)
+**Note:** Version bump only for package mos-gateway
 
+## [1.50.2](https://github.com/nrkno/tv-automation-server-core/compare/v1.49.6...v1.50.2) (2024-05-15)
 
+## [1.50.1](https://github.com/nrkno/tv-automation-server-core/compare/v1.49.5-0...v1.50.1) (2024-03-11)
 
-# [1.50.0-in-testing.5](https://github.com/nrkno/tv-automation-server-core/compare/v1.50.0-in-testing.4...v1.50.0-in-testing.5) (2023-08-25)
+### Bug Fixes
 
+- strip unused node dependencies from docker images ([#1159](https://github.com/nrkno/tv-automation-server-core/issues/1159)) ([6d86132](https://github.com/nrkno/tv-automation-server-core/commit/6d86132c1bc36219f04f00d5360940dfcbd6df7c))
 
+## [1.50.1-0](https://github.com/nrkno/tv-automation-server-core/compare/v1.50.0...v1.50.1-0) (2024-03-05)
 
-# [1.50.0-in-testing.4](https://github.com/nrkno/tv-automation-server-core/compare/v1.49.0-in-testing.7...v1.50.0-in-testing.4) (2023-08-23)
+# [1.50.0](https://github.com/nrkno/tv-automation-server-core/compare/v1.49.4...v1.50.0) (2024-02-23)
 
+# [1.50.0-in-testing.5](https://github.com/nrkno/tv-automation-server-core/compare/v1.50.0-in-testing.4...v1.50.0-in-testing.5) (2023-08-25)
 
+# [1.50.0-in-testing.4](https://github.com/nrkno/tv-automation-server-core/compare/v1.49.0-in-testing.7...v1.50.0-in-testing.4) (2023-08-23)
 
 # [1.50.0-in-testing.2](https://github.com/nrkno/tv-automation-server-core/compare/v1.50.0-in-testing.1...v1.50.0-in-testing.2) (2023-07-17)
 
-
 ### Features
 
-* expose MOS ports in mos-gateway settings ([#917](https://github.com/nrkno/tv-automation-server-core/issues/917)) ([4cb1649](https://github.com/nrkno/tv-automation-server-core/commit/4cb16493107c07be9c8a2a804f6bcb7e54072de2))
-* move gateway settings onto Studio SOFIE-1330 ([#907](https://github.com/nrkno/tv-automation-server-core/issues/907)) ([523c061](https://github.com/nrkno/tv-automation-server-core/commit/523c061c51296e21814deeeabbe9aafca21cd5a6))
-* peripheral device tidying ([#906](https://github.com/nrkno/tv-automation-server-core/issues/906)) ([0795ae5](https://github.com/nrkno/tv-automation-server-core/commit/0795ae5c0517114a34e350d5a5afbf7a731e9794))
+- expose MOS ports in mos-gateway settings ([#917](https://github.com/nrkno/tv-automation-server-core/issues/917)) ([4cb1649](https://github.com/nrkno/tv-automation-server-core/commit/4cb16493107c07be9c8a2a804f6bcb7e54072de2))
+- move gateway settings onto Studio SOFIE-1330 ([#907](https://github.com/nrkno/tv-automation-server-core/issues/907)) ([523c061](https://github.com/nrkno/tv-automation-server-core/commit/523c061c51296e21814deeeabbe9aafca21cd5a6))
+- peripheral device tidying ([#906](https://github.com/nrkno/tv-automation-server-core/issues/906)) ([0795ae5](https://github.com/nrkno/tv-automation-server-core/commit/0795ae5c0517114a34e350d5a5afbf7a731e9794))
 
+## [1.50.1](https://github.com/nrkno/tv-automation-server-core/compare/v1.50.1-0...v1.50.1) (2024-03-11)
+
+### Bug Fixes
 
+- strip unused node dependencies from docker images ([#1159](https://github.com/nrkno/tv-automation-server-core/issues/1159)) ([6d86132](https://github.com/nrkno/tv-automation-server-core/commit/6d86132c1bc36219f04f00d5360940dfcbd6df7c))
 
+## [1.50.1-0](https://github.com/nrkno/tv-automation-server-core/compare/v1.50.0...v1.50.1-0) (2024-03-05)
 
+**Note:** Version bump only for package mos-gateway
+
+# [1.50.0](https://github.com/nrkno/tv-automation-server-core/compare/v1.49.4...v1.50.0) (2024-02-23)
 
 # [1.50.0-in-testing.5](https://github.com/nrkno/tv-automation-server-core/compare/v1.50.0-in-testing.4...v1.50.0-in-testing.5) (2023-08-25)
 
 # [1.50.0-in-testing.4](https://github.com/nrkno/tv-automation-server-core/compare/v1.49.0-in-testing.7...v1.50.0-in-testing.4) (2023-08-23)
 
-# [1.50.0-in-testing.3](https://github.com/nrkno/tv-automation-server-core/compare/v1.49.0-in-testing.5...v1.50.0-in-testing.3) (2023-08-17)
-
 # [1.50.0-in-testing.2](https://github.com/nrkno/tv-automation-server-core/compare/v1.50.0-in-testing.1...v1.50.0-in-testing.2) (2023-07-17)
 
 ### Features
@@ -103,6 +198,10 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 - move gateway settings onto Studio SOFIE-1330 ([#907](https://github.com/nrkno/tv-automation-server-core/issues/907)) ([523c061](https://github.com/nrkno/tv-automation-server-core/commit/523c061c51296e21814deeeabbe9aafca21cd5a6))
 - peripheral device tidying ([#906](https://github.com/nrkno/tv-automation-server-core/issues/906)) ([0795ae5](https://github.com/nrkno/tv-automation-server-core/commit/0795ae5c0517114a34e350d5a5afbf7a731e9794))
 
+# [1.50.0-in-testing.5](https://github.com/nrkno/tv-automation-server-core/compare/v1.50.0-in-testing.4...v1.50.0-in-testing.5) (2023-08-25)
+
+# [1.50.0-in-testing.4](https://github.com/nrkno/tv-automation-server-core/compare/v1.49.0-in-testing.7...v1.50.0-in-testing.4) (2023-08-23)
+
 # [1.50.0-in-testing.3](https://github.com/nrkno/tv-automation-server-core/compare/v1.49.0-in-testing.5...v1.50.0-in-testing.3) (2023-08-17)
 
 # [1.50.0-in-testing.2](https://github.com/nrkno/tv-automation-server-core/compare/v1.50.0-in-testing.1...v1.50.0-in-testing.2) (2023-07-17)
@@ -113,23 +212,26 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 - move gateway settings onto Studio SOFIE-1330 ([#907](https://github.com/nrkno/tv-automation-server-core/issues/907)) ([523c061](https://github.com/nrkno/tv-automation-server-core/commit/523c061c51296e21814deeeabbe9aafca21cd5a6))
 - peripheral device tidying ([#906](https://github.com/nrkno/tv-automation-server-core/issues/906)) ([0795ae5](https://github.com/nrkno/tv-automation-server-core/commit/0795ae5c0517114a34e350d5a5afbf7a731e9794))
 
+# [1.50.0-in-testing.3](https://github.com/nrkno/tv-automation-server-core/compare/v1.49.0-in-testing.5...v1.50.0-in-testing.3) (2023-08-17)
+
 # [1.50.0-in-testing.2](https://github.com/nrkno/tv-automation-server-core/compare/v1.50.0-in-testing.1...v1.50.0-in-testing.2) (2023-07-17)
-## [1.49.3](https://github.com/nrkno/tv-automation-server-core/compare/v1.49.2...v1.49.3) (2023-12-21)
 
-**Note:** Version bump only for package mos-gateway
+### Features
 
+- expose MOS ports in mos-gateway settings ([#917](https://github.com/nrkno/tv-automation-server-core/issues/917)) ([4cb1649](https://github.com/nrkno/tv-automation-server-core/commit/4cb16493107c07be9c8a2a804f6bcb7e54072de2))
+- move gateway settings onto Studio SOFIE-1330 ([#907](https://github.com/nrkno/tv-automation-server-core/issues/907)) ([523c061](https://github.com/nrkno/tv-automation-server-core/commit/523c061c51296e21814deeeabbe9aafca21cd5a6))
+- peripheral device tidying ([#906](https://github.com/nrkno/tv-automation-server-core/issues/906)) ([0795ae5](https://github.com/nrkno/tv-automation-server-core/commit/0795ae5c0517114a34e350d5a5afbf7a731e9794))
 
+# [1.50.0-in-testing.2](https://github.com/nrkno/tv-automation-server-core/compare/v1.50.0-in-testing.1...v1.50.0-in-testing.2) (2023-07-17)
 
+## [1.49.3](https://github.com/nrkno/tv-automation-server-core/compare/v1.49.2...v1.49.3) (2023-12-21)
 
+**Note:** Version bump only for package mos-gateway
 
 ## [1.49.2](https://github.com/nrkno/tv-automation-server-core/compare/v1.49.1...v1.49.2) (2023-11-29)
 
 **Note:** Version bump only for package mos-gateway
 
-
-
-
-
 ## [1.49.1](https://github.com/nrkno/tv-automation-server-core/compare/v1.49.0...v1.49.1) (2023-10-20)
 
 **Note:** Version bump only for package mos-gateway
diff --git a/packages/mos-gateway/package.json b/packages/mos-gateway/package.json
index ebc8f1b64b..c9e13e2fa4 100644
--- a/packages/mos-gateway/package.json
+++ b/packages/mos-gateway/package.json
@@ -1,18 +1,18 @@
 {
 	"name": "mos-gateway",
-	"version": "1.51.0-in-development",
+	"version": "1.52.0-in-development",
 	"private": true,
 	"description": "MOS-Gateway for the Sofie project",
 	"license": "MIT",
 	"repository": {
 		"type": "git",
-		"url": "git+https://github.com/nrkno/tv-automation-server-core.git",
+		"url": "git+https://github.com/nrkno/sofie-core.git",
 		"directory": "packages/mos-gateway"
 	},
 	"bugs": {
-		"url": "https://github.com/nrkno/tv-automation-server-core/issues"
+		"url": "https://github.com/nrkno/sofie-core/issues"
 	},
-	"homepage": "https://github.com/nrkno/tv-automation-server-core/blob/master/packages/mos-gateway#readme",
+	"homepage": "https://github.com/nrkno/sofie-core/blob/master/packages/mos-gateway#readme",
 	"author": {
 		"name": "Johan Nyman",
 		"email": "johan@superfly.tv",
@@ -65,9 +65,9 @@
 		"production"
 	],
 	"dependencies": {
-		"@mos-connection/connector": "4.1.1-nightly-master-20240430-072032-ffb8bf6.0",
-		"@sofie-automation/server-core-integration": "1.51.0-in-development",
-		"@sofie-automation/shared-lib": "1.51.0-in-development",
+		"@mos-connection/connector": "v4.2.0-alpha.1",
+		"@sofie-automation/server-core-integration": "1.52.0-in-development",
+		"@sofie-automation/shared-lib": "1.52.0-in-development",
 		"tslib": "^2.6.2",
 		"type-fest": "^3.13.1",
 		"underscore": "^1.13.6",
diff --git a/packages/mos-gateway/src/CoreMosDeviceHandler.ts b/packages/mos-gateway/src/CoreMosDeviceHandler.ts
index 6063571da5..3101470c6f 100644
--- a/packages/mos-gateway/src/CoreMosDeviceHandler.ts
+++ b/packages/mos-gateway/src/CoreMosDeviceHandler.ts
@@ -27,6 +27,7 @@ import {
 	MosTypes,
 	IMOSString128,
 	stringifyMosObject,
+	stringifyMosType,
 } from '@mos-connection/connector'
 import * as _ from 'underscore'
 import { MosHandler } from './mosHandler'
@@ -285,9 +286,13 @@ export class CoreMosDeviceHandler {
 				(change) => change.storyID === this.mosTypes.mosString128.stringify(story.ID)
 			)
 			if (pendingChange) {
-				const pendingChangeItem = story.Body.find(
-					(item) => item.Type === 'storyItem' && pendingChange.itemID === item.Content.ID.toString()
-				)
+				const pendingChangeItem = story.Body.find((item) => {
+					const content = item.Content && Array.isArray(item.Content) ? item.Content[0] : item.Content
+					const contentId =
+						typeof content === 'object' && content.ID ? stringifyMosType(content.ID, this.mosTypes) : ''
+
+					return item.Type === 'storyItem' && pendingChange.itemID === contentId
+				})
 				if (pendingChangeItem && deepMatch(pendingChangeItem.Content, pendingChange.itemDiff, true)) {
 					pendingChange.resolve()
 				}
@@ -427,7 +432,7 @@ export class CoreMosDeviceHandler {
 			}, 2000)
 		})
 	}
-	async dispose(): Promise<void> {
+	async dispose(subdevice: 'keepSubDevice' | 'removeSubDevice' = 'keepSubDevice'): Promise<void> {
 		this._observers.forEach((obs) => obs.stop())
 
 		await this.core.setStatus({
@@ -435,6 +440,7 @@ export class CoreMosDeviceHandler {
 			messages: ['Uninitialized'],
 		})
 
+		if (subdevice === 'removeSubDevice') await this.core.unInitialize()
 		await this.core.destroy()
 	}
 	killProcess(): void {
diff --git a/packages/mos-gateway/src/coreHandler.ts b/packages/mos-gateway/src/coreHandler.ts
index dee6f39bf6..54871df2e8 100644
--- a/packages/mos-gateway/src/coreHandler.ts
+++ b/packages/mos-gateway/src/coreHandler.ts
@@ -167,7 +167,7 @@ export class CoreHandler {
 		const coreMosHandler = this._coreMosHandlers[foundI]
 		if (coreMosHandler) {
 			this._coreMosHandlers.splice(foundI, 1)
-			await coreMosHandler.dispose()
+			await coreMosHandler.dispose('removeSubDevice')
 		}
 	}
 	onConnectionRestored(): void {
diff --git a/packages/mos-gateway/src/versions.ts b/packages/mos-gateway/src/versions.ts
index 08896de911..8cacd8223a 100644
--- a/packages/mos-gateway/src/versions.ts
+++ b/packages/mos-gateway/src/versions.ts
@@ -1,3 +1,4 @@
+import { stringifyError } from '@sofie-automation/server-core-integration'
 import * as Winston from 'winston'
 
 export function getVersions(logger: Winston.Logger): { [packageName: string]: string } {
@@ -15,7 +16,7 @@ export function getVersions(logger: Winston.Logger): { [packageName: string]: st
 				const pkgInfo = require(`${pkgName}/package.json`)
 				versions[pkgName] = pkgInfo.version || 'N/A'
 			} catch (e) {
-				logger.error(`Failed to load package.json for lib "${pkgName}": ${e}`)
+				logger.error(`Failed to load package.json for lib "${pkgName}": ${stringifyError(e)}`)
 			}
 		}
 	} catch (e) {
diff --git a/packages/openapi/LICENSE b/packages/openapi/LICENSE
new file mode 100644
index 0000000000..78f0f2dbb8
--- /dev/null
+++ b/packages/openapi/LICENSE
@@ -0,0 +1,21 @@
+MIT License (MIT)
+
+Copyright (c) 2018 Norsk rikskringkasting AS (NRK)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/packages/openapi/api/actions.yaml b/packages/openapi/api/actions.yaml
index 994dd78aaf..26ddddabd8 100644
--- a/packages/openapi/api/actions.yaml
+++ b/packages/openapi/api/actions.yaml
@@ -61,6 +61,8 @@ paths:
     $ref: 'definitions/playlists.yaml#/resources/setNextSegment'
   /playlists/{playlistId}/queue-next-segment:
     $ref: 'definitions/playlists.yaml#/resources/queueNextSegment'
+  /playlists/{playlistId}/clear-sourcelayers:
+    $ref: 'definitions/playlists.yaml#/resources/clearSourceLayers'
   /playlists/{playlistId}/take:
     $ref: 'definitions/playlists.yaml#/resources/take'
   /playlists/{playlistId}/sourceLayer/{sourceLayerId}:
diff --git a/packages/openapi/api/definitions/playlists.yaml b/packages/openapi/api/definitions/playlists.yaml
index bb459f6d52..8a4b050414 100644
--- a/packages/openapi/api/definitions/playlists.yaml
+++ b/packages/openapi/api/definitions/playlists.yaml
@@ -574,12 +574,67 @@ resources:
                     example: No Next point found, please set a part as Next before doing a TAKE.
         500:
           $ref: '#/components/responses/internalServerError'
+
+  clearSourceLayers:
+    put:
+      operationId: clearSourceLayers
+      tags:
+        - playlists
+      summary: Clears the target SourceLayers.
+      parameters:
+        - name: playlistId
+          in: path
+          description: Target playlist.
+          required: true
+          schema:
+            type: string
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              type: object
+              properties:
+                sourceLayerIds:
+                  description: Target SourceLayers.
+                  type: array
+                  items:
+                    type: string
+              required:
+                - sourceLayerIds
+              example:
+                sourceLayerIds:
+                  - 'mySourceLayerId'
+      responses:
+        200:
+          $ref: '#/components/responses/putSuccess'
+        404:
+          $ref: '#/components/responses/playlistNotFound'
+        412:
+          description: Playlist is not active.
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  status:
+                    type: number
+                    example: 412
+                  message:
+                    type: string
+                    example: Rundown must be active!
+        500:
+          $ref: '#/components/responses/internalServerError'
+
   sourceLayer:
     delete:
+      deprecated: true
       operationId: clearSourceLayer
       tags:
         - sourceLayers
-      summary: Clears the target SourceLayer.
+      summary: |
+        Clears the target SourceLayer.
+        This endpoint is deprecated, use the `clear-sourcelayers` endpoint instead.
       parameters:
         - name: playlistId
           in: path
diff --git a/packages/openapi/api/definitions/studios.yaml b/packages/openapi/api/definitions/studios.yaml
index fd45cded9b..03cffacca0 100644
--- a/packages/openapi/api/definitions/studios.yaml
+++ b/packages/openapi/api/definitions/studios.yaml
@@ -536,6 +536,17 @@ components:
         preserveOrphanedSegmentPositionInRundown:
           type: boolean
           description: Preserve unsynced segments psoition in the rundown, relative to the other segments
+        enableQuickLoop:
+          type: boolean
+          description: Should QuickLoop context menu options be available to the users
+        forceQuickLoopAutoNext:
+          type: string
+          enum: [disabled, enabled_when_valid_duration, enabled_forcing_min_duration]
+          description: If and how to force auto-nexting in a looping Playlist
+        fallbackPartDuration:
+          type: number
+          description: The duration to apply on too short Parts Within QuickLoop when forceQuickLoopAutoNext is set to `enabled_forcing_min_duration`
+
       required:
         - frameRate
         - mediaPreviewsUrl
diff --git a/packages/openapi/package.json b/packages/openapi/package.json
index f1aa6e169a..474841a024 100644
--- a/packages/openapi/package.json
+++ b/packages/openapi/package.json
@@ -1,11 +1,11 @@
 {
 	"name": "@sofie-automation/openapi",
-	"version": "1.51.0-in-development",
+	"version": "1.52.0-in-development",
 	"private": true,
 	"license": "MIT",
 	"repository": {
 		"type": "git",
-		"url": "git+https://github.com/nrkno/tv-automation-server-core.git",
+		"url": "git+https://github.com/nrkno/sofie-core.git",
 		"directory": "packages/openapi"
 	},
 	"main": "dist/index.js",
diff --git a/packages/openapi/src/__tests__/playlists.spec.ts b/packages/openapi/src/__tests__/playlists.spec.ts
index 7b63d3194c..e9aecdb988 100644
--- a/packages/openapi/src/__tests__/playlists.spec.ts
+++ b/packages/openapi/src/__tests__/playlists.spec.ts
@@ -152,4 +152,29 @@ describe('Network client', () => {
 	} else {
 		test.todo('Reload playlist can be dependant on test order')
 	}
+
+	test('fails to clear the target SourceLayers with null playlistId', async () => {
+		await expect(
+			playlistsApi.clearSourceLayers({
+				playlistId: null,
+				clearSourceLayersRequest: {
+					sourceLayerIds: ['42'],
+				},
+			})
+		).rejects.toThrow()
+	})
+
+	if (testServer) {
+		test('can clear the target SourceLayers', async () => {
+			const sofieVersion = await playlistsApi.clearSourceLayers({
+				playlistId: playlistIds[0],
+				clearSourceLayersRequest: {
+					sourceLayerIds: ['42'],
+				},
+			})
+			expect(sofieVersion.status).toBe(200)
+		})
+	} else {
+		test.todo('Get SourceLayerIds for clear operation')
+	}
 })
diff --git a/packages/package.json b/packages/package.json
index ac9e9c160b..13435f2a65 100644
--- a/packages/package.json
+++ b/packages/package.json
@@ -8,7 +8,9 @@
 			"openapi",
 			"shared-lib",
 			"job-worker",
-			"documentation"
+			"meteor-lib",
+			"documentation",
+			"webui"
 		]
 	},
 	"scripts": {
@@ -49,7 +51,9 @@
 		"@types/underscore": "^1.11.15",
 		"babel-jest": "^29.7.0",
 		"copyfiles": "^2.4.1",
+		"eslint-plugin-react": "latest",
 		"jest": "^29.7.0",
+		"jest-environment-jsdom": "^29.7.0",
 		"jest-mock-extended": "^3.0.5",
 		"json-schema-to-typescript": "^10.1.5",
 		"lerna": "^6.6.2",
@@ -66,7 +70,6 @@
 	"name": "packages",
 	"packageManager": "yarn@3.5.0",
 	"resolutions": {
-		"@asyncapi/generator-react-sdk@^1.0.20": "patch:@asyncapi/generator-react-sdk@npm%3A1.0.20#./.yarn/patches/@asyncapi-generator-react-sdk-npm-1.0.20-af18b2f42b.patch",
-		"@asyncapi/generator-react-sdk@^1.0.18": "patch:@asyncapi/generator-react-sdk@npm%3A1.0.20#./.yarn/patches/@asyncapi-generator-react-sdk-npm-1.0.20-af18b2f42b.patch"
+		"timecode@0.0.4": "patch:timecode@npm%3A0.0.4#./.yarn/patches/timecode-npm-0.0.4-82bde9e6fe.patch"
 	}
 }
diff --git a/packages/playout-gateway/CHANGELOG.md b/packages/playout-gateway/CHANGELOG.md
index 195b175037..334fc18216 100644
--- a/packages/playout-gateway/CHANGELOG.md
+++ b/packages/playout-gateway/CHANGELOG.md
@@ -3,6 +3,199 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.51.1-2](https://github.com/nrkno/sofie-core/compare/v1.51.1-1...v1.51.1-2) (2024-10-24)
+
+**Note:** Version bump only for package playout-gateway
+
+
+
+
+
+## [1.51.1-2](https://github.com/nrkno/sofie-core/compare/v1.51.1-1...v1.51.1-2) (2024-10-24)
+
+**Note:** Version bump only for package playout-gateway
+
+
+
+
+
+## [1.51.1-1](https://github.com/nrkno/sofie-core/compare/v1.51.1-0...v1.51.1-1) (2024-10-18)
+
+**Note:** Version bump only for package playout-gateway
+
+
+
+
+
+## [1.51.1-0](https://github.com/nrkno/sofie-core/compare/v1.51.0...v1.51.1-0) (2024-10-18)
+
+**Note:** Version bump only for package playout-gateway
+
+
+
+
+
+## [1.51.1-0](https://github.com/nrkno/sofie-core/compare/v1.51.0...v1.51.1-0) (2024-10-18)
+
+**Note:** Version bump only for package playout-gateway
+
+
+
+
+
+# [1.51.0](https://github.com/nrkno/sofie-core/compare/v1.51.0-in-testing.3...v1.51.0) (2024-10-07)
+
+**Note:** Version bump only for package playout-gateway
+
+
+
+
+
+# [1.51.0](https://github.com/nrkno/sofie-core/compare/v1.51.0-in-testing.3...v1.51.0) (2024-10-07)
+
+**Note:** Version bump only for package playout-gateway
+
+
+
+
+
+# [1.51.0-in-testing.3](https://github.com/nrkno/sofie-core/compare/v1.51.0-in-testing.2...v1.51.0-in-testing.3) (2024-09-25)
+
+**Note:** Version bump only for package playout-gateway
+
+
+
+
+
+# [1.51.0-in-testing.2](https://github.com/nrkno/sofie-core/compare/v1.51.0-in-testing.1...v1.51.0-in-testing.2) (2024-09-24)
+
+**Note:** Version bump only for package playout-gateway
+
+
+
+
+
+# [1.51.0-in-testing.1](https://github.com/nrkno/sofie-core/compare/v1.51.0-in-testing.0...v1.51.0-in-testing.1) (2024-09-06)
+
+
+### Bug Fixes
+
+* playout-gateway not passing datastore to tsr at startup ([82f6fb2](https://github.com/nrkno/sofie-core/commit/82f6fb2720992581f26ff18d161e787784195c95))
+* update TSR dependency (to fix timeline bug) ([746e0d2](https://github.com/nrkno/sofie-core/commit/746e0d2c822b95927172e76cbd6a4436d1a99192))
+
+
+
+
+
+# [1.51.0-in-testing.1](https://github.com/nrkno/sofie-core/compare/v1.51.0-in-testing.0...v1.51.0-in-testing.1) (2024-09-06)
+
+
+### Bug Fixes
+
+* playout-gateway not passing datastore to tsr at startup ([82f6fb2](https://github.com/nrkno/sofie-core/commit/82f6fb2720992581f26ff18d161e787784195c95))
+* update TSR dependency (to fix timeline bug) ([746e0d2](https://github.com/nrkno/sofie-core/commit/746e0d2c822b95927172e76cbd6a4436d1a99192))
+
+
+
+
+
+# [1.51.0-in-testing.0](https://github.com/nrkno/sofie-core/compare/v1.50.4...v1.51.0-in-testing.0) (2024-08-19)
+
+
+### Features
+
+* Ensure peripheralDevice subdevice removal when requested ([#1227](https://github.com/nrkno/sofie-core/issues/1227)) ([d5cafe8](https://github.com/nrkno/sofie-core/commit/d5cafe8db5e453f87f8d46262f23e118b580d4d5))
+
+
+
+## [1.50.5-LSG-updates](https://github.com/nrkno/sofie-core/compare/v1.50.4-LSG-updates...v1.50.5-LSG-updates) (2024-08-08)
+
+
+
+## [1.50.4-LSG-updates](https://github.com/nrkno/sofie-core/compare/v1.50.3-LSG-updates...v1.50.4-LSG-updates) (2024-07-30)
+
+
+### Bug Fixes
+
+* improve error logging: use stringifyError() ([8da63de](https://github.com/nrkno/sofie-core/commit/8da63dec44915439ea436eee9697f3774241537b))
+* include timestamp when logging to file ([#1207](https://github.com/nrkno/sofie-core/issues/1207)) ([2dcca21](https://github.com/nrkno/sofie-core/commit/2dcca215403cc0256c78f5f8f5f6befa2a1ca683))
+* **playout-gateway:** improve handling and typing of TSR events (fixes some logging issues) ([26a8613](https://github.com/nrkno/sofie-core/commit/26a8613cd64d7e077dfd7ff2092555c1b7805f4d))
+* use helper function to keep the scope of 'unsafe' code small ([c58a6de](https://github.com/nrkno/sofie-core/commit/c58a6de80597373e158316d33661ac0e8a07956a))
+
+
+### Features
+
+* backport of release51 live-status-gateway onto release50 ([0a87a95](https://github.com/nrkno/sofie-core/commit/0a87a9519ca1f344429e9b4d47a44c1a9acddff2))
+* refactor server-core-integration subscription handling to reduce duplication ([8eaedd2](https://github.com/nrkno/sofie-core/commit/8eaedd22e8efb9750f00ff472301c6b3f2d0f0af))
+* typed publications in gateways/peripheraldevices SOFIE-1183 ([#1056](https://github.com/nrkno/sofie-core/issues/1056)) ([0c3c1bf](https://github.com/nrkno/sofie-core/commit/0c3c1bfd2bb779034976dc34e49aa6e664ea874b))
+
+
+
+
+
+# [1.51.0-in-testing.0](https://github.com/nrkno/sofie-core/compare/v1.50.4...v1.51.0-in-testing.0) (2024-08-19)
+
+
+### Features
+
+* Ensure peripheralDevice subdevice removal when requested ([#1227](https://github.com/nrkno/sofie-core/issues/1227)) ([d5cafe8](https://github.com/nrkno/sofie-core/commit/d5cafe8db5e453f87f8d46262f23e118b580d4d5))
+
+
+
+## [1.50.5-LSG-updates](https://github.com/nrkno/sofie-core/compare/v1.50.4-LSG-updates...v1.50.5-LSG-updates) (2024-08-08)
+
+
+
+## [1.50.4-LSG-updates](https://github.com/nrkno/sofie-core/compare/v1.50.3-LSG-updates...v1.50.4-LSG-updates) (2024-07-30)
+
+
+### Bug Fixes
+
+* improve error logging: use stringifyError() ([8da63de](https://github.com/nrkno/sofie-core/commit/8da63dec44915439ea436eee9697f3774241537b))
+* include timestamp when logging to file ([#1207](https://github.com/nrkno/sofie-core/issues/1207)) ([2dcca21](https://github.com/nrkno/sofie-core/commit/2dcca215403cc0256c78f5f8f5f6befa2a1ca683))
+* **playout-gateway:** improve handling and typing of TSR events (fixes some logging issues) ([26a8613](https://github.com/nrkno/sofie-core/commit/26a8613cd64d7e077dfd7ff2092555c1b7805f4d))
+* use helper function to keep the scope of 'unsafe' code small ([c58a6de](https://github.com/nrkno/sofie-core/commit/c58a6de80597373e158316d33661ac0e8a07956a))
+
+
+### Features
+
+* backport of release51 live-status-gateway onto release50 ([0a87a95](https://github.com/nrkno/sofie-core/commit/0a87a9519ca1f344429e9b4d47a44c1a9acddff2))
+* refactor server-core-integration subscription handling to reduce duplication ([8eaedd2](https://github.com/nrkno/sofie-core/commit/8eaedd22e8efb9750f00ff472301c6b3f2d0f0af))
+* typed publications in gateways/peripheraldevices SOFIE-1183 ([#1056](https://github.com/nrkno/sofie-core/issues/1056)) ([0c3c1bf](https://github.com/nrkno/sofie-core/commit/0c3c1bfd2bb779034976dc34e49aa6e664ea874b))
+
+
+
+
+
+## [1.50.5](https://github.com/nrkno/tv-automation-server-core/compare/v1.50.4...v1.50.5) (2024-09-19)
+
+**Note:** Version bump only for package playout-gateway
+
+**Note:** Version bump only for package playout-gateway
+
+
+
+
+
+## [1.50.4](https://github.com/nrkno/tv-automation-server-core/compare/v1.50.3-LSG-updates...v1.50.4) (2024-07-30)
+
+
+### Bug Fixes
+
+* improve error logging: use stringifyError() ([8da63de](https://github.com/nrkno/tv-automation-server-core/commit/8da63dec44915439ea436eee9697f3774241537b))
+
+
+
+
+
+## [1.50.3](https://github.com/nrkno/tv-automation-server-core/compare/v1.50.2...v1.50.3) (2024-06-24)
+
+**Note:** Version bump only for package playout-gateway
+
+
+
+
+
 ## [1.50.2](https://github.com/nrkno/tv-automation-server-core/compare/v1.49.6...v1.50.2) (2024-05-15)
 
 
diff --git a/packages/playout-gateway/package.json b/packages/playout-gateway/package.json
index 70a1e85da2..cb6bfdc773 100644
--- a/packages/playout-gateway/package.json
+++ b/packages/playout-gateway/package.json
@@ -1,18 +1,18 @@
 {
 	"name": "playout-gateway",
-	"version": "1.51.0-in-development",
+	"version": "1.52.0-in-development",
 	"private": true,
 	"description": "Connect to Core, play stuff",
 	"license": "MIT",
 	"repository": {
 		"type": "git",
-		"url": "git+https://github.com/nrkno/tv-automation-server-core.git",
+		"url": "git+https://github.com/nrkno/sofie-core.git",
 		"directory": "packages/playout-gateway"
 	},
 	"bugs": {
-		"url": "https://github.com/nrkno/tv-automation-server-core/issues"
+		"url": "https://github.com/nrkno/sofie-core/issues"
 	},
-	"homepage": "https://github.com/nrkno/tv-automation-server-core/blob/master/packages/playout-gateway#readme",
+	"homepage": "https://github.com/nrkno/sofie-core/blob/master/packages/playout-gateway#readme",
 	"author": {
 		"name": "Johan Nyman",
 		"email": "johan@superfly.tv",
@@ -56,11 +56,11 @@
 		"production"
 	],
 	"dependencies": {
-		"@sofie-automation/server-core-integration": "1.51.0-in-development",
-		"@sofie-automation/shared-lib": "1.51.0-in-development",
+		"@sofie-automation/server-core-integration": "1.52.0-in-development",
+		"@sofie-automation/shared-lib": "1.52.0-in-development",
 		"debug": "^4.3.4",
 		"influx": "^5.9.3",
-		"timeline-state-resolver": "9.1.0-nightly-release51-20240228-132329-b7ceb6950.0",
+		"timeline-state-resolver": "9.2.0-nightly-release52-20240923-122840-58cfbb259.0",
 		"tslib": "^2.6.2",
 		"underscore": "^1.13.6",
 		"winston": "^3.11.0"
diff --git a/packages/playout-gateway/src/coreHandler.ts b/packages/playout-gateway/src/coreHandler.ts
index 40d3e18312..1f73222973 100644
--- a/packages/playout-gateway/src/coreHandler.ts
+++ b/packages/playout-gateway/src/coreHandler.ts
@@ -346,7 +346,7 @@ export class CoreHandler {
 
 		const devices: any[] = []
 		if (this._tsrHandler) {
-			for (const device of this._tsrHandler.tsr.getDevices()) {
+			for (const device of this._tsrHandler.tsr.connectionManager.getConnections()) {
 				devices.push({
 					instanceId: device.instanceId,
 					deviceId: device.deviceId,
@@ -416,7 +416,6 @@ export class CoreTSRDeviceHandler {
 	public _deviceId: string
 	public _device!: BaseRemoteDeviceIntegration<DeviceOptionsAny>
 	private _coreParentHandler: CoreHandler
-	private _tsrHandler: TSRHandler
 	private _hasGottenStatusChange = false
 	private _deviceStatus: PeripheralDeviceAPI.PeripheralDeviceStatusObject = {
 		statusCode: StatusCode.BAD,
@@ -424,16 +423,10 @@ export class CoreTSRDeviceHandler {
 	}
 	private disposed = false
 
-	constructor(
-		parent: CoreHandler,
-		device: Promise<BaseRemoteDeviceIntegration<DeviceOptionsAny>>,
-		deviceId: string,
-		tsrHandler: TSRHandler
-	) {
+	constructor(parent: CoreHandler, device: Promise<BaseRemoteDeviceIntegration<DeviceOptionsAny>>, deviceId: string) {
 		this._coreParentHandler = parent
 		this._devicePr = device
 		this._deviceId = deviceId
-		this._tsrHandler = tsrHandler
 	}
 	async init(): Promise<void> {
 		this._device = await this._devicePr
@@ -455,10 +448,11 @@ export class CoreTSRDeviceHandler {
 			)
 		})
 
+		console.log('has got status? ' + this._hasGottenStatusChange)
 		if (!this._hasGottenStatusChange) {
 			this._deviceStatus = await this._device.device.getStatus()
-			this.sendStatus()
 		}
+		this.sendStatus()
 		if (this.disposed) throw new Error('CoreTSRDeviceHandler cant init, is disposed')
 		await this.setupSubscriptionsAndObservers()
 		if (this.disposed) throw new Error('CoreTSRDeviceHandler cant init, is disposed')
@@ -490,8 +484,9 @@ export class CoreTSRDeviceHandler {
 		// setup observers
 		this._coreParentHandler.setupObserverForPeripheralDeviceCommands(this)
 	}
-	statusChanged(deviceStatus: Partial<PeripheralDeviceAPI.PeripheralDeviceStatusObject>): void {
-		this._hasGottenStatusChange = true
+	statusChanged(deviceStatus: Partial<PeripheralDeviceAPI.PeripheralDeviceStatusObject>, fromDevice = true): void {
+		console.log('device ' + this._deviceId + ' status set to ' + deviceStatus.statusCode)
+		if (fromDevice) this._hasGottenStatusChange = true
 
 		this._deviceStatus = {
 			...this._deviceStatus,
@@ -503,12 +498,9 @@ export class CoreTSRDeviceHandler {
 	sendStatus(): void {
 		if (!this.core) return // not initialized yet
 
-		this.core.setStatus(this._deviceStatus).catch((e: any) =>
-			this._coreParentHandler.logger.error(`Error when setting status: ${e}`, {
-				error: e,
-				stacktrace: e.stack,
-			})
-		)
+		this.core
+			.setStatus(this._deviceStatus)
+			.catch((e: any) => this._coreParentHandler.logger.error(`Error when setting status: ${stringifyError(e)}`))
 	}
 	onCommandError(
 		_errorMessage: string,
@@ -524,39 +516,38 @@ export class CoreTSRDeviceHandler {
 		// this.core
 		// 		.callMethodLowPrio(PeripheralDeviceAPIMethods.reportCommandError, [errorMessage, ref])
 		// 		.catch((e: any) =>
-		// 			this._coreParentHandler.logger.error(`Error when callMethodLowPrio: ${e}`, {
-		// 				error: e,
-		// 				stacktrace: e.stack,
-		// 			})
+		// 			this._coreParentHandler.logger.error(`Error when callMethodLowPrio: ${stringifyError(e)}`)
 		// 		)
 		// }
 	}
 	onUpdateMediaObject(collectionId: string, docId: string, doc: MediaObject | null): void {
-		this.core.coreMethodsLowPriority.updateMediaObject(collectionId, docId, doc as any).catch((e: any) =>
-			this._coreParentHandler.logger.error(`Error when updating Media Object: ${e}`, {
-				error: e,
-				stacktrace: e.stack,
-			})
-		)
+		this.core.coreMethodsLowPriority
+			.updateMediaObject(collectionId, docId, doc as any)
+			.catch((e: any) =>
+				this._coreParentHandler.logger.error(`Error when updating Media Object: ${stringifyError(e)}`)
+			)
 	}
 	onClearMediaObjectCollection(collectionId: string): void {
-		this.core.coreMethodsLowPriority.clearMediaObjectCollection(collectionId).catch((e: any) =>
-			this._coreParentHandler.logger.error(`Error when clearing Media Objects collection: ${e}`, {
-				error: e,
-				stacktrace: e.stack,
-			})
-		)
+		this.core.coreMethodsLowPriority
+			.clearMediaObjectCollection(collectionId)
+			.catch((e: any) =>
+				this._coreParentHandler.logger.error(
+					`Error when clearing Media Objects collection: ${stringifyError(e)}`
+				)
+			)
 	}
 
-	async dispose(): Promise<void> {
+	async dispose(subdevice: 'keepSubDevice' | 'removeSubDevice' = 'keepSubDevice'): Promise<void> {
 		this._observers.forEach((obs) => obs.stop())
 
-		await this._tsrHandler.tsr.removeDevice(this._deviceId)
+		if (!this.core) return
+
 		await this.core.setStatus({
 			statusCode: StatusCode.BAD,
 			messages: ['Uninitialized'],
 		})
 
+		if (subdevice === 'removeSubDevice') await this.core.unInitialize()
 		await this.core.destroy()
 	}
 	killProcess(): void {
diff --git a/packages/playout-gateway/src/influxdb.ts b/packages/playout-gateway/src/influxdb.ts
index cffd2b599d..eabd4b6f27 100644
--- a/packages/playout-gateway/src/influxdb.ts
+++ b/packages/playout-gateway/src/influxdb.ts
@@ -105,7 +105,7 @@ function getVersions(): Record<string, string> {
 		const pkgInfo = require(`timeline-state-resolver/package.json`)
 		versions['tsrVersion'] = pkgInfo.version || 'N/A'
 	} catch (e) {
-		// this.logger.error(`Failed to load package.json for lib "${pkgName}": ${e}`)
+		// this.logger.error(`Failed to load package.json for lib "${pkgName}": ${stringifyError(e)}`)
 	}
 
 	return versions
diff --git a/packages/playout-gateway/src/tsrHandler.ts b/packages/playout-gateway/src/tsrHandler.ts
index 7060a7c502..40def38103 100644
--- a/packages/playout-gateway/src/tsrHandler.ts
+++ b/packages/playout-gateway/src/tsrHandler.ts
@@ -7,16 +7,12 @@ import {
 	TSRTimelineObj,
 	TSRTimeline,
 	TSRTimelineContent,
-	CommandReport,
 	DeviceOptionsAtem,
 	AtemMediaPoolAsset,
-	MediaObject,
 	ExpectedPlayoutItem,
 	ExpectedPlayoutItemContent,
-	SlowSentCommandInfo,
-	SlowFulfilledCommandInfo,
-	DeviceStatus,
 	StatusCode,
+	Datastore,
 } from 'timeline-state-resolver'
 import { CoreHandler, CoreTSRDeviceHandler } from './coreHandler'
 import * as crypto from 'crypto'
@@ -54,8 +50,6 @@ import {
 	unprotectString,
 } from '@sofie-automation/server-core-integration'
 import { BaseRemoteDeviceIntegration } from 'timeline-state-resolver/dist/service/remoteDeviceInstance'
-import { DeviceEvents } from 'timeline-state-resolver/dist/service/device'
-import EventEmitter = require('eventemitter3')
 
 const debug = Debug('playout-gateway')
 
@@ -68,31 +62,6 @@ export interface TimelineContentObjectTmp<TContent extends { deviceType: DeviceT
 	extends TSRTimelineObj<TContent> {
 	inGroup?: string
 }
-/** Max time for initializing devices */
-const INIT_TIMEOUT = 10000
-
-enum DeviceAction {
-	ADD = 'add',
-	READD = 'readd',
-	REMOVE = 'remove',
-}
-
-type DeviceActionResult = {
-	success: boolean
-	deviceId: string
-	action: DeviceAction
-}
-
-type UpdateDeviceOperationsResult =
-	| {
-			success: true
-			results: DeviceActionResult[]
-	  }
-	| {
-			success: false
-			reason: 'timeout' | 'error'
-			details: string[]
-	  }
 
 /**
  * Represents a connection between Gateway and TSR
@@ -222,6 +191,8 @@ export class TSRHandler {
 		})
 		this.tsr.on('timeTrace', (trace: FinishedTrace) => sendTrace(trace))
 
+		this.attachTSRConnectionEvents()
+
 		this.logger.debug('tsr init')
 		await this.tsr.init()
 
@@ -229,9 +200,199 @@ export class TSRHandler {
 		this._triggerupdateTimelineAndMappings('TSRHandler.init(), later')
 		this.onSettingsChanged()
 		this._triggerUpdateDevices()
+		this._triggerUpdateDatastore()
 		this.logger.debug('tsr init done')
 	}
 
+	private attachTSRConnectionEvents() {
+		this.tsr.connectionManager.on('info', (info) => this.logger.info('TSR ConnectionManager: ' + info))
+		this.tsr.connectionManager.on('warning', (warning) => this.logger.warn('TSR ConnectionManager: ' + warning))
+		this.tsr.connectionManager.on('debug', (...args) => {
+			if (!this._coreHandler.logDebug) {
+				return
+			}
+			const data = args.map((arg) => (typeof arg === 'object' ? JSON.stringify(arg) : arg))
+			this.logger.debug(`TSR ConnectionManager debug (${args.length})`, { data })
+		})
+
+		this.tsr.connectionManager.on('connectionAdded', (id, container) => {
+			const coreTsrHandler = new CoreTSRDeviceHandler(this._coreHandler, Promise.resolve(container), id)
+			this._coreTsrHandlers[id] = coreTsrHandler
+
+			// set the status to uninitialized for now:
+			coreTsrHandler.statusChanged(
+				{
+					statusCode: StatusCode.BAD,
+					messages: ['Device initialising...'],
+				},
+				false
+			)
+
+			this._triggerupdateExpectedPlayoutItems() // So that any recently created devices will get all the ExpectedPlayoutItems
+		})
+
+		this.tsr.connectionManager.on('connectionInitialised', (id) => {
+			const coreTsrHandler = this._coreTsrHandlers[id]
+
+			if (!coreTsrHandler) {
+				this.logger.error('TSR Connection initialised when there was not CoreTSRHandler for it')
+				return
+			}
+
+			coreTsrHandler.init().catch((e) => this.logger.error('CoreTSRHandler failed to initialise', e)) // todo - is this the right way to log this?
+		})
+
+		this.tsr.connectionManager.on('connectionRemoved', (id) => {
+			const coreTsrHandler = this._coreTsrHandlers[id]
+
+			if (!coreTsrHandler) {
+				this.logger.error('TSR Connection was removed when but there was not CoreTSRHandler to handle that')
+				return
+			}
+
+			coreTsrHandler.dispose('removeSubDevice').catch((e) => {
+				this.logger.error('Failed to dispose of coreTsrHandler for ' + id + ': ' + e)
+			})
+			delete this._coreTsrHandlers[id]
+		})
+
+		const fixLog = (id: string, e: string): string => {
+			const device = this._coreTsrHandlers[id]?._device
+
+			return `Device "${device?.deviceName ?? id}" (${device?.instanceId ?? 'instance unknown'}): ` + e
+		}
+		const fixError = (id: string, e: Error): any => {
+			const device = this._coreTsrHandlers[id]?._device
+			const name = `Device "${device?.deviceName ?? id}" (${device?.instanceId ?? 'instance unknown'})`
+
+			return {
+				message: e.message && name + ': ' + e.message,
+				name: e.name && name + ': ' + e.name,
+				stack: e.stack && e.stack + '\nAt device' + name,
+			}
+		}
+		const fixContext = (...context: any[]): any => {
+			return {
+				context,
+			}
+		}
+
+		this.tsr.connectionManager.on('connectionEvent:connectionChanged', (id, status) => {
+			const coreTsrHandler = this._coreTsrHandlers[id]
+			if (!coreTsrHandler) return
+
+			coreTsrHandler.statusChanged(status)
+
+			// When the status has changed, the deviceName might have changed:
+			coreTsrHandler._device.reloadProps().catch((err) => {
+				this.logger.error(`Error in reloadProps: ${stringifyError(err)}`)
+			})
+			// hack to make sure atem has media after restart
+			if (
+				(status.statusCode === StatusCode.GOOD ||
+					status.statusCode === StatusCode.WARNING_MINOR ||
+					status.statusCode === StatusCode.WARNING_MAJOR) &&
+				coreTsrHandler._device.deviceType === DeviceType.ATEM &&
+				!disableAtemUpload
+			) {
+				const assets = (coreTsrHandler._device.deviceOptions as DeviceOptionsAtem).options?.mediaPoolAssets
+				if (assets && assets.length > 0) {
+					try {
+						this.uploadFilesToAtem(
+							coreTsrHandler._device,
+							assets.filter((asset) => _.isNumber(asset.position) && asset.path)
+						)
+					} catch (e) {
+						// don't worry about it.
+					}
+				}
+			}
+		})
+		this.tsr.connectionManager.on('connectionEvent:slowSentCommand', (id, info) => {
+			// If the internalDelay is too large, it should be logged as an error,
+			// since something took too long internally.
+
+			if (info.internalDelay > 100) {
+				this.logger.error('slowSentCommand', {
+					id,
+					...info,
+				})
+			} else {
+				this.logger.warn('slowSentCommand', {
+					id,
+					...info,
+				})
+			}
+		})
+		this.tsr.connectionManager.on('connectionEvent:slowFulfilledCommand', (id, info) => {
+			// Note: we don't emit slow fulfilled commands as error, since
+			// the fulfillment of them lies on the device being controlled, not on us.
+
+			this.logger.warn('slowFulfilledCommand', {
+				id,
+				...info,
+			})
+		})
+		this.tsr.connectionManager.on('connectionEvent:commandError', (id, error, context) => {
+			// todo: handle this better
+			this.logger.error(fixError(id, error), { context })
+		})
+		this.tsr.connectionManager.on('connectionEvent:commandReport', (_id, commandReport) => {
+			if (this._reportAllCommands) {
+				// Todo: send these to Core
+				this.logger.info('commandReport', {
+					commandReport: commandReport,
+				})
+			}
+		})
+		this.tsr.connectionManager.on('connectionEvent:updateMediaObject', (id, collectionId, docId, doc) => {
+			const coreTsrHandler = this._coreTsrHandlers[id]
+			if (!coreTsrHandler) return
+
+			coreTsrHandler.onUpdateMediaObject(collectionId, docId, doc)
+		})
+		this.tsr.connectionManager.on('connectionEvent:clearMediaObjects', (id, collectionId) => {
+			const coreTsrHandler = this._coreTsrHandlers[id]
+			if (!coreTsrHandler) return
+
+			coreTsrHandler.onClearMediaObjectCollection(collectionId)
+		})
+		this.tsr.connectionManager.on('connectionEvent:info', (id, info) => {
+			this.logger.info(fixLog(id, info))
+		})
+		this.tsr.connectionManager.on('connectionEvent:warning', (id, warning) => {
+			this.logger.warn(fixLog(id, warning))
+		})
+		this.tsr.connectionManager.on('connectionEvent:error', (id, context, error) => {
+			this.logger.error(fixError(id, error), fixContext(context))
+		})
+		this.tsr.connectionManager.on('connectionEvent:debug', (id, ...args) => {
+			const device = this._coreTsrHandlers[id]?._device
+
+			if (!device?.debugLogging && !this._coreHandler.logDebug) {
+				return
+			}
+			if (args.length === 0) {
+				this.logger.debug('>empty message<')
+				return
+			}
+			const data = args.map((arg) => (typeof arg === 'object' ? JSON.stringify(arg) : arg))
+			this.logger.debug(`Device "${device?.deviceName || id}" (${device?.instanceId})`, { data })
+		})
+		this.tsr.connectionManager.on('connectionEvent:debugState', (id, state) => {
+			const device = this._coreTsrHandlers[id]?._device
+
+			if (device?.debugState && this._coreHandler.logDebug) {
+				// Fetch the Id that core knows this device by
+				const coreId = this._coreTsrHandlers[device.deviceId].core.deviceId
+				this._debugStates.set(unprotectString(coreId), state)
+			}
+		})
+		this.tsr.connectionManager.on('connectionEvent:timeTrace', (_id, trace) => {
+			sendTrace(trace)
+		})
+	}
+
 	private loadSubdeviceConfigurations(): { [deviceType: string]: Record<string, any> } {
 		const defaultDeviceOptions: { [deviceType: string]: Record<string, any> } = {}
 
@@ -494,40 +655,14 @@ export class TSRHandler {
 	}
 
 	private async _updateDevices(): Promise<void> {
-		this.logger.debug('updateDevices start')
-
 		const peripheralDevice = this._getPeripheralDevice()
 
-		const ps: Promise<DeviceActionResult>[] = []
-		const promiseOperations: { [id: string]: { deviceId: string; operation: DeviceAction } } = {}
-		const keepTrack = async <T>(p: Promise<T>, deviceId: string, operation: DeviceAction) => {
-			const name = `${operation}_${deviceId}`
-			promiseOperations[name] = {
-				deviceId,
-				operation,
-			}
-			return p.then((result) => {
-				delete promiseOperations[name]
-				return result
-			})
-		}
-		const deviceOptions = new Map<string, DeviceOptionsAny>()
-
 		if (peripheralDevice) {
+			const connections: Record<string, DeviceOptionsAny> = {}
 			const devices = peripheralDevice.playoutDevices
 
 			for (const [deviceId, device0] of Object.entries<DeviceOptionsAny>(devices)) {
-				const device = device0
-				if (!device.disable) {
-					deviceOptions.set(deviceId, device)
-				}
-			}
-
-			for (const [deviceId, orgDeviceOptions] of deviceOptions.entries()) {
-				const oldDevice: BaseRemoteDeviceIntegration<DeviceOptionsAny> | undefined = this.tsr.getDevice(
-					deviceId,
-					true
-				)
+				if (device0.disable) continue
 
 				const deviceOptions = _.extend(
 					{
@@ -536,9 +671,8 @@ export class TSRHandler {
 						limitSlowFulfilledCommand: 100,
 						options: {},
 					},
-					this.populateDefaultValuesIfMissing(orgDeviceOptions)
+					this.populateDefaultValuesIfMissing(device0)
 				)
-
 				if (this._multiThreaded !== null && deviceOptions.isMultiThreaded === undefined) {
 					deviceOptions.isMultiThreaded = this._multiThreaded
 				}
@@ -546,130 +680,11 @@ export class TSRHandler {
 					deviceOptions.reportAllCommands = this._reportAllCommands
 				}
 
-				if (!oldDevice) {
-					if (deviceOptions.options) {
-						this.logger.info('Initializing device: ' + deviceId)
-						this.logger.info('new', deviceOptions)
-						ps.push(keepTrack(this._addDevice(deviceId, deviceOptions), deviceId, DeviceAction.ADD))
-					}
-				} else {
-					if (deviceOptions.options) {
-						let anyChanged = false
-
-						if (
-							// Changing the debug flag shouldn't restart the device:
-							!_.isEqual(_.omit(oldDevice.deviceOptions, 'debug'), _.omit(deviceOptions, 'debug'))
-						) {
-							anyChanged = true
-						}
-
-						if (anyChanged) {
-							deviceOptions.debug = this.getDeviceDebug(orgDeviceOptions)
-
-							this.logger.info('Re-initializing device: ' + deviceId)
-							this.logger.info('old', oldDevice.deviceOptions)
-							this.logger.info('new', deviceOptions)
-							ps.push(
-								keepTrack(this._removeDevice(deviceId), deviceId, DeviceAction.REMOVE).then(async () =>
-									keepTrack(this._addDevice(deviceId, deviceOptions), deviceId, DeviceAction.READD)
-								)
-							)
-						}
-					}
-				}
-			}
-
-			for (const oldDevice of this.tsr.getDevices()) {
-				const deviceId = oldDevice.deviceId
-				if (!deviceOptions.has(deviceId)) {
-					this.logger.info('Un-initializing device: ' + deviceId)
-					ps.push(keepTrack(this._removeDevice(deviceId), deviceId, DeviceAction.REMOVE))
-				}
-			}
-		}
-
-		const resultsOrTimeout = await Promise.race<UpdateDeviceOperationsResult>([
-			Promise.all(ps).then((results) => ({
-				success: true,
-				results,
-			})),
-			new Promise<UpdateDeviceOperationsResult>((resolve) =>
-				setTimeout(() => {
-					const keys = Object.keys(promiseOperations)
-					if (keys.length) {
-						this.logger.warn(
-							`Timeout in _updateDevices: ${Object.values<{ deviceId: string; operation: DeviceAction }>(
-								promiseOperations
-							)
-								.map((op) => op.deviceId)
-								.join(',')}`
-						)
-					}
-
-					Promise.all(
-						// At this point in time, promiseOperations contains the promises that have timed out.
-						// If we tried to add or re-add a device, that apparently failed so we should remove the device in order to
-						// give it another chance next time _updateDevices() is called.
-						Object.values<{ deviceId: string; operation: DeviceAction }>(promiseOperations)
-							.filter((op) => op.operation === DeviceAction.ADD || op.operation === DeviceAction.READD)
-							.map(async (op) =>
-								// the device was never added, should retry next round
-								this._removeDevice(op.deviceId)
-							)
-					)
-						.catch((e) => {
-							this.logger.error(
-								`Error when trying to remove unsuccessfully initialized devices: ${stringifyIds(
-									Object.values<{ deviceId: string; operation: DeviceAction }>(promiseOperations).map(
-										(op) => op.deviceId
-									)
-								)}`,
-								e
-							)
-						})
-						.finally(() => {
-							resolve({
-								success: false,
-								reason: 'error',
-								details: keys,
-							})
-						})
-				}, INIT_TIMEOUT)
-			), // Timeout if not all are resolved within INIT_TIMEOUT
-		])
-
-		await this._reportResult(resultsOrTimeout)
-
-		const debugLoggingPs: Promise<void>[] = []
-		// Set logDebug on the devices:
-		for (const device of this.tsr.getDevices()) {
-			const options: DeviceOptionsAny | undefined = deviceOptions.get(device.deviceId)
-			if (!options) {
-				continue
-			}
-			const debug: boolean = this.getDeviceDebug(options)
-			if (device.debugLogging !== debug) {
-				this.logger.info(`Setting logDebug of device ${device.deviceId} to ${debug}`)
-				debugLoggingPs.push(device.setDebugLogging(debug))
-			}
-		}
-		// Set debugState on devices:
-		for (const device of this.tsr.getDevices()) {
-			const options: DeviceOptionsAny | undefined = deviceOptions.get(device.deviceId)
-			if (!options) {
-				continue
+				connections[deviceId] = deviceOptions
 			}
 
-			const debug: boolean = this.getDeviceDebugState(options)
-			if (device.debugState !== debug) {
-				this.logger.info(`Setting debugState of device ${device.deviceId} to ${debug}`)
-				debugLoggingPs.push(device.setDebugState(debug))
-			}
+			this.tsr.connectionManager.setConnections(connections)
 		}
-		await Promise.all(debugLoggingPs)
-
-		this._triggerupdateExpectedPlayoutItems() // So that any recently created devices will get all the ExpectedPlayoutItems
-		this.logger.debug('updateDevices end')
 	}
 
 	private populateDefaultValuesIfMissing(deviceOptions: DeviceOptionsAny): DeviceOptionsAny {
@@ -679,303 +694,6 @@ export class TSRHandler {
 		deviceOptions.options = { ...this.defaultDeviceOptions[deviceOptions.type], ...options }
 		return deviceOptions
 	}
-
-	private getDeviceDebug(deviceOptions: DeviceOptionsAny): boolean {
-		return deviceOptions.debug || this._coreHandler.logDebug || false
-	}
-	private getDeviceDebugState(deviceOptions: DeviceOptionsAny): boolean {
-		return (deviceOptions.debugState && this._coreHandler.logState) || false
-	}
-	private async _reportResult(resultsOrTimeout: UpdateDeviceOperationsResult): Promise<void> {
-		this.logger.warn(JSON.stringify(resultsOrTimeout))
-		// Check if the updateDevice operation failed before completing
-		if (!resultsOrTimeout.success) {
-			// It failed because there was a global timeout (not a device-specific failure)
-			if (resultsOrTimeout.reason === 'timeout') {
-				await this._coreHandler.core.setStatus({
-					statusCode: StatusCode.FATAL,
-					messages: [
-						`Time-out during device update. Timed-out on devices: ${stringifyIds(
-							resultsOrTimeout.details
-						)}`,
-					],
-				})
-				// It failed for an unknown reason
-			} else {
-				await this._coreHandler.core.setStatus({
-					statusCode: StatusCode.BAD,
-					messages: [
-						`Unknown error during device update: ${resultsOrTimeout.reason}. Devices: ${stringifyIds(
-							resultsOrTimeout.details
-						)}`,
-					],
-				})
-			}
-
-			return
-		}
-
-		// updateDevice finished successfully, let's see if any of the individual devices failed
-		const failures = resultsOrTimeout.results.filter((result) => !result.success)
-		// Group the failures according to what sort of an operation was executed
-		const addFailureDeviceIds = failures
-			.filter((failure) => failure.action === DeviceAction.ADD)
-			.map((failure) => failure.deviceId)
-		const removeFailureDeviceIds = failures
-			.filter((failure) => failure.action === DeviceAction.REMOVE)
-			.map((failure) => failure.deviceId)
-
-		// There were no failures, good
-		if (failures.length === 0) {
-			await this._coreHandler.core.setStatus({
-				statusCode: StatusCode.GOOD,
-				messages: [],
-			})
-			return
-		}
-		// Something did fail, let's report it as the status
-		await this._coreHandler.core.setStatus({
-			statusCode: StatusCode.BAD,
-			messages: [
-				addFailureDeviceIds.length > 0
-					? `Unable to initialize devices, check configuration: ${stringifyIds(addFailureDeviceIds)}`
-					: null,
-				removeFailureDeviceIds.length > 0
-					? `Failed to remove devices: ${stringifyIds(removeFailureDeviceIds)}`
-					: null,
-			].filter(Boolean) as string[],
-		})
-	}
-
-	private async _addDevice(deviceId: string, options: DeviceOptionsAny): Promise<DeviceActionResult> {
-		this.logger.debug('Adding device ' + deviceId)
-
-		try {
-			if (this._coreTsrHandlers[deviceId]) {
-				throw new Error(`There is already a _coreTsrHandlers for deviceId "${deviceId}"!`)
-			}
-
-			const devicePr: Promise<BaseRemoteDeviceIntegration<DeviceOptionsAny>> = this.tsr.createDevice(
-				deviceId,
-				options
-			)
-
-			const coreTsrHandler = new CoreTSRDeviceHandler(this._coreHandler, devicePr, deviceId, this)
-
-			this._coreTsrHandlers[deviceId] = coreTsrHandler
-
-			// set the status to uninitialized for now:
-			coreTsrHandler.statusChanged({
-				statusCode: StatusCode.BAD,
-				messages: ['Device initialising...'],
-			})
-
-			const device = await devicePr
-
-			// Set up device status
-			const deviceType = device.deviceType
-
-			const onDeviceStatusChanged = (connectedOrStatus: Partial<DeviceStatus>) => {
-				let deviceStatus: Partial<PeripheralDeviceAPI.PeripheralDeviceStatusObject>
-				if (_.isBoolean(connectedOrStatus)) {
-					// for backwards compability, to be removed later
-					if (connectedOrStatus) {
-						deviceStatus = {
-							statusCode: StatusCode.GOOD,
-						}
-					} else {
-						deviceStatus = {
-							statusCode: StatusCode.BAD,
-							messages: ['Disconnected'],
-						}
-					}
-				} else {
-					deviceStatus = connectedOrStatus
-				}
-				coreTsrHandler.statusChanged(deviceStatus)
-
-				// When the status has changed, the deviceName might have changed:
-				device.reloadProps().catch((err) => {
-					this.logger.error(`Error in reloadProps: ${err}`)
-				})
-				// hack to make sure atem has media after restart
-				if (
-					(deviceStatus.statusCode === StatusCode.GOOD ||
-						deviceStatus.statusCode === StatusCode.WARNING_MINOR ||
-						deviceStatus.statusCode === StatusCode.WARNING_MAJOR) &&
-					deviceType === DeviceType.ATEM &&
-					!disableAtemUpload
-				) {
-					const assets = (options as DeviceOptionsAtem).options?.mediaPoolAssets
-					if (assets && assets.length > 0) {
-						try {
-							this.uploadFilesToAtem(
-								device,
-								assets.filter((asset) => _.isNumber(asset.position) && asset.path)
-							)
-						} catch (e) {
-							// don't worry about it.
-						}
-					}
-				}
-			}
-			const onSlowSentCommand = (info: SlowSentCommandInfo) => {
-				// If the internalDelay is too large, it should be logged as an error,
-				// since something took too long internally.
-
-				if (info.internalDelay > 100) {
-					this.logger.error('slowSentCommand', {
-						deviceName: device.deviceName,
-						...info,
-					})
-				} else {
-					this.logger.warn('slowSentCommand', {
-						deviceName: device.deviceName,
-						...info,
-					})
-				}
-			}
-			const onSlowFulfilledCommand = (info: SlowFulfilledCommandInfo) => {
-				// Note: we don't emit slow fulfilled commands as error, since
-				// the fulfillment of them lies on the device being controlled, not on us.
-
-				this.logger.warn('slowFulfilledCommand', {
-					deviceName: device.deviceName,
-					...info,
-				})
-			}
-			const onCommandReport = (commandReport: CommandReport) => {
-				if (this._reportAllCommands) {
-					// Todo: send these to Core
-					this.logger.info('commandReport', {
-						commandReport: commandReport,
-					})
-				}
-			}
-			const onCommandError = (error: any, context: any) => {
-				// todo: handle this better
-				this.logger.error(fixError(error), { context })
-			}
-			const onUpdateMediaObject = (collectionId: string, docId: string, doc: MediaObject | null) => {
-				coreTsrHandler.onUpdateMediaObject(collectionId, docId, doc)
-			}
-			const onClearMediaObjectCollection = (collectionId: string) => {
-				coreTsrHandler.onClearMediaObjectCollection(collectionId)
-			}
-			const fixLog = (e: string): string => `Device "${device.deviceName || deviceId}" (${device.instanceId})` + e
-			const fixError = (e: Error): any => {
-				const name = `Device "${device.deviceName || deviceId}" (${device.instanceId})`
-
-				return {
-					message: e.message && name + ': ' + e.message,
-					name: e.name && name + ': ' + e.name,
-					stack: e.stack && e.stack + '\nAt device' + name,
-				}
-			}
-			const fixContext = (...context: any[]): any => {
-				return {
-					context,
-				}
-			}
-			await coreTsrHandler.init()
-
-			device.onChildClose = () => {
-				// Called if a child is closed / crashed
-				this.logger.warn(`Child of device ${deviceId} closed/crashed`)
-				debug(`Trigger update devices because "${deviceId}" process closed`)
-
-				onDeviceStatusChanged({
-					statusCode: StatusCode.BAD,
-					messages: ['Child process closed'],
-				})
-
-				this._removeDevice(deviceId).then(
-					() => {
-						this._triggerUpdateDevices()
-					},
-					() => {
-						this._triggerUpdateDevices()
-					}
-				)
-			}
-
-			await addListenerToDevice(device, 'connectionChanged', onDeviceStatusChanged)
-			// await addListenerToDevice(device, 'slowCommand', onSlowCommand)
-			await addListenerToDevice(device, 'slowSentCommand', onSlowSentCommand)
-			await addListenerToDevice(device, 'slowFulfilledCommand', onSlowFulfilledCommand)
-			await addListenerToDevice(device, 'commandError', onCommandError)
-			await addListenerToDevice(device, 'commandReport', onCommandReport)
-			await addListenerToDevice(device, 'updateMediaObject', onUpdateMediaObject)
-			await addListenerToDevice(device, 'clearMediaObjects', onClearMediaObjectCollection)
-
-			await addListenerToDevice(device, 'info', (info) => {
-				this.logger.info(fixLog(info))
-			})
-			await addListenerToDevice(device, 'warning', (warning: string) => {
-				this.logger.warn(fixLog(warning))
-			})
-			await addListenerToDevice(device, 'error', (context, error) => {
-				this.logger.error(fixError(error), fixContext(context))
-			})
-
-			await addListenerToDevice(device, 'debug', (...args) => {
-				if (!device.debugLogging && !this._coreHandler.logDebug) {
-					return
-				}
-				if (args.length === 0) {
-					this.logger.debug('>empty message<')
-					return
-				}
-				const data = args.map((arg) => (typeof arg === 'object' ? JSON.stringify(arg) : arg))
-				this.logger.debug(`Device "${device.deviceName || deviceId}" (${device.instanceId})`, { data })
-			})
-
-			await addListenerToDevice(device, 'debugState', (...args) => {
-				if (device.debugState && this._coreHandler.logDebug) {
-					// Fetch the Id that core knows this device by
-					const coreId = this._coreTsrHandlers[device.deviceId].core.deviceId
-					this._debugStates.set(unprotectString(coreId), args[0])
-				}
-			})
-
-			await addListenerToDevice(device, 'timeTrace', (trace) => sendTrace(trace))
-			/* eslint-enable @typescript-eslint/await-thenable */
-
-			// now initialize it
-			await this.tsr.initDevice(deviceId, options)
-
-			// also ask for the status now, and update:
-			onDeviceStatusChanged(await device.device.getStatus())
-			return {
-				action: DeviceAction.ADD,
-				deviceId,
-				success: true,
-			}
-		} catch (error) {
-			// Initialization failed, clean up any artifacts and see if we can try again later:
-			this.logger.error(`Error when adding device "${deviceId}"`, { error })
-			debug(`Error when adding device "${deviceId}"`)
-			try {
-				await this._removeDevice(deviceId)
-			} catch (error) {
-				this.logger.error(`Error when cleaning up after adding device "${deviceId}" error...`, error)
-			}
-
-			if (!this._triggerUpdateDevicesTimeout) {
-				this._triggerUpdateDevicesTimeout = setTimeout(() => {
-					debug(`Trigger updateDevices from failure "${deviceId}"`)
-					// try again later:
-					this._triggerUpdateDevices()
-				}, 10 * 1000)
-			}
-
-			return {
-				action: DeviceAction.ADD,
-				deviceId,
-				success: false,
-			}
-		}
-	}
 	/**
 	 * This function is a quick and dirty solution to load a still to the atem mixers.
 	 * This does not serve as a proper implementation! And need to be refactor
@@ -998,25 +716,6 @@ export class TSRHandler {
 		process.stderr.on('data', (data) => this.logger.info(data.toString()))
 		process.on('close', () => process.removeAllListeners())
 	}
-	private async _removeDevice(deviceId: string): Promise<DeviceActionResult> {
-		let success = false
-		if (this._coreTsrHandlers[deviceId]) {
-			try {
-				await this._coreTsrHandlers[deviceId].dispose()
-				this.logger.debug('Disposed device ' + deviceId)
-				success = true
-			} catch (error) {
-				this.logger.error(`Error when removing device "${deviceId}"`, error)
-			}
-		}
-		delete this._coreTsrHandlers[deviceId]
-
-		return {
-			deviceId,
-			action: DeviceAction.REMOVE,
-			success,
-		}
-	}
 	private _triggerupdateExpectedPlayoutItems() {
 		if (!this._initialized) return
 		if (this._triggerupdateExpectedPlayoutItemsTimeout) {
@@ -1047,7 +746,7 @@ export class TSRHandler {
 		}
 
 		await Promise.all(
-			_.map(this.tsr.getDevices(), async (container) => {
+			_.map(this.tsr.connectionManager.getConnections(), async (container) => {
 				if (!container.details.supportsExpectedPlayoutItems) {
 					return
 				}
@@ -1085,12 +784,12 @@ export class TSRHandler {
 		const datastoreObjs = datastoreCollection.find({
 			studioId: peripheralDevice.studioId,
 		})
-		const datastore: Record<string, any> = {}
+		const datastore: Datastore = {}
 		for (const { key, value, modified } of datastoreObjs) {
 			datastore[key] = { value, modified }
 		}
 
-		this.logger.debug(datastore)
+		this.logger.debug('datastore', datastore)
 		this.tsr.setDatastore(datastore)
 	}
 	/**
@@ -1239,19 +938,3 @@ export function getHash(str: string): string {
 export function stringifyIds(ids: string[]): string {
 	return ids.map((id) => `"${id}"`).join(', ')
 }
-
-async function addListenerToDevice<T extends keyof DeviceEvents>(
-	device: BaseRemoteDeviceIntegration<DeviceOptionsAny>,
-	eventName: T,
-	fcn: EventEmitter.EventListener<DeviceEvents, T>
-): Promise<void> {
-	// Note for the future:
-	// It is important that the callbacks returns void,
-	// otherwise there might be problems with threadedclass!
-	// Also, it is critical that all of these `.on` calls be `await`ed.
-	// They aren't typed as promises due to limitations of TypeScript,
-	// but due to threadedclass they _are_ promises.
-
-	const emitterHack = device.device as unknown as EventEmitter<DeviceEvents>
-	await Promise.resolve(emitterHack.on(eventName, fcn))
-}
diff --git a/packages/playout-gateway/src/versions.ts b/packages/playout-gateway/src/versions.ts
index ca8a2d9acf..7c98a78995 100644
--- a/packages/playout-gateway/src/versions.ts
+++ b/packages/playout-gateway/src/versions.ts
@@ -1,3 +1,4 @@
+import { stringifyError } from '@sofie-automation/server-core-integration'
 import * as Winston from 'winston'
 
 export function getVersions(logger: Winston.Logger): { [packageName: string]: string } {
@@ -23,7 +24,7 @@ export function getVersions(logger: Winston.Logger): { [packageName: string]: st
 				const pkgInfo = require(`${pkgName}/package.json`)
 				versions[pkgName] = pkgInfo.version || 'N/A'
 			} catch (e) {
-				logger.error(`Failed to load package.json for lib "${pkgName}": ${e}`)
+				logger.error(`Failed to load package.json for lib "${pkgName}": ${stringifyError(e)}`)
 			}
 		}
 	} catch (e) {
diff --git a/packages/playout-gateway/tsconfig.build.json b/packages/playout-gateway/tsconfig.build.json
index a9a75d47c1..d0f135508a 100644
--- a/packages/playout-gateway/tsconfig.build.json
+++ b/packages/playout-gateway/tsconfig.build.json
@@ -6,8 +6,7 @@
 		"outDir": "./dist",
 		"baseUrl": "./",
 		"paths": {
-			"*": ["./node_modules/*"],
-			"tv-automation-playout-gateway": ["./src/index.ts"]
+			"*": ["./node_modules/*"]
 		},
 		"types": ["node"],
 		// TSR throws some typings issues
diff --git a/packages/server-core-integration/CHANGELOG.md b/packages/server-core-integration/CHANGELOG.md
index bb719c4f41..66c7282306 100644
--- a/packages/server-core-integration/CHANGELOG.md
+++ b/packages/server-core-integration/CHANGELOG.md
@@ -3,59 +3,55 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## [1.50.2](https://github.com/nrkno/tv-automation-server-core/compare/v1.49.6...v1.50.2) (2024-05-15)
+## [1.51.1-2](https://github.com/nrkno/sofie-core/compare/v1.51.1-1...v1.51.1-2) (2024-10-24)
 
+**Note:** Version bump only for package @sofie-automation/server-core-integration
 
-### Bug Fixes
 
-* peripheraldevice child device pings not starting upon first connection SOFIE-3047 ([0379304](https://github.com/nrkno/tv-automation-server-core/commit/03793042547ea19200ef7629c53ea76a53ea7cd0))
 
 
 
-## [1.50.1](https://github.com/nrkno/tv-automation-server-core/compare/v1.49.5-0...v1.50.1) (2024-03-11)
+## [1.51.1-2](https://github.com/nrkno/sofie-core/compare/v1.51.1-1...v1.51.1-2) (2024-10-24)
 
+**Note:** Version bump only for package @sofie-automation/server-core-integration
 
 
-## [1.50.1-0](https://github.com/nrkno/tv-automation-server-core/compare/v1.50.0...v1.50.1-0) (2024-03-05)
 
 
 
-# [1.50.0](https://github.com/nrkno/tv-automation-server-core/compare/v1.49.4...v1.50.0) (2024-02-23)
+## [1.51.1-1](https://github.com/nrkno/sofie-core/compare/v1.51.1-0...v1.51.1-1) (2024-10-18)
 
+**Note:** Version bump only for package @sofie-automation/server-core-integration
 
-### Bug Fixes
 
-* don't rely on winston types in `server-core-integration`, have own logger interface ([b418530](https://github.com/nrkno/tv-automation-server-core/commit/b4185307c4d5dd3d2439e11005a858321832d02e))
-* improve disposal of core connection ([dc52fe5](https://github.com/nrkno/tv-automation-server-core/commit/dc52fe5b362e308f157e5009b0f8359ba6c63630))
 
 
 
-# [1.50.0-in-testing.5](https://github.com/nrkno/tv-automation-server-core/compare/v1.50.0-in-testing.4...v1.50.0-in-testing.5) (2023-08-25)
+## [1.51.1-0](https://github.com/nrkno/sofie-core/compare/v1.51.0...v1.51.1-0) (2024-10-18)
 
+**Note:** Version bump only for package @sofie-automation/server-core-integration
 
 
-# [1.50.0-in-testing.4](https://github.com/nrkno/tv-automation-server-core/compare/v1.49.0-in-testing.7...v1.50.0-in-testing.4) (2023-08-23)
 
 
 
-# [1.50.0-in-testing.2](https://github.com/nrkno/tv-automation-server-core/compare/v1.50.0-in-testing.1...v1.50.0-in-testing.2) (2023-07-17)
+## [1.51.1-0](https://github.com/nrkno/sofie-core/compare/v1.51.0...v1.51.1-0) (2024-10-18)
+
+**Note:** Version bump only for package @sofie-automation/server-core-integration
 
 
-### Bug Fixes
 
-* **server-core-integration:** `autosubscribe` will resubscribe to collections using the same subscriptionId as when initially subscribed ([f0f3383](https://github.com/nrkno/tv-automation-server-core/commit/f0f33837b07b944abe320ae4a378641bba167a3c))
 
 
-### Features
+# [1.51.0](https://github.com/nrkno/sofie-core/compare/v1.51.0-in-testing.3...v1.51.0) (2024-10-07)
 
-* move gateway settings onto Studio SOFIE-1330 ([#907](https://github.com/nrkno/tv-automation-server-core/issues/907)) ([523c061](https://github.com/nrkno/tv-automation-server-core/commit/523c061c51296e21814deeeabbe9aafca21cd5a6))
-* peripheral device tidying ([#906](https://github.com/nrkno/tv-automation-server-core/issues/906)) ([0795ae5](https://github.com/nrkno/tv-automation-server-core/commit/0795ae5c0517114a34e350d5a5afbf7a731e9794))
+**Note:** Version bump only for package @sofie-automation/server-core-integration
 
 
 
 
 
-## [1.50.1](https://github.com/nrkno/tv-automation-server-core/compare/v1.50.1-0...v1.50.1) (2024-03-11)
+# [1.51.0](https://github.com/nrkno/sofie-core/compare/v1.51.0-in-testing.3...v1.51.0) (2024-10-07)
 
 **Note:** Version bump only for package @sofie-automation/server-core-integration
 
@@ -63,7 +59,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-## [1.50.1-0](https://github.com/nrkno/tv-automation-server-core/compare/v1.50.0...v1.50.1-0) (2024-03-05)
+# [1.51.0-in-testing.3](https://github.com/nrkno/sofie-core/compare/v1.51.0-in-testing.2...v1.51.0-in-testing.3) (2024-09-25)
 
 **Note:** Version bump only for package @sofie-automation/server-core-integration
 
@@ -71,41 +67,138 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-# [1.50.0](https://github.com/nrkno/tv-automation-server-core/compare/v1.49.4...v1.50.0) (2024-02-23)
+# [1.51.0-in-testing.2](https://github.com/nrkno/sofie-core/compare/v1.51.0-in-testing.1...v1.51.0-in-testing.2) (2024-09-24)
+
+**Note:** Version bump only for package @sofie-automation/server-core-integration
+
+
+
+
+
+# [1.51.0-in-testing.1](https://github.com/nrkno/sofie-core/compare/v1.51.0-in-testing.0...v1.51.0-in-testing.1) (2024-09-06)
 
+**Note:** Version bump only for package @sofie-automation/server-core-integration
+
+
+
+
+
+# [1.51.0-in-testing.1](https://github.com/nrkno/sofie-core/compare/v1.51.0-in-testing.0...v1.51.0-in-testing.1) (2024-09-06)
+
+**Note:** Version bump only for package @sofie-automation/server-core-integration
+
+
+
+
+
+# [1.51.0-in-testing.0](https://github.com/nrkno/sofie-core/compare/v1.50.4...v1.51.0-in-testing.0) (2024-08-19)
+
+## [1.50.5-LSG-updates](https://github.com/nrkno/sofie-core/compare/v1.50.4-LSG-updates...v1.50.5-LSG-updates) (2024-08-08)
+
+## [1.50.4-LSG-updates](https://github.com/nrkno/sofie-core/compare/v1.50.3-LSG-updates...v1.50.4-LSG-updates) (2024-07-30)
 
 ### Bug Fixes
 
-* core-integration: handle error when subscribing ([e9beb34](https://github.com/nrkno/tv-automation-server-core/commit/e9beb349b3e799f6a0110deb3c75374934a463a2))
-* don't rely on winston types in `server-core-integration`, have own logger interface ([b418530](https://github.com/nrkno/tv-automation-server-core/commit/b4185307c4d5dd3d2439e11005a858321832d02e))
-* improve disposal of core connection ([dc52fe5](https://github.com/nrkno/tv-automation-server-core/commit/dc52fe5b362e308f157e5009b0f8359ba6c63630))
+- core-integration: handle error when subscribing ([3ad0c73](https://github.com/nrkno/sofie-core/commit/3ad0c73dd7fa4d9572cc00a7ffa9987fed0df4e3))
 
+### Features
 
+- backport of release51 live-status-gateway onto release50 ([0a87a95](https://github.com/nrkno/sofie-core/commit/0a87a9519ca1f344429e9b4d47a44c1a9acddff2))
+- **Device Triggers:** add support for setting shift register operations SOFIE-3136 ([c5a6292](https://github.com/nrkno/sofie-core/commit/c5a6292a85821d67653eebef75bbd929ff0cd44d))
+- refactor server-core-integration subscription handling to reduce duplication ([8eaedd2](https://github.com/nrkno/sofie-core/commit/8eaedd22e8efb9750f00ff472301c6b3f2d0f0af))
+- typed publications in gateways/peripheraldevices SOFIE-1183 ([#1056](https://github.com/nrkno/sofie-core/issues/1056)) ([0c3c1bf](https://github.com/nrkno/sofie-core/commit/0c3c1bfd2bb779034976dc34e49aa6e664ea874b))
 
-# [1.50.0-in-testing.5](https://github.com/nrkno/tv-automation-server-core/compare/v1.50.0-in-testing.4...v1.50.0-in-testing.5) (2023-08-25)
+# [1.51.0-in-testing.0](https://github.com/nrkno/sofie-core/compare/v1.50.4...v1.51.0-in-testing.0) (2024-08-19)
 
+## [1.50.5-LSG-updates](https://github.com/nrkno/sofie-core/compare/v1.50.4-LSG-updates...v1.50.5-LSG-updates) (2024-08-08)
 
+## [1.50.4-LSG-updates](https://github.com/nrkno/sofie-core/compare/v1.50.3-LSG-updates...v1.50.4-LSG-updates) (2024-07-30)
 
-# [1.50.0-in-testing.4](https://github.com/nrkno/tv-automation-server-core/compare/v1.49.0-in-testing.7...v1.50.0-in-testing.4) (2023-08-23)
+### Bug Fixes
 
+- core-integration: handle error when subscribing ([3ad0c73](https://github.com/nrkno/sofie-core/commit/3ad0c73dd7fa4d9572cc00a7ffa9987fed0df4e3))
 
+### Features
 
-# [1.50.0-in-testing.2](https://github.com/nrkno/tv-automation-server-core/compare/v1.50.0-in-testing.1...v1.50.0-in-testing.2) (2023-07-17)
+- backport of release51 live-status-gateway onto release50 ([0a87a95](https://github.com/nrkno/sofie-core/commit/0a87a9519ca1f344429e9b4d47a44c1a9acddff2))
+- **Device Triggers:** add support for setting shift register operations SOFIE-3136 ([c5a6292](https://github.com/nrkno/sofie-core/commit/c5a6292a85821d67653eebef75bbd929ff0cd44d))
+- refactor server-core-integration subscription handling to reduce duplication ([8eaedd2](https://github.com/nrkno/sofie-core/commit/8eaedd22e8efb9750f00ff472301c6b3f2d0f0af))
+- typed publications in gateways/peripheraldevices SOFIE-1183 ([#1056](https://github.com/nrkno/sofie-core/issues/1056)) ([0c3c1bf](https://github.com/nrkno/sofie-core/commit/0c3c1bfd2bb779034976dc34e49aa6e664ea874b))
 
+## [1.50.5](https://github.com/nrkno/tv-automation-server-core/compare/v1.50.4...v1.50.5) (2024-09-19)
+
+**Note:** Version bump only for package @sofie-automation/server-core-integration
+
+## [1.50.4](https://github.com/nrkno/tv-automation-server-core/compare/v1.50.3...v1.50.4) (2024-08-08)
+
+**Note:** Version bump only for package @sofie-automation/server-core-integration
+
+## [1.50.3](https://github.com/nrkno/tv-automation-server-core/compare/v1.50.2...v1.50.3) (2024-06-24)
+
+**Note:** Version bump only for package @sofie-automation/server-core-integration
+
+## [1.50.2](https://github.com/nrkno/tv-automation-server-core/compare/v1.49.6...v1.50.2) (2024-05-15)
+
+### Bug Fixes
+
+- peripheraldevice child device pings not starting upon first connection SOFIE-3047 ([0379304](https://github.com/nrkno/tv-automation-server-core/commit/03793042547ea19200ef7629c53ea76a53ea7cd0))
+
+## [1.50.1](https://github.com/nrkno/tv-automation-server-core/compare/v1.49.5-0...v1.50.1) (2024-03-11)
+
+## [1.50.1-0](https://github.com/nrkno/tv-automation-server-core/compare/v1.50.0...v1.50.1-0) (2024-03-05)
+
+# [1.50.0](https://github.com/nrkno/tv-automation-server-core/compare/v1.49.4...v1.50.0) (2024-02-23)
 
 ### Bug Fixes
 
-* **server-core-integration:** `autosubscribe` will resubscribe to collections using the same subscriptionId as when initially subscribed ([f0f3383](https://github.com/nrkno/tv-automation-server-core/commit/f0f33837b07b944abe320ae4a378641bba167a3c))
+- don't rely on winston types in `server-core-integration`, have own logger interface ([b418530](https://github.com/nrkno/tv-automation-server-core/commit/b4185307c4d5dd3d2439e11005a858321832d02e))
+- improve disposal of core connection ([dc52fe5](https://github.com/nrkno/tv-automation-server-core/commit/dc52fe5b362e308f157e5009b0f8359ba6c63630))
+
+# [1.50.0-in-testing.5](https://github.com/nrkno/tv-automation-server-core/compare/v1.50.0-in-testing.4...v1.50.0-in-testing.5) (2023-08-25)
+
+# [1.50.0-in-testing.4](https://github.com/nrkno/tv-automation-server-core/compare/v1.49.0-in-testing.7...v1.50.0-in-testing.4) (2023-08-23)
+
+# [1.50.0-in-testing.2](https://github.com/nrkno/tv-automation-server-core/compare/v1.50.0-in-testing.1...v1.50.0-in-testing.2) (2023-07-17)
 
+### Bug Fixes
+
+- **server-core-integration:** `autosubscribe` will resubscribe to collections using the same subscriptionId as when initially subscribed ([f0f3383](https://github.com/nrkno/tv-automation-server-core/commit/f0f33837b07b944abe320ae4a378641bba167a3c))
 
 ### Features
 
-* move gateway settings onto Studio SOFIE-1330 ([#907](https://github.com/nrkno/tv-automation-server-core/issues/907)) ([523c061](https://github.com/nrkno/tv-automation-server-core/commit/523c061c51296e21814deeeabbe9aafca21cd5a6))
-* peripheral device tidying ([#906](https://github.com/nrkno/tv-automation-server-core/issues/906)) ([0795ae5](https://github.com/nrkno/tv-automation-server-core/commit/0795ae5c0517114a34e350d5a5afbf7a731e9794))
+- move gateway settings onto Studio SOFIE-1330 ([#907](https://github.com/nrkno/tv-automation-server-core/issues/907)) ([523c061](https://github.com/nrkno/tv-automation-server-core/commit/523c061c51296e21814deeeabbe9aafca21cd5a6))
+- peripheral device tidying ([#906](https://github.com/nrkno/tv-automation-server-core/issues/906)) ([0795ae5](https://github.com/nrkno/tv-automation-server-core/commit/0795ae5c0517114a34e350d5a5afbf7a731e9794))
 
+## [1.50.1](https://github.com/nrkno/tv-automation-server-core/compare/v1.50.1-0...v1.50.1) (2024-03-11)
 
+**Note:** Version bump only for package @sofie-automation/server-core-integration
 
+## [1.50.1-0](https://github.com/nrkno/tv-automation-server-core/compare/v1.50.0...v1.50.1-0) (2024-03-05)
 
+**Note:** Version bump only for package @sofie-automation/server-core-integration
+
+# [1.50.0](https://github.com/nrkno/tv-automation-server-core/compare/v1.49.4...v1.50.0) (2024-02-23)
+
+### Bug Fixes
+
+- core-integration: handle error when subscribing ([e9beb34](https://github.com/nrkno/tv-automation-server-core/commit/e9beb349b3e799f6a0110deb3c75374934a463a2))
+- don't rely on winston types in `server-core-integration`, have own logger interface ([b418530](https://github.com/nrkno/tv-automation-server-core/commit/b4185307c4d5dd3d2439e11005a858321832d02e))
+- improve disposal of core connection ([dc52fe5](https://github.com/nrkno/tv-automation-server-core/commit/dc52fe5b362e308f157e5009b0f8359ba6c63630))
+
+# [1.50.0-in-testing.5](https://github.com/nrkno/tv-automation-server-core/compare/v1.50.0-in-testing.4...v1.50.0-in-testing.5) (2023-08-25)
+
+# [1.50.0-in-testing.4](https://github.com/nrkno/tv-automation-server-core/compare/v1.49.0-in-testing.7...v1.50.0-in-testing.4) (2023-08-23)
+
+# [1.50.0-in-testing.2](https://github.com/nrkno/tv-automation-server-core/compare/v1.50.0-in-testing.1...v1.50.0-in-testing.2) (2023-07-17)
+
+### Bug Fixes
+
+- **server-core-integration:** `autosubscribe` will resubscribe to collections using the same subscriptionId as when initially subscribed ([f0f3383](https://github.com/nrkno/tv-automation-server-core/commit/f0f33837b07b944abe320ae4a378641bba167a3c))
+
+### Features
+
+- move gateway settings onto Studio SOFIE-1330 ([#907](https://github.com/nrkno/tv-automation-server-core/issues/907)) ([523c061](https://github.com/nrkno/tv-automation-server-core/commit/523c061c51296e21814deeeabbe9aafca21cd5a6))
+- peripheral device tidying ([#906](https://github.com/nrkno/tv-automation-server-core/issues/906)) ([0795ae5](https://github.com/nrkno/tv-automation-server-core/commit/0795ae5c0517114a34e350d5a5afbf7a731e9794))
 
 # [1.50.0-in-testing.5](https://github.com/nrkno/tv-automation-server-core/compare/v1.50.0-in-testing.4...v1.50.0-in-testing.5) (2023-08-25)
 
@@ -160,18 +253,10 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 **Note:** Version bump only for package @sofie-automation/server-core-integration
 
-
-
-
-
 ## [1.49.2](https://github.com/nrkno/tv-automation-server-core/compare/v1.49.1...v1.49.2) (2023-11-29)
 
 **Note:** Version bump only for package @sofie-automation/server-core-integration
 
-
-
-
-
 ## [1.49.1](https://github.com/nrkno/tv-automation-server-core/compare/v1.49.0...v1.49.1) (2023-10-20)
 
 **Note:** Version bump only for package @sofie-automation/server-core-integration
diff --git a/packages/server-core-integration/package.json b/packages/server-core-integration/package.json
index 3d44e2c986..98605c6d68 100644
--- a/packages/server-core-integration/package.json
+++ b/packages/server-core-integration/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@sofie-automation/server-core-integration",
-	"version": "1.51.0-in-development",
+	"version": "1.52.0-in-development",
 	"description": "Library for connecting to Core",
 	"main": "dist/index.js",
 	"typings": "dist/index.d.ts",
@@ -9,13 +9,13 @@
 	"license": "MIT",
 	"repository": {
 		"type": "git",
-		"url": "git+https://github.com/nrkno/tv-automation-server-core.git",
+		"url": "git+https://github.com/nrkno/sofie-core.git",
 		"directory": "packages/server-core-integration"
 	},
 	"bugs": {
-		"url": "https://github.com/nrkno/tv-automation-server-core/issues"
+		"url": "https://github.com/nrkno/sofie-core/issues"
 	},
-	"homepage": "https://github.com/nrkno/tv-automation-server-core/blob/master/packages/server-core-integration#readme",
+	"homepage": "https://github.com/nrkno/sofie-core/blob/master/packages/server-core-integration#readme",
 	"author": {
 		"name": "Johan Nyman",
 		"email": "johan@superfly.tv",
@@ -70,7 +70,7 @@
 		"production"
 	],
 	"dependencies": {
-		"@sofie-automation/shared-lib": "1.51.0-in-development",
+		"@sofie-automation/shared-lib": "1.52.0-in-development",
 		"ejson": "^2.2.3",
 		"eventemitter3": "^4.0.7",
 		"faye-websocket": "^0.11.4",
diff --git a/packages/shared-lib/package.json b/packages/shared-lib/package.json
index d2c4be6f57..40c506ca0c 100644
--- a/packages/shared-lib/package.json
+++ b/packages/shared-lib/package.json
@@ -1,19 +1,19 @@
 {
 	"name": "@sofie-automation/shared-lib",
-	"version": "1.51.0-in-development",
+	"version": "1.52.0-in-development",
 	"description": "Library for types & values shared by core, workers and gateways",
 	"main": "dist/index.js",
 	"typings": "dist/index.d.ts",
 	"license": "MIT",
 	"repository": {
 		"type": "git",
-		"url": "git+https://github.com/nrkno/tv-automation-server-core.git",
+		"url": "git+https://github.com/nrkno/sofie-core.git",
 		"directory": "packages/sharelib"
 	},
 	"bugs": {
-		"url": "https://github.com/nrkno/tv-automation-server-core/issues"
+		"url": "https://github.com/nrkno/sofie-core/issues"
 	},
-	"homepage": "https://github.com/nrkno/tv-automation-server-core/blob/master/packages/sharelib#readme",
+	"homepage": "https://github.com/nrkno/sofie-core/blob/master/packages/sharelib#readme",
 	"scripts": {
 		"build": "run -T rimraf dist && run build:main",
 		"build:main": "run -T tsc -p tsconfig.build.json",
@@ -38,8 +38,8 @@
 		"/LICENSE"
 	],
 	"dependencies": {
-		"@mos-connection/model": "^4.1.1-nightly-master-20240430-072032-ffb8bf6.0",
-		"timeline-state-resolver-types": "9.1.0-nightly-release51-20240228-132329-b7ceb6950.0",
+		"@mos-connection/model": "v4.2.0-alpha.1",
+		"timeline-state-resolver-types": "9.2.0-nightly-release52-20240923-122840-58cfbb259.0",
 		"tslib": "^2.6.2",
 		"type-fest": "^3.13.1"
 	},
diff --git a/packages/shared-lib/src/__tests__/index.spec.ts b/packages/shared-lib/src/__tests__/index.spec.ts
deleted file mode 100644
index 73e9c07fdc..0000000000
--- a/packages/shared-lib/src/__tests__/index.spec.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-test('noop', () => {
-	expect(1).toBe(1)
-})
diff --git a/packages/shared-lib/src/core/constants.ts b/packages/shared-lib/src/core/constants.ts
index 494e2eb7f7..d36e413229 100644
--- a/packages/shared-lib/src/core/constants.ts
+++ b/packages/shared-lib/src/core/constants.ts
@@ -19,5 +19,8 @@ export const DEFAULT_TSR_ACTION_TIMEOUT_TIME = 5 * 1000
 /** How much time must pass, in milliseconds, after a take before another take is allowed */
 export const DEFAULT_MINIMUM_TAKE_SPAN = 1000
 
+/** The duration to apply on too short Parts Within QuickLoop when ForceQuickLoopAutoNext.ENABLED_FORCING_MIN_DURATION is selected */
+export const DEFAULT_FALLBACK_PART_DURATION = 3000
+
 /** The expected time it takes from an ingest operation to receiving a new timeline in the playout-gateway */
 export const EXPECTED_INGEST_TO_PLAYOUT_TIME = 500
diff --git a/packages/shared-lib/src/core/model/PackageContainer.ts b/packages/shared-lib/src/core/model/PackageContainer.ts
new file mode 100644
index 0000000000..f2eeeab894
--- /dev/null
+++ b/packages/shared-lib/src/core/model/PackageContainer.ts
@@ -0,0 +1,7 @@
+import { PackageContainer } from '../../package-manager/package'
+
+export interface StudioPackageContainer {
+	/** List of which peripheraldevices uses this packageContainer */
+	deviceIds: string[]
+	container: PackageContainer
+}
diff --git a/packages/shared-lib/src/core/model/ShowStyle.ts b/packages/shared-lib/src/core/model/ShowStyle.ts
index 4a7a2ec8da..9c1825ff28 100644
--- a/packages/shared-lib/src/core/model/ShowStyle.ts
+++ b/packages/shared-lib/src/core/model/ShowStyle.ts
@@ -95,6 +95,7 @@ export enum PlayoutActions {
 	reloadRundownPlaylistData = 'reloadRundownPlaylistData',
 	disableNextPiece = 'disableNextPiece',
 	activateAdlibTestingMode = 'activateAdlibTestingMode',
+	switchRouteSet = 'switchRouteSet',
 }
 
 export enum ClientActions {
diff --git a/packages/shared-lib/src/core/model/StudioRouteSet.ts b/packages/shared-lib/src/core/model/StudioRouteSet.ts
new file mode 100644
index 0000000000..4928eb0192
--- /dev/null
+++ b/packages/shared-lib/src/core/model/StudioRouteSet.ts
@@ -0,0 +1,67 @@
+import { BlueprintMapping } from './Timeline'
+import { TSR } from '../../tsr'
+
+export type AbPlayerId = number | string
+
+export interface StudioRouteSetExclusivityGroup {
+	name: string
+}
+
+export interface StudioRouteSet {
+	/** User-presentable name */
+	name: string
+	/** Whether this group is active or not */
+	active: boolean
+	/** Default state of this group */
+	defaultActive?: boolean
+	/** Only one Route can be active at the same time in the exclusivity-group */
+	exclusivityGroup?: string
+	/** If true, should be displayed and toggleable by user */
+	behavior: StudioRouteBehavior
+
+	routes: RouteMapping[]
+	/**
+	 * AB Pool members
+	 * An AB player will be active if either no routesets reference it, or any active routset references it.
+	 * Specify the players here which this routeset should enable
+	 */
+	abPlayers: StudioAbPlayerDisabling[]
+}
+
+export enum StudioRouteBehavior {
+	HIDDEN = 0,
+	TOGGLE = 1,
+	ACTIVATE_ONLY = 2,
+}
+
+export enum StudioRouteType {
+	/** Default */
+	REROUTE = 0,
+	/** Replace all properties with a new mapping */
+	REMAP = 1,
+}
+
+export interface RouteMapping extends ResultingMappingRoute {
+	/** Which original layer to route. If false, a "new" layer will be inserted during routing */
+	mappedLayer: string | undefined
+}
+
+export interface StudioAbPlayerDisabling {
+	poolName: string
+	playerId: AbPlayerId
+}
+
+export interface ResultingMappingRoutes {
+	/** Routes that route existing layers */
+	existing: {
+		[mappedLayer: string]: ResultingMappingRoute[]
+	}
+	/** Routes that create new layers, from nothing */
+	inserted: ResultingMappingRoute[]
+}
+export interface ResultingMappingRoute {
+	outputMappedLayer: string
+	deviceType?: TSR.DeviceType
+	remapping?: Partial<BlueprintMapping>
+	routeType: StudioRouteType
+}
diff --git a/packages/shared-lib/src/core/model/Timeline.ts b/packages/shared-lib/src/core/model/Timeline.ts
index 2eeb041172..8c6ece2934 100644
--- a/packages/shared-lib/src/core/model/Timeline.ts
+++ b/packages/shared-lib/src/core/model/Timeline.ts
@@ -16,6 +16,14 @@ export interface TimelineObjectAbSessionInfo {
 	 * The name of the AB Pool this session is for
 	 */
 	poolName: string
+
+	/**
+	 * Whether the `sessionName` of this session is globally unique
+	 * This means that every usage of this name will be treated as the same session, regardless of where it is used
+	 * This should typically only be used when generating a unique id in an adlib-action, if used during ingest
+	 * then replaying a part will often cause the session to be reused which is likely not the desired behaviour
+	 */
+	sessionNameIsGloballyUnique?: boolean
 }
 
 export enum TimelineObjHoldMode {
diff --git a/packages/shared-lib/src/lib/__tests__/lib.spec.ts b/packages/shared-lib/src/lib/__tests__/lib.spec.ts
new file mode 100644
index 0000000000..83a0da9833
--- /dev/null
+++ b/packages/shared-lib/src/lib/__tests__/lib.spec.ts
@@ -0,0 +1,10 @@
+import { equalSets, equivalentArrays } from '../lib'
+
+test('equalSets', () => {
+	expect(equalSets(new Set(['a', 'b', 'c']), new Set(['c', 'b', 'a']))).toBe(true)
+	expect(equalSets(new Set(['a', 'b', 'c']), new Set(['d', 'b', 'a']))).toBe(false)
+})
+test('equivalentArrays', () => {
+	expect(equivalentArrays(['a', 'b', 'c'], ['c', 'a', 'b'])).toBe(true)
+	expect(equivalentArrays(['a', 'b', 'c'], ['b', 'g', 'a'])).toBe(false)
+})
diff --git a/packages/shared-lib/src/lib/lib.ts b/packages/shared-lib/src/lib/lib.ts
index ac212a06c8..1eac0d8323 100644
--- a/packages/shared-lib/src/lib/lib.ts
+++ b/packages/shared-lib/src/lib/lib.ts
@@ -1,3 +1,5 @@
+import { ProtectedString } from './protectedString'
+
 export type Time = number
 export type TimeDuration = number
 
@@ -7,6 +9,73 @@ export function assertNever(_never: never): void {
 export function literal<T>(o: T): T {
 	return o
 }
+
+/** Convenience function, to be used when length of array has previously been verified */
+export function last<T>(values: T[]): T {
+	return values[values.length - 1]
+}
+
+export function objectFromEntries<Key extends ProtectedString<any>, Val>(
+	entries: Array<[Key, Val]>
+): Record<string, Val> {
+	return Object.fromEntries(entries)
+}
+
 export async function sleep(ms: number): Promise<void> {
 	return new Promise((resolve) => setTimeout(resolve, ms))
 }
+
+export function isPromise<T>(val: unknown): val is Promise<T> {
+	const val0 = val as any
+	return val0 && typeof val0 == 'object' && typeof val0.then === 'function' && typeof val0.catch === 'function'
+}
+
+/**
+ * This is a fast, shallow compare of two Sets.
+ *
+ * **Note**: This is a shallow compare, so it will return false if the objects in the arrays are identical, but not the same.
+ *
+ * @param a
+ * @param b
+ */
+export function equalSets<T>(a: Set<T>, b: Set<T>): boolean {
+	if (a === b) return true
+	if (a.size !== b.size) return false
+	for (const val of a.values()) {
+		if (!b.has(val)) return false
+	}
+	return true
+}
+
+/**
+ * This is a fast, shallow compare of two arrays that are used as unsorted lists. The ordering of the elements is ignored.
+ *
+ * **Note**: This is a shallow compare, so it will return false if the objects in the arrays are identical, but not the same.
+ *
+ * @param a
+ * @param b
+ */
+export function equivalentArrays<T>(a: T[], b: T[]): boolean {
+	if (a === b) return true
+	if (a.length !== b.length) return false
+	for (let i = 0; i < a.length; i++) {
+		if (!b.includes(a[i])) return false
+	}
+	return true
+}
+
+/**
+ * This is a fast, shallow compare of two arrays of the same type.
+ *
+ * **Note**: This is a shallow compare, so it will return false if the objects in the arrays are identical, but not the same.
+ * @param a
+ * @param b
+ */
+export function equalArrays<T>(a: T[], b: T[]): boolean {
+	if (a === b) return true
+	if (a.length !== b.length) return false
+	for (let i = 0; i < a.length; i++) {
+		if (b[i] !== a[i]) return false
+	}
+	return true
+}
diff --git a/packages/shared-lib/src/lib/types.ts b/packages/shared-lib/src/lib/types.ts
new file mode 100644
index 0000000000..94d7ae43f7
--- /dev/null
+++ b/packages/shared-lib/src/lib/types.ts
@@ -0,0 +1,40 @@
+/**
+ * Make all optional properties be required and `| undefined`
+ * This is useful to ensure that no property is missed, when manually converting between types, but allowing fields to be undefined
+ */
+export type Complete<T> = {
+	[P in keyof Required<T>]: Pick<T, P> extends Required<Pick<T, P>> ? T[P] : T[P] | undefined
+}
+
+export type ArrayElement<A> = A extends readonly (infer T)[] ? T : never
+
+export type Subtract<T extends T1, T1 extends object> = Pick<T, Exclude<keyof T, keyof T1>>
+
+export type PromisifyCallbacks<T> = {
+	[K in keyof T]: PromisifyFunction<T[K]>
+}
+type PromisifyFunction<T> = T extends (...args: any) => any
+	? (...args: Parameters<T>) => Promise<ReturnType<T>> | ReturnType<T>
+	: T
+
+export type Awaited<T> = T extends PromiseLike<infer U> ? Awaited<U> : T
+
+/**
+ * Thanks to https://github.com/Microsoft/TypeScript/issues/23126#issuecomment-395929162
+ */
+export type OptionalPropertyNames<T> = {
+	[K in keyof T]-?: undefined extends T[K] ? K : never
+}[keyof T]
+export type RequiredPropertyNames<T> = {
+	[K in keyof T]-?: undefined extends T[K] ? never : K
+}[keyof T]
+export type OptionalProperties<T> = Pick<T, OptionalPropertyNames<T>>
+export type RequiredProperties<T> = Pick<T, RequiredPropertyNames<T>>
+
+export type Diff<T, U> = T extends U ? never : T // Remove types from T that are assignable to U
+export type KeysByType<TObj, TVal> = Diff<
+	{
+		[K in keyof TObj]: TObj[K] extends TVal ? K : never
+	}[keyof TObj],
+	undefined
+>
diff --git a/packages/shared-lib/src/package-manager/helpers.ts b/packages/shared-lib/src/package-manager/helpers.ts
new file mode 100644
index 0000000000..c6eb6d8bb1
--- /dev/null
+++ b/packages/shared-lib/src/package-manager/helpers.ts
@@ -0,0 +1,61 @@
+import { ExpectedPackage } from './package'
+
+// Note: These functions are copied from Package Manager
+
+type Steps = Required<ExpectedPackage.ExpectedPackageHtmlTemplate['version']>['steps']
+
+export function htmlTemplateGetSteps(version: ExpectedPackage.ExpectedPackageHtmlTemplate['version']): Steps {
+	let steps: Steps
+	if (version.casparCG) {
+		// Generate a set of steps for standard CasparCG templates
+		const casparData = version.casparCG.data
+		const casparDataJSON = typeof casparData === 'string' ? casparData : JSON.stringify(casparData)
+		steps = [
+			{ do: 'waitForLoad' },
+			{ do: 'takeScreenshot', fileName: 'idle.png' },
+			{ do: 'startRecording', fileName: 'preview.webm' },
+			{ do: 'executeJs', js: `update(${casparDataJSON})` },
+			{ do: 'executeJs', js: `play()` },
+			{ do: 'sleep', duration: 1000 },
+			{ do: 'takeScreenshot', fileName: 'play.png' },
+			{ do: 'executeJs', js: `stop()` },
+			{ do: 'sleep', duration: 1000 },
+			{ do: 'takeScreenshot', fileName: 'stop.png' },
+			{ do: 'stopRecording' },
+			{ do: 'cropRecording', fileName: 'preview-cropped.webm' },
+		]
+	} else {
+		steps = version.steps || []
+	}
+	return steps
+}
+export function htmlTemplateGetFileNamesFromSteps(steps: Steps): {
+	/** List of all file names that will be output from in the steps */
+	fileNames: string[]
+	/** The "main file", ie the file that will carry the main metadata */
+	mainFileName: string | undefined
+	/** File name of the main (first) screenshot */
+	mainScreenShot: string | undefined
+	/** File name of the main (first) recording */
+	mainRecording: string | undefined
+} {
+	const fileNames: string[] = []
+	let mainFileName: string | undefined = undefined
+	let mainScreenShot: string | undefined = undefined
+	let mainRecording: string | undefined = undefined
+
+	for (const step of steps) {
+		if (step.do === 'takeScreenshot') {
+			fileNames.push(step.fileName)
+			if (!mainFileName) mainFileName = step.fileName
+			if (!mainScreenShot) mainScreenShot = step.fileName
+		} else if (step.do === 'startRecording') {
+			fileNames.push(step.fileName)
+			mainFileName = step.fileName
+			if (!mainRecording) mainRecording = step.fileName
+		} else if (step.do === 'cropRecording') {
+			fileNames.push(step.fileName)
+		}
+	}
+	return { fileNames, mainFileName, mainScreenShot, mainRecording }
+}
diff --git a/packages/shared-lib/src/package-manager/package.ts b/packages/shared-lib/src/package-manager/package.ts
index 6eab512b61..bf2dddd34f 100644
--- a/packages/shared-lib/src/package-manager/package.ts
+++ b/packages/shared-lib/src/package-manager/package.ts
@@ -7,14 +7,23 @@
 
 import { StatusCode } from '../lib/status'
 
+type AccessorId = string
+type ExpectedPackageId = string
+type PackageContainerId = string
+
 // eslint-disable-next-line @typescript-eslint/no-namespace
 export namespace ExpectedPackage {
-	export type Any = ExpectedPackageMediaFile | ExpectedPackageQuantelClip | ExpectedPackageJSONData
+	export type Any =
+		| ExpectedPackageMediaFile
+		| ExpectedPackageQuantelClip
+		| ExpectedPackageJSONData
+		| ExpectedPackageHtmlTemplate
 
 	export enum PackageType {
 		MEDIA_FILE = 'media_file',
 		QUANTEL_CLIP = 'quantel_clip',
 		JSON_DATA = 'json_data',
+		HTML_TEMPLATE = 'html_template',
 
 		// TALLY_LABEL = 'tally_label'
 
@@ -24,7 +33,7 @@ export namespace ExpectedPackage {
 	/** Generic (used in extends) */
 	export interface Base {
 		/** Unique id of the expectedPackage */
-		_id: string
+		_id: ExpectedPackageId
 		/** Reference to which timeline-layer(s) the Package is going to be used in.
 		 * (Used to route the package to the right playout-device (targets))
 		 */
@@ -54,19 +63,21 @@ export namespace ExpectedPackage {
 		 */
 		sources: {
 			/** Reference to a PackageContainer */
-			containerId: string
+			containerId: PackageContainerId
 			/** Locally defined Accessors, these are combined (deep extended) with the PackageContainer (if it is found) Accessors */
-			accessors: { [accessorId: string]: AccessorOnPackage.Any }
+			accessors: {
+				[accessorId: AccessorId]: AccessorOnPackage.Any
+			}
 		}[]
 
 		/** The sideEffect is used by the Package Manager to generate extra artifacts, such as thumbnails & previews */
 		sideEffect: {
 			/** Which container previews are to be put into */
-			previewContainerId?: string | null // null is used to disable the sideEffect
+			previewContainerId?: PackageContainerId | null // null is used to disable the sideEffect
 			previewPackageSettings?: SideEffectPreviewSettings | null
 
 			/** Which container thumbnails are to be put into */
-			thumbnailContainerId?: string | null // null is used to disable the sideEffect
+			thumbnailContainerId?: PackageContainerId | null // null is used to disable the sideEffect
 			thumbnailPackageSettings?: SideEffectThumbnailSettings | null
 
 			/** Should the package be scanned for loudness */
@@ -110,7 +121,7 @@ export namespace ExpectedPackage {
 	export interface ExpectedPackageMediaFile extends Base {
 		type: PackageType.MEDIA_FILE
 		content: {
-			/** Local file path on the playout device */
+			/** Local file path on the package container */
 			filePath: string
 		}
 		version: {
@@ -120,9 +131,9 @@ export namespace ExpectedPackage {
 			checkSumType?: 'sha' | 'md5' | 'whatever'
 		}
 		sources: {
-			containerId: string
+			containerId: PackageContainerId
 			accessors: {
-				[accessorId: string]:
+				[accessorId: AccessorId]:
 					| AccessorOnPackage.LocalFolder
 					| AccessorOnPackage.FileShare
 					| AccessorOnPackage.HTTP
@@ -149,8 +160,8 @@ export namespace ExpectedPackage {
 			cloneId?: number
 		}
 		sources: {
-			containerId: string
-			accessors: { [accessorId: string]: AccessorOnPackage.Quantel }
+			containerId: PackageContainerId
+			accessors: { [accessorId: AccessorId]: AccessorOnPackage.Quantel }
 		}[]
 	}
 
@@ -162,9 +173,9 @@ export namespace ExpectedPackage {
 		}
 		version: any // {}
 		sources: {
-			containerId: string
+			containerId: PackageContainerId
 			accessors: {
-				[accessorId: string]:
+				[accessorId: AccessorId]:
 					| AccessorOnPackage.HTTP
 					| AccessorOnPackage.HTTPProxy
 					| AccessorOnPackage.LocalFolder
@@ -172,6 +183,90 @@ export namespace ExpectedPackage {
 			}
 		}[]
 	}
+	export interface ExpectedPackageHtmlTemplate extends Base {
+		type: PackageType.HTML_TEMPLATE
+		content: {
+			/** path to the HTML template */
+			path: string
+		}
+		version: {
+			renderer?: {
+				/** Renderer width, defaults to 1920 */
+				width?: number
+				/** Renderer height, defaults to 1080 */
+				height?: number
+				/**
+				 * Scale the rendered width and height with this value, and also zoom the content accordingly.
+				 * For example, if the width is 1920 and scale is 0.5, the width will be scaled to 960.
+				 * (Defaults to 1)
+				 */
+				scale?: number
+				/** Background color, #RRGGBB, CSS-string, "transparent" or "default" (defaults to "default") */
+				background?: string
+				userAgent?: string
+			}
+
+			/**
+			 * Convenience settings for a template that follows the typical CasparCG steps;
+			 * update(data); play(); stop();
+			 * If this is set, steps are overridden */
+			casparCG?: {
+				/**
+				 * Data to send into the update() function of a CasparCG Template.
+				 * Strings will be piped through as-is, objects will be JSON.stringified.
+				 */
+				data: { [key: string]: any } | null | string
+
+				/** How long to wait between each action in a CasparCG template, (default: 1000ms) */
+				delay?: number
+			}
+
+			steps?: (
+				| { do: 'waitForLoad' }
+				| { do: 'sleep'; duration: number }
+				| {
+						do: 'sendHTTPCommand'
+						url: string
+						/** GET, POST, PUT etc.. */
+						method: string
+						body?: ArrayBuffer | ArrayBufferView | NodeJS.ReadableStream | string | URLSearchParams
+
+						headers?: Record<string, string>
+				  }
+				| { do: 'takeScreenshot'; fileName: string }
+				| { do: 'startRecording'; fileName: string }
+				| { do: 'stopRecording' }
+				| { do: 'cropRecording'; fileName: string }
+				| { do: 'executeJs'; js: string }
+				// Store an object in memory
+				| {
+						do: 'storeObject'
+						key: string
+						/** The value to store into memory. Either an object, or a JSON-stringified object */
+						value: Record<string, any> | string
+				  }
+				// Modify an object in memory. Path is a dot-separated string
+				| { do: 'modifyObject'; key: string; path: string; value: any }
+				// Send an object to the renderer as a postMessage (so basically does a executeJs: window.postMessage(memory[key]))
+				| {
+						do: 'injectObject'
+						key: string
+						/** The method to receive the value. Defaults to window.postMessage */
+						receivingFunction?: string
+				  }
+			)[]
+		}
+		sources: {
+			containerId: PackageContainerId
+			accessors: {
+				[accessorId: AccessorId]:
+					| AccessorOnPackage.LocalFolder
+					| AccessorOnPackage.FileShare
+					| AccessorOnPackage.HTTP
+					| AccessorOnPackage.HTTPProxy
+			}
+		}[]
+	}
 }
 
 /** A PackageContainer defines a place that contains Packages, that can be read or written to.
@@ -185,7 +280,7 @@ export interface PackageContainer {
 	label: string
 
 	/** A list of ways to access the PackageContainer. Note: The accessors are different ways to access THE SAME PackageContainer. */
-	accessors: { [accessorId: string]: Accessor.Any }
+	accessors: { [accessorId: AccessorId]: Accessor.Any }
 }
 
 /** Defines different ways of accessing a PackageContainer.
@@ -245,10 +340,16 @@ export namespace Accessor {
 		allowWrite: false
 
 		/** Base url (url to the host), for example http://myhost.com/fileShare/ */
-		baseUrl: string
+		baseUrl?: string
 
 		/** Name/Id of the network the share exists on. Used to differ between different local networks. Leave empty if globally accessible. */
 		networkId?: string
+
+		/** If true, assumes that a source never changes once it has been fetched. */
+		isImmutable?: boolean
+
+		/** If true, assumes that the source doesn't support HEAD requests and will use GET instead. If false, HEAD requests will be sent to check availability. */
+		useGETinsteadOfHEAD?: boolean
 	}
 	/** Definition of access to the HTTP-proxy server that comes with Package Manager. */
 	export interface HTTPProxy extends Base {
@@ -263,7 +364,7 @@ export namespace Accessor {
 	export interface Quantel extends Base {
 		type: AccessType.QUANTEL
 
-		/** URL to a Quantel-gateway (https://github.com/nrkno/tv-automation-quantel-gateway) */
+		/** URL to a Quantel-gateway (https://github.com/nrkno/sofie-quantel-gateway) */
 		quantelGatewayUrl: string
 
 		/** Locations of the Quantel ISA:s (in order of importance) */
@@ -343,11 +444,11 @@ export namespace AccessorOnPackage {
 }
 
 export interface PackageContainerOnPackage extends Omit<PackageContainer, 'accessors'> {
-	containerId: string
+	containerId: PackageContainerId
 	/** Short name, for displaying to user */
 	label: string
 
-	accessors: { [accessorId: string]: AccessorOnPackage.Any }
+	accessors: { [accessorId: AccessorId]: AccessorOnPackage.Any }
 }
 
 // todo: should this be moved into core-integration?
diff --git a/packages/tsconfig.json b/packages/tsconfig.json
index 6e84729385..71c49cb4de 100644
--- a/packages/tsconfig.json
+++ b/packages/tsconfig.json
@@ -9,6 +9,8 @@
 		{ "path": "corelib" },
 		{ "path": "shared-lib" },
 		{ "path": "openapi" },
-		{ "path": "live-status-gateway" }
+		{ "path": "live-status-gateway" },
+		{ "path": "meteor-lib" },
+		{ "path": "webui" }
 	]
 }
diff --git a/packages/webui/.eslintignore b/packages/webui/.eslintignore
new file mode 100644
index 0000000000..584fca0cbe
--- /dev/null
+++ b/packages/webui/.eslintignore
@@ -0,0 +1,4 @@
+/public
+/dist
+/src/fonts
+/src/meteor
diff --git a/packages/webui/.eslintrc.cjs b/packages/webui/.eslintrc.cjs
new file mode 100644
index 0000000000..17d7af8b27
--- /dev/null
+++ b/packages/webui/.eslintrc.cjs
@@ -0,0 +1,153 @@
+// module.exports = {
+//   root: true,
+//   env: { browser: true, es2020: true },
+//   extends: [
+//     'eslint:recommended',
+//     'plugin:@typescript-eslint/recommended',
+//     'plugin:react-hooks/recommended',
+//   ],
+//   ignorePatterns: ['dist', '.eslintrc.cjs'],
+//   parser: '@typescript-eslint/parser',
+//   plugins: ['react-refresh'],
+//   rules: {
+//     'react-refresh/only-export-components': [
+//       'warn',
+//       { allowConstantExport: true },
+//     ],
+//   },
+// }
+
+const {
+	commonPlugins,
+	tsPlugins,
+	commonExtends,
+	tsExtends,
+	commonRules,
+	tsRules,
+	tsParser,
+} = require('@sofie-automation/code-standard-preset/eslint/fragments') // eslint-disable-line node/no-unpublished-require
+
+const tmpRules = {
+	// Temporary rules to be removed over time
+	'@typescript-eslint/ban-types': 'off',
+	'@typescript-eslint/no-namespace': 'off',
+	'@typescript-eslint/no-var-requires': 'off',
+	'@typescript-eslint/no-non-null-assertion': 'off',
+	'@typescript-eslint/unbound-method': 'off',
+	'@typescript-eslint/no-misused-promises': 'off',
+	'@typescript-eslint/no-unnecessary-type-assertion': 'off',
+}
+
+const tsBase = {
+	extends: [...tsExtends],
+	plugins: tsPlugins,
+	...tsParser,
+	parserOptions: { project: './tsconfig.eslint.json' },
+	settings: {
+		node: {
+			tryExtensions: ['.js', '.json', '.node', '.ts', '.tsx', '.d.ts'],
+		},
+	},
+	env: {
+		'jest/globals': false, // Block jest from this
+	},
+	rules: {
+		...commonRules,
+		...tsRules,
+
+		// custom
+		'no-inner-declarations': 'off', // some functions are unexported and placed inside a namespace next to related ones
+		'node/no-missing-import': [
+			'error',
+			{
+				allowModules: ['meteor', 'mongodb'],
+				tryExtensions: ['.js', '.json', '.node', '.ts', '.tsx', '.d.ts'],
+			},
+		],
+		'node/no-extraneous-import': [
+			'error',
+			{
+				allowModules: ['meteor', 'mongodb'],
+			},
+		],
+		'jest/no-standalone-expect': 'off', // testInFiber confuses the rule
+		...tmpRules,
+
+		'react/react-in-jsx-scope': 'off',
+	},
+}
+
+module.exports = {
+	extends: [...commonExtends, 'plugin:react/recommended'],
+	plugins: [...commonPlugins, 'react'],
+	rules: {
+		'prettier/prettier': 'error',
+	},
+	env: { browser: true, es2020: true },
+	parserOptions: { sourceType: 'module', ecmaVersion: 2020 },
+	settings: {
+		react: {
+			version: 'detect', // Tells eslint-plugin-react to automatically detect the version of React to use
+		},
+	},
+	overrides: [
+		// Note: these replace the values defined above, so make sure to extend them if they are needed
+		{
+			files: ['*.ts'],
+			...tsBase,
+		},
+		{
+			files: ['*.tsx'],
+			...tsBase,
+			extends: [...tsBase.extends, 'plugin:react/recommended'],
+			parserOptions: {
+				...tsBase.parserOptions,
+				ecmaFeatures: {
+					jsx: true, // Allows for the parsing of JSX
+				},
+			},
+			rules: {
+				...tsBase.rules,
+				'node/no-extraneous-import': 'off', // because there are a lot of them as dev-dependencies
+				'node/no-missing-import': 'off', // erroring on every single import
+				'react/prop-types': 'off', // we don't use this
+				'@typescript-eslint/no-empty-interface': 'off', // many prop/state types are {}
+				'@typescript-eslint/promise-function-async': 'off', // event handlers can't be async
+			},
+		},
+		{
+			files: ['*.js'],
+			env: {
+				'jest/globals': false, // Block jest from this
+			},
+			settings: {
+				node: {
+					tryExtensions: ['.js', '.json', '.node', '.ts', '.tsx'],
+				},
+			},
+			rules: {
+				...commonRules,
+				...tmpRules,
+			},
+		},
+		{
+			files: ['**/__tests__/**/*.ts', '**/__tests__/**/*.js', '**/__mocks__/**/*.ts'],
+			...tsBase,
+			env: {
+				'jest/globals': true,
+				jest: true,
+			},
+			rules: {
+				...tsBase.rules,
+				'@typescript-eslint/ban-ts-ignore': 'off',
+				'@typescript-eslint/ban-ts-comment': 'off',
+
+				// custom
+				'node/no-unpublished-import': 'off',
+				'node/no-unpublished-require': 'off',
+				'@typescript-eslint/no-non-null-assertion': 'off',
+				...tmpRules,
+			},
+		},
+	],
+}
diff --git a/packages/webui/.gitignore b/packages/webui/.gitignore
new file mode 100644
index 0000000000..f4ffadd528
--- /dev/null
+++ b/packages/webui/.gitignore
@@ -0,0 +1,25 @@
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+pnpm-debug.log*
+lerna-debug.log*
+
+node_modules
+/dist
+dist-ssr
+*.local
+coverage
+
+# Editor directories and files
+.vscode/*
+!.vscode/extensions.json
+.idea
+.DS_Store
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+*.sw?
diff --git a/packages/webui/.prettierignore b/packages/webui/.prettierignore
new file mode 100644
index 0000000000..c6bcdd3925
--- /dev/null
+++ b/packages/webui/.prettierignore
@@ -0,0 +1,3 @@
+src/meteor
+package.json
+CHANGELOG.md
\ No newline at end of file
diff --git a/packages/webui/LICENSE b/packages/webui/LICENSE
new file mode 100644
index 0000000000..41b71f8777
--- /dev/null
+++ b/packages/webui/LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2018 Norsk rikskringkasting AS
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/packages/webui/README.md b/packages/webui/README.md
new file mode 100644
index 0000000000..5f2d39af05
--- /dev/null
+++ b/packages/webui/README.md
@@ -0,0 +1,19 @@
+# Sofie: The Modern TV News Studio Automation System (WebUI)
+
+The default webui for [Sofie Server Core](https://github.com/nrkno/sofie-core)
+
+This application is a part of the [**Sofie** TV News Studio Automation System](https://github.com/nrkno/Sofie-TV-automation/).
+
+## Usage
+
+```
+// Development:
+yarn dev
+// Production:
+yarn build
+```
+
+## Installation for dev
+
+- yarn
+- yarn dev
diff --git a/meteor/client/main.html b/packages/webui/index.html
similarity index 83%
rename from meteor/client/main.html
rename to packages/webui/index.html
index c8ff8a49de..efd4095594 100644
--- a/meteor/client/main.html
+++ b/packages/webui/index.html
@@ -1,7 +1,9 @@
+<!DOCTYPE html>
 <head>
 	<title>Sofie</title>
 	<meta charset="utf-8" />
 	<link rel="stylesheet" href="/origo-ui/dist/origo.css" />
+	<link rel="stylesheet" href="/src/client/styles/main.scss" />
 
 	<meta name="apple-mobile-web-app-title" content="Sofie" />
 	<meta name="apple-mobile-web-app-capable" content="yes" />
@@ -15,7 +17,11 @@
 	<meta name="msapplication-TileColor" content="#da532c" />
 	<meta name="msapplication-config" content="/browserconfig.xml" />
 	<meta name="theme-color" content="#252627" />
+
+	<script type="text/javascript" src="/meteor-runtime-config.js"></script>
 </head>
 <body>
 	<div id="render-target"></div>
+
+	<script type="module" src="/src/main.tsx"></script>
 </body>
diff --git a/packages/webui/jest.config.cjs b/packages/webui/jest.config.cjs
new file mode 100644
index 0000000000..060062dd60
--- /dev/null
+++ b/packages/webui/jest.config.cjs
@@ -0,0 +1,33 @@
+module.exports = {
+	setupFilesAfterEnv: ['./src/__mocks__/_setupMocks.ts', '<rootDir>/src/client/__tests__/jest-setup.cjs'],
+	globals: {},
+	moduleFileExtensions: ['js', 'ts'],
+	moduleNameMapper: {
+		'meteor/(.*)': '<rootDir>/src/meteor/$1',
+	},
+	transform: {
+		'^.+\\.(ts|tsx)$': [
+			'ts-jest',
+			{
+				tsconfig: 'tsconfig.jest.json',
+			},
+		],
+		'^.+\\.(js|jsx)$': ['babel-jest', { presets: ['@babel/preset-env'] }],
+	},
+	transformIgnorePatterns: ['node_modules/(?!(nanoid)/)', '\\.pnp\\.[^\\/]+$'],
+	testMatch: ['**/__tests__/**/*.(spec|test).(ts|js)'],
+	testPathIgnorePatterns: ['integrationTests'],
+	testEnvironment: 'jsdom',
+	// coverageThreshold: {
+	// 	global: {
+	// 		branches: 80,
+	// 		functions: 100,
+	// 		lines: 95,
+	// 		statements: 90,
+	// 	},
+	// },
+	coverageDirectory: './coverage/',
+	coverageProvider: 'v8',
+	collectCoverage: true,
+	preset: 'ts-jest',
+}
diff --git a/packages/webui/package.json b/packages/webui/package.json
new file mode 100644
index 0000000000..a0761dac9f
--- /dev/null
+++ b/packages/webui/package.json
@@ -0,0 +1,113 @@
+{
+	"name": "@sofie-automation/webui",
+	"private": true,
+	"version": "1.52.0-in-development",
+	"type": "module",
+	"license": "MIT",
+	"repository": {
+		"type": "git",
+		"url": "git+https://github.com/nrkno/sofie-core.git",
+		"directory": "packages/webui"
+	},
+	"bugs": {
+		"url": "https://github.com/nrkno/sofie-core/issues"
+	},
+	"homepage": "https://github.com/nrkno/sofie-core/blob/master/packages/webui#readme",
+	"scripts": {
+		"dev": "vite --port=3005",
+		"build": "tsc -b && vite build",
+		"check-types": "tsc -p tsconfig.app.json --noEmit",
+		"watch-types": "run check-types --watch",
+		"preview": "vite preview",
+		"lint:raw": "run -T eslint --ext .ts,.tsx,.js,.jsx --ignore-pattern dist",
+		"lint": "run lint:raw .",
+		"unit": "run -T jest",
+		"test": "run lint && run unit",
+		"watch": "run -T jest --watch",
+		"cov": "run -T jest; run -T open-cli coverage/lcov-report/index.html",
+		"cov-open": "open-cli coverage/lcov-report/index.html",
+		"ci": "run test",
+		"validate:dependencies": "yarn npm audit --environment production && run license-validate",
+		"validate:dev-dependencies": "yarn npm audit --environment development",
+		"license-validate": "run -T sofie-licensecheck"
+	},
+	"dependencies": {
+		"@crello/react-lottie": "0.0.9",
+		"@fortawesome/fontawesome-free": "^6.4.2",
+		"@fortawesome/fontawesome-svg-core": "^6.4.2",
+		"@fortawesome/free-solid-svg-icons": "^6.4.2",
+		"@fortawesome/react-fontawesome": "^0.2.0",
+		"@jstarpl/react-contextmenu": "^2.15.0",
+		"@nrk/core-icons": "^9.6.0",
+		"@popperjs/core": "^2.11.8",
+		"@sofie-automation/blueprints-integration": "1.52.0-in-development",
+		"@sofie-automation/corelib": "1.52.0-in-development",
+		"@sofie-automation/meteor-lib": "1.52.0-in-development",
+		"@sofie-automation/shared-lib": "1.52.0-in-development",
+		"@sofie-automation/sorensen": "^1.4.3",
+		"@types/sinon": "^10.0.20",
+		"classnames": "^2.5.1",
+		"cubic-spline": "^3.0.3",
+		"deep-extend": "0.6.0",
+		"ejson": "^2.2.3",
+		"i18next": "^21.10.0",
+		"i18next-browser-languagedetector": "^6.1.8",
+		"i18next-http-backend": "^1.4.5",
+		"immutability-helper": "^3.1.1",
+		"lottie-web": "^5.12.2",
+		"moment": "^2.30.1",
+		"promise.allsettled": "^1.0.7",
+		"query-string": "^6.14.1",
+		"rc-tooltip": "^6.1.3",
+		"react": "^18.3.1",
+		"react-circular-progressbar": "^2.1.0",
+		"react-datepicker": "^3.8.0",
+		"react-dnd": "^14.0.5",
+		"react-dnd-html5-backend": "^14.1.0",
+		"react-dom": "^18.3.1",
+		"react-focus-bounder": "^1.1.6",
+		"react-hotkeys": "^2.0.0",
+		"react-i18next": "^11.18.6",
+		"react-intersection-observer": "^9.10.3",
+		"react-moment": "^0.9.7",
+		"react-popper": "^2.3.0",
+		"react-router-dom": "^5.3.4",
+		"react-timer-hoc": "^2.3.0",
+		"semver": "^7.6.3",
+		"sha.js": "^2.4.11",
+		"type-fest": "^3.13.1",
+		"underscore": "^1.13.7",
+		"velocity-animate": "^1.5.2",
+		"velocity-react": "^1.4.3",
+		"webmidi": "^2.5.3",
+		"xmlbuilder": "^15.1.1"
+	},
+	"devDependencies": {
+		"@babel/preset-env": "^7.24.8",
+		"@types/classnames": "^2.3.1",
+		"@types/deep-extend": "^0.6.2",
+		"@types/react": "^18.3.3",
+		"@types/react-circular-progressbar": "^1.1.0",
+		"@types/react-datepicker": "^3.1.8",
+		"@types/react-dom": "^18.3.0",
+		"@types/react-router": "^5.1.20",
+		"@types/react-router-dom": "^5.3.3",
+		"@types/sha.js": "^2.4.4",
+		"@types/xml2js": "^0.4.14",
+		"@typescript-eslint/parser": "^7.17.0",
+		"@vitejs/plugin-react": "^4.3.1",
+		"@welldone-software/why-did-you-render": "^4.3.2",
+		"@xmldom/xmldom": "^0.8.10",
+		"babel-jest": "^29.7.0",
+		"sass": "^1.77.8",
+		"sinon": "^14.0.2",
+		"typescript": "^5.2.2",
+		"vite": "^5.3.4",
+		"vite-plugin-node-polyfills": "^0.22.0",
+		"vite-tsconfig-paths": "^4.3.2",
+		"xml2js": "^0.6.2"
+	},
+	"engines": {
+		"node": ">=18"
+	}
+}
diff --git a/meteor/public/browserconfig.xml b/packages/webui/public/browserconfig.xml
similarity index 100%
rename from meteor/public/browserconfig.xml
rename to packages/webui/public/browserconfig.xml
diff --git a/meteor/public/favicon.ico b/packages/webui/public/favicon.ico
similarity index 100%
rename from meteor/public/favicon.ico
rename to packages/webui/public/favicon.ico
diff --git a/meteor/public/icons/android-chrome-192x192.png b/packages/webui/public/icons/android-chrome-192x192.png
similarity index 100%
rename from meteor/public/icons/android-chrome-192x192.png
rename to packages/webui/public/icons/android-chrome-192x192.png
diff --git a/meteor/public/icons/android-chrome-512x512.png b/packages/webui/public/icons/android-chrome-512x512.png
similarity index 100%
rename from meteor/public/icons/android-chrome-512x512.png
rename to packages/webui/public/icons/android-chrome-512x512.png
diff --git a/meteor/public/icons/apple-touch-icon.png b/packages/webui/public/icons/apple-touch-icon.png
similarity index 100%
rename from meteor/public/icons/apple-touch-icon.png
rename to packages/webui/public/icons/apple-touch-icon.png
diff --git a/meteor/public/icons/auto-presenter-screen.svg b/packages/webui/public/icons/auto-presenter-screen.svg
similarity index 100%
rename from meteor/public/icons/auto-presenter-screen.svg
rename to packages/webui/public/icons/auto-presenter-screen.svg
diff --git a/meteor/public/icons/favicon-16x16.png b/packages/webui/public/icons/favicon-16x16.png
similarity index 100%
rename from meteor/public/icons/favicon-16x16.png
rename to packages/webui/public/icons/favicon-16x16.png
diff --git a/meteor/public/icons/favicon-32x32.png b/packages/webui/public/icons/favicon-32x32.png
similarity index 100%
rename from meteor/public/icons/favicon-32x32.png
rename to packages/webui/public/icons/favicon-32x32.png
diff --git a/meteor/public/icons/freeze-presenter-screen.svg b/packages/webui/public/icons/freeze-presenter-screen.svg
similarity index 100%
rename from meteor/public/icons/freeze-presenter-screen.svg
rename to packages/webui/public/icons/freeze-presenter-screen.svg
diff --git a/meteor/public/icons/hourglass_icon.svg b/packages/webui/public/icons/hourglass_icon.svg
similarity index 100%
rename from meteor/public/icons/hourglass_icon.svg
rename to packages/webui/public/icons/hourglass_icon.svg
diff --git a/meteor/public/icons/maskable-512x512.png b/packages/webui/public/icons/maskable-512x512.png
similarity index 100%
rename from meteor/public/icons/maskable-512x512.png
rename to packages/webui/public/icons/maskable-512x512.png
diff --git a/meteor/public/icons/maskable-96x96.png b/packages/webui/public/icons/maskable-96x96.png
similarity index 100%
rename from meteor/public/icons/maskable-96x96.png
rename to packages/webui/public/icons/maskable-96x96.png
diff --git a/meteor/public/icons/mstile-144x144.png b/packages/webui/public/icons/mstile-144x144.png
similarity index 100%
rename from meteor/public/icons/mstile-144x144.png
rename to packages/webui/public/icons/mstile-144x144.png
diff --git a/meteor/public/icons/mstile-150x150.png b/packages/webui/public/icons/mstile-150x150.png
similarity index 100%
rename from meteor/public/icons/mstile-150x150.png
rename to packages/webui/public/icons/mstile-150x150.png
diff --git a/meteor/public/icons/mstile-310x150.png b/packages/webui/public/icons/mstile-310x150.png
similarity index 100%
rename from meteor/public/icons/mstile-310x150.png
rename to packages/webui/public/icons/mstile-310x150.png
diff --git a/meteor/public/icons/mstile-310x310.png b/packages/webui/public/icons/mstile-310x310.png
similarity index 100%
rename from meteor/public/icons/mstile-310x310.png
rename to packages/webui/public/icons/mstile-310x310.png
diff --git a/meteor/public/icons/mstile-70x70.png b/packages/webui/public/icons/mstile-70x70.png
similarity index 100%
rename from meteor/public/icons/mstile-70x70.png
rename to packages/webui/public/icons/mstile-70x70.png
diff --git a/meteor/public/icons/safari-pinned-tab.svg b/packages/webui/public/icons/safari-pinned-tab.svg
similarity index 100%
rename from meteor/public/icons/safari-pinned-tab.svg
rename to packages/webui/public/icons/safari-pinned-tab.svg
diff --git a/meteor/public/icons/sofie_clock_icon.ico b/packages/webui/public/icons/sofie_clock_icon.ico
similarity index 100%
rename from meteor/public/icons/sofie_clock_icon.ico
rename to packages/webui/public/icons/sofie_clock_icon.ico
diff --git a/meteor/public/icons/sofie_logo.ico b/packages/webui/public/icons/sofie_logo.ico
similarity index 100%
rename from meteor/public/icons/sofie_logo.ico
rename to packages/webui/public/icons/sofie_logo.ico
diff --git a/meteor/public/icons/sofie_studio-icon.ico b/packages/webui/public/icons/sofie_studio-icon.ico
similarity index 100%
rename from meteor/public/icons/sofie_studio-icon.ico
rename to packages/webui/public/icons/sofie_studio-icon.ico
diff --git a/meteor/public/icons/warning_icon.svg b/packages/webui/public/icons/warning_icon.svg
similarity index 100%
rename from meteor/public/icons/warning_icon.svg
rename to packages/webui/public/icons/warning_icon.svg
diff --git a/meteor/public/images/collapse-triangle.svg b/packages/webui/public/images/collapse-triangle.svg
similarity index 100%
rename from meteor/public/images/collapse-triangle.svg
rename to packages/webui/public/images/collapse-triangle.svg
diff --git a/meteor/public/images/cursor_zoom_area_move.png b/packages/webui/public/images/cursor_zoom_area_move.png
similarity index 100%
rename from meteor/public/images/cursor_zoom_area_move.png
rename to packages/webui/public/images/cursor_zoom_area_move.png
diff --git a/meteor/public/images/cursor_zoom_in.png b/packages/webui/public/images/cursor_zoom_in.png
similarity index 100%
rename from meteor/public/images/cursor_zoom_in.png
rename to packages/webui/public/images/cursor_zoom_in.png
diff --git a/meteor/public/images/freeze-frame-icicle.svg b/packages/webui/public/images/freeze-frame-icicle.svg
similarity index 100%
rename from meteor/public/images/freeze-frame-icicle.svg
rename to packages/webui/public/images/freeze-frame-icicle.svg
diff --git a/meteor/public/images/multi-step-chevrons-default.svg b/packages/webui/public/images/multi-step-chevrons-default.svg
similarity index 100%
rename from meteor/public/images/multi-step-chevrons-default.svg
rename to packages/webui/public/images/multi-step-chevrons-default.svg
diff --git a/meteor/public/images/multi-step-chevrons.svg b/packages/webui/public/images/multi-step-chevrons.svg
similarity index 100%
rename from meteor/public/images/multi-step-chevrons.svg
rename to packages/webui/public/images/multi-step-chevrons.svg
diff --git a/meteor/public/images/previewBG.jpg b/packages/webui/public/images/previewBG.jpg
similarity index 100%
rename from meteor/public/images/previewBG.jpg
rename to packages/webui/public/images/previewBG.jpg
diff --git a/meteor/public/images/previewBG.png b/packages/webui/public/images/previewBG.png
similarity index 100%
rename from meteor/public/images/previewBG.png
rename to packages/webui/public/images/previewBG.png
diff --git a/meteor/public/images/screen-saver-bkg.svg b/packages/webui/public/images/screen-saver-bkg.svg
similarity index 100%
rename from meteor/public/images/screen-saver-bkg.svg
rename to packages/webui/public/images/screen-saver-bkg.svg
diff --git a/meteor/public/images/sofie-logo-christmas.svg b/packages/webui/public/images/sofie-logo-christmas.svg
similarity index 100%
rename from meteor/public/images/sofie-logo-christmas.svg
rename to packages/webui/public/images/sofie-logo-christmas.svg
diff --git a/meteor/public/images/sofie-logo-norway.svg b/packages/webui/public/images/sofie-logo-norway.svg
similarity index 100%
rename from meteor/public/images/sofie-logo-norway.svg
rename to packages/webui/public/images/sofie-logo-norway.svg
diff --git a/meteor/public/images/sofie-logo-pride.svg b/packages/webui/public/images/sofie-logo-pride.svg
similarity index 100%
rename from meteor/public/images/sofie-logo-pride.svg
rename to packages/webui/public/images/sofie-logo-pride.svg
diff --git a/meteor/public/images/sofie-logo.png b/packages/webui/public/images/sofie-logo.png
similarity index 100%
rename from meteor/public/images/sofie-logo.png
rename to packages/webui/public/images/sofie-logo.png
diff --git a/meteor/public/images/sofie-logo.svg b/packages/webui/public/images/sofie-logo.svg
similarity index 100%
rename from meteor/public/images/sofie-logo.svg
rename to packages/webui/public/images/sofie-logo.svg
diff --git a/meteor/public/images/sofie-logo_black_bg.png b/packages/webui/public/images/sofie-logo_black_bg.png
similarity index 100%
rename from meteor/public/images/sofie-logo_black_bg.png
rename to packages/webui/public/images/sofie-logo_black_bg.png
diff --git a/meteor/public/images/warning-transferring.webp b/packages/webui/public/images/warning-transferring.webp
similarity index 100%
rename from meteor/public/images/warning-transferring.webp
rename to packages/webui/public/images/warning-transferring.webp
diff --git a/meteor/public/images/zoom_area_move.svg b/packages/webui/public/images/zoom_area_move.svg
similarity index 100%
rename from meteor/public/images/zoom_area_move.svg
rename to packages/webui/public/images/zoom_area_move.svg
diff --git a/meteor/public/locales/en/translations.json b/packages/webui/public/locales/en/translations.json
similarity index 100%
rename from meteor/public/locales/en/translations.json
rename to packages/webui/public/locales/en/translations.json
diff --git a/meteor/public/locales/nb/translations.json b/packages/webui/public/locales/nb/translations.json
similarity index 100%
rename from meteor/public/locales/nb/translations.json
rename to packages/webui/public/locales/nb/translations.json
diff --git a/meteor/public/locales/nn/translations.json b/packages/webui/public/locales/nn/translations.json
similarity index 100%
rename from meteor/public/locales/nn/translations.json
rename to packages/webui/public/locales/nn/translations.json
diff --git a/meteor/public/locales/sv/translations.json b/packages/webui/public/locales/sv/translations.json
similarity index 100%
rename from meteor/public/locales/sv/translations.json
rename to packages/webui/public/locales/sv/translations.json
diff --git a/meteor/public/origo-ui/dist/origo.css b/packages/webui/public/origo-ui/dist/origo.css
similarity index 100%
rename from meteor/public/origo-ui/dist/origo.css
rename to packages/webui/public/origo-ui/dist/origo.css
diff --git a/meteor/public/origo-ui/images/batch-icon-complete-dark.png b/packages/webui/public/origo-ui/images/batch-icon-complete-dark.png
similarity index 100%
rename from meteor/public/origo-ui/images/batch-icon-complete-dark.png
rename to packages/webui/public/origo-ui/images/batch-icon-complete-dark.png
diff --git a/meteor/public/origo-ui/images/batch-icon-complete-light.png b/packages/webui/public/origo-ui/images/batch-icon-complete-light.png
similarity index 100%
rename from meteor/public/origo-ui/images/batch-icon-complete-light.png
rename to packages/webui/public/origo-ui/images/batch-icon-complete-light.png
diff --git a/meteor/public/origo-ui/images/batch-icon-dark.png b/packages/webui/public/origo-ui/images/batch-icon-dark.png
similarity index 100%
rename from meteor/public/origo-ui/images/batch-icon-dark.png
rename to packages/webui/public/origo-ui/images/batch-icon-dark.png
diff --git a/meteor/public/origo-ui/images/batch-icon-light.png b/packages/webui/public/origo-ui/images/batch-icon-light.png
similarity index 100%
rename from meteor/public/origo-ui/images/batch-icon-light.png
rename to packages/webui/public/origo-ui/images/batch-icon-light.png
diff --git a/meteor/public/origo-ui/images/loading-spinner.svg b/packages/webui/public/origo-ui/images/loading-spinner.svg
similarity index 100%
rename from meteor/public/origo-ui/images/loading-spinner.svg
rename to packages/webui/public/origo-ui/images/loading-spinner.svg
diff --git a/meteor/public/origo-ui/images/thumb-scrubber-active.png b/packages/webui/public/origo-ui/images/thumb-scrubber-active.png
similarity index 100%
rename from meteor/public/origo-ui/images/thumb-scrubber-active.png
rename to packages/webui/public/origo-ui/images/thumb-scrubber-active.png
diff --git a/meteor/public/origo-ui/images/thumb-scrubber.png b/packages/webui/public/origo-ui/images/thumb-scrubber.png
similarity index 100%
rename from meteor/public/origo-ui/images/thumb-scrubber.png
rename to packages/webui/public/origo-ui/images/thumb-scrubber.png
diff --git a/meteor/public/origo-ui/images/tooltip-pointer-dark.png b/packages/webui/public/origo-ui/images/tooltip-pointer-dark.png
similarity index 100%
rename from meteor/public/origo-ui/images/tooltip-pointer-dark.png
rename to packages/webui/public/origo-ui/images/tooltip-pointer-dark.png
diff --git a/meteor/public/origo-ui/images/tooltip-pointer.png b/packages/webui/public/origo-ui/images/tooltip-pointer.png
similarity index 100%
rename from meteor/public/origo-ui/images/tooltip-pointer.png
rename to packages/webui/public/origo-ui/images/tooltip-pointer.png
diff --git a/meteor/public/sw.js b/packages/webui/public/sw.js
similarity index 100%
rename from meteor/public/sw.js
rename to packages/webui/public/sw.js
diff --git a/packages/webui/src/__mocks__/_setupMocks.ts b/packages/webui/src/__mocks__/_setupMocks.ts
new file mode 100644
index 0000000000..d2645535bd
--- /dev/null
+++ b/packages/webui/src/__mocks__/_setupMocks.ts
@@ -0,0 +1,21 @@
+import { resetRandomId } from './random'
+
+// This file is run before all tests start.
+
+// 'Mock' the random string generator
+jest.mock('nanoid', (...args) => require('./random').setup(args), { virtual: true })
+
+// Add references to all "meteor" mocks below, so that jest resolves the imports properly.
+
+jest.mock('meteor/meteor', (...args) => require('./meteor').setup(args), { virtual: true })
+jest.mock('meteor/tracker', (...args) => require('./tracker').setup(args), { virtual: true })
+// jest.mock('meteor/ejson', (...args) => require('./ejson').setup(args), { virtual: true })
+// jest.mock('meteor/reactive-var', (...args) => require('./reactive-var').setup(args), { virtual: true })
+
+jest.mock('meteor/mongo', (...args) => require('./mongo').setup(args), { virtual: true })
+
+beforeEach(() => {
+	// put setLogLevel('info') in the beginning of your test to see logs
+
+	resetRandomId()
+})
diff --git a/packages/webui/src/__mocks__/defaultCollectionObjects.ts b/packages/webui/src/__mocks__/defaultCollectionObjects.ts
new file mode 100644
index 0000000000..99dfea69b7
--- /dev/null
+++ b/packages/webui/src/__mocks__/defaultCollectionObjects.ts
@@ -0,0 +1,215 @@
+import { DBStudio } from '@sofie-automation/corelib/dist/dataModel/Studio'
+import { clone, protectString, unprotectString } from '../client/lib/tempLib'
+import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
+import { DBRundown } from '@sofie-automation/corelib/dist/dataModel/Rundown'
+import { DBSegment } from '@sofie-automation/corelib/dist/dataModel/Segment'
+import { DBPart } from '@sofie-automation/corelib/dist/dataModel/Part'
+import { IBlueprintPieceType, PieceLifespan } from '@sofie-automation/blueprints-integration'
+import { Piece, EmptyPieceTimelineObjectsBlob } from '@sofie-automation/corelib/dist/dataModel/Piece'
+import { AdLibPiece } from '@sofie-automation/corelib/dist/dataModel/AdLibPiece'
+import { wrapDefaultObject } from '@sofie-automation/corelib/dist/settings/objectWithOverrides'
+import { PartInstance } from '@sofie-automation/meteor-lib/dist/collections/PartInstances'
+import { PieceInstance } from '@sofie-automation/corelib/dist/dataModel/PieceInstance'
+import {
+	PartId,
+	PartInstanceId,
+	PeripheralDeviceId,
+	PieceId,
+	PieceInstanceId,
+	RundownId,
+	RundownPlaylistActivationId,
+	RundownPlaylistId,
+	SegmentId,
+	SegmentPlayoutId,
+	ShowStyleBaseId,
+	ShowStyleVariantId,
+	StudioId,
+} from '@sofie-automation/corelib/dist/dataModel/Ids'
+import { DEFAULT_MINIMUM_TAKE_SPAN } from '@sofie-automation/shared-lib/dist/core/constants'
+
+export function defaultRundownPlaylist(_id: RundownPlaylistId, studioId: StudioId): DBRundownPlaylist {
+	return {
+		_id: _id,
+
+		externalId: 'MOCK_RUNDOWNPLAYLIST',
+		organizationId: null,
+		studioId: studioId,
+
+		name: 'Default RundownPlaylist',
+		created: Date.now(),
+		modified: Date.now(),
+
+		// activationId: undefined,
+		rehearsal: false,
+		currentPartInfo: null,
+		nextPartInfo: null,
+		previousPartInfo: null,
+		timing: {
+			type: 'none' as any,
+		},
+		rundownIdsInOrder: [],
+	}
+}
+export function defaultRundown(
+	externalId: string,
+	studioId: StudioId,
+	ingestDeviceId: PeripheralDeviceId,
+	playlistId: RundownPlaylistId,
+	showStyleBaseId: ShowStyleBaseId,
+	showStyleVariantId: ShowStyleVariantId
+): DBRundown {
+	return {
+		studioId: studioId,
+		showStyleBaseId: showStyleBaseId,
+		showStyleVariantId: showStyleVariantId,
+
+		organizationId: null,
+
+		playlistId: playlistId,
+
+		_id: protectString(`rundown_${studioId}_${externalId}`),
+		externalId: externalId,
+		name: 'Default Rundown',
+
+		created: Date.now(),
+		modified: Date.now(),
+		importVersions: {
+			studio: '',
+			showStyleBase: '',
+			showStyleVariant: '',
+			blueprint: '',
+			core: '',
+		},
+
+		timing: {
+			type: 'none' as any,
+		},
+		source: {
+			type: 'nrcs',
+			peripheralDeviceId: ingestDeviceId,
+			nrcsName: 'mock',
+		},
+	}
+}
+
+export function defaultStudio(_id: StudioId): DBStudio {
+	return {
+		_id: _id,
+
+		name: 'mockStudio',
+		organizationId: null,
+		mappingsWithOverrides: wrapDefaultObject({}),
+		supportedShowStyleBase: [],
+		blueprintConfigWithOverrides: wrapDefaultObject({}),
+		settings: {
+			frameRate: 25,
+			mediaPreviewsUrl: '',
+			minimumTakeSpan: DEFAULT_MINIMUM_TAKE_SPAN,
+		},
+		_rundownVersionHash: '',
+		routeSetsWithOverrides: wrapDefaultObject({}),
+		routeSetExclusivityGroupsWithOverrides: wrapDefaultObject({}),
+		packageContainersWithOverrides: wrapDefaultObject({}),
+		previewContainerIds: [],
+		thumbnailContainerIds: [],
+		peripheralDeviceSettings: {
+			playoutDevices: wrapDefaultObject({}),
+			ingestDevices: wrapDefaultObject({}),
+			inputDevices: wrapDefaultObject({}),
+		},
+		lastBlueprintConfig: undefined,
+		lastBlueprintFixUpHash: undefined,
+	}
+}
+
+export function defaultSegment(_id: SegmentId, rundownId: RundownId): DBSegment {
+	return {
+		_id: _id,
+		_rank: 0,
+		externalId: unprotectString(_id),
+		rundownId: rundownId,
+		name: 'Default Segment',
+		externalModified: 1,
+	}
+}
+
+export function defaultPart(_id: PartId, rundownId: RundownId, segmentId: SegmentId): DBPart {
+	return {
+		_id: _id,
+		rundownId: rundownId,
+		segmentId: segmentId,
+		_rank: 0,
+		externalId: unprotectString(_id),
+		title: 'Default Part',
+		expectedDurationWithTransition: undefined,
+	}
+}
+export function defaultPiece(_id: PieceId, rundownId: RundownId, segmentId: SegmentId, partId: PartId): Piece {
+	return {
+		_id: _id,
+		externalId: 'MOCK_PIECE',
+		startRundownId: rundownId,
+		startSegmentId: segmentId,
+		startPartId: partId,
+		name: 'Default Piece',
+		lifespan: PieceLifespan.WithinPart,
+		pieceType: IBlueprintPieceType.Normal,
+		invalid: false,
+		enable: {
+			start: 0,
+		},
+		sourceLayerId: '',
+		outputLayerId: '',
+		content: {},
+		timelineObjectsString: EmptyPieceTimelineObjectsBlob,
+	}
+}
+export function defaultAdLibPiece(_id: PieceId, rundownId: RundownId, partId: PartId): AdLibPiece {
+	return {
+		_id: _id,
+		externalId: 'MOCK_ADLIB',
+		rundownId: rundownId,
+		partId: partId,
+		_rank: 0,
+		name: 'Default Adlib',
+		lifespan: PieceLifespan.WithinPart,
+		sourceLayerId: '',
+		outputLayerId: '',
+		content: {},
+		timelineObjectsString: EmptyPieceTimelineObjectsBlob,
+	}
+}
+export function defaultPartInstance(
+	_id: PartInstanceId,
+	playlistActivationId: RundownPlaylistActivationId,
+	segmentPlayoutId: SegmentPlayoutId,
+	part: DBPart
+): PartInstance {
+	return {
+		_id,
+		isTemporary: false,
+		part: clone(part),
+		playlistActivationId,
+		rehearsal: false,
+		rundownId: part.rundownId,
+		segmentId: part.segmentId,
+		takeCount: 0,
+		segmentPlayoutId,
+	}
+}
+export function defaultPieceInstance(
+	_id: PieceInstanceId,
+	playlistActivationId: RundownPlaylistActivationId,
+	rundownId: RundownId,
+	partInstanceId: PartInstanceId,
+	piece: Piece
+): PieceInstance {
+	return {
+		_id,
+		partInstanceId,
+		piece: clone(piece),
+		playlistActivationId,
+		rundownId,
+		isTemporary: false,
+	}
+}
diff --git a/packages/webui/src/__mocks__/helpers/database.ts b/packages/webui/src/__mocks__/helpers/database.ts
new file mode 100644
index 0000000000..382e789aa0
--- /dev/null
+++ b/packages/webui/src/__mocks__/helpers/database.ts
@@ -0,0 +1,547 @@
+import * as _ from 'underscore'
+import { DBStudio } from '@sofie-automation/corelib/dist/dataModel/Studio'
+import {
+	PieceLifespan,
+	IOutputLayer,
+	ISourceLayer,
+	SourceLayerType,
+	IBlueprintPieceType,
+} from '@sofie-automation/blueprints-integration'
+import { DBShowStyleBase } from '@sofie-automation/corelib/dist/dataModel/ShowStyleBase'
+import { DBShowStyleVariant } from '@sofie-automation/corelib/dist/dataModel/ShowStyleVariant'
+import { ICoreSystem, SYSTEM_ID } from '@sofie-automation/meteor-lib/dist/collections/CoreSystem'
+import { literal, protectString, getRandomId, Complete, normalizeArray } from '../../client/lib/tempLib'
+import { DBRundown } from '@sofie-automation/corelib/dist/dataModel/Rundown'
+import { DBSegment } from '@sofie-automation/corelib/dist/dataModel/Segment'
+import { DBPart } from '@sofie-automation/corelib/dist/dataModel/Part'
+import { EmptyPieceTimelineObjectsBlob, Piece } from '@sofie-automation/corelib/dist/dataModel/Piece'
+import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
+import { RundownBaselineAdLibItem } from '@sofie-automation/corelib/dist/dataModel/RundownBaselineAdLibPiece'
+import { AdLibPiece } from '@sofie-automation/corelib/dist/dataModel/AdLibPiece'
+import { restartRandomId } from '../random'
+import { MongoMock } from '../mongo'
+import { defaultRundownPlaylist, defaultStudio } from '../defaultCollectionObjects'
+import {
+	applyAndValidateOverrides,
+	wrapDefaultObject,
+} from '@sofie-automation/corelib/dist/settings/objectWithOverrides'
+import { UIShowStyleBase } from '@sofie-automation/meteor-lib/dist/api/showStyles'
+import {
+	BlueprintId,
+	OrganizationId,
+	RundownId,
+	RundownPlaylistId,
+	ShowStyleBaseId,
+	ShowStyleVariantId,
+} from '@sofie-automation/corelib/dist/dataModel/Ids'
+import {
+	AdLibPieces,
+	CoreSystem,
+	Parts,
+	Pieces,
+	RundownBaselineAdLibPieces,
+	RundownPlaylists,
+	Rundowns,
+	Segments,
+	ShowStyleBases,
+	ShowStyleVariants,
+	Studios,
+} from '../../client/collections'
+
+export enum LAYER_IDS {
+	SOURCE_CAM0 = 'cam0',
+	SOURCE_VT0 = 'vt0',
+	SOURCE_TRANSITION0 = 'transition0',
+	SOURCE_GRAPHICS0 = 'graphics0',
+	OUTPUT_PGM = 'pgm',
+}
+
+let dbI = 0
+export async function setupMockCore(doc?: Partial<ICoreSystem>): Promise<ICoreSystem> {
+	// Reset everything mongo, to keep the ids predictable
+	restartRandomId()
+	MongoMock.deleteAllData()
+
+	doc = doc || {}
+
+	const defaultCore: ICoreSystem = {
+		_id: SYSTEM_ID,
+		name: 'mock Core',
+		created: 0,
+		modified: 0,
+		version: '0.0.0',
+		previousVersion: '0.0.0',
+		serviceMessages: {},
+	}
+	const coreSystem = _.extend(defaultCore, doc)
+	CoreSystem.remove(SYSTEM_ID)
+	CoreSystem.insert(coreSystem)
+	return coreSystem
+}
+// export async function setupMockTriggeredActions(
+// 	showStyleBaseId: ShowStyleBaseId | null = null,
+// 	num = 3,
+// 	doc?: Partial<DBTriggeredActions>
+// ): Promise<DBTriggeredActions[]> {
+// 	doc = doc || {}
+// 	const mocks: DBTriggeredActions[] = []
+// 	for (let i = 0; i < num; i++) {
+// 		const mock: DBTriggeredActions = {
+// 			_id: protectString(`mockTriggeredAction_${showStyleBaseId ?? 'core'}` + i),
+// 			_rank: i * 1000,
+// 			showStyleBaseId,
+// 			blueprintUniqueId: null,
+// 			actionsWithOverrides: wrapDefaultObject({
+// 				'0': {
+// 					action: PlayoutActions.adlib,
+// 					filterChain: [
+// 						{
+// 							object: 'adLib',
+// 							field: 'global',
+// 							value: true,
+// 						},
+// 						{
+// 							object: 'adLib',
+// 							field: 'pick',
+// 							value: i,
+// 						},
+// 					],
+// 				},
+// 			}),
+// 			triggersWithOverrides: wrapDefaultObject({
+// 				'0': {
+// 					type: TriggerType.hotkey,
+// 					keys: `Key${String.fromCharCode(65 + i)}`, // KeyA and so on
+// 				},
+// 			}),
+// 			...doc,
+// 		}
+// 		mocks.push(mock)
+// 		 TriggeredActions.insert(mock)
+// 	}
+// 	return mocks
+// }
+export async function setupMockStudio(doc?: Partial<DBStudio>): Promise<DBStudio> {
+	doc = doc || {}
+
+	const studio: DBStudio = {
+		...defaultStudio(protectString('mockStudio' + dbI++)),
+		name: 'mockStudio',
+		_rundownVersionHash: 'asdf',
+		...doc,
+	}
+	Studios.insert(studio)
+	return studio
+}
+export async function setupMockShowStyleBase(
+	blueprintId: BlueprintId,
+	doc?: Partial<DBShowStyleBase>
+): Promise<DBShowStyleBase> {
+	doc = doc || {}
+
+	const defaultShowStyleBase: DBShowStyleBase = {
+		_id: protectString('mockShowStyleBase' + dbI++),
+		name: 'mockShowStyleBase',
+		organizationId: null,
+		outputLayersWithOverrides: wrapDefaultObject(
+			normalizeArray(
+				[
+					literal<IOutputLayer>({
+						_id: LAYER_IDS.OUTPUT_PGM,
+						_rank: 0,
+						isPGM: true,
+						name: 'PGM',
+					}),
+				],
+				'_id'
+			)
+		),
+		sourceLayersWithOverrides: wrapDefaultObject(
+			normalizeArray(
+				[
+					literal<ISourceLayer>({
+						_id: LAYER_IDS.SOURCE_CAM0,
+						_rank: 0,
+						name: 'Camera',
+						type: SourceLayerType.CAMERA,
+						exclusiveGroup: 'main',
+					}),
+					literal<ISourceLayer>({
+						_id: LAYER_IDS.SOURCE_VT0,
+						_rank: 1,
+						name: 'VT',
+						type: SourceLayerType.VT,
+						exclusiveGroup: 'main',
+					}),
+					literal<ISourceLayer>({
+						_id: LAYER_IDS.SOURCE_TRANSITION0,
+						_rank: 2,
+						name: 'Transition',
+						type: SourceLayerType.TRANSITION,
+					}),
+					literal<ISourceLayer>({
+						_id: LAYER_IDS.SOURCE_GRAPHICS0,
+						_rank: 3,
+						name: 'Graphic',
+						type: SourceLayerType.GRAPHICS,
+					}),
+				],
+				'_id'
+			)
+		),
+		blueprintConfigWithOverrides: wrapDefaultObject({}),
+		blueprintId: blueprintId,
+		// hotkeyLegend?: Array<HotkeyDefinition>
+		_rundownVersionHash: '',
+		lastBlueprintConfig: undefined,
+		lastBlueprintFixUpHash: undefined,
+	}
+	const showStyleBase = _.extend(defaultShowStyleBase, doc)
+	ShowStyleBases.insert(showStyleBase)
+	return showStyleBase
+}
+export async function setupMockShowStyleVariant(
+	showStyleBaseId: ShowStyleBaseId,
+	doc?: Partial<DBShowStyleVariant>
+): Promise<DBShowStyleVariant> {
+	doc = doc || {}
+
+	const defaultShowStyleVariant: DBShowStyleVariant = {
+		_id: protectString('mockShowStyleVariant' + dbI++),
+		name: 'mockShowStyleVariant',
+		showStyleBaseId: showStyleBaseId,
+		blueprintConfigWithOverrides: wrapDefaultObject({}),
+		_rundownVersionHash: '',
+		_rank: 0,
+	}
+	const showStyleVariant = _.extend(defaultShowStyleVariant, doc)
+	ShowStyleVariants.insert(showStyleVariant)
+
+	return showStyleVariant
+}
+
+export interface DefaultEnvironment {
+	showStyleBaseId: ShowStyleBaseId
+	showStyleVariantId: ShowStyleVariantId
+	// studioBlueprint: Blueprint
+	// showStyleBlueprint: Blueprint
+	showStyleBase: DBShowStyleBase
+	// triggeredActions: DBTriggeredActions[]
+	showStyleVariant: DBShowStyleVariant
+	studio: DBStudio
+	core: ICoreSystem
+	// systemTriggeredActions: DBTriggeredActions[]
+}
+export async function setupDefaultStudioEnvironment(
+	organizationId: OrganizationId | null = null
+): Promise<DefaultEnvironment> {
+	const core = await setupMockCore({})
+	// const systemTriggeredActions = await setupMockTriggeredActions()
+
+	const showStyleBaseId: ShowStyleBaseId = getRandomId()
+	const showStyleVariantId: ShowStyleVariantId = getRandomId()
+
+	const showStyleBase = await setupMockShowStyleBase(protectString('blueprint0'), {
+		_id: showStyleBaseId,
+		organizationId: organizationId,
+	})
+	// const triggeredActions = await setupMockTriggeredActions(showStyleBase._id)
+	const showStyleVariant = await setupMockShowStyleVariant(showStyleBase._id, { _id: showStyleVariantId })
+
+	const studio = await setupMockStudio({
+		blueprintId: protectString('blueprint0'),
+		supportedShowStyleBase: [showStyleBaseId],
+		organizationId: organizationId,
+	})
+
+	return {
+		showStyleBaseId,
+		showStyleVariantId,
+		showStyleBase,
+		// triggeredActions,
+		showStyleVariant,
+		studio,
+		core,
+		// systemTriggeredActions: systemTriggeredActions,
+	}
+}
+export async function setupDefaultRundownPlaylist(
+	env: DefaultEnvironment,
+	rundownId0?: RundownId,
+	customRundownFactory?: (env: DefaultEnvironment, playlistId: RundownPlaylistId, rundownId: RundownId) => RundownId
+): Promise<{ rundownId: RundownId; playlistId: RundownPlaylistId }> {
+	const rundownId: RundownId = rundownId0 || getRandomId()
+
+	const playlist: DBRundownPlaylist = defaultRundownPlaylist(protectString('playlist_' + rundownId), env.studio._id)
+
+	const playlistId: RundownPlaylistId = protectString(
+		MongoMock.getInnerMockCollection(RundownPlaylists).insert(playlist)
+	)
+
+	return {
+		rundownId: await (customRundownFactory || setupDefaultRundown)(env, playlistId, rundownId),
+		playlistId,
+	}
+}
+// export async function setupEmptyEnvironment(): Promise<{ core: ICoreSystem }> {
+// 	const core = await setupMockCore({})
+
+// 	return {
+// 		core,
+// 	}
+// }
+export async function setupDefaultRundown(
+	env: DefaultEnvironment,
+	playlistId: RundownPlaylistId,
+	rundownId: RundownId
+): Promise<RundownId> {
+	const outputLayerIds = Object.keys(applyAndValidateOverrides(env.showStyleBase.outputLayersWithOverrides).obj)
+	const sourceLayerIds = Object.keys(applyAndValidateOverrides(env.showStyleBase.sourceLayersWithOverrides).obj)
+
+	const rundown: DBRundown = {
+		organizationId: null,
+		studioId: env.studio._id,
+		showStyleBaseId: env.showStyleBase._id,
+		showStyleVariantId: env.showStyleVariant._id,
+		timing: {
+			type: 'none' as any,
+		},
+
+		playlistId: playlistId,
+
+		_id: rundownId,
+		externalId: 'MOCK_RUNDOWN_' + rundownId,
+		name: 'Default Rundown',
+
+		created: Date.now(),
+		modified: Date.now(),
+		importVersions: {
+			studio: '',
+			showStyleBase: '',
+			showStyleVariant: '',
+			blueprint: '',
+			core: '',
+		},
+
+		source: {
+			type: 'nrcs',
+			peripheralDeviceId: protectString('ingest0'),
+			nrcsName: 'mock',
+		},
+	}
+	MongoMock.getInnerMockCollection(Rundowns).insert(rundown)
+
+	MongoMock.getInnerMockCollection(RundownPlaylists).update(playlistId, {
+		$push: {
+			rundownIdsInOrder: rundown._id,
+		},
+	})
+
+	const segment0: DBSegment = {
+		_id: protectString(rundownId + '_segment0'),
+		_rank: 0,
+		externalId: 'MOCK_SEGMENT_0',
+		rundownId: rundown._id,
+		name: 'Segment 0',
+		externalModified: 1,
+	}
+	MongoMock.getInnerMockCollection(Segments).insert(segment0)
+	/* tslint:disable:ter-indent*/
+	//
+	const part00: DBPart = {
+		_id: protectString(rundownId + '_part0_0'),
+		segmentId: segment0._id,
+		rundownId: rundown._id,
+		_rank: 0,
+		externalId: 'MOCK_PART_0_0',
+		title: 'Part 0 0',
+		expectedDurationWithTransition: undefined,
+	}
+	MongoMock.getInnerMockCollection(Parts).insert(part00)
+
+	const piece000: Piece = {
+		_id: protectString(rundownId + '_piece000'),
+		externalId: 'MOCK_PIECE_000',
+		startRundownId: rundown._id,
+		startSegmentId: part00.segmentId,
+		startPartId: part00._id,
+		name: 'Piece 000',
+		enable: {
+			start: 0,
+		},
+		sourceLayerId: sourceLayerIds[0],
+		outputLayerId: outputLayerIds[0],
+		lifespan: PieceLifespan.WithinPart,
+		pieceType: IBlueprintPieceType.Normal,
+		invalid: false,
+		content: {},
+		timelineObjectsString: EmptyPieceTimelineObjectsBlob,
+	}
+	MongoMock.getInnerMockCollection(Pieces).insert(piece000)
+
+	const piece001: Piece = {
+		_id: protectString(rundownId + '_piece001'),
+		externalId: 'MOCK_PIECE_001',
+		startRundownId: rundown._id,
+		startSegmentId: part00.segmentId,
+		startPartId: part00._id,
+		name: 'Piece 001',
+		enable: {
+			start: 0,
+		},
+		sourceLayerId: sourceLayerIds[1],
+		outputLayerId: outputLayerIds[0],
+		lifespan: PieceLifespan.WithinPart,
+		pieceType: IBlueprintPieceType.Normal,
+		invalid: false,
+		content: {},
+		timelineObjectsString: EmptyPieceTimelineObjectsBlob,
+	}
+	MongoMock.getInnerMockCollection(Pieces).insert(piece001)
+
+	const adLibPiece000: AdLibPiece = {
+		_id: protectString(rundownId + '_adLib000'),
+		_rank: 0,
+		expectedDuration: 1000,
+		lifespan: PieceLifespan.WithinPart,
+		externalId: 'MOCK_ADLIB_000',
+		partId: part00._id,
+		rundownId: segment0.rundownId,
+		name: 'AdLib 0',
+		sourceLayerId: sourceLayerIds[1],
+		outputLayerId: outputLayerIds[0],
+		content: {},
+		timelineObjectsString: EmptyPieceTimelineObjectsBlob,
+	}
+
+	MongoMock.getInnerMockCollection(AdLibPieces).insert(adLibPiece000)
+
+	const part01: DBPart = {
+		_id: protectString(rundownId + '_part0_1'),
+		segmentId: segment0._id,
+		rundownId: segment0.rundownId,
+		_rank: 1,
+		externalId: 'MOCK_PART_0_1',
+		title: 'Part 0 1',
+		expectedDurationWithTransition: undefined,
+	}
+	MongoMock.getInnerMockCollection(Parts).insert(part01)
+
+	const piece010: Piece = {
+		_id: protectString(rundownId + '_piece010'),
+		externalId: 'MOCK_PIECE_010',
+		startRundownId: rundown._id,
+		startSegmentId: part01.segmentId,
+		startPartId: part01._id,
+		name: 'Piece 010',
+		enable: {
+			start: 0,
+		},
+		sourceLayerId: sourceLayerIds[0],
+		outputLayerId: outputLayerIds[0],
+		lifespan: PieceLifespan.WithinPart,
+		pieceType: IBlueprintPieceType.Normal,
+		invalid: false,
+		content: {},
+		timelineObjectsString: EmptyPieceTimelineObjectsBlob,
+	}
+	MongoMock.getInnerMockCollection(Pieces).insert(piece010)
+
+	const segment1: DBSegment = {
+		_id: protectString(rundownId + '_segment1'),
+		_rank: 1,
+		externalId: 'MOCK_SEGMENT_2',
+		rundownId: rundown._id,
+		name: 'Segment 1',
+		externalModified: 1,
+	}
+	MongoMock.getInnerMockCollection(Segments).insert(segment1)
+
+	const part10: DBPart = {
+		_id: protectString(rundownId + '_part1_0'),
+		segmentId: segment1._id,
+		rundownId: segment1.rundownId,
+		_rank: 0,
+		externalId: 'MOCK_PART_1_0',
+		title: 'Part 1 0',
+		expectedDurationWithTransition: undefined,
+	}
+	MongoMock.getInnerMockCollection(Parts).insert(part10)
+
+	const part11: DBPart = {
+		_id: protectString(rundownId + '_part1_1'),
+		segmentId: segment1._id,
+		rundownId: segment1.rundownId,
+		_rank: 1,
+		externalId: 'MOCK_PART_1_1',
+		title: 'Part 1 1',
+		expectedDurationWithTransition: undefined,
+	}
+	MongoMock.getInnerMockCollection(Parts).insert(part11)
+
+	const part12: DBPart = {
+		_id: protectString(rundownId + '_part1_2'),
+		segmentId: segment1._id,
+		rundownId: segment1.rundownId,
+		_rank: 2,
+		externalId: 'MOCK_PART_1_2',
+		title: 'Part 1 2',
+		expectedDurationWithTransition: undefined,
+	}
+	MongoMock.getInnerMockCollection(Parts).insert(part12)
+
+	const segment2: DBSegment = {
+		_id: protectString(rundownId + '_segment2'),
+		_rank: 2,
+		externalId: 'MOCK_SEGMENT_2',
+		rundownId: rundown._id,
+		name: 'Segment 2',
+		externalModified: 1,
+	}
+	MongoMock.getInnerMockCollection(Segments).insert(segment2)
+
+	const globalAdLib0: RundownBaselineAdLibItem = {
+		_id: protectString(rundownId + '_globalAdLib0'),
+		_rank: 0,
+		externalId: 'MOCK_GLOBAL_ADLIB_0',
+		lifespan: PieceLifespan.OutOnRundownEnd,
+		rundownId: segment0.rundownId,
+		name: 'Global AdLib 0',
+		sourceLayerId: sourceLayerIds[0],
+		outputLayerId: outputLayerIds[0],
+		content: {},
+		timelineObjectsString: EmptyPieceTimelineObjectsBlob,
+	}
+
+	const globalAdLib1: RundownBaselineAdLibItem = {
+		_id: protectString(rundownId + '_globalAdLib1'),
+		_rank: 0,
+		externalId: 'MOCK_GLOBAL_ADLIB_1',
+		lifespan: PieceLifespan.OutOnRundownEnd,
+		rundownId: segment0.rundownId,
+		name: 'Global AdLib 1',
+		sourceLayerId: sourceLayerIds[1],
+		outputLayerId: outputLayerIds[0],
+		content: {},
+		timelineObjectsString: EmptyPieceTimelineObjectsBlob,
+	}
+
+	MongoMock.getInnerMockCollection(RundownBaselineAdLibPieces).insert(globalAdLib0)
+	MongoMock.getInnerMockCollection(RundownBaselineAdLibPieces).insert(globalAdLib1)
+
+	return rundownId
+}
+
+// // const studioBlueprint
+// // const showStyleBlueprint
+// // const showStyleVariant
+
+export function convertToUIShowStyleBase(showStyleBase: DBShowStyleBase): UIShowStyleBase {
+	return literal<Complete<UIShowStyleBase>>({
+		_id: showStyleBase._id,
+		name: showStyleBase.name,
+		hotkeyLegend: showStyleBase.hotkeyLegend,
+		sourceLayers: applyAndValidateOverrides(showStyleBase.sourceLayersWithOverrides).obj,
+		outputLayers: applyAndValidateOverrides(showStyleBase.outputLayersWithOverrides).obj,
+	})
+}
diff --git a/packages/webui/src/__mocks__/helpers/jest.ts b/packages/webui/src/__mocks__/helpers/jest.ts
new file mode 100644
index 0000000000..e8baceae20
--- /dev/null
+++ b/packages/webui/src/__mocks__/helpers/jest.ts
@@ -0,0 +1,58 @@
+/* eslint-disable jest/no-export, jest/valid-title, jest/expect-expect, jest/no-focused-tests */
+
+const orgSetTimeout = setTimeout
+const DateOrg = Date
+export async function runAllTimers(): Promise<void> {
+	// Run all timers, and wait, multiple times.
+	// This is to allow timers AND internal promises to resolve in inner functions
+	for (let i = 0; i < 10; i++) {
+		jest.runOnlyPendingTimers()
+		await new Promise((resolve) => orgSetTimeout(resolve, 0))
+	}
+}
+
+export async function runTimersUntilNow(): Promise<void> {
+	// Run all timers, and wait, multiple times.
+	// This is to allow timers AND internal promises to resolve in inner functions
+	for (let i = 0; i < 50; i++) {
+		jest.advanceTimersByTime(0)
+		await new Promise((resolve) => orgSetTimeout(resolve, 0))
+	}
+}
+
+/** Returns a Promise that resolves after a speficied number of milliseconds */
+export async function waitTime(ms: number): Promise<void> {
+	return new Promise((resolve) => orgSetTimeout(resolve, ms))
+}
+
+/**
+ * Executes {expectFcn} intermittently until it doesn't throw anymore.
+ * Waits up to {maxWaitTime} ms, then throws the latest error.
+ * Useful in unit-tests as a way to wait until a predicate is fulfilled.
+ * Example usage:
+ * ```
+ * const myArray = []
+ * asynchoronouslyPopulateArray(myArray)
+ * await waitUntil(() => {
+ *   expect(myArray).toHaveLength(42)
+ * }, 500)
+ * ```
+ */
+export async function waitUntil(expectFcn: () => void | Promise<void>, maxWaitTime: number): Promise<void> {
+	/** How often to check expectFcn() */
+	const iterateInterval = maxWaitTime < 100 ? 10 : 100
+
+	const startTime = Date.now()
+	// eslint-disable-next-line no-constant-condition
+	while (true) {
+		await waitTime(iterateInterval)
+		try {
+			await expectFcn()
+			return
+		} catch (err) {
+			const waitedTime = DateOrg.now() - startTime
+			if (waitedTime > maxWaitTime) throw err
+			// else ignore error and try again later
+		}
+	}
+}
diff --git a/packages/webui/src/__mocks__/meteor.ts b/packages/webui/src/__mocks__/meteor.ts
new file mode 100644
index 0000000000..f11ac9b999
--- /dev/null
+++ b/packages/webui/src/__mocks__/meteor.ts
@@ -0,0 +1,264 @@
+import * as _ from 'underscore'
+import { MongoMock } from './mongo'
+import type { DDP } from 'meteor/ddp'
+
+let controllableDefer = false
+
+export function useControllableDefer(): void {
+	controllableDefer = true
+}
+export function useNextTickDefer(): void {
+	controllableDefer = false
+}
+
+namespace Meteor {
+	export interface Settings {
+		public: {
+			[id: string]: any
+		}
+		[id: string]: any
+	}
+
+	export interface UserEmail {
+		address: string
+		verified: boolean
+	}
+	export interface User {
+		_id?: string
+		username?: string
+		emails?: UserEmail[]
+		createdAt?: number
+		profile?: any
+		services?: any
+	}
+
+	export interface ErrorStatic {
+		new (error: string | number, reason?: string, details?: string): Error
+	}
+	export interface Error {
+		error: string | number
+		reason?: string
+		details?: string
+	}
+
+	export interface SubscriptionHandle {
+		stop(): void
+		ready(): boolean
+	}
+	export interface LiveQueryHandle {
+		stop(): void
+	}
+}
+const orgSetTimeout = setTimeout
+const orgSetInterval = setInterval
+const orgClearTimeout = clearTimeout
+const orgClearInterval = clearInterval
+
+const $ = {
+	Error,
+	get setTimeout(): Function {
+		return setTimeout
+	},
+	get setInterval(): Function {
+		return setInterval
+	},
+	get clearTimeout(): Function {
+		return clearTimeout
+	},
+	get clearInterval(): Function {
+		return clearInterval
+	},
+
+	get orgSetTimeout(): Function {
+		return orgSetTimeout
+	},
+	get orgSetInterval(): Function {
+		return orgSetInterval
+	},
+	get orgClearTimeout(): Function {
+		return orgClearTimeout
+	},
+	get orgClearInterval(): Function {
+		return orgClearInterval
+	},
+}
+
+export class MeteorMock {}
+
+export namespace MeteorMock {
+	export const settings: any = {}
+
+	export const mockMethods: { [name: string]: Function } = {}
+	export let mockUser: Meteor.User | undefined = undefined
+	export const mockStartupFunctions: Function[] = []
+
+	export function status(): DDP.DDPStatus {
+		return {
+			connected: true,
+			status: 'connected',
+			retryCount: 0,
+		}
+	}
+
+	export function user(): Meteor.User | undefined {
+		return mockUser
+	}
+	export function userId(): string | undefined {
+		return mockUser ? mockUser._id : undefined
+	}
+	function getMethodContext() {
+		return {
+			userId: mockUser ? mockUser._id : undefined,
+			connection: {
+				clientAddress: '1.1.1.1',
+			},
+			unblock: () => {
+				// noop
+			},
+		}
+	}
+	export class Error {
+		private _stack?: string
+		constructor(public error: number, public reason?: string) {
+			const e = new $.Error('')
+			let stack: string = e.stack || ''
+
+			const lines = stack.split('\n')
+			if (lines.length > 1) {
+				lines.shift()
+				stack = lines.join('\n')
+			}
+			this._stack = stack
+			// console.log(this._stack)
+		}
+		get name(): string {
+			return this.toString()
+		}
+		get message(): string {
+			return this.toString()
+		}
+		get details(): any {
+			return undefined
+		}
+		get errorType(): string {
+			return 'Meteor.Error'
+		}
+		get isClientSafe(): boolean {
+			return false
+		}
+		get stack(): string | undefined {
+			return this._stack
+		}
+		toString(): string {
+			return `[${this.error}] ${this.reason}` // TODO: This should be changed to "${this.reason} [${this.error}]"
+		}
+	}
+	export function methods(addMethods: { [name: string]: Function }): void {
+		Object.assign(mockMethods, addMethods)
+	}
+	export function call(methodName: string, ...args: any[]): any {
+		const fcn: Function = mockMethods[methodName]
+		if (!fcn) {
+			console.log(methodName)
+			console.log(mockMethods)
+			console.log(new Error(1).stack)
+			throw new Error(404, `Method '${methodName}' not found`)
+		}
+
+		const lastArg = args.length > 0 && args[args.length - 1]
+		if (lastArg && typeof lastArg === 'function') {
+			const callback = args.pop()
+
+			defer(() => {
+				try {
+					Promise.resolve(fcn.call(getMethodContext(), ...args))
+						.then((result) => {
+							callback(undefined, result)
+						})
+						.catch((e) => {
+							callback(e)
+						})
+				} catch (e) {
+					callback(e)
+				}
+			})
+		} else {
+			throw new Error(500, 'callback must be supplied on the client to Meteor.call')
+		}
+	}
+	export function apply(
+		methodName: string,
+		args: any[],
+		_options?: {
+			wait?: boolean
+			onResultReceived?: Function
+		},
+		asyncCallback?: Function
+	): any {
+		// ?
+		// This is a bad mock, since it doesn't support any of the options..
+		// but it'll do for now:
+		call(methodName, ...args, asyncCallback)
+	}
+	export function setTimeout(fcn: () => void | Promise<void>, time: number): number {
+		return $.setTimeout(fcn, time) as number
+	}
+	export function clearTimeout(timer: number): void {
+		$.clearTimeout(timer)
+	}
+	export function setInterval(fcn: () => void | Promise<void>, time: number): number {
+		return $.setInterval(fcn, time) as number
+	}
+	export function clearInterval(timer: number): void {
+		$.clearInterval(timer)
+	}
+	export function defer(fcn: () => void | Promise<void>): void {
+		return (controllableDefer ? $.setTimeout : $.orgSetTimeout)(() => fcn, 0)
+	}
+
+	export function startup(fcn: Function): void {
+		mockStartupFunctions.push(fcn)
+	}
+
+	export function bindEnvironment(_fcn: Function): any {
+		throw new Error(500, 'bindEnvironment not supported on client')
+	}
+	export let users: MongoMock.Collection<any> | undefined = undefined
+
+	// -- Mock functions: --------------------------
+	/**
+	 * Run the Meteor.startup() functions
+	 */
+	export async function mockRunMeteorStartup(): Promise<void> {
+		_.each(mockStartupFunctions, (fcn) => {
+			fcn()
+		})
+
+		await waitTimeNoFakeTimers(10) // So that any observers or defers has had time to run.
+	}
+	export function mockLoginUser(newUser: Meteor.User): void {
+		mockUser = newUser
+	}
+	export function mockSetUsersCollection(usersCollection: MongoMock.Collection<any>): void {
+		users = usersCollection
+	}
+
+	/** Wait for time to pass ( unaffected by jest.useFakeTimers() ) */
+	export async function sleepNoFakeTimers(time: number): Promise<void> {
+		return new Promise<void>((resolve) => $.orgSetTimeout(resolve, time))
+	}
+
+	export function _setImmediate(cb: () => void): number {
+		return setTimeout(cb, 0)
+	}
+}
+export function setup(): any {
+	return {
+		Meteor: MeteorMock,
+	}
+}
+
+/** Wait for time to pass ( unaffected by jest.useFakeTimers() ) */
+export async function waitTimeNoFakeTimers(time: number): Promise<void> {
+	await MeteorMock.sleepNoFakeTimers(time)
+}
diff --git a/packages/webui/src/__mocks__/mongo.ts b/packages/webui/src/__mocks__/mongo.ts
new file mode 100644
index 0000000000..160a603b46
--- /dev/null
+++ b/packages/webui/src/__mocks__/mongo.ts
@@ -0,0 +1,353 @@
+/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
+import * as _ from 'underscore'
+import { literal, ProtectedString, unprotectString, protectString, getRandomString } from '../client/lib/tempLib'
+import { RandomMock } from './random'
+import { MeteorMock } from './meteor'
+import { Meteor } from 'meteor/meteor'
+import type { AnyBulkWriteOperation } from 'mongodb'
+import {
+	FindOneOptions,
+	FindOptions,
+	MongoReadOnlyCollection,
+	ObserveCallbacks,
+	ObserveChangesCallbacks,
+	UpdateOptions,
+	UpsertOptions,
+	WrappedMongoCollection,
+} from '../client/collections/lib'
+import {
+	mongoWhere,
+	mongoFindOptions,
+	mongoModify,
+	MongoQuery,
+	MongoModifier,
+} from '@sofie-automation/corelib/dist/mongo'
+import { Mongo } from 'meteor/mongo'
+import { sleep } from '@sofie-automation/shared-lib/dist/lib/lib'
+const clone = require('fast-clone')
+
+export namespace MongoMock {
+	interface ObserverEntry<T extends CollectionObject> {
+		id: string
+		query: any
+		callbacksChanges?: ObserveChangesCallbacks<T>
+		callbacksObserve?: ObserveCallbacks<T>
+	}
+
+	export interface MockCollections<T extends CollectionObject> {
+		[collectionName: string]: MockCollection<T>
+	}
+	export interface MockCollection<T extends CollectionObject> {
+		[id: string]: T
+	}
+	interface CollectionObject {
+		_id: ProtectedString<any>
+	}
+
+	const mockCollections: MockCollections<any> = {}
+	export type MongoCollection = {}
+	export class Collection<T extends CollectionObject> implements MongoCollection {
+		public _name: string
+		private _options: any = {}
+		// @ts-expect-error used in test to check that it's a mock
+		private _isMock = true as const
+		public observers: ObserverEntry<T>[] = []
+
+		public asyncBulkWriteDelay = 100
+
+		constructor(name: string | null, options?: { transform?: never }) {
+			this._options = options || {}
+			this._name = name || getRandomString() // If `null`, then its an in memory unique collection
+
+			if (this._options.transform) throw new Error('document transform is no longer supported')
+		}
+
+		find(query: any, options?: FindOptions<T>) {
+			if (_.isString(query)) query = { _id: query }
+			query = query || {}
+
+			const unimplementedUsedOptions = _.without(_.keys(options), 'sort', 'limit', 'fields', 'projection')
+			if (options && 'fields' in options && 'projection' in options) {
+				throw new Error(`Only one of 'fields' and 'projection' can be specified`)
+			}
+			if (unimplementedUsedOptions.length > 0) {
+				throw new Error(`find being performed using unimplemented options: ${unimplementedUsedOptions}`)
+			}
+
+			const docsArray = Object.values<T>(this.documents)
+			let docs: T[] = _.compact(
+				query._id && typeof query._id === 'string'
+					? [this.documents[query._id]]
+					: docsArray.filter((doc) => mongoWhere(doc, query))
+			)
+
+			docs = mongoFindOptions(docs, options)
+
+			const observers = this.observers
+
+			const removeObserver = (id: string): void => {
+				const index = observers.findIndex((o) => o.id === id)
+				if (index === -1) throw new Meteor.Error(500, 'Cannot stop observer that is not registered')
+				observers.splice(index, 1)
+			}
+
+			return {
+				_fetchRaw: () => {
+					return docs
+				},
+				fetch: () => {
+					return clone(docs)
+				},
+				count: () => {
+					return docs.length
+				},
+				observe(clbs: ObserveCallbacks<T>): Meteor.LiveQueryHandle {
+					const id = getRandomString(5)
+					observers.push(
+						literal<ObserverEntry<T>>({
+							id: id,
+							callbacksObserve: clbs,
+							query: query,
+						})
+					)
+					return {
+						stop() {
+							removeObserver(id)
+						},
+					}
+				},
+				observeChanges(clbs: ObserveChangesCallbacks<T>): Meteor.LiveQueryHandle {
+					// todo - finish implementing uses of callbacks
+					const id = getRandomString(5)
+					observers.push(
+						literal<ObserverEntry<T>>({
+							id: id,
+							callbacksChanges: clbs,
+							query: query,
+						})
+					)
+					return {
+						stop() {
+							removeObserver(id)
+						},
+					}
+				},
+				forEach(f: any) {
+					docs.forEach(f)
+				},
+				map(f: any) {
+					return docs.map(f)
+				},
+			}
+		}
+		findOne(query: MongoQuery<T>, options?: FindOneOptions<T>) {
+			return this.find(query, options).fetch()[0]
+		}
+		update(query: MongoQuery<T>, modifier: MongoModifier<T>, options?: UpdateOptions): number {
+			const unimplementedUsedOptions = _.without(_.keys(options), 'multi')
+			if (unimplementedUsedOptions.length > 0) {
+				throw new Error(`update being performed using unimplemented options: ${unimplementedUsedOptions}`)
+			}
+
+			// todo
+			let docs = this.find(query)._fetchRaw()
+
+			// By default mongo only updates one doc, unless told multi
+			if (this.documents.length && !options?.multi) {
+				docs = [docs[0]]
+			}
+
+			_.each(docs, (doc) => {
+				const modifiedDoc = mongoModify(query, doc, modifier)
+				this.documents[unprotectString(doc._id)] = modifiedDoc
+
+				Meteor.defer(() => {
+					_.each(_.clone(this.observers), (obs) => {
+						if (mongoWhere(doc, obs.query)) {
+							if (obs.callbacksChanges?.changed) {
+								obs.callbacksChanges.changed(doc._id, {}) // TODO - figure out what changed
+							}
+							if (obs.callbacksObserve?.changed) {
+								obs.callbacksObserve.changed(modifiedDoc, doc)
+							}
+						}
+					})
+				})
+			})
+
+			return docs.length
+		}
+		insert(doc: T): T['_id'] {
+			const d = _.clone(doc)
+			if (!d._id) d._id = protectString(RandomMock.id())
+
+			if (this.documents[unprotectString(d._id)]) {
+				throw new MeteorMock.Error(500, `Duplicate key '${d._id}'`)
+			}
+
+			this.documents[unprotectString(d._id)] = d
+
+			Meteor.defer(() => {
+				_.each(_.clone(this.observers), (obs) => {
+					if (mongoWhere(d, obs.query)) {
+						const fields = _.keys(_.omit(d, '_id'))
+						if (obs.callbacksChanges?.addedBefore) {
+							obs.callbacksChanges.addedBefore(d._id, fields, null as any)
+						}
+						if (obs.callbacksChanges?.added) {
+							obs.callbacksChanges.added(d._id, fields)
+						}
+						if (obs.callbacksObserve?.added) {
+							obs.callbacksObserve.added(d)
+						}
+					}
+				})
+			})
+
+			return d._id
+		}
+		upsert(
+			query: any,
+			modifier: MongoModifier<T>,
+			options?: UpsertOptions
+		): { numberAffected: number | undefined; insertedId: T['_id'] | undefined } {
+			const id = _.isString(query) ? query : query._id
+
+			const docs = this.find(id)._fetchRaw()
+
+			if (docs.length) {
+				const count = this.update(docs[0]._id, modifier, options)
+				return { insertedId: undefined, numberAffected: count }
+			} else {
+				const doc = mongoModify<T>(query, { _id: id } as any, modifier)
+				const insertedId = this.insert(doc)
+				return { insertedId: insertedId, numberAffected: undefined }
+			}
+		}
+		remove(query: any): number {
+			const docs = this.find(query)._fetchRaw()
+
+			_.each(docs, (doc) => {
+				delete this.documents[unprotectString(doc._id)]
+
+				Meteor.defer(() => {
+					_.each(_.clone(this.observers), (obs) => {
+						if (mongoWhere(doc, obs.query)) {
+							if (obs.callbacksChanges?.removed) {
+								obs.callbacksChanges.removed(doc._id)
+							}
+							if (obs.callbacksObserve?.removed) {
+								obs.callbacksObserve.removed(doc)
+							}
+						}
+					})
+				})
+			})
+			return docs.length
+		}
+
+		_ensureIndex(_obj: any) {
+			// todo
+		}
+		allow() {
+			// todo
+		}
+		rawCollection() {
+			return {
+				bulkWrite: async (updates: AnyBulkWriteOperation<any>[], _options: unknown) => {
+					await sleep(this.asyncBulkWriteDelay)
+
+					for (const update of updates) {
+						if ('insertOne' in update) {
+							this.insert(update.insertOne.document)
+						} else if ('updateOne' in update) {
+							if (update.updateOne.upsert) {
+								this.upsert(update.updateOne.filter, update.updateOne.update as any, { multi: false })
+							} else {
+								this.update(update.updateOne.filter, update.updateOne.update as any, { multi: false })
+							}
+						} else if ('updateMany' in update) {
+							if (update.updateMany.upsert) {
+								this.upsert(update.updateMany.filter, update.updateMany.update as any, { multi: true })
+							} else {
+								this.update(update.updateMany.filter, update.updateMany.update as any, { multi: true })
+							}
+						} else if ('deleteOne' in update) {
+							const docs = this.find(update.deleteOne.filter).fetch()
+							if (docs.length) {
+								this.remove(docs[0]._id)
+							}
+						} else if ('deleteMany' in update) {
+							this.remove(update.deleteMany.filter)
+						} else if (update['replaceOne']) {
+							this.upsert(update.replaceOne.filter, update.replaceOne.replacement)
+						}
+					}
+				},
+				collectionName: this._name,
+			}
+		}
+		private get documents(): MockCollection<T> {
+			if (!mockCollections[this._name]) mockCollections[this._name] = {}
+			return mockCollections[this._name]
+		}
+	}
+	// Mock functions:
+	export function mockSetData<T extends CollectionObject>(
+		collection: WrappedMongoCollection<T>,
+		data: MockCollection<T> | Array<T> | null
+	) {
+		const collectionName = collection.name
+		if (collectionName === null) {
+			throw new Meteor.Error(500, 'mockSetData can only be done for named collections')
+		}
+
+		data = data || {}
+		if (_.isArray(data)) {
+			const collectionData: MockCollection<T> = {}
+			_.each(data, (doc) => {
+				if (!doc._id) throw Error(`mockSetData: "${collectionName}": doc._id missing`)
+				collectionData[unprotectString(doc._id)] = doc
+			})
+			mockCollections[collectionName] = collectionData
+		} else {
+			mockCollections[collectionName] = data
+		}
+	}
+
+	export function deleteAllData() {
+		Object.keys(mockCollections).forEach((id) => {
+			mockCollections[id] = {}
+		})
+	}
+
+	/**
+	 * The Mock Collection type does a sleep before starting on executing the bulkWrite.
+	 * This simulates the async nature of writes to mongo, and aims to detect race conditions in our code.
+	 * This method will change the duration of the sleep, and returns the old delay value
+	 */
+	export function setCollectionAsyncBulkWriteDelay(collection: WrappedMongoCollection<any>, delay: number): number {
+		const collection2 = collection as any
+		if (typeof collection2.asyncWriteDelay !== 'number') {
+			throw new Error(
+				"asyncWriteDelay must be defined already, or this won't do anything. Perhaps some refactoring?"
+			)
+		}
+		const oldDelay = collection2.asyncWriteDelay
+		collection2.asyncWriteDelay = delay
+		return oldDelay
+	}
+
+	export function getInnerMockCollection<T extends { _id: ProtectedString<any> }>(
+		collection: MongoReadOnlyCollection<T> | WrappedMongoCollection<T>
+	): Mongo.Collection<T> {
+		return (collection as any).mockCollection
+	}
+}
+export function setup(): any {
+	return {
+		Mongo: MongoMock,
+	}
+}
+
+MeteorMock.mockSetUsersCollection(new MongoMock.Collection('Meteor.users'))
diff --git a/packages/webui/src/__mocks__/random.ts b/packages/webui/src/__mocks__/random.ts
new file mode 100644
index 0000000000..aa4e336b8a
--- /dev/null
+++ b/packages/webui/src/__mocks__/random.ts
@@ -0,0 +1,33 @@
+export class RandomMock {
+	static mockIds: Array<string> = []
+	static mockI = 9000
+
+	static id(): string {
+		let id = this.mockIds.shift()
+		if (!id) id = 'randomId' + RandomMock.mockI++
+		return id
+	}
+	/** Returns a "mocked random" number 0-1 */
+	static number(): number {
+		return (RandomMock.mockI++ / 1.6180339887) % 1
+	}
+}
+export function setup(): any {
+	return {
+		Random: RandomMock,
+		nanoid: RandomMock.id.bind(RandomMock),
+		customAlphabet: () => RandomMock.id.bind(RandomMock),
+	}
+}
+
+export function restartRandomId(): void {
+	RandomMock.mockI = 9000
+	RandomMock.mockIds = []
+}
+
+export function resetRandomId(): void {
+	// move the iterator forward and tie to next 1000
+	// This will help with making the random id more consistend in tests
+	RandomMock.mockI += 500
+	RandomMock.mockI += 1000 - (RandomMock.mockI % 1000)
+}
diff --git a/packages/webui/src/__mocks__/tracker.ts b/packages/webui/src/__mocks__/tracker.ts
new file mode 100644
index 0000000000..47ebb8cfcd
--- /dev/null
+++ b/packages/webui/src/__mocks__/tracker.ts
@@ -0,0 +1,128 @@
+/**
+ * This is a very rudimentary mock of a Meteor Tracker. It is quite likely buggy and may not accurately represent
+ * the order in which flags are turned on/off, since that's not clear from Meteor documentation.
+ * Also, all of the Tracker.flush() and related methods are not implemented.
+ */
+
+export namespace TrackerMock {
+	type ComputationCallback = (computation: Computation) => void
+	type AutorunCallback = (computation: Computation) => void
+	// eslint-disable-next-line prefer-const
+	export let currentComputation: Computation | null = null
+	// eslint-disable-next-line prefer-const
+	export let active = false
+
+	export class Dependency {
+		private dependents: Computation[] = []
+		public changed = (): void => {
+			this.dependents.forEach((comp) => comp.invalidate())
+		}
+		public depend = (): void => {
+			if (TrackerMock.currentComputation) {
+				const comp = TrackerMock.currentComputation
+				if (comp) {
+					const length = this.dependents.push(comp)
+					comp.onStop(() => {
+						this.dependents.splice(length - 1, 1)
+					})
+				}
+			}
+		}
+		public hasDependents = (): boolean => {
+			return this.dependents.length > 0
+		}
+	}
+
+	export class Computation {
+		private onInvalidateClbs: Array<ComputationCallback> = []
+		private onStopClbs: Array<ComputationCallback> = []
+		private func: AutorunCallback
+		private parentComputation: Computation | null = null
+		stopped = false
+		invalidated = false
+		firstRun = true
+
+		constructor(computedFunc: AutorunCallback, parentComputation: Computation | null, _onError?: (e: any) => void) {
+			this.parentComputation = parentComputation
+			this.firstRun = true
+			this.func = computedFunc
+			this.runFunc()
+			this.firstRun = false
+		}
+
+		private runFunc = () => {
+			const trackBuf = TrackerMock.currentComputation
+			TrackerMock.currentComputation = this
+			TrackerMock.active = !!TrackerMock.currentComputation
+			this.func(this)
+			TrackerMock.currentComputation = trackBuf
+			TrackerMock.active = !!TrackerMock.currentComputation
+		}
+		private runAll = (clbs: Array<ComputationCallback>) => {
+			clbs.forEach((clb) => clb(this))
+		}
+		public stop = (): void => {
+			this.stopped = true
+			this.runAll(this.onInvalidateClbs)
+			this.onInvalidateClbs.length = 0
+			this.runAll(this.onStopClbs)
+			this.onStopClbs.length = 0
+		}
+		public invalidate = (): void => {
+			this.invalidated = true
+			if (!this.parentComputation) {
+				this.runAll(this.onInvalidateClbs)
+				this.runFunc()
+				this.invalidated = false
+			} else {
+				this.stop()
+				this.parentComputation.invalidate()
+			}
+		}
+		public onInvalidate = (clb: ComputationCallback): void => {
+			this.onInvalidateClbs.push(clb)
+		}
+		public onStop = (clb: ComputationCallback): void => {
+			this.onStopClbs.push(clb)
+		}
+	}
+
+	export function autorun(runFunc: AutorunCallback, options = {}): TrackerMock.Computation {
+		if (Object.keys(options).length > 0) {
+			throw new Error(`Tracker.autorun using unimplemented options: ${Object.keys(options).join(', ')}`)
+		}
+
+		return new TrackerMock.Computation(runFunc, TrackerMock.currentComputation)
+	}
+	export function flush(): void {
+		throw new Error(`Tracker.flush() is not implemented in the mock Tracker`)
+	}
+	export function nonreactive<T>(runFunc: () => T): T {
+		const comp = TrackerMock.currentComputation
+		TrackerMock.currentComputation = null
+		TrackerMock.active = !!TrackerMock.currentComputation
+		const result = runFunc()
+		TrackerMock.currentComputation = comp
+		TrackerMock.active = !!TrackerMock.currentComputation
+		return result
+	}
+	export function inFlush(): boolean {
+		throw new Error(`Tracker.inFlush() is not implemented in the mock Tracker`)
+	}
+	export function onInvalidate(clb: ComputationCallback): void {
+		if (!TrackerMock.currentComputation) {
+			throw new Error('Tracker.onInvalidate requires a currentComputation')
+		}
+
+		TrackerMock.currentComputation.onInvalidate(clb)
+	}
+	export function afterFlush(_clb: Function): void {
+		throw new Error(`Tracker.afterFlush() is not implemented in the mock Tracker`)
+	}
+}
+
+export function setup(): any {
+	return {
+		Tracker: TrackerMock,
+	}
+}
diff --git a/meteor/client/__tests__/jest-setup.js b/packages/webui/src/client/__tests__/jest-setup.cjs
similarity index 50%
rename from meteor/client/__tests__/jest-setup.js
rename to packages/webui/src/client/__tests__/jest-setup.cjs
index 73ddc6089d..bb36d10e75 100644
--- a/meteor/client/__tests__/jest-setup.js
+++ b/packages/webui/src/client/__tests__/jest-setup.cjs
@@ -1,2 +1,7 @@
+/* eslint-disable node/no-unpublished-require */
+
 // used by code creating XML with the DOM API to return an XML string
 global.XMLSerializer = require('@xmldom/xmldom').XMLSerializer
+
+// Version number injected by vite packaging
+global.__APP_VERSION__ = '0.0.0'
diff --git a/meteor/client/collections/index.ts b/packages/webui/src/client/collections/index.ts
similarity index 58%
rename from meteor/client/collections/index.ts
rename to packages/webui/src/client/collections/index.ts
index 7158421b30..ef7784e023 100644
--- a/meteor/client/collections/index.ts
+++ b/packages/webui/src/client/collections/index.ts
@@ -16,29 +16,35 @@ import { ExternalMessageQueueObj } from '@sofie-automation/corelib/dist/dataMode
 import { PackageContainerStatusDB } from '@sofie-automation/corelib/dist/dataModel/PackageContainerStatus'
 import { MediaWorkFlow } from '@sofie-automation/shared-lib/dist/core/model/MediaWorkFlows'
 import { MediaWorkFlowStep } from '@sofie-automation/shared-lib/dist/core/model/MediaWorkFlowSteps'
-import { Meteor } from 'meteor/meteor'
-import { Bucket } from '../../lib/collections/Buckets'
-import { ICoreSystem, SYSTEM_ID } from '../../lib/collections/CoreSystem'
-import { Evaluation } from '../../lib/collections/Evaluations'
+import { Bucket } from '@sofie-automation/meteor-lib/dist/collections/Buckets'
+import { ICoreSystem, SYSTEM_ID } from '@sofie-automation/meteor-lib/dist/collections/CoreSystem'
+import { Evaluation } from '@sofie-automation/meteor-lib/dist/collections/Evaluations'
 import { ExpectedPackageDB } from '@sofie-automation/corelib/dist/dataModel/ExpectedPackages'
-import {
-	createSyncMongoCollection,
-	createSyncReadOnlyMongoCollection,
-	wrapMongoCollection,
-} from '../../lib/collections/lib'
+import { createSyncMongoCollection, createSyncReadOnlyMongoCollection } from './lib'
 import { PeripheralDevice } from '@sofie-automation/corelib/dist/dataModel/PeripheralDevice'
-import { RundownLayoutBase } from '../../lib/collections/RundownLayouts'
+import { RundownLayoutBase } from '@sofie-automation/meteor-lib/dist/collections/RundownLayouts'
 import { DBShowStyleBase } from '@sofie-automation/corelib/dist/dataModel/ShowStyleBase'
 import { DBShowStyleVariant } from '@sofie-automation/corelib/dist/dataModel/ShowStyleVariant'
-import { SnapshotItem } from '../../lib/collections/Snapshots'
+import { SnapshotItem } from '@sofie-automation/meteor-lib/dist/collections/Snapshots'
 import { DBStudio } from '@sofie-automation/corelib/dist/dataModel/Studio'
-import { TranslationsBundle } from '../../lib/collections/TranslationsBundles'
-import { DBTriggeredActions } from '../../lib/collections/TriggeredActions'
-import { UserActionsLogItem } from '../../lib/collections/UserActionsLog'
-import { DBUser } from '../../lib/collections/Users'
-
-// Future: remove the need for this
-export * from '../../lib/collections/libCollections'
+import { TranslationsBundle } from '@sofie-automation/meteor-lib/dist/collections/TranslationsBundles'
+import { DBTriggeredActions } from '@sofie-automation/meteor-lib/dist/collections/TriggeredActions'
+import { UserActionsLogItem } from '@sofie-automation/meteor-lib/dist/collections/UserActionsLog'
+import { AdLibAction } from '@sofie-automation/corelib/dist/dataModel/AdlibAction'
+import { AdLibPiece } from '@sofie-automation/corelib/dist/dataModel/AdLibPiece'
+import { DBPart } from '@sofie-automation/corelib/dist/dataModel/Part'
+import { Piece } from '@sofie-automation/corelib/dist/dataModel/Piece'
+import { PieceInstance } from '@sofie-automation/corelib/dist/dataModel/PieceInstance'
+import { PartInstance } from '@sofie-automation/meteor-lib/dist/collections/PartInstances'
+import { DBRundown } from '@sofie-automation/corelib/dist/dataModel/Rundown'
+import { RundownBaselineAdLibAction } from '@sofie-automation/corelib/dist/dataModel/RundownBaselineAdLibAction'
+import { RundownBaselineAdLibItem } from '@sofie-automation/corelib/dist/dataModel/RundownBaselineAdLibPiece'
+import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
+import { DBSegment } from '@sofie-automation/corelib/dist/dataModel/Segment'
+
+export const AdLibActions = createSyncReadOnlyMongoCollection<AdLibAction>(CollectionName.AdLibActions)
+
+export const AdLibPieces = createSyncReadOnlyMongoCollection<AdLibPiece>(CollectionName.AdLibPieces)
 
 export const Blueprints = createSyncMongoCollection<Blueprint>(CollectionName.Blueprints)
 
@@ -74,10 +80,32 @@ export const PackageContainerStatuses = createSyncReadOnlyMongoCollection<Packag
 	CollectionName.PackageContainerStatuses
 )
 
+export const PartInstances = createSyncReadOnlyMongoCollection<PartInstance>(CollectionName.PartInstances)
+
+export const Parts = createSyncReadOnlyMongoCollection<DBPart>(CollectionName.Parts)
+
 export const PeripheralDevices = createSyncMongoCollection<PeripheralDevice>(CollectionName.PeripheralDevices)
 
+export const PieceInstances = createSyncReadOnlyMongoCollection<PieceInstance>(CollectionName.PieceInstances)
+
+export const Pieces = createSyncReadOnlyMongoCollection<Piece>(CollectionName.Pieces)
+
+export const RundownBaselineAdLibActions = createSyncReadOnlyMongoCollection<RundownBaselineAdLibAction>(
+	CollectionName.RundownBaselineAdLibActions
+)
+
+export const RundownBaselineAdLibPieces = createSyncReadOnlyMongoCollection<RundownBaselineAdLibItem>(
+	CollectionName.RundownBaselineAdLibPieces
+)
+
 export const RundownLayouts = createSyncMongoCollection<RundownLayoutBase>(CollectionName.RundownLayouts)
 
+export const RundownPlaylists = createSyncReadOnlyMongoCollection<DBRundownPlaylist>(CollectionName.RundownPlaylists)
+
+export const Rundowns = createSyncReadOnlyMongoCollection<DBRundown>(CollectionName.Rundowns)
+
+export const Segments = createSyncReadOnlyMongoCollection<DBSegment>(CollectionName.Segments)
+
 export const ShowStyleBases = createSyncMongoCollection<DBShowStyleBase>(CollectionName.ShowStyleBases)
 
 export const ShowStyleVariants = createSyncMongoCollection<DBShowStyleVariant>(CollectionName.ShowStyleVariants)
@@ -94,9 +122,6 @@ export const TriggeredActions = createSyncMongoCollection<DBTriggeredActions>(Co
 
 export const UserActionsLog = createSyncReadOnlyMongoCollection<UserActionsLogItem>(CollectionName.UserActionsLog)
 
-// This is a somewhat special collection, as it draws from the Meteor.users collection from the Accounts package
-export const Users = wrapMongoCollection<DBUser>(Meteor.users as any, CollectionName.Users)
-
 export function getCoreSystem(): ICoreSystem | undefined {
 	return CoreSystem.findOne(SYSTEM_ID)
 }
diff --git a/packages/webui/src/client/collections/lib.ts b/packages/webui/src/client/collections/lib.ts
new file mode 100644
index 0000000000..40409c8064
--- /dev/null
+++ b/packages/webui/src/client/collections/lib.ts
@@ -0,0 +1,241 @@
+import { Meteor } from 'meteor/meteor'
+import { Mongo } from 'meteor/mongo'
+import { ProtectedString, protectString } from '../lib/tempLib'
+import { stringifyError } from '@sofie-automation/shared-lib/dist/lib/stringifyError'
+import type { Collection as RawCollection, Db as RawDb } from 'mongodb'
+import { CollectionName } from '@sofie-automation/corelib/dist/dataModel/Collections'
+import { MongoModifier, MongoQuery } from '@sofie-automation/corelib/dist/mongo'
+import { CustomCollectionName, MeteorPubSubCustomCollections } from '@sofie-automation/meteor-lib/dist/api/pubsub'
+import {
+	PeripheralDevicePubSubCollections,
+	PeripheralDevicePubSubCollectionsNames,
+} from '@sofie-automation/shared-lib/dist/pubsub/peripheralDevice'
+import {
+	MongoCollection,
+	MongoReadOnlyCollection,
+	MongoCursor,
+	FindOptions,
+	FindOneOptions,
+	UpdateOptions,
+	UpsertOptions,
+} from '@sofie-automation/meteor-lib/dist/collections/lib'
+
+export * from '@sofie-automation/meteor-lib/dist/collections/lib'
+
+export const ClientCollections = new Map<CollectionName, MongoCollection<any> | WrappedMongoReadOnlyCollection<any>>()
+function registerClientCollection(
+	name: CollectionName,
+	collection: MongoCollection<any> | WrappedMongoReadOnlyCollection<any>
+): void {
+	if (ClientCollections.has(name)) throw new Meteor.Error(`Cannot re-register collection "${name}"`)
+	ClientCollections.set(name, collection)
+}
+
+export const PublicationCollections = new Map<
+	CustomCollectionName | PeripheralDevicePubSubCollectionsNames,
+	WrappedMongoReadOnlyCollection<any>
+>()
+
+/**
+ * Map of current collection objects.
+ * Future: Could this weakly hold the collections?
+ */
+export const collectionsCache = new Map<string, Mongo.Collection<any>>()
+export function getOrCreateMongoCollection(name: string): Mongo.Collection<any> {
+	const collection = collectionsCache.get(name)
+	if (collection) {
+		return collection
+	}
+
+	const newCollection = new Mongo.Collection(name)
+	collectionsCache.set(name, newCollection)
+	return newCollection
+}
+
+/**
+ * Wrap an existing Mongo.Collection to have async methods. Primarily to convert the built-in Users collection
+ * @param collection Collection to wrap
+ * @param name Name of the collection
+ */
+export function wrapMongoCollection<DBInterface extends { _id: ProtectedString<any> }>(
+	collection: Mongo.Collection<DBInterface>,
+	name: CollectionName
+): MongoCollection<DBInterface> {
+	const wrapped = new WrappedMongoCollection<DBInterface>(collection, name)
+
+	registerClientCollection(name, wrapped)
+
+	return wrapped
+}
+
+/**
+ * Create a sync in-memory Mongo Collection (for ui temporary storage)
+ * @param name Name of the collection (for logging)
+ */
+export function createInMemorySyncMongoCollection<DBInterface extends { _id: ProtectedString<any> }>(
+	name: string
+): MongoCollection<DBInterface> {
+	const collection = new Mongo.Collection<DBInterface>(null)
+	return new WrappedMongoCollection<DBInterface>(collection, name)
+}
+
+/**
+ * Create a Mongo Collection for use in the client (has sync apis)
+ * @param name Name of the collection
+ */
+export function createSyncMongoCollection<DBInterface extends { _id: ProtectedString<any> }>(
+	name: CollectionName
+): MongoCollection<DBInterface> {
+	const collection = getOrCreateMongoCollection(name)
+	const wrapped = new WrappedMongoCollection<DBInterface>(collection, name)
+
+	registerClientCollection(name, wrapped)
+
+	return wrapped
+}
+
+/**
+ * Create a Mongo Collection for use in the client (has sync apis)
+ * @param name Name of the collection
+ */
+export function createSyncReadOnlyMongoCollection<DBInterface extends { _id: ProtectedString<any> }>(
+	name: CollectionName
+): MongoReadOnlyCollection<DBInterface> {
+	const collection = getOrCreateMongoCollection(name)
+	const wrapped = new WrappedMongoReadOnlyCollection<DBInterface>(collection, name)
+
+	registerClientCollection(name, wrapped)
+
+	return wrapped
+}
+
+/**
+ * Create a Mongo Collection for a virtual collection populated by a custom-publication
+ * @param name Name of the custom-collection
+ */
+export function createSyncCustomPublicationMongoCollection<
+	K extends CustomCollectionName & keyof MeteorPubSubCustomCollections
+>(name: K): MongoReadOnlyCollection<MeteorPubSubCustomCollections[K]> {
+	const collection = new Mongo.Collection<MeteorPubSubCustomCollections[K]>(name)
+	const wrapped = new WrappedMongoReadOnlyCollection<MeteorPubSubCustomCollections[K]>(collection, name)
+
+	if (PublicationCollections.has(name)) throw new Meteor.Error(`Cannot re-register collection "${name}"`)
+	PublicationCollections.set(name, wrapped)
+
+	return wrapped
+}
+
+export function createSyncPeripheralDeviceCustomPublicationMongoCollection<
+	K extends PeripheralDevicePubSubCollectionsNames & keyof PeripheralDevicePubSubCollections
+>(name: K): MongoReadOnlyCollection<PeripheralDevicePubSubCollections[K]> {
+	const collection = new Mongo.Collection<PeripheralDevicePubSubCollections[K]>(name)
+	const wrapped = new WrappedMongoReadOnlyCollection<PeripheralDevicePubSubCollections[K]>(collection, name)
+
+	if (PublicationCollections.has(name)) throw new Meteor.Error(`Cannot re-register collection "${name}"`)
+	PublicationCollections.set(name, wrapped)
+
+	return wrapped
+}
+
+class WrappedMongoReadOnlyCollection<DBInterface extends { _id: ProtectedString<any> }>
+	implements MongoReadOnlyCollection<DBInterface>
+{
+	protected readonly _collection: Mongo.Collection<DBInterface>
+
+	public readonly name: string | null
+
+	constructor(collection: Mongo.Collection<DBInterface>, name: string | null) {
+		this._collection = collection
+		this.name = name
+	}
+
+	protected get _isMock() {
+		// @ts-expect-error re-export private property
+		return this._collection._isMock
+	}
+
+	public get mockCollection() {
+		return this._collection
+	}
+
+	protected wrapMongoError(e: any): never {
+		const str = stringifyError(e) || 'Unknown MongoDB Error'
+		throw new Meteor.Error((e && e.error) || 500, `Collection "${this.name}": ${str}`)
+	}
+
+	find(
+		selector?: MongoQuery<DBInterface> | DBInterface['_id'],
+		options?: FindOptions<DBInterface>
+	): MongoCursor<DBInterface> {
+		try {
+			return this._collection.find((selector ?? {}) as any, options as any) as MongoCursor<DBInterface>
+		} catch (e) {
+			this.wrapMongoError(e)
+		}
+	}
+	findOne(
+		selector?: MongoQuery<DBInterface> | DBInterface['_id'],
+		options?: FindOneOptions<DBInterface>
+	): DBInterface | undefined {
+		try {
+			return this._collection.findOne((selector ?? {}) as any, options as any)
+		} catch (e) {
+			this.wrapMongoError(e)
+		}
+	}
+}
+export class WrappedMongoCollection<DBInterface extends { _id: ProtectedString<any> }>
+	extends WrappedMongoReadOnlyCollection<DBInterface>
+	implements MongoCollection<DBInterface>
+{
+	insert(doc: DBInterface): DBInterface['_id'] {
+		try {
+			const resultId = this._collection.insert(doc as unknown as Mongo.OptionalId<DBInterface>)
+			return protectString(resultId)
+		} catch (e) {
+			this.wrapMongoError(e)
+		}
+	}
+	rawCollection(): RawCollection<DBInterface> {
+		return this._collection.rawCollection() as any
+	}
+	rawDatabase(): RawDb {
+		return this._collection.rawDatabase() as any
+	}
+	remove(selector: MongoQuery<DBInterface> | DBInterface['_id']): number {
+		try {
+			return this._collection.remove(selector as any)
+		} catch (e) {
+			this.wrapMongoError(e)
+		}
+	}
+	update(
+		selector: MongoQuery<DBInterface> | DBInterface['_id'] | { _id: DBInterface['_id'] },
+		modifier: MongoModifier<DBInterface>,
+		options?: UpdateOptions
+	): number {
+		try {
+			return this._collection.update(selector as any, modifier as any, options)
+		} catch (e) {
+			this.wrapMongoError(e)
+		}
+	}
+	upsert(
+		selector: MongoQuery<DBInterface> | DBInterface['_id'],
+		modifier: MongoModifier<DBInterface>,
+		options?: UpsertOptions
+	): {
+		numberAffected?: number
+		insertedId?: DBInterface['_id']
+	} {
+		try {
+			const result = this._collection.upsert(selector as any, modifier as any, options)
+			return {
+				numberAffected: result.numberAffected,
+				insertedId: protectString(result.insertedId),
+			}
+		} catch (e) {
+			this.wrapMongoError(e)
+		}
+	}
+}
diff --git a/packages/webui/src/client/collections/rundownPlaylistUtil.ts b/packages/webui/src/client/collections/rundownPlaylistUtil.ts
new file mode 100644
index 0000000000..f433ba9ef5
--- /dev/null
+++ b/packages/webui/src/client/collections/rundownPlaylistUtil.ts
@@ -0,0 +1,70 @@
+import { RundownId, RundownPlaylistId } from '@sofie-automation/corelib/dist/dataModel/Ids'
+import { Rundown, DBRundown } from '@sofie-automation/corelib/dist/dataModel/Rundown'
+import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
+import { normalizeArrayToMap } from '@sofie-automation/corelib/dist/lib'
+import { sortRundownIDsInPlaylist } from '@sofie-automation/corelib/dist/playout/playlist'
+import _ from 'underscore'
+import { Rundowns } from './index'
+import { FindOptions } from './lib'
+import { MongoQuery } from '@sofie-automation/corelib/dist/mongo'
+
+/**
+ * Direct database accessors for the RundownPlaylist
+ * These used to reside on the Rundown class
+ */
+export class RundownPlaylistCollectionUtil {
+	/** Returns an array of all Rundowns in the RundownPlaylist, sorted in playout order */
+	static getRundownsOrdered(
+		playlist: Pick<DBRundownPlaylist, '_id' | 'rundownIdsInOrder'>,
+		selector?: MongoQuery<Rundown>,
+		options?: FindOptions<Rundown>
+	): Rundown[] {
+		const allRundowns = RundownPlaylistCollectionUtil.getRundownsUnordered(playlist._id, selector, options)
+
+		const rundownsMap = normalizeArrayToMap(allRundowns, '_id')
+
+		const sortedIds = sortRundownIDsInPlaylist(playlist.rundownIdsInOrder, Array.from(rundownsMap.keys()))
+
+		return _.compact(sortedIds.map((id) => rundownsMap.get(id)))
+	}
+	/** Returns an array of all Rundowns in the RundownPlaylist, in no predictable order */
+	static getRundownsUnordered(
+		playlistId: RundownPlaylistId,
+		selector?: MongoQuery<Rundown>,
+		options?: FindOptions<Rundown>
+	): Rundown[] {
+		return Rundowns.find(
+			{
+				playlistId: playlistId,
+				...selector,
+			},
+			{
+				sort: {
+					_id: 1,
+				},
+				...options,
+			}
+		).fetch()
+	}
+	/** Returns an array with the id:s of all Rundowns in the RundownPlaylist, sorted in playout order */
+	static getRundownOrderedIDs(playlist: Pick<DBRundownPlaylist, '_id' | 'rundownIdsInOrder'>): RundownId[] {
+		const allIds = RundownPlaylistCollectionUtil.getRundownUnorderedIDs(playlist)
+
+		return sortRundownIDsInPlaylist(playlist.rundownIdsInOrder, allIds)
+	}
+	/** Returns an array with the id:s of all Rundowns in the RundownPlaylist, in no predictable order */
+	static getRundownUnorderedIDs(playlist: Pick<DBRundownPlaylist, '_id'>): RundownId[] {
+		const rundowns = Rundowns.find(
+			{
+				playlistId: playlist._id,
+			},
+			{
+				fields: {
+					_id: 1,
+				},
+			}
+		).fetch() as Array<Pick<DBRundown, '_id'>>
+
+		return rundowns.map((i) => i._id)
+	}
+}
diff --git a/meteor/client/lib/Components/Base64ImageInput.tsx b/packages/webui/src/client/lib/Components/Base64ImageInput.tsx
similarity index 100%
rename from meteor/client/lib/Components/Base64ImageInput.tsx
rename to packages/webui/src/client/lib/Components/Base64ImageInput.tsx
diff --git a/meteor/client/lib/Components/Checkbox.tsx b/packages/webui/src/client/lib/Components/Checkbox.tsx
similarity index 74%
rename from meteor/client/lib/Components/Checkbox.tsx
rename to packages/webui/src/client/lib/Components/Checkbox.tsx
index c357624805..6932ef5e6d 100644
--- a/meteor/client/lib/Components/Checkbox.tsx
+++ b/packages/webui/src/client/lib/Components/Checkbox.tsx
@@ -6,6 +6,7 @@ import ClassNames from 'classnames'
 interface ICheckboxControlProps {
 	classNames?: string
 	disabled?: boolean
+	title?: string
 
 	value: boolean
 	handleUpdate: (value: boolean) => void
@@ -15,6 +16,7 @@ export function CheckboxControl({
 	value,
 	disabled,
 	handleUpdate,
+	title,
 }: Readonly<ICheckboxControlProps>): JSX.Element {
 	const handleChange = useCallback(
 		(e: React.ChangeEvent<HTMLInputElement>) => {
@@ -25,11 +27,18 @@ export function CheckboxControl({
 
 	return (
 		<span className={ClassNames('checkbox', classNames)}>
-			<input type="checkbox" className="form-control" checked={value} onChange={handleChange} disabled={disabled} />
-			<span className="checkbox-checked">
+			<input
+				type="checkbox"
+				className="form-control"
+				checked={value}
+				onChange={handleChange}
+				disabled={disabled}
+				title={title}
+			/>
+			<span className="checkbox-checked" title={title}>
 				<FontAwesomeIcon icon={faCheckSquare} />
 			</span>
-			<span className="checkbox-unchecked">
+			<span className="checkbox-unchecked" title={title}>
 				<FontAwesomeIcon icon={faSquare} />
 			</span>
 		</span>
diff --git a/meteor/client/lib/Components/DropdownInput.tsx b/packages/webui/src/client/lib/Components/DropdownInput.tsx
similarity index 100%
rename from meteor/client/lib/Components/DropdownInput.tsx
rename to packages/webui/src/client/lib/Components/DropdownInput.tsx
diff --git a/meteor/client/lib/Components/FloatInput.tsx b/packages/webui/src/client/lib/Components/FloatInput.tsx
similarity index 100%
rename from meteor/client/lib/Components/FloatInput.tsx
rename to packages/webui/src/client/lib/Components/FloatInput.tsx
diff --git a/meteor/client/lib/Components/IntInput.tsx b/packages/webui/src/client/lib/Components/IntInput.tsx
similarity index 100%
rename from meteor/client/lib/Components/IntInput.tsx
rename to packages/webui/src/client/lib/Components/IntInput.tsx
diff --git a/meteor/client/lib/Components/JsonTextInput.tsx b/packages/webui/src/client/lib/Components/JsonTextInput.tsx
similarity index 100%
rename from meteor/client/lib/Components/JsonTextInput.tsx
rename to packages/webui/src/client/lib/Components/JsonTextInput.tsx
diff --git a/meteor/client/lib/Components/LabelAndOverrides.tsx b/packages/webui/src/client/lib/Components/LabelAndOverrides.tsx
similarity index 78%
rename from meteor/client/lib/Components/LabelAndOverrides.tsx
rename to packages/webui/src/client/lib/Components/LabelAndOverrides.tsx
index 25cb48894a..be6c4d39f2 100644
--- a/meteor/client/lib/Components/LabelAndOverrides.tsx
+++ b/packages/webui/src/client/lib/Components/LabelAndOverrides.tsx
@@ -16,6 +16,7 @@ export interface LabelAndOverridesProps<T extends object, TValue> {
 	opPrefix: string
 	overrideHelper: OverrideOpHelperForItemContents
 
+	showClearButton?: boolean
 	formatDefaultValue?: (value: any) => JSX.Element | string | null
 
 	children: (value: TValue, setValue: (value: TValue) => void) => React.ReactNode
@@ -33,6 +34,7 @@ export function LabelAndOverrides<T extends object, TValue = any>({
 	itemKey,
 	opPrefix,
 	overrideHelper,
+	showClearButton,
 	formatDefaultValue,
 }: Readonly<LabelAndOverridesProps<T, TValue>>): JSX.Element {
 	const { t } = useTranslation()
@@ -51,7 +53,7 @@ export function LabelAndOverrides<T extends object, TValue = any>({
 
 	let displayValue: JSX.Element | string | null = '""'
 	if (item.defaults) {
-		const defaultValue: any = item.defaults[itemKey]
+		const defaultValue: any = objectPathGet(item.defaults, String(itemKey))
 		// Special cases for formatting of the default
 		if (formatDefaultValue) {
 			displayValue = formatDefaultValue(defaultValue)
@@ -75,7 +77,16 @@ export function LabelAndOverrides<T extends object, TValue = any>({
 		<label className="field">
 			<LabelActual label={label} />
 
-			{children(value, setValue)}
+			<div className="field-content">
+				{showClearButton && (
+					<button className="btn btn-primary field-clear" onClick={() => setValue(undefined)} title={t('Clear value')}>
+						&nbsp;
+						<FontAwesomeIcon icon={faSync} />
+					</button>
+				)}
+
+				{children(value, setValue)}
+			</div>
 
 			{item.defaults && (
 				<>
@@ -188,3 +199,44 @@ export function LabelAndOverridesForBase64Image<T extends object>(
 
 	return <LabelAndOverrides<T, string> {...props} formatDefaultValue={formatter} />
 }
+
+export function LabelAndOverridesForMultiSelect<T extends object, TValue = any>(
+	props: Omit<LabelAndOverridesProps<T, TValue>, 'formatDefaultValue' | 'children'> & {
+		options: DropdownInputOption<TValue>[]
+		children: (
+			value: TValue[],
+			setValue: (value: TValue[]) => void,
+			options: DropdownInputOption<TValue>[]
+		) => React.ReactNode
+	}
+): JSX.Element {
+	const formatMultiLine = useCallback(
+		(value: any) => {
+			const matchedOption = findOptionByValue(props.options, value)
+			if (matchedOption) {
+				return `"${matchedOption.name}"`
+			} else {
+				return `Value: "${value}"`
+			}
+		},
+		[props.options]
+	)
+	const formatter = useCallback(
+		(defaultValue: any) => {
+			if (defaultValue === undefined || defaultValue.length === 0) return '""'
+
+			if (Array.isArray(defaultValue)) {
+				return defaultValue.map(formatMultiLine).join('/n')
+			} else {
+				return formatMultiLine(defaultValue)
+			}
+		},
+		[formatMultiLine]
+	)
+
+	return (
+		<LabelAndOverrides<T, TValue[]> {...props} formatDefaultValue={formatter}>
+			{(value, setValue) => props.children(value, setValue, props.options)}
+		</LabelAndOverrides>
+	)
+}
diff --git a/meteor/client/lib/Components/MultiLineTextInput.tsx b/packages/webui/src/client/lib/Components/MultiLineTextInput.tsx
similarity index 100%
rename from meteor/client/lib/Components/MultiLineTextInput.tsx
rename to packages/webui/src/client/lib/Components/MultiLineTextInput.tsx
diff --git a/meteor/client/lib/Components/MultiSelectInput.tsx b/packages/webui/src/client/lib/Components/MultiSelectInput.tsx
similarity index 96%
rename from meteor/client/lib/Components/MultiSelectInput.tsx
rename to packages/webui/src/client/lib/Components/MultiSelectInput.tsx
index bf49275ac6..1e9602145e 100644
--- a/meteor/client/lib/Components/MultiSelectInput.tsx
+++ b/packages/webui/src/client/lib/Components/MultiSelectInput.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback, useMemo } from 'react'
+import { useCallback, useMemo } from 'react'
 import { MultiSelect, MultiSelectEvent, MultiSelectOptions } from '../multiSelect'
 import { DropdownInputOption } from './DropdownInput'
 import ClassNames from 'classnames'
diff --git a/meteor/client/lib/Components/PromiseButton.scss b/packages/webui/src/client/lib/Components/PromiseButton.scss
similarity index 100%
rename from meteor/client/lib/Components/PromiseButton.scss
rename to packages/webui/src/client/lib/Components/PromiseButton.scss
index 2f31075b40..5171521faf 100644
--- a/meteor/client/lib/Components/PromiseButton.scss
+++ b/packages/webui/src/client/lib/Components/PromiseButton.scss
@@ -2,6 +2,10 @@ button.promise-button {
 	position: relative;
 
 	&.is-success {
+		animation-name: anim-success;
+		animation-timing-function: linear;
+		animation-duration: 3s;
+
 		@keyframes anim-success {
 			0% {
 				background-color: #95e995;
@@ -10,12 +14,15 @@ button.promise-button {
 				background-color: inherit;
 			}
 		}
-
-		animation-name: anim-success;
-		animation-timing-function: linear;
-		animation-duration: 3s;
 	}
 	&.is-failure {
+		background-color: inherit;
+
+		animation-name: anim-failure;
+		animation-timing-function: linear;
+		animation-duration: 0.25s;
+		animation-iteration-count: 4;
+
 		@keyframes anim-failure {
 			0% {
 				background-color: inherit;
@@ -33,13 +40,6 @@ button.promise-button {
 				background-color: inherit;
 			}
 		}
-
-		background-color: inherit;
-
-		animation-name: anim-failure;
-		animation-timing-function: linear;
-		animation-duration: 0.25s;
-		animation-iteration-count: 4;
 	}
 
 	> .content {
diff --git a/meteor/client/lib/Components/PromiseButton.tsx b/packages/webui/src/client/lib/Components/PromiseButton.tsx
similarity index 98%
rename from meteor/client/lib/Components/PromiseButton.tsx
rename to packages/webui/src/client/lib/Components/PromiseButton.tsx
index fe5cb6d2c2..c29dd1d669 100644
--- a/meteor/client/lib/Components/PromiseButton.tsx
+++ b/packages/webui/src/client/lib/Components/PromiseButton.tsx
@@ -1,6 +1,6 @@
 import React, { useCallback, useEffect, useState } from 'react'
 import ClassNames from 'classnames'
-import { logger } from '../../../lib/logging'
+import { logger } from '../logging'
 import { stringifyError } from '@sofie-automation/shared-lib/dist/lib/stringifyError'
 import { faCheck } from '@fortawesome/free-solid-svg-icons'
 
diff --git a/meteor/client/lib/Components/TextInput.tsx b/packages/webui/src/client/lib/Components/TextInput.tsx
similarity index 60%
rename from meteor/client/lib/Components/TextInput.tsx
rename to packages/webui/src/client/lib/Components/TextInput.tsx
index c260e7b4f6..76320be406 100644
--- a/meteor/client/lib/Components/TextInput.tsx
+++ b/packages/webui/src/client/lib/Components/TextInput.tsx
@@ -1,11 +1,21 @@
-import React, { useCallback, useState } from 'react'
+import React, { useCallback, useMemo, useState } from 'react'
 import ClassNames from 'classnames'
+import { DropdownInputOption } from './DropdownInput'
+import { getRandomString } from '@sofie-automation/corelib/dist/lib'
 
+export type TextInputSuggestion = DropdownInputOption<string>
+export interface TextInputSuggestionGroup {
+	name: string
+	options: TextInputSuggestion[]
+}
 interface ITextInputControlProps {
 	classNames?: string
 	modifiedClassName?: string
 	disabled?: boolean
 	placeholder?: string
+	spellCheck?: boolean
+
+	suggestions?: Array<TextInputSuggestionGroup | TextInputSuggestion>
 
 	/** Call handleUpdate on every change, before focus is lost */
 	updateOnKey?: boolean
@@ -19,6 +29,8 @@ export function TextInputControl({
 	value,
 	disabled,
 	placeholder,
+	spellCheck,
+	suggestions,
 	handleUpdate,
 	updateOnKey,
 }: Readonly<ITextInputControlProps>): JSX.Element {
@@ -60,7 +72,9 @@ export function TextInputControl({
 		[handleUpdate]
 	)
 
-	return (
+	const fieldId = useMemo(() => getRandomString(), [])
+
+	const textInput = (
 		<input
 			type="text"
 			className={ClassNames('form-control', classNames, editingValue !== null && modifiedClassName)}
@@ -71,6 +85,34 @@ export function TextInputControl({
 			onFocus={handleFocus}
 			onKeyUp={handleKeyUp}
 			disabled={disabled}
+			spellCheck={spellCheck}
+			list={suggestions ? fieldId : undefined}
 		/>
 	)
+
+	if (!suggestions) {
+		return textInput
+	} else {
+		return (
+			<div className="input-dropdowntext">
+				{textInput}
+
+				<datalist id={fieldId}>
+					{suggestions.map((o, j) =>
+						'options' in o ? (
+							<optgroup key={j} label={o.name}>
+								{o.options.map((v, i) => (
+									<option key={i} value={v + ''}></option>
+								))}
+							</optgroup>
+						) : (
+							<option key={o.i} value={o.value + ''}>
+								{o.value !== o.name ? o.name : null}
+							</option>
+						)
+					)}
+				</datalist>
+			</div>
+		)
+	}
 }
diff --git a/packages/webui/src/client/lib/Components/ToggleSwitch.tsx b/packages/webui/src/client/lib/Components/ToggleSwitch.tsx
new file mode 100644
index 0000000000..3cf82b1560
--- /dev/null
+++ b/packages/webui/src/client/lib/Components/ToggleSwitch.tsx
@@ -0,0 +1,50 @@
+import { useCallback, useRef } from 'react'
+import ClassNames from 'classnames'
+
+interface IToggleSwitchControlProps {
+	classNames?: string
+	disabled?: boolean
+
+	label?: string
+
+	value: boolean
+	handleUpdate: (value: boolean) => void
+}
+export function ToggleSwitchControl({
+	classNames,
+	value,
+	disabled,
+	label,
+	handleUpdate,
+}: Readonly<IToggleSwitchControlProps>): JSX.Element {
+	// Use a ref to avoid binding into the useCallback
+	const currentValue = useRef(value)
+	currentValue.current = value
+
+	const handleChange = useCallback(() => {
+		if (disabled) return
+		handleUpdate(!currentValue.current)
+	}, [handleUpdate, disabled])
+
+	return (
+		<div className="mvs">
+			<a
+				className={ClassNames('switch-button', 'mrs', classNames, disabled ? 'disabled' : '', {
+					'sb-on': value,
+				})}
+				role="button"
+				onClick={handleChange}
+				tabIndex={0}
+			>
+				<div className="sb-content">
+					<div className="sb-label">
+						<span className="mls">&nbsp;</span>
+						<span className="mrs right">&nbsp;</span>
+					</div>
+					<div className="sb-switch"></div>
+				</div>
+			</a>
+			<span>{label}</span>
+		</div>
+	)
+}
diff --git a/meteor/client/lib/Components/util.tsx b/packages/webui/src/client/lib/Components/util.tsx
similarity index 100%
rename from meteor/client/lib/Components/util.tsx
rename to packages/webui/src/client/lib/Components/util.tsx
diff --git a/meteor/client/lib/ConnectionStatusNotification.tsx b/packages/webui/src/client/lib/ConnectionStatusNotification.tsx
similarity index 96%
rename from meteor/client/lib/ConnectionStatusNotification.tsx
rename to packages/webui/src/client/lib/ConnectionStatusNotification.tsx
index 5d8e4ca3d0..fcb7e66e50 100644
--- a/meteor/client/lib/ConnectionStatusNotification.tsx
+++ b/packages/webui/src/client/lib/ConnectionStatusNotification.tsx
@@ -12,12 +12,12 @@ import {
 	Notification,
 	NotificationList,
 	NotifierHandle,
-} from '../../lib/notifications/notifications'
+} from './notifications/notifications'
 import { WithManagedTracker } from './reactiveData/reactiveDataHelper'
 import { withTranslation } from 'react-i18next'
 import { NotificationCenterPopUps } from './notifications/NotificationCenterPanel'
-import { MeteorPubSub } from '../../lib/api/pubsub'
-import { ICoreSystem, ServiceMessage, Criticality } from '../../lib/collections/CoreSystem'
+import { MeteorPubSub } from '@sofie-automation/meteor-lib/dist/api/pubsub'
+import { ICoreSystem, ServiceMessage, Criticality } from '@sofie-automation/meteor-lib/dist/collections/CoreSystem'
 import { TFunction } from 'react-i18next'
 import { getRandomId } from '@sofie-automation/corelib/dist/lib'
 import { CoreSystem } from '../collections'
diff --git a/meteor/client/lib/DocumentTitleProvider.tsx b/packages/webui/src/client/lib/DocumentTitleProvider.tsx
similarity index 95%
rename from meteor/client/lib/DocumentTitleProvider.tsx
rename to packages/webui/src/client/lib/DocumentTitleProvider.tsx
index 0af6e99276..edc455f9ce 100644
--- a/meteor/client/lib/DocumentTitleProvider.tsx
+++ b/packages/webui/src/client/lib/DocumentTitleProvider.tsx
@@ -1,7 +1,7 @@
 import * as React from 'react'
 
 import { translateWithTracker, Translated } from './ReactMeteorData/ReactMeteorData'
-import { ICoreSystem } from '../../lib/collections/CoreSystem'
+import { ICoreSystem } from '@sofie-automation/meteor-lib/dist/collections/CoreSystem'
 
 import { ReactiveVar } from 'meteor/reactive-var'
 import { isRunningInPWA } from './lib'
diff --git a/meteor/client/lib/EditAttribute.tsx b/packages/webui/src/client/lib/EditAttribute.tsx
similarity index 82%
rename from meteor/client/lib/EditAttribute.tsx
rename to packages/webui/src/client/lib/EditAttribute.tsx
index 0252431e41..7138d7645b 100644
--- a/meteor/client/lib/EditAttribute.tsx
+++ b/packages/webui/src/client/lib/EditAttribute.tsx
@@ -6,15 +6,16 @@ import { MultiSelect, MultiSelectEvent, MultiSelectOptions } from './multiSelect
 import ClassNames from 'classnames'
 import { ColorPickerEvent, ColorPicker } from './colorPicker'
 import { IconPicker, IconPickerEvent } from './iconPicker'
-import { assertNever, getRandomString } from '../../lib/lib'
-import { MongoCollection } from '../../lib/collections/lib'
+import { assertNever } from './tempLib'
+import { MongoCollection } from '../collections/lib'
 import { CheckboxControl } from './Components/Checkbox'
 import { TextInputControl } from './Components/TextInput'
 import { IntInputControl } from './Components/IntInput'
-import { DropdownInputControl, getDropdownInputOptions } from './Components/DropdownInput'
+import { DropdownInputControl, DropdownInputOption, getDropdownInputOptions } from './Components/DropdownInput'
 import { FloatInputControl } from './Components/FloatInput'
 import { joinLines, MultiLineTextInputControl, splitValueIntoLines } from './Components/MultiLineTextInput'
 import { JsonTextInputControl, tryParseJson } from './Components/JsonTextInput'
+import { ToggleSwitchControl } from './Components/ToggleSwitch'
 
 interface IEditAttribute extends IEditAttributeBaseProps {
 	type: EditAttributeType
@@ -28,7 +29,6 @@ export type EditAttributeType =
 	| 'toggle'
 	| 'dropdown'
 	| 'dropdowntext'
-	| 'switch'
 	| 'multiselect'
 	| 'json'
 	| 'colorpicker'
@@ -46,8 +46,6 @@ export class EditAttribute extends React.Component<IEditAttribute> {
 			return <EditAttributeFloat {...this.props} />
 		} else if (this.props.type === 'checkbox') {
 			return <EditAttributeCheckbox {...this.props} />
-		} else if (this.props.type === 'switch') {
-			return <EditAttributeSwitch {...this.props} />
 		} else if (this.props.type === 'toggle') {
 			return <EditAttributeToggle {...this.props} />
 		} else if (this.props.type === 'dropdown') {
@@ -362,81 +360,19 @@ const EditAttributeToggle = wrapEditAttribute(
 		constructor(props: any) {
 			super(props)
 		}
-		isChecked() {
+		private isChecked() {
 			return !!this.getEditAttribute()
 		}
-		handleChange = () => {
-			if (!this.props.disabled) {
-				this.handleUpdate(!this.state.value)
-			}
-		}
-		handleClick = () => {
-			this.handleChange()
-		}
-		render(): JSX.Element {
-			return (
-				<div className="mvs">
-					<a
-						className={ClassNames(
-							'switch-button',
-							'mrs',
-							this.props.className,
-							this.state.editing ? this.props.modifiedClassName : undefined,
-							this.props.disabled ? 'disabled' : '',
-							{
-								'sb-on': this.isChecked(),
-							}
-						)}
-						role="button"
-						onClick={this.handleClick}
-						tabIndex={0}
-					>
-						<div className="sb-content">
-							<div className="sb-label">
-								<span className="mls">&nbsp;</span>
-								<span className="mrs right">&nbsp;</span>
-							</div>
-							<div className="sb-switch"></div>
-						</div>
-					</a>
-					<span>{this.props.label}</span>
-				</div>
-			)
-		}
-	}
-)
-const EditAttributeSwitch = wrapEditAttribute(
-	class EditAttributeSwitch extends EditAttributeBase {
-		constructor(props: any) {
-			super(props)
-		}
-		isChecked() {
-			return !!this.getEditAttribute()
-		}
-		handleChange = () => {
-			this.handleUpdate(!this.state.value)
-		}
-		handleClick = () => {
-			this.handleChange()
-		}
+
 		render(): JSX.Element {
 			return (
-				<div
-					className={
-						'switch ' +
-						' ' +
-						(this.props.className || '') +
-						' ' +
-						(this.state.editing ? this.props.modifiedClassName || '' : '') +
-						' ' +
-						(this.isChecked() ? 'switch-active' : '') +
-						' ' +
-						(this.props.disabled ? 'disabled' : '')
-					}
-					onClick={this.handleClick}
-				>
-					{this.props.label}
-				</div>
+				<ToggleSwitchControl
+					classNames={this.props.className}
+					value={this.isChecked()}
+					disabled={this.props.disabled}
+					label={this.props.label}
+					handleUpdate={this.handleUpdate}
+				/>
 			)
 		}
 	}
@@ -469,81 +405,22 @@ const EditAttributeDropdown = wrapEditAttribute(
 )
 const EditAttributeDropdownText = wrapEditAttribute(
 	class EditAttributeDropdownText extends EditAttributeBase {
-		private _id: string
-
-		constructor(props: any) {
-			super(props)
-
-			this.handleChangeDropdown = this.handleChangeDropdown.bind(this)
-			this.handleChangeText = this.handleChangeText.bind(this)
-			this.handleBlurText = this.handleBlurText.bind(this)
-			this.handleEscape = this.handleEscape.bind(this)
-
-			this._id = getRandomString()
-		}
-		handleChangeDropdown(event: React.ChangeEvent<HTMLInputElement>) {
-			// because event.target.value is always a string, use the original value instead
-			const option = _.find(this.getOptions(), (o) => {
-				return o.value + '' === event.target.value + ''
-			})
-
-			const value = option ? option.value : event.target.value
-
-			this.handleUpdate(this.props.optionsAreNumbers ? Number(value) : value)
-		}
-		handleChangeText(event: React.ChangeEvent<HTMLInputElement>) {
-			this.handleChangeDropdown(event)
-		}
-		handleBlurText(event: React.FocusEvent<HTMLInputElement>) {
-			this.handleUpdate(event.target.value)
-		}
-		handleEscape(e: React.KeyboardEvent<HTMLInputElement>) {
-			if (e.key === 'Escape') {
-				this.handleDiscard()
-			}
-		}
-		getOptions() {
+		private getOptions(): DropdownInputOption<string>[] {
 			return getDropdownInputOptions(this.props.options)
 		}
 		render(): JSX.Element {
 			return (
-				<div className="input-dropdowntext">
-					<input
-						type="text"
-						className={
-							'form-control' +
-							' ' +
-							(this.state.valueError ? 'error ' : '') +
-							(this.props.className || '') +
-							' ' +
-							(this.state.editing ? this.props.modifiedClassName || '' : '')
-						}
-						placeholder={this.props.label}
-						value={this.getEditAttribute() || ''}
-						onChange={this.handleChangeText}
-						onBlur={this.handleBlurText}
-						onKeyUp={this.handleEscape}
-						disabled={this.props.disabled}
-						spellCheck={false}
-						list={this._id}
-					/>
-
-					<datalist id={this._id}>
-						{this.getOptions().map((o, j) =>
-							Array.isArray(o.value) ? (
-								<optgroup key={j} label={o.name}>
-									{o.value.map((v, i) => (
-										<option key={i} value={v + ''}></option>
-									))}
-								</optgroup>
-							) : (
-								<option key={o.i} value={o.value + ''}>
-									{o.value !== o.name ? o.name : null}
-								</option>
-							)
-						)}
-					</datalist>
-				</div>
+				<TextInputControl
+					classNames={`${this.props.className || ''} ${this.state.valueError ? 'error ' : ''}`}
+					modifiedClassName={this.props.modifiedClassName}
+					disabled={this.props.disabled}
+					placeholder={this.props.label}
+					updateOnKey={this.props.updateOnKey}
+					value={this.getAttribute() ?? ''}
+					handleUpdate={this.handleUpdate}
+					spellCheck={false}
+					suggestions={this.getOptions()}
+				/>
 			)
 		}
 	}
diff --git a/meteor/client/lib/ErrorBoundary.tsx b/packages/webui/src/client/lib/ErrorBoundary.tsx
similarity index 100%
rename from meteor/client/lib/ErrorBoundary.tsx
rename to packages/webui/src/client/lib/ErrorBoundary.tsx
diff --git a/meteor/client/lib/Escape.tsx b/packages/webui/src/client/lib/Escape.tsx
similarity index 100%
rename from meteor/client/lib/Escape.tsx
rename to packages/webui/src/client/lib/Escape.tsx
diff --git a/meteor/client/lib/KeyboardFocusIndicator.tsx b/packages/webui/src/client/lib/KeyboardFocusIndicator.tsx
similarity index 80%
rename from meteor/client/lib/KeyboardFocusIndicator.tsx
rename to packages/webui/src/client/lib/KeyboardFocusIndicator.tsx
index 1f796f0b1a..d254dc49da 100644
--- a/meteor/client/lib/KeyboardFocusIndicator.tsx
+++ b/packages/webui/src/client/lib/KeyboardFocusIndicator.tsx
@@ -1,17 +1,17 @@
 import { Meteor } from 'meteor/meteor'
 import * as React from 'react'
 
-import { getAllowStudio, getAllowConfigure, getAllowService } from '../lib/localStorage'
-
-import { MeteorCall } from '../../lib/api/methods'
-import { getCurrentTime } from '../../lib/lib'
+import { MeteorCall } from '../lib/meteorApi'
+import { getCurrentTime } from './systemTime'
 import { catchError } from './lib'
+import { UserPermissions } from '../ui/UserPermissions'
 
 interface IKeyboardFocusIndicatorState {
 	inFocus: boolean
 }
 interface IKeyboardFocusIndicatorProps {
 	showWhenFocused?: boolean
+	userPermissions: Readonly<UserPermissions>
 }
 
 export class KeyboardFocusIndicator extends React.Component<
@@ -50,14 +50,14 @@ export class KeyboardFocusIndicator extends React.Component<
 			this.setState({
 				inFocus: focusNow,
 			})
-			const viewInfo = [
-				window.location.href + window.location.search,
-				window.innerWidth,
-				window.innerHeight,
-				getAllowStudio(),
-				getAllowConfigure(),
-				getAllowService(),
-			]
+			const viewInfo = {
+				url: window.location.href + window.location.search,
+				width: window.innerWidth,
+				height: window.innerHeight,
+				studio: this.props.userPermissions.studio,
+				configure: this.props.userPermissions.configure,
+				service: this.props.userPermissions.service,
+			}
 			if (focusNow) {
 				MeteorCall.userAction
 					.guiFocused('checkFocus', getCurrentTime(), viewInfo)
diff --git a/meteor/client/lib/LottieButton.tsx b/packages/webui/src/client/lib/LottieButton.tsx
similarity index 100%
rename from meteor/client/lib/LottieButton.tsx
rename to packages/webui/src/client/lib/LottieButton.tsx
diff --git a/meteor/lib/MeteorApply.ts b/packages/webui/src/client/lib/MeteorApply.ts
similarity index 95%
rename from meteor/lib/MeteorApply.ts
rename to packages/webui/src/client/lib/MeteorApply.ts
index 607793399e..564992f20a 100644
--- a/meteor/lib/MeteorApply.ts
+++ b/packages/webui/src/client/lib/MeteorApply.ts
@@ -22,8 +22,6 @@ export async function MeteorApply(
 	options?: Parameters<typeof Meteor.apply>[2],
 	sendOptions?: SendOptions
 ): Promise<any> {
-	if (!Meteor.isClient) throw new Error('MeteorApply should only be called client side!')
-
 	return new Promise((resolve, reject) => {
 		const queuedMethod: QueuedMeteorMethod = {
 			queueTime: Date.now(),
@@ -144,7 +142,6 @@ export interface SendOptions {
 	/** Log a warning if the method was completed later than this time. Defaults to 1000. [milliseconds] */
 	warnCompleteTime?: number
 }
-if (Meteor.isClient) {
-	// @ts-expect-error hack for dev
-	window.MeteorApply = MeteorApply
-}
+
+// @ts-expect-error hack for dev
+window.MeteorApply = MeteorApply
diff --git a/meteor/client/lib/ModalDialog.tsx b/packages/webui/src/client/lib/ModalDialog.tsx
similarity index 98%
rename from meteor/client/lib/ModalDialog.tsx
rename to packages/webui/src/client/lib/ModalDialog.tsx
index 8d1ff3e4cb..0243afef23 100644
--- a/meteor/client/lib/ModalDialog.tsx
+++ b/packages/webui/src/client/lib/ModalDialog.tsx
@@ -1,18 +1,19 @@
 import React, { useLayoutEffect, useRef } from 'react'
-import CoreIcons from '@nrk/core-icons/jsx'
+import * as CoreIcons from '@nrk/core-icons/jsx'
 import Escape from './Escape'
+// @ts-expect-error type linking issue
 import FocusBounder from 'react-focus-bounder'
 import { useTranslation } from 'react-i18next'
 
 import ClassNames from 'classnames'
 // @ts-expect-error No types available
 import * as VelocityReact from 'velocity-react'
-import { logger } from '../../lib/logging'
+import { logger } from './logging'
 import * as _ from 'underscore'
 import { withTranslation } from 'react-i18next'
 import { Translated } from './ReactMeteorData/ReactMeteorData'
 import { EditAttribute, EditAttributeType, EditAttributeBase } from './EditAttribute'
-import { Settings } from '../../lib/Settings'
+import { Settings } from '../lib/Settings'
 
 interface IModalDialogAttributes {
 	show?: boolean
diff --git a/meteor/client/lib/Moment.tsx b/packages/webui/src/client/lib/Moment.tsx
similarity index 84%
rename from meteor/client/lib/Moment.tsx
rename to packages/webui/src/client/lib/Moment.tsx
index 880983d075..408b4aadb9 100644
--- a/meteor/client/lib/Moment.tsx
+++ b/packages/webui/src/client/lib/Moment.tsx
@@ -1,7 +1,6 @@
-import * as React from 'react'
 import Moment, { MomentProps } from 'react-moment'
 import moment from 'moment'
-import { getCurrentTime } from '../../lib/lib'
+import { getCurrentTime } from './systemTime'
 import timer from 'react-timer-hoc'
 
 /**
diff --git a/meteor/client/lib/PointerLockCursor.tsx b/packages/webui/src/client/lib/PointerLockCursor.tsx
similarity index 100%
rename from meteor/client/lib/PointerLockCursor.tsx
rename to packages/webui/src/client/lib/PointerLockCursor.tsx
diff --git a/meteor/client/lib/ReactMeteorData/ReactMeteorData.tsx b/packages/webui/src/client/lib/ReactMeteorData/ReactMeteorData.tsx
similarity index 93%
rename from meteor/client/lib/ReactMeteorData/ReactMeteorData.tsx
rename to packages/webui/src/client/lib/ReactMeteorData/ReactMeteorData.tsx
index 133178f2b8..b97ab3cb71 100644
--- a/meteor/client/lib/ReactMeteorData/ReactMeteorData.tsx
+++ b/packages/webui/src/client/lib/ReactMeteorData/ReactMeteorData.tsx
@@ -1,13 +1,14 @@
 /* eslint-disable react/prefer-stateless-function */
 
 import React, { useState, useEffect, useRef } from 'react'
-import { Meteor } from 'meteor/meteor'
 import { Mongo } from 'meteor/mongo'
 import { Tracker } from 'meteor/tracker'
 import { withTranslation, WithTranslation } from 'react-i18next'
-import { meteorSubscribe, AllPubSubTypes } from '../../../lib/api/pubsub'
-import { stringifyObjects } from '../../../lib/lib'
+import { AllPubSubTypes } from '@sofie-automation/meteor-lib/dist/api/pubsub'
+import { meteorSubscribe } from '../meteorApi'
+import { stringifyObjects } from '../tempLib'
 import _ from 'underscore'
+import { Meteor } from 'meteor/meteor'
 
 const globalTrackerQueue: Array<Function> = []
 let globalTrackerTimestamp: number | undefined = undefined
@@ -111,12 +112,6 @@ class MeteorDataManager {
 			return null
 		}
 
-		// When rendering on the server, we don't want to use the Tracker.
-		// We only do the first rendering on the server so we can get the data right away
-		if (Meteor.isServer) {
-			return component.getMeteorData()
-		}
-
 		if (this.computation) {
 			this.computation.stop()
 			this.computation = null
@@ -270,17 +265,11 @@ export interface WithTrackerOptions<IProps, IState, TrackedProps> {
 	// pure?: boolean
 }
 // @todo: add withTrackerPure()
-type IWrappedComponent<IProps, IState, TrackedProps> =
-	| React.ComponentClass<IProps & TrackedProps, IState>
-	// | (new (props: IProps & TrackedProps, state: IState) => React.Component<IProps & TrackedProps, IState>)
-	| ((props: IProps & TrackedProps) => JSX.Element | null)
 export function withTracker<IProps, IState, TrackedProps>(
 	autorunFunction: (props: IProps) => TrackedProps,
 	checkUpdate?: (data: any, props: IProps, nextProps: IProps, state?: IState, nextState?: IState) => boolean,
 	queueTrackerUpdates?: boolean
-): (
-	WrappedComponent: IWrappedComponent<IProps, IState, TrackedProps>
-) => new (props: IProps) => React.Component<IProps, IState> {
+): (component: React.ComponentType<IProps & TrackedProps>) => React.ComponentType<IProps> {
 	const expandedOptions: WithTrackerOptions<IProps, IState, TrackedProps> = {
 		getMeteorData: autorunFunction,
 		shouldComponentUpdate: checkUpdate,
@@ -318,15 +307,15 @@ export function translateWithTracker<IProps, IState, TrackedProps>(
 	autorunFunction: (props: Translated<IProps>, state?: IState) => TrackedProps,
 	checkUpdate?: (data: any, props: IProps, nextProps: IProps, state?: IState, nextState?: IState) => boolean,
 	queueTrackerUpdates?: boolean
-) {
+): (component: React.ComponentType<Translated<IProps & TrackedProps>>) => React.ComponentType<IProps> {
 	// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
-	return (WrappedComponent: IWrappedComponent<Translated<IProps>, IState, TrackedProps>) => {
-		const inner = withTracker<Translated<IProps>, IState, TrackedProps>(
+	return (WrappedComponent) => {
+		const inner: React.ComponentType<Translated<IProps>> = withTracker<Translated<IProps>, IState, TrackedProps>(
 			autorunFunction,
 			checkUpdate,
 			queueTrackerUpdates
 		)(WrappedComponent)
-		return withTranslation()(inner)
+		return withTranslation()(inner) as React.ComponentType<IProps>
 	}
 }
 export type Translated<T> = T & WithTranslation
@@ -402,6 +391,7 @@ export function useSubscription<K extends keyof AllPubSubTypes>(
 /**
  * A Meteor Subscription hook that allows using React Functional Components and the Hooks API with Meteor subscriptions.
  * Subscriptions will be torn down 1000ms after unmounting the component.
+ * If the subscription is not enabled, the subscription will not be created, and the ready state will always be true.
  *
  * @export
  * @param {PubSub} sub The subscription to be subscribed to
@@ -432,7 +422,7 @@ export function useSubscriptionIfEnabled<K extends keyof AllPubSubTypes>(
 		}
 	}, [sub, enable, stringifyObjects(args)])
 
-	return ready
+	return !enable || ready
 }
 
 /**
diff --git a/meteor/client/lib/ReactMeteorData/react-meteor-data.tsx b/packages/webui/src/client/lib/ReactMeteorData/react-meteor-data.tsx
similarity index 100%
rename from meteor/client/lib/ReactMeteorData/react-meteor-data.tsx
rename to packages/webui/src/client/lib/ReactMeteorData/react-meteor-data.tsx
diff --git a/meteor/lib/Rundown.ts b/packages/webui/src/client/lib/RundownResolver.ts
similarity index 69%
rename from meteor/lib/Rundown.ts
rename to packages/webui/src/client/lib/RundownResolver.ts
index 9817128311..d58e5573db 100644
--- a/meteor/lib/Rundown.ts
+++ b/packages/webui/src/client/lib/RundownResolver.ts
@@ -1,21 +1,20 @@
 import { Piece } from '@sofie-automation/corelib/dist/dataModel/Piece'
-import { IOutputLayer, ISourceLayer, ITranslatableMessage } from '@sofie-automation/blueprints-integration'
 import { DBSegment, SegmentOrphanedReason } from '@sofie-automation/corelib/dist/dataModel/Segment'
 import { DBPart } from '@sofie-automation/corelib/dist/dataModel/Part'
-import { PartInstance, wrapPartToTemporaryInstance } from './collections/PartInstances'
+import { PartInstance, wrapPartToTemporaryInstance } from '@sofie-automation/meteor-lib/dist/collections/PartInstances'
 import { PieceInstance } from '@sofie-automation/corelib/dist/dataModel/PieceInstance'
 import {
 	getPieceInstancesForPart,
 	buildPiecesStartingInThisPartQuery,
 	buildPastInfinitePiecesForThisPartQuery,
 } from '@sofie-automation/corelib/dist/playout/infinites'
-import { invalidateAfter } from '../lib/invalidatingTime'
-import { getCurrentTime, groupByToMap, ProtectedString, protectString } from './lib'
-import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
+import { invalidateAfter } from './invalidatingTime'
+import { groupByToMap, protectString } from './tempLib'
+import { getCurrentTime } from './systemTime'
+import { DBRundownPlaylist, QuickLoopMarkerType } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
 import { Rundown } from '@sofie-automation/corelib/dist/dataModel/Rundown'
-import { isTranslatableMessage } from '@sofie-automation/corelib/dist/TranslatableMessage'
 import { mongoWhereFilter, MongoQuery } from '@sofie-automation/corelib/dist/mongo'
-import { FindOptions } from './collections/lib'
+import { FindOptions } from '@sofie-automation/meteor-lib/dist/collections/lib'
 import {
 	PartId,
 	RundownId,
@@ -23,11 +22,16 @@ import {
 	SegmentId,
 	ShowStyleBaseId,
 } from '@sofie-automation/corelib/dist/dataModel/Ids'
-import { PieceInstances, Pieces } from './collections/libCollections'
-import { RundownPlaylistCollectionUtil } from './collections/rundownPlaylistUtil'
-import { PieceContentStatusObj } from './api/pieceContentStatus'
-import { ReadonlyDeep } from 'type-fest'
-import { PieceInstanceWithTimings } from '@sofie-automation/corelib/dist/playout/processAndPrune'
+import { RundownPlaylistClientUtil } from './rundownPlaylistUtil'
+import { PieceInstances, Pieces } from '../collections/index'
+
+import { PieceExtended } from '@sofie-automation/meteor-lib/dist/uiTypes/Piece'
+import { ISourceLayerExtended } from '@sofie-automation/meteor-lib/dist/uiTypes/SourceLayer'
+import { IOutputLayerExtended } from '@sofie-automation/meteor-lib/dist/uiTypes/OutputLayer'
+
+export type { PieceExtended } from '@sofie-automation/meteor-lib/dist/uiTypes/Piece'
+export type { ISourceLayerExtended } from '@sofie-automation/meteor-lib/dist/uiTypes/SourceLayer'
+export type { IOutputLayerExtended } from '@sofie-automation/meteor-lib/dist/uiTypes/OutputLayer'
 
 export interface SegmentExtended extends DBSegment {
 	/** Output layers available in the installation used by this segment */
@@ -52,38 +56,6 @@ export interface PartExtended {
 	willProbablyAutoNext: boolean
 }
 
-export interface IOutputLayerExtended extends IOutputLayer {
-	/** Is this output layer used in this segment */
-	used: boolean
-	/** Source layers that will be used by this output layer */
-	sourceLayers: Array<ISourceLayerExtended>
-}
-export interface ISourceLayerExtended extends ISourceLayer {
-	/** Pieces present on this source layer */
-	pieces: Array<PieceExtended>
-	followingItems: Array<PieceExtended>
-}
-export interface PieceExtended {
-	instance: PieceInstanceWithTimings
-
-	/** Source layer that this piece belongs to */
-	sourceLayer?: ISourceLayerExtended
-	/** Output layer that this part uses */
-	outputLayer?: IOutputLayerExtended
-	/** Position in timeline, relative to the beginning of the Part */
-	renderedInPoint: number | null
-	/** Duration in timeline */
-	renderedDuration: number | null
-	/** If set, the item was cropped in runtime by another item following it */
-	cropped?: boolean
-	/** Maximum width of a label so as not to appear underneath the following item */
-	maxLabelWidth?: number
-	/** If this piece has a "buddy" piece in the preceeding part, then it's not neccessary to display it's left label */
-	hasOriginInPreceedingPart?: boolean
-
-	contentStatus?: ReadonlyDeep<PieceContentStatusObj>
-}
-
 function fetchPiecesThatMayBeActiveForPart(
 	part: DBPart,
 	partsToReceiveOnSegmentEndFromSet: Set<PartId>,
@@ -269,14 +241,14 @@ export function getSegmentsWithPartInstances(
 	partsOptions?: FindOptions<DBPart>,
 	partInstancesOptions?: FindOptions<PartInstance>
 ): Array<{ segment: DBSegment; partInstances: PartInstance[] }> {
-	const { segments, parts: rawParts } = RundownPlaylistCollectionUtil.getSegmentsAndPartsSync(
+	const { segments, parts: rawParts } = RundownPlaylistClientUtil.getSegmentsAndPartsSync(
 		playlist,
 		segmentsQuery,
 		partsQuery,
 		segmentsOptions,
 		partsOptions
 	)
-	const rawPartInstances = RundownPlaylistCollectionUtil.getActivePartInstances(
+	const rawPartInstances = RundownPlaylistClientUtil.getActivePartInstances(
 		playlist,
 		partInstancesQuery,
 		partInstancesOptions
@@ -323,84 +295,45 @@ export function getSegmentsWithPartInstances(
 	})
 }
 
-// 1 reactivelly listen to data changes
-/*
-setup () {
-	RundownPlaylists.find().observeChanges(
-		asdf: onReactiveDataChange
-	)
+export function isLoopDefined(playlist: DBRundownPlaylist | undefined): boolean {
+	return playlist?.quickLoop?.start != null && playlist?.quickLoop?.end != null
 }
 
-onReactiveDataChange () {
-	setTimeoutIgnore(() => {
-		updateCalculatedData()
-	}, 200)
+export function isLoopRunning(playlist: DBRundownPlaylist | undefined): boolean {
+	return !!playlist?.quickLoop?.running
 }
 
-const cachedSegments = {}
-updateCalculatedData () {
-
-	const data = calculateBigDataSet()
-
-	data.segments
+export function isLoopLocked(playlist: DBRundownPlaylist | undefined): boolean {
+	return !!playlist?.quickLoop?.locked
 }
-*/
 
-function compareLabels(a: string | ITranslatableMessage, b: string | ITranslatableMessage) {
-	const actualA = isTranslatableMessage(a) ? a.key : (a as string)
-	const actualB = isTranslatableMessage(b) ? b.key : (b as string)
-	// can't use .localeCompare, because this needs to be locale-independent and always return
-	// the same sorting order, because that's being relied upon by limit & pick/pickEnd.
-	if (actualA > actualB) return 1
-	if (actualA < actualB) return -1
-	return 0
+export function isEntirePlaylistLooping(playlist: DBRundownPlaylist | undefined): boolean {
+	return (
+		playlist?.quickLoop?.start?.type === QuickLoopMarkerType.PLAYLIST &&
+		playlist?.quickLoop?.end?.type === QuickLoopMarkerType.PLAYLIST
+	)
 }
 
-/** Sort a list of adlibs */
-export function sortAdlibs<T>(
-	adlibs: {
-		adlib: T
-		label: string | ITranslatableMessage
-		adlibRank: number
-		adlibId: ProtectedString<any> | string
-		partRank: number | null
-		segmentRank: number | null
-		rundownRank: number | null
-	}[]
-): T[] {
-	adlibs = adlibs.sort((a, b) => {
-		// Sort by rundown rank, where applicable:
-		a.rundownRank = a.rundownRank ?? Number.POSITIVE_INFINITY
-		b.rundownRank = b.rundownRank ?? Number.POSITIVE_INFINITY
-		if (a.rundownRank > b.rundownRank) return 1
-		if (a.rundownRank < b.rundownRank) return -1
-
-		// Sort by segment rank, where applicable:
-		a.segmentRank = a.segmentRank ?? Number.POSITIVE_INFINITY
-		b.segmentRank = b.segmentRank ?? Number.POSITIVE_INFINITY
-		if (a.segmentRank > b.segmentRank) return 1
-		if (a.segmentRank < b.segmentRank) return -1
-
-		// Sort by part rank, where applicable:
-		a.partRank = a.partRank ?? Number.POSITIVE_INFINITY
-		b.partRank = b.partRank ?? Number.POSITIVE_INFINITY
-		if (a.partRank > b.partRank) return 1
-		if (a.partRank < b.partRank) return -1
-
-		// Sort by adlib rank
-		if (a.adlibRank > b.adlibRank) return 1
-		if (a.adlibRank < b.adlibRank) return -1
-
-		// Sort by labels:
-		const r = compareLabels(a.label, b.label)
-		if (r !== 0) return r
-
-		// As a last resort, sort by ids:
-		if (a.adlibId > b.adlibId) return 1
-		if (a.adlibId < b.adlibId) return -1
+export function isQuickLoopStart(partId: PartId, playlist: DBRundownPlaylist | undefined): boolean {
+	return playlist?.quickLoop?.start?.type === QuickLoopMarkerType.PART && playlist.quickLoop.start.id === partId
+}
 
-		return 0
-	})
+export function isQuickLoopEnd(partId: PartId, playlist: DBRundownPlaylist | undefined): boolean {
+	return playlist?.quickLoop?.end?.type === QuickLoopMarkerType.PART && playlist.quickLoop.end.id === partId
+}
 
-	return adlibs.map((a) => a.adlib)
+export function isEndOfLoopingShow(
+	playlist: DBRundownPlaylist | undefined,
+	isLastSegment: boolean,
+	isPartLastInSegment: boolean,
+	part: DBPart
+): boolean {
+	return (
+		isPartLastInSegment &&
+		isLoopDefined(playlist) &&
+		((isLastSegment && playlist?.quickLoop?.end?.type === QuickLoopMarkerType.PLAYLIST) ||
+			(playlist?.quickLoop?.end?.type === QuickLoopMarkerType.SEGMENT &&
+				playlist?.quickLoop.end.id === part.segmentId) ||
+			(playlist?.quickLoop?.end?.type === QuickLoopMarkerType.PART && playlist?.quickLoop.end.id === part._id))
+	)
 }
diff --git a/packages/webui/src/client/lib/Settings.ts b/packages/webui/src/client/lib/Settings.ts
new file mode 100644
index 0000000000..77282d0891
--- /dev/null
+++ b/packages/webui/src/client/lib/Settings.ts
@@ -0,0 +1,21 @@
+import * as _ from 'underscore'
+import { ISettings, DEFAULT_SETTINGS } from '@sofie-automation/meteor-lib/dist/Settings'
+
+/**
+ * This is an object specifying installation-wide, User Interface settings.
+ * There are default values for these settings that will be used, unless overriden
+ * through Meteor.settings functionality.
+ *
+ * You can use METEOR_SETTING to inject the settings JSON or you can use the
+ * --settings [filename] to provide a JSON file containing the settings
+ */
+export let Settings: ISettings = _.clone(DEFAULT_SETTINGS)
+
+// @ts-expect-error no types defined
+const MeteorInjectedSettings: any = window.__meteor_runtime_config__
+
+if (MeteorInjectedSettings?.PUBLIC_SETTINGS) {
+	Settings = _.extend(Settings, MeteorInjectedSettings.PUBLIC_SETTINGS)
+}
+
+export const APP_VERSION_EXTENDED: string | undefined = MeteorInjectedSettings?.sofieVersionExtended
diff --git a/meteor/client/lib/SettingsNavigation.tsx b/packages/webui/src/client/lib/SettingsNavigation.tsx
similarity index 92%
rename from meteor/client/lib/SettingsNavigation.tsx
rename to packages/webui/src/client/lib/SettingsNavigation.tsx
index d88945b7b8..4fd171f9e9 100644
--- a/meteor/client/lib/SettingsNavigation.tsx
+++ b/packages/webui/src/client/lib/SettingsNavigation.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback } from 'react'
+import { useCallback } from 'react'
 import { useHistory } from 'react-router-dom'
 import { BlueprintId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 
diff --git a/meteor/client/lib/SorensenContext.tsx b/packages/webui/src/client/lib/SorensenContext.tsx
similarity index 100%
rename from meteor/client/lib/SorensenContext.tsx
rename to packages/webui/src/client/lib/SorensenContext.tsx
diff --git a/meteor/client/lib/Spinner.tsx b/packages/webui/src/client/lib/Spinner.tsx
similarity index 100%
rename from meteor/client/lib/Spinner.tsx
rename to packages/webui/src/client/lib/Spinner.tsx
diff --git a/meteor/client/lib/SplitDropdown.tsx b/packages/webui/src/client/lib/SplitDropdown.tsx
similarity index 100%
rename from meteor/client/lib/SplitDropdown.tsx
rename to packages/webui/src/client/lib/SplitDropdown.tsx
diff --git a/meteor/client/lib/SplitPreviewBox.tsx b/packages/webui/src/client/lib/SplitPreviewBox.tsx
similarity index 100%
rename from meteor/client/lib/SplitPreviewBox.tsx
rename to packages/webui/src/client/lib/SplitPreviewBox.tsx
diff --git a/meteor/client/lib/StyledTimecode.tsx b/packages/webui/src/client/lib/StyledTimecode.tsx
similarity index 93%
rename from meteor/client/lib/StyledTimecode.tsx
rename to packages/webui/src/client/lib/StyledTimecode.tsx
index ba0268b4f2..718492ac30 100644
--- a/meteor/client/lib/StyledTimecode.tsx
+++ b/packages/webui/src/client/lib/StyledTimecode.tsx
@@ -1,6 +1,6 @@
 import React from 'react'
 import ClassNames from 'classnames'
-import { Time, formatDurationAsTimecode } from '../../lib/lib'
+import { Time, formatDurationAsTimecode } from './tempLib'
 import { IStudioSettings } from '@sofie-automation/corelib/dist/dataModel/Studio'
 
 interface IProps {
diff --git a/meteor/client/lib/UIStateStorage.ts b/packages/webui/src/client/lib/UIStateStorage.ts
similarity index 100%
rename from meteor/client/lib/UIStateStorage.ts
rename to packages/webui/src/client/lib/UIStateStorage.ts
diff --git a/meteor/client/lib/VideoPreviewPlayer.scss b/packages/webui/src/client/lib/VideoPreviewPlayer.scss
similarity index 100%
rename from meteor/client/lib/VideoPreviewPlayer.scss
rename to packages/webui/src/client/lib/VideoPreviewPlayer.scss
diff --git a/meteor/client/lib/VideoPreviewPlayer.tsx b/packages/webui/src/client/lib/VideoPreviewPlayer.tsx
similarity index 97%
rename from meteor/client/lib/VideoPreviewPlayer.tsx
rename to packages/webui/src/client/lib/VideoPreviewPlayer.tsx
index 565ab5a31f..727b7ba0b0 100644
--- a/meteor/client/lib/VideoPreviewPlayer.tsx
+++ b/packages/webui/src/client/lib/VideoPreviewPlayer.tsx
@@ -1,6 +1,6 @@
 import { IStudioSettings } from '@sofie-automation/corelib/dist/dataModel/Studio'
 import classNames from 'classnames'
-import React, { useEffect, useRef } from 'react'
+import { useEffect, useRef } from 'react'
 import { StyledTimecode } from './StyledTimecode'
 
 function setVideoElementPosition(
diff --git a/meteor/client/lib/VirtualElement.tsx b/packages/webui/src/client/lib/VirtualElement.tsx
similarity index 100%
rename from meteor/client/lib/VirtualElement.tsx
rename to packages/webui/src/client/lib/VirtualElement.tsx
diff --git a/meteor/client/lib/__tests__/__snapshots__/rundown.test.ts.snap b/packages/webui/src/client/lib/__tests__/__snapshots__/rundown.test.ts.snap
similarity index 76%
rename from meteor/client/lib/__tests__/__snapshots__/rundown.test.ts.snap
rename to packages/webui/src/client/lib/__tests__/__snapshots__/rundown.test.ts.snap
index e465b62c50..59fcec5d1a 100644
--- a/meteor/client/lib/__tests__/__snapshots__/rundown.test.ts.snap
+++ b/packages/webui/src/client/lib/__tests__/__snapshots__/rundown.test.ts.snap
@@ -13,32 +13,32 @@ exports[`client/lib/rundown RundownUtils.getResolvedSegment Basic Segment resolu
   "parts": [
     {
       "instance": {
-        "_id": "randomId9010_part0_0_tmp_instance",
+        "_id": "randomId9002_part0_0_tmp_instance",
         "isTemporary": true,
         "part": {
-          "_id": "randomId9010_part0_0",
+          "_id": "randomId9002_part0_0",
           "_rank": 0,
           "externalId": "MOCK_PART_0_0",
-          "rundownId": "randomId9010",
-          "segmentId": "randomId9010_segment0",
+          "rundownId": "randomId9002",
+          "segmentId": "randomId9002_segment0",
           "title": "Part 0 0",
         },
         "playlistActivationId": "",
         "rehearsal": false,
-        "rundownId": "randomId9010",
-        "segmentId": "randomId9010_segment0",
+        "rundownId": "randomId9002",
+        "segmentId": "randomId9002_segment0",
         "segmentPlayoutId": "",
         "takeCount": -1,
       },
-      "partId": "randomId9010_part0_0",
+      "partId": "randomId9002_part0_0",
       "pieces": [
         {
           "instance": {
-            "_id": "randomId9010_part0_0_tmp_instance_randomId9010_piece001",
+            "_id": "randomId9002_part0_0_tmp_instance_randomId9002_piece001",
             "isTemporary": true,
-            "partInstanceId": "randomId9010_part0_0_tmp_instance",
+            "partInstanceId": "randomId9002_part0_0_tmp_instance",
             "piece": {
-              "_id": "randomId9010_piece001",
+              "_id": "randomId9002_piece001",
               "content": {},
               "enable": {
                 "start": 0,
@@ -50,14 +50,14 @@ exports[`client/lib/rundown RundownUtils.getResolvedSegment Basic Segment resolu
               "outputLayerId": "pgm",
               "pieceType": "normal",
               "sourceLayerId": "vt0",
-              "startPartId": "randomId9010_part0_0",
-              "startRundownId": "randomId9010",
-              "startSegmentId": "randomId9010_segment0",
+              "startPartId": "randomId9002_part0_0",
+              "startRundownId": "randomId9002",
+              "startSegmentId": "randomId9002_segment0",
               "timelineObjectsString": "[]",
             },
             "playlistActivationId": "",
             "priority": 5,
-            "rundownId": "randomId9010",
+            "rundownId": "randomId9002",
           },
           "outputLayer": {
             "_id": "pgm",
@@ -85,11 +85,11 @@ exports[`client/lib/rundown RundownUtils.getResolvedSegment Basic Segment resolu
                 "pieces": [
                   {
                     "instance": {
-                      "_id": "randomId9010_part0_1_tmp_instance_randomId9010_piece010",
+                      "_id": "randomId9002_part0_1_tmp_instance_randomId9002_piece010",
                       "isTemporary": true,
-                      "partInstanceId": "randomId9010_part0_1_tmp_instance",
+                      "partInstanceId": "randomId9002_part0_1_tmp_instance",
                       "piece": {
-                        "_id": "randomId9010_piece010",
+                        "_id": "randomId9002_piece010",
                         "content": {},
                         "enable": {
                           "start": 0,
@@ -101,14 +101,14 @@ exports[`client/lib/rundown RundownUtils.getResolvedSegment Basic Segment resolu
                         "outputLayerId": "pgm",
                         "pieceType": "normal",
                         "sourceLayerId": "cam0",
-                        "startPartId": "randomId9010_part0_1",
-                        "startRundownId": "randomId9010",
-                        "startSegmentId": "randomId9010_segment0",
+                        "startPartId": "randomId9002_part0_1",
+                        "startRundownId": "randomId9002",
+                        "startSegmentId": "randomId9002_segment0",
                         "timelineObjectsString": "[]",
                       },
                       "playlistActivationId": "",
                       "priority": 5,
-                      "rundownId": "randomId9010",
+                      "rundownId": "randomId9002",
                     },
                     "outputLayer": [Circular],
                     "renderedDuration": null,
@@ -142,32 +142,32 @@ exports[`client/lib/rundown RundownUtils.getResolvedSegment Basic Segment resolu
     },
     {
       "instance": {
-        "_id": "randomId9010_part0_1_tmp_instance",
+        "_id": "randomId9002_part0_1_tmp_instance",
         "isTemporary": true,
         "part": {
-          "_id": "randomId9010_part0_1",
+          "_id": "randomId9002_part0_1",
           "_rank": 1,
           "externalId": "MOCK_PART_0_1",
-          "rundownId": "randomId9010",
-          "segmentId": "randomId9010_segment0",
+          "rundownId": "randomId9002",
+          "segmentId": "randomId9002_segment0",
           "title": "Part 0 1",
         },
         "playlistActivationId": "",
         "rehearsal": false,
-        "rundownId": "randomId9010",
-        "segmentId": "randomId9010_segment0",
+        "rundownId": "randomId9002",
+        "segmentId": "randomId9002_segment0",
         "segmentPlayoutId": "",
         "takeCount": -1,
       },
-      "partId": "randomId9010_part0_1",
+      "partId": "randomId9002_part0_1",
       "pieces": [
         {
           "instance": {
-            "_id": "randomId9010_part0_1_tmp_instance_randomId9010_piece010",
+            "_id": "randomId9002_part0_1_tmp_instance_randomId9002_piece010",
             "isTemporary": true,
-            "partInstanceId": "randomId9010_part0_1_tmp_instance",
+            "partInstanceId": "randomId9002_part0_1_tmp_instance",
             "piece": {
-              "_id": "randomId9010_piece010",
+              "_id": "randomId9002_piece010",
               "content": {},
               "enable": {
                 "start": 0,
@@ -179,14 +179,14 @@ exports[`client/lib/rundown RundownUtils.getResolvedSegment Basic Segment resolu
               "outputLayerId": "pgm",
               "pieceType": "normal",
               "sourceLayerId": "cam0",
-              "startPartId": "randomId9010_part0_1",
-              "startRundownId": "randomId9010",
-              "startSegmentId": "randomId9010_segment0",
+              "startPartId": "randomId9002_part0_1",
+              "startRundownId": "randomId9002",
+              "startSegmentId": "randomId9002_segment0",
               "timelineObjectsString": "[]",
             },
             "playlistActivationId": "",
             "priority": 5,
-            "rundownId": "randomId9010",
+            "rundownId": "randomId9002",
           },
           "outputLayer": {
             "_id": "pgm",
@@ -203,11 +203,11 @@ exports[`client/lib/rundown RundownUtils.getResolvedSegment Basic Segment resolu
                 "pieces": [
                   {
                     "instance": {
-                      "_id": "randomId9010_part0_0_tmp_instance_randomId9010_piece001",
+                      "_id": "randomId9002_part0_0_tmp_instance_randomId9002_piece001",
                       "isTemporary": true,
-                      "partInstanceId": "randomId9010_part0_0_tmp_instance",
+                      "partInstanceId": "randomId9002_part0_0_tmp_instance",
                       "piece": {
-                        "_id": "randomId9010_piece001",
+                        "_id": "randomId9002_piece001",
                         "content": {},
                         "enable": {
                           "start": 0,
@@ -219,14 +219,14 @@ exports[`client/lib/rundown RundownUtils.getResolvedSegment Basic Segment resolu
                         "outputLayerId": "pgm",
                         "pieceType": "normal",
                         "sourceLayerId": "vt0",
-                        "startPartId": "randomId9010_part0_0",
-                        "startRundownId": "randomId9010",
-                        "startSegmentId": "randomId9010_segment0",
+                        "startPartId": "randomId9002_part0_0",
+                        "startRundownId": "randomId9002",
+                        "startSegmentId": "randomId9002_segment0",
                         "timelineObjectsString": "[]",
                       },
                       "playlistActivationId": "",
                       "priority": 5,
-                      "rundownId": "randomId9010",
+                      "rundownId": "randomId9002",
                     },
                     "outputLayer": [Circular],
                     "renderedDuration": null,
@@ -271,7 +271,7 @@ exports[`client/lib/rundown RundownUtils.getResolvedSegment Basic Segment resolu
     },
   ],
   "segmentExtended": {
-    "_id": "randomId9010_segment0",
+    "_id": "randomId9002_segment0",
     "_rank": 0,
     "externalId": "MOCK_SEGMENT_0",
     "externalModified": 1,
@@ -292,11 +292,11 @@ exports[`client/lib/rundown RundownUtils.getResolvedSegment Basic Segment resolu
             "pieces": [
               {
                 "instance": {
-                  "_id": "randomId9010_part0_0_tmp_instance_randomId9010_piece001",
+                  "_id": "randomId9002_part0_0_tmp_instance_randomId9002_piece001",
                   "isTemporary": true,
-                  "partInstanceId": "randomId9010_part0_0_tmp_instance",
+                  "partInstanceId": "randomId9002_part0_0_tmp_instance",
                   "piece": {
-                    "_id": "randomId9010_piece001",
+                    "_id": "randomId9002_piece001",
                     "content": {},
                     "enable": {
                       "start": 0,
@@ -308,14 +308,14 @@ exports[`client/lib/rundown RundownUtils.getResolvedSegment Basic Segment resolu
                     "outputLayerId": "pgm",
                     "pieceType": "normal",
                     "sourceLayerId": "vt0",
-                    "startPartId": "randomId9010_part0_0",
-                    "startRundownId": "randomId9010",
-                    "startSegmentId": "randomId9010_segment0",
+                    "startPartId": "randomId9002_part0_0",
+                    "startRundownId": "randomId9002",
+                    "startSegmentId": "randomId9002_segment0",
                     "timelineObjectsString": "[]",
                   },
                   "playlistActivationId": "",
                   "priority": 5,
-                  "rundownId": "randomId9010",
+                  "rundownId": "randomId9002",
                 },
                 "outputLayer": [Circular],
                 "renderedDuration": null,
@@ -334,11 +334,11 @@ exports[`client/lib/rundown RundownUtils.getResolvedSegment Basic Segment resolu
             "pieces": [
               {
                 "instance": {
-                  "_id": "randomId9010_part0_1_tmp_instance_randomId9010_piece010",
+                  "_id": "randomId9002_part0_1_tmp_instance_randomId9002_piece010",
                   "isTemporary": true,
-                  "partInstanceId": "randomId9010_part0_1_tmp_instance",
+                  "partInstanceId": "randomId9002_part0_1_tmp_instance",
                   "piece": {
-                    "_id": "randomId9010_piece010",
+                    "_id": "randomId9002_piece010",
                     "content": {},
                     "enable": {
                       "start": 0,
@@ -350,14 +350,14 @@ exports[`client/lib/rundown RundownUtils.getResolvedSegment Basic Segment resolu
                     "outputLayerId": "pgm",
                     "pieceType": "normal",
                     "sourceLayerId": "cam0",
-                    "startPartId": "randomId9010_part0_1",
-                    "startRundownId": "randomId9010",
-                    "startSegmentId": "randomId9010_segment0",
+                    "startPartId": "randomId9002_part0_1",
+                    "startRundownId": "randomId9002",
+                    "startSegmentId": "randomId9002_segment0",
                     "timelineObjectsString": "[]",
                   },
                   "playlistActivationId": "",
                   "priority": 5,
-                  "rundownId": "randomId9010",
+                  "rundownId": "randomId9002",
                 },
                 "outputLayer": [Circular],
                 "renderedDuration": null,
@@ -371,7 +371,7 @@ exports[`client/lib/rundown RundownUtils.getResolvedSegment Basic Segment resolu
         "used": true,
       },
     },
-    "rundownId": "randomId9010",
+    "rundownId": "randomId9002",
     "sourceLayers": {
       "cam0": {
         "_id": "cam0",
diff --git a/meteor/lib/__tests__/logging.test.ts b/packages/webui/src/client/lib/__tests__/logging.test.ts
similarity index 66%
rename from meteor/lib/__tests__/logging.test.ts
rename to packages/webui/src/client/lib/__tests__/logging.test.ts
index 6d12eecae8..492fc3afcb 100644
--- a/meteor/lib/__tests__/logging.test.ts
+++ b/packages/webui/src/client/lib/__tests__/logging.test.ts
@@ -1,11 +1,10 @@
-import { testInFiber } from '../../__mocks__/helpers/jest'
 import { logger } from '../logging'
 
 describe('lib/logger', () => {
-	testInFiber('logger', () => {
+	test('logger', () => {
 		expect(typeof logger.error).toEqual('function')
 		expect(typeof logger.warn).toEqual('function')
-		expect(typeof logger.help).toEqual('function')
+		// expect(typeof logger.help).toEqual('function')
 		expect(typeof logger.info).toEqual('function')
 		expect(typeof logger.debug).toEqual('function')
 	})
diff --git a/packages/webui/src/client/lib/__tests__/memoizedIsolatedAutorun.test.ts b/packages/webui/src/client/lib/__tests__/memoizedIsolatedAutorun.test.ts
new file mode 100644
index 0000000000..19f37567f1
--- /dev/null
+++ b/packages/webui/src/client/lib/__tests__/memoizedIsolatedAutorun.test.ts
@@ -0,0 +1,91 @@
+import { memoizedIsolatedAutorun } from '../memoizedIsolatedAutorun'
+import { Tracker } from 'meteor/tracker'
+
+describe('memoizedIsolatedAutorun', () => {
+	describe('Meteor.isClient', () => {
+		test('it returns the result of the autorun function', () => {
+			const dep = new Tracker.Dependency()
+			const result0 = memoizedIsolatedAutorun(() => {
+				dep.depend()
+				return 'result0'
+			}, 'getResult0')
+			expect(result0).toBe('result0')
+		})
+		test('it reruns when the dependency is changed', () => {
+			let runCount = 0
+			const dep = new Tracker.Dependency()
+			const result1 = memoizedIsolatedAutorun(() => {
+				runCount++
+				dep.depend()
+				return 'result1'
+			}, 'getResult1')
+			expect(result1).toBe('result1')
+			expect(runCount).toBe(1)
+			dep.changed()
+			expect(runCount).toBe(2)
+		})
+		test("it invalidates the parent computation if it's dependency has changed and the returned result is different", () => {
+			let runCount0 = 0
+			let runCount1 = 0
+			const dep0 = new Tracker.Dependency()
+			const dep1 = new Tracker.Dependency()
+			let innerResult = ''
+			Tracker.autorun(() => {
+				runCount0++
+				dep0.depend()
+				innerResult = memoizedIsolatedAutorun(() => {
+					runCount1++
+					dep1.depend()
+					return 'result2_' + runCount1
+				}, 'getResult2')
+			})
+			expect(innerResult).toBe('result2_1')
+			expect(runCount0).toBe(1)
+			expect(runCount1).toBe(1)
+			dep1.changed()
+			expect(innerResult).toBe('result2_2')
+			expect(runCount0).toBe(2)
+			expect(runCount1).toBe(2)
+		})
+		test("it doesn't invalidate the parent computation if it's dependency has changed and the returned result is the same", () => {
+			let runCount0 = 0
+			let runCount1 = 0
+			const dep0 = new Tracker.Dependency()
+			const dep1 = new Tracker.Dependency()
+			Tracker.autorun(() => {
+				runCount0++
+				dep0.depend()
+				memoizedIsolatedAutorun(() => {
+					runCount1++
+					dep1.depend()
+					return 'result3'
+				}, 'getResult3')
+			})
+			expect(runCount0).toBe(1)
+			expect(runCount1).toBe(1)
+			dep1.changed()
+			expect(runCount0).toBe(1)
+			expect(runCount1).toBe(2)
+		})
+		test("it doesn't rerun if the dependency is not changed, even if the outer computation is invalidated", () => {
+			let runCount0 = 0
+			let runCount1 = 0
+			const dep0 = new Tracker.Dependency()
+			const dep1 = new Tracker.Dependency()
+			Tracker.autorun(() => {
+				runCount0++
+				dep0.depend()
+				memoizedIsolatedAutorun(() => {
+					runCount1++
+					dep1.depend()
+					return 'result4'
+				}, 'getResult4')
+			})
+			expect(runCount0).toBe(1)
+			expect(runCount1).toBe(1)
+			dep0.changed()
+			expect(runCount0).toBe(2)
+			expect(runCount1).toBe(1)
+		})
+	})
+})
diff --git a/meteor/client/lib/__tests__/rundown.test.ts b/packages/webui/src/client/lib/__tests__/rundown.test.ts
similarity index 56%
rename from meteor/client/lib/__tests__/rundown.test.ts
rename to packages/webui/src/client/lib/__tests__/rundown.test.ts
index e0fd6c7ace..1571a19532 100644
--- a/meteor/client/lib/__tests__/rundown.test.ts
+++ b/packages/webui/src/client/lib/__tests__/rundown.test.ts
@@ -1,4 +1,3 @@
-import { testInFiber } from '../../../__mocks__/helpers/jest'
 import {
 	setupDefaultStudioEnvironment,
 	DefaultEnvironment,
@@ -10,18 +9,30 @@ import { Piece } from '@sofie-automation/corelib/dist/dataModel/Piece'
 import { defaultPartInstance, defaultPiece, defaultPieceInstance } from '../../../__mocks__/defaultCollectionObjects'
 import { protectString, unprotectString } from '@sofie-automation/corelib/dist/protectedString'
 import { PieceLifespan } from '@sofie-automation/blueprints-integration'
-import { PartInstance } from '../../../lib/collections/PartInstances'
+import { PartInstance } from '@sofie-automation/meteor-lib/dist/collections/PartInstances'
 import { PieceInstance } from '@sofie-automation/corelib/dist/dataModel/PieceInstance'
 import { RundownPlaylistId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import { PartInstances, PieceInstances, Pieces, RundownPlaylists } from '../../collections'
 import { MongoMock } from '../../../__mocks__/mongo'
-import { RundownPlaylistCollectionUtil } from '../../../lib/collections/rundownPlaylistUtil'
+import { RundownPlaylistCollectionUtil } from '../../collections/rundownPlaylistUtil'
+import { RundownPlaylistClientUtil } from '../rundownPlaylistUtil'
 
 const mockRundownPlaylistsCollection = MongoMock.getInnerMockCollection(RundownPlaylists)
 const mockPartInstancesCollection = MongoMock.getInnerMockCollection(PartInstances)
 const mockPieceInstancesCollection = MongoMock.getInnerMockCollection(PieceInstances)
 const mockPiecesCollection = MongoMock.getInnerMockCollection(Pieces)
 
+// This is a hack, the tests should be rewriten to not use methods unrelated to the testee
+jest.mock('../../ui/Collections', () => {
+	const mockClientCollections = jest.requireActual('../../ui/Collections')
+	const mockLibCollections = jest.requireActual('../../collections/index')
+	return {
+		...mockClientCollections,
+		UIParts: mockLibCollections.Parts, // for most purposes they're equivalent
+		UIPartInstances: mockLibCollections.PartInstances, // for most purposes they're equivalent
+	}
+})
+
 describe('client/lib/rundown', () => {
 	let env: DefaultEnvironment
 	let playlistId: RundownPlaylistId
@@ -30,16 +41,16 @@ describe('client/lib/rundown', () => {
 		playlistId = (await setupDefaultRundownPlaylist(env)).playlistId
 	})
 	describe('RundownUtils.getResolvedSegment', () => {
-		testInFiber('Basic Segment resolution', () => {
+		test('Basic Segment resolution', () => {
 			const showStyleBase = convertToUIShowStyleBase(env.showStyleBase)
 			const playlist = RundownPlaylists.findOne(playlistId)
 			if (!playlist) throw new Error('Rundown not found')
 
 			const { currentPartInstance, nextPartInstance } =
-				RundownPlaylistCollectionUtil.getSelectedPartInstances(playlist)
+				RundownPlaylistClientUtil.getSelectedPartInstances(playlist)
 
 			const rundowns = RundownPlaylistCollectionUtil.getRundownsOrdered(playlist)
-			const { parts, segments } = RundownPlaylistCollectionUtil.getSegmentsAndPartsSync(playlist)
+			const { parts, segments } = RundownPlaylistClientUtil.getSegmentsAndPartsSync(playlist)
 			const rundown = rundowns[0]
 			const segment = segments[0]
 
@@ -70,7 +81,7 @@ describe('client/lib/rundown', () => {
 			expect(resolvedSegment).toMatchSnapshot()
 		})
 
-		testInFiber('Infinite Piece starting in first Part is populated across the Segment', () => {
+		test('Infinite Piece starting in first Part is populated across the Segment', () => {
 			const showStyleBase = convertToUIShowStyleBase(env.showStyleBase)
 			const sourceLayerIds = Object.keys(showStyleBase.sourceLayers)
 			const outputLayerIds = Object.keys(showStyleBase.outputLayers)
@@ -79,10 +90,10 @@ describe('client/lib/rundown', () => {
 			if (!playlist) throw new Error('Playlist not found')
 
 			const { currentPartInstance, nextPartInstance } =
-				RundownPlaylistCollectionUtil.getSelectedPartInstances(playlist)
+				RundownPlaylistClientUtil.getSelectedPartInstances(playlist)
 
 			const rundowns = RundownPlaylistCollectionUtil.getRundownsOrdered(playlist)
-			const { parts, segments } = RundownPlaylistCollectionUtil.getSegmentsAndPartsSync(playlist)
+			const { parts, segments } = RundownPlaylistClientUtil.getSegmentsAndPartsSync(playlist)
 			const rundown = rundowns[0]
 			const rundownId = rundown._id
 			const segment = segments[1]
@@ -142,7 +153,7 @@ describe('client/lib/rundown', () => {
 			expect(resolvedInfinitePiece01?.renderedDuration).toBe(null)
 		})
 
-		testInFiber('Infinite Piece starting in first Part is cropped by another Piece', () => {
+		test('Infinite Piece starting in first Part is cropped by another Piece', () => {
 			const showStyleBase = convertToUIShowStyleBase(env.showStyleBase)
 			const sourceLayerIds = Object.keys(showStyleBase.sourceLayers)
 			const outputLayerIds = Object.keys(showStyleBase.outputLayers)
@@ -151,10 +162,10 @@ describe('client/lib/rundown', () => {
 			if (!playlist) throw new Error('Playlist not found')
 
 			const { currentPartInstance, nextPartInstance } =
-				RundownPlaylistCollectionUtil.getSelectedPartInstances(playlist)
+				RundownPlaylistClientUtil.getSelectedPartInstances(playlist)
 
 			const rundowns = RundownPlaylistCollectionUtil.getRundownsOrdered(playlist)
-			const { parts, segments } = RundownPlaylistCollectionUtil.getSegmentsAndPartsSync(playlist)
+			const { parts, segments } = RundownPlaylistClientUtil.getSegmentsAndPartsSync(playlist)
 			const rundown = rundowns[0]
 			const rundownId = rundown._id
 			const segment = segments[1]
@@ -233,165 +244,152 @@ describe('client/lib/rundown', () => {
 			expect(resolvedSegment.parts[1].pieces).toHaveLength(0)
 		})
 
-		testInFiber(
-			"User-Stopped Infinite Piece starting in first Part maintains it's length when followed by another Piece",
-			() => {
-				const showStyleBase = convertToUIShowStyleBase(env.showStyleBase)
-				const sourceLayerIds = Object.keys(showStyleBase.sourceLayers)
-				const outputLayerIds = Object.keys(showStyleBase.outputLayers)
-
-				const playlistActivationId = protectString('mock_activation_0')
-				mockRundownPlaylistsCollection.update(unprotectString(playlistId), {
-					$set: {
-						activationId: playlistActivationId,
-					},
-				})
-
-				let playlist = RundownPlaylists.findOne(playlistId)
-				if (!playlist) throw new Error('Playlist not found')
-
-				const rundowns = RundownPlaylistCollectionUtil.getRundownsOrdered(playlist)
-				const { parts, segments } = RundownPlaylistCollectionUtil.getSegmentsAndPartsSync(playlist)
-				const rundown = rundowns[0]
-				const rundownId = rundown._id
-				const segment = segments[1]
-				const firstPart = parts.find((part) => part.segmentId === segment._id)
-
-				if (!firstPart) throw new Error('Mock Segment 1 not found')
-
-				const infinitePiece: Piece = {
-					...defaultPiece(
-						protectString(rundownId + '_infinite_piece'),
-						rundownId,
-						segment._id,
-						firstPart._id
-					),
-					externalId: 'MOCK_INFINITE_PIECE',
-					name: 'Infinite',
-					sourceLayerId: sourceLayerIds[0],
-					outputLayerId: outputLayerIds[0],
-					enable: {
-						start: 1000,
-					},
-					lifespan: PieceLifespan.OutOnSegmentChange,
-				}
-				mockPiecesCollection.insert(infinitePiece)
-
-				const followingPiece: Piece = {
-					...defaultPiece(
-						protectString(rundownId + '_cropping_piece'),
-						rundownId,
-						segment._id,
-						firstPart._id
-					),
-					externalId: 'MOCK_CROPPING_PIECE',
-					name: 'Cropping',
-					sourceLayerId: sourceLayerIds[0],
-					outputLayerId: outputLayerIds[0],
-					enable: {
-						start: 4000,
-						duration: 1000,
-					},
-					lifespan: PieceLifespan.WithinPart,
-				}
-				mockPiecesCollection.insert(followingPiece)
-
-				const segmentPlayoutId = protectString('mock_segment_playout_0')
-				const mockCurrentPartInstance: PartInstance = {
-					...defaultPartInstance(
-						protectString(rundownId + '_partInstance_0'),
-						playlistActivationId,
-						segmentPlayoutId,
-						firstPart
-					),
-				}
-
-				mockPartInstancesCollection.insert(mockCurrentPartInstance)
-
-				const infinitePieceInstance: PieceInstance = {
-					...defaultPieceInstance(
-						protectString('instance_' + infinitePiece._id),
-						playlistActivationId,
-						rundown._id,
-						mockCurrentPartInstance._id,
-						infinitePiece
-					),
-					userDuration: {
-						endRelativeToPart: 2000,
-					},
-				}
-
-				mockPieceInstancesCollection.insert(infinitePieceInstance)
-
-				const followingPieceInstance: PieceInstance = {
-					...defaultPieceInstance(
-						protectString('instance_' + followingPiece._id),
-						playlistActivationId,
-						rundown._id,
-						mockCurrentPartInstance._id,
-						followingPiece
-					),
-				}
-
-				mockPieceInstancesCollection.insert(followingPieceInstance)
-
-				mockRundownPlaylistsCollection.update(unprotectString(playlistId), {
-					$set: {
-						currentPartInfo: {
-							partInstanceId: mockCurrentPartInstance._id,
-							rundownId: mockCurrentPartInstance.rundownId,
-							manuallySelected: false,
-							consumesQueuedSegmentId: false,
-						},
-					},
-				})
-
-				playlist = RundownPlaylists.findOne(playlistId)
-				if (!playlist) throw new Error('Playlist not found')
-				const { currentPartInstance, nextPartInstance } =
-					RundownPlaylistCollectionUtil.getSelectedPartInstances(playlist)
-
-				const resolvedSegment = RundownUtils.getResolvedSegment(
-					showStyleBase,
-					playlist,
-					rundown,
-					segment,
-					new Set(segments.slice(0, 1).map((s) => s._id)),
-					[],
-					new Map(),
-					parts.map((part) => part._id),
-					currentPartInstance,
-					nextPartInstance
-				)
-				expect(resolvedSegment).toBeTruthy()
-				expect(resolvedSegment.parts).toHaveLength(3)
-				expect(resolvedSegment).toMatchObject({
-					isLiveSegment: true,
-					isNextSegment: false,
-					currentNextPart: undefined,
-					hasRemoteItems: false,
-					hasGuestItems: false,
-					autoNextPart: false,
-				})
-
-				expect(resolvedSegment.parts[0].pieces).toHaveLength(2)
-
-				const resolvedInfinitePiece00 = resolvedSegment.parts[0].pieces.find(
-					(piece) => piece.instance._id === infinitePieceInstance._id
-				)
-				expect(resolvedInfinitePiece00).toBeDefined()
-				expect(resolvedInfinitePiece00?.renderedInPoint).toBe(1000)
-				expect(resolvedInfinitePiece00?.renderedDuration).toBe(1000)
-
-				const resolvedCroppingPiece00 = resolvedSegment.parts[0].pieces.find(
-					(piece) => piece.instance._id === followingPieceInstance._id
-				)
-				expect(resolvedCroppingPiece00).toBeDefined()
-				expect(resolvedCroppingPiece00?.renderedInPoint).toBe(4000)
-				expect(resolvedCroppingPiece00?.renderedDuration).toBe(1000)
-
-				expect(resolvedSegment.parts[1].pieces).toHaveLength(0)
+		test("User-Stopped Infinite Piece starting in first Part maintains it's length when followed by another Piece", () => {
+			const showStyleBase = convertToUIShowStyleBase(env.showStyleBase)
+			const sourceLayerIds = Object.keys(showStyleBase.sourceLayers)
+			const outputLayerIds = Object.keys(showStyleBase.outputLayers)
+
+			const playlistActivationId = protectString('mock_activation_0')
+			mockRundownPlaylistsCollection.update(unprotectString(playlistId), {
+				$set: {
+					activationId: playlistActivationId,
+				},
+			})
+
+			let playlist = RundownPlaylists.findOne(playlistId)
+			if (!playlist) throw new Error('Playlist not found')
+
+			const rundowns = RundownPlaylistCollectionUtil.getRundownsOrdered(playlist)
+			const { parts, segments } = RundownPlaylistClientUtil.getSegmentsAndPartsSync(playlist)
+			const rundown = rundowns[0]
+			const rundownId = rundown._id
+			const segment = segments[1]
+			const firstPart = parts.find((part) => part.segmentId === segment._id)
+
+			if (!firstPart) throw new Error('Mock Segment 1 not found')
+
+			const infinitePiece: Piece = {
+				...defaultPiece(protectString(rundownId + '_infinite_piece'), rundownId, segment._id, firstPart._id),
+				externalId: 'MOCK_INFINITE_PIECE',
+				name: 'Infinite',
+				sourceLayerId: sourceLayerIds[0],
+				outputLayerId: outputLayerIds[0],
+				enable: {
+					start: 1000,
+				},
+				lifespan: PieceLifespan.OutOnSegmentChange,
+			}
+			mockPiecesCollection.insert(infinitePiece)
+
+			const followingPiece: Piece = {
+				...defaultPiece(protectString(rundownId + '_cropping_piece'), rundownId, segment._id, firstPart._id),
+				externalId: 'MOCK_CROPPING_PIECE',
+				name: 'Cropping',
+				sourceLayerId: sourceLayerIds[0],
+				outputLayerId: outputLayerIds[0],
+				enable: {
+					start: 4000,
+					duration: 1000,
+				},
+				lifespan: PieceLifespan.WithinPart,
+			}
+			mockPiecesCollection.insert(followingPiece)
+
+			const segmentPlayoutId = protectString('mock_segment_playout_0')
+			const mockCurrentPartInstance: PartInstance = {
+				...defaultPartInstance(
+					protectString(rundownId + '_partInstance_0'),
+					playlistActivationId,
+					segmentPlayoutId,
+					firstPart
+				),
+			}
+
+			mockPartInstancesCollection.insert(mockCurrentPartInstance)
+
+			const infinitePieceInstance: PieceInstance = {
+				...defaultPieceInstance(
+					protectString('instance_' + infinitePiece._id),
+					playlistActivationId,
+					rundown._id,
+					mockCurrentPartInstance._id,
+					infinitePiece
+				),
+				userDuration: {
+					endRelativeToPart: 2000,
+				},
+			}
+
+			mockPieceInstancesCollection.insert(infinitePieceInstance)
+
+			const followingPieceInstance: PieceInstance = {
+				...defaultPieceInstance(
+					protectString('instance_' + followingPiece._id),
+					playlistActivationId,
+					rundown._id,
+					mockCurrentPartInstance._id,
+					followingPiece
+				),
 			}
-		)
+
+			mockPieceInstancesCollection.insert(followingPieceInstance)
+
+			mockRundownPlaylistsCollection.update(unprotectString(playlistId), {
+				$set: {
+					currentPartInfo: {
+						partInstanceId: mockCurrentPartInstance._id,
+						rundownId: mockCurrentPartInstance.rundownId,
+						manuallySelected: false,
+						consumesQueuedSegmentId: false,
+					},
+				},
+			})
+
+			playlist = RundownPlaylists.findOne(playlistId)
+			if (!playlist) throw new Error('Playlist not found')
+			const { currentPartInstance, nextPartInstance } =
+				RundownPlaylistClientUtil.getSelectedPartInstances(playlist)
+
+			const resolvedSegment = RundownUtils.getResolvedSegment(
+				showStyleBase,
+				playlist,
+				rundown,
+				segment,
+				new Set(segments.slice(0, 1).map((s) => s._id)),
+				[],
+				new Map(),
+				parts.map((part) => part._id),
+				currentPartInstance,
+				nextPartInstance
+			)
+			expect(resolvedSegment).toBeTruthy()
+			expect(resolvedSegment.parts).toHaveLength(3)
+			expect(resolvedSegment).toMatchObject({
+				isLiveSegment: true,
+				isNextSegment: false,
+				currentNextPart: undefined,
+				hasRemoteItems: false,
+				hasGuestItems: false,
+				autoNextPart: false,
+			})
+
+			expect(resolvedSegment.parts[0].pieces).toHaveLength(2)
+
+			const resolvedInfinitePiece00 = resolvedSegment.parts[0].pieces.find(
+				(piece) => piece.instance._id === infinitePieceInstance._id
+			)
+			expect(resolvedInfinitePiece00).toBeDefined()
+			expect(resolvedInfinitePiece00?.renderedInPoint).toBe(1000)
+			expect(resolvedInfinitePiece00?.renderedDuration).toBe(1000)
+
+			const resolvedCroppingPiece00 = resolvedSegment.parts[0].pieces.find(
+				(piece) => piece.instance._id === followingPieceInstance._id
+			)
+			expect(resolvedCroppingPiece00).toBeDefined()
+			expect(resolvedCroppingPiece00?.renderedInPoint).toBe(4000)
+			expect(resolvedCroppingPiece00?.renderedDuration).toBe(1000)
+
+			expect(resolvedSegment.parts[1].pieces).toHaveLength(0)
+		})
 	})
 })
diff --git a/meteor/client/lib/__tests__/rundownTiming.test.ts b/packages/webui/src/client/lib/__tests__/rundownTiming.test.ts
similarity index 78%
rename from meteor/client/lib/__tests__/rundownTiming.test.ts
rename to packages/webui/src/client/lib/__tests__/rundownTiming.test.ts
index 1897d369b6..1f3a435b08 100644
--- a/meteor/client/lib/__tests__/rundownTiming.test.ts
+++ b/packages/webui/src/client/lib/__tests__/rundownTiming.test.ts
@@ -1,11 +1,15 @@
-import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
-import { PartInstance, wrapPartToTemporaryInstance } from '../../../lib/collections/PartInstances'
+import {
+	DBRundownPlaylist,
+	ForceQuickLoopAutoNext,
+	QuickLoopMarkerType,
+} from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
+import { PartInstance, wrapPartToTemporaryInstance } from '@sofie-automation/meteor-lib/dist/collections/PartInstances'
 import { DBPart } from '@sofie-automation/corelib/dist/dataModel/Part'
 import { DBSegment } from '@sofie-automation/corelib/dist/dataModel/Segment'
 import { DBRundown } from '@sofie-automation/corelib/dist/dataModel/Rundown'
-import { literal, protectString } from '../../../lib/lib'
-import { RundownTimingCalculator, RundownTimingContext } from '../rundownTiming'
-import { PlaylistTimingType } from '@sofie-automation/blueprints-integration'
+import { literal, protectString, unprotectString } from '../tempLib'
+import { RundownTimingCalculator, RundownTimingContext, findPartInstancesInQuickLoop } from '../rundownTiming'
+import { PlaylistTimingType, SegmentTimingInfo } from '@sofie-automation/blueprints-integration'
 import { PartId, RundownId, SegmentId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 
 const DEFAULT_DURATION = 0
@@ -35,12 +39,7 @@ function makeMockPart(
 	rank: number,
 	rundownId: string,
 	segmentId: string,
-	durations: {
-		budgetDuration?: number
-		displayDuration?: number
-		displayDurationGroup?: string
-		expectedDuration?: number
-	}
+	durations: Pick<DBPart, 'displayDuration' | 'displayDurationGroup' | 'expectedDuration'>
 ): DBPart {
 	return literal<DBPart>({
 		_id: protectString(id),
@@ -50,19 +49,11 @@ function makeMockPart(
 		_rank: rank,
 		rundownId: protectString(rundownId),
 		...durations,
-		expectedDurationWithPreroll: durations.expectedDuration,
+		expectedDurationWithTransition: durations.expectedDuration,
 	})
 }
 
-function makeMockSegment(
-	id: string,
-	rank: number,
-	rundownId: string,
-	timing?: {
-		expectedStart?: number
-		expectedEnd?: number
-	}
-): DBSegment {
+function makeMockSegment(id: string, rank: number, rundownId: string, timing?: SegmentTimingInfo): DBSegment {
 	return literal<DBSegment>({
 		_id: protectString(id),
 		name: 'mock-segment',
@@ -103,6 +94,23 @@ function convertPartsToPartInstances(parts: DBPart[]): PartInstance[] {
 	return parts.map((part) => wrapPartToTemporaryInstance(protectString(''), part))
 }
 
+function makeMockPartsForQuickLoopTest() {
+	const rundownId = 'rundown1'
+	const segmentId1 = 'segment1'
+	const segmentId2 = 'segment2'
+	const segmentsMap: Map<SegmentId, DBSegment> = new Map()
+	segmentsMap.set(protectString<SegmentId>(segmentId1), makeMockSegment(segmentId1, 0, rundownId))
+	segmentsMap.set(protectString<SegmentId>(segmentId2), makeMockSegment(segmentId2, 0, rundownId))
+	const parts: DBPart[] = []
+	parts.push(makeMockPart('part1', 0, rundownId, segmentId1, { expectedDuration: 1000 }))
+	parts.push(makeMockPart('part2', 0, rundownId, segmentId1, { expectedDuration: 1000 }))
+	parts.push(makeMockPart('part3', 0, rundownId, segmentId2, { expectedDuration: 1000 }))
+	parts.push(makeMockPart('part4', 0, rundownId, segmentId2, { expectedDuration: 1000 }))
+	parts.push(makeMockPart('part5', 0, rundownId, segmentId2, { expectedDuration: 1000 }))
+	const partInstances = convertPartsToPartInstances(parts)
+	return { parts, partInstances }
+}
+
 describe('rundown Timing Calculator', () => {
 	it('Provides output for empty playlist', () => {
 		const timing = new RundownTimingCalculator()
@@ -120,7 +128,7 @@ describe('rundown Timing Calculator', () => {
 			partInstancesMap,
 			segmentsMap,
 			DEFAULT_DURATION,
-			[]
+			{}
 		)
 		expect(result).toEqual(
 			literal<RundownTimingContext>({
@@ -139,13 +147,12 @@ describe('rundown Timing Calculator', () => {
 				partExpectedDurations: {},
 				partPlayed: {},
 				partStartsAt: {},
+				partsInQuickLoop: {},
 				remainingPlaylistDuration: 0,
 				totalPlaylistDuration: 0,
 				breakIsLastRundown: undefined,
 				remainingTimeOnCurrentPart: undefined,
 				rundownsBeforeNextBreak: undefined,
-				segmentBudgetDurations: {},
-				segmentStartedPlayback: {},
 			})
 		)
 	})
@@ -183,7 +190,7 @@ describe('rundown Timing Calculator', () => {
 			partInstancesMap,
 			segmentsMap,
 			DEFAULT_DURATION,
-			[]
+			{}
 		)
 		expect(result).toEqual(
 			literal<RundownTimingContext>({
@@ -241,13 +248,12 @@ describe('rundown Timing Calculator', () => {
 					part3: 2000,
 					part4: 3000,
 				},
+				partsInQuickLoop: {},
 				remainingPlaylistDuration: 4000,
 				totalPlaylistDuration: 4000,
 				breakIsLastRundown: undefined,
 				remainingTimeOnCurrentPart: undefined,
 				rundownsBeforeNextBreak: undefined,
-				segmentBudgetDurations: {},
-				segmentStartedPlayback: {},
 			})
 		)
 	})
@@ -285,7 +291,7 @@ describe('rundown Timing Calculator', () => {
 			partInstancesMap,
 			segmentsMap,
 			DEFAULT_DURATION,
-			[]
+			{}
 		)
 		expect(result).toEqual(
 			literal<RundownTimingContext>({
@@ -343,13 +349,12 @@ describe('rundown Timing Calculator', () => {
 					part3: 2000,
 					part4: 3000,
 				},
+				partsInQuickLoop: {},
 				remainingPlaylistDuration: 4000,
 				totalPlaylistDuration: 4000,
 				breakIsLastRundown: undefined,
 				remainingTimeOnCurrentPart: undefined,
 				rundownsBeforeNextBreak: undefined,
-				segmentBudgetDurations: {},
-				segmentStartedPlayback: {},
 			})
 		)
 	})
@@ -389,7 +394,7 @@ describe('rundown Timing Calculator', () => {
 			partInstancesMap,
 			segmentsMap,
 			DEFAULT_DURATION,
-			[]
+			{}
 		)
 		expect(result).toEqual(
 			literal<RundownTimingContext>({
@@ -449,13 +454,12 @@ describe('rundown Timing Calculator', () => {
 					part3: 2000,
 					part4: 3000,
 				},
+				partsInQuickLoop: {},
 				remainingPlaylistDuration: 4000,
 				totalPlaylistDuration: 4000,
 				breakIsLastRundown: undefined,
 				remainingTimeOnCurrentPart: undefined,
 				rundownsBeforeNextBreak: undefined,
-				segmentBudgetDurations: {},
-				segmentStartedPlayback: {},
 			})
 		)
 	})
@@ -518,7 +522,7 @@ describe('rundown Timing Calculator', () => {
 				partInstancesMap,
 				segmentsMap,
 				DEFAULT_DURATION,
-				[]
+				{}
 			)
 			expect(result).toEqual(
 				literal<RundownTimingContext>({
@@ -576,13 +580,12 @@ describe('rundown Timing Calculator', () => {
 						part3: 2000,
 						part4: 3000,
 					},
+					partsInQuickLoop: {},
 					remainingPlaylistDuration: 4000,
 					totalPlaylistDuration: 4000,
 					breakIsLastRundown: undefined,
 					remainingTimeOnCurrentPart: undefined,
 					rundownsBeforeNextBreak: undefined,
-					segmentBudgetDurations: {},
-					segmentStartedPlayback: {},
 				})
 			)
 		})
@@ -673,7 +676,7 @@ describe('rundown Timing Calculator', () => {
 				partInstancesMap,
 				segmentsMap,
 				DEFAULT_DURATION,
-				[]
+				{}
 			)
 			expect(result).toEqual(
 				literal<RundownTimingContext>({
@@ -682,6 +685,7 @@ describe('rundown Timing Calculator', () => {
 					asDisplayedPlaylistDuration: 7000,
 					asPlayedPlaylistDuration: 7000,
 					currentPartWillAutoNext: false,
+					currentSegmentId: protectString(segmentId1),
 					currentTime: 3500,
 					rundownExpectedDurations: {
 						[rundownId1]: 7000,
@@ -731,13 +735,12 @@ describe('rundown Timing Calculator', () => {
 						part3: 3000,
 						part4: 3500,
 					},
+					partsInQuickLoop: {},
 					remainingPlaylistDuration: 3500,
 					totalPlaylistDuration: 7000,
 					breakIsLastRundown: false,
 					remainingTimeOnCurrentPart: 2500,
 					rundownsBeforeNextBreak: [],
-					segmentBudgetDurations: {},
-					segmentStartedPlayback: {},
 					nextRundownAnchor: undefined,
 				})
 			)
@@ -829,7 +832,7 @@ describe('rundown Timing Calculator', () => {
 				partInstancesMap,
 				segmentsMap,
 				DEFAULT_DURATION,
-				[]
+				{}
 			)
 			expect(result).toEqual(
 				literal<RundownTimingContext>({
@@ -838,6 +841,7 @@ describe('rundown Timing Calculator', () => {
 					asDisplayedPlaylistDuration: 11000,
 					asPlayedPlaylistDuration: 11000,
 					currentPartWillAutoNext: false,
+					currentSegmentId: protectString(segmentId1),
 					currentTime: 10000,
 					rundownExpectedDurations: {
 						[rundownId1]: 7000,
@@ -887,13 +891,12 @@ describe('rundown Timing Calculator', () => {
 						part3: 3000,
 						part4: 10000,
 					},
+					partsInQuickLoop: {},
 					remainingPlaylistDuration: 1000,
 					totalPlaylistDuration: 7000,
 					breakIsLastRundown: false,
 					remainingTimeOnCurrentPart: -4000,
 					rundownsBeforeNextBreak: [],
-					segmentBudgetDurations: {},
-					segmentStartedPlayback: {},
 					nextRundownAnchor: undefined,
 				})
 			)
@@ -934,7 +937,7 @@ describe('rundown Timing Calculator', () => {
 				partInstancesMap,
 				segmentsMap,
 				DEFAULT_NONZERO_DURATION,
-				[]
+				{}
 			)
 			expect(result).toEqual(
 				literal<RundownTimingContext>({
@@ -992,13 +995,12 @@ describe('rundown Timing Calculator', () => {
 						part3: 2000,
 						part4: 3000,
 					},
+					partsInQuickLoop: {},
 					remainingPlaylistDuration: 4000,
 					totalPlaylistDuration: 4000,
 					breakIsLastRundown: undefined,
 					remainingTimeOnCurrentPart: undefined,
 					rundownsBeforeNextBreak: undefined,
-					segmentBudgetDurations: {},
-					segmentStartedPlayback: {},
 				})
 			)
 		})
@@ -1065,7 +1067,7 @@ describe('rundown Timing Calculator', () => {
 				partInstancesMap,
 				segmentsMap,
 				DEFAULT_NONZERO_DURATION,
-				[]
+				{}
 			)
 			expect(result).toEqual(
 				literal<RundownTimingContext>({
@@ -1130,13 +1132,12 @@ describe('rundown Timing Calculator', () => {
 						part4: 3000,
 						part5: 4000,
 					},
+					partsInQuickLoop: {},
 					remainingPlaylistDuration: 5000,
 					totalPlaylistDuration: 5000,
 					breakIsLastRundown: undefined,
 					remainingTimeOnCurrentPart: undefined,
 					rundownsBeforeNextBreak: undefined,
-					segmentBudgetDurations: {},
-					segmentStartedPlayback: {},
 				})
 			)
 		})
@@ -1154,24 +1155,27 @@ describe('rundown Timing Calculator', () => {
 		const segmentId1 = 'segment1'
 		const segmentId2 = 'segment2'
 		const segmentsMap: Map<SegmentId, DBSegment> = new Map()
-		segmentsMap.set(protectString<SegmentId>(segmentId1), makeMockSegment(segmentId1, 0, rundownId1))
-		segmentsMap.set(protectString<SegmentId>(segmentId2), makeMockSegment(segmentId2, 0, rundownId1))
+		segmentsMap.set(
+			protectString<SegmentId>(segmentId1),
+			makeMockSegment(segmentId1, 0, rundownId1, { budgetDuration: 5000 })
+		)
+		segmentsMap.set(
+			protectString<SegmentId>(segmentId2),
+			makeMockSegment(segmentId2, 0, rundownId1, { budgetDuration: 3000 })
+		)
 		const parts: DBPart[] = []
 		parts.push(
 			makeMockPart('part1', 0, rundownId1, segmentId1, {
-				budgetDuration: 2000,
 				expectedDuration: 1000,
 			})
 		)
 		parts.push(
 			makeMockPart('part2', 0, rundownId1, segmentId1, {
-				budgetDuration: 3000,
 				expectedDuration: 1000,
 			})
 		)
 		parts.push(
 			makeMockPart('part3', 0, rundownId1, segmentId2, {
-				budgetDuration: 3000,
 				expectedDuration: 1000,
 			})
 		)
@@ -1190,7 +1194,7 @@ describe('rundown Timing Calculator', () => {
 			partInstancesMap,
 			segmentsMap,
 			DEFAULT_DURATION,
-			[]
+			{}
 		)
 		expect(result).toEqual(
 			literal<RundownTimingContext>({
@@ -1248,16 +1252,301 @@ describe('rundown Timing Calculator', () => {
 					part3: 2000,
 					part4: 3000,
 				},
+				partsInQuickLoop: {},
 				remainingPlaylistDuration: 8000,
 				totalPlaylistDuration: 8000,
 				breakIsLastRundown: undefined,
 				remainingTimeOnCurrentPart: undefined,
 				rundownsBeforeNextBreak: undefined,
-				segmentBudgetDurations: {
-					[segmentId1]: 5000,
-					[segmentId2]: 3000,
+			})
+		)
+	})
+
+	it('Handles part with autonext', () => {
+		const timing = new RundownTimingCalculator()
+		const playlist: DBRundownPlaylist = makeMockPlaylist()
+		playlist.timing = {
+			type: 'forward-time' as any,
+			expectedStart: 0,
+			expectedDuration: 40000,
+		}
+		const rundownId1 = 'rundown1'
+		const segmentId1 = 'segment1'
+		const segmentId2 = 'segment2'
+		const segmentsMap: Map<SegmentId, DBSegment> = new Map()
+		segmentsMap.set(
+			protectString<SegmentId>(segmentId1),
+			makeMockSegment(segmentId1, 0, rundownId1, {
+				budgetDuration: 5000,
+			})
+		)
+		segmentsMap.set(
+			protectString<SegmentId>(segmentId2),
+			makeMockSegment(segmentId2, 0, rundownId1, {
+				budgetDuration: 3000,
+			})
+		)
+		const parts: DBPart[] = []
+		parts.push(
+			makeMockPart('part1', 0, rundownId1, segmentId1, {
+				expectedDuration: 1000,
+			})
+		)
+		parts.push(
+			makeMockPart('part2', 0, rundownId1, segmentId1, {
+				expectedDuration: 1000,
+			})
+		)
+		parts.push(
+			makeMockPart('part3', 0, rundownId1, segmentId2, {
+				expectedDuration: 1000,
+			})
+		)
+		parts.push(makeMockPart('part4', 0, rundownId1, segmentId2, { expectedDuration: 1000 }))
+		// set autonext and create partInstances
+		parts[0].autoNext = true
+		const partInstance1 = wrapPartToTemporaryInstance(protectString(''), parts[0])
+		partInstance1.isTemporary = false
+		partInstance1.timings = {
+			plannedStartedPlayback: 0,
+		}
+		const partInstance2 = wrapPartToTemporaryInstance(protectString(''), parts[1])
+		partInstance2.isTemporary = false
+		partInstance2.timings = {
+			plannedStartedPlayback: 1000, // start after part1's expectedDuration
+		}
+		const partInstances = [partInstance1, partInstance2, ...convertPartsToPartInstances([parts[2], parts[3]])]
+		const partInstancesMap: Map<PartId, PartInstance> = new Map()
+		const rundown = makeMockRundown(rundownId1, playlist)
+		const rundowns = [rundown]
+		// at t = 0
+		const result = timing.updateDurations(
+			0,
+			false,
+			playlist,
+			rundowns,
+			undefined,
+			partInstances,
+			partInstancesMap,
+			segmentsMap,
+			DEFAULT_DURATION,
+			{}
+		)
+		expect(result).toEqual(
+			literal<RundownTimingContext>({
+				currentPartInstanceId: null,
+				isLowResolution: false,
+				asDisplayedPlaylistDuration: 4000,
+				asPlayedPlaylistDuration: 8000,
+				currentPartWillAutoNext: false,
+				currentTime: 0,
+				partsInQuickLoop: {},
+				rundownExpectedDurations: {
+					[rundownId1]: 4000,
+				},
+				rundownAsPlayedDurations: {
+					[rundownId1]: 8000,
+				},
+				partCountdown: {
+					part1: 0,
+					part2: 1000,
+					part3: 5000,
+					part4: 6000,
+				},
+				partDisplayDurations: {
+					part1_tmp_instance: 1000,
+					part2_tmp_instance: 1000,
+					part3: 1000,
+					part4: 1000,
+				},
+				partDisplayStartsAt: {
+					part1_tmp_instance: 0,
+					part2_tmp_instance: 1000,
+					part3: 2000,
+					part4: 3000,
+				},
+				partDurations: {
+					part1_tmp_instance: 1000,
+					part2_tmp_instance: 1000,
+					part3: 1000,
+					part4: 1000,
+				},
+				partExpectedDurations: {
+					part1_tmp_instance: 1000,
+					part2_tmp_instance: 1000,
+					part3: 1000,
+					part4: 1000,
+				},
+				partPlayed: {
+					part1_tmp_instance: 0,
+					part2_tmp_instance: 0,
+					part3: 0,
+					part4: 0,
+				},
+				partStartsAt: {
+					part1_tmp_instance: 0,
+					part2_tmp_instance: 1000,
+					part3: 2000,
+					part4: 3000,
+				},
+				remainingPlaylistDuration: 8000,
+				totalPlaylistDuration: 8000,
+				breakIsLastRundown: undefined,
+				remainingTimeOnCurrentPart: undefined,
+				rundownsBeforeNextBreak: undefined,
+			})
+		)
+	})
+
+	it('Handles part with postroll', () => {
+		const timing = new RundownTimingCalculator()
+		const playlist: DBRundownPlaylist = makeMockPlaylist()
+		playlist.timing = {
+			type: 'forward-time' as any,
+			expectedStart: 0,
+			expectedDuration: 40000,
+		}
+		const rundownId1 = 'rundown1'
+		const segmentId1 = 'segment1'
+		const segmentId2 = 'segment2'
+		const segmentsMap: Map<SegmentId, DBSegment> = new Map()
+		segmentsMap.set(
+			protectString<SegmentId>(segmentId1),
+			makeMockSegment(segmentId1, 0, rundownId1, {
+				budgetDuration: 5000,
+			})
+		)
+		segmentsMap.set(
+			protectString<SegmentId>(segmentId2),
+			makeMockSegment(segmentId2, 0, rundownId1, {
+				budgetDuration: 3000,
+			})
+		)
+		const parts: DBPart[] = []
+		parts.push(
+			makeMockPart('part1', 0, rundownId1, segmentId1, {
+				expectedDuration: 2000,
+			})
+		)
+		parts.push(
+			makeMockPart('part2', 0, rundownId1, segmentId1, {
+				expectedDuration: 2000,
+			})
+		)
+		parts.push(
+			makeMockPart('part3', 0, rundownId1, segmentId2, {
+				expectedDuration: 1000,
+			})
+		)
+		parts.push(makeMockPart('part4', 0, rundownId1, segmentId2, { expectedDuration: 1000 }))
+		// set autonext and create partInstances
+		parts[0].autoNext = true
+		const partInstance1 = wrapPartToTemporaryInstance(protectString(''), parts[0])
+		partInstance1.isTemporary = false
+		partInstance1.timings = {
+			plannedStartedPlayback: 0,
+			reportedStartedPlayback: 0,
+			reportedStoppedPlayback: 2000,
+		}
+		partInstance1.partPlayoutTimings = {
+			inTransitionStart: 0,
+			toPartDelay: 0,
+			toPartPostroll: 500,
+			fromPartRemaining: 0,
+			fromPartPostroll: 0,
+		}
+		const partInstance2 = wrapPartToTemporaryInstance(protectString(''), parts[1])
+		partInstance2.isTemporary = false
+		partInstance2.timings = {
+			plannedStartedPlayback: 2000, // start after part1's expectedDuration
+			reportedStartedPlayback: 2000,
+		}
+		partInstance2.partPlayoutTimings = {
+			inTransitionStart: 0,
+			toPartDelay: 0,
+			toPartPostroll: 0,
+			fromPartRemaining: 500,
+			fromPartPostroll: 500,
+		}
+		const partInstances = [partInstance1, partInstance2, ...convertPartsToPartInstances([parts[2], parts[3]])]
+		const partInstancesMap: Map<PartId, PartInstance> = new Map()
+		const rundown = makeMockRundown(rundownId1, playlist)
+		const rundowns = [rundown]
+		// at t = 0
+		const result = timing.updateDurations(
+			3000,
+			false,
+			playlist,
+			rundowns,
+			undefined,
+			partInstances,
+			partInstancesMap,
+			segmentsMap,
+			DEFAULT_DURATION,
+			{}
+		)
+		expect(result).toEqual(
+			literal<RundownTimingContext>({
+				currentPartInstanceId: null,
+				isLowResolution: false,
+				asDisplayedPlaylistDuration: 6000,
+				asPlayedPlaylistDuration: 8000,
+				currentPartWillAutoNext: false,
+				currentTime: 3000,
+				partsInQuickLoop: {},
+				rundownExpectedDurations: {
+					[rundownId1]: 6000,
+				},
+				rundownAsPlayedDurations: {
+					[rundownId1]: 8000,
+				},
+				partCountdown: {
+					part1: 4000,
+					part2: 6000,
+					part3: 6000,
+					part4: 7000,
+				},
+				partDisplayDurations: {
+					part1_tmp_instance: 2000,
+					part2_tmp_instance: 2000,
+					part3: 1000,
+					part4: 1000,
+				},
+				partDisplayStartsAt: {
+					part1_tmp_instance: 0,
+					part2_tmp_instance: 2000,
+					part3: 4000,
+					part4: 5000,
+				},
+				partDurations: {
+					part1_tmp_instance: 2000,
+					part2_tmp_instance: 2000,
+					part3: 1000,
+					part4: 1000,
+				},
+				partExpectedDurations: {
+					part1_tmp_instance: 2000,
+					part2_tmp_instance: 2000,
+					part3: 1000,
+					part4: 1000,
+				},
+				partPlayed: {
+					part1_tmp_instance: 0,
+					part2_tmp_instance: 1000,
+					part3: 0,
+					part4: 0,
 				},
-				segmentStartedPlayback: {},
+				partStartsAt: {
+					part1_tmp_instance: 0,
+					part2_tmp_instance: 2000,
+					part3: 4000,
+					part4: 5000,
+				},
+				remainingPlaylistDuration: 8000,
+				totalPlaylistDuration: 8000,
+				breakIsLastRundown: undefined,
+				remainingTimeOnCurrentPart: undefined,
+				rundownsBeforeNextBreak: undefined,
 			})
 		)
 	})
@@ -1341,7 +1630,7 @@ describe('rundown Timing Calculator', () => {
 			partInstancesMap,
 			segmentsMap,
 			DEFAULT_DURATION,
-			[]
+			{}
 		)
 		expect(result).toEqual(
 			literal<RundownTimingContext>({
@@ -1350,6 +1639,7 @@ describe('rundown Timing Calculator', () => {
 				asDisplayedPlaylistDuration: 4000,
 				asPlayedPlaylistDuration: 4000,
 				currentPartWillAutoNext: false,
+				currentSegmentId: protectString(segmentId1),
 				currentTime: 1500,
 				rundownExpectedDurations: {
 					[rundownId1]: 4000,
@@ -1399,13 +1689,12 @@ describe('rundown Timing Calculator', () => {
 					part3: 2000,
 					part4: 3000,
 				},
+				partsInQuickLoop: {},
 				remainingPlaylistDuration: 2500,
 				totalPlaylistDuration: 4000,
 				breakIsLastRundown: false,
 				remainingTimeOnCurrentPart: 500,
 				rundownsBeforeNextBreak: [],
-				segmentBudgetDurations: {},
-				segmentStartedPlayback: {},
 				nextRundownAnchor: 2000,
 			})
 		)
@@ -1490,7 +1779,7 @@ describe('rundown Timing Calculator', () => {
 			partInstancesMap,
 			segmentsMap,
 			DEFAULT_DURATION,
-			[]
+			{}
 		)
 		expect(result).toEqual(
 			literal<RundownTimingContext>({
@@ -1499,6 +1788,7 @@ describe('rundown Timing Calculator', () => {
 				asDisplayedPlaylistDuration: 5500,
 				asPlayedPlaylistDuration: 5500,
 				currentPartWillAutoNext: false,
+				currentSegmentId: protectString(segmentId1),
 				currentTime: 3500,
 				rundownExpectedDurations: {
 					[rundownId1]: 4000,
@@ -1548,13 +1838,12 @@ describe('rundown Timing Calculator', () => {
 					part3: 3500,
 					part4: 4500,
 				},
+				partsInQuickLoop: {},
 				remainingPlaylistDuration: 2000,
 				totalPlaylistDuration: 4000,
 				breakIsLastRundown: false,
 				remainingTimeOnCurrentPart: -1500,
 				rundownsBeforeNextBreak: [],
-				segmentBudgetDurations: {},
-				segmentStartedPlayback: {},
 				nextRundownAnchor: 4000,
 			})
 		)
@@ -1645,7 +1934,7 @@ describe('rundown Timing Calculator', () => {
 			partInstancesMap,
 			segmentsMap,
 			DEFAULT_DURATION,
-			[]
+			{}
 		)
 		expect(result).toEqual(
 			literal<RundownTimingContext>({
@@ -1654,6 +1943,7 @@ describe('rundown Timing Calculator', () => {
 				asDisplayedPlaylistDuration: 4000,
 				asPlayedPlaylistDuration: 4000,
 				currentPartWillAutoNext: false,
+				currentSegmentId: protectString(segmentId2),
 				currentTime: 2500,
 				rundownExpectedDurations: {
 					[rundownId1]: 4000,
@@ -1703,13 +1993,12 @@ describe('rundown Timing Calculator', () => {
 					part3: 2000,
 					part4: 3000,
 				},
+				partsInQuickLoop: {},
 				remainingPlaylistDuration: 1500,
 				totalPlaylistDuration: 4000,
 				breakIsLastRundown: false,
 				remainingTimeOnCurrentPart: 500,
 				rundownsBeforeNextBreak: [],
-				segmentBudgetDurations: {},
-				segmentStartedPlayback: {},
 				nextRundownAnchor: 3000,
 			})
 		)
@@ -1794,7 +2083,7 @@ describe('rundown Timing Calculator', () => {
 			partInstancesMap,
 			segmentsMap,
 			DEFAULT_DURATION,
-			[]
+			{}
 		)
 		expect(result).toEqual(
 			literal<RundownTimingContext>({
@@ -1803,6 +2092,7 @@ describe('rundown Timing Calculator', () => {
 				asDisplayedPlaylistDuration: 4000,
 				asPlayedPlaylistDuration: 4000,
 				currentPartWillAutoNext: false,
+				currentSegmentId: protectString(segmentId1),
 				currentTime: 1500,
 				rundownExpectedDurations: {
 					[rundownId1]: 4000,
@@ -1852,13 +2142,12 @@ describe('rundown Timing Calculator', () => {
 					part3: 2000,
 					part4: 3000,
 				},
+				partsInQuickLoop: {},
 				remainingPlaylistDuration: 2500,
 				totalPlaylistDuration: 4000,
 				breakIsLastRundown: false,
 				remainingTimeOnCurrentPart: 500,
 				rundownsBeforeNextBreak: [],
-				segmentBudgetDurations: {},
-				segmentStartedPlayback: {},
 				nextRundownAnchor: 2000,
 			})
 		)
@@ -1943,7 +2232,7 @@ describe('rundown Timing Calculator', () => {
 			partInstancesMap,
 			segmentsMap,
 			DEFAULT_DURATION,
-			[]
+			{}
 		)
 		expect(result).toEqual(
 			literal<RundownTimingContext>({
@@ -1952,6 +2241,7 @@ describe('rundown Timing Calculator', () => {
 				asDisplayedPlaylistDuration: 5500,
 				asPlayedPlaylistDuration: 5500,
 				currentPartWillAutoNext: false,
+				currentSegmentId: protectString(segmentId1),
 				currentTime: 3500,
 				rundownExpectedDurations: {
 					[rundownId1]: 4000,
@@ -2001,13 +2291,12 @@ describe('rundown Timing Calculator', () => {
 					part3: 3500,
 					part4: 4500,
 				},
+				partsInQuickLoop: {},
 				remainingPlaylistDuration: 2000,
 				totalPlaylistDuration: 4000,
 				breakIsLastRundown: false,
 				remainingTimeOnCurrentPart: -1500,
 				rundownsBeforeNextBreak: [],
-				segmentBudgetDurations: {},
-				segmentStartedPlayback: {},
 				nextRundownAnchor: 4000,
 			})
 		)
@@ -2098,7 +2387,7 @@ describe('rundown Timing Calculator', () => {
 			partInstancesMap,
 			segmentsMap,
 			DEFAULT_DURATION,
-			[]
+			{}
 		)
 		expect(result).toEqual(
 			literal<RundownTimingContext>({
@@ -2107,6 +2396,7 @@ describe('rundown Timing Calculator', () => {
 				asDisplayedPlaylistDuration: 4000,
 				asPlayedPlaylistDuration: 4000,
 				currentPartWillAutoNext: false,
+				currentSegmentId: protectString(segmentId2),
 				currentTime: 2500,
 				rundownExpectedDurations: {
 					[rundownId1]: 4000,
@@ -2156,15 +2446,186 @@ describe('rundown Timing Calculator', () => {
 					part3: 2000,
 					part4: 3000,
 				},
+				partsInQuickLoop: {},
 				remainingPlaylistDuration: 1500,
 				totalPlaylistDuration: 4000,
 				breakIsLastRundown: false,
 				remainingTimeOnCurrentPart: 500,
 				rundownsBeforeNextBreak: [],
-				segmentBudgetDurations: {},
-				segmentStartedPlayback: {},
 				nextRundownAnchor: 3000,
 			})
 		)
 	})
+
+	it('Passes partsInQuickLoop', () => {
+		const timing = new RundownTimingCalculator()
+		const playlist: DBRundownPlaylist = makeMockPlaylist()
+		const rundownId = 'rundown1'
+		const segmentId1 = 'segment1'
+		const segmentId2 = 'segment2'
+		const segmentsMap: Map<SegmentId, DBSegment> = new Map()
+		segmentsMap.set(protectString<SegmentId>(segmentId1), makeMockSegment(segmentId1, 0, rundownId))
+		segmentsMap.set(protectString<SegmentId>(segmentId2), makeMockSegment(segmentId2, 0, rundownId))
+		const parts: DBPart[] = []
+		parts.push(makeMockPart('part1', 0, rundownId, segmentId1, { expectedDuration: 1000 }))
+		parts.push(makeMockPart('part2', 0, rundownId, segmentId1, { expectedDuration: 1000 }))
+		parts.push(makeMockPart('part3', 0, rundownId, segmentId2, { expectedDuration: 1000 }))
+		parts.push(makeMockPart('part4', 0, rundownId, segmentId2, { expectedDuration: 1000 }))
+		const partInstances = convertPartsToPartInstances(parts)
+		const partInstancesMap: Map<PartId, PartInstance> = new Map()
+		const rundown = makeMockRundown(rundownId, playlist)
+		const rundowns = [rundown]
+		const result = timing.updateDurations(
+			0,
+			false,
+			playlist,
+			rundowns,
+			undefined,
+			partInstances,
+			partInstancesMap,
+			segmentsMap,
+			DEFAULT_DURATION,
+			{
+				part2: true,
+				part3: true,
+			}
+		)
+		expect(result).toMatchObject(
+			literal<Partial<RundownTimingContext>>({
+				partsInQuickLoop: {
+					part2: true,
+					part3: true,
+				},
+			})
+		)
+	})
+})
+
+describe('findPartInstancesInQuickLoop', () => {
+	it('Returns no parts when QuickLoop is not defined', () => {
+		const { partInstances } = makeMockPartsForQuickLoopTest()
+		const playlist = makeMockPlaylist()
+
+		const result = findPartInstancesInQuickLoop(playlist, partInstances)
+
+		expect(result).toEqual({})
+	})
+
+	it('Returns parts between QuickLoop Part Markers when loop is not running', () => {
+		const { parts, partInstances } = makeMockPartsForQuickLoopTest()
+
+		const playlist = makeMockPlaylist()
+		playlist.quickLoop = {
+			start: {
+				type: QuickLoopMarkerType.PART,
+				id: parts[1]._id,
+			},
+			end: {
+				type: QuickLoopMarkerType.PART,
+				id: parts[3]._id,
+			},
+			running: false,
+			forceAutoNext: ForceQuickLoopAutoNext.DISABLED,
+			locked: false,
+		}
+
+		const result = findPartInstancesInQuickLoop(playlist, partInstances)
+
+		expect(result).toEqual({
+			[unprotectString(parts[1]._id)]: true,
+			[unprotectString(parts[2]._id)]: true,
+			[unprotectString(parts[3]._id)]: true,
+		})
+	})
+
+	it('Returns parts between QuickLoop Part Markers when loop is running', () => {
+		const { parts, partInstances } = makeMockPartsForQuickLoopTest()
+
+		const playlist = makeMockPlaylist()
+		playlist.quickLoop = {
+			start: {
+				type: QuickLoopMarkerType.PART,
+				id: parts[1]._id,
+			},
+			end: {
+				type: QuickLoopMarkerType.PART,
+				id: parts[3]._id,
+			},
+			running: true,
+			forceAutoNext: ForceQuickLoopAutoNext.DISABLED,
+			locked: false,
+		}
+
+		const result = findPartInstancesInQuickLoop(playlist, partInstances)
+
+		expect(result).toEqual({
+			[unprotectString(parts[1]._id)]: true,
+			[unprotectString(parts[2]._id)]: true,
+			[unprotectString(parts[3]._id)]: true,
+		})
+	})
+
+	it('Returns no parts when the entire Playlist is looping', () => {
+		// this may need to change if setting other than Part markers is allowed by the users
+		const { partInstances } = makeMockPartsForQuickLoopTest()
+
+		const playlist = makeMockPlaylist()
+		playlist.quickLoop = {
+			start: {
+				type: QuickLoopMarkerType.PLAYLIST,
+			},
+			end: {
+				type: QuickLoopMarkerType.PLAYLIST,
+			},
+			running: false,
+			forceAutoNext: ForceQuickLoopAutoNext.DISABLED,
+			locked: false,
+		}
+
+		const result = findPartInstancesInQuickLoop(playlist, partInstances)
+
+		expect(result).toEqual({})
+	})
+
+	it('Returns no parts when QuickLoop Part Markers are in the wrong order', () => {
+		const { parts, partInstances } = makeMockPartsForQuickLoopTest()
+
+		const playlist = makeMockPlaylist()
+		playlist.quickLoop = {
+			start: {
+				type: QuickLoopMarkerType.PART,
+				id: parts[3]._id,
+			},
+			end: {
+				type: QuickLoopMarkerType.PART,
+				id: parts[1]._id,
+			},
+			running: false,
+			forceAutoNext: ForceQuickLoopAutoNext.DISABLED,
+			locked: false,
+		}
+
+		const result = findPartInstancesInQuickLoop(playlist, partInstances)
+
+		expect(result).toEqual({})
+	})
+
+	it('Returns no parts when QuickLoop End Marker is not defined', () => {
+		const { parts, partInstances } = makeMockPartsForQuickLoopTest()
+
+		const playlist = makeMockPlaylist()
+		playlist.quickLoop = {
+			start: {
+				type: QuickLoopMarkerType.PART,
+				id: parts[3]._id,
+			},
+			running: false,
+			forceAutoNext: ForceQuickLoopAutoNext.DISABLED,
+			locked: false,
+		}
+
+		const result = findPartInstancesInQuickLoop(playlist, partInstances)
+
+		expect(result).toEqual({})
+	})
 })
diff --git a/packages/webui/src/client/lib/__tests__/systemTime.test.ts b/packages/webui/src/client/lib/__tests__/systemTime.test.ts
new file mode 100644
index 0000000000..87b0dd3f59
--- /dev/null
+++ b/packages/webui/src/client/lib/__tests__/systemTime.test.ts
@@ -0,0 +1,41 @@
+import { runTimersUntilNow } from '../../../__mocks__/helpers/jest'
+import { getCurrentTime, systemTime, TimeJumpDetector } from '../systemTime'
+
+test('getCurrentTime', () => {
+	systemTime.diff = 5439
+	expect(getCurrentTime() / 1000).toBeCloseTo((Date.now() - 5439) / 1000, 1)
+})
+
+test('TimeJumpDetector', async () => {
+	jest.useFakeTimers()
+	const mockCallback = jest.fn()
+	let now = Date.now()
+	let monotonicNow = 5000 // say it's running for 5 seconds
+	const mockDateNow = jest.spyOn(global.Date, 'now').mockImplementation(() => now)
+	const mockProcessHrtime = jest.spyOn(performance, 'now').mockImplementation(() => monotonicNow)
+
+	const timeJumpDetector = new TimeJumpDetector(10000, mockCallback)
+	timeJumpDetector.start()
+
+	jest.advanceTimersByTime(11000)
+	await runTimersUntilNow()
+	expect(mockCallback).toHaveBeenCalledTimes(0)
+
+	now += 11000
+	monotonicNow += 11051
+
+	jest.advanceTimersByTime(11000)
+	await runTimersUntilNow()
+	expect(mockCallback).toHaveBeenCalledTimes(1)
+	mockCallback.mockClear()
+
+	now += 11000
+	monotonicNow += 10951
+
+	jest.advanceTimersByTime(11000)
+	await runTimersUntilNow()
+	expect(mockCallback).toHaveBeenCalledTimes(0)
+
+	mockDateNow.mockRestore()
+	mockProcessHrtime.mockRestore()
+})
diff --git a/meteor/client/lib/clientAPI.ts b/packages/webui/src/client/lib/clientAPI.ts
similarity index 93%
rename from meteor/client/lib/clientAPI.ts
rename to packages/webui/src/client/lib/clientAPI.ts
index 89ab570997..b6420ca6b6 100644
--- a/meteor/client/lib/clientAPI.ts
+++ b/packages/webui/src/client/lib/clientAPI.ts
@@ -1,7 +1,7 @@
 import { PeripheralDevice } from '@sofie-automation/corelib/dist/dataModel/PeripheralDevice'
-import { MeteorCall } from '../../lib/api/methods'
+import { MeteorCall } from '../lib/meteorApi'
 import { PeripheralDeviceId } from '@sofie-automation/corelib/dist/dataModel/Ids'
-import { eventContextForLog } from '../../lib/clientUserAction'
+import { eventContextForLog } from './clientUserAction'
 import { TSR } from '@sofie-automation/blueprints-integration'
 
 export async function callPeripheralDeviceFunction(
diff --git a/meteor/lib/clientUserAction.ts b/packages/webui/src/client/lib/clientUserAction.ts
similarity index 94%
rename from meteor/lib/clientUserAction.ts
rename to packages/webui/src/client/lib/clientUserAction.ts
index 268939bf03..cd75970630 100644
--- a/meteor/lib/clientUserAction.ts
+++ b/packages/webui/src/client/lib/clientUserAction.ts
@@ -1,11 +1,12 @@
 import * as i18next from 'i18next'
 import _ from 'underscore'
 import { NotificationCenter, Notification, NoticeLevel } from './notifications/notifications'
-import { ClientAPI } from './api/client'
+import { ClientAPI } from '@sofie-automation/meteor-lib/dist/api/client'
 import { Meteor } from 'meteor/meteor'
 import { logger } from './logging'
-import { assertNever, getCurrentTime, systemTime, Time } from './lib'
-import { UserAction } from './userAction'
+import { assertNever, Time } from './tempLib'
+import { getCurrentTime, systemTime } from './systemTime'
+import { UserAction } from '@sofie-automation/meteor-lib/dist/userAction'
 import { translateMessage } from '@sofie-automation/corelib/dist/TranslatableMessage'
 
 export { UserAction }
@@ -116,6 +117,10 @@ function userActionToLabel(userAction: UserAction, t: i18next.TFunction) {
 			return t('Rehearsal Mode')
 		case UserAction.CREATE_ADLIB_TESTING_RUNDOWN:
 			return t('Creating Adlib Testing Rundown')
+		case UserAction.SET_QUICK_LOOP_START:
+			return t('Setting as QuickLoop Start')
+		case UserAction.SET_QUICK_LOOP_END:
+			return t('Setting as QuickLoop End')
 		default:
 			assertNever(userAction)
 	}
@@ -269,9 +274,10 @@ export function eventContextForLog(e: any): [string, Time] {
 		str = e.type
 	}
 	if (!str) {
-		logger.error(
-			'Could not create context in eventContextForLog, because provided event had no identifiable type',
-			e
+		logger.warn(
+			`Could not create context in eventContextForLog, because provided event had no identifiable type: ${JSON.stringify(
+				e
+			)}, stack: ${new Error().stack}`
 		)
 		str = 'N/A'
 	}
diff --git a/packages/webui/src/client/lib/collapseJSON.tsx b/packages/webui/src/client/lib/collapseJSON.tsx
new file mode 100644
index 0000000000..63a190be26
--- /dev/null
+++ b/packages/webui/src/client/lib/collapseJSON.tsx
@@ -0,0 +1,118 @@
+import classNames from 'classnames'
+import { useMemo, useState } from 'react'
+
+/**
+ * pretty-prints JSON content, and collapses it if it's too long.
+ */
+export function CollapseJSON({ json }: { json: string }): JSX.Element {
+	const [expanded, setExpanded] = useState(false)
+
+	const originalString = useMemo(() => {
+		try {
+			const obj = JSON.parse(json)
+			let str = JSON.stringify(obj, undefined, 2) // Pretty print JSON
+
+			// If the JSON string is a pretty short one, use a condensed JSON instead:
+			if (str.length < 200) {
+				str = JSON.stringify(obj) // Condensed JSON
+			}
+			return str
+		} catch (_e) {
+			// Ignore parsing error
+			return '' + json
+		}
+	}, [json])
+
+	/** Position of the 5th line in the string, 0 if not found */
+	const indexOf5thLine = useMemo(() => {
+		let indexOf5thLine: null | number = null
+		let foundIndex = 0
+		for (let foundCount = 0; foundCount < 10; foundCount++) {
+			foundIndex = originalString.indexOf('\n', foundIndex + 1)
+			if (foundIndex === -1) {
+				break
+			} else {
+				if (foundCount >= 5) {
+					indexOf5thLine = foundIndex
+					break
+				}
+			}
+		}
+		return indexOf5thLine
+	}, [originalString])
+
+	function copyContents() {
+		if (!navigator.clipboard) return
+
+		navigator.clipboard.writeText(json).catch((e) => console.error('Unable to copy JSON contents to clipboard', e))
+	}
+
+	if (originalString.length < 100 && indexOf5thLine === null) {
+		return <pre className="collapse-json__block">{originalString}</pre>
+	}
+
+	const displayContents = expanded ? (
+		<>
+			{originalString}
+			<div className="collapse-json__tools">
+				<button
+					key={'collapse'}
+					className="collapse-json__copy"
+					tabIndex={0}
+					onClick={(e) => {
+						e.stopPropagation()
+						copyContents()
+					}}
+				>
+					Copy
+				</button>
+				<button
+					key={'collapse'}
+					className="collapse-json__collapser"
+					tabIndex={0}
+					onClick={(e) => {
+						e.stopPropagation()
+						setExpanded(false)
+					}}
+				>
+					⮥
+				</button>
+			</div>
+		</>
+	) : (
+		<>
+			{originalString.substring(0, Math.min(indexOf5thLine || 100, 100))}
+			<div className="collapse-json__tools">
+				<button
+					key={'expand'}
+					className="collapse-json__collapser"
+					tabIndex={0}
+					onClick={(e) => {
+						e.stopPropagation()
+						setExpanded(true)
+					}}
+				>
+					…
+				</button>
+			</div>
+		</>
+	)
+
+	return (
+		<pre
+			tabIndex={0}
+			className={classNames('collapse-json__block', 'expanding', {
+				expanded,
+			})}
+			onClick={() => {
+				// Don't expand when user is selecting text:
+				const selection = window.getSelection()
+				if (selection?.type != 'Range') {
+					setExpanded(!expanded)
+				}
+			}}
+		>
+			{displayContents}
+		</pre>
+	)
+}
diff --git a/meteor/client/lib/colorPicker.tsx b/packages/webui/src/client/lib/colorPicker.tsx
similarity index 100%
rename from meteor/client/lib/colorPicker.tsx
rename to packages/webui/src/client/lib/colorPicker.tsx
diff --git a/meteor/client/lib/currentTimeReactive.ts b/packages/webui/src/client/lib/currentTimeReactive.ts
similarity index 88%
rename from meteor/client/lib/currentTimeReactive.ts
rename to packages/webui/src/client/lib/currentTimeReactive.ts
index b944c922d3..fd9e091050 100644
--- a/meteor/client/lib/currentTimeReactive.ts
+++ b/packages/webui/src/client/lib/currentTimeReactive.ts
@@ -1,4 +1,5 @@
-import { getCurrentTime, Time } from '../../lib/lib'
+import { Time } from './tempLib'
+import { getCurrentTime } from './systemTime'
 import { Meteor } from 'meteor/meteor'
 import { Tracker } from 'meteor/tracker'
 
diff --git a/meteor/client/lib/data/mos/__tests__/plugin-support.test.ts b/packages/webui/src/client/lib/data/mos/__tests__/plugin-support.test.ts
similarity index 100%
rename from meteor/client/lib/data/mos/__tests__/plugin-support.test.ts
rename to packages/webui/src/client/lib/data/mos/__tests__/plugin-support.test.ts
diff --git a/meteor/client/lib/data/mos/plugin-support.ts b/packages/webui/src/client/lib/data/mos/plugin-support.ts
similarity index 94%
rename from meteor/client/lib/data/mos/plugin-support.ts
rename to packages/webui/src/client/lib/data/mos/plugin-support.ts
index 73bc8b9ed7..0f271e824a 100644
--- a/meteor/client/lib/data/mos/plugin-support.ts
+++ b/packages/webui/src/client/lib/data/mos/plugin-support.ts
@@ -1,7 +1,5 @@
 import { objectToXML } from '../util/object-to-xml'
 
-const PackageInfo = require('../../../../package.json')
-
 export enum AckStatus {
 	ACK = 'ACK',
 	Error = 'ERROR',
@@ -68,7 +66,7 @@ export function createMosAppInfoXmlString(uiMetrics?: UIMetric[]): string {
 					software: {
 						manufacturer: 'Sofie Project',
 						product: 'Sofie TV Automation',
-						version: PackageInfo.version || 'UNSTABLE',
+						version: __APP_VERSION__ || 'UNSTABLE',
 					},
 					uiMetric: uiMetrics
 						? uiMetrics.map((metric, index) => {
diff --git a/meteor/client/lib/data/nora/browser-plugin-data.ts b/packages/webui/src/client/lib/data/nora/browser-plugin-data.ts
similarity index 87%
rename from meteor/client/lib/data/nora/browser-plugin-data.ts
rename to packages/webui/src/client/lib/data/nora/browser-plugin-data.ts
index 0588e7f6f1..b2a083be0c 100644
--- a/meteor/client/lib/data/nora/browser-plugin-data.ts
+++ b/packages/webui/src/client/lib/data/nora/browser-plugin-data.ts
@@ -1,4 +1,4 @@
-import { NoraContent } from '@sofie-automation/blueprints-integration'
+import { JSONBlobParse, NoraContent } from '@sofie-automation/blueprints-integration'
 import { PieceGeneric } from '@sofie-automation/corelib/dist/dataModel/Piece'
 import { objectToXML } from '../util/object-to-xml'
 
@@ -6,7 +6,7 @@ export { createMosObjectXmlStringNoraBluePrintPiece }
 
 function createMosObjectXmlStringNoraBluePrintPiece(piece: Pick<PieceGeneric, 'content' | 'externalId'>): string {
 	const noraContent = piece.content as NoraContent | undefined
-	const noraPayload = noraContent?.payload
+	const noraPayload = noraContent?.previewPayload ? JSONBlobParse(noraContent.previewPayload) : undefined
 	if (!noraContent || !noraPayload) {
 		throw new Error('Not a Nora blueprint piece')
 	}
diff --git a/meteor/client/lib/data/util/__tests__/object-to-xml.test.ts b/packages/webui/src/client/lib/data/util/__tests__/object-to-xml.test.ts
similarity index 100%
rename from meteor/client/lib/data/util/__tests__/object-to-xml.test.ts
rename to packages/webui/src/client/lib/data/util/__tests__/object-to-xml.test.ts
diff --git a/meteor/client/lib/data/util/object-to-xml.ts b/packages/webui/src/client/lib/data/util/object-to-xml.ts
similarity index 100%
rename from meteor/client/lib/data/util/object-to-xml.ts
rename to packages/webui/src/client/lib/data/util/object-to-xml.ts
diff --git a/packages/webui/src/client/lib/datePicker.tsx b/packages/webui/src/client/lib/datePicker.tsx
new file mode 100644
index 0000000000..38abcf8ab9
--- /dev/null
+++ b/packages/webui/src/client/lib/datePicker.tsx
@@ -0,0 +1,102 @@
+import { useState, useEffect } from 'react'
+import DatePicker from 'react-datepicker'
+import moment from 'moment'
+import 'react-datepicker/dist/react-datepicker.css'
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
+import { faChevronRight, faChevronLeft } from '@fortawesome/free-solid-svg-icons'
+import { Time } from './tempLib'
+import { useTranslation } from 'react-i18next'
+
+export function DatePickerFromTo({
+	from,
+	to,
+	onChange,
+}: {
+	from?: Time
+	to?: Time
+	onChange: (from: Time, to: Time) => void
+}): JSX.Element {
+	const { t } = useTranslation()
+
+	const [localFrom, setLocalFrom] = useState<Date>(
+		from ? new Date(from) : moment().subtract(1, 'days').startOf('day').toDate()
+	)
+	const [localTo, setLocalTo] = useState<Date>(to ? new Date(to) : moment().startOf('day').toDate())
+
+	function onClickPrevious() {
+		const from = moment(localFrom).subtract(1, 'days').valueOf()
+		const to = moment(localTo).subtract(1, 'days').valueOf()
+
+		setLocalFrom(new Date(from))
+		setLocalTo(new Date(to))
+	}
+	function onClickNext() {
+		const from = moment(localFrom).add(1, 'days').valueOf()
+		const to = moment(localTo).add(1, 'days').valueOf()
+
+		setLocalFrom(new Date(from))
+		setLocalTo(new Date(to))
+	}
+	function handleChangeFrom(date: Date | null) {
+		if (!date) return
+		if (date.valueOf() >= localTo.valueOf()) {
+			setLocalTo(moment(date).add(1, 'days').startOf('day').toDate())
+		}
+		setLocalFrom(date)
+	}
+	function handleChangeTo(date: Date | null) {
+		if (!date) return
+		if (date.valueOf() <= localFrom.valueOf()) {
+			setLocalFrom(moment(date).subtract(1, 'days').startOf('day').toDate())
+		}
+		setLocalTo(date)
+	}
+
+	useEffect(() => {
+		onChange(localFrom.valueOf(), localTo.valueOf())
+	}, [localFrom, localTo])
+
+	useEffect(() => {
+		if (from) {
+			setLocalFrom(from ? new Date(from) : moment().subtract(1, 'days').startOf('day').toDate())
+		}
+		if (to) {
+			setLocalTo(to ? new Date(to) : moment().startOf('day').toDate())
+		}
+	}, [from, to])
+
+	return (
+		<div className="datepicker-from-to">
+			<button className="action-btn mod mhm" onClick={onClickPrevious}>
+				<FontAwesomeIcon icon={faChevronLeft} />
+			</button>
+			<label className="mod mhs mvn">
+				{t('From')}
+				<div className="picker expco">
+					<DatePicker
+						dateFormat="yyyy-MM-dd HH:mm"
+						showTimeInput
+						selected={localFrom}
+						onChange={handleChangeFrom}
+						className="expco-title"
+					/>
+				</div>
+			</label>
+			<label className="mod mhs mvn">
+				{t('Until')}
+				<div className="picker expco">
+					<DatePicker
+						dateFormat="yyyy-MM-dd HH:mm"
+						showTimeInput
+						selected={localTo}
+						onChange={handleChangeTo}
+						className="expco-title"
+					/>
+				</div>
+			</label>
+			<button className="action-btn mod mhm" onClick={onClickNext}>
+				<FontAwesomeIcon icon={faChevronRight} />
+			</button>
+		</div>
+	)
+}
diff --git a/meteor/client/lib/dev.ts b/packages/webui/src/client/lib/dev.ts
similarity index 76%
rename from meteor/client/lib/dev.ts
rename to packages/webui/src/client/lib/dev.ts
index a6a7769694..0bfb3edea3 100644
--- a/meteor/client/lib/dev.ts
+++ b/packages/webui/src/client/lib/dev.ts
@@ -1,11 +1,10 @@
-import { getCurrentTime } from '../../lib/lib'
-import { Session } from 'meteor/session'
+import { getCurrentTime } from './systemTime'
 import { Meteor } from 'meteor/meteor'
 import { Tracker } from 'meteor/tracker'
 import * as _ from 'underscore'
-import { MeteorCall } from '../../lib/api/methods'
-import { ClientCollections, PublicationCollections } from '../../lib/collections/lib'
-import { logger } from '../../lib/logging'
+import { MeteorCall } from '../lib/meteorApi'
+import { ClientCollections, PublicationCollections } from '../collections/lib'
+import { logger } from './logging'
 
 // Note: These things are convenience functions to be used during development:
 
@@ -17,7 +16,6 @@ Meteor.startup(() => {
 })
 
 windowAny['getCurrentTime'] = getCurrentTime
-windowAny['Session'] = Session
 
 function setDebugData() {
 	Tracker.autorun(() => {
diff --git a/meteor/client/lib/downloadBlob.ts b/packages/webui/src/client/lib/downloadBlob.ts
similarity index 100%
rename from meteor/client/lib/downloadBlob.ts
rename to packages/webui/src/client/lib/downloadBlob.ts
diff --git a/meteor/client/lib/forms/SchemaFormForCollection.tsx b/packages/webui/src/client/lib/forms/SchemaFormForCollection.tsx
similarity index 95%
rename from meteor/client/lib/forms/SchemaFormForCollection.tsx
rename to packages/webui/src/client/lib/forms/SchemaFormForCollection.tsx
index e70c205f7e..2544b116dc 100644
--- a/meteor/client/lib/forms/SchemaFormForCollection.tsx
+++ b/packages/webui/src/client/lib/forms/SchemaFormForCollection.tsx
@@ -4,8 +4,8 @@ import {
 	ObjectOverrideDeleteOp,
 	ObjectOverrideSetOp,
 } from '@sofie-automation/corelib/dist/settings/objectWithOverrides'
-import React, { useCallback, useMemo } from 'react'
-import { MongoCollection } from '../../../lib/collections/lib'
+import { useCallback, useMemo } from 'react'
+import { MongoCollection } from '../../collections/lib'
 import {
 	WrappedOverridableItemNormal,
 	OverrideOpHelperForItemContentsBatcher,
@@ -120,7 +120,7 @@ class OverrideOpHelperCollection implements OverrideOpHelperForItemContentsBatch
 			this.#changes.$unset[`${this.#basePath}.${subPath}`] = 1
 		} else {
 			if (!this.#changes.$set) this.#changes.$set = {}
-			;(this.#changes.$set[`${this.#basePath}.${subPath}`] as any) = value
+			this.#changes.$set[`${this.#basePath}.${subPath}`] = value
 		}
 
 		return this
diff --git a/meteor/client/lib/forms/SchemaFormInPlace.tsx b/packages/webui/src/client/lib/forms/SchemaFormInPlace.tsx
similarity index 97%
rename from meteor/client/lib/forms/SchemaFormInPlace.tsx
rename to packages/webui/src/client/lib/forms/SchemaFormInPlace.tsx
index 9d7be60ec1..9afc265469 100644
--- a/meteor/client/lib/forms/SchemaFormInPlace.tsx
+++ b/packages/webui/src/client/lib/forms/SchemaFormInPlace.tsx
@@ -1,5 +1,5 @@
 import { literal, objectPathSet } from '@sofie-automation/corelib/dist/lib'
-import React, { useCallback, useMemo, useState } from 'react'
+import { useCallback, useMemo, useState } from 'react'
 import {
 	WrappedOverridableItemNormal,
 	OverrideOpHelperForItemContentsBatcher,
diff --git a/meteor/client/lib/forms/SchemaFormSectionHeader.tsx b/packages/webui/src/client/lib/forms/SchemaFormSectionHeader.tsx
similarity index 95%
rename from meteor/client/lib/forms/SchemaFormSectionHeader.tsx
rename to packages/webui/src/client/lib/forms/SchemaFormSectionHeader.tsx
index b230e9516d..3c9b219565 100644
--- a/meteor/client/lib/forms/SchemaFormSectionHeader.tsx
+++ b/packages/webui/src/client/lib/forms/SchemaFormSectionHeader.tsx
@@ -1,4 +1,3 @@
-import React from 'react'
 import { translateStringIfHasNamespaces } from './schemaFormUtil'
 
 export function SchemaFormSectionHeader({
diff --git a/meteor/client/lib/forms/SchemaFormTable/ArrayTable.tsx b/packages/webui/src/client/lib/forms/SchemaFormTable/ArrayTable.tsx
similarity index 100%
rename from meteor/client/lib/forms/SchemaFormTable/ArrayTable.tsx
rename to packages/webui/src/client/lib/forms/SchemaFormTable/ArrayTable.tsx
diff --git a/meteor/client/lib/forms/SchemaFormTable/ArrayTableOpHelper.tsx b/packages/webui/src/client/lib/forms/SchemaFormTable/ArrayTableOpHelper.tsx
similarity index 100%
rename from meteor/client/lib/forms/SchemaFormTable/ArrayTableOpHelper.tsx
rename to packages/webui/src/client/lib/forms/SchemaFormTable/ArrayTableOpHelper.tsx
diff --git a/meteor/client/lib/forms/SchemaFormTable/ArrayTableRow.tsx b/packages/webui/src/client/lib/forms/SchemaFormTable/ArrayTableRow.tsx
similarity index 100%
rename from meteor/client/lib/forms/SchemaFormTable/ArrayTableRow.tsx
rename to packages/webui/src/client/lib/forms/SchemaFormTable/ArrayTableRow.tsx
diff --git a/meteor/client/lib/forms/SchemaFormTable/ObjectTable.scss b/packages/webui/src/client/lib/forms/SchemaFormTable/ObjectTable.scss
similarity index 100%
rename from meteor/client/lib/forms/SchemaFormTable/ObjectTable.scss
rename to packages/webui/src/client/lib/forms/SchemaFormTable/ObjectTable.scss
diff --git a/meteor/client/lib/forms/SchemaFormTable/ObjectTable.tsx b/packages/webui/src/client/lib/forms/SchemaFormTable/ObjectTable.tsx
similarity index 100%
rename from meteor/client/lib/forms/SchemaFormTable/ObjectTable.tsx
rename to packages/webui/src/client/lib/forms/SchemaFormTable/ObjectTable.tsx
diff --git a/meteor/client/lib/forms/SchemaFormTable/ObjectTableDeletedRow.tsx b/packages/webui/src/client/lib/forms/SchemaFormTable/ObjectTableDeletedRow.tsx
similarity index 96%
rename from meteor/client/lib/forms/SchemaFormTable/ObjectTableDeletedRow.tsx
rename to packages/webui/src/client/lib/forms/SchemaFormTable/ObjectTableDeletedRow.tsx
index d876c2c263..700c5cbcfc 100644
--- a/meteor/client/lib/forms/SchemaFormTable/ObjectTableDeletedRow.tsx
+++ b/packages/webui/src/client/lib/forms/SchemaFormTable/ObjectTableDeletedRow.tsx
@@ -1,7 +1,7 @@
 import { faSync } from '@fortawesome/free-solid-svg-icons'
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
 import { objectPathGet } from '@sofie-automation/corelib/dist/lib'
-import React, { useCallback } from 'react'
+import { useCallback } from 'react'
 import { SchemaSummaryField } from '../schemaFormUtil'
 
 interface ObjectTableDeletedRowProps {
diff --git a/meteor/client/lib/forms/SchemaFormTable/ObjectTableOpHelper.tsx b/packages/webui/src/client/lib/forms/SchemaFormTable/ObjectTableOpHelper.tsx
similarity index 100%
rename from meteor/client/lib/forms/SchemaFormTable/ObjectTableOpHelper.tsx
rename to packages/webui/src/client/lib/forms/SchemaFormTable/ObjectTableOpHelper.tsx
diff --git a/meteor/client/lib/forms/SchemaFormTable/TableEditRow.tsx b/packages/webui/src/client/lib/forms/SchemaFormTable/TableEditRow.tsx
similarity index 97%
rename from meteor/client/lib/forms/SchemaFormTable/TableEditRow.tsx
rename to packages/webui/src/client/lib/forms/SchemaFormTable/TableEditRow.tsx
index 215c970c81..d797966c90 100644
--- a/meteor/client/lib/forms/SchemaFormTable/TableEditRow.tsx
+++ b/packages/webui/src/client/lib/forms/SchemaFormTable/TableEditRow.tsx
@@ -1,7 +1,7 @@
 import { faCheck } from '@fortawesome/free-solid-svg-icons'
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
 import classNames from 'classnames'
-import React, { useCallback } from 'react'
+import { useCallback } from 'react'
 import { OverrideOpHelperForItemContents } from '../../../ui/Settings/util/OverrideOpHelper'
 import { SchemaFormSofieEnumDefinition } from '../schemaFormUtil'
 import { SchemaFormWithOverrides } from '../SchemaFormWithOverrides'
diff --git a/meteor/client/lib/forms/SchemaFormWithOverrides.tsx b/packages/webui/src/client/lib/forms/SchemaFormWithOverrides.tsx
similarity index 95%
rename from meteor/client/lib/forms/SchemaFormWithOverrides.tsx
rename to packages/webui/src/client/lib/forms/SchemaFormWithOverrides.tsx
index d55d193dd8..bcd00e9afb 100644
--- a/meteor/client/lib/forms/SchemaFormWithOverrides.tsx
+++ b/packages/webui/src/client/lib/forms/SchemaFormWithOverrides.tsx
@@ -1,5 +1,5 @@
 import { joinObjectPathFragments, literal } from '@sofie-automation/corelib/dist/lib'
-import React, { useMemo } from 'react'
+import { useMemo } from 'react'
 import { useTranslation } from 'react-i18next'
 import { WrappedOverridableItemNormal, OverrideOpHelperForItemContents } from '../../ui/Settings/util/OverrideOpHelper'
 import { CheckboxControl } from '../Components/Checkbox'
@@ -46,13 +46,16 @@ interface FormComponentProps {
 		overrideHelper: OverrideOpHelperForItemContents
 		itemKey: string
 		opPrefix: string
+
+		/** Whether a clear button should be showed for fields not marked as "required" */
+		showClearButton: boolean
 	}
 
 	/** Whether this field has been marked as "required" */
 	isRequired: boolean
 }
 
-function useChildPropsForFormComponent(props: Readonly<SchemaFormWithOverridesProps>) {
+function useChildPropsForFormComponent(props: Readonly<SchemaFormWithOverridesProps>): FormComponentProps {
 	return useMemo(() => {
 		const title = getSchemaUIField(props.schema, SchemaFormUIField.Title) || props.attr
 		const description = getSchemaUIField(props.schema, SchemaFormUIField.Description)
@@ -67,10 +70,20 @@ function useChildPropsForFormComponent(props: Readonly<SchemaFormWithOverridesPr
 				itemKey: props.attr,
 				opPrefix: props.item.id,
 				overrideHelper: props.overrideHelper,
+
+				showClearButton: !!props.showClearButtonForNonRequiredFields && !props.isRequired,
 			},
 			isRequired: props.isRequired,
 		}
-	}, [props.schema, props.translationNamespaces, props.attr, props.item, props.overrideHelper, props.isRequired])
+	}, [
+		props.schema,
+		props.translationNamespaces,
+		props.attr,
+		props.item,
+		props.overrideHelper,
+		props.isRequired,
+		props.showClearButtonForNonRequiredFields,
+	])
 }
 
 export function SchemaFormWithOverrides(props: Readonly<SchemaFormWithOverridesProps>): JSX.Element {
@@ -179,6 +192,7 @@ const ObjectFormWithOverrides = (props: Readonly<SchemaFormWithOverridesProps>)
 						sofieEnumDefinitons={props.sofieEnumDefinitons}
 						allowTables={props.allowTables}
 						isRequired={props.schema.required?.includes(index) ?? false}
+						showClearButtonForNonRequiredFields={props.showClearButtonForNonRequiredFields}
 					/>
 				)
 			})}
diff --git a/meteor/client/lib/forms/SchemaTableSummaryRow.tsx b/packages/webui/src/client/lib/forms/SchemaTableSummaryRow.tsx
similarity index 98%
rename from meteor/client/lib/forms/SchemaTableSummaryRow.tsx
rename to packages/webui/src/client/lib/forms/SchemaTableSummaryRow.tsx
index 7cef346160..402589bd5b 100644
--- a/meteor/client/lib/forms/SchemaTableSummaryRow.tsx
+++ b/packages/webui/src/client/lib/forms/SchemaTableSummaryRow.tsx
@@ -2,7 +2,7 @@ import { faPencilAlt, faSync, faTrash } from '@fortawesome/free-solid-svg-icons'
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
 import { objectPathGet } from '@sofie-automation/corelib/dist/lib'
 import classNames from 'classnames'
-import React, { useCallback } from 'react'
+import { useCallback } from 'react'
 import { SchemaSummaryField } from './schemaFormUtil'
 import { WrappedOverridableItemNormal } from '../../ui/Settings/util/OverrideOpHelper'
 import { useTranslation } from 'react-i18next'
diff --git a/meteor/client/lib/forms/schemaFormUtil.tsx b/packages/webui/src/client/lib/forms/schemaFormUtil.tsx
similarity index 96%
rename from meteor/client/lib/forms/schemaFormUtil.tsx
rename to packages/webui/src/client/lib/forms/schemaFormUtil.tsx
index a603d6eb1e..1dddc1dd43 100644
--- a/meteor/client/lib/forms/schemaFormUtil.tsx
+++ b/packages/webui/src/client/lib/forms/schemaFormUtil.tsx
@@ -1,4 +1,3 @@
-import React from 'react'
 import { translateMessage } from '@sofie-automation/corelib/dist/TranslatableMessage'
 import { i18nTranslator } from '../../ui/i18n'
 import { JSONSchema, TypeName } from '@sofie-automation/shared-lib/dist/lib/JSONSchemaTypes'
@@ -30,6 +29,11 @@ export interface SchemaFormCommonProps {
 	 * For example, a table inside a table will not display properly so this gets set automatically
 	 */
 	allowTables?: boolean
+
+	/**
+	 * Whether a clear button should be shown for any fields not marked as "required"
+	 */
+	showClearButtonForNonRequiredFields?: boolean
 }
 
 export function translateStringIfHasNamespaces(str: string, translationNamespaces: string[] | undefined): string {
diff --git a/meteor/client/lib/hotkeyHelper.ts b/packages/webui/src/client/lib/hotkeyHelper.ts
similarity index 100%
rename from meteor/client/lib/hotkeyHelper.ts
rename to packages/webui/src/client/lib/hotkeyHelper.ts
diff --git a/meteor/client/lib/iconPicker.tsx b/packages/webui/src/client/lib/iconPicker.tsx
similarity index 100%
rename from meteor/client/lib/iconPicker.tsx
rename to packages/webui/src/client/lib/iconPicker.tsx
diff --git a/meteor/lib/invalidatingTime.ts b/packages/webui/src/client/lib/invalidatingTime.ts
similarity index 93%
rename from meteor/lib/invalidatingTime.ts
rename to packages/webui/src/client/lib/invalidatingTime.ts
index 9bac36f8b8..a09511c3ed 100644
--- a/meteor/lib/invalidatingTime.ts
+++ b/packages/webui/src/client/lib/invalidatingTime.ts
@@ -1,5 +1,5 @@
 import { Tracker } from 'meteor/tracker'
-import { getCurrentTime } from './lib'
+import { getCurrentTime } from './systemTime'
 
 /** Invalidate a reactive computation after a given amount of time */
 export function invalidateAfter(timeout: number): void {
diff --git a/meteor/client/lib/language.ts b/packages/webui/src/client/lib/language.ts
similarity index 100%
rename from meteor/client/lib/language.ts
rename to packages/webui/src/client/lib/language.ts
diff --git a/meteor/client/lib/lib.tsx b/packages/webui/src/client/lib/lib.tsx
similarity index 87%
rename from meteor/client/lib/lib.tsx
rename to packages/webui/src/client/lib/lib.tsx
index 7a03e0da5c..d83ae5a54d 100644
--- a/meteor/client/lib/lib.tsx
+++ b/packages/webui/src/client/lib/lib.tsx
@@ -1,8 +1,11 @@
 import React, { useEffect, useRef, useState } from 'react'
 import { Meteor } from 'meteor/meteor'
 import _ from 'underscore'
-import { getCurrentTime, systemTime, Time } from '../../lib/lib'
-import { logger } from '../../lib/logging'
+import { Time } from './tempLib'
+import { getCurrentTime, systemTime } from './systemTime'
+import { logger } from './logging'
+import shajs from 'sha.js'
+import { SINGLE_USE_TOKEN_SALT } from '@sofie-automation/meteor-lib/dist/api/userActions'
 
 export { multilineText, isEventInInputField }
 
@@ -208,6 +211,14 @@ export function mapOrFallback<T = any, K = any, L = any>(
 	return array.map(callbackFn)
 }
 
+export function firstIfArray<T>(value: T | T[] | null | undefined): T | null | undefined
+export function firstIfArray<T>(value: T | T[] | null): T | null
+export function firstIfArray<T>(value: T | T[] | undefined): T | undefined
+export function firstIfArray<T>(value: T | T[]): T
+export function firstIfArray<T>(value: unknown): T {
+	return _.isArray(value) ? _.first(value) : value
+}
+
 export const TOOLTIP_DEFAULT_DELAY = 0.5
 
 /**
@@ -218,3 +229,11 @@ export const TOOLTIP_DEFAULT_DELAY = 0.5
 export function catchError(context: string): (...errs: any[]) => void {
 	return (...errs: any[]) => logger.error(context, ...errs)
 }
+
+export function hashSingleUseToken(token: string): string {
+	// Future: it would be nice for this to use a better webcrypto/better library, but this works
+	return shajs('sha1')
+		.update(SINGLE_USE_TOKEN_SALT + token)
+		.digest('base64')
+		.replace(/[+/=]/g, '_')
+}
diff --git a/meteor/client/lib/localStorage.ts b/packages/webui/src/client/lib/localStorage.ts
similarity index 84%
rename from meteor/client/lib/localStorage.ts
rename to packages/webui/src/client/lib/localStorage.ts
index 830e97c2b5..ae0982433b 100644
--- a/meteor/client/lib/localStorage.ts
+++ b/packages/webui/src/client/lib/localStorage.ts
@@ -1,10 +1,24 @@
-import { Settings } from '../../lib/Settings'
-import { getUserRoles } from '../../lib/collections/Users'
 import {
 	setReportNotifications as libSetReportNotifications,
 	getReportNotifications as libGetReportNotifications,
-} from '../../lib/notifications/notifications'
-import { LocalStorageProperty } from '../../lib/lib'
+} from './notifications/notifications'
+
+export enum LocalStorageProperty {
+	STUDIO = 'studioMode',
+	CONFIGURE = 'configureMode',
+	DEVELOPER = 'developerMode',
+	TESTING = 'testingMode',
+	SPEAKING = 'speakingMode',
+	VIBRATING = 'vibratingMode',
+	SERVICE = 'serviceMode',
+	SHELF_FOLLOWS_ON_AIR = 'shelfFollowsOnAir',
+	SHOW_HIDDEN_SOURCE_LAYERS = 'showHiddenSourceLayers',
+	IGNORE_PIECE_CONTENT_STATUS = 'ignorePieceContentStatus',
+	UI_ZOOM_LEVEL = 'uiZoomLevel',
+	HELP_MODE = 'helpMode',
+	LOG_NOTIFICATIONS = 'logNotifications',
+	PROTO_ONE_PART_PER_LINE = 'proto:onePartPerLine',
+}
 
 const GUI_FLAGS: {
 	[key in LocalStorageProperty]?: string | null
@@ -33,47 +47,35 @@ function localStorageUnsetCachedItem(key: LocalStorageProperty): void {
 export function setAllowStudio(studioMode: boolean): void {
 	localStorageSetCachedItem(LocalStorageProperty.STUDIO, studioMode ? '1' : '0')
 }
-export function getAllowStudio(): boolean {
-	if (Settings.enableUserAccounts) {
-		return !!getUserRoles().studio
-	}
+export function getLocalAllowStudio(): boolean {
 	return localStorageGetCachedItem(LocalStorageProperty.STUDIO) === '1'
 }
 
 export function setAllowConfigure(configureMode: boolean): void {
 	localStorageSetCachedItem(LocalStorageProperty.CONFIGURE, configureMode ? '1' : '0')
 }
-export function getAllowConfigure(): boolean {
-	if (Settings.enableUserAccounts) {
-		return !!getUserRoles().configurator
-	}
+export function getLocalAllowConfigure(): boolean {
 	return localStorageGetCachedItem(LocalStorageProperty.CONFIGURE) === '1'
 }
 
 export function setAllowService(serviceMode: boolean): void {
 	localStorageSetCachedItem(LocalStorageProperty.SERVICE, serviceMode ? '1' : '0')
 }
-export function getAllowService(): boolean {
+export function getLocalAllowService(): boolean {
 	return localStorageGetCachedItem(LocalStorageProperty.SERVICE) === '1'
 }
 
 export function setAllowDeveloper(developerMode: boolean): void {
 	localStorageSetCachedItem(LocalStorageProperty.DEVELOPER, developerMode ? '1' : '0')
 }
-export function getAllowDeveloper(): boolean {
-	if (Settings.enableUserAccounts) {
-		return !!getUserRoles().developer
-	}
+export function getLocalAllowDeveloper(): boolean {
 	return localStorageGetCachedItem(LocalStorageProperty.DEVELOPER) === '1'
 }
 
 export function setAllowTesting(testingMode: boolean): void {
 	localStorageSetCachedItem(LocalStorageProperty.TESTING, testingMode ? '1' : '0')
 }
-export function getAllowTesting(): boolean {
-	if (Settings.enableUserAccounts) {
-		return !!getUserRoles().developer
-	}
+export function getLocalAllowTesting(): boolean {
 	return localStorageGetCachedItem(LocalStorageProperty.TESTING) === '1'
 }
 
diff --git a/meteor/client/lib/logStatus.ts b/packages/webui/src/client/lib/logStatus.ts
similarity index 81%
rename from meteor/client/lib/logStatus.ts
rename to packages/webui/src/client/lib/logStatus.ts
index bf5fe6994f..9137a8c1b2 100644
--- a/meteor/client/lib/logStatus.ts
+++ b/packages/webui/src/client/lib/logStatus.ts
@@ -1,8 +1,8 @@
 import { Meteor } from 'meteor/meteor'
 import { Tracker } from 'meteor/tracker'
-import { getRandomString } from '../../lib/lib'
-import { getAllowStudio } from './localStorage'
-import { logger } from '../../lib/logging'
+import { getRandomString } from './tempLib'
+import { logger } from './logging'
+import { getLocalAllowStudio } from './localStorage'
 
 /*
  * This file sets up logging of the connection status, for troubleshooting purposes.
@@ -12,7 +12,7 @@ import { logger } from '../../lib/logging'
 const browserSessionId = getRandomString(8)
 
 // Only log status for studio users
-const logStatusEnable = getAllowStudio()
+const logStatusEnable = getLocalAllowStudio() // Future: this needs to be setup to be reactive if this is wanted to work correctly in environments with authentication
 
 const previouslyLogged: {
 	connected?: boolean
diff --git a/packages/webui/src/client/lib/logging.ts b/packages/webui/src/client/lib/logging.ts
new file mode 100644
index 0000000000..c32cceb459
--- /dev/null
+++ b/packages/webui/src/client/lib/logging.ts
@@ -0,0 +1,50 @@
+import { stringifyError } from '@sofie-automation/shared-lib/dist/lib/stringifyError'
+import { MeteorCall } from './meteorApi'
+import { LoggerInstanceFixed } from '@sofie-automation/corelib/dist/logging'
+
+const getLogMethod = (type: string) => {
+	return (...args: any[]) => {
+		console.log(type, ...args)
+
+		if (type === 'error' || type === 'warn' || type === 'info') {
+			// Also send log entry to server, for logging:
+			const stringifiedArgs: string[] = args.map((arg) => stringifyError(arg))
+			MeteorCall.client.clientLogger(type, `Client ${type}`, ...stringifiedArgs).catch(console.error)
+			return logger
+		}
+		return logger
+	}
+}
+
+const noop = (_type: string) => {
+	// do nothing
+	return logger
+}
+
+const logger: LoggerInstanceFixed = {
+	error: getLogMethod('error'),
+	warn: getLogMethod('warn'),
+	// help: getLogMethod('help'),
+	data: getLogMethod('data'),
+	info: getLogMethod('info'),
+	debug: getLogMethod('debug'),
+	prompt: getLogMethod('prompt'),
+	http: getLogMethod('http'),
+	verbose: getLogMethod('verbose'),
+	input: getLogMethod('input'),
+	silly: getLogMethod('silly'),
+
+	emerg: getLogMethod('emerg'),
+	alert: getLogMethod('alert'),
+	crit: getLogMethod('crit'),
+	warning: getLogMethod('warn'),
+	notice: getLogMethod('notice'),
+	log: getLogMethod('log'),
+}
+if (localStorage && localStorage.getItem('developerMode') !== '1') {
+	// not in developerMode, don't log everything then:
+	logger.debug = noop
+	logger.silly = noop
+}
+
+export { logger }
diff --git a/meteor/lib/memoizedIsolatedAutorun.ts b/packages/webui/src/client/lib/memoizedIsolatedAutorun.ts
similarity index 97%
rename from meteor/lib/memoizedIsolatedAutorun.ts
rename to packages/webui/src/client/lib/memoizedIsolatedAutorun.ts
index 9d38c39da1..992654c5cb 100644
--- a/meteor/lib/memoizedIsolatedAutorun.ts
+++ b/packages/webui/src/client/lib/memoizedIsolatedAutorun.ts
@@ -33,10 +33,6 @@ export function memoizedIsolatedAutorun<T extends (...args: any) => any>(
 	functionName: string,
 	...params: Parameters<T>
 ): ReturnType<T> {
-	if (Meteor.isServer) {
-		return fnc(...(params as any))
-	}
-
 	function hashFncAndParams(fName: string, p: any): string {
 		return fName + '_' + JSON.stringify(p)
 	}
diff --git a/packages/webui/src/client/lib/meteorApi.ts b/packages/webui/src/client/lib/meteorApi.ts
new file mode 100644
index 0000000000..15cb2cb1a3
--- /dev/null
+++ b/packages/webui/src/client/lib/meteorApi.ts
@@ -0,0 +1,29 @@
+import { Meteor } from 'meteor/meteor'
+import { logger } from './logging'
+import { AllPubSubTypes } from '@sofie-automation/meteor-lib/dist/api/pubsub'
+import { MakeMeteorCall } from '@sofie-automation/meteor-lib/dist/api/methods'
+import { MeteorApply } from './MeteorApply'
+import { stringifyError } from '@sofie-automation/shared-lib/dist/lib/stringifyError'
+
+/**
+ * Type safe wrapper around Meteor.subscribe()
+ * @param name name of the subscription
+ * @param args arguments to the subscription
+ * @returns Meteor subscription handle
+ */
+export function meteorSubscribe<K extends keyof AllPubSubTypes>(
+	name: K,
+	...args: Parameters<AllPubSubTypes[K]>
+): Meteor.SubscriptionHandle {
+	const callbacks = {
+		onError: (...errs: any[]) => {
+			logger.error(
+				`meteorSubscribe "${name}": ${JSON.stringify(args)}: ${errs.map((err) => stringifyError(err))}`
+			)
+		},
+	}
+
+	return Meteor.subscribe(name, ...args, callbacks)
+}
+
+export const MeteorCall = MakeMeteorCall(MeteorApply)
diff --git a/meteor/client/lib/multiSelect.tsx b/packages/webui/src/client/lib/multiSelect.tsx
similarity index 99%
rename from meteor/client/lib/multiSelect.tsx
rename to packages/webui/src/client/lib/multiSelect.tsx
index ea3d515d92..396c3be59c 100644
--- a/meteor/client/lib/multiSelect.tsx
+++ b/packages/webui/src/client/lib/multiSelect.tsx
@@ -1,5 +1,5 @@
 import * as React from 'react'
-import * as _ from 'underscore'
+import _ from 'underscore'
 import ClassNames from 'classnames'
 
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
diff --git a/meteor/client/lib/notifications/NotificationCenterPanel.tsx b/packages/webui/src/client/lib/notifications/NotificationCenterPanel.tsx
similarity index 98%
rename from meteor/client/lib/notifications/NotificationCenterPanel.tsx
rename to packages/webui/src/client/lib/notifications/NotificationCenterPanel.tsx
index fb3d561919..4938b40edc 100644
--- a/meteor/client/lib/notifications/NotificationCenterPanel.tsx
+++ b/packages/webui/src/client/lib/notifications/NotificationCenterPanel.tsx
@@ -1,15 +1,10 @@
 import * as React from 'react'
-import CoreIcon from '@nrk/core-icons/jsx'
+import * as CoreIcon from '@nrk/core-icons/jsx'
 import ClassNames from 'classnames'
 // @ts-expect-error No types available
 import * as VelocityReact from 'velocity-react'
 import { translateWithTracker, Translated, useTracker } from '../ReactMeteorData/ReactMeteorData'
-import {
-	NotificationCenter,
-	Notification,
-	NoticeLevel,
-	NotificationAction,
-} from '../../../lib/notifications/notifications'
+import { NotificationCenter, Notification, NoticeLevel, NotificationAction } from './notifications'
 import { ContextMenuTrigger, ContextMenu, MenuItem } from '@jstarpl/react-contextmenu'
 import { translateMessage, isTranslatableMessage } from '@sofie-automation/corelib/dist/TranslatableMessage'
 import { CriticalIcon, WarningIcon, CollapseChevrons, InformationIcon } from '../ui/icons/notifications'
@@ -110,7 +105,8 @@ class NotificationPopUp extends React.Component<IPopUpProps> {
 												key={i}
 												className={ClassNames(
 													'btn',
-													['default', 'primary'].indexOf(action.type) ? 'btn-primary' : 'btn-default'
+													['default', 'primary'].indexOf(action.type) ? 'btn-primary' : 'btn-default',
+													'mls'
 												)}
 												onClick={(e) => this.triggerEvent(action, e)}
 											>
diff --git a/meteor/client/lib/notifications/ReactNotification.tsx b/packages/webui/src/client/lib/notifications/ReactNotification.tsx
similarity index 79%
rename from meteor/client/lib/notifications/ReactNotification.tsx
rename to packages/webui/src/client/lib/notifications/ReactNotification.tsx
index 1ff97d57e6..e4ad08f078 100644
--- a/meteor/client/lib/notifications/ReactNotification.tsx
+++ b/packages/webui/src/client/lib/notifications/ReactNotification.tsx
@@ -1,11 +1,7 @@
 import React, { useEffect } from 'react'
-import {
-	NoticeLevel,
-	NotificationCenter,
-	Notification,
-	NotificationAction,
-} from '../../../lib/notifications/notifications'
-import { getCurrentTime, getRandomString } from '../../../lib/lib'
+import { NoticeLevel, NotificationCenter, Notification, NotificationAction } from './notifications'
+import { getRandomString } from '../tempLib'
+import { getCurrentTime } from '../systemTime'
 
 export interface IProps {
 	level?: NoticeLevel
diff --git a/meteor/lib/notifications/notifications.ts b/packages/webui/src/client/lib/notifications/notifications.ts
similarity index 99%
rename from meteor/lib/notifications/notifications.ts
rename to packages/webui/src/client/lib/notifications/notifications.ts
index aa2776acf9..e1df7695e4 100644
--- a/meteor/lib/notifications/notifications.ts
+++ b/packages/webui/src/client/lib/notifications/notifications.ts
@@ -11,12 +11,12 @@ import {
 	protectString,
 	assertNever,
 	getRandomString,
-	LocalStorageProperty,
-} from '../lib'
+} from '../tempLib'
 import { isTranslatableMessage, ITranslatableMessage } from '@sofie-automation/corelib/dist/TranslatableMessage'
 import { PieceStatusCode } from '@sofie-automation/corelib/dist/dataModel/Piece'
-import { MeteorCall } from '../api/methods'
+import { MeteorCall } from '../../lib/meteorApi'
 import { RundownId, SegmentId } from '@sofie-automation/corelib/dist/dataModel/Ids'
+import { LocalStorageProperty } from '../localStorage'
 
 let reportNotificationsId: string | null = null
 
@@ -29,8 +29,6 @@ export function setReportNotifications(id: string | null): void {
 }
 
 Meteor.startup(() => {
-	if (!Meteor.isClient) return
-
 	reportNotificationsId = localStorage.getItem(LocalStorageProperty.LOG_NOTIFICATIONS)
 })
 
@@ -563,8 +561,6 @@ export function getNoticeLevelForPieceStatus(statusCode: PieceStatusCode | undef
 }
 
 Meteor.startup(() => {
-	if (!Meteor.isClient) return
-
 	const windowAny: any = window
 
 	windowAny['testNotification'] = function (
diff --git a/meteor/client/lib/notifications/warningIcon.tsx b/packages/webui/src/client/lib/notifications/warningIcon.tsx
similarity index 100%
rename from meteor/client/lib/notifications/warningIcon.tsx
rename to packages/webui/src/client/lib/notifications/warningIcon.tsx
diff --git a/meteor/client/lib/parsers/mos/__tests__/mosReqAppInfo.xml b/packages/webui/src/client/lib/parsers/mos/__tests__/mosReqAppInfo.xml
similarity index 100%
rename from meteor/client/lib/parsers/mos/__tests__/mosReqAppInfo.xml
rename to packages/webui/src/client/lib/parsers/mos/__tests__/mosReqAppInfo.xml
diff --git a/meteor/client/lib/parsers/mos/__tests__/mosSample1.json b/packages/webui/src/client/lib/parsers/mos/__tests__/mosSample1.json
similarity index 89%
rename from meteor/client/lib/parsers/mos/__tests__/mosSample1.json
rename to packages/webui/src/client/lib/parsers/mos/__tests__/mosSample1.json
index 3ceb858ae1..c231ca5217 100644
--- a/meteor/client/lib/parsers/mos/__tests__/mosSample1.json
+++ b/packages/webui/src/client/lib/parsers/mos/__tests__/mosSample1.json
@@ -41,7 +41,7 @@
 							"software": {
 								"manufacturer": "AP",
 								"product": "ENPS Client",
-								"version": 8
+								"version": "8"
 							}
 						},
 						"changed": "2018-08-30-T17:56:41"
@@ -55,21 +55,20 @@
 				},
 				"content": {
 					"bilde": {
-						"text": 0,
 						"creators": "ØYSTEIN TRONSLI DRABLØS / FRILAND/DAVID BLOOMER",
 						"credit": "",
 						"title": "Hennie som French",
-						"w": 0.8462222,
+						"w": "0.8462222",
 						"format": "image/jpeg",
-						"width": 1920,
-						"x": 0.07688889,
-						"h": 1,
-						"y": 0,
+						"width": "1920",
+						"x": "0.07688889",
+						"h": "1",
+						"y": "0",
 						"id": "QdncIGkD-IU8W5Ff5QBoIA",
 						"type": "image/jpeg",
 						"uri": "QdncIGkD-IU8W5Ff5QBoIARqUM5XjlRKIhner2t9Dsxg",
-						"quality": 0.9,
-						"height": 1080,
+						"quality": "0.9",
+						"height": "1080",
 						"url": "https://some-url"
 					}
 				}
@@ -80,9 +79,8 @@
 			"MosSchema": "http://nora.core.mesosint.nrk.no/mos/timing",
 			"MosPayload": {
 				"out": "onNext",
-				"text": 0,
-				"timeIn": 0,
-				"duration": 5000,
+				"timeIn": "0",
+				"duration": "5000",
 				"in": "auto"
 			}
 		}
diff --git a/meteor/client/lib/parsers/mos/__tests__/mosSample1.xml b/packages/webui/src/client/lib/parsers/mos/__tests__/mosSample1.xml
similarity index 100%
rename from meteor/client/lib/parsers/mos/__tests__/mosSample1.xml
rename to packages/webui/src/client/lib/parsers/mos/__tests__/mosSample1.xml
diff --git a/meteor/client/lib/parsers/mos/__tests__/mosSample2.json b/packages/webui/src/client/lib/parsers/mos/__tests__/mosSample2.json
similarity index 86%
rename from meteor/client/lib/parsers/mos/__tests__/mosSample2.json
rename to packages/webui/src/client/lib/parsers/mos/__tests__/mosSample2.json
index 476df39810..29900e75ba 100644
--- a/meteor/client/lib/parsers/mos/__tests__/mosSample2.json
+++ b/packages/webui/src/client/lib/parsers/mos/__tests__/mosSample2.json
@@ -13,12 +13,11 @@
 	"MosExternalMetaData": [
 		{
 			"MosScope": "OBJECT",
-			"MosSchema": "undefined",
+			"MosSchema": "",
 			"MosPayload": {
 				"objType": "VIDEO"
 			}
 		}
 	],
-	"mosAbstract": "[object Object]",
 	"ObjectSlug": "bts-finnmark-bil_navnekonflikt(2)"
 }
diff --git a/meteor/client/lib/parsers/mos/__tests__/mosSample2.xml b/packages/webui/src/client/lib/parsers/mos/__tests__/mosSample2.xml
similarity index 100%
rename from meteor/client/lib/parsers/mos/__tests__/mosSample2.xml
rename to packages/webui/src/client/lib/parsers/mos/__tests__/mosSample2.xml
diff --git a/meteor/client/lib/parsers/mos/__tests__/mosXml2Js.test.ts b/packages/webui/src/client/lib/parsers/mos/__tests__/mosXml2Js.test.ts
similarity index 70%
rename from meteor/client/lib/parsers/mos/__tests__/mosXml2Js.test.ts
rename to packages/webui/src/client/lib/parsers/mos/__tests__/mosXml2Js.test.ts
index 53acdff793..ae907c7a0c 100644
--- a/meteor/client/lib/parsers/mos/__tests__/mosXml2Js.test.ts
+++ b/packages/webui/src/client/lib/parsers/mos/__tests__/mosXml2Js.test.ts
@@ -1,8 +1,7 @@
 import { parseMosPluginMessageXml, generateMosPluginItemXml } from '../mosXml2Js'
 import { readFileSync } from 'fs'
 import { join } from 'path'
-import { MOS_DATA_IS_STRICT } from '../../../../../lib/mos'
-import { stringifyMosObject } from '@mos-connection/helper'
+import { MOS_DATA_IS_STRICT, MOS } from '@sofie-automation/meteor-lib/dist/mos'
 
 describe('MOS XML to JavaScript object parser', () => {
 	describe('mosXml2Js', () => {
@@ -14,7 +13,7 @@ describe('MOS XML to JavaScript object parser', () => {
 
 			it('should match the json representation', () => {
 				const actual = parseMosPluginMessageXml(sample1XmlStr)
-				const actualJson = actual && actual.item && stringifyMosObject(actual.item, MOS_DATA_IS_STRICT) // Strip out any MosString etc
+				const actualJson = actual && actual.item && MOS.stringifyMosObject(actual.item, MOS_DATA_IS_STRICT) // Strip out any MosString etc
 
 				expect(actualJson).toEqual(jsonDoc)
 			})
@@ -23,7 +22,7 @@ describe('MOS XML to JavaScript object parser', () => {
 				const generatedXml = generateMosPluginItemXml(jsonDoc)
 				const actual = parseMosPluginMessageXml(generatedXml)
 				const actualJson =
-					actual && actual.item && actual.item && stringifyMosObject(actual.item, MOS_DATA_IS_STRICT) // Strip out any MosString etc
+					actual && actual.item && actual.item && MOS.stringifyMosObject(actual.item, MOS_DATA_IS_STRICT) // Strip out any MosString etc
 
 				expect(actualJson).toEqual(jsonDoc)
 			})
@@ -37,7 +36,7 @@ describe('MOS XML to JavaScript object parser', () => {
 
 			it('should match the json representation', () => {
 				const actual = parseMosPluginMessageXml(sampleXmlStr)
-				const actualJson = actual && actual.item && stringifyMosObject(actual.item, MOS_DATA_IS_STRICT) // Strip out any MosString etc
+				const actualJson = actual && actual.item && MOS.stringifyMosObject(actual.item, MOS_DATA_IS_STRICT) // Strip out any MosString etc
 
 				expect(actualJson).toEqual(jsonDoc)
 			})
@@ -45,7 +44,7 @@ describe('MOS XML to JavaScript object parser', () => {
 			it('converting via xml should be lossless', () => {
 				const generatedXml = generateMosPluginItemXml(jsonDoc)
 				const actual = parseMosPluginMessageXml(generatedXml)
-				const actualJson = actual && actual.item && stringifyMosObject(actual.item, MOS_DATA_IS_STRICT) // Strip out any MosString etc
+				const actualJson = actual && actual.item && MOS.stringifyMosObject(actual.item, MOS_DATA_IS_STRICT) // Strip out any MosString etc
 
 				expect(actualJson).toEqual(jsonDoc)
 			})
diff --git a/meteor/client/lib/parsers/mos/mosXml2Js.ts b/packages/webui/src/client/lib/parsers/mos/mosXml2Js.ts
similarity index 82%
rename from meteor/client/lib/parsers/mos/mosXml2Js.ts
rename to packages/webui/src/client/lib/parsers/mos/mosXml2Js.ts
index f7ea3687ac..b184d048e4 100644
--- a/meteor/client/lib/parsers/mos/mosXml2Js.ts
+++ b/packages/webui/src/client/lib/parsers/mos/mosXml2Js.ts
@@ -1,6 +1,5 @@
-import * as MOS from '@mos-connection/helper'
 import * as XMLBuilder from 'xmlbuilder'
-import { MOS_DATA_IS_STRICT } from '../../../../lib/mos'
+import { MOS_DATA_IS_STRICT, MOS } from '@sofie-automation/meteor-lib/dist/mos'
 
 /**
  * Client side MOS XML to JavaScript object conversion. Not exhaustive, might cut
@@ -23,7 +22,7 @@ export function parseMosPluginMessageXml(xmlString: string): MosPluginMessage |
 		}
 
 		if (doc.mos.ncsItem && doc.mos.ncsItem.item) {
-			res.item = MOS.MosModel.XMLMosItem.fromXML(doc.mos.ncsItem.item, MOS_DATA_IS_STRICT)
+			res.item = MOS.MosModel.XMLMosItem.fromXML('ncsItem.item', doc.mos.ncsItem.item, MOS_DATA_IS_STRICT)
 		}
 
 		return res
diff --git a/meteor/client/lib/polyfill/polyfills.ts b/packages/webui/src/client/lib/polyfill/polyfills.ts
similarity index 100%
rename from meteor/client/lib/polyfill/polyfills.ts
rename to packages/webui/src/client/lib/polyfill/polyfills.ts
diff --git a/meteor/client/lib/polyfill/promise.allSettled.ts b/packages/webui/src/client/lib/polyfill/promise.allSettled.ts
similarity index 100%
rename from meteor/client/lib/polyfill/promise.allSettled.ts
rename to packages/webui/src/client/lib/polyfill/promise.allSettled.ts
diff --git a/meteor/client/lib/polyfill/requestIdleCallback.ts b/packages/webui/src/client/lib/polyfill/requestIdleCallback.ts
similarity index 100%
rename from meteor/client/lib/polyfill/requestIdleCallback.ts
rename to packages/webui/src/client/lib/polyfill/requestIdleCallback.ts
diff --git a/meteor/client/lib/polyfill/vibrate.ts b/packages/webui/src/client/lib/polyfill/vibrate.ts
similarity index 100%
rename from meteor/client/lib/polyfill/vibrate.ts
rename to packages/webui/src/client/lib/polyfill/vibrate.ts
diff --git a/meteor/client/lib/popperUtils.ts b/packages/webui/src/client/lib/popperUtils.ts
similarity index 100%
rename from meteor/client/lib/popperUtils.ts
rename to packages/webui/src/client/lib/popperUtils.ts
diff --git a/meteor/client/lib/reactiveData/__tests__/reactiveDataHelper.test.ts b/packages/webui/src/client/lib/reactiveData/__tests__/reactiveDataHelper.test.ts
similarity index 64%
rename from meteor/client/lib/reactiveData/__tests__/reactiveDataHelper.test.ts
rename to packages/webui/src/client/lib/reactiveData/__tests__/reactiveDataHelper.test.ts
index 308dd68cc9..d27e1abc2a 100644
--- a/meteor/client/lib/reactiveData/__tests__/reactiveDataHelper.test.ts
+++ b/packages/webui/src/client/lib/reactiveData/__tests__/reactiveDataHelper.test.ts
@@ -1,15 +1,10 @@
-import { testInFiber } from '../../../../__mocks__/helpers/jest'
 import { Tracker } from 'meteor/tracker'
 import { slowDownReactivity } from '../reactiveDataHelper'
-import { sleep } from '../../../../lib/lib'
-import { MeteorMock } from '../../../../__mocks__/meteor'
+import { sleep } from '@sofie-automation/shared-lib/dist/lib/lib'
 
 describe('client/lib/reactiveData/reactiveDataHelper', () => {
-	beforeAll(() => {
-		MeteorMock.mockSetClientEnvironment()
-	})
 	describe('slowDownReactivity', () => {
-		testInFiber('it invalidates the parent computation immediately, when delay === 0', () => {
+		test('it invalidates the parent computation immediately, when delay === 0', () => {
 			let runCount = 0
 			const dep = new Tracker.Dependency()
 			let result = ''
@@ -27,7 +22,7 @@ describe('client/lib/reactiveData/reactiveDataHelper', () => {
 			expect(runCount).toBe(2)
 			expect(result).toBe('test2')
 		})
-		testInFiber("it invalidates the computation after a delay, if it's dependency changes", async () => {
+		test("it invalidates the computation after a delay, if it's dependency changes", async () => {
 			let runCount = 0
 			const dep = new Tracker.Dependency()
 			Tracker.autorun(() => {
@@ -47,36 +42,33 @@ describe('client/lib/reactiveData/reactiveDataHelper', () => {
 			await sleep(200)
 			expect(runCount).toBe(2)
 		})
-		testInFiber(
-			'it invalidates once after a delay, even when there are additional invalidations in the delay period',
-			async () => {
-				let runCount = 0
-				const dep = new Tracker.Dependency()
-				Tracker.autorun(() => {
-					runCount++
-					slowDownReactivity(() => {
-						dep.depend()
-					}, 200)
-				})
+		test('it invalidates once after a delay, even when there are additional invalidations in the delay period', async () => {
+			let runCount = 0
+			const dep = new Tracker.Dependency()
+			Tracker.autorun(() => {
+				runCount++
+				slowDownReactivity(() => {
+					dep.depend()
+				}, 200)
+			})
 
-				expect(runCount).toBe(1)
-				dep.changed()
-				expect(runCount).toBe(1)
-				await sleep(100)
-				expect(runCount).toBe(1)
-				dep.changed()
+			expect(runCount).toBe(1)
+			dep.changed()
+			expect(runCount).toBe(1)
+			await sleep(100)
+			expect(runCount).toBe(1)
+			dep.changed()
 
-				await sleep(50)
-				dep.changed()
+			await sleep(50)
+			dep.changed()
 
-				await sleep(100)
-				expect(runCount).toBe(2)
+			await sleep(100)
+			expect(runCount).toBe(2)
 
-				await sleep(400)
-				expect(runCount).toBe(2)
-			}
-		)
-		testInFiber('it cleans up after itself when parent computation is invalidated', async () => {
+			await sleep(400)
+			expect(runCount).toBe(2)
+		})
+		test('it cleans up after itself when parent computation is invalidated', async () => {
 			let runCount0 = 0
 			let runCount1 = 0
 			const dep0 = new Tracker.Dependency()
diff --git a/meteor/client/lib/reactiveData/reactiveData.ts b/packages/webui/src/client/lib/reactiveData/reactiveData.ts
similarity index 97%
rename from meteor/client/lib/reactiveData/reactiveData.ts
rename to packages/webui/src/client/lib/reactiveData/reactiveData.ts
index edc161f8cf..cb95386f6a 100644
--- a/meteor/client/lib/reactiveData/reactiveData.ts
+++ b/packages/webui/src/client/lib/reactiveData/reactiveData.ts
@@ -2,8 +2,8 @@ import { Tracker } from 'meteor/tracker'
 import { ReactiveVar } from 'meteor/reactive-var'
 import { Piece } from '@sofie-automation/corelib/dist/dataModel/Piece'
 import { PeripheralDevice } from '@sofie-automation/corelib/dist/dataModel/PeripheralDevice'
-import { getCurrentTime } from '../../../lib/lib'
-import { FindOptions } from '../../../lib/collections/lib'
+import { getCurrentTime } from '../systemTime'
+import { FindOptions } from '../../collections/lib'
 import { RundownPlaylistId, StudioId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import { ExternalMessageQueue, PeripheralDevices, Pieces, Rundowns } from '../../collections'
 import { DBRundown, Rundown } from '@sofie-automation/corelib/dist/dataModel/Rundown'
diff --git a/meteor/client/lib/reactiveData/reactiveDataHelper.ts b/packages/webui/src/client/lib/reactiveData/reactiveDataHelper.ts
similarity index 96%
rename from meteor/client/lib/reactiveData/reactiveDataHelper.ts
rename to packages/webui/src/client/lib/reactiveData/reactiveDataHelper.ts
index 965e5083d5..7384c8dee0 100644
--- a/meteor/client/lib/reactiveData/reactiveDataHelper.ts
+++ b/packages/webui/src/client/lib/reactiveData/reactiveDataHelper.ts
@@ -1,5 +1,6 @@
 import { Tracker } from 'meteor/tracker'
-import { meteorSubscribe, AllPubSubTypes } from '../../../lib/api/pubsub'
+import { AllPubSubTypes } from '@sofie-automation/meteor-lib/dist/api/pubsub'
+import { meteorSubscribe } from '../meteorApi'
 import { Meteor } from 'meteor/meteor'
 
 /**
diff --git a/meteor/client/lib/resizeObserver.ts b/packages/webui/src/client/lib/resizeObserver.ts
similarity index 100%
rename from meteor/client/lib/resizeObserver.ts
rename to packages/webui/src/client/lib/resizeObserver.ts
diff --git a/meteor/client/lib/rundown.ts b/packages/webui/src/client/lib/rundown.ts
similarity index 85%
rename from meteor/client/lib/rundown.ts
rename to packages/webui/src/client/lib/rundown.ts
index 89f302c716..71db5aac0b 100644
--- a/meteor/client/lib/rundown.ts
+++ b/packages/webui/src/client/lib/rundown.ts
@@ -1,7 +1,7 @@
 import * as _ from 'underscore'
 import { PieceUi, PartUi } from '../ui/SegmentTimeline/SegmentTimelineContainer'
 import { Timecode } from '@sofie-automation/corelib/dist/index'
-import { Settings } from '../../lib/Settings'
+import { Settings } from '../lib/Settings'
 import {
 	SourceLayerType,
 	PieceLifespan,
@@ -18,12 +18,13 @@ import {
 	IOutputLayerExtended,
 	ISourceLayerExtended,
 	PartInstanceLimited,
-	getSegmentsWithPartInstances,
-} from '../../lib/Rundown'
-import { PartInstance } from '../../lib/collections/PartInstances'
+	isLoopRunning,
+} from './RundownResolver'
+import { PartInstance, wrapPartToTemporaryInstance } from '@sofie-automation/meteor-lib/dist/collections/PartInstances'
 import { DBSegment } from '@sofie-automation/corelib/dist/dataModel/Segment'
 import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
-import { literal, getCurrentTime } from '../../lib/lib'
+import { literal, protectString, groupByToMap } from './tempLib'
+import { getCurrentTime } from './systemTime'
 import {
 	processAndPrunePieceInstanceTimings,
 	resolvePrunedPieceInstance,
@@ -31,17 +32,20 @@ import {
 import { PieceInstance, PieceInstancePiece } from '@sofie-automation/corelib/dist/dataModel/PieceInstance'
 import { IAdLibListItem } from '../ui/Shelf/AdLibListItem'
 import { BucketAdLibItem, BucketAdLibUi } from '../ui/Shelf/RundownViewBuckets'
-import { FindOptions } from '../../lib/collections/lib'
+import { FindOptions } from '../collections/lib'
 import { getShowHiddenSourceLayers } from './localStorage'
 import { Rundown } from '@sofie-automation/corelib/dist/dataModel/Rundown'
 import { IStudioSettings } from '@sofie-automation/corelib/dist/dataModel/Studio'
-import { calculatePartInstanceExpectedDurationWithPreroll } from '@sofie-automation/corelib/dist/playout/timings'
+import { calculatePartInstanceExpectedDurationWithTransition } from '@sofie-automation/corelib/dist/playout/timings'
 import { AdLibPieceUi } from './shelf'
-import { UIShowStyleBase } from '../../lib/api/showStyles'
+import { UIShowStyleBase } from '@sofie-automation/meteor-lib/dist/api/showStyles'
 import { PartId, PieceId, RundownId, SegmentId, ShowStyleBaseId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import { PieceInstances, Segments } from '../collections'
 import { PieceStatusCode } from '@sofie-automation/corelib/dist/dataModel/Piece'
 import { assertNever } from '@sofie-automation/shared-lib/dist/lib/lib'
+import { MongoQuery } from '@sofie-automation/corelib/dist/mongo'
+import { DBPart } from '@sofie-automation/corelib/dist/dataModel/Part'
+import { RundownPlaylistClientUtil } from './rundownPlaylistUtil'
 
 export namespace RundownUtils {
 	export function padZeros(input: number, places?: number): string {
@@ -58,7 +62,7 @@ export namespace RundownUtils {
 			return (
 				memo +
 				(part.instance.timings?.duration ||
-					calculatePartInstanceExpectedDurationWithPreroll(part.instance) ||
+					calculatePartInstanceExpectedDurationWithTransition(part.instance) ||
 					part.renderedDuration ||
 					(display ? Settings.defaultDisplayDuration : 0))
 			)
@@ -213,7 +217,7 @@ export namespace RundownUtils {
 								? part.instance.timings.duration + (part.instance.timings?.playOffset || 0)
 								: (partDuration ||
 										part.renderedDuration ||
-										calculatePartInstanceExpectedDurationWithPreroll(part.instance) ||
+										calculatePartInstanceExpectedDurationWithTransition(part.instance) ||
 										0) - (piece.renderedInPoint || 0)))
 					: part.instance.timings?.duration !== undefined
 					? part.instance.timings.duration + (part.instance.timings?.playOffset || 0)
@@ -385,8 +389,15 @@ export namespace RundownUtils {
 
 			let startsAt = 0
 			let previousPart: PartExtended | undefined
+
+			const deduplicatedPartInstances = RundownUtils.deduplicatePartInstancesForQuickLoop(
+				playlist,
+				segmentInfo.partInstances,
+				currentPartInstance
+			)
+
 			// fetch all the pieces for the parts
-			const partIds = segmentInfo.partInstances.map((part) => part.part._id)
+			const partIds = deduplicatedPartInstances.map((part) => part.part._id)
 
 			let nextPartIsAfterCurrentPart = false
 			if (nextPartInstance && currentPartInstance) {
@@ -413,8 +424,8 @@ export namespace RundownUtils {
 
 			const showHiddenSourceLayers = getShowHiddenSourceLayers()
 
-			partsE = segmentInfo.partInstances.map((partInstance, itIndex) => {
-				const partExpectedDuration = calculatePartInstanceExpectedDurationWithPreroll(partInstance)
+			partsE = deduplicatedPartInstances.map((partInstance, itIndex) => {
+				const partExpectedDuration = calculatePartInstanceExpectedDurationWithTransition(partInstance)
 
 				// extend objects to match the Extended interface
 				const partE = literal<PartExtended>({
@@ -769,4 +780,94 @@ export namespace RundownUtils {
 	): piece is BucketAdLibItem {
 		return 'bucketId' in piece && !!piece['bucketId']
 	}
+
+	export function deduplicatePartInstancesForQuickLoop<T extends Pick<PartInstance, '_id' | 'part'>>(
+		playlist: DBRundownPlaylist,
+		sortedPartInstances: T[],
+		currentPartInstance: T | undefined
+	): T[] {
+		if (!isLoopRunning(playlist)) return sortedPartInstances
+		return sortedPartInstances.filter((partInstance) => {
+			return (
+				partInstance.part._id !== currentPartInstance?.part._id || partInstance._id === currentPartInstance._id
+			)
+		})
+	}
+
+	/**
+	 * Get all PartInstances (or temporary PartInstances) all segments in all rundowns in a playlist, using given queries
+	 * to limit the data, in correct order.
+	 *
+	 * @export
+	 * @param {DBRundownPlaylist} playlist
+	 * @param {(MongoQuery<DBSegment>)} [segmentsQuery]
+	 * @param {(MongoQuery<DBPart>)} [partsQuery]
+	 * @param {MongoQuery<PartInstance>} [partInstancesQuery]
+	 * @param {FindOptions<DBSegment>} [segmentsOptions]
+	 * @param {FindOptions<DBPart>} [partsOptions]
+	 * @param {FindOptions<PartInstance>} [partInstancesOptions]
+	 * @return {*}  {Array<{ segment: Segment; partInstances: PartInstance[] }>}
+	 */
+	export function getSegmentsWithPartInstances(
+		playlist: DBRundownPlaylist,
+		segmentsQuery?: MongoQuery<DBSegment>,
+		partsQuery?: MongoQuery<DBPart>,
+		partInstancesQuery?: MongoQuery<PartInstance>,
+		segmentsOptions?: FindOptions<DBSegment>,
+		partsOptions?: FindOptions<DBPart>,
+		partInstancesOptions?: FindOptions<PartInstance>
+	): Array<{ segment: DBSegment; partInstances: PartInstance[] }> {
+		const { segments, parts: rawParts } = RundownPlaylistClientUtil.getSegmentsAndPartsSync(
+			playlist,
+			segmentsQuery,
+			partsQuery,
+			segmentsOptions,
+			partsOptions
+		)
+		const rawPartInstances = RundownPlaylistClientUtil.getActivePartInstances(
+			playlist,
+			partInstancesQuery,
+			partInstancesOptions
+		)
+		const playlistActivationId = playlist.activationId ?? protectString('')
+
+		const partsBySegment = groupByToMap(rawParts, 'segmentId')
+		const partInstancesBySegment = groupByToMap(rawPartInstances, 'segmentId')
+
+		return segments.map((segment) => {
+			const segmentParts = partsBySegment.get(segment._id) ?? []
+			const segmentPartInstances = partInstancesBySegment.get(segment._id) ?? []
+
+			if (segmentPartInstances.length === 0) {
+				return {
+					segment,
+					partInstances: segmentParts.map((p) => wrapPartToTemporaryInstance(playlistActivationId, p)),
+				}
+			} else if (segmentParts.length === 0) {
+				return {
+					segment,
+					partInstances: segmentPartInstances.sort(
+						(a, b) => a.part._rank - b.part._rank || a.takeCount - b.takeCount
+					),
+				}
+			} else {
+				const partIds: Set<PartId> = new Set()
+				for (const partInstance of segmentPartInstances) {
+					partIds.add(partInstance.part._id)
+				}
+				for (const part of segmentParts) {
+					if (partIds.has(part._id)) continue
+					segmentPartInstances.push(wrapPartToTemporaryInstance(playlistActivationId, part))
+				}
+				const allPartInstances = segmentPartInstances.sort(
+					(a, b) => a.part._rank - b.part._rank || a.takeCount - b.takeCount
+				)
+
+				return {
+					segment,
+					partInstances: allPartInstances,
+				}
+			}
+		})
+	}
 }
diff --git a/meteor/lib/api/rundownLayouts.ts b/packages/webui/src/client/lib/rundownLayouts.ts
similarity index 73%
rename from meteor/lib/api/rundownLayouts.ts
rename to packages/webui/src/client/lib/rundownLayouts.ts
index 9160006328..2da1f74648 100644
--- a/meteor/lib/api/rundownLayouts.ts
+++ b/packages/webui/src/client/lib/rundownLayouts.ts
@@ -1,61 +1,62 @@
 import {
-	RundownLayoutBase,
-	RundownLayout,
+	PartInstanceId,
+	RundownLayoutId,
+	RundownPlaylistActivationId,
+	StudioId,
+} from '@sofie-automation/corelib/dist/dataModel/Ids'
+import { processAndPrunePieceInstanceTimings } from '@sofie-automation/corelib/dist/playout/processAndPrune'
+import { UIShowStyleBase } from '@sofie-automation/meteor-lib/dist/api/showStyles'
+import { PieceInstance } from '@sofie-automation/corelib/dist/dataModel/PieceInstance'
+import {
+	CustomizableRegions,
 	DashboardLayout,
-	RundownLayoutType,
+	DashboardLayoutFilter,
+	PieceDisplayStyle,
+	RequiresActiveLayers,
+	RundownLayout,
+	RundownLayoutAdLibRegion,
+	RundownLayoutBase,
+	RundownLayoutColoredBox,
 	RundownLayoutElementBase,
-	RundownLayoutFilterBase,
 	RundownLayoutElementType,
+	RundownLayoutEndWords,
 	RundownLayoutExternalFrame,
-	RundownLayoutAdLibRegion,
-	PieceDisplayStyle,
+	RundownLayoutFilterBase,
+	RundownLayoutKeyboardPreview,
+	RundownLayoutMiniRundown,
+	RundownLayoutNextBreakTiming,
+	RundownLayoutNextInfo,
+	RundownLayoutPartName,
+	RundownLayoutPartTiming,
 	RundownLayoutPieceCountdown,
-	RundownViewLayout,
-	RundownLayoutRundownHeader,
-	RundownLayoutShelfBase,
-	CustomizableRegions,
-	RundownLayoutPlaylistStartTimer,
 	RundownLayoutPlaylistEndTimer,
-	RundownLayoutNextBreakTiming,
-	RundownLayoutEndWords,
+	RundownLayoutPlaylistName,
+	RundownLayoutPlaylistStartTimer,
+	RundownLayoutPresenterView,
+	RundownLayoutRundownHeader,
+	RundownLayoutSegmentName,
 	RundownLayoutSegmentTiming,
-	RundownLayoutPartTiming,
+	RundownLayoutShelfBase,
+	RundownLayoutShowStyleDisplay,
+	RundownLayoutStudioName,
+	RundownLayoutSytemStatus,
 	RundownLayoutTextLabel,
-	RundownLayoutPlaylistName,
 	RundownLayoutTimeOfDay,
-	RundownLayoutSytemStatus,
-	RundownLayoutShowStyleDisplay,
+	RundownLayoutType,
 	RundownLayoutWithFilters,
-	DashboardLayoutFilter,
-	RundownLayoutKeyboardPreview,
-	RundownLayoutNextInfo,
-	RundownLayoutPresenterView,
-	RundownLayoutStudioName,
-	RundownLayoutSegmentName,
-	RundownLayoutPartName,
-	RundownLayoutColoredBox,
-	RundownLayoutMiniRundown,
-} from '../collections/RundownLayouts'
-import * as _ from 'underscore'
-import { literal } from '../lib'
+	RundownViewLayout,
+} from '@sofie-automation/meteor-lib/dist/collections/RundownLayouts'
+import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
+import { literal } from './tempLib'
+import { getCurrentTime } from './systemTime'
+import { invalidateAt } from './invalidatingTime'
+import { memoizedIsolatedAutorun } from './memoizedIsolatedAutorun'
+import { PieceInstances } from '../collections'
+import { ReadonlyDeep } from 'type-fest'
 import { TFunction } from 'i18next'
-import { Settings } from '../Settings'
-import { RundownLayoutId, ShowStyleBaseId, StudioId } from '@sofie-automation/corelib/dist/dataModel/Ids'
-
-export interface NewRundownLayoutsAPI {
-	createRundownLayout(
-		name: string,
-		type: RundownLayoutType,
-		showStyleBaseId: ShowStyleBaseId,
-		regionId: string
-	): Promise<RundownLayoutId>
-	removeRundownLayout(id: RundownLayoutId): Promise<void>
-}
-
-export enum RundownLayoutsAPIMethods {
-	'removeRundownLayout' = 'rundownLayout.removeRundownLayout',
-	'createRundownLayout' = 'rundownLayout.createRundownLayout',
-}
+import _ from 'underscore'
+import { Settings } from './Settings'
+import { UIPartInstances } from '../ui/Collections'
 
 export interface LayoutDescriptor {
 	supportedFilters: RundownLayoutElementType[]
@@ -76,6 +77,132 @@ export interface CustomizableRegionLayout {
 	supportedFilters: RundownLayoutElementType[]
 }
 
+/**
+ * If the conditions of the filter are met, activePieceInstance will include the first piece instance found that matches the filter, otherwise it will be undefined.
+ */
+export function getIsFilterActive(
+	playlist: DBRundownPlaylist,
+	showStyleBase: UIShowStyleBase,
+	panel: RequiresActiveLayers
+): { active: boolean; activePieceInstance: ReadonlyDeep<PieceInstance> | undefined } {
+	const unfinishedPieces = getUnfinishedPieceInstancesReactive(playlist, showStyleBase)
+	let activePieceInstance: ReadonlyDeep<PieceInstance> | undefined
+	const activeLayers = unfinishedPieces.map((p) => p.piece.sourceLayerId)
+	const containsEveryRequiredLayer = panel.requireAllAdditionalSourcelayers
+		? panel.additionalLayers?.length && panel.additionalLayers.every((s) => activeLayers.includes(s))
+		: false
+	const containsRequiredLayer = containsEveryRequiredLayer
+		? true
+		: panel.additionalLayers && panel.additionalLayers.length
+		? panel.additionalLayers.some((s) => activeLayers.includes(s))
+		: false
+
+	if (
+		(!panel.requireAllAdditionalSourcelayers || containsEveryRequiredLayer) &&
+		(!panel.additionalLayers?.length || containsRequiredLayer)
+	) {
+		activePieceInstance =
+			panel.requiredLayerIds && panel.requiredLayerIds.length
+				? unfinishedPieces.find((piece: ReadonlyDeep<PieceInstance>) => {
+						return (
+							(panel.requiredLayerIds || []).indexOf(piece.piece.sourceLayerId) !== -1 &&
+							piece.partInstanceId === playlist.currentPartInfo?.partInstanceId
+						)
+				  })
+				: undefined
+	}
+	return {
+		active:
+			activePieceInstance !== undefined || (!panel.requiredLayerIds?.length && !panel.additionalLayers?.length),
+		activePieceInstance,
+	}
+}
+
+export function getUnfinishedPieceInstancesReactive(
+	playlist: DBRundownPlaylist,
+	showStyleBase: UIShowStyleBase
+): ReadonlyDeep<PieceInstance>[] {
+	if (playlist.activationId && playlist.currentPartInfo) {
+		return memoizedIsolatedAutorun(
+			(
+				playlistActivationId: RundownPlaylistActivationId,
+				currentPartInstanceId: PartInstanceId,
+				showStyleBase: UIShowStyleBase
+			) => {
+				const now = getCurrentTime()
+				let prospectivePieces: ReadonlyDeep<PieceInstance>[] = []
+
+				const partInstance = UIPartInstances.findOne(currentPartInstanceId)
+
+				if (partInstance) {
+					prospectivePieces = PieceInstances.find({
+						partInstanceId: currentPartInstanceId,
+						playlistActivationId: playlistActivationId,
+					}).fetch()
+
+					const nowInPart = partInstance.timings?.plannedStartedPlayback
+						? now - partInstance.timings.plannedStartedPlayback
+						: 0
+					prospectivePieces = processAndPrunePieceInstanceTimings(
+						showStyleBase.sourceLayers,
+						prospectivePieces,
+						nowInPart
+					)
+
+					let nearestEnd = Number.POSITIVE_INFINITY
+					prospectivePieces = prospectivePieces.filter((pieceInstance) => {
+						const piece = pieceInstance.piece
+
+						if (!pieceInstance.adLibSourceId && !piece.tags) {
+							// No effect on the data, so ignore
+							return false
+						}
+
+						let end: number | undefined
+						if (pieceInstance.plannedStoppedPlayback) {
+							end = pieceInstance.plannedStoppedPlayback
+						} else if (
+							pieceInstance.userDuration &&
+							'endRelativeToPart' in pieceInstance.userDuration &&
+							typeof pieceInstance.userDuration.endRelativeToPart === 'number'
+						) {
+							end = pieceInstance.userDuration.endRelativeToPart
+						} else if (
+							pieceInstance.userDuration &&
+							'endRelativeToNow' in pieceInstance.userDuration &&
+							typeof pieceInstance.userDuration.endRelativeToNow === 'number'
+						) {
+							end = pieceInstance.userDuration.endRelativeToNow + now
+						} else if (typeof piece.enable.duration === 'number' && pieceInstance.plannedStartedPlayback) {
+							end = piece.enable.duration + pieceInstance.plannedStartedPlayback
+						}
+
+						if (end !== undefined) {
+							if (end > now) {
+								nearestEnd = Math.min(nearestEnd, end)
+								return true
+							} else {
+								return false
+							}
+						}
+						return true
+					})
+
+					if (Number.isFinite(nearestEnd)) invalidateAt(nearestEnd)
+				}
+
+				return prospectivePieces
+			},
+			'getUnfinishedPieceInstancesReactive',
+			playlist.activationId,
+			playlist.currentPartInfo.partInstanceId,
+			showStyleBase
+		)
+	}
+
+	return []
+}
+
 class RundownLayoutsRegistry {
 	private shelfLayouts: Map<RundownLayoutType, LayoutDescriptor> = new Map()
 	private rundownViewLayouts: Map<RundownLayoutType, LayoutDescriptor> = new Map()
diff --git a/meteor/lib/collections/rundownPlaylistUtil.ts b/packages/webui/src/client/lib/rundownPlaylistUtil.ts
similarity index 71%
rename from meteor/lib/collections/rundownPlaylistUtil.ts
rename to packages/webui/src/client/lib/rundownPlaylistUtil.ts
index 114bc45ebb..b836e43695 100644
--- a/meteor/lib/collections/rundownPlaylistUtil.ts
+++ b/packages/webui/src/client/lib/rundownPlaylistUtil.ts
@@ -1,83 +1,24 @@
-import { PartId, RundownId, RundownPlaylistId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import { DBPart } from '@sofie-automation/corelib/dist/dataModel/Part'
-import { Rundown, DBRundown } from '@sofie-automation/corelib/dist/dataModel/Rundown'
 import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
+import { FindOptions, MongoQuery } from '@sofie-automation/corelib/dist/mongo'
+import { RundownPlaylistCollectionUtil } from '../collections/rundownPlaylistUtil'
+import { UIPartInstances, UIParts } from '../ui/Collections'
 import { DBSegment } from '@sofie-automation/corelib/dist/dataModel/Segment'
-import { normalizeArrayToMap, normalizeArrayFunc, groupByToMap } from '@sofie-automation/corelib/dist/lib'
+import { Pieces, Segments } from '../collections'
+import { DBRundown, Rundown } from '@sofie-automation/corelib/dist/dataModel/Rundown'
+import { RundownId, PartId } from '@sofie-automation/corelib/dist/dataModel/Ids'
+import { Piece } from '@sofie-automation/corelib/dist/dataModel/Piece'
+import { normalizeArrayFunc, groupByToMap } from '@sofie-automation/corelib/dist/lib'
 import {
-	sortRundownIDsInPlaylist,
 	sortSegmentsInRundowns,
 	sortPartsInSegments,
 	sortPartsInSortedSegments,
 } from '@sofie-automation/corelib/dist/playout/playlist'
 import { unprotectString } from '@sofie-automation/corelib/dist/protectedString'
-import _ from 'underscore'
-import { Rundowns, Segments, Parts, PartInstances, Pieces } from './libCollections'
-import { FindOptions } from './lib'
-import { PartInstance } from './PartInstances'
-import { MongoQuery } from '@sofie-automation/corelib/dist/mongo'
-import { Piece } from '@sofie-automation/corelib/dist/dataModel/Piece'
-
-/**
- * Direct database accessors for the RundownPlaylist
- * These used to reside on the Rundown class
- */
-export class RundownPlaylistCollectionUtil {
-	/** Returns an array of all Rundowns in the RundownPlaylist, sorted in playout order */
-	static getRundownsOrdered(
-		playlist: Pick<DBRundownPlaylist, '_id' | 'rundownIdsInOrder'>,
-		selector?: MongoQuery<Rundown>,
-		options?: FindOptions<Rundown>
-	): Rundown[] {
-		const allRundowns = RundownPlaylistCollectionUtil.getRundownsUnordered(playlist._id, selector, options)
-
-		const rundownsMap = normalizeArrayToMap(allRundowns, '_id')
-
-		const sortedIds = sortRundownIDsInPlaylist(playlist.rundownIdsInOrder, Array.from(rundownsMap.keys()))
-
-		return _.compact(sortedIds.map((id) => rundownsMap.get(id)))
-	}
-	/** Returns an array of all Rundowns in the RundownPlaylist, in no predictable order */
-	static getRundownsUnordered(
-		playlistId: RundownPlaylistId,
-		selector?: MongoQuery<Rundown>,
-		options?: FindOptions<Rundown>
-	): Rundown[] {
-		return Rundowns.find(
-			{
-				playlistId: playlistId,
-				...selector,
-			},
-			{
-				sort: {
-					_id: 1,
-				},
-				...options,
-			}
-		).fetch()
-	}
-	/** Returns an array with the id:s of all Rundowns in the RundownPlaylist, sorted in playout order */
-	static getRundownOrderedIDs(playlist: Pick<DBRundownPlaylist, '_id' | 'rundownIdsInOrder'>): RundownId[] {
-		const allIds = RundownPlaylistCollectionUtil.getRundownUnorderedIDs(playlist)
-
-		return sortRundownIDsInPlaylist(playlist.rundownIdsInOrder, allIds)
-	}
-	/** Returns an array with the id:s of all Rundowns in the RundownPlaylist, in no predictable order */
-	static getRundownUnorderedIDs(playlist: Pick<DBRundownPlaylist, '_id'>): RundownId[] {
-		const rundowns = Rundowns.find(
-			{
-				playlistId: playlist._id,
-			},
-			{
-				fields: {
-					_id: 1,
-				},
-			}
-		).fetch() as Array<Pick<DBRundown, '_id'>>
-
-		return rundowns.map((i) => i._id)
-	}
+import { PartInstance } from '@sofie-automation/meteor-lib/dist/collections/PartInstances'
+import * as _ from 'underscore'
 
+export class RundownPlaylistClientUtil {
 	/** Returns all segments joined with their rundowns in their correct oreder for this RundownPlaylist */
 	static getRundownsAndSegments(
 		playlist: Pick<DBRundownPlaylist, '_id' | 'rundownIdsInOrder'>,
@@ -121,7 +62,7 @@ export class RundownPlaylistCollectionUtil {
 				...options,
 			}
 		).fetch()
-		return RundownPlaylistCollectionUtil._matchSegmentsAndRundowns(segments, rundowns)
+		return RundownPlaylistClientUtil._matchSegmentsAndRundowns(segments, rundowns)
 	}
 	/** Returns all segments in their correct order for this RundownPlaylist */
 	static getSegments(
@@ -145,97 +86,9 @@ export class RundownPlaylistCollectionUtil {
 				...options,
 			}
 		).fetch()
-		return RundownPlaylistCollectionUtil._sortSegments(segments, playlist)
+		return RundownPlaylistClientUtil._sortSegments(segments, playlist)
 	}
-	static getUnorderedParts(
-		playlist: Pick<DBRundownPlaylist, '_id'>,
-		selector?: MongoQuery<DBPart>,
-		options?: FindOptions<DBPart>
-	): DBPart[] {
-		const rundownIds = RundownPlaylistCollectionUtil.getRundownUnorderedIDs(playlist)
-		const parts = Parts.find(
-			{
-				...selector,
-				rundownId: {
-					$in: rundownIds,
-				},
-			},
-			{
-				...options,
-				sort: {
-					rundownId: 1,
-					_rank: 1,
-				},
-			}
-		).fetch()
-		return parts
-	}
-	/** Synchronous version of getSegmentsAndParts, to be used client-side */
-	static getSegmentsAndPartsSync(
-		playlist: Pick<DBRundownPlaylist, '_id' | 'rundownIdsInOrder'>,
-		segmentsQuery?: MongoQuery<DBSegment>,
-		partsQuery?: MongoQuery<DBPart>,
-		segmentsOptions?: Omit<FindOptions<DBSegment>, 'projection'>, // We are mangling fields, so block projection
-		partsOptions?: Omit<FindOptions<DBPart>, 'projection'> // We are mangling fields, so block projection
-	): { segments: DBSegment[]; parts: DBPart[] } {
-		const rundownIds = RundownPlaylistCollectionUtil.getRundownUnorderedIDs(playlist)
-		const segments = Segments.find(
-			{
-				rundownId: {
-					$in: rundownIds,
-				},
-				...segmentsQuery,
-			},
-			{
-				...segmentsOptions,
-				//@ts-expect-error This is too clever for the compiler
-				fields: segmentsOptions?.fields
-					? {
-							...segmentsOptions?.fields,
-							_rank: 1,
-							rundownId: 1,
-					  }
-					: undefined,
-				sort: {
-					...segmentsOptions?.sort,
-					rundownId: 1,
-					_rank: 1,
-				},
-			}
-		).fetch()
 
-		const parts = Parts.find(
-			{
-				rundownId: {
-					$in: rundownIds,
-				},
-				...partsQuery,
-			},
-			{
-				...partsOptions,
-				//@ts-expect-error This is too clever for the compiler
-				fields: partsOptions?.fields
-					? {
-							...partsOptions?.fields,
-							rundownId: 1,
-							segmentId: 1,
-							_rank: 1,
-					  }
-					: undefined,
-				sort: {
-					...segmentsOptions?.sort,
-					rundownId: 1,
-					_rank: 1,
-				},
-			}
-		).fetch()
-
-		const sortedSegments = RundownPlaylistCollectionUtil._sortSegments(segments, playlist)
-		return {
-			segments: sortedSegments,
-			parts: RundownPlaylistCollectionUtil._sortPartsInner(parts, sortedSegments),
-		}
-	}
 	static getSelectedPartInstances(
 		playlist: Pick<DBRundownPlaylist, '_id' | 'currentPartInfo' | 'previousPartInfo' | 'nextPartInfo'>,
 		rundownIds0?: RundownId[]
@@ -256,7 +109,7 @@ export class RundownPlaylistCollectionUtil {
 		])
 		const instances =
 			ids.length > 0
-				? PartInstances.find({
+				? UIPartInstances.find({
 						rundownId: { $in: unorderedRundownIds },
 						_id: { $in: ids },
 						reset: { $ne: true },
@@ -277,7 +130,7 @@ export class RundownPlaylistCollectionUtil {
 	): PartInstance[] {
 		const unorderedRundownIds = RundownPlaylistCollectionUtil.getRundownUnorderedIDs(playlist)
 
-		return PartInstances.find(
+		return UIPartInstances.find(
 			{
 				rundownId: { $in: unorderedRundownIds },
 				...selector,
@@ -298,14 +151,14 @@ export class RundownPlaylistCollectionUtil {
 			...selector,
 			reset: { $ne: true },
 		}
-		return RundownPlaylistCollectionUtil.getAllPartInstances(playlist, newSelector, options)
+		return RundownPlaylistClientUtil.getAllPartInstances(playlist, newSelector, options)
 	}
 	static getActivePartInstancesMap(
 		playlist: Pick<DBRundownPlaylist, '_id'>,
 		selector?: MongoQuery<PartInstance>,
 		options?: FindOptions<PartInstance>
 	): Record<string, PartInstance> {
-		const instances = RundownPlaylistCollectionUtil.getActivePartInstances(playlist, selector, options)
+		const instances = RundownPlaylistClientUtil.getActivePartInstances(playlist, selector, options)
 		return normalizeArrayFunc(instances, (i) => unprotectString(i.part._id))
 	}
 	static getPiecesForParts(
@@ -369,4 +222,94 @@ export class RundownPlaylistCollectionUtil {
 	): P[] {
 		return sortPartsInSortedSegments(parts, sortedSegments)
 	}
+
+	static getUnorderedParts(
+		playlist: Pick<DBRundownPlaylist, '_id'>,
+		selector?: MongoQuery<DBPart>,
+		options?: FindOptions<DBPart>
+	): DBPart[] {
+		const rundownIds = RundownPlaylistCollectionUtil.getRundownUnorderedIDs(playlist)
+		const parts = UIParts.find(
+			{
+				...selector,
+				rundownId: {
+					$in: rundownIds,
+				},
+			},
+			{
+				...options,
+				sort: {
+					rundownId: 1,
+					_rank: 1,
+				},
+			}
+		).fetch()
+		return parts
+	}
+	/** Synchronous version of getSegmentsAndParts, to be used client-side */
+	static getSegmentsAndPartsSync(
+		playlist: Pick<DBRundownPlaylist, '_id' | 'rundownIdsInOrder'>,
+		segmentsQuery?: MongoQuery<DBSegment>,
+		partsQuery?: MongoQuery<DBPart>,
+		segmentsOptions?: Omit<FindOptions<DBSegment>, 'projection'>, // We are mangling fields, so block projection
+		partsOptions?: Omit<FindOptions<DBPart>, 'projection'> // We are mangling fields, so block projection
+	): { segments: DBSegment[]; parts: DBPart[] } {
+		const rundownIds = RundownPlaylistCollectionUtil.getRundownUnorderedIDs(playlist)
+		const segments = Segments.find(
+			{
+				rundownId: {
+					$in: rundownIds,
+				},
+				...segmentsQuery,
+			},
+			{
+				...segmentsOptions,
+				//@ts-expect-error This is too clever for the compiler
+				fields: segmentsOptions?.fields
+					? {
+							...segmentsOptions?.fields,
+							_rank: 1,
+							rundownId: 1,
+					  }
+					: undefined,
+				sort: {
+					...segmentsOptions?.sort,
+					rundownId: 1,
+					_rank: 1,
+				},
+			}
+		).fetch()
+
+		const parts = UIParts.find(
+			{
+				rundownId: {
+					$in: rundownIds,
+				},
+				...partsQuery,
+			},
+			{
+				...partsOptions,
+				//@ts-expect-error This is too clever for the compiler
+				fields: partsOptions?.fields
+					? {
+							...partsOptions?.fields,
+							rundownId: 1,
+							segmentId: 1,
+							_rank: 1,
+					  }
+					: undefined,
+				sort: {
+					...segmentsOptions?.sort,
+					rundownId: 1,
+					_rank: 1,
+				},
+			}
+		).fetch()
+
+		const sortedSegments = RundownPlaylistClientUtil._sortSegments(segments, playlist)
+		return {
+			segments: sortedSegments,
+			parts: RundownPlaylistClientUtil._sortPartsInner(parts, sortedSegments),
+		}
+	}
 }
diff --git a/meteor/client/lib/rundownTiming.ts b/packages/webui/src/client/lib/rundownTiming.ts
similarity index 78%
rename from meteor/client/lib/rundownTiming.ts
rename to packages/webui/src/client/lib/rundownTiming.ts
index fd9b06c37f..56cac1317c 100644
--- a/meteor/client/lib/rundownTiming.ts
+++ b/packages/webui/src/client/lib/rundownTiming.ts
@@ -11,18 +11,21 @@
  * without knowing what particular case you are trying to solve.
  */
 
-import { PartId, PartInstanceId, SegmentId } from '@sofie-automation/corelib/dist/dataModel/Ids'
+import { PartId, PartInstanceId, SegmentId, SegmentPlayoutId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import { literal } from '@sofie-automation/corelib/dist/lib'
 import { PlaylistTiming } from '@sofie-automation/corelib/dist/playout/rundownTiming'
-import { calculatePartInstanceExpectedDurationWithPreroll } from '@sofie-automation/corelib/dist/playout/timings'
+import { calculatePartInstanceExpectedDurationWithTransition } from '@sofie-automation/corelib/dist/playout/timings'
 import { unprotectString } from '@sofie-automation/corelib/dist/protectedString'
-import { PartInstance } from '../../lib/collections/PartInstances'
+import { PartInstance } from '@sofie-automation/meteor-lib/dist/collections/PartInstances'
 import { DBPart } from '@sofie-automation/corelib/dist/dataModel/Part'
-import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
-import { getCurrentTime, objectFromEntries } from '../../lib/lib'
-import { Settings } from '../../lib/Settings'
+import { DBRundownPlaylist, QuickLoopMarkerType } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
+import { objectFromEntries } from '@sofie-automation/shared-lib/dist/lib/lib'
+import { getCurrentTime } from './systemTime'
+import { Settings } from '../lib/Settings'
 import { Rundown } from '@sofie-automation/corelib/dist/dataModel/Rundown'
 import { DBSegment } from '@sofie-automation/corelib/dist/dataModel/Segment'
+import { CountdownType } from '@sofie-automation/blueprints-integration'
+import { isLoopDefined, isEntirePlaylistLooping, isLoopRunning } from '../lib/RundownResolver'
 
 // Minimum duration that a part can be assigned. Used by gap parts to allow them to "compress" to indicate time running out.
 const MINIMAL_NONZERO_DURATION = 1
@@ -34,7 +37,7 @@ interface BreakProps {
 
 type CalculateTimingsPartInstance = Pick<
 	PartInstance,
-	'_id' | 'isTemporary' | 'segmentId' | 'orphaned' | 'timings' | 'part'
+	'_id' | 'isTemporary' | 'segmentId' | 'segmentPlayoutId' | 'orphaned' | 'timings' | 'part'
 >
 
 export type TimingId = string
@@ -63,8 +66,6 @@ export class RundownTimingCalculator {
 	private partDisplayDurations: Record<TimingId, number> = {}
 	private partDisplayDurationsNoPlayback: Record<TimingId, number> = {}
 	private displayDurationGroups: Record<string, number> = {}
-	private segmentBudgetDurations: Record<string, number> = {}
-	private segmentStartedPlayback: Record<string, number> = {}
 	private segmentAsPlayedDurations: Record<string, number> = {}
 	private breakProps: {
 		props: BreakProps | undefined
@@ -86,7 +87,6 @@ export class RundownTimingCalculator {
 	 * @param {CalculateTimingsPartInstance[]} partInstances
 	 * @param {Map<PartId, CalculateTimingsPartInstance>} partInstancesMap
 	 * @param {number} [defaultDuration]
-	 * @param {CalculateTimingsPartInstance[]} segmentEntryPartInstances
 	 * @return {*}  {RundownTimingContext}
 	 * @memberof RundownTimingCalculator
 	 */
@@ -101,35 +101,30 @@ export class RundownTimingCalculator {
 		segmentsMap: Map<SegmentId, DBSegment>,
 		/** Fallback duration for Parts that have no as-played duration of their own. */
 		defaultDuration: number = Settings.defaultDisplayDuration,
-		/** The first played-out PartInstance in the current playing segment and
-		 * optionally the first played-out PartInstance in the previously playing segment if the
-		 * previousPartInstance of the current RundownPlaylist is from a different Segment than
-		 * the currentPartInstance.
-		 *
-		 * This is being used for calculating Segment Duration Budget */
-		segmentEntryPartInstances: CalculateTimingsPartInstance[]
+		partsInQuickLoop: Record<TimingId, boolean>
 	): RundownTimingContext {
 		let totalRundownDuration = 0
 		let remainingRundownDuration = 0
 		let asPlayedRundownDuration = 0
 		let asDisplayedRundownDuration = 0
+		// the "wait" for a part is defined as its asPlayedDuration or its displayDuration or its expectedDuration
+		const waitPerPart: Record<string, number> = {}
 		let waitAccumulator = 0
 		let currentRemaining = 0
 		let startsAtAccumulator = 0
 		let displayStartsAtAccumulator = 0
 		let segmentDisplayDuration = 0
 		let segmentBudgetDurationLeft = 0
+		let remainingBudgetOnCurrentSegment: undefined | number
 
 		const rundownExpectedDurations: Record<string, number> = {}
 		const rundownAsPlayedDurations: Record<string, number> = {}
 
 		let rundownsBeforeNextBreak: Rundown[] | undefined
 		let breakIsLastRundown: boolean | undefined
-		let liveSegmentId: SegmentId | undefined
+		let liveSegmentIds: { segmentId: SegmentId; segmentPlayoutId: SegmentPlayoutId } | undefined
 
 		Object.keys(this.displayDurationGroups).forEach((key) => delete this.displayDurationGroups[key])
-		Object.keys(this.segmentBudgetDurations).forEach((key) => delete this.segmentBudgetDurations[key])
-		Object.keys(this.segmentStartedPlayback).forEach((key) => delete this.segmentStartedPlayback[key])
 		Object.keys(this.segmentAsPlayedDurations).forEach((key) => delete this.segmentAsPlayedDurations[key])
 		this.untimedSegments.clear()
 		this.linearParts.length = 0
@@ -137,7 +132,7 @@ export class RundownTimingCalculator {
 		let nextAIndex = -1
 		let currentAIndex = -1
 
-		let lastSegmentId: SegmentId | undefined = undefined
+		let lastSegmentIds: { segmentId: SegmentId; segmentPlayoutId: SegmentPlayoutId } | undefined = undefined
 		let nextRundownAnchor: number | undefined = undefined
 
 		if (playlist) {
@@ -152,37 +147,42 @@ export class RundownTimingCalculator {
 				this.nextSegmentId = undefined
 			}
 
-			partInstances.forEach((partInstance) => {
-				const origPart = partInstance.part
-				if (origPart.budgetDuration !== undefined) {
-					const segmentId = unprotectString(origPart.segmentId)
-					if (this.segmentBudgetDurations[segmentId] !== undefined) {
-						this.segmentBudgetDurations[unprotectString(origPart.segmentId)] += origPart.budgetDuration
-					} else {
-						this.segmentBudgetDurations[unprotectString(origPart.segmentId)] = origPart.budgetDuration
-					}
-				}
-			})
-
-			segmentEntryPartInstances.forEach((partInstance) => {
-				if (partInstance.timings?.reportedStartedPlayback !== undefined)
-					this.segmentStartedPlayback[unprotectString(partInstance.segmentId)] =
-						partInstance.timings?.reportedStartedPlayback
-			})
-
 			partInstances.forEach((partInstance, itIndex) => {
 				const partId = partInstance.part._id
 				const partInstanceId = !partInstance.isTemporary ? partInstance._id : null
 				const partInstanceOrPartId = unprotectString(partInstanceId ?? partId)
-
-				if (partInstance.segmentId !== lastSegmentId) {
+				const partsSegment = segmentsMap.get(partInstance.segmentId)
+				const segmentBudget = partsSegment?.segmentTiming?.budgetDuration
+				const segmentUsesBudget = segmentBudget !== undefined
+				// note: lastStartedPlayback that lies in the future means it hasn't started yet (like from autonext)
+				const lastStartedPlayback =
+					(partInstance.timings?.plannedStartedPlayback ?? 0) <= now
+						? partInstance.timings?.plannedStartedPlayback
+						: undefined
+
+				if (!lastSegmentIds || partInstance.segmentId !== lastSegmentIds.segmentId) {
 					this.untimedSegments.add(partInstance.segmentId)
-					lastSegmentId = partInstance.segmentId
+					if (liveSegmentIds && lastSegmentIds && lastSegmentIds.segmentId === liveSegmentIds.segmentId) {
+						const liveSegment = segmentsMap.get(liveSegmentIds.segmentId)
+
+						if (liveSegment?.segmentTiming?.countdownType === CountdownType.SEGMENT_BUDGET_DURATION) {
+							remainingBudgetOnCurrentSegment =
+								(playlist.segmentsStartedPlayback?.[unprotectString(liveSegmentIds.segmentPlayoutId)] ??
+									lastStartedPlayback ??
+									now) +
+								(liveSegment.segmentTiming.budgetDuration ?? 0) -
+								now
+						}
+					}
 					segmentDisplayDuration = 0
 					if (segmentBudgetDurationLeft > 0) {
 						waitAccumulator += segmentBudgetDurationLeft
 					}
-					segmentBudgetDurationLeft = this.segmentBudgetDurations[unprotectString(partInstance.segmentId)]
+					segmentBudgetDurationLeft = segmentBudget ?? 0
+					lastSegmentIds = {
+						segmentId: partInstance.segmentId,
+						segmentPlayoutId: partInstance.segmentPlayoutId,
+					}
 				}
 
 				// add piece to accumulator
@@ -194,7 +194,10 @@ export class RundownTimingCalculator {
 					this.nextSegmentId = partInstance.segmentId
 				} else if (playlist.currentPartInfo?.partInstanceId === partInstance._id) {
 					currentAIndex = aIndex
-					liveSegmentId = partInstance.segmentId
+					liveSegmentIds = {
+						segmentId: partInstance.segmentId,
+						segmentPlayoutId: partInstance.segmentPlayoutId,
+					}
 				}
 
 				const partCounts =
@@ -203,9 +206,6 @@ export class RundownTimingCalculator {
 					(itIndex >= currentAIndex && currentAIndex >= 0) ||
 					(itIndex >= nextAIndex && nextAIndex >= 0 && currentAIndex === -1)
 
-				const segmentUsesBudget =
-					this.segmentBudgetDurations[unprotectString(partInstance.segmentId)] !== undefined
-
 				const partIsUntimed = partInstance.part.untimed || false
 
 				if (!partIsUntimed) {
@@ -216,10 +216,9 @@ export class RundownTimingCalculator {
 				// if the Part is using budgetDuration, this budget is calculated when going through all the segments
 				// in the Rundown (see further down)
 				if (!segmentUsesBudget && !partIsUntimed) {
-					totalRundownDuration += calculatePartInstanceExpectedDurationWithPreroll(partInstance) || 0
+					totalRundownDuration += calculatePartInstanceExpectedDurationWithTransition(partInstance) || 0
 				}
 
-				const lastStartedPlayback = partInstance.timings?.plannedStartedPlayback
 				const playOffset = partInstance.timings?.playOffset || 0
 
 				let partDuration = 0
@@ -230,7 +229,7 @@ export class RundownTimingCalculator {
 				let displayDurationFromGroup = 0
 
 				partExpectedDuration =
-					calculatePartInstanceExpectedDurationWithPreroll(partInstance) ||
+					calculatePartInstanceExpectedDurationWithTransition(partInstance) ||
 					partInstance.timings?.duration ||
 					0
 
@@ -254,7 +253,7 @@ export class RundownTimingCalculator {
 				) {
 					this.displayDurationGroups[partInstance.part.displayDurationGroup] =
 						(this.displayDurationGroups[partInstance.part.displayDurationGroup] || 0) +
-						(calculatePartInstanceExpectedDurationWithPreroll(partInstance) || 0)
+						(calculatePartInstanceExpectedDurationWithTransition(partInstance) || 0)
 					displayDurationFromGroup =
 						partInstance.part.displayDuration ||
 						Math.max(
@@ -278,7 +277,7 @@ export class RundownTimingCalculator {
 							: undefined)
 					partDuration =
 						Math.max(
-							duration || calculatePartInstanceExpectedDurationWithPreroll(partInstance) || 0,
+							duration || calculatePartInstanceExpectedDurationWithTransition(partInstance) || 0,
 							now - lastStartedPlayback
 						) - playOffset
 					// because displayDurationGroups have no actual timing on them, we need to have a copy of the
@@ -288,20 +287,19 @@ export class RundownTimingCalculator {
 						duration ||
 						(memberOfDisplayDurationGroup
 							? displayDurationFromGroup
-							: calculatePartInstanceExpectedDurationWithPreroll(partInstance)) ||
+							: calculatePartInstanceExpectedDurationWithTransition(partInstance)) ||
 						defaultDuration
 					partDisplayDuration = Math.max(partDisplayDurationNoPlayback, now - lastStartedPlayback)
 					this.partPlayed[partInstanceOrPartId] = now - lastStartedPlayback
 					const segmentStartedPlayback =
-						this.segmentStartedPlayback[unprotectString(partInstance.segmentId)] || lastStartedPlayback
+						playlist.segmentsStartedPlayback?.[unprotectString(partInstance.segmentPlayoutId)] ??
+						lastStartedPlayback
 
 					// NOTE: displayDurationGroups are ignored here, when using budgetDuration
 					if (segmentUsesBudget) {
 						currentRemaining = Math.max(
 							0,
-							this.segmentBudgetDurations[unprotectString(partInstance.segmentId)] -
-								segmentDisplayDuration -
-								(now - segmentStartedPlayback)
+							segmentBudget - segmentDisplayDuration - (now - segmentStartedPlayback)
 						)
 						segmentBudgetDurationLeft = 0
 					} else {
@@ -310,7 +308,7 @@ export class RundownTimingCalculator {
 							(duration ||
 								(memberOfDisplayDurationGroup
 									? displayDurationFromGroup
-									: calculatePartInstanceExpectedDurationWithPreroll(partInstance)) ||
+									: calculatePartInstanceExpectedDurationWithTransition(partInstance)) ||
 								0) -
 								(now - lastStartedPlayback)
 						)
@@ -318,7 +316,7 @@ export class RundownTimingCalculator {
 				} else {
 					partDuration =
 						(partInstance.timings?.duration ||
-							calculatePartInstanceExpectedDurationWithPreroll(partInstance) ||
+							calculatePartInstanceExpectedDurationWithTransition(partInstance) ||
 							0) - playOffset
 					partDisplayDurationNoPlayback = Math.max(
 						0,
@@ -326,7 +324,7 @@ export class RundownTimingCalculator {
 							displayDurationFromGroup ||
 							ensureMinimumDefaultDurationIfNotAuto(
 								partInstance,
-								calculatePartInstanceExpectedDurationWithPreroll(partInstance),
+								calculatePartInstanceExpectedDurationWithTransition(partInstance),
 								defaultDuration
 							)
 					)
@@ -349,7 +347,7 @@ export class RundownTimingCalculator {
 							valToAddToAsPlayedDuration = partInstance.timings.duration
 						} else if (partCounts) {
 							valToAddToAsPlayedDuration =
-								calculatePartInstanceExpectedDurationWithPreroll(partInstance) || 0
+								calculatePartInstanceExpectedDurationWithTransition(partInstance) || 0
 						}
 
 						asPlayedRundownDuration += valToAddToAsPlayedDuration
@@ -386,15 +384,15 @@ export class RundownTimingCalculator {
 						memberOfDisplayDurationGroup
 							? Math.max(
 									partExpectedDuration,
-									calculatePartInstanceExpectedDurationWithPreroll(partInstance) || 0
+									calculatePartInstanceExpectedDurationWithTransition(partInstance) || 0
 							  )
-							: calculatePartInstanceExpectedDurationWithPreroll(partInstance) || 0,
+							: calculatePartInstanceExpectedDurationWithTransition(partInstance) || 0,
 						now - lastStartedPlayback
 					)
 				} else {
 					asDisplayedRundownDuration +=
 						partInstance.timings?.duration ||
-						calculatePartInstanceExpectedDurationWithPreroll(partInstance) ||
+						calculatePartInstanceExpectedDurationWithTransition(partInstance) ||
 						0
 				}
 
@@ -437,19 +435,22 @@ export class RundownTimingCalculator {
 					waitDuration =
 						partInstance.timings?.duration ||
 						partDisplayDuration ||
-						calculatePartInstanceExpectedDurationWithPreroll(partInstance) ||
+						calculatePartInstanceExpectedDurationWithTransition(partInstance) ||
 						0
 				} else {
 					waitDuration =
 						partInstance.timings?.duration ||
-						calculatePartInstanceExpectedDurationWithPreroll(partInstance) ||
+						calculatePartInstanceExpectedDurationWithTransition(partInstance) ||
 						0
 				}
 				if (segmentUsesBudget) {
-					waitAccumulator += Math.min(waitDuration, Math.max(segmentBudgetDurationLeft, 0))
+					const wait = Math.min(waitDuration, Math.max(segmentBudgetDurationLeft, 0))
+					waitAccumulator += wait
 					segmentBudgetDurationLeft -= waitDuration
+					waitPerPart[unprotectString(partId)] = wait + Math.max(0, segmentBudgetDurationLeft)
 				} else {
 					waitAccumulator += waitDuration
+					waitPerPart[unprotectString(partId)] = waitDuration
 				}
 
 				// remaining is the sum of unplayed lines + whatever is left of the current segment
@@ -466,7 +467,8 @@ export class RundownTimingCalculator {
 						// this needs to use partInstance.part.expectedDuration as opposed to partExpectedDuration, because
 						// partExpectedDuration is affected by displayGroups, and if it hasn't played yet then it shouldn't
 						// add any duration to the "remaining" time pool
-						remainingRundownDuration += calculatePartInstanceExpectedDurationWithPreroll(partInstance) || 0
+						remainingRundownDuration +=
+							calculatePartInstanceExpectedDurationWithTransition(partInstance) || 0
 						// item is onAir right now, and it's is currently shorter than expectedDuration
 					} else if (
 						lastStartedPlayback &&
@@ -489,13 +491,15 @@ export class RundownTimingCalculator {
 			})
 
 			// This is where the waitAccumulator-generated data in the linearSegLines is used to calculate the countdowns.
+			// at this point the "waitAccumulator" should be the total sum of all the "waits" in the rundown
 			let localAccum = 0
+			let timeTillEndLoop: undefined | number = undefined
 			for (let i = 0; i < this.linearParts.length; i++) {
 				if (i < nextAIndex) {
 					// this is a line before next line
 					localAccum = this.linearParts[i][1] || 0
 					// only null the values if not looping, if looping, these will be offset by the countdown for the last part
-					if (!playlist.loop) {
+					if (!partsInQuickLoop[unprotectString(this.linearParts[i][0])]) {
 						this.linearParts[i][1] = null // we use null to express 'will not probably be played out, if played in order'
 					}
 				} else if (i === currentAIndex) {
@@ -526,6 +530,11 @@ export class RundownTimingCalculator {
 					// and add the currentRemaining countdown, since we are currentRemaining + diff between next and
 					// this away from this line.
 					this.linearParts[i][1] = (this.linearParts[i][1] || 0) - localAccum + currentRemaining
+
+					if (!partsInQuickLoop[unprotectString(this.linearParts[i][0])]) {
+						timeTillEndLoop = timeTillEndLoop ?? this.linearParts[i][1] ?? undefined
+					}
+
 					if (nextRundownAnchor === undefined) {
 						nextRundownAnchor = getSegmentRundownAnchorFromPart(
 							this.linearParts[i][0],
@@ -536,12 +545,22 @@ export class RundownTimingCalculator {
 					}
 				}
 			}
-			// contiunation of linearParts calculations for looping playlists
-			if (playlist.loop) {
+			// at this point the localAccumulator should be the sum of waits before the next line
+			// continuation of linearParts calculations for looping playlists
+			if (isLoopRunning(playlist)) {
+				// we track the sum of all the "waits" that happen in the loop
+				let waitInLoop = 0
+				// if timeTillEndLoop was undefined then we can assume the end of the loop is the last line in the rundown
+				timeTillEndLoop = timeTillEndLoop ?? waitAccumulator - localAccum + currentRemaining
 				for (let i = 0; i < nextAIndex; i++) {
-					// offset the parts before the on air line by the countdown for the end of the rundown
-					this.linearParts[i][1] =
-						(this.linearParts[i][1] || 0) + waitAccumulator - localAccum + currentRemaining
+					if (!partsInQuickLoop[unprotectString(this.linearParts[i][0])]) continue
+
+					// this countdown is the wait until the loop ends + whatever waits occur before this part but inside the loop
+					this.linearParts[i][1] = timeTillEndLoop + waitInLoop
+
+					// add the wait from this part to the waitInLoop (the lookup here should still work by the definition of a "wait")
+					waitInLoop += waitPerPart[unprotectString(this.linearParts[i][0])] ?? 0
+
 					if (nextRundownAnchor === undefined) {
 						nextRundownAnchor = getSegmentRundownAnchorFromPart(
 							this.linearParts[i][0],
@@ -561,7 +580,7 @@ export class RundownTimingCalculator {
 				if (segment._id === this.nextSegmentId) {
 					nextSegmentIndex = itIndex
 				}
-				const segmentBudgetDuration = this.segmentBudgetDurations[unprotectString(segment._id)]
+				const segmentBudgetDuration = segment.segmentTiming?.budgetDuration
 
 				// If all of the Parts in a Segment are untimed, do not consider the Segment for
 				// Playlist Remaining and As-Played durations.
@@ -571,8 +590,9 @@ export class RundownTimingCalculator {
 
 				let valToAddToRundownAsPlayedDuration = 0
 				let valToAddToRundownRemainingDuration = 0
-				if (segment._id === liveSegmentId) {
-					const startedPlayback = this.segmentStartedPlayback[unprotectString(segment._id)]
+				if (liveSegmentIds && segment._id === liveSegmentIds.segmentId) {
+					const startedPlayback =
+						playlist.segmentsStartedPlayback?.[unprotectString(liveSegmentIds.segmentPlayoutId)]
 					valToAddToRundownRemainingDuration = Math.max(
 						0,
 						segmentBudgetDuration - (startedPlayback ? now - startedPlayback : 0)
@@ -597,6 +617,7 @@ export class RundownTimingCalculator {
 
 		let remainingTimeOnCurrentPart: number | undefined = undefined
 		let currentPartWillAutoNext = false
+		let currentSegmentId: SegmentId | null | undefined
 		if (currentAIndex >= 0) {
 			const currentLivePartInstance = partInstances[currentAIndex]
 			const currentLivePart = currentLivePartInstance.part
@@ -605,7 +626,7 @@ export class RundownTimingCalculator {
 
 			let onAirPartDuration =
 				currentLivePartInstance.timings?.duration ||
-				calculatePartInstanceExpectedDurationWithPreroll(currentLivePartInstance) ||
+				calculatePartInstanceExpectedDurationWithTransition(currentLivePartInstance) ||
 				0
 			if (
 				currentLivePart.displayDurationGroup &&
@@ -622,10 +643,13 @@ export class RundownTimingCalculator {
 					: onAirPartDuration
 
 			currentPartWillAutoNext = !!(currentLivePart.autoNext && currentLivePart.expectedDuration)
+
+			currentSegmentId = currentLivePart.segmentId
 		}
 
 		return literal<RundownTimingContext>({
 			currentPartInstanceId: playlist ? playlist.currentPartInfo?.partInstanceId ?? null : undefined,
+			currentSegmentId: currentSegmentId,
 			totalPlaylistDuration: totalRundownDuration,
 			remainingPlaylistDuration: remainingRundownDuration,
 			asDisplayedPlaylistDuration: asDisplayedRundownDuration,
@@ -639,15 +663,15 @@ export class RundownTimingCalculator {
 			partDisplayStartsAt: this.partDisplayStartsAt,
 			partExpectedDurations: this.partExpectedDurations,
 			partDisplayDurations: this.partDisplayDurations,
-			segmentBudgetDurations: this.segmentBudgetDurations,
-			segmentStartedPlayback: this.segmentStartedPlayback,
 			currentTime: now,
 			remainingTimeOnCurrentPart,
+			remainingBudgetOnCurrentSegment,
 			currentPartWillAutoNext,
 			rundownsBeforeNextBreak,
 			breakIsLastRundown,
 			isLowResolution,
 			nextRundownAnchor,
+			partsInQuickLoop,
 		})
 	}
 
@@ -695,6 +719,8 @@ export class RundownTimingCalculator {
 export interface RundownTimingContext {
 	/** This stores the part instance that was active when this timing information was generated. */
 	currentPartInstanceId?: PartInstanceId | null
+	/** This stores the id of the segment that was active when this timing information was generated. */
+	currentSegmentId?: SegmentId | null
 	/** This is the total duration of the playlist as planned (using expectedDurations). */
 	totalPlaylistDuration?: number
 	/** This is the content remaining to be played in the playlist (based on the expectedDurations).  */
@@ -711,6 +737,8 @@ export interface RundownTimingContext {
 	partCountdown?: Record<string, number | null>
 	/** The calculated durations of each of the Parts: as-planned/as-run depending on state. */
 	partDurations?: Record<string, number>
+	/** Whether a Part (or Part Instance) is within the QuickLoop */
+	partsInQuickLoop?: Record<string, boolean>
 	/** The offset of each of the Parts from the beginning of the Playlist. */
 	partStartsAt?: Record<string, number>
 	/** Same as partStartsAt, but will include display duration overrides
@@ -729,12 +757,10 @@ export interface RundownTimingContext {
 	 * if the Part does not have an expected duration.
 	 */
 	partExpectedDurations?: Record<string, number>
-	/** Budget durations of segments (sum of parts budget durations). */
-	segmentBudgetDurations?: Record<string, number>
-	/** Time when selected segments started playback. Contains only the current segment and the segment before, if we've just entered a new one */
-	segmentStartedPlayback?: Record<string, number>
 	/** Remaining time on current part */
 	remainingTimeOnCurrentPart?: number
+	/** Remaining budget on current segment, if its countdownType === CountdownType.SEGMENT_BUDGET_DURATION, undefined otherwise */
+	remainingBudgetOnCurrentSegment?: number | undefined
 	/** Current part will autoNext */
 	currentPartWillAutoNext?: boolean
 	/** Current time of this calculation */
@@ -893,3 +919,65 @@ function getSegmentRundownAnchorFromPart(
 
 	return nextRundownAnchor
 }
+
+export type MinimalPartInstance = Pick<
+	PartInstance,
+	| '_id'
+	| 'isTemporary'
+	| 'rundownId'
+	| 'segmentId'
+	| 'segmentPlayoutId'
+	| 'takeCount'
+	| 'part'
+	| 'timings'
+	| 'orphaned'
+>
+
+export function findPartInstancesInQuickLoop(
+	playlist: DBRundownPlaylist,
+	sortedPartInstances: MinimalPartInstance[]
+): Record<TimingId, boolean> {
+	if (!isLoopDefined(playlist) || isEntirePlaylistLooping(playlist)) {
+		return {}
+	}
+
+	const partsInQuickLoop: Record<TimingId, boolean> = {}
+	let isInQuickLoop = playlist.quickLoop?.start?.type === QuickLoopMarkerType.PLAYLIST
+	let previousPartInstance: MinimalPartInstance | undefined = undefined
+	for (const partInstance of sortedPartInstances) {
+		if (
+			previousPartInstance &&
+			((playlist.quickLoop?.end?.type === QuickLoopMarkerType.PART &&
+				playlist.quickLoop.end.id === previousPartInstance.part._id) ||
+				(playlist.quickLoop?.end?.type === QuickLoopMarkerType.SEGMENT &&
+					playlist.quickLoop.end.id === previousPartInstance.segmentId) ||
+				(playlist.quickLoop?.end?.type === QuickLoopMarkerType.RUNDOWN &&
+					playlist.quickLoop.end.id === previousPartInstance.rundownId))
+		) {
+			isInQuickLoop = false
+			if (
+				playlist.quickLoop.start?.type !== QuickLoopMarkerType.PART ||
+				playlist.quickLoop.start?.id !== playlist.quickLoop.end?.id
+			) {
+				// when looping over a single part we need to include the three instances of that part shown at once, otherwise, we can break
+				break
+			}
+		}
+		if (
+			!isInQuickLoop &&
+			((playlist.quickLoop?.start?.type === QuickLoopMarkerType.PART &&
+				playlist.quickLoop.start.id === partInstance.part._id) ||
+				(playlist.quickLoop?.start?.type === QuickLoopMarkerType.SEGMENT &&
+					playlist.quickLoop.start.id === partInstance.segmentId) ||
+				(playlist.quickLoop?.start?.type === QuickLoopMarkerType.RUNDOWN &&
+					playlist.quickLoop.start.id === partInstance.rundownId))
+		) {
+			isInQuickLoop = true
+		}
+		if (isInQuickLoop) {
+			partsInQuickLoop[getPartInstanceTimingId(partInstance)] = true
+		}
+		previousPartInstance = partInstance
+	}
+	return partsInQuickLoop
+}
diff --git a/meteor/client/lib/shelf.ts b/packages/webui/src/client/lib/shelf.ts
similarity index 79%
rename from meteor/client/lib/shelf.ts
rename to packages/webui/src/client/lib/shelf.ts
index 5342c8fc59..7d30b95616 100644
--- a/meteor/client/lib/shelf.ts
+++ b/packages/webui/src/client/lib/shelf.ts
@@ -1,19 +1,17 @@
-import { IOutputLayer, ISourceLayer } from '@sofie-automation/blueprints-integration'
 import _ from 'underscore'
-import { AdLibAction } from '@sofie-automation/corelib/dist/dataModel/AdlibAction'
-import { AdLibPiece } from '@sofie-automation/corelib/dist/dataModel/AdLibPiece'
-import { PartInstance } from '../../lib/collections/PartInstances'
+import { PartInstance } from '@sofie-automation/meteor-lib/dist/collections/PartInstances'
 import { PieceInstance } from '@sofie-automation/corelib/dist/dataModel/PieceInstance'
-import { RundownBaselineAdLibAction } from '@sofie-automation/corelib/dist/dataModel/RundownBaselineAdLibAction'
 import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
 import { DBSegment } from '@sofie-automation/corelib/dist/dataModel/Segment'
 import { processAndPrunePieceInstanceTimings } from '@sofie-automation/corelib/dist/playout/processAndPrune'
 import { getUnfinishedPieceInstancesReactive } from './rundownLayouts'
-import { UIShowStyleBase } from '../../lib/api/showStyles'
-import { PieceId, SegmentId } from '@sofie-automation/corelib/dist/dataModel/Ids'
+import { UIShowStyleBase } from '@sofie-automation/meteor-lib/dist/api/showStyles'
+import { PieceId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import { PieceInstances } from '../collections'
 import { ReadonlyDeep } from 'type-fest'
-import { PieceContentStatusObj } from '../../lib/api/pieceContentStatus'
+import { AdLibPieceUi } from '@sofie-automation/meteor-lib/dist/uiTypes/Adlib'
+
+export type { AdLibPieceUi } from '@sofie-automation/meteor-lib/dist/uiTypes/Adlib'
 
 export interface ShelfDisplayOptions {
 	enableBuckets: boolean
@@ -21,22 +19,6 @@ export interface ShelfDisplayOptions {
 	enableInspector: boolean
 }
 
-export interface AdLibPieceUi extends Omit<AdLibPiece, 'timelineObjectsString'> {
-	hotkey?: string
-	sourceLayer?: ISourceLayer
-	outputLayer?: IOutputLayer
-	isGlobal?: boolean
-	isHidden?: boolean
-	isSticky?: boolean
-	isAction?: boolean
-	isClearSourceLayer?: boolean
-	disabled?: boolean
-	adlibAction?: AdLibAction | RundownBaselineAdLibAction
-	segmentId?: SegmentId
-
-	contentStatus?: ReadonlyDeep<PieceContentStatusObj>
-}
-
 export interface AdlibSegmentUi extends DBSegment {
 	/** Pieces belonging to this part */
 	parts: Array<PartInstance>
diff --git a/meteor/client/lib/speechSynthesis.ts b/packages/webui/src/client/lib/speechSynthesis.ts
similarity index 100%
rename from meteor/client/lib/speechSynthesis.ts
rename to packages/webui/src/client/lib/speechSynthesis.ts
diff --git a/packages/webui/src/client/lib/systemTime.ts b/packages/webui/src/client/lib/systemTime.ts
new file mode 100644
index 0000000000..03652a24aa
--- /dev/null
+++ b/packages/webui/src/client/lib/systemTime.ts
@@ -0,0 +1,141 @@
+import { Meteor } from 'meteor/meteor'
+import { logger } from './logging'
+import { MeteorCall } from './meteorApi'
+import { Time } from '@sofie-automation/shared-lib/dist/lib/lib'
+
+export const systemTime = {
+	hasBeenSet: false,
+	diff: 0,
+	stdDev: 9999,
+	lastSync: 0,
+	timeOriginDiff: 0,
+}
+
+/**
+ * Returns the current (synced) time.
+ * If NTP-syncing is enabled, it'll be unaffected of whether the client has a well-synced computer time or not.
+ * @return {Time}
+ */
+export function getCurrentTime(): Time {
+	return Math.floor(Date.now() - systemTime.diff)
+}
+
+/** How often the client should sync its time to the server [ms] */
+const SYNC_TIME = 5 * 60 * 1000 // 5 minutes
+
+/** How much we assume a clock to drift over time [time unit per time unit] */
+const ASSUMED_CLOCK_DRIFT = 5 / (3600 * 24) // We assume 5 seconds drift in a day for the system clock
+
+/** How good time sync quality we should strive for [ms] */
+const TARGET_TIME_SYNC_QUALITY = 50 // 50 milliseconds
+
+/** How often we should check if its time has jumped or been skewed [ms] */
+const JUMP_CHECK_INTERVAL = 10 * 1000 // 10 seconds
+
+export class TimeJumpDetector {
+	private wallTime: number = TimeJumpDetector.getWallTime()
+	private monotonicTime: number = TimeJumpDetector.getMonotonicTime()
+
+	constructor(private jumpCheckInterval: number, private onJumpDetected: (syncDiff: number) => void) {}
+
+	public start(): void {
+		setInterval(() => {
+			if (Meteor.status().connected) {
+				this.detectTimeJump()
+			}
+		}, this.jumpCheckInterval)
+	}
+
+	/** Returns the actual time of the OS, which could be influenced (jump) by an NTP sync. */
+	private static getWallTime() {
+		return Date.now()
+	}
+
+	/** Returns a Monotonic Time, which is not influenced by any NTP-sync  */
+	private static getMonotonicTime() {
+		return performance.now()
+	}
+
+	private detectTimeJump() {
+		const wallTime = TimeJumpDetector.getWallTime()
+		const monotonicTime = TimeJumpDetector.getMonotonicTime()
+		const currentDiff = wallTime - monotonicTime
+		const previousDiff = this.wallTime - this.monotonicTime
+		const syncDiff = currentDiff - previousDiff
+		if (Math.abs(syncDiff) > TARGET_TIME_SYNC_QUALITY) {
+			this.wallTime = wallTime
+			this.monotonicTime = monotonicTime
+			this.onJumpDetected(syncDiff)
+		}
+	}
+}
+
+// fetch time from server:
+const updateDiffTime = (force?: boolean) => {
+	// Calculate an "adjusted standard deviation", something that increases over time.
+	// Using this we can decide wether a new measurement is better or worse than previous one. (the lower, the better)
+	const currentSyncDegradation = systemTime.stdDev + (performance.now() - systemTime.lastSync) * ASSUMED_CLOCK_DRIFT
+
+	// If the sync is assumed to have degraded enough, it's time to resync
+	if (currentSyncDegradation > TARGET_TIME_SYNC_QUALITY || force) {
+		const sentTime = performance.now()
+		MeteorCall.peripheralDevice
+			.getTimeDiff()
+			.then((stat) => {
+				const replyTime = performance.now()
+
+				const diff = Math.round(Date.now() + (sentTime - replyTime) / 2 - stat.currentTime)
+				const stdDev = Math.abs(Math.round(sentTime - replyTime)) / 2 // Not really a standard deviation calculation, but it's what we can do with just one measuring point..
+
+				// Only use the result if the stdDev is better than previous sync quality:
+				if (stdDev <= currentSyncDegradation || force) {
+					// Only trace the result if the diff is different than the previous:
+					if (Math.abs(systemTime.diff - diff) > 10) {
+						logger.verbose(
+							`Time diff set to: ${diff} ms (server stdDev: ${
+								Math.floor(stat.stdDev * 10) / 10
+							} ms, client stdDev: ${stdDev} ms)`
+						)
+					}
+
+					// Store the result into the global variable `systemTime` (used in getCurrentTime()):
+					systemTime.diff = diff
+					systemTime.stdDev = stdDev
+					systemTime.lastSync = performance.now()
+					systemTime.hasBeenSet = true
+					systemTime.timeOriginDiff = getCurrentTime() - (performance.timeOrigin + performance.now())
+				}
+			})
+			.catch((err) => {
+				logger.error(err)
+			})
+	}
+}
+
+Meteor.startup(() => {
+	// Run it once right away:
+	updateDiffTime()
+
+	// Also run it a few seconds in, to get a more accurate reading:
+	Meteor.setTimeout(() => {
+		updateDiffTime()
+	}, 5000)
+
+	// Also run it after 30 seconds, to get an even more accurate reading:
+	Meteor.setTimeout(() => {
+		updateDiffTime()
+	}, 30 * 1000)
+
+	// Then run it on an interval, to ensure it is kept up to date:
+	Meteor.setInterval(() => {
+		if (Meteor.status().connected) {
+			updateDiffTime()
+		}
+	}, SYNC_TIME)
+
+	const timeJumpDetector = new TimeJumpDetector(JUMP_CHECK_INTERVAL, (syncDiff) => {
+		logger.verbose(`Time jump or skew of ${Math.round(syncDiff)} ms detected, resyncing with server.`)
+		updateDiffTime(true)
+	})
+	timeJumpDetector.start()
+})
diff --git a/packages/webui/src/client/lib/tempLib.ts b/packages/webui/src/client/lib/tempLib.ts
new file mode 100644
index 0000000000..494b3d6ce7
--- /dev/null
+++ b/packages/webui/src/client/lib/tempLib.ts
@@ -0,0 +1,34 @@
+/**
+ * This file contains some temporary re-exports of code that has been moved.
+ * It should be removed entirely, but requires a bit of effort to update the hundreds of references to this file.
+ */
+
+// Legacy compatability
+// Note: These have to be named explicity, to satisfy Vite
+export type { Time, TimeDuration } from '@sofie-automation/shared-lib/dist/lib/lib'
+export type { ProtectedString } from '@sofie-automation/shared-lib/dist/lib/protectedString'
+export {
+	protectString,
+	unprotectString,
+	isProtectedString,
+} from '@sofie-automation/shared-lib/dist/lib/protectedString'
+export {
+	stringifyObjects,
+	normalizeArray,
+	clone,
+	assertNever,
+	literal,
+	applyToArray,
+	omit,
+	getRandomId,
+	normalizeArrayToMap,
+	getRandomString,
+	flatten,
+	groupByToMap,
+	groupByToMapFunc,
+	formatDurationAsTimecode,
+	formatDateAsTimecode,
+	generateTranslation,
+} from '@sofie-automation/corelib/dist/lib'
+export type { Complete } from '@sofie-automation/corelib/dist/lib'
+export { LogLevel } from '@sofie-automation/meteor-lib/dist/lib'
diff --git a/meteor/client/lib/triggers/ActionAdLibHotkeyPreview.tsx b/packages/webui/src/client/lib/triggers/ActionAdLibHotkeyPreview.tsx
similarity index 86%
rename from meteor/client/lib/triggers/ActionAdLibHotkeyPreview.tsx
rename to packages/webui/src/client/lib/triggers/ActionAdLibHotkeyPreview.tsx
index 1a8f3c2144..932c3ca39c 100644
--- a/meteor/client/lib/triggers/ActionAdLibHotkeyPreview.tsx
+++ b/packages/webui/src/client/lib/triggers/ActionAdLibHotkeyPreview.tsx
@@ -1,12 +1,16 @@
 import { ISourceLayer } from '@sofie-automation/blueprints-integration'
 import React, { useContext, useState, useEffect } from 'react'
-import { assertNever } from '../../../lib/lib'
+import { assertNever } from '../tempLib'
 import { useTracker } from '../ReactMeteorData/ReactMeteorData'
 import { SorensenContext } from '../SorensenContext'
 import { MountedAdLibTriggers } from './TriggersHandler'
 import { codesToKeyLabels } from './codesToKeyLabels'
 import { AdLibActionId, PieceId, RundownBaselineAdLibActionId } from '@sofie-automation/corelib/dist/dataModel/Ids'
-import { MountedAdLibTrigger, MountedHotkeyMixin } from '../../../lib/api/triggers/MountedTriggers'
+import {
+	MountedAdLibTrigger,
+	MountedAdLibTriggerType,
+	MountedHotkeyMixin,
+} from '@sofie-automation/meteor-lib/dist/api/MountedTriggers'
 import { FindOptions, MongoQuery } from '@sofie-automation/corelib/dist/mongo'
 
 type IProps =
@@ -66,37 +70,37 @@ export const ActionAdLibHotkeyPreview: React.FC<IProps> = function AdLibActionHo
 		switch (props.type) {
 			case 'adLibAction':
 				selector = {
-					type: 'adLibAction',
+					type: MountedAdLibTriggerType.adLibAction,
 					targetId: props.targetId,
 				}
 				break
 			case 'adLibPiece':
 				selector = {
-					type: 'adLibPiece',
+					type: MountedAdLibTriggerType.adLibPiece,
 					targetId: props.targetId,
 				}
 				break
 			case 'rundownBaselineAdLibAction':
 				selector = {
-					type: 'rundownBaselineAdLibAction',
+					type: MountedAdLibTriggerType.rundownBaselineAdLibAction,
 					targetId: props.targetId,
 				}
 				break
 			case 'rundownBaselineAdLibItem':
 				selector = {
-					type: 'rundownBaselineAdLibItem',
+					type: MountedAdLibTriggerType.rundownBaselineAdLibItem,
 					targetId: props.targetId,
 				}
 				break
 			case 'clearSourceLayer':
 				selector = {
-					type: 'clearSourceLayer',
+					type: MountedAdLibTriggerType.clearSourceLayer,
 					targetId: props.targetId,
 				}
 				break
 			case 'sticky':
 				selector = {
-					type: 'sticky',
+					type: MountedAdLibTriggerType.sticky,
 					targetId: props.targetId,
 				}
 				break
diff --git a/meteor/client/lib/triggers/README.md b/packages/webui/src/client/lib/triggers/README.md
similarity index 100%
rename from meteor/client/lib/triggers/README.md
rename to packages/webui/src/client/lib/triggers/README.md
diff --git a/meteor/client/lib/triggers/TriggersHandler.tsx b/packages/webui/src/client/lib/triggers/TriggersHandler.tsx
similarity index 92%
rename from meteor/client/lib/triggers/TriggersHandler.tsx
rename to packages/webui/src/client/lib/triggers/TriggersHandler.tsx
index 75be2eef66..5c28ff8f54 100644
--- a/meteor/client/lib/triggers/TriggersHandler.tsx
+++ b/packages/webui/src/client/lib/triggers/TriggersHandler.tsx
@@ -3,7 +3,7 @@ import { useEffect, useRef, useState } from 'react'
 import { TFunction } from 'i18next'
 import { useTranslation } from 'react-i18next'
 import Sorensen from '@sofie-automation/sorensen'
-import { MeteorPubSub } from '../../../lib/api/pubsub'
+import { MeteorPubSub } from '@sofie-automation/meteor-lib/dist/api/pubsub'
 import { useSubscription, useTracker } from '../ReactMeteorData/ReactMeteorData'
 import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
 import { PlayoutActions, SomeAction, SomeBlueprintTrigger, TriggerType } from '@sofie-automation/blueprints-integration'
@@ -11,43 +11,46 @@ import {
 	isPreviewableAction,
 	ReactivePlaylistActionContext,
 	createAction as libCreateAction,
-} from '../../../lib/api/triggers/actionFactory'
-import { flatten, protectString } from '../../../lib/lib'
-import { IWrappedAdLib } from '../../../lib/api/triggers/actionFilterChainCompilers'
+} from '@sofie-automation/meteor-lib/dist/triggers/actionFactory'
+import { flatten, protectString } from '../tempLib'
+import { IWrappedAdLib } from '@sofie-automation/meteor-lib/dist/triggers/actionFilterChainCompilers'
 import { ReactiveVar } from 'meteor/reactive-var'
 import { preventDefault } from '../SorensenContext'
 import { getFinalKey } from './codesToKeyLabels'
 import RundownViewEventBus, {
 	RundownViewEvents,
 	TriggerActionEvent,
-} from '../../../lib/api/triggers/RundownViewEventBus'
+} from '@sofie-automation/meteor-lib/dist/triggers/RundownViewEventBus'
 import { Tracker } from 'meteor/tracker'
-import { Settings } from '../../../lib/Settings'
-import { createInMemorySyncMongoCollection } from '../../../lib/collections/lib'
+import { Settings } from '../../lib/Settings'
+import { createInMemorySyncMongoCollection } from '../../collections/lib'
 import { RundownPlaylists } from '../../collections'
 import { UIShowStyleBases, UITriggeredActions } from '../../ui/Collections'
-import { UIShowStyleBase } from '../../../lib/api/showStyles'
+import { UIShowStyleBase } from '@sofie-automation/meteor-lib/dist/api/showStyles'
 import {
 	PartId,
 	RundownId,
 	RundownPlaylistId,
 	ShowStyleBaseId,
+	StudioId,
 	TriggeredActionId,
 } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import {
 	MountedAdLibTrigger,
 	MountedGenericTrigger,
 	MountedHotkeyMixin,
-} from '../../../lib/api/triggers/MountedTriggers'
-import { isHotkeyTrigger } from '../../../lib/api/triggers/triggerTypeSelectors'
-import { RundownPlaylistCollectionUtil } from '../../../lib/collections/rundownPlaylistUtil'
+} from '@sofie-automation/meteor-lib/dist/api/MountedTriggers'
+import { isHotkeyTrigger } from '@sofie-automation/meteor-lib/dist/triggers/triggerTypeSelectors'
+import { RundownPlaylistCollectionUtil } from '../../collections/rundownPlaylistUtil'
 import { catchError } from '../lib'
-import { logger } from '../../../lib/logging'
+import { logger } from '../logging'
 import { CorelibPubSub } from '@sofie-automation/corelib/dist/pubsub'
+import { UiTriggersContext } from './triggersContext'
 
 type HotkeyTriggerListener = (e: KeyboardEvent) => void
 
 interface IProps {
+	studioId: StudioId
 	rundownPlaylistId: RundownPlaylistId
 	currentRundownId: RundownId | null
 	showStyleBaseId: ShowStyleBaseId
@@ -96,7 +99,9 @@ function createAction(
 	listener: HotkeyTriggerListener
 	preview: () => IWrappedAdLib[]
 } {
-	const executableActions = actions.map((value) => libCreateAction(value, showStyleBase.sourceLayers))
+	const executableActions = actions.map((value) =>
+		libCreateAction(UiTriggersContext, value, showStyleBase.sourceLayers)
+	)
 	return {
 		preview: () => {
 			const ctx = collectContext()
@@ -317,6 +322,7 @@ export const TriggersHandler: React.FC<IProps> = function TriggersHandler(
 				let context = rundownPlaylistContext.get()
 				if (context === null) {
 					context = {
+						studioId: new ReactiveVar(props.studioId),
 						rundownPlaylistId: new ReactiveVar(playlist._id),
 						rundownPlaylist: new ReactiveVar(playlist),
 						currentRundownId: new ReactiveVar(props.currentRundownId),
@@ -339,6 +345,7 @@ export const TriggersHandler: React.FC<IProps> = function TriggersHandler(
 			}
 		})
 	}, [
+		props.studioId,
 		props.rundownPlaylistId,
 		props.currentRundownId,
 		props.currentPartId,
diff --git a/meteor/client/lib/triggers/codesToKeyLabels.ts b/packages/webui/src/client/lib/triggers/codesToKeyLabels.ts
similarity index 100%
rename from meteor/client/lib/triggers/codesToKeyLabels.ts
rename to packages/webui/src/client/lib/triggers/codesToKeyLabels.ts
diff --git a/packages/webui/src/client/lib/triggers/triggersContext.ts b/packages/webui/src/client/lib/triggers/triggersContext.ts
new file mode 100644
index 0000000000..1fe46fc9f3
--- /dev/null
+++ b/packages/webui/src/client/lib/triggers/triggersContext.ts
@@ -0,0 +1,54 @@
+import { TriggersContext } from '@sofie-automation/meteor-lib/dist/triggers/triggersContext'
+import { hashSingleUseToken } from '../lib'
+import { MeteorCall } from '../meteorApi'
+import { IBaseFilterLink } from '@sofie-automation/blueprints-integration'
+import { doUserAction } from '../clientUserAction'
+import { memoizedIsolatedAutorun } from '../memoizedIsolatedAutorun'
+import { Tracker } from 'meteor/tracker'
+import {
+	AdLibActions,
+	AdLibPieces,
+	Parts,
+	RundownBaselineAdLibActions,
+	RundownBaselineAdLibPieces,
+	RundownPlaylists,
+	Rundowns,
+	Segments,
+} from '../../collections'
+import { logger } from '../logging'
+import { StudioId } from '@sofie-automation/corelib/dist/dataModel/Ids'
+import { ReactivePlaylistActionContext } from '@sofie-automation/meteor-lib/dist/triggers/actionFactory'
+
+export const UiTriggersContext: TriggersContext = {
+	MeteorCall,
+
+	logger,
+
+	isClient: true,
+
+	AdLibActions,
+	AdLibPieces,
+	Parts,
+	RundownBaselineAdLibActions,
+	RundownBaselineAdLibPieces,
+	RundownPlaylists,
+	Rundowns,
+	Segments,
+
+	hashSingleUseToken,
+
+	doUserAction,
+
+	nonreactiveTracker: Tracker.nonreactive,
+
+	memoizedIsolatedAutorun,
+
+	createContextForRundownPlaylistChain(
+		_studioId: StudioId,
+		_filterChain: IBaseFilterLink[]
+	): ReactivePlaylistActionContext | undefined {
+		// Server only
+
+		throw new Error('Invalid filter combination')
+	},
+}
diff --git a/meteor/client/lib/ui/PieceStatusIcon.tsx b/packages/webui/src/client/lib/ui/PieceStatusIcon.tsx
similarity index 81%
rename from meteor/client/lib/ui/PieceStatusIcon.tsx
rename to packages/webui/src/client/lib/ui/PieceStatusIcon.tsx
index 80b659cb54..e451ca3826 100644
--- a/meteor/client/lib/ui/PieceStatusIcon.tsx
+++ b/packages/webui/src/client/lib/ui/PieceStatusIcon.tsx
@@ -1,5 +1,4 @@
-import * as React from 'react'
-import { NoticeLevel } from '../../../lib/notifications/notifications'
+import { NoticeLevel } from '../notifications/notifications'
 import { CriticalIconSmall, WarningIconSmall } from './icons/notifications'
 
 export interface IProps {
diff --git a/meteor/client/lib/ui/containers/modals/Modal.tsx b/packages/webui/src/client/lib/ui/containers/modals/Modal.tsx
similarity index 96%
rename from meteor/client/lib/ui/containers/modals/Modal.tsx
rename to packages/webui/src/client/lib/ui/containers/modals/Modal.tsx
index 13454a5ab2..fd0c32ae4c 100644
--- a/meteor/client/lib/ui/containers/modals/Modal.tsx
+++ b/packages/webui/src/client/lib/ui/containers/modals/Modal.tsx
@@ -1,10 +1,10 @@
 import * as React from 'react'
 import type { Sorensen } from '@sofie-automation/sorensen'
-import CoreIcons from '@nrk/core-icons/jsx'
+import * as CoreIcons from '@nrk/core-icons/jsx'
 import Escape from './../../../Escape'
 
 import { SorensenContext } from '../../../SorensenContext'
-import { Settings } from '../../../../../lib/Settings'
+import { Settings } from '../../../../lib/Settings'
 
 export interface IModalAttributes {
 	show?: boolean
diff --git a/meteor/client/lib/ui/icons/freezeFrame.tsx b/packages/webui/src/client/lib/ui/icons/freezeFrame.tsx
similarity index 100%
rename from meteor/client/lib/ui/icons/freezeFrame.tsx
rename to packages/webui/src/client/lib/ui/icons/freezeFrame.tsx
diff --git a/meteor/client/lib/ui/icons/icon-loop.json b/packages/webui/src/client/lib/ui/icons/icon-loop.json
similarity index 100%
rename from meteor/client/lib/ui/icons/icon-loop.json
rename to packages/webui/src/client/lib/ui/icons/icon-loop.json
diff --git a/meteor/client/lib/ui/icons/listView.tsx b/packages/webui/src/client/lib/ui/icons/listView.tsx
similarity index 100%
rename from meteor/client/lib/ui/icons/listView.tsx
rename to packages/webui/src/client/lib/ui/icons/listView.tsx
diff --git a/meteor/client/lib/ui/icons/looping.tsx b/packages/webui/src/client/lib/ui/icons/looping.tsx
similarity index 96%
rename from meteor/client/lib/ui/icons/looping.tsx
rename to packages/webui/src/client/lib/ui/icons/looping.tsx
index 24362662b3..96d7b46c06 100644
--- a/meteor/client/lib/ui/icons/looping.tsx
+++ b/packages/webui/src/client/lib/ui/icons/looping.tsx
@@ -1,5 +1,4 @@
 import React, { JSX } from 'react'
-// @ts-expect-error Not recognized by Typescript
 import * as loopAnimation from './icon-loop.json'
 import { Lottie } from '@crello/react-lottie'
 
diff --git a/meteor/client/lib/ui/icons/mediaStatus.tsx b/packages/webui/src/client/lib/ui/icons/mediaStatus.tsx
similarity index 98%
rename from meteor/client/lib/ui/icons/mediaStatus.tsx
rename to packages/webui/src/client/lib/ui/icons/mediaStatus.tsx
index 46c28f3787..0d7dd38384 100644
--- a/meteor/client/lib/ui/icons/mediaStatus.tsx
+++ b/packages/webui/src/client/lib/ui/icons/mediaStatus.tsx
@@ -1,4 +1,4 @@
-import React, { JSX } from 'react'
+import { JSX } from 'react'
 
 export function MediaStatusIcon(): JSX.Element {
 	return (
diff --git a/meteor/client/lib/ui/icons/notifications.tsx b/packages/webui/src/client/lib/ui/icons/notifications.tsx
similarity index 99%
rename from meteor/client/lib/ui/icons/notifications.tsx
rename to packages/webui/src/client/lib/ui/icons/notifications.tsx
index e955973775..e4e6dd26ed 100644
--- a/meteor/client/lib/ui/icons/notifications.tsx
+++ b/packages/webui/src/client/lib/ui/icons/notifications.tsx
@@ -1,4 +1,4 @@
-import React, { JSX } from 'react'
+import { JSX } from 'react'
 
 export function CriticalIcon(): JSX.Element {
 	return (
diff --git a/meteor/client/lib/ui/icons/rewindAllSegmentsIcon.tsx b/packages/webui/src/client/lib/ui/icons/rewindAllSegmentsIcon.tsx
similarity index 92%
rename from meteor/client/lib/ui/icons/rewindAllSegmentsIcon.tsx
rename to packages/webui/src/client/lib/ui/icons/rewindAllSegmentsIcon.tsx
index 40d731692b..dda2fc4cac 100644
--- a/meteor/client/lib/ui/icons/rewindAllSegmentsIcon.tsx
+++ b/packages/webui/src/client/lib/ui/icons/rewindAllSegmentsIcon.tsx
@@ -1,5 +1,3 @@
-import * as React from 'react'
-
 export const RewindAllSegmentsIcon = (): JSX.Element => (
 	<svg width="18px" height="18px" viewBox="0 0 512 300" fill="none" xmlns="http://www.w3.org/2000/svg">
 		<path
diff --git a/meteor/client/lib/ui/icons/rundownList.tsx b/packages/webui/src/client/lib/ui/icons/rundownList.tsx
similarity index 93%
rename from meteor/client/lib/ui/icons/rundownList.tsx
rename to packages/webui/src/client/lib/ui/icons/rundownList.tsx
index 060c0b2dd0..e6c420978f 100644
--- a/meteor/client/lib/ui/icons/rundownList.tsx
+++ b/packages/webui/src/client/lib/ui/icons/rundownList.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 export function PathIcon(): JSX.Element {
 	return (
 		<svg width="22" height="18" viewBox="0 0 22 18" fill="none" xmlns="http://www.w3.org/2000/svg">
diff --git a/meteor/client/lib/ui/icons/segment.tsx b/packages/webui/src/client/lib/ui/icons/segment.tsx
similarity index 100%
rename from meteor/client/lib/ui/icons/segment.tsx
rename to packages/webui/src/client/lib/ui/icons/segment.tsx
diff --git a/meteor/client/lib/ui/icons/segmentZoomIcon.tsx b/packages/webui/src/client/lib/ui/icons/segmentZoomIcon.tsx
similarity index 97%
rename from meteor/client/lib/ui/icons/segmentZoomIcon.tsx
rename to packages/webui/src/client/lib/ui/icons/segmentZoomIcon.tsx
index 21912405a7..8ee0562389 100644
--- a/meteor/client/lib/ui/icons/segmentZoomIcon.tsx
+++ b/packages/webui/src/client/lib/ui/icons/segmentZoomIcon.tsx
@@ -1,5 +1,3 @@
-import * as React from 'react'
-
 export const ZoomOutIcon = (): JSX.Element => (
 	<svg width="22" height="22" viewBox="0 0 22 22" fill="none" xmlns="http://www.w3.org/2000/svg" role="presentation">
 		<circle cx="11.5" cy="11.5" r="7.5" fill="#5C5C5C" className="btn-bkg" />
diff --git a/meteor/client/lib/ui/icons/sorting.tsx b/packages/webui/src/client/lib/ui/icons/sorting.tsx
similarity index 99%
rename from meteor/client/lib/ui/icons/sorting.tsx
rename to packages/webui/src/client/lib/ui/icons/sorting.tsx
index a28ae3dc69..a8bd8b274c 100644
--- a/meteor/client/lib/ui/icons/sorting.tsx
+++ b/packages/webui/src/client/lib/ui/icons/sorting.tsx
@@ -1,4 +1,4 @@
-import React, { JSX } from 'react'
+import { JSX } from 'react'
 
 export function SortDescending(): JSX.Element {
 	return (
diff --git a/meteor/client/lib/ui/icons/supportIcon.tsx b/packages/webui/src/client/lib/ui/icons/supportIcon.tsx
similarity index 98%
rename from meteor/client/lib/ui/icons/supportIcon.tsx
rename to packages/webui/src/client/lib/ui/icons/supportIcon.tsx
index 599d01c121..844246696a 100644
--- a/meteor/client/lib/ui/icons/supportIcon.tsx
+++ b/packages/webui/src/client/lib/ui/icons/supportIcon.tsx
@@ -1,5 +1,3 @@
-import * as React from 'react'
-
 export const SupportIcon = (): JSX.Element => (
 	<svg width="326" height="514" viewBox="0 0 326 514" fill="none" xmlns="http://www.w3.org/2000/svg">
 		<path
diff --git a/meteor/client/lib/ui/icons/switchboard.tsx b/packages/webui/src/client/lib/ui/icons/switchboard.tsx
similarity index 100%
rename from meteor/client/lib/ui/icons/switchboard.tsx
rename to packages/webui/src/client/lib/ui/icons/switchboard.tsx
diff --git a/meteor/client/lib/ui/pieceUiClassNames.ts b/packages/webui/src/client/lib/ui/pieceUiClassNames.ts
similarity index 71%
rename from meteor/client/lib/ui/pieceUiClassNames.ts
rename to packages/webui/src/client/lib/ui/pieceUiClassNames.ts
index 7b6f078f62..4d91cb014f 100644
--- a/meteor/client/lib/ui/pieceUiClassNames.ts
+++ b/packages/webui/src/client/lib/ui/pieceUiClassNames.ts
@@ -4,9 +4,12 @@ import { PieceStatusCode } from '@sofie-automation/corelib/dist/dataModel/Piece'
 import classNames from 'classnames'
 import { PieceUi } from '../../ui/SegmentContainer/withResolvedSegment'
 import { RundownUtils } from '../rundown'
+import { ReadonlyDeep } from 'type-fest'
+import { PieceContentStatusObj } from '@sofie-automation/meteor-lib/dist/api/pieceContentStatus'
 
 export function pieceUiClassNames(
 	pieceInstance: PieceUi,
+	contentStatus: ReadonlyDeep<PieceContentStatusObj> | undefined,
 	baseClassName: string,
 	layerType?: SourceLayerType,
 	partId?: PartId,
@@ -42,12 +45,12 @@ export function pieceUiClassNames(
 		'next-is-touching': pieceInstance.cropped,
 
 		'source-missing':
-			pieceInstance.contentStatus?.status === PieceStatusCode.SOURCE_MISSING ||
-			pieceInstance.contentStatus?.status === PieceStatusCode.SOURCE_NOT_SET,
-		'source-unknown-state': pieceInstance.contentStatus?.status === PieceStatusCode.SOURCE_UNKNOWN_STATE,
-		'source-broken': pieceInstance.contentStatus?.status === PieceStatusCode.SOURCE_BROKEN,
-		'source-not-ready': pieceInstance.contentStatus?.status === PieceStatusCode.SOURCE_NOT_READY,
-		'unknown-state': pieceInstance.contentStatus?.status === PieceStatusCode.UNKNOWN,
+			contentStatus?.status === PieceStatusCode.SOURCE_MISSING ||
+			contentStatus?.status === PieceStatusCode.SOURCE_NOT_SET,
+		'source-unknown-state': contentStatus?.status === PieceStatusCode.SOURCE_UNKNOWN_STATE,
+		'source-broken': contentStatus?.status === PieceStatusCode.SOURCE_BROKEN,
+		'source-not-ready': contentStatus?.status === PieceStatusCode.SOURCE_NOT_READY,
+		'unknown-state': contentStatus?.status === PieceStatusCode.UNKNOWN,
 		disabled: pieceInstance.instance.disabled,
 
 		'invert-flash': highlight,
diff --git a/meteor/client/lib/ui/scriptPreview.ts b/packages/webui/src/client/lib/ui/scriptPreview.ts
similarity index 100%
rename from meteor/client/lib/ui/scriptPreview.ts
rename to packages/webui/src/client/lib/ui/scriptPreview.ts
diff --git a/meteor/client/lib/ui/splitPreview.ts b/packages/webui/src/client/lib/ui/splitPreview.ts
similarity index 95%
rename from meteor/client/lib/ui/splitPreview.ts
rename to packages/webui/src/client/lib/ui/splitPreview.ts
index 1281636d0d..ffb514c260 100644
--- a/meteor/client/lib/ui/splitPreview.ts
+++ b/packages/webui/src/client/lib/ui/splitPreview.ts
@@ -3,7 +3,7 @@ import {
 	SplitsContentBoxContent,
 	SplitsContentBoxProperties,
 } from '@sofie-automation/blueprints-integration'
-import { literal } from '../../../lib/lib'
+import { literal } from '../tempLib'
 
 const DEFAULT_POSITIONS = [
 	{
diff --git a/meteor/client/lib/uncaughtErrorHandler.ts b/packages/webui/src/client/lib/uncaughtErrorHandler.ts
similarity index 97%
rename from meteor/client/lib/uncaughtErrorHandler.ts
rename to packages/webui/src/client/lib/uncaughtErrorHandler.ts
index a919cde5f8..fec2309fe7 100644
--- a/meteor/client/lib/uncaughtErrorHandler.ts
+++ b/packages/webui/src/client/lib/uncaughtErrorHandler.ts
@@ -1,9 +1,9 @@
 import { Meteor } from 'meteor/meteor'
 import { Tracker } from 'meteor/tracker'
 import { Time } from '@sofie-automation/blueprints-integration'
-import { getCurrentTime } from '../../lib/lib'
+import { getCurrentTime } from './systemTime'
 import { stringifyError } from '@sofie-automation/shared-lib/dist/lib/stringifyError'
-import { MeteorCall } from '../../lib/api/methods'
+import { MeteorCall } from '../lib/meteorApi'
 
 interface LoggedError {
 	location: string
diff --git a/meteor/client/lib/uploadButton.tsx b/packages/webui/src/client/lib/uploadButton.tsx
similarity index 100%
rename from meteor/client/lib/uploadButton.tsx
rename to packages/webui/src/client/lib/uploadButton.tsx
diff --git a/meteor/client/lib/useBlackBrowserTheme.ts b/packages/webui/src/client/lib/useBlackBrowserTheme.ts
similarity index 100%
rename from meteor/client/lib/useBlackBrowserTheme.ts
rename to packages/webui/src/client/lib/useBlackBrowserTheme.ts
diff --git a/meteor/client/lib/utilComponents.tsx b/packages/webui/src/client/lib/utilComponents.tsx
similarity index 100%
rename from meteor/client/lib/utilComponents.tsx
rename to packages/webui/src/client/lib/utilComponents.tsx
diff --git a/meteor/client/lib/viewPort.ts b/packages/webui/src/client/lib/viewPort.ts
similarity index 96%
rename from meteor/client/lib/viewPort.ts
rename to packages/webui/src/client/lib/viewPort.ts
index 0cf58ebe12..61edc9e6e5 100644
--- a/meteor/client/lib/viewPort.ts
+++ b/packages/webui/src/client/lib/viewPort.ts
@@ -1,10 +1,10 @@
 import { SEGMENT_TIMELINE_ELEMENT_ID } from '../ui/SegmentTimeline/SegmentTimeline'
-import { isProtectedString } from '../../lib/lib'
-import RundownViewEventBus, { RundownViewEvents } from '../../lib/api/triggers/RundownViewEventBus'
-import { Settings } from '../../lib/Settings'
+import { isProtectedString } from './tempLib'
+import RundownViewEventBus, { RundownViewEvents } from '@sofie-automation/meteor-lib/dist/triggers/RundownViewEventBus'
+import { Settings } from '../lib/Settings'
 import { PartId, PartInstanceId, SegmentId } from '@sofie-automation/corelib/dist/dataModel/Ids'
-import { PartInstances, Parts } from '../collections'
-import { logger } from '../../lib/logging'
+import { UIPartInstances, UIParts } from '../ui/Collections'
+import { logger } from './logging'
 
 const HEADER_MARGIN = 24 // TODOSYNC: TV2 uses 15. If it's needed to be different, it needs to be made generic somehow..
 const FALLBACK_HEADER_HEIGHT = 65
@@ -66,7 +66,7 @@ export async function scrollToPartInstance(
 	noAnimation?: boolean
 ): Promise<boolean> {
 	quitFocusOnPart()
-	const partInstance = PartInstances.findOne(partInstanceId)
+	const partInstance = UIPartInstances.findOne(partInstanceId)
 	if (partInstance) {
 		RundownViewEventBus.emit(RundownViewEvents.GO_TO_PART_INSTANCE, {
 			segmentId: partInstance.segmentId,
@@ -84,7 +84,7 @@ export async function scrollToPart(
 	zoomInToFit?: boolean
 ): Promise<boolean> {
 	quitFocusOnPart()
-	const part = Parts.findOne(partId)
+	const part = UIParts.findOne(partId)
 	if (part) {
 		await scrollToSegment(part.segmentId, forceScroll, noAnimation)
 
diff --git a/meteor/client/styles/_colorScheme.scss b/packages/webui/src/client/styles/_colorScheme.scss
similarity index 98%
rename from meteor/client/styles/_colorScheme.scss
rename to packages/webui/src/client/styles/_colorScheme.scss
index 97bbc75783..43efdc541f 100644
--- a/meteor/client/styles/_colorScheme.scss
+++ b/packages/webui/src/client/styles/_colorScheme.scss
@@ -1,3 +1,5 @@
+@import 'defaultColors';
+
 // color variables are defined in defaultColors.scss
 
 $color-status-good: var(--color-status-good);
diff --git a/meteor/client/styles/_cssVariables.ts b/packages/webui/src/client/styles/_cssVariables.ts
similarity index 100%
rename from meteor/client/styles/_cssVariables.ts
rename to packages/webui/src/client/styles/_cssVariables.ts
diff --git a/meteor/client/styles/_header.scss b/packages/webui/src/client/styles/_header.scss
similarity index 100%
rename from meteor/client/styles/_header.scss
rename to packages/webui/src/client/styles/_header.scss
diff --git a/meteor/client/styles/_itemTypeColors.scss b/packages/webui/src/client/styles/_itemTypeColors.scss
similarity index 98%
rename from meteor/client/styles/_itemTypeColors.scss
rename to packages/webui/src/client/styles/_itemTypeColors.scss
index fbd4853c8f..d848050805 100644
--- a/meteor/client/styles/_itemTypeColors.scss
+++ b/packages/webui/src/client/styles/_itemTypeColors.scss
@@ -35,6 +35,8 @@ $segment-layer-background-local: #9a2bd8;
 $segment-layer-background-local--second: darken($segment-layer-background-local, 10%);
 $segment-layer-background-studio-screen: #641fb3;
 
+$step-counter-background-studio-screen: #2a005b;
+
 $segment-item-disabled-background: #898989;
 $segment-item-disabled-color: #c9c9c9;
 
@@ -78,6 +80,10 @@ $layer-types: join($layer-types-solid, $layer-types-gradient);
 			}
 		}
 	}
+
+	&.studio-screen {
+		--segment-piece-step-counter-background: #{$step-counter-background-studio-screen};
+	}
 }
 
 @mixin piece-colors {
@@ -251,6 +257,10 @@ $layer-types: join($layer-types-solid, $layer-types-gradient);
 			}
 		}
 	}
+
+	&.studio-screen {
+		--segment-piece-step-counter-background: #{$step-counter-background-studio-screen};
+	}
 }
 
 @mixin item-type-borders {
diff --git a/meteor/client/styles/_prompterFont.scss b/packages/webui/src/client/styles/_prompterFont.scss
similarity index 100%
rename from meteor/client/styles/_prompterFont.scss
rename to packages/webui/src/client/styles/_prompterFont.scss
diff --git a/meteor/client/styles/_robotoCondensed.scss b/packages/webui/src/client/styles/_robotoCondensed.scss
similarity index 98%
rename from meteor/client/styles/_robotoCondensed.scss
rename to packages/webui/src/client/styles/_robotoCondensed.scss
index d692064f64..c00005145e 100644
--- a/meteor/client/styles/_robotoCondensed.scss
+++ b/packages/webui/src/client/styles/_robotoCondensed.scss
@@ -1,4 +1,4 @@
-$FontPath: './fonts/roboto-condensed-v18-latin_latin-ext';
+$FontPath: '../../fonts/roboto-condensed-v18-latin_latin-ext';
 
 /* roboto-condensed-300 - latin_latin-ext */
 @font-face {
diff --git a/packages/webui/src/client/styles/_robotoFont.scss b/packages/webui/src/client/styles/_robotoFont.scss
new file mode 100644
index 0000000000..30c56a12a2
--- /dev/null
+++ b/packages/webui/src/client/styles/_robotoFont.scss
@@ -0,0 +1,2 @@
+$FontPath: '../../fonts/roboto-gh-pages/fonts';
+@import 'fonts/roboto';
diff --git a/meteor/client/styles/_rundownOverview.scss b/packages/webui/src/client/styles/_rundownOverview.scss
similarity index 100%
rename from meteor/client/styles/_rundownOverview.scss
rename to packages/webui/src/client/styles/_rundownOverview.scss
diff --git a/meteor/client/styles/_variables.scss b/packages/webui/src/client/styles/_variables.scss
similarity index 100%
rename from meteor/client/styles/_variables.scss
rename to packages/webui/src/client/styles/_variables.scss
diff --git a/meteor/client/styles/afterBroadcastForm.scss b/packages/webui/src/client/styles/afterBroadcastForm.scss
similarity index 100%
rename from meteor/client/styles/afterBroadcastForm.scss
rename to packages/webui/src/client/styles/afterBroadcastForm.scss
diff --git a/packages/webui/src/client/styles/collapseJSON.scss b/packages/webui/src/client/styles/collapseJSON.scss
new file mode 100644
index 0000000000..3d90e0a02c
--- /dev/null
+++ b/packages/webui/src/client/styles/collapseJSON.scss
@@ -0,0 +1,43 @@
+.collapse-json__block {
+	text-wrap: wrap;
+	white-space: pre-wrap;
+	word-break: break-all;
+
+	&.expanding {
+		cursor: pointer;
+	}
+}
+
+.collapse-json__tools {
+	display: block;
+	float: right;
+	clear: both;
+}
+
+.collapse-json__tools > button {
+	background: #eee;
+	border-radius: 3px;
+	line-height: 1rem;
+	padding: 0 0.3rem;
+	margin-top: 0.2rem;
+	border: none;
+	user-select: none;
+	margin-left: 0.2rem;
+	vertical-align: top;
+
+	&:focus {
+		outline: none;
+		box-shadow: 0 0 0 2px #00feff;
+	}
+
+	&:active {
+		background-color: #ddd;
+	}
+}
+
+.collapse-json__copy {
+	font-family: Roboto, arial, sans-serif;
+	font-weight: 500;
+	font-size: 0.8em;
+	color: #888;
+}
diff --git a/meteor/client/styles/colorPicker.scss b/packages/webui/src/client/styles/colorPicker.scss
similarity index 100%
rename from meteor/client/styles/colorPicker.scss
rename to packages/webui/src/client/styles/colorPicker.scss
diff --git a/meteor/client/styles/contextMenu.scss b/packages/webui/src/client/styles/contextMenu.scss
similarity index 100%
rename from meteor/client/styles/contextMenu.scss
rename to packages/webui/src/client/styles/contextMenu.scss
diff --git a/meteor/client/styles/countdown/overlay.scss b/packages/webui/src/client/styles/countdown/overlay.scss
similarity index 100%
rename from meteor/client/styles/countdown/overlay.scss
rename to packages/webui/src/client/styles/countdown/overlay.scss
diff --git a/meteor/client/styles/countdown/presenter.scss b/packages/webui/src/client/styles/countdown/presenter.scss
similarity index 100%
rename from meteor/client/styles/countdown/presenter.scss
rename to packages/webui/src/client/styles/countdown/presenter.scss
diff --git a/meteor/client/styles/customizations/nrk/shelf/taPanel.scss b/packages/webui/src/client/styles/customizations/nrk/shelf/taPanel.scss
similarity index 100%
rename from meteor/client/styles/customizations/nrk/shelf/taPanel.scss
rename to packages/webui/src/client/styles/customizations/nrk/shelf/taPanel.scss
diff --git a/meteor/client/styles/customizations/readme.md b/packages/webui/src/client/styles/customizations/readme.md
similarity index 100%
rename from meteor/client/styles/customizations/readme.md
rename to packages/webui/src/client/styles/customizations/readme.md
diff --git a/meteor/client/styles/datePicker.scss b/packages/webui/src/client/styles/datePicker.scss
similarity index 100%
rename from meteor/client/styles/datePicker.scss
rename to packages/webui/src/client/styles/datePicker.scss
diff --git a/meteor/client/styles/defaultColors.scss b/packages/webui/src/client/styles/defaultColors.scss
similarity index 100%
rename from meteor/client/styles/defaultColors.scss
rename to packages/webui/src/client/styles/defaultColors.scss
diff --git a/meteor/client/styles/editAttribute.scss b/packages/webui/src/client/styles/editAttribute.scss
similarity index 100%
rename from meteor/client/styles/editAttribute.scss
rename to packages/webui/src/client/styles/editAttribute.scss
diff --git a/meteor/client/styles/externalMessagesStatus.scss b/packages/webui/src/client/styles/externalMessagesStatus.scss
similarity index 100%
rename from meteor/client/styles/externalMessagesStatus.scss
rename to packages/webui/src/client/styles/externalMessagesStatus.scss
diff --git a/meteor/client/styles/fonts.scss b/packages/webui/src/client/styles/fonts.scss
similarity index 100%
rename from meteor/client/styles/fonts.scss
rename to packages/webui/src/client/styles/fonts.scss
diff --git a/meteor/client/styles/fonts/roboto.scss b/packages/webui/src/client/styles/fonts/roboto.scss
similarity index 100%
rename from meteor/client/styles/fonts/roboto.scss
rename to packages/webui/src/client/styles/fonts/roboto.scss
diff --git a/meteor/client/styles/fonts/sass/_Black.scss b/packages/webui/src/client/styles/fonts/sass/_Black.scss
similarity index 100%
rename from meteor/client/styles/fonts/sass/_Black.scss
rename to packages/webui/src/client/styles/fonts/sass/_Black.scss
diff --git a/meteor/client/styles/fonts/sass/_BlackItalic.scss b/packages/webui/src/client/styles/fonts/sass/_BlackItalic.scss
similarity index 100%
rename from meteor/client/styles/fonts/sass/_BlackItalic.scss
rename to packages/webui/src/client/styles/fonts/sass/_BlackItalic.scss
diff --git a/meteor/client/styles/fonts/sass/_Bold.scss b/packages/webui/src/client/styles/fonts/sass/_Bold.scss
similarity index 100%
rename from meteor/client/styles/fonts/sass/_Bold.scss
rename to packages/webui/src/client/styles/fonts/sass/_Bold.scss
diff --git a/meteor/client/styles/fonts/sass/_BoldItalic.scss b/packages/webui/src/client/styles/fonts/sass/_BoldItalic.scss
similarity index 100%
rename from meteor/client/styles/fonts/sass/_BoldItalic.scss
rename to packages/webui/src/client/styles/fonts/sass/_BoldItalic.scss
diff --git a/meteor/client/styles/fonts/sass/_Italic.scss b/packages/webui/src/client/styles/fonts/sass/_Italic.scss
similarity index 100%
rename from meteor/client/styles/fonts/sass/_Italic.scss
rename to packages/webui/src/client/styles/fonts/sass/_Italic.scss
diff --git a/meteor/client/styles/fonts/sass/_Light.scss b/packages/webui/src/client/styles/fonts/sass/_Light.scss
similarity index 100%
rename from meteor/client/styles/fonts/sass/_Light.scss
rename to packages/webui/src/client/styles/fonts/sass/_Light.scss
diff --git a/meteor/client/styles/fonts/sass/_LightItalic.scss b/packages/webui/src/client/styles/fonts/sass/_LightItalic.scss
similarity index 100%
rename from meteor/client/styles/fonts/sass/_LightItalic.scss
rename to packages/webui/src/client/styles/fonts/sass/_LightItalic.scss
diff --git a/meteor/client/styles/fonts/sass/_Medium.scss b/packages/webui/src/client/styles/fonts/sass/_Medium.scss
similarity index 100%
rename from meteor/client/styles/fonts/sass/_Medium.scss
rename to packages/webui/src/client/styles/fonts/sass/_Medium.scss
diff --git a/meteor/client/styles/fonts/sass/_MediumItalic.scss b/packages/webui/src/client/styles/fonts/sass/_MediumItalic.scss
similarity index 100%
rename from meteor/client/styles/fonts/sass/_MediumItalic.scss
rename to packages/webui/src/client/styles/fonts/sass/_MediumItalic.scss
diff --git a/meteor/client/styles/fonts/sass/_Regular.scss b/packages/webui/src/client/styles/fonts/sass/_Regular.scss
similarity index 100%
rename from meteor/client/styles/fonts/sass/_Regular.scss
rename to packages/webui/src/client/styles/fonts/sass/_Regular.scss
diff --git a/meteor/client/styles/fonts/sass/_Thin.scss b/packages/webui/src/client/styles/fonts/sass/_Thin.scss
similarity index 100%
rename from meteor/client/styles/fonts/sass/_Thin.scss
rename to packages/webui/src/client/styles/fonts/sass/_Thin.scss
diff --git a/meteor/client/styles/fonts/sass/_ThinItalic.scss b/packages/webui/src/client/styles/fonts/sass/_ThinItalic.scss
similarity index 100%
rename from meteor/client/styles/fonts/sass/_ThinItalic.scss
rename to packages/webui/src/client/styles/fonts/sass/_ThinItalic.scss
diff --git a/meteor/client/styles/fonts/sass/_mixins.scss b/packages/webui/src/client/styles/fonts/sass/_mixins.scss
similarity index 100%
rename from meteor/client/styles/fonts/sass/_mixins.scss
rename to packages/webui/src/client/styles/fonts/sass/_mixins.scss
diff --git a/meteor/client/styles/fonts/sass/_variables.scss b/packages/webui/src/client/styles/fonts/sass/_variables.scss
similarity index 100%
rename from meteor/client/styles/fonts/sass/_variables.scss
rename to packages/webui/src/client/styles/fonts/sass/_variables.scss
diff --git a/meteor/client/styles/fonts/sass/roboto.scss b/packages/webui/src/client/styles/fonts/sass/roboto.scss
similarity index 100%
rename from meteor/client/styles/fonts/sass/roboto.scss
rename to packages/webui/src/client/styles/fonts/sass/roboto.scss
diff --git a/meteor/client/styles/iconPicker.scss b/packages/webui/src/client/styles/iconPicker.scss
similarity index 100%
rename from meteor/client/styles/iconPicker.scss
rename to packages/webui/src/client/styles/iconPicker.scss
diff --git a/packages/webui/src/client/styles/main.scss b/packages/webui/src/client/styles/main.scss
new file mode 100644
index 0000000000..8b3de38f60
--- /dev/null
+++ b/packages/webui/src/client/styles/main.scss
@@ -0,0 +1,256 @@
+/* SASS statring point. Import styles from here on: */
+
+/* body {
+	user-select: none;
+}
+
+input {
+	user-select: auto;
+} */
+
+@import '_variables';
+@import '_header';
+@import '_colorScheme';
+@import 'fonts';
+
+@import 'afterBroadcastForm';
+@import 'collapseJSON';
+@import 'colorPicker';
+@import 'contextMenu';
+@import 'datePicker';
+@import 'editAttribute';
+@import 'externalMessagesStatus';
+@import 'iconPicker';
+@import 'modalDialog';
+@import 'multiSelect';
+@import 'notifications';
+@import 'organization';
+@import 'overflowingContainer';
+@import 'pieceStatusIcon';
+@import 'prompter';
+@import 'rundownList';
+@import 'rundownSystemStatus';
+@import 'settings';
+@import 'splitDropdown';
+@import 'statusbar';
+@import 'statusNotification';
+@import 'studioScreenSaver';
+@import 'supportAndSwitchboardPanel';
+@import 'systemStatus';
+@import 'testtools';
+@import 'tooltips';
+@import 'users';
+@import 'utils';
+
+@import 'countdown/overlay';
+@import 'countdown/presenter';
+
+@import 'customizations/nrk/shelf/taPanel';
+
+@import 'shelf/adLibPanel';
+@import 'shelf/adLibRegionPanel';
+@import 'shelf/colored-box-panel';
+@import 'shelf/dashboard-rundownView';
+@import 'shelf/dashboard-streamdeck';
+@import 'shelf/dashboard';
+@import 'shelf/endTimerPanel';
+@import 'shelf/endWordsPanel';
+@import 'shelf/externalFramePanel';
+@import 'shelf/inspector';
+@import 'shelf/miniRundownPanel';
+@import 'shelf/nextInfoPanel';
+@import 'shelf/partCountdownPanel';
+@import 'shelf/partNamePanel';
+@import 'shelf/pieceCountdownPanel';
+@import 'shelf/playlistNamePanel';
+@import 'shelf/segmentNamePanel';
+@import 'shelf/segmentTimingPanel';
+@import 'shelf/shelf';
+@import 'shelf/showStylePanel';
+@import 'shelf/startTimerPanel';
+@import 'shelf/studioNamePanel';
+@import 'shelf/systemStatusPanel';
+@import 'shelf/textLabelPanel';
+@import 'shelf/timeOfDayPanel';
+
+@import '../lib/forms/SchemaFormTable/ObjectTable.scss';
+@import '../lib/Components/PromiseButton.scss';
+@import '../lib/VideoPreviewPlayer.scss';
+@import '../ui/ClipTrimPanel/ClipTrimPanel.scss';
+@import '../ui/ClipTrimPanel/TimecodeEncoder.scss';
+@import '../ui/ClipTrimPanel/VideoEditMonitor.scss';
+@import '../ui/SegmentStoryboard/StoryboardPartThumbnail/StoryboardPartThumbnail.scss';
+@import '../ui/SegmentStoryboard/SegmentStoryboard.scss';
+@import '../ui/SegmentStoryboard/StoryboardPartSecondaryPieces/StoryboardPartSecondaryPieces.scss';
+@import '../ui/Settings/components/triggeredActions/TriggeredActionsEditor.scss';
+@import '../ui/Settings/Forms.scss';
+@import '../ui/SegmentTimeline/SegmentTimeline.scss';
+@import '../ui/Status/media-status/MediaStatusListItem.scss';
+@import '../ui/Status/media-status/MediaStatusList.scss';
+@import '../ui/Status/media-status/MediaStatusListHeader.scss';
+@import '../ui/Status/package-status/package-status.scss';
+@import '../ui/SegmentList/LinePartPieceIndicator/LinePartPieceIndicator.scss';
+@import '../ui/SegmentList/LinePartPieceIndicator/PieceIndicatorMenu.scss';
+@import '../ui/SegmentList/SegmentList.scss';
+@import '../ui/SegmentList/LinePartMainPiece/LinePartMainPiece.scss';
+@import '../ui/SegmentList/LinePartTransitionPiece/LinePartTransitionPiece.scss';
+@import '../ui/SegmentList/LinePartSecondaryPiece/LinePartSecondaryPiece.scss';
+@import '../ui/PieceIcons/IconColors.scss';
+@import '../ui/ClockView/CameraScreen/CameraScreen.scss';
+@import '../ui/RundownView/MediaStatusPopUp/MediaStatusPopUpItem.scss';
+@import '../ui/RundownView/MediaStatusPopUp/MediaStatusPopUp.scss';
+@import '../ui/RundownView/MediaStatusPopUp/MediaStatusPopUpHeader.scss';
+@import '../ui/RundownView/MediaStatusPopUp/MediaStatusPopUpSegmentRule.scss';
+@import '../ui/SegmentAdlibTesting/SegmentAdlibTesting.scss';
+
+@import 'rundownView';
+
+body {
+	overscroll-behavior: none;
+	touch-action: pan-x pan-y;
+}
+
+:fullscreen ::-webkit-scrollbar {
+	background: #252627;
+}
+
+:fullscreen ::-webkit-scrollbar-thumb {
+	background: #555;
+	border: 3px solid #252627;
+	border-radius: 10px;
+}
+
+.scroll-sink {
+	overscroll-behavior: none;
+}
+
+/* Don't show visited status, since people will browse around the app a lot */
+a:visited {
+	color: $ui-button-primary;
+}
+
+.header {
+	position: fixed;
+	top: 0;
+	left: 0;
+	right: 0;
+	z-index: 500;
+	user-select: none;
+
+	// position: relative;
+	// z-index: 500;
+}
+.header-clear {
+	padding-top: 4rem;
+	padding-right: $statusbar-width;
+}
+
+#render-target {
+	font-weight: 300;
+
+	h5,
+	.h5,
+	.text-s,
+	.text-s p,
+	.text-s .mod,
+	.text-s .table,
+	.text-s .action-btn,
+	.switch,
+	.pill,
+	.pills .action-btn,
+	.notification,
+	.tooltip,
+	.btn,
+	.btn-tight {
+		font-weight: 300;
+	}
+
+	p,
+	center,
+	.table {
+		font-weight: 300;
+	}
+
+	.checkbox {
+		vertical-align: top;
+
+		&.mod {
+			vertical-align: middle;
+		}
+	}
+
+	.btn,
+	.btn-tight {
+		font-weight: 300;
+	}
+
+	input {
+		&::-webkit-input-placeholder,
+		&::placeholder {
+			color: #bbb;
+		}
+	}
+
+	.scroll-x {
+		overflow-x: auto;
+	}
+}
+
+.origo-pulse {
+	vertical-align: top;
+
+	&.small.left,
+	&.small.right {
+		top: 1px;
+	}
+}
+
+a.selectable {
+	display: block;
+	text-decoration: inherit;
+
+	&:hover,
+	&:active {
+		text-decoration: inherit;
+	}
+}
+
+.btn > svg.svg-inline--fa + span {
+	margin-left: 0.5em;
+}
+
+.switch-button {
+	width: 42px !important;
+	height: 21px !important;
+
+	&.sb-nocolor.sb-on {
+		.sb-content {
+			.sb-label {
+				background-color: #737373;
+			}
+		}
+	}
+
+	.sb-content {
+		width: 42px;
+		height: 21px;
+		> .sb-label {
+			width: 42px;
+			height: 21px;
+		}
+		.sb-switch {
+			width: 19px;
+			height: 19px;
+		}
+	}
+
+	&:active .sb-label {
+		opacity: 0.8;
+	}
+
+	&.sb-on {
+		.sb-switch {
+			transform: matrix(1, 0, 0, 1, 21, 0);
+		}
+	}
+}
diff --git a/meteor/client/styles/modalDialog.scss b/packages/webui/src/client/styles/modalDialog.scss
similarity index 100%
rename from meteor/client/styles/modalDialog.scss
rename to packages/webui/src/client/styles/modalDialog.scss
diff --git a/meteor/client/styles/multiSelect.scss b/packages/webui/src/client/styles/multiSelect.scss
similarity index 100%
rename from meteor/client/styles/multiSelect.scss
rename to packages/webui/src/client/styles/multiSelect.scss
diff --git a/meteor/client/styles/notifications.scss b/packages/webui/src/client/styles/notifications.scss
similarity index 100%
rename from meteor/client/styles/notifications.scss
rename to packages/webui/src/client/styles/notifications.scss
diff --git a/meteor/client/styles/organization.scss b/packages/webui/src/client/styles/organization.scss
similarity index 100%
rename from meteor/client/styles/organization.scss
rename to packages/webui/src/client/styles/organization.scss
diff --git a/meteor/client/styles/overflowingContainer.scss b/packages/webui/src/client/styles/overflowingContainer.scss
similarity index 100%
rename from meteor/client/styles/overflowingContainer.scss
rename to packages/webui/src/client/styles/overflowingContainer.scss
diff --git a/meteor/client/styles/pieceStatusIcon.scss b/packages/webui/src/client/styles/pieceStatusIcon.scss
similarity index 100%
rename from meteor/client/styles/pieceStatusIcon.scss
rename to packages/webui/src/client/styles/pieceStatusIcon.scss
diff --git a/meteor/client/styles/prompter.scss b/packages/webui/src/client/styles/prompter.scss
similarity index 89%
rename from meteor/client/styles/prompter.scss
rename to packages/webui/src/client/styles/prompter.scss
index 2a6c061ce1..a27c915620 100644
--- a/meteor/client/styles/prompter.scss
+++ b/packages/webui/src/client/styles/prompter.scss
@@ -2,13 +2,13 @@
 
 @font-face {
 	font-family: 'Source Serif Pro';
-	src: url('/fonts/Source_Serif_Pro/SourceSerifPro-Regular.woff') format('woff'),
-		/* Pretty Modern Browsers */ url('/fonts/Source_Serif_Pro/SourceSerifPro-Regular.ttf') format('truetype'); /* Safari, Android, iOS */
+	src: url('../../fonts/Source_Serif_Pro/SourceSerifPro-Regular.woff') format('woff'),
+		/* Pretty Modern Browsers */ url('../../fonts/Source_Serif_Pro/SourceSerifPro-Regular.ttf') format('truetype'); /* Safari, Android, iOS */
 }
 @font-face {
 	font-family: 'Overpass';
-	src: url('/fonts/Overpass/Overpass-Regular.woff') format('woff'),
-		/* Pretty Modern Browsers */ url('/fonts/Overpass/Overpass-Regular.ttf') format('truetype'); /* Safari, Android, iOS */
+	src: url('../../fonts/Overpass/Overpass-Regular.woff') format('woff'),
+		/* Pretty Modern Browsers */ url('../../fonts/Overpass/Overpass-Regular.ttf') format('truetype'); /* Safari, Android, iOS */
 }
 
 body.prompter-scrollbar {
@@ -70,6 +70,14 @@ body.prompter-scrollbar {
 		transform: rotate(180deg);
 	}
 
+	.prompter-rundown {
+		font-size: 75%;
+		text-align: center;
+		background: #fff;
+		color: #000;
+		font-weight: bold;
+	}
+
 	.prompter-segment {
 		font-size: 75%;
 		text-align: center;
diff --git a/meteor/client/styles/rundownList.scss b/packages/webui/src/client/styles/rundownList.scss
similarity index 100%
rename from meteor/client/styles/rundownList.scss
rename to packages/webui/src/client/styles/rundownList.scss
diff --git a/meteor/client/styles/rundownSystemStatus.scss b/packages/webui/src/client/styles/rundownSystemStatus.scss
similarity index 100%
rename from meteor/client/styles/rundownSystemStatus.scss
rename to packages/webui/src/client/styles/rundownSystemStatus.scss
diff --git a/meteor/client/styles/rundownView.scss b/packages/webui/src/client/styles/rundownView.scss
similarity index 96%
rename from meteor/client/styles/rundownView.scss
rename to packages/webui/src/client/styles/rundownView.scss
index 6b18b445a1..18e9253a41 100644
--- a/meteor/client/styles/rundownView.scss
+++ b/packages/webui/src/client/styles/rundownView.scss
@@ -36,7 +36,7 @@ $previewline-color: rgb(38, 137, 186);
 /** The top padding of the timeline has to be equal to the header-height, so that the
 	functional part of the timeline starts at the same level as the segment title
 */
-$segment-timeline-padding: $segment-header-height 0 1.5em;
+$segment-timeline-padding: $segment-header-height 0 1.5em 2px;
 
 $segment-layer-height: 1.5em;
 $segment-layer-separator-color: transparentize(#000, 0.5);
@@ -1089,6 +1089,7 @@ svg.icon {
 			$output-layer-group-collapse-animation-duration margin-bottom
 				($output-layer-group-collapse-animation-duration * 1/2);
 		margin-bottom: 1.5em;
+		margin-left: 2px;
 	}
 
 	.segment-timeline__timeline-grid {
@@ -1102,6 +1103,7 @@ svg.icon {
 		min-width: 0;
 		overflow: hidden;
 		margin-bottom: 1.15em;
+		margin-left: 2px;
 
 		opacity: 1;
 		visibility: visible;
@@ -1381,6 +1383,7 @@ svg.icon {
 				position: absolute;
 				top: -10px;
 				left: 0;
+				right: 0;
 				bottom: -1.3em;
 				flex: 0;
 				border-left: 2px solid $part-start-color;
@@ -1393,6 +1396,21 @@ svg.icon {
 					z-index: 30;
 				}
 
+				&.quickloop-start {
+					left: -2px;
+
+					&::before, &::after {
+						z-index: 1;
+						margin-left: 5px;
+						border-left-color: white;
+					}
+					
+					.segment-timeline__part__nextline__label {
+						z-index: 5;
+						left: 5px;
+					}
+				}
+
 				.segment-timeline__part__nextline__label {
 					display: none;
 					position: absolute;
@@ -1436,6 +1454,38 @@ svg.icon {
 					left: -2px;
 					@include take-arrow();
 				}
+
+				.segment-timeline__part__nextline__quickloop-start {
+					border-left: 3px solid white;
+					border-right: 1px solid white;
+					display: block;
+					position: absolute;
+					top: 0;
+					bottom: 0;
+					left: -2px;
+					width: 6px;
+				}
+			}
+
+			.segment-timeline__part__nextline__quickloop-end {
+				border-right: 3px solid white;
+				display: block;
+				position: absolute;
+				top: -12px;
+				bottom: -1.3em;
+				right: 0px;
+				z-index: 40;
+				width: 6px;
+
+				&::before {
+					content: ' ';
+					border-left: 1px solid white;
+					display: block;
+					position: absolute;
+					top: 0;
+					bottom: 0;
+					right: 2px;
+				}
 			}
 
 			.segment-timeline__part__invalid-cover {
@@ -1513,6 +1563,30 @@ svg.icon {
 				z-index: -1;
 			}
 
+			&.quickloop-start {
+				z-index: 1;
+			}
+
+			&.quickloop-end {
+				z-index: 1;
+			}
+
+			&.outside-quickloop {
+				&::before {
+					content: ' ';
+					display: block;
+					position: absolute;
+					top: 0;
+					left: 0;
+					bottom: 0;
+					right: 0;
+					background: rgba(0, 0, 0, 0.5);
+					z-index: 2;
+					pointer-events: none;
+				}
+			}
+
+
 			&:not(.live) {
 				.segment-timeline__part__nextline.auto-next:not(.segment-timeline__part__nextline--endline),
 				.segment-timeline__part__nextline.invalid:not(.segment-timeline__part__nextline--endline) {
@@ -1627,9 +1701,6 @@ svg.icon {
 						> svg {
 							margin-left: 1px;
 							margin-right: 5px;
-							> path {
-								stroke: $general-next-color;
-							}
 						}
 					}
 				}
@@ -1695,6 +1766,11 @@ svg.icon {
 							filter: drop-shadow(2px 2px 0px black) drop-shadow(-2px -2px 0px black) drop-shadow(0 0 5px black);
 						}
 					}
+
+					.segment-timeline__part__nextline__quickloop-start {
+						border-left-color: $general-next-color;
+						border-right-color: $general-next-color;
+					}
 				}
 			}
 
@@ -1732,6 +1808,51 @@ svg.icon {
 				}
 			}
 
+			.segment-timeline__part__bottom-line {
+				min-height: $segment-layer-height;
+				font-weight: 400;
+				display: flex;
+				flex-direction: row;
+				align-items: flex-end;
+				position: absolute;
+				bottom: 0;
+				left: 1px;
+				right: 1px;
+				overflow: hidden;
+
+				.segment-timeline__part__quickloop-background {
+					position: absolute;
+					z-index: -2;
+					min-height: 1em;
+					background-image: linear-gradient(to right, white 20%, rgba(255, 255, 255, 0) 0%);
+					background-position: center left;
+					background-size: 10px 2px;
+					background-repeat: repeat-x;
+					left: 6px;
+					right: 0;
+				}
+
+				.segment-timeline__part__quickloop-start, .segment-timeline__part__quickloop-end {
+					background: $segment-background-color;
+					padding: 0 0.3em;
+					margin-bottom: -2px;
+					white-space: nowrap;
+					color: white;
+				}
+				.segment-timeline__part__quickloop-start {
+					padding-left: 0.6em;
+				}
+
+				.segment-timeline__identifier + .segment-timeline__part__quickloop-start {
+					padding-left: 0.3em;
+				}
+
+				.segment-timeline__part__quickloop-end {
+					padding-right: 0.6em;
+					margin-left: auto
+				}
+			}
+
 			// Group all layers belonging to an output group
 			.segment-timeline__output-group {
 				min-height: $segment-layer-height;
@@ -2149,7 +2270,7 @@ svg.icon {
 					vertical-align: top;
 					margin-right: 0.2em;
 					margin-top: 0.1em;
-					background: $segment-piece-step-counter-background;
+					background: var(--segment-piece-step-counter-background, #{$segment-piece-step-counter-background});
 					display: inline-block;
 					padding: 0 0.3em;
 					color: $segment-piece-step-counter;
@@ -2267,8 +2388,6 @@ svg.icon {
 			}
 
 			.segment-timeline__identifier {
-				position: absolute;
-				bottom: 0;
 				z-index: -1;
 				padding: 0 4px 0 10px;
 				box-sizing: border-box;
@@ -2907,7 +3026,7 @@ svg.icon {
 			position: absolute;
 			top: 0;
 			left: 0;
-			background: $segment-piece-step-counter-background;
+			background: var(--segment-piece-step-counter-background, #{$segment-piece-step-counter-background});
 			padding: 0 0.2em;
 			font-weight: 400;
 			text-shadow: 0 0 1px #000, 0.5px 0.5px 8px rgba(0, 0, 0, 0.8);
@@ -3282,7 +3401,7 @@ svg.icon {
 .segment-storyboard__piece__step-chevron,
 .segment-opl__main-piece__label__step-chevron {
 	margin-right: 0.2em;
-	background: $segment-piece-step-counter-background;
+	background: var(--segment-piece-step-counter-background, #{$segment-piece-step-counter-background});
 	display: inline-block;
 	padding: 0 0.2em;
 	color: $segment-piece-step-counter;
diff --git a/meteor/client/styles/settings.scss b/packages/webui/src/client/styles/settings.scss
similarity index 100%
rename from meteor/client/styles/settings.scss
rename to packages/webui/src/client/styles/settings.scss
diff --git a/meteor/client/styles/shelf/adLibPanel.scss b/packages/webui/src/client/styles/shelf/adLibPanel.scss
similarity index 100%
rename from meteor/client/styles/shelf/adLibPanel.scss
rename to packages/webui/src/client/styles/shelf/adLibPanel.scss
diff --git a/meteor/client/styles/shelf/adLibRegionPanel.scss b/packages/webui/src/client/styles/shelf/adLibRegionPanel.scss
similarity index 100%
rename from meteor/client/styles/shelf/adLibRegionPanel.scss
rename to packages/webui/src/client/styles/shelf/adLibRegionPanel.scss
diff --git a/meteor/client/styles/shelf/colored-box-panel.scss b/packages/webui/src/client/styles/shelf/colored-box-panel.scss
similarity index 100%
rename from meteor/client/styles/shelf/colored-box-panel.scss
rename to packages/webui/src/client/styles/shelf/colored-box-panel.scss
diff --git a/meteor/client/styles/shelf/dashboard-rundownView.scss b/packages/webui/src/client/styles/shelf/dashboard-rundownView.scss
similarity index 100%
rename from meteor/client/styles/shelf/dashboard-rundownView.scss
rename to packages/webui/src/client/styles/shelf/dashboard-rundownView.scss
diff --git a/meteor/client/styles/shelf/dashboard-streamdeck.scss b/packages/webui/src/client/styles/shelf/dashboard-streamdeck.scss
similarity index 100%
rename from meteor/client/styles/shelf/dashboard-streamdeck.scss
rename to packages/webui/src/client/styles/shelf/dashboard-streamdeck.scss
diff --git a/meteor/client/styles/shelf/dashboard.scss b/packages/webui/src/client/styles/shelf/dashboard.scss
similarity index 100%
rename from meteor/client/styles/shelf/dashboard.scss
rename to packages/webui/src/client/styles/shelf/dashboard.scss
diff --git a/meteor/client/styles/shelf/endTimerPanel.scss b/packages/webui/src/client/styles/shelf/endTimerPanel.scss
similarity index 100%
rename from meteor/client/styles/shelf/endTimerPanel.scss
rename to packages/webui/src/client/styles/shelf/endTimerPanel.scss
diff --git a/meteor/client/styles/shelf/endWordsPanel.scss b/packages/webui/src/client/styles/shelf/endWordsPanel.scss
similarity index 100%
rename from meteor/client/styles/shelf/endWordsPanel.scss
rename to packages/webui/src/client/styles/shelf/endWordsPanel.scss
diff --git a/meteor/client/styles/shelf/externalFramePanel.scss b/packages/webui/src/client/styles/shelf/externalFramePanel.scss
similarity index 100%
rename from meteor/client/styles/shelf/externalFramePanel.scss
rename to packages/webui/src/client/styles/shelf/externalFramePanel.scss
diff --git a/meteor/client/styles/shelf/inspector.scss b/packages/webui/src/client/styles/shelf/inspector.scss
similarity index 100%
rename from meteor/client/styles/shelf/inspector.scss
rename to packages/webui/src/client/styles/shelf/inspector.scss
diff --git a/meteor/client/styles/shelf/miniRundownPanel.scss b/packages/webui/src/client/styles/shelf/miniRundownPanel.scss
similarity index 100%
rename from meteor/client/styles/shelf/miniRundownPanel.scss
rename to packages/webui/src/client/styles/shelf/miniRundownPanel.scss
diff --git a/meteor/client/styles/shelf/nextInfoPanel.scss b/packages/webui/src/client/styles/shelf/nextInfoPanel.scss
similarity index 100%
rename from meteor/client/styles/shelf/nextInfoPanel.scss
rename to packages/webui/src/client/styles/shelf/nextInfoPanel.scss
diff --git a/meteor/client/styles/shelf/partCountdownPanel.scss b/packages/webui/src/client/styles/shelf/partCountdownPanel.scss
similarity index 100%
rename from meteor/client/styles/shelf/partCountdownPanel.scss
rename to packages/webui/src/client/styles/shelf/partCountdownPanel.scss
diff --git a/meteor/client/styles/shelf/partNamePanel.scss b/packages/webui/src/client/styles/shelf/partNamePanel.scss
similarity index 100%
rename from meteor/client/styles/shelf/partNamePanel.scss
rename to packages/webui/src/client/styles/shelf/partNamePanel.scss
diff --git a/meteor/client/styles/shelf/partTimingPanel.scss b/packages/webui/src/client/styles/shelf/partTimingPanel.scss
similarity index 100%
rename from meteor/client/styles/shelf/partTimingPanel.scss
rename to packages/webui/src/client/styles/shelf/partTimingPanel.scss
diff --git a/meteor/client/styles/shelf/pieceCountdownPanel.scss b/packages/webui/src/client/styles/shelf/pieceCountdownPanel.scss
similarity index 100%
rename from meteor/client/styles/shelf/pieceCountdownPanel.scss
rename to packages/webui/src/client/styles/shelf/pieceCountdownPanel.scss
diff --git a/meteor/client/styles/shelf/playlistNamePanel.scss b/packages/webui/src/client/styles/shelf/playlistNamePanel.scss
similarity index 100%
rename from meteor/client/styles/shelf/playlistNamePanel.scss
rename to packages/webui/src/client/styles/shelf/playlistNamePanel.scss
diff --git a/meteor/client/styles/shelf/segmentNamePanel.scss b/packages/webui/src/client/styles/shelf/segmentNamePanel.scss
similarity index 100%
rename from meteor/client/styles/shelf/segmentNamePanel.scss
rename to packages/webui/src/client/styles/shelf/segmentNamePanel.scss
diff --git a/meteor/client/styles/shelf/segmentTimingPanel.scss b/packages/webui/src/client/styles/shelf/segmentTimingPanel.scss
similarity index 100%
rename from meteor/client/styles/shelf/segmentTimingPanel.scss
rename to packages/webui/src/client/styles/shelf/segmentTimingPanel.scss
diff --git a/meteor/client/styles/shelf/shelf.scss b/packages/webui/src/client/styles/shelf/shelf.scss
similarity index 100%
rename from meteor/client/styles/shelf/shelf.scss
rename to packages/webui/src/client/styles/shelf/shelf.scss
diff --git a/meteor/client/styles/shelf/showStylePanel.scss b/packages/webui/src/client/styles/shelf/showStylePanel.scss
similarity index 100%
rename from meteor/client/styles/shelf/showStylePanel.scss
rename to packages/webui/src/client/styles/shelf/showStylePanel.scss
diff --git a/meteor/client/styles/shelf/startTimerPanel.scss b/packages/webui/src/client/styles/shelf/startTimerPanel.scss
similarity index 100%
rename from meteor/client/styles/shelf/startTimerPanel.scss
rename to packages/webui/src/client/styles/shelf/startTimerPanel.scss
diff --git a/meteor/client/styles/shelf/studioNamePanel.scss b/packages/webui/src/client/styles/shelf/studioNamePanel.scss
similarity index 100%
rename from meteor/client/styles/shelf/studioNamePanel.scss
rename to packages/webui/src/client/styles/shelf/studioNamePanel.scss
diff --git a/meteor/client/styles/shelf/systemStatusPanel.scss b/packages/webui/src/client/styles/shelf/systemStatusPanel.scss
similarity index 100%
rename from meteor/client/styles/shelf/systemStatusPanel.scss
rename to packages/webui/src/client/styles/shelf/systemStatusPanel.scss
diff --git a/meteor/client/styles/shelf/textLabelPanel.scss b/packages/webui/src/client/styles/shelf/textLabelPanel.scss
similarity index 100%
rename from meteor/client/styles/shelf/textLabelPanel.scss
rename to packages/webui/src/client/styles/shelf/textLabelPanel.scss
diff --git a/meteor/client/styles/shelf/timeOfDayPanel.scss b/packages/webui/src/client/styles/shelf/timeOfDayPanel.scss
similarity index 100%
rename from meteor/client/styles/shelf/timeOfDayPanel.scss
rename to packages/webui/src/client/styles/shelf/timeOfDayPanel.scss
diff --git a/meteor/client/styles/splitDropdown.scss b/packages/webui/src/client/styles/splitDropdown.scss
similarity index 100%
rename from meteor/client/styles/splitDropdown.scss
rename to packages/webui/src/client/styles/splitDropdown.scss
diff --git a/meteor/client/styles/statusNotification.scss b/packages/webui/src/client/styles/statusNotification.scss
similarity index 100%
rename from meteor/client/styles/statusNotification.scss
rename to packages/webui/src/client/styles/statusNotification.scss
diff --git a/meteor/client/styles/statusbar.scss b/packages/webui/src/client/styles/statusbar.scss
similarity index 100%
rename from meteor/client/styles/statusbar.scss
rename to packages/webui/src/client/styles/statusbar.scss
diff --git a/meteor/client/styles/studioScreenSaver.scss b/packages/webui/src/client/styles/studioScreenSaver.scss
similarity index 100%
rename from meteor/client/styles/studioScreenSaver.scss
rename to packages/webui/src/client/styles/studioScreenSaver.scss
diff --git a/meteor/client/styles/supportAndSwitchboardPanel.scss b/packages/webui/src/client/styles/supportAndSwitchboardPanel.scss
similarity index 100%
rename from meteor/client/styles/supportAndSwitchboardPanel.scss
rename to packages/webui/src/client/styles/supportAndSwitchboardPanel.scss
diff --git a/meteor/client/styles/systemStatus.scss b/packages/webui/src/client/styles/systemStatus.scss
similarity index 94%
rename from meteor/client/styles/systemStatus.scss
rename to packages/webui/src/client/styles/systemStatus.scss
index 64a5e4de29..536f5acaec 100644
--- a/meteor/client/styles/systemStatus.scss
+++ b/packages/webui/src/client/styles/systemStatus.scss
@@ -217,30 +217,46 @@
 		min-width: 12em;
 	}
 	.user-action-log__userId {
-		min-width: 5em;
+		min-width: 2em;
 	}
 	.user-action-log__executionTime {
 		min-width: 5em;
 
-		td {
-			white-space: nowrap;
+		> table {
+			width: 100%;
+
+			> tbody > tr:first-child td {
+				border-top: none;
+			}
+
+			td {
+				white-space: nowrap;
+
+				&:first-child {
+					width: 4.5em;
+				}
+			}
 		}
 	}
 	.user-action-log__clientAddress {
-		min-width: 7em;
+		min-width: 8em;
 	}
 	.user-action-log__context {
 		min-width: 10em;
 	}
 	.user-action-log__method {
-		min-width: 23em;
+		min-width: 17em;
 	}
 	.user-action-log__status {
-		min-width: 23em;
+		min-width: 6em;
+	}
+	.user-action-log__args {
+		min-width: 30em;
 	}
 	td.user-action-log__args {
 		position: relative;
-		font-family: 'Consolas', 'Courier New', Courier, monospace;
+		font-family: 'Consolas', 'SF Mono', SFMono-Regular, 'DejaVu Sans Mono', Menlo, ui-monospace, 'Courier New', Courier,
+			monospace;
 		color: #555;
 		white-space: pre;
 		overflow: hidden;
@@ -248,11 +264,8 @@
 		font-size: 0.8em;
 		line-height: 1.7em;
 
-		&:hover {
-			// white-space: normal;
-			overflow: visible;
-			text-overflow: unset;
-			word-break: break-all;
+		pre {
+			margin: 0;
 		}
 	}
 }
diff --git a/meteor/client/styles/testtools.scss b/packages/webui/src/client/styles/testtools.scss
similarity index 100%
rename from meteor/client/styles/testtools.scss
rename to packages/webui/src/client/styles/testtools.scss
diff --git a/meteor/client/styles/tooltips.scss b/packages/webui/src/client/styles/tooltips.scss
similarity index 100%
rename from meteor/client/styles/tooltips.scss
rename to packages/webui/src/client/styles/tooltips.scss
diff --git a/meteor/client/styles/users.scss b/packages/webui/src/client/styles/users.scss
similarity index 100%
rename from meteor/client/styles/users.scss
rename to packages/webui/src/client/styles/users.scss
diff --git a/meteor/client/styles/utils.scss b/packages/webui/src/client/styles/utils.scss
similarity index 100%
rename from meteor/client/styles/utils.scss
rename to packages/webui/src/client/styles/utils.scss
diff --git a/meteor/client/ui/ActiveRundownView.tsx b/packages/webui/src/client/ui/ActiveRundownView.tsx
similarity index 96%
rename from meteor/client/ui/ActiveRundownView.tsx
rename to packages/webui/src/client/ui/ActiveRundownView.tsx
index 04b1ed05ee..0b5cab2624 100644
--- a/meteor/client/ui/ActiveRundownView.tsx
+++ b/packages/webui/src/client/ui/ActiveRundownView.tsx
@@ -1,10 +1,9 @@
-import React from 'react'
 import { NavLink, Route, Switch, useRouteMatch } from 'react-router-dom'
 import { useSubscription, useTracker } from '../lib/ReactMeteorData/ReactMeteorData'
 
 import { Spinner } from '../lib/Spinner'
 import { RundownView } from './RundownView'
-import { MeteorPubSub } from '../../lib/api/pubsub'
+import { MeteorPubSub } from '@sofie-automation/meteor-lib/dist/api/pubsub'
 import { UIStudios } from './Collections'
 import { StudioId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import { RundownPlaylists } from '../collections'
diff --git a/meteor/client/ui/AfterBroadcastForm.tsx b/packages/webui/src/client/ui/AfterBroadcastForm.tsx
similarity index 93%
rename from meteor/client/ui/AfterBroadcastForm.tsx
rename to packages/webui/src/client/ui/AfterBroadcastForm.tsx
index d38b55383a..974bbcc00d 100644
--- a/meteor/client/ui/AfterBroadcastForm.tsx
+++ b/packages/webui/src/client/ui/AfterBroadcastForm.tsx
@@ -2,17 +2,18 @@ import React, { useMemo, useState } from 'react'
 import { Meteor } from 'meteor/meteor'
 import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
 import { TFunction, useTranslation } from 'react-i18next'
-import { EvaluationBase } from '../../lib/collections/Evaluations'
-import { doUserAction, UserAction } from '../../lib/clientUserAction'
-import { MeteorCall } from '../../lib/api/methods'
+import { EvaluationBase } from '@sofie-automation/meteor-lib/dist/collections/Evaluations'
+import { doUserAction, UserAction } from '../lib/clientUserAction'
+import { MeteorCall } from '../lib/meteorApi'
 import { SnapshotId } from '@sofie-automation/corelib/dist/dataModel/Ids'
-import { ClientAPI } from '../../lib/api/client'
-import { hashSingleUseToken } from '../../lib/api/userActions'
+import { ClientAPI } from '@sofie-automation/meteor-lib/dist/api/client'
+import { hashSingleUseToken } from '../lib/lib'
 import { DropdownInputControl, DropdownInputOption, getDropdownInputOptions } from '../lib/Components/DropdownInput'
 import { MultiLineTextInputControl } from '../lib/Components/MultiLineTextInput'
 import { TextInputControl } from '../lib/Components/TextInput'
 import { Spinner } from '../lib/Spinner'
-import { NotificationCenter, Notification, NoticeLevel } from '../../lib/notifications/notifications'
+import { NotificationCenter, Notification, NoticeLevel } from '../lib/notifications/notifications'
+import { isLoopRunning } from '../lib/RundownResolver'
 import { useTracker } from '../lib/ReactMeteorData/ReactMeteorData'
 import { CoreSystem } from '../collections'
 
@@ -26,7 +27,7 @@ const DEFAULT_STATE = {
 
 export function AfterBroadcastForm({ playlist }: Readonly<{ playlist: DBRundownPlaylist }>): JSX.Element {
 	const { t } = useTranslation()
-	const shouldDeactivateRundown = !playlist.loop
+	const shouldDeactivateRundown = isLoopRunning(playlist)
 	const [problems, setProblems] = useState<ProblemType>(DEFAULT_STATE.problems)
 	const [description, setDescription] = useState<string[]>(DEFAULT_STATE.description.slice())
 	const [userName, setUserName] = useState<string>(DEFAULT_STATE.userName)
diff --git a/packages/webui/src/client/ui/App.tsx b/packages/webui/src/client/ui/App.tsx
new file mode 100644
index 0000000000..77c4d7afa7
--- /dev/null
+++ b/packages/webui/src/client/ui/App.tsx
@@ -0,0 +1,294 @@
+import React, { useCallback, useEffect, useState } from 'react'
+import { useTranslation } from 'react-i18next'
+import 'moment/min/locales'
+import { parse as queryStringParse } from 'query-string'
+import Header from './Header'
+import {
+	setAllowSpeaking,
+	setAllowVibrating,
+	setHelpMode,
+	setUIZoom,
+	getUIZoom,
+	setShowHiddenSourceLayers,
+	setIgnorePieceContentStatus,
+	setShelfFollowsOnAir,
+	setReportNotifications,
+	unsetReportNotifications,
+	getShelfFollowsOnAir,
+	getAllowSpeaking,
+	getAllowVibrating,
+	getShowHiddenSourceLayers,
+	getIgnorePieceContentStatus,
+	getHelpMode,
+	getReportNotifications,
+} from '../lib/localStorage'
+import Status from './Status'
+import { Settings as SettingsView } from './Settings'
+import TestTools from './TestTools'
+import { RundownList } from './RundownList'
+import { RundownView } from './RundownView'
+import { ActiveRundownView } from './ActiveRundownView'
+import { ClockView } from './ClockView/ClockView'
+import { ConnectionStatusNotification } from '../lib/ConnectionStatusNotification'
+import { BrowserRouter as Router, Route, Switch, Redirect } from 'react-router-dom'
+import { ErrorBoundary } from '../lib/ErrorBoundary'
+import { PrompterView } from './Prompter/PrompterView'
+import { ModalDialogGlobalContainer, doModalDialog } from '../lib/ModalDialog'
+import { Settings } from '../lib/Settings'
+import { DocumentTitleProvider } from '../lib/DocumentTitleProvider'
+import { catchError, firstIfArray, isRunningInPWA } from '../lib/lib'
+import { protectString } from '@sofie-automation/shared-lib/dist/lib/protectedString'
+import { useUserPermissions, UserPermissionsContext } from './UserPermissions'
+
+const NullComponent = () => null
+
+const CRON_INTERVAL = 30 * 60 * 1000
+const LAST_RESTART_LATENCY = 3 * 60 * 60 * 1000
+const WINDOW_START_HOUR = 3
+const WINDOW_END_HOUR = 5
+
+export const App: React.FC = function App() {
+	const { t } = useTranslation()
+
+	const [lastStart] = useState(Date.now())
+
+	const roles = useUserPermissions()
+	const featureFlags = useFeatureFlags()
+
+	useEffect(() => {
+		function cronJob() {
+			const now = new Date()
+			const hour = now.getHours() + now.getMinutes() / 60
+			// if the time is between 3 and 5
+			if (
+				hour >= WINDOW_START_HOUR &&
+				hour < WINDOW_END_HOUR &&
+				// and the previous restart happened more than 3 hours ago
+				Date.now() - lastStart > LAST_RESTART_LATENCY &&
+				// and not in an active rundown
+				document.querySelector('.rundown.active') === null
+			) {
+				// @ts-expect-error forceReload is marked as deprecated, but it's still usable
+				setTimeout(() => window.location.reload(true), 1)
+			}
+		}
+
+		const interval = setInterval(cronJob, CRON_INTERVAL)
+
+		return () => {
+			clearInterval(interval)
+		}
+	}, [lastStart])
+
+	const mountPWAFullScreenTrigger = useCallback(() => {
+		document.addEventListener(
+			'mousedown',
+			(event) => {
+				event.preventDefault()
+
+				document.documentElement
+					.requestFullscreen({
+						navigationUI: 'auto',
+					})
+					.then(() => {
+						document.addEventListener('fullscreenchange', mountPWAFullScreenTrigger, {
+							once: true,
+						})
+					})
+					.catch(catchError('documentElement.requestFullscreen'))
+
+				// Use Keyboard API to lock the keyboard and disable all browser shortcuts
+				if (!('keyboard' in navigator)) return
+				// but we check for its availability, so it should be fine.
+				// Keyboard Lock: https://wicg.github.io/keyboard-lock/
+				navigator.keyboard.lock().catch(catchError('keyboard.lock'))
+			},
+			{
+				once: true,
+				passive: false,
+			}
+		)
+	}, [])
+
+	useEffect(() => {
+		if (Settings.customizationClassName) {
+			document.body.classList.add(Settings.customizationClassName)
+		}
+		const uiZoom = featureFlags.zoom
+		if (uiZoom !== 1) {
+			document.documentElement.style.fontSize = uiZoom * 16 + 'px'
+		}
+	}, [featureFlags.zoom])
+
+	useEffect(() => {
+		if (isRunningInPWA()) {
+			mountPWAFullScreenTrigger()
+		} else {
+			window.addEventListener('appinstalled', mountPWAFullScreenTrigger)
+
+			return () => {
+				window.removeEventListener('appinstalled', mountPWAFullScreenTrigger)
+			}
+		}
+	}, [mountPWAFullScreenTrigger])
+
+	const onNavigationUserConfirmation = useCallback((message: string, callback: (result: boolean) => void) => {
+		doModalDialog({
+			title: t('Are you sure?'),
+			message,
+			onAccept: () => {
+				callback(true)
+			},
+			onDiscard: () => {
+				callback(false)
+			},
+		})
+	}, [])
+
+	return (
+		<UserPermissionsContext.Provider value={roles}>
+			<Router getUserConfirmation={onNavigationUserConfirmation}>
+				<div className="container-fluid header-clear">
+					{/* Header switch - render the usual header for all pages but the rundown view */}
+					<ErrorBoundary>
+						<Switch>
+							<Route path="/rundown/:playlistId" component={NullComponent} />
+							<Route path="/countdowns/:studioId" component={NullComponent} />
+							<Route path="/activeRundown" component={NullComponent} />
+							<Route path="/prompter/:studioId" component={NullComponent} />
+							<Route
+								path="/"
+								render={(props) => (
+									<Header
+										{...props}
+										allowConfigure={roles.configure}
+										allowTesting={roles.testing}
+										allowDeveloper={roles.developer}
+									/>
+								)}
+							/>
+						</Switch>
+					</ErrorBoundary>
+					{/* Main app switch */}
+					<ErrorBoundary>
+						<Switch>
+							<Route exact path="/" component={RundownList} />
+							<Route path="/rundowns" render={() => <RundownList />} />
+							<Route
+								path="/rundown/:playlistId/shelf"
+								exact
+								render={(props) => (
+									<RundownView
+										playlistId={protectString(decodeURIComponent(props.match.params.playlistId))}
+										onlyShelf={true}
+									/>
+								)}
+							/>
+							<Route
+								path="/rundown/:playlistId"
+								render={(props) => (
+									<RundownView playlistId={protectString(decodeURIComponent(props.match.params.playlistId))} />
+								)}
+							/>
+							<Route
+								path="/activeRundown/:studioId"
+								render={(props) => (
+									<ActiveRundownView studioId={protectString(decodeURIComponent(props.match.params.studioId))} />
+								)}
+							/>
+							<Route
+								path="/prompter/:studioId"
+								render={(props) => (
+									<PrompterView studioId={protectString(decodeURIComponent(props.match.params.studioId))} />
+								)}
+							/>
+							{/* We switch to the general ClockView component, and allow it to do the switch between various types of countdowns */}
+							<Route
+								path="/countdowns/:studioId"
+								render={(props) => (
+									<ClockView studioId={protectString(decodeURIComponent(props.match.params.studioId))} />
+								)}
+							/>
+							<Route path="/status" render={() => <Status />} />
+							<Route path="/settings" render={() => <SettingsView />} />
+							<Route path="/testTools" render={() => <TestTools />} />
+							<Route>
+								<Redirect to="/" />
+							</Route>
+						</Switch>
+					</ErrorBoundary>
+					<ErrorBoundary>
+						<Switch>
+							{/* Put views that should NOT have the Notification center here: */}
+							<Route path="/countdowns/:studioId" component={NullComponent} />
+							<Route path="/prompter/:studioId" component={NullComponent} />
+							<Route path="/" component={ConnectionStatusNotification} />
+						</Switch>
+					</ErrorBoundary>
+					<ErrorBoundary>
+						<DocumentTitleProvider />
+					</ErrorBoundary>
+					<ErrorBoundary>
+						<ModalDialogGlobalContainer />
+					</ErrorBoundary>
+				</div>
+			</Router>
+		</UserPermissionsContext.Provider>
+	)
+}
+
+function useFeatureFlags() {
+	const location = window.location
+
+	const [featureFlags, setFeatureFlags] = useState({
+		shelfFollowsOnAir: getShelfFollowsOnAir(),
+		speak: getAllowSpeaking(),
+		vibrate: getAllowVibrating(),
+		help: getHelpMode(),
+		zoom: getUIZoom(),
+		showHiddenSourceLayers: getShowHiddenSourceLayers(),
+		ignorePieceContentStatus: getIgnorePieceContentStatus(),
+		reportNotifications: getReportNotifications(),
+	})
+
+	useEffect(() => {
+		if (!location.search) return
+
+		const params = queryStringParse(location.search)
+
+		if (params['shelffollowsonair']) setShelfFollowsOnAir(params['shelffollowsonair'] === '1')
+		if (params['speak']) setAllowSpeaking(params['speak'] === '1')
+		if (params['vibrate']) setAllowVibrating(params['vibrate'] === '1')
+		if (params['help']) setHelpMode(params['help'] === '1')
+		if (params['zoom'] && typeof params['zoom'] === 'string') {
+			setUIZoom(parseFloat(firstIfArray(params['zoom']) || '1') / 100 || 1)
+		}
+		if (params['show_hidden_source_layers']) {
+			setShowHiddenSourceLayers(params['show_hidden_source_layers'] === '1')
+		}
+		if (params['ignore_piece_content_status']) {
+			setIgnorePieceContentStatus(params['ignore_piece_content_status'] === '1')
+		}
+		if (params['reportNotificationsId'] && params['reportNotificationsId'] !== '0') {
+			const notificationsId = firstIfArray(params['reportNotificationsId'])
+			if (notificationsId) setReportNotifications(notificationsId)
+		} else if (params['reportNotificationsId'] === '0') {
+			unsetReportNotifications()
+		}
+
+		setFeatureFlags({
+			shelfFollowsOnAir: getShelfFollowsOnAir(),
+			speak: getAllowSpeaking(),
+			vibrate: getAllowVibrating(),
+			help: getHelpMode(),
+			zoom: getUIZoom(),
+			showHiddenSourceLayers: getShowHiddenSourceLayers(),
+			ignorePieceContentStatus: getIgnorePieceContentStatus(),
+			reportNotifications: getReportNotifications(),
+		})
+	}, [location.search])
+
+	return featureFlags
+}
+
+export default App
diff --git a/meteor/client/ui/ClipTrimPanel/ClipTrimDialog.tsx b/packages/webui/src/client/ui/ClipTrimPanel/ClipTrimDialog.tsx
similarity index 91%
rename from meteor/client/ui/ClipTrimPanel/ClipTrimDialog.tsx
rename to packages/webui/src/client/ui/ClipTrimPanel/ClipTrimDialog.tsx
index 45ba2b7f75..8c5e023dc9 100644
--- a/meteor/client/ui/ClipTrimPanel/ClipTrimDialog.tsx
+++ b/packages/webui/src/client/ui/ClipTrimPanel/ClipTrimDialog.tsx
@@ -1,17 +1,17 @@
-import React, { useCallback, useState } from 'react'
+import { useCallback, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import { ClipTrimPanel } from './ClipTrimPanel'
 import { VTContent } from '@sofie-automation/blueprints-integration'
 import { ModalDialog, SomeEvent } from '../../lib/ModalDialog'
-import { doUserAction, UserAction } from '../../../lib/clientUserAction'
-import { MeteorCall } from '../../../lib/api/methods'
-import { NotificationCenter, Notification, NoticeLevel } from '../../../lib/notifications/notifications'
-import { protectString } from '../../../lib/lib'
+import { doUserAction, UserAction } from '../../lib/clientUserAction'
+import { MeteorCall } from '../../lib/meteorApi'
+import { NotificationCenter, Notification, NoticeLevel } from '../../lib/notifications/notifications'
+import { protectString } from '../../lib/tempLib'
 import { stringifyError } from '@sofie-automation/shared-lib/dist/lib/stringifyError'
-import { ClientAPI } from '../../../lib/api/client'
+import { ClientAPI } from '@sofie-automation/meteor-lib/dist/api/client'
 import { Rundown, getRundownNrcsName } from '@sofie-automation/corelib/dist/dataModel/Rundown'
 import { PieceInstancePiece } from '@sofie-automation/corelib/dist/dataModel/PieceInstance'
-import { UIStudio } from '../../../lib/api/studios'
+import { UIStudio } from '@sofie-automation/meteor-lib/dist/api/studios'
 import { RundownPlaylistId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import { ReadonlyDeep } from 'type-fest'
 
diff --git a/meteor/client/ui/ClipTrimPanel/ClipTrimPanel.scss b/packages/webui/src/client/ui/ClipTrimPanel/ClipTrimPanel.scss
similarity index 100%
rename from meteor/client/ui/ClipTrimPanel/ClipTrimPanel.scss
rename to packages/webui/src/client/ui/ClipTrimPanel/ClipTrimPanel.scss
diff --git a/meteor/client/ui/ClipTrimPanel/ClipTrimPanel.tsx b/packages/webui/src/client/ui/ClipTrimPanel/ClipTrimPanel.tsx
similarity index 98%
rename from meteor/client/ui/ClipTrimPanel/ClipTrimPanel.tsx
rename to packages/webui/src/client/ui/ClipTrimPanel/ClipTrimPanel.tsx
index 3b3d080e27..43235f9bce 100644
--- a/meteor/client/ui/ClipTrimPanel/ClipTrimPanel.tsx
+++ b/packages/webui/src/client/ui/ClipTrimPanel/ClipTrimPanel.tsx
@@ -1,11 +1,11 @@
-import React, { useCallback, useMemo } from 'react'
+import { useCallback, useMemo } from 'react'
 import { VTContent } from '@sofie-automation/blueprints-integration'
 import { VideoEditMonitor } from './VideoEditMonitor'
 import { TimecodeEncoder } from './TimecodeEncoder'
 import { faUndo } from '@fortawesome/free-solid-svg-icons'
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
 import Tooltip from 'rc-tooltip'
-import { UIStudio } from '../../../lib/api/studios'
+import { UIStudio } from '@sofie-automation/meteor-lib/dist/api/studios'
 import { useTranslation } from 'react-i18next'
 import { useContentStatusForPiece } from '../SegmentTimeline/withMediaObjectStatus'
 import { useSubscription, useTracker } from '../../lib/ReactMeteorData/ReactMeteorData'
diff --git a/meteor/client/ui/ClipTrimPanel/TimecodeEncoder.scss b/packages/webui/src/client/ui/ClipTrimPanel/TimecodeEncoder.scss
similarity index 100%
rename from meteor/client/ui/ClipTrimPanel/TimecodeEncoder.scss
rename to packages/webui/src/client/ui/ClipTrimPanel/TimecodeEncoder.scss
diff --git a/meteor/client/ui/ClipTrimPanel/TimecodeEncoder.tsx b/packages/webui/src/client/ui/ClipTrimPanel/TimecodeEncoder.tsx
similarity index 100%
rename from meteor/client/ui/ClipTrimPanel/TimecodeEncoder.tsx
rename to packages/webui/src/client/ui/ClipTrimPanel/TimecodeEncoder.tsx
diff --git a/meteor/client/ui/ClipTrimPanel/VideoEditMonitor.scss b/packages/webui/src/client/ui/ClipTrimPanel/VideoEditMonitor.scss
similarity index 100%
rename from meteor/client/ui/ClipTrimPanel/VideoEditMonitor.scss
rename to packages/webui/src/client/ui/ClipTrimPanel/VideoEditMonitor.scss
diff --git a/meteor/client/ui/ClipTrimPanel/VideoEditMonitor.tsx b/packages/webui/src/client/ui/ClipTrimPanel/VideoEditMonitor.tsx
similarity index 100%
rename from meteor/client/ui/ClipTrimPanel/VideoEditMonitor.tsx
rename to packages/webui/src/client/ui/ClipTrimPanel/VideoEditMonitor.tsx
diff --git a/meteor/client/ui/ClockView/CameraScreen/CameraScreen.scss b/packages/webui/src/client/ui/ClockView/CameraScreen/CameraScreen.scss
similarity index 100%
rename from meteor/client/ui/ClockView/CameraScreen/CameraScreen.scss
rename to packages/webui/src/client/ui/ClockView/CameraScreen/CameraScreen.scss
diff --git a/meteor/client/ui/ClockView/CameraScreen/OrderedPartsProvider.tsx b/packages/webui/src/client/ui/ClockView/CameraScreen/OrderedPartsProvider.tsx
similarity index 100%
rename from meteor/client/ui/ClockView/CameraScreen/OrderedPartsProvider.tsx
rename to packages/webui/src/client/ui/ClockView/CameraScreen/OrderedPartsProvider.tsx
diff --git a/meteor/client/ui/ClockView/CameraScreen/Part.tsx b/packages/webui/src/client/ui/ClockView/CameraScreen/Part.tsx
similarity index 91%
rename from meteor/client/ui/ClockView/CameraScreen/Part.tsx
rename to packages/webui/src/client/ui/ClockView/CameraScreen/Part.tsx
index 7533af701b..bc3680ca6a 100644
--- a/meteor/client/ui/ClockView/CameraScreen/Part.tsx
+++ b/packages/webui/src/client/ui/ClockView/CameraScreen/Part.tsx
@@ -1,13 +1,13 @@
 import { unprotectString } from '@sofie-automation/corelib/dist/protectedString'
 import classNames from 'classnames'
-import React, { useContext } from 'react'
+import { useContext } from 'react'
 import { AreaZoom } from '.'
 import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
-import { PieceExtended } from '../../../../lib/Rundown'
+import { PieceExtended } from '../../../lib/RundownResolver'
 import { getAllowSpeaking, getAllowVibrating } from '../../../lib/localStorage'
 import { getPartInstanceTimingValue } from '../../../lib/rundownTiming'
 import { AutoNextStatus } from '../../RundownView/RundownTiming/AutoNextStatus'
-import { CurrentPartRemaining } from '../../RundownView/RundownTiming/CurrentPartRemaining'
+import { CurrentPartOrSegmentRemaining } from '../../RundownView/RundownTiming/CurrentPartOrSegmentRemaining'
 import { PartCountdown } from '../../RundownView/RundownTiming/PartCountdown'
 import { PartDisplayDuration } from '../../RundownView/RundownTiming/PartDuration'
 import { TimingDataResolution, TimingTickResolution, withTiming } from '../../RundownView/RundownTiming/withTiming'
@@ -70,7 +70,7 @@ export const Part = withTiming<IProps, {}>({
 						<span className="camera-screen__part-take-mode">
 							<AutoNextStatus />
 						</span>
-						<CurrentPartRemaining
+						<CurrentPartOrSegmentRemaining
 							currentPartInstanceId={part.instance._id}
 							speaking={getAllowSpeaking()}
 							vibrating={getAllowVibrating()}
diff --git a/meteor/client/ui/ClockView/CameraScreen/Piece.tsx b/packages/webui/src/client/ui/ClockView/CameraScreen/Piece.tsx
similarity index 97%
rename from meteor/client/ui/ClockView/CameraScreen/Piece.tsx
rename to packages/webui/src/client/ui/ClockView/CameraScreen/Piece.tsx
index da023679c6..1b488a8c87 100644
--- a/meteor/client/ui/ClockView/CameraScreen/Piece.tsx
+++ b/packages/webui/src/client/ui/ClockView/CameraScreen/Piece.tsx
@@ -2,7 +2,7 @@ import React, { useContext, useMemo } from 'react'
 import { PartId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import classNames from 'classnames'
 import { CanvasSizeContext } from '.'
-import { PieceExtended } from '../../../../lib/Rundown'
+import { PieceExtended } from '../../../lib/RundownResolver'
 import { PieceElement } from '../../SegmentContainer/PieceElement'
 import { getSplitItems } from '../../SegmentContainer/getSplitItems'
 
diff --git a/meteor/client/ui/ClockView/CameraScreen/Rundown.tsx b/packages/webui/src/client/ui/ClockView/CameraScreen/Rundown.tsx
similarity index 95%
rename from meteor/client/ui/ClockView/CameraScreen/Rundown.tsx
rename to packages/webui/src/client/ui/ClockView/CameraScreen/Rundown.tsx
index 2001cfd9b1..348e7d72a4 100644
--- a/meteor/client/ui/ClockView/CameraScreen/Rundown.tsx
+++ b/packages/webui/src/client/ui/ClockView/CameraScreen/Rundown.tsx
@@ -1,7 +1,7 @@
-import React, { useContext } from 'react'
+import { useContext } from 'react'
 import { useSubscription, useTracker } from '../../../lib/ReactMeteorData/ReactMeteorData'
 import { Rundown as RundownObj } from '@sofie-automation/corelib/dist/dataModel/Rundown'
-import { MeteorPubSub } from '../../../../lib/api/pubsub'
+import { MeteorPubSub } from '@sofie-automation/meteor-lib/dist/api/pubsub'
 import { Segments } from '../../../collections'
 import { DBSegment } from '@sofie-automation/corelib/dist/dataModel/Segment'
 import { Segment as SegmentComponent } from './Segment'
diff --git a/meteor/client/ui/ClockView/CameraScreen/Segment.tsx b/packages/webui/src/client/ui/ClockView/CameraScreen/Segment.tsx
similarity index 98%
rename from meteor/client/ui/ClockView/CameraScreen/Segment.tsx
rename to packages/webui/src/client/ui/ClockView/CameraScreen/Segment.tsx
index be7d7d087b..971126281f 100644
--- a/meteor/client/ui/ClockView/CameraScreen/Segment.tsx
+++ b/packages/webui/src/client/ui/ClockView/CameraScreen/Segment.tsx
@@ -1,6 +1,6 @@
 import { unprotectString } from '@sofie-automation/corelib/dist/protectedString'
 import classNames from 'classnames'
-import React, { useContext, useMemo } from 'react'
+import { useContext, useMemo } from 'react'
 import { ActivePartInstancesContext, PieceFilter } from '.'
 import {
 	withResolvedSegment,
diff --git a/meteor/client/ui/ClockView/CameraScreen/index.tsx b/packages/webui/src/client/ui/ClockView/CameraScreen/index.tsx
similarity index 93%
rename from meteor/client/ui/ClockView/CameraScreen/index.tsx
rename to packages/webui/src/client/ui/ClockView/CameraScreen/index.tsx
index 029395b67e..b6e9c21903 100644
--- a/meteor/client/ui/ClockView/CameraScreen/index.tsx
+++ b/packages/webui/src/client/ui/ClockView/CameraScreen/index.tsx
@@ -3,17 +3,17 @@ import { CameraContent, RemoteContent, SourceLayerType, SplitsContent } from '@s
 import { RundownId, ShowStyleBaseId, StudioId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import { Rundown } from '@sofie-automation/corelib/dist/dataModel/Rundown'
 import { unprotectString } from '@sofie-automation/corelib/dist/protectedString'
-import { MeteorPubSub } from '../../../../lib/api/pubsub'
-import { UIStudio } from '../../../../lib/api/studios'
+import { MeteorPubSub } from '@sofie-automation/meteor-lib/dist/api/pubsub'
+import { UIStudio } from '@sofie-automation/meteor-lib/dist/api/studios'
 import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
-import { PieceExtended } from '../../../../lib/Rundown'
-import { PartInstances, Rundowns } from '../../../collections'
+import { PieceExtended } from '../../../lib/RundownResolver'
+import { Rundowns } from '../../../collections'
 import { useSubscription, useTracker } from '../../../lib/ReactMeteorData/ReactMeteorData'
-import { UIStudios } from '../../Collections'
+import { UIPartInstances, UIStudios } from '../../Collections'
 import { Rundown as RundownComponent } from './Rundown'
 import { useLocation } from 'react-router-dom'
 import { parse as queryStringParse } from 'query-string'
-import { PartInstance } from '../../../../lib/collections/PartInstances'
+import { PartInstance } from '@sofie-automation/meteor-lib/dist/collections/PartInstances'
 import { OrderedPartsProvider } from './OrderedPartsProvider'
 import { offElementResize, onElementResize } from '../../../lib/resizeObserver'
 import { useTranslation } from 'react-i18next'
@@ -100,7 +100,7 @@ export function CameraScreen({ playlist, studioId }: Readonly<IProps>): JSX.Elem
 	useSubscription(CorelibPubSub.segments, rundownIds, {})
 
 	const studioReady = useSubscription(MeteorPubSub.uiStudio, studioId)
-	useSubscription(CorelibPubSub.partInstances, rundownIds, playlist?.activationId ?? null)
+	useSubscription(MeteorPubSub.uiPartInstances, rundownIds, playlist?.activationId ?? null)
 
 	useSubscription(CorelibPubSub.parts, rundownIds, null)
 
@@ -116,7 +116,7 @@ export function CameraScreen({ playlist, studioId }: Readonly<IProps>): JSX.Elem
 	const currentPartInstanceVolatile = useTracker(
 		() =>
 			playlist?.currentPartInfo?.partInstanceId
-				? PartInstances.findOne(playlist?.currentPartInfo?.partInstanceId)
+				? UIPartInstances.findOne(playlist?.currentPartInfo?.partInstanceId)
 				: undefined,
 		[playlist?.currentPartInfo?.partInstanceId],
 		undefined
@@ -124,7 +124,7 @@ export function CameraScreen({ playlist, studioId }: Readonly<IProps>): JSX.Elem
 	const nextPartInstanceVolatile = useTracker(
 		() =>
 			playlist?.nextPartInfo?.partInstanceId
-				? PartInstances.findOne(playlist?.nextPartInfo?.partInstanceId)
+				? UIPartInstances.findOne(playlist?.nextPartInfo?.partInstanceId)
 				: undefined,
 		[playlist?.nextPartInfo?.partInstanceId],
 		undefined
diff --git a/meteor/client/ui/ClockView/CameraScreen/useWakeLock.ts b/packages/webui/src/client/ui/ClockView/CameraScreen/useWakeLock.ts
similarity index 94%
rename from meteor/client/ui/ClockView/CameraScreen/useWakeLock.ts
rename to packages/webui/src/client/ui/ClockView/CameraScreen/useWakeLock.ts
index 778e4a41c2..36576bf00f 100644
--- a/meteor/client/ui/ClockView/CameraScreen/useWakeLock.ts
+++ b/packages/webui/src/client/ui/ClockView/CameraScreen/useWakeLock.ts
@@ -24,7 +24,7 @@ export function useWakeLock(): void {
 
 		return () => {
 			if (wakeLockRef.current !== null) {
-				wakeLockRef.current.release()
+				wakeLockRef.current.release().catch(() => null)
 				wakeLockRef.current = null
 			}
 
diff --git a/meteor/client/ui/ClockView/ClockView.tsx b/packages/webui/src/client/ui/ClockView/ClockView.tsx
similarity index 95%
rename from meteor/client/ui/ClockView/ClockView.tsx
rename to packages/webui/src/client/ui/ClockView/ClockView.tsx
index dcdddf5ede..8b80da1cef 100644
--- a/meteor/client/ui/ClockView/ClockView.tsx
+++ b/packages/webui/src/client/ui/ClockView/ClockView.tsx
@@ -1,4 +1,3 @@
-import React from 'react'
 import { Switch, Route, Redirect } from 'react-router-dom'
 import { useSubscription, useTracker } from '../../lib/ReactMeteorData/react-meteor-data'
 
@@ -11,7 +10,7 @@ import { OverlayScreenSaver } from './OverlayScreenSaver'
 import { RundownPlaylists } from '../../collections'
 import { StudioId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import { CameraScreen } from './CameraScreen'
-import { MeteorPubSub } from '../../../lib/api/pubsub'
+import { MeteorPubSub } from '@sofie-automation/meteor-lib/dist/api/pubsub'
 
 export function ClockView({ studioId }: Readonly<{ studioId: StudioId }>): JSX.Element {
 	useSubscription(MeteorPubSub.rundownPlaylistForStudio, studioId, true)
diff --git a/meteor/client/ui/ClockView/OverlayScreen.tsx b/packages/webui/src/client/ui/ClockView/OverlayScreen.tsx
similarity index 99%
rename from meteor/client/ui/ClockView/OverlayScreen.tsx
rename to packages/webui/src/client/ui/ClockView/OverlayScreen.tsx
index c1b976bfa6..8014b980de 100644
--- a/meteor/client/ui/ClockView/OverlayScreen.tsx
+++ b/packages/webui/src/client/ui/ClockView/OverlayScreen.tsx
@@ -1,4 +1,4 @@
-import React, { useEffect } from 'react'
+import { useEffect } from 'react'
 import Moment from 'react-moment'
 import { useTranslation } from 'react-i18next'
 import { WithTiming, withTiming } from '../RundownView/RundownTiming/withTiming'
diff --git a/meteor/client/ui/ClockView/OverlayScreenSaver.tsx b/packages/webui/src/client/ui/ClockView/OverlayScreenSaver.tsx
similarity index 95%
rename from meteor/client/ui/ClockView/OverlayScreenSaver.tsx
rename to packages/webui/src/client/ui/ClockView/OverlayScreenSaver.tsx
index 473f21a37b..68d90af340 100644
--- a/meteor/client/ui/ClockView/OverlayScreenSaver.tsx
+++ b/packages/webui/src/client/ui/ClockView/OverlayScreenSaver.tsx
@@ -1,9 +1,8 @@
-import React, { useEffect, useRef } from 'react'
+import { useEffect, useRef } from 'react'
 import { Clock } from '../StudioScreenSaver/Clock'
 import { useTracker, useSubscription } from '../../lib/ReactMeteorData/ReactMeteorData'
-import { MeteorPubSub } from '../../../lib/api/pubsub'
+import { MeteorPubSub } from '@sofie-automation/meteor-lib/dist/api/pubsub'
 import { findNextPlaylist } from '../StudioScreenSaver/StudioScreenSaver'
-// @ts-expect-error No types available
 import Velocity from 'velocity-animate'
 import { StudioId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import { useSetDocumentClass } from '../util/useSetDocumentClass'
diff --git a/meteor/client/ui/ClockView/PresenterScreen.tsx b/packages/webui/src/client/ui/ClockView/PresenterScreen.tsx
similarity index 92%
rename from meteor/client/ui/ClockView/PresenterScreen.tsx
rename to packages/webui/src/client/ui/ClockView/PresenterScreen.tsx
index 88b1f73cbb..02eaff0486 100644
--- a/meteor/client/ui/ClockView/PresenterScreen.tsx
+++ b/packages/webui/src/client/ui/ClockView/PresenterScreen.tsx
@@ -1,4 +1,3 @@
-import React from 'react'
 import ClassNames from 'classnames'
 import { DBSegment } from '@sofie-automation/corelib/dist/dataModel/Segment'
 import { PartUi } from '../SegmentTimeline/SegmentTimelineContainer'
@@ -6,9 +5,10 @@ import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/Rund
 import { Rundown } from '@sofie-automation/corelib/dist/dataModel/Rundown'
 import { withTiming, WithTiming } from '../RundownView/RundownTiming/withTiming'
 import { useSubscription, useSubscriptions, useTracker, withTracker } from '../../lib/ReactMeteorData/ReactMeteorData'
-import { extendMandadory, getCurrentTime, protectString, unprotectString } from '../../../lib/lib'
-import { PartInstance } from '../../../lib/collections/PartInstances'
-import { MeteorPubSub } from '../../../lib/api/pubsub'
+import { protectString, unprotectString } from '@sofie-automation/shared-lib/dist/lib/protectedString'
+import { getCurrentTime } from '../../lib/systemTime'
+import { PartInstance } from '@sofie-automation/meteor-lib/dist/collections/PartInstances'
+import { MeteorPubSub } from '@sofie-automation/meteor-lib/dist/api/pubsub'
 import { PieceIconContainer } from '../PieceIcons/PieceIcon'
 import { PieceNameContainer } from '../PieceIcons/PieceName'
 import { Timediff } from './Timediff'
@@ -17,7 +17,7 @@ import { PieceLifespan } from '@sofie-automation/blueprints-integration'
 import { DBPart } from '@sofie-automation/corelib/dist/dataModel/Part'
 import { PieceCountdownContainer } from '../PieceIcons/PieceCountdown'
 import { PlaylistTiming } from '@sofie-automation/corelib/dist/playout/rundownTiming'
-import { DashboardLayout, RundownLayoutBase } from '../../../lib/collections/RundownLayouts'
+import { DashboardLayout, RundownLayoutBase } from '@sofie-automation/meteor-lib/dist/collections/RundownLayouts'
 import {
 	RundownId,
 	RundownLayoutId,
@@ -27,19 +27,20 @@ import {
 	StudioId,
 } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import { DBShowStyleVariant } from '@sofie-automation/corelib/dist/dataModel/ShowStyleVariant'
-import { RundownLayoutsAPI } from '../../../lib/api/rundownLayouts'
+import { RundownLayoutsAPI } from '../../lib/rundownLayouts'
 import { ShelfDashboardLayout } from '../Shelf/ShelfDashboardLayout'
 import { parse as queryStringParse } from 'query-string'
-import { calculatePartInstanceExpectedDurationWithPreroll } from '@sofie-automation/corelib/dist/playout/timings'
+import { calculatePartInstanceExpectedDurationWithTransition } from '@sofie-automation/corelib/dist/playout/timings'
 import { getPlaylistTimingDiff } from '../../lib/rundownTiming'
-import { UIShowStyleBase } from '../../../lib/api/showStyles'
+import { UIShowStyleBase } from '@sofie-automation/meteor-lib/dist/api/showStyles'
 import { UIShowStyleBases, UIStudios } from '../Collections'
-import { UIStudio } from '../../../lib/api/studios'
+import { UIStudio } from '@sofie-automation/meteor-lib/dist/api/studios'
 import { PieceInstances, RundownLayouts, RundownPlaylists, Rundowns, ShowStyleVariants } from '../../collections'
-import { RundownPlaylistCollectionUtil } from '../../../lib/collections/rundownPlaylistUtil'
+import { RundownPlaylistCollectionUtil } from '../../collections/rundownPlaylistUtil'
 import { CorelibPubSub } from '@sofie-automation/corelib/dist/pubsub'
 import { useSetDocumentClass } from '../util/useSetDocumentClass'
 import { useRundownAndShowStyleIdsForPlaylist } from '../util/useRundownAndShowStyleIdsForPlaylist'
+import { RundownPlaylistClientUtil } from '../../lib/rundownPlaylistUtil'
 
 interface SegmentUi extends DBSegment {
 	items: Array<PartUi>
@@ -137,9 +138,10 @@ function getShowStyleBaseIdSegmentPartUi(
 				true
 			)
 
-			segment = extendMandadory<DBSegment, SegmentUi>(o.segmentExtended, {
+			segment = {
+				...o.segmentExtended,
 				items: o.parts,
-			})
+			}
 
 			partInstanceUi = o.parts.find((part) => part.instance._id === partInstance._id)
 		}
@@ -192,14 +194,14 @@ export const getPresenterScreenReactive = (props: PresenterScreenProps): Present
 
 	if (playlist) {
 		rundowns = RundownPlaylistCollectionUtil.getRundownsOrdered(playlist)
-		const orderedSegmentsAndParts = RundownPlaylistCollectionUtil.getSegmentsAndPartsSync(playlist)
+		const orderedSegmentsAndParts = RundownPlaylistClientUtil.getSegmentsAndPartsSync(playlist)
 		rundownIds = rundowns.map((rundown) => rundown._id)
 		const rundownsToShowstyles: Map<RundownId, ShowStyleBaseId> = new Map()
 		for (const rundown of rundowns) {
 			rundownsToShowstyles.set(rundown._id, rundown.showStyleBaseId)
 		}
 		showStyleBaseIds = rundowns.map((rundown) => rundown.showStyleBaseId)
-		const { currentPartInstance, nextPartInstance } = RundownPlaylistCollectionUtil.getSelectedPartInstances(playlist)
+		const { currentPartInstance, nextPartInstance } = RundownPlaylistClientUtil.getSelectedPartInstances(playlist)
 		const partInstance = currentPartInstance ?? nextPartInstance
 		if (partInstance) {
 			// This is to register a reactive dependency on Rundown-spanning PieceInstances, that we may miss otherwise.
@@ -339,7 +341,7 @@ export function usePresenterScreenSubscriptions(props: PresenterScreenProps): vo
 
 	useSubscription(CorelibPubSub.segments, rundownIds, {})
 	useSubscription(CorelibPubSub.parts, rundownIds, null)
-	useSubscription(CorelibPubSub.partInstances, rundownIds, playlist?.activationId ?? null)
+	useSubscription(MeteorPubSub.uiPartInstances, rundownIds, playlist?.activationId ?? null)
 	useSubscriptions(
 		MeteorPubSub.uiShowStyleBase,
 		showStyleBaseIds.map((id) => [id])
@@ -359,7 +361,7 @@ export function usePresenterScreenSubscriptions(props: PresenterScreenProps): vo
 			}) as Pick<DBRundownPlaylist, '_id' | 'currentPartInfo' | 'nextPartInfo' | 'previousPartInfo'> | undefined
 
 			if (playlist) {
-				return RundownPlaylistCollectionUtil.getSelectedPartInstances(playlist)
+				return RundownPlaylistClientUtil.getSelectedPartInstances(playlist)
 			} else {
 				return { currentPartInstance: undefined, nextPartInstance: undefined, previousPartInstance: undefined }
 			}
@@ -422,10 +424,8 @@ function PresenterScreenContentDefaultLayout({
 	rundownIds,
 }: Readonly<WithTiming<PresenterScreenProps & PresenterScreenTrackedProps>>) {
 	if (playlist && playlistId && segments) {
-		let currentPartCountdown = 0
-		if (currentPartInstance) {
-			currentPartCountdown = timingDurations.remainingTimeOnCurrentPart || 0
-		}
+		const currentPartOrSegmentCountdown =
+			timingDurations.remainingBudgetOnCurrentSegment ?? timingDurations.remainingTimeOnCurrentPart ?? 0
 
 		const expectedStart = PlaylistTiming.getExpectedStart(playlist.timing)
 		const overUnderClock = getPlaylistTimingDiff(playlist, timingDurations) ?? 0
@@ -465,13 +465,15 @@ function PresenterScreenContentDefaultLayout({
 									showStyleBaseId={currentShowStyleBaseId}
 									rundownIds={rundownIds}
 									partAutoNext={currentPartInstance.instance.part.autoNext || false}
-									partExpectedDuration={calculatePartInstanceExpectedDurationWithPreroll(currentPartInstance.instance)}
+									partExpectedDuration={calculatePartInstanceExpectedDurationWithTransition(
+										currentPartInstance.instance
+									)}
 									partStartedPlayback={currentPartInstance.instance.timings?.plannedStartedPlayback}
 									playlistActivationId={playlist?.activationId}
 								/>
 							</div>
 							<div className="presenter-screen__part__part-countdown">
-								<Timediff time={currentPartCountdown} />
+								<Timediff time={currentPartOrSegmentCountdown} />
 							</div>
 						</>
 					) : expectedStart ? (
diff --git a/meteor/client/ui/ClockView/Timediff.tsx b/packages/webui/src/client/ui/ClockView/Timediff.tsx
similarity index 100%
rename from meteor/client/ui/ClockView/Timediff.tsx
rename to packages/webui/src/client/ui/ClockView/Timediff.tsx
diff --git a/meteor/client/ui/Collections.tsx b/packages/webui/src/client/ui/Collections.tsx
similarity index 79%
rename from meteor/client/ui/Collections.tsx
rename to packages/webui/src/client/ui/Collections.tsx
index 2ced6bb5fd..c6215a78fd 100644
--- a/meteor/client/ui/Collections.tsx
+++ b/packages/webui/src/client/ui/Collections.tsx
@@ -1,5 +1,5 @@
-import { CustomCollectionName } from '../../lib/api/pubsub'
-import { createSyncCustomPublicationMongoCollection } from '../../lib/collections/lib'
+import { CustomCollectionName } from '@sofie-automation/meteor-lib/dist/api/pubsub'
+import { createSyncCustomPublicationMongoCollection } from '../collections/lib'
 
 /**
  * A playout UI version of ShowStyleBases.
@@ -38,6 +38,16 @@ export const UIPieceContentStatuses = createSyncCustomPublicationMongoCollection
 	CustomCollectionName.UIPieceContentStatuses
 )
 
+/**
+ * A playout UI version of Parts.
+ */
+export const UIParts = createSyncCustomPublicationMongoCollection(CustomCollectionName.UIParts)
+
+/**
+ * A playout UI version of PartInstances.
+ */
+export const UIPartInstances = createSyncCustomPublicationMongoCollection(CustomCollectionName.UIPartInstances)
+
 /**
  * Pre-processed MediaObjectIssue for Adlibbs in a Bucket
  */
diff --git a/meteor/lib/ReactingObserver.ts b/packages/webui/src/client/ui/Collections/index.ts
similarity index 100%
rename from meteor/lib/ReactingObserver.ts
rename to packages/webui/src/client/ui/Collections/index.ts
diff --git a/meteor/client/ui/DragDropItemTypes.ts b/packages/webui/src/client/ui/DragDropItemTypes.ts
similarity index 100%
rename from meteor/client/ui/DragDropItemTypes.ts
rename to packages/webui/src/client/ui/DragDropItemTypes.ts
diff --git a/meteor/client/ui/FloatingInspector.tsx b/packages/webui/src/client/ui/FloatingInspector.tsx
similarity index 100%
rename from meteor/client/ui/FloatingInspector.tsx
rename to packages/webui/src/client/ui/FloatingInspector.tsx
diff --git a/meteor/client/ui/FloatingInspectors/FloatingInspectorHelpers/FloatingInspectorTimeInformationRow.tsx b/packages/webui/src/client/ui/FloatingInspectors/FloatingInspectorHelpers/FloatingInspectorTimeInformationRow.tsx
similarity index 98%
rename from meteor/client/ui/FloatingInspectors/FloatingInspectorHelpers/FloatingInspectorTimeInformationRow.tsx
rename to packages/webui/src/client/ui/FloatingInspectors/FloatingInspectorHelpers/FloatingInspectorTimeInformationRow.tsx
index 9efc0de561..80ee93acb8 100644
--- a/meteor/client/ui/FloatingInspectors/FloatingInspectorHelpers/FloatingInspectorTimeInformationRow.tsx
+++ b/packages/webui/src/client/ui/FloatingInspectors/FloatingInspectorHelpers/FloatingInspectorTimeInformationRow.tsx
@@ -3,7 +3,7 @@ import { PieceInstancePiece } from '@sofie-automation/corelib/dist/dataModel/Pie
 import { RundownUtils } from '../../../lib/rundown'
 import { PieceLifespan } from '@sofie-automation/blueprints-integration'
 import { TFunction, useTranslation } from 'react-i18next'
-import { Time } from '../../../../lib/lib'
+import { Time } from '../../../lib/tempLib'
 import Moment from 'react-moment'
 import { ReadonlyDeep } from 'type-fest'
 
diff --git a/meteor/client/ui/FloatingInspectors/IFloatingInspectorPosition.ts b/packages/webui/src/client/ui/FloatingInspectors/IFloatingInspectorPosition.ts
similarity index 100%
rename from meteor/client/ui/FloatingInspectors/IFloatingInspectorPosition.ts
rename to packages/webui/src/client/ui/FloatingInspectors/IFloatingInspectorPosition.ts
diff --git a/meteor/client/ui/FloatingInspectors/InvalidFloatingInspector.tsx b/packages/webui/src/client/ui/FloatingInspectors/InvalidFloatingInspector.tsx
similarity index 100%
rename from meteor/client/ui/FloatingInspectors/InvalidFloatingInspector.tsx
rename to packages/webui/src/client/ui/FloatingInspectors/InvalidFloatingInspector.tsx
diff --git a/meteor/client/ui/FloatingInspectors/L3rdFloatingInspector.tsx b/packages/webui/src/client/ui/FloatingInspectors/L3rdFloatingInspector.tsx
similarity index 76%
rename from meteor/client/ui/FloatingInspectors/L3rdFloatingInspector.tsx
rename to packages/webui/src/client/ui/FloatingInspectors/L3rdFloatingInspector.tsx
index 2f046f1904..9c838071dd 100644
--- a/meteor/client/ui/FloatingInspectors/L3rdFloatingInspector.tsx
+++ b/packages/webui/src/client/ui/FloatingInspectors/L3rdFloatingInspector.tsx
@@ -1,11 +1,11 @@
-import React, { useRef } from 'react'
+import React, { useMemo, useRef } from 'react'
 import * as _ from 'underscore'
 
-import { GraphicsContent, NoraContent } from '@sofie-automation/blueprints-integration'
+import { GraphicsContent, JSONBlobParse, NoraContent } from '@sofie-automation/blueprints-integration'
 
 import { NoraFloatingInspector } from './NoraFloatingInspector'
 import { FloatingInspector } from '../FloatingInspector'
-import { Time } from '../../../lib/lib'
+import { Time } from '../../lib/tempLib'
 import { PieceInstancePiece } from '@sofie-automation/corelib/dist/dataModel/PieceInstance'
 import { FloatingInspectorTimeInformationRow } from './FloatingInspectorHelpers/FloatingInspectorTimeInformationRow'
 import { IFloatingInspectorPosition, useInspectorPosition } from './IFloatingInspectorPosition'
@@ -34,13 +34,15 @@ export const L3rdFloatingInspector: React.FunctionComponent<IProps> = ({
 	pieceRenderedDuration,
 	typeClass,
 }) => {
-	const noraContent = (content as NoraContent)?.payload?.content ? (content as NoraContent | undefined) : undefined
+	const noraContent = (content as NoraContent)?.previewPayload ? (content as NoraContent | undefined) : undefined
 
-	let properties: Array<KeyValue> = []
-	if (noraContent && noraContent.payload && noraContent.payload.content) {
-		properties = _.compact(
+	const properties: Array<KeyValue> = useMemo(() => {
+		if (!noraContent?.previewPayload) return []
+		const payload = JSONBlobParse(noraContent.previewPayload)
+		if (!payload?.content) return []
+		return _.compact(
 			_.map(
-				noraContent.payload.content,
+				payload.content,
 				(
 					value,
 					key: string
@@ -67,22 +69,25 @@ export const L3rdFloatingInspector: React.FunctionComponent<IProps> = ({
 				}
 			)
 		) as Array<KeyValue>
-	}
+	}, [noraContent?.previewPayload])
 
-	const changed: Time | undefined = noraContent?.payload?.changed ?? undefined
+	const changed: Time | undefined = noraContent?.changed ?? undefined
 
 	const graphicContent = (content as GraphicsContent)?.fileName ? (content as GraphicsContent | undefined) : undefined
 
-	const templateName = noraContent?.payload?.metadata?.templateName ?? piece.name
+	const templateName = noraContent?.templateInfo?.name ?? piece.name
 	const templateVariant =
-		noraContent?.payload?.metadata?.templateVariant ??
+		noraContent?.templateInfo?.variant ??
 		(piece.name !== graphicContent?.fileName ? graphicContent?.fileName : undefined)
 
 	const ref = useRef<HTMLDivElement>(null)
 
 	const { style: floatingInspectorStyle } = useInspectorPosition(position, ref, showMiniInspector)
 
-	return noraContent && noraContent.payload && noraContent.previewRenderer ? (
+	const hasValidPreviewPayload =
+		noraContent?.previewPayload && noraContent?.previewPayload && noraContent.previewPayload.toString() !== '{}'
+
+	return hasValidPreviewPayload && noraContent.previewRenderer ? (
 		showMiniInspector ? (
 			<NoraFloatingInspector ref={ref} noraContent={noraContent} style={floatingInspectorStyle} />
 		) : null
diff --git a/meteor/client/ui/FloatingInspectors/MicFloatingInspector.tsx b/packages/webui/src/client/ui/FloatingInspectors/MicFloatingInspector.tsx
similarity index 100%
rename from meteor/client/ui/FloatingInspectors/MicFloatingInspector.tsx
rename to packages/webui/src/client/ui/FloatingInspectors/MicFloatingInspector.tsx
diff --git a/meteor/client/ui/FloatingInspectors/NoraFloatingInspector.tsx b/packages/webui/src/client/ui/FloatingInspectors/NoraFloatingInspector.tsx
similarity index 87%
rename from meteor/client/ui/FloatingInspectors/NoraFloatingInspector.tsx
rename to packages/webui/src/client/ui/FloatingInspectors/NoraFloatingInspector.tsx
index b77a6f9890..8bb6d2f7db 100644
--- a/meteor/client/ui/FloatingInspectors/NoraFloatingInspector.tsx
+++ b/packages/webui/src/client/ui/FloatingInspectors/NoraFloatingInspector.tsx
@@ -1,4 +1,4 @@
-import { NoraContent } from '@sofie-automation/blueprints-integration'
+import { JSONBlobParse, NoraContent, NoraPayload } from '@sofie-automation/blueprints-integration'
 import React, { useEffect, useImperativeHandle } from 'react'
 import _ from 'underscore'
 import { getNoraContentSteps } from '../SegmentContainer/PieceMultistepChevron'
@@ -86,33 +86,39 @@ export class NoraPreviewRenderer extends React.Component<{}, IStateHeader> {
 	}
 
 	private postNoraEvent(contentWindow: Window, noraContent: NoraContent) {
-		contentWindow.postMessage(
-			{
-				event: 'nora',
-				contentToShow: {
-					manifest: noraContent.payload.manifest,
-					template: {
-						event: 'preview',
-						name: noraContent.payload.template.name,
-						channel: 'gfx1',
-						layer: noraContent.payload.template.layer,
-						system: 'html',
+		try {
+			const payload = JSONBlobParse<NoraPayload>(noraContent.previewPayload)
+
+			contentWindow.postMessage(
+				{
+					event: 'nora',
+					contentToShow: {
+						manifest: payload.manifest,
+						template: {
+							event: 'preview',
+							name: payload.template.name,
+							channel: 'gfx1',
+							layer: payload.template.layer,
+							system: 'html',
+						},
+						content: {
+							...payload.content,
+							_valid: false,
+						},
+						timing: {
+							duration: '00:05',
+							in: 'auto',
+							out: 'auto',
+							timeIn: '00:00',
+						},
+						step: payload.step,
 					},
-					content: {
-						...noraContent.payload.content,
-						_valid: false,
-					},
-					timing: {
-						duration: '00:05',
-						in: 'auto',
-						out: 'auto',
-						timeIn: '00:00',
-					},
-					step: noraContent.payload.step,
 				},
-			},
-			'*'
-		)
+				'*'
+			)
+		} catch (e) {
+			console.error(`Error in NoraPreviewRenderer.postNoraEvent: ${e}`, e)
+		}
 	}
 
 	private _show() {
diff --git a/meteor/client/ui/FloatingInspectors/SplitsFloatingInspector.tsx b/packages/webui/src/client/ui/FloatingInspectors/SplitsFloatingInspector.tsx
similarity index 100%
rename from meteor/client/ui/FloatingInspectors/SplitsFloatingInspector.tsx
rename to packages/webui/src/client/ui/FloatingInspectors/SplitsFloatingInspector.tsx
diff --git a/meteor/client/ui/FloatingInspectors/VTFloatingInspector.tsx b/packages/webui/src/client/ui/FloatingInspectors/VTFloatingInspector.tsx
similarity index 97%
rename from meteor/client/ui/FloatingInspectors/VTFloatingInspector.tsx
rename to packages/webui/src/client/ui/FloatingInspectors/VTFloatingInspector.tsx
index e20c27c691..5edb6e68e8 100644
--- a/meteor/client/ui/FloatingInspectors/VTFloatingInspector.tsx
+++ b/packages/webui/src/client/ui/FloatingInspectors/VTFloatingInspector.tsx
@@ -3,13 +3,13 @@ import { TFunction, useTranslation } from 'react-i18next'
 
 import { CriticalIconSmall, WarningIconSmall } from '../../lib/ui/icons/notifications'
 import { FloatingInspector } from '../FloatingInspector'
-import { NoticeLevel } from '../../../lib/notifications/notifications'
+import { NoticeLevel } from '../../lib/notifications/notifications'
 import { VTContent } from '@sofie-automation/blueprints-integration'
 import { IStudioSettings } from '@sofie-automation/corelib/dist/dataModel/Studio'
 import { PieceStatusCode } from '@sofie-automation/corelib/dist/dataModel/Piece'
 import { VideoPreviewPlayer } from '../../lib/VideoPreviewPlayer'
 import classNames from 'classnames'
-import { UIStudio } from '../../../lib/api/studios'
+import { UIStudio } from '@sofie-automation/meteor-lib/dist/api/studios'
 import { ITranslatableMessage, translateMessage } from '@sofie-automation/corelib/dist/TranslatableMessage'
 import { IFloatingInspectorPosition, useInspectorPosition } from './IFloatingInspectorPosition'
 import { ReadonlyDeep } from 'type-fest'
diff --git a/meteor/client/ui/Header.tsx b/packages/webui/src/client/ui/Header.tsx
similarity index 85%
rename from meteor/client/ui/Header.tsx
rename to packages/webui/src/client/ui/Header.tsx
index d33e07d858..97098c65f1 100644
--- a/meteor/client/ui/Header.tsx
+++ b/packages/webui/src/client/ui/Header.tsx
@@ -1,19 +1,16 @@
 import * as React from 'react'
 import { WithTranslation } from 'react-i18next'
-import { Meteor } from 'meteor/meteor'
 import { NavLink, Link } from 'react-router-dom'
 import { NotificationCenterPanelToggle, NotificationCenterPanel } from '../lib/notifications/NotificationCenterPanel'
-import { NotificationCenter, Notification, NoticeLevel } from '../../lib/notifications/notifications'
+import { NotificationCenter, NoticeLevel } from '../lib/notifications/notifications'
 import { ErrorBoundary } from '../lib/ErrorBoundary'
 import { SupportPopUpToggle, SupportPopUp } from './SupportPopUp'
 // @ts-expect-error No types available
 import * as VelocityReact from 'velocity-react'
 import { translateWithTracker, Translated } from '../lib/ReactMeteorData/ReactMeteorData'
-import { Settings } from '../../lib/Settings'
 import { CoreSystem } from '../collections'
 
 interface IPropsHeader {
-	loggedIn: boolean
 	allowConfigure?: boolean
 	allowTesting?: boolean
 	allowDeveloper?: boolean
@@ -38,22 +35,6 @@ class Header extends React.Component<Translated<IPropsHeader & ITrackedPropsHead
 		}
 	}
 
-	private handleLogout(e: React.MouseEvent<HTMLAnchorElement>) {
-		e.preventDefault()
-		Meteor.logout((error) => {
-			if (error) {
-				NotificationCenter.push(
-					new Notification(
-						undefined,
-						NoticeLevel.WARNING,
-						`Error when trying to log out: ${error.toString()}`,
-						'Page Header'
-					)
-				)
-			}
-		})
-	}
-
 	onToggleNotifications = (_e: React.MouseEvent<HTMLButtonElement>, filter: NoticeLevel | undefined) => {
 		if (this.state.isNotificationCenterOpen === filter) {
 			filter = undefined
@@ -176,16 +157,6 @@ class Header extends React.Component<Translated<IPropsHeader & ITrackedPropsHead
 											{t('Settings')}
 										</NavLink>
 									)}
-									{Settings.enableUserAccounts && this.props.loggedIn && (
-										<NavLink to="/account" activeClassName="active">
-											{t('Account')}
-										</NavLink>
-									)}
-									{Settings.enableUserAccounts && this.props.loggedIn && (
-										<NavLink to="/" activeClassName="active" onClick={this.handleLogout}>
-											{t('Logout')}
-										</NavLink>
-									)}
 								</nav>
 							</div>
 						</div>
diff --git a/meteor/client/ui/MediaStatus/MediaStatus.tsx b/packages/webui/src/client/ui/MediaStatus/MediaStatus.tsx
similarity index 98%
rename from meteor/client/ui/MediaStatus/MediaStatus.tsx
rename to packages/webui/src/client/ui/MediaStatus/MediaStatus.tsx
index f75904f10e..8dd3bfa745 100644
--- a/meteor/client/ui/MediaStatus/MediaStatus.tsx
+++ b/packages/webui/src/client/ui/MediaStatus/MediaStatus.tsx
@@ -1,7 +1,6 @@
 import { useMemo, JSX } from 'react'
 import { useSubscription, useSubscriptions, useTracker } from '../../lib/ReactMeteorData/ReactMeteorData'
-import { MeteorPubSub } from '../../../lib/api/pubsub'
-import { getSegmentsWithPartInstances } from '../../../lib/Rundown'
+import { MeteorPubSub } from '@sofie-automation/meteor-lib/dist/api/pubsub'
 import {
 	AdLibActionId,
 	PartId,
@@ -29,13 +28,14 @@ import { ProtectedString, unprotectString } from '@sofie-automation/corelib/dist
 import { ExpectedPackage } from '@sofie-automation/shared-lib/dist/package-manager/package'
 import { PartInvalidReason } from '@sofie-automation/corelib/dist/dataModel/Part'
 import { IBlueprintActionManifestDisplayContent, SourceLayerType } from '@sofie-automation/blueprints-integration'
-import { PieceContentStatusObj } from '../../../lib/api/pieceContentStatus'
+import { PieceContentStatusObj } from '@sofie-automation/meteor-lib/dist/api/pieceContentStatus'
 import { Piece, PieceStatusCode } from '@sofie-automation/corelib/dist/dataModel/Piece'
 import { assertNever, literal } from '@sofie-automation/corelib/dist/lib'
 import { UIPieceContentStatuses, UIShowStyleBases } from '../Collections'
 import { isTranslatableMessage, translateMessage } from '@sofie-automation/corelib/dist/TranslatableMessage'
 import { i18nTranslator } from '../i18n'
 import { CorelibPubSub } from '@sofie-automation/corelib/dist/pubsub'
+import { RundownUtils } from '../../lib/rundown'
 
 export function MediaStatus({
 	playlistIds,
@@ -111,7 +111,7 @@ function useRundownPlaylists(playlistIds: RundownPlaylistId[]) {
 				.sort(sortRundownPlaylists)
 				.map((playlist) => ({
 					playlist,
-					segments: getSegmentsWithPartInstances(
+					segments: RundownUtils.getSegmentsWithPartInstances(
 						playlist,
 						undefined,
 						undefined,
diff --git a/meteor/client/ui/MediaStatus/MediaStatusIndicator.tsx b/packages/webui/src/client/ui/MediaStatus/MediaStatusIndicator.tsx
similarity index 92%
rename from meteor/client/ui/MediaStatus/MediaStatusIndicator.tsx
rename to packages/webui/src/client/ui/MediaStatus/MediaStatusIndicator.tsx
index 669d6d5aff..a11189a2fa 100644
--- a/meteor/client/ui/MediaStatus/MediaStatusIndicator.tsx
+++ b/packages/webui/src/client/ui/MediaStatus/MediaStatusIndicator.tsx
@@ -41,9 +41,15 @@ export const MediaStatusIndicator = React.memo(function MediaStatusIndicator({
 			break
 	}
 
+	const content = <span data-overlay={overlay}>{icon}</span>
+
+	if (!overlay) {
+		return content
+	}
+
 	return (
 		<Tooltip overlay={overlay} trigger={['hover']} placement="top">
-			<span data-overlay={overlay}>{icon}</span>
+			{content}
 		</Tooltip>
 	)
 })
diff --git a/meteor/client/ui/MediaStatus/SortOrderButton.tsx b/packages/webui/src/client/ui/MediaStatus/SortOrderButton.tsx
similarity index 95%
rename from meteor/client/ui/MediaStatus/SortOrderButton.tsx
rename to packages/webui/src/client/ui/MediaStatus/SortOrderButton.tsx
index 2e8c46b2bb..26750314b2 100644
--- a/meteor/client/ui/MediaStatus/SortOrderButton.tsx
+++ b/packages/webui/src/client/ui/MediaStatus/SortOrderButton.tsx
@@ -1,4 +1,4 @@
-import React, { JSX } from 'react'
+import { JSX } from 'react'
 import { assertNever } from '@sofie-automation/corelib/dist/lib'
 import { SortAscending, SortDescending, SortDisabled } from '../../lib/ui/icons/sorting'
 
diff --git a/meteor/client/ui/PieceIcons/IconColors.scss b/packages/webui/src/client/ui/PieceIcons/IconColors.scss
similarity index 100%
rename from meteor/client/ui/PieceIcons/IconColors.scss
rename to packages/webui/src/client/ui/PieceIcons/IconColors.scss
diff --git a/meteor/client/ui/PieceIcons/PieceCountdown.tsx b/packages/webui/src/client/ui/PieceIcons/PieceCountdown.tsx
similarity index 95%
rename from meteor/client/ui/PieceIcons/PieceCountdown.tsx
rename to packages/webui/src/client/ui/PieceIcons/PieceCountdown.tsx
index 6c2b384b84..4b9a606ea6 100644
--- a/meteor/client/ui/PieceIcons/PieceCountdown.tsx
+++ b/packages/webui/src/client/ui/PieceIcons/PieceCountdown.tsx
@@ -1,10 +1,9 @@
-import React from 'react'
 import { useSubscription, useTracker } from '../../lib/ReactMeteorData/ReactMeteorData'
 import { SourceLayerType, VTContent } from '@sofie-automation/blueprints-integration'
-import { MeteorPubSub } from '../../../lib/api/pubsub'
+import { MeteorPubSub } from '@sofie-automation/meteor-lib/dist/api/pubsub'
 import { findPieceInstanceToShow } from './utils'
 import { Timediff } from '../ClockView/Timediff'
-import { getCurrentTime } from '../../../lib/lib'
+import { getCurrentTime } from '../../lib/systemTime'
 import {
 	PartInstanceId,
 	RundownId,
diff --git a/meteor/client/ui/PieceIcons/PieceIcon.tsx b/packages/webui/src/client/ui/PieceIcons/PieceIcon.tsx
similarity index 98%
rename from meteor/client/ui/PieceIcons/PieceIcon.tsx
rename to packages/webui/src/client/ui/PieceIcons/PieceIcon.tsx
index a4c7949cce..1285e5695f 100644
--- a/meteor/client/ui/PieceIcons/PieceIcon.tsx
+++ b/packages/webui/src/client/ui/PieceIcons/PieceIcon.tsx
@@ -1,4 +1,3 @@
-import React from 'react'
 import { useSubscription, useTracker } from '../../lib/ReactMeteorData/ReactMeteorData'
 import {
 	SourceLayerType,
@@ -14,7 +13,7 @@ import RemoteInputIcon from './Renderers/RemoteInputIcon'
 import LiveSpeakInputIcon from './Renderers/LiveSpeakInputIcon'
 import GraphicsInputIcon from './Renderers/GraphicsInputIcon'
 import UnknownInputIcon from './Renderers/UnknownInputIcon'
-import { MeteorPubSub } from '../../../lib/api/pubsub'
+import { MeteorPubSub } from '@sofie-automation/meteor-lib/dist/api/pubsub'
 import { PieceInstance } from '@sofie-automation/corelib/dist/dataModel/PieceInstance'
 import { findPieceInstanceToShow, findPieceInstanceToShowFromInstances } from './utils'
 import LocalInputIcon from './Renderers/LocalInputIcon'
diff --git a/meteor/client/ui/PieceIcons/PieceName.tsx b/packages/webui/src/client/ui/PieceIcons/PieceName.tsx
similarity index 96%
rename from meteor/client/ui/PieceIcons/PieceName.tsx
rename to packages/webui/src/client/ui/PieceIcons/PieceName.tsx
index 610cf7af41..7122535a56 100644
--- a/meteor/client/ui/PieceIcons/PieceName.tsx
+++ b/packages/webui/src/client/ui/PieceIcons/PieceName.tsx
@@ -1,8 +1,7 @@
-import React from 'react'
 import { useSubscription, useTracker } from '../../lib/ReactMeteorData/ReactMeteorData'
 import { EvsContent, SourceLayerType } from '@sofie-automation/blueprints-integration'
 
-import { MeteorPubSub } from '../../../lib/api/pubsub'
+import { MeteorPubSub } from '@sofie-automation/meteor-lib/dist/api/pubsub'
 import { IPropsHeader } from './PieceIcon'
 import { findPieceInstanceToShow } from './utils'
 import { PieceGeneric } from '@sofie-automation/corelib/dist/dataModel/Piece'
diff --git a/meteor/client/ui/PieceIcons/Renderers/CamInputIcon.tsx b/packages/webui/src/client/ui/PieceIcons/Renderers/CamInputIcon.tsx
similarity index 100%
rename from meteor/client/ui/PieceIcons/Renderers/CamInputIcon.tsx
rename to packages/webui/src/client/ui/PieceIcons/Renderers/CamInputIcon.tsx
diff --git a/meteor/client/ui/PieceIcons/Renderers/GraphicsInputIcon.tsx b/packages/webui/src/client/ui/PieceIcons/Renderers/GraphicsInputIcon.tsx
similarity index 100%
rename from meteor/client/ui/PieceIcons/Renderers/GraphicsInputIcon.tsx
rename to packages/webui/src/client/ui/PieceIcons/Renderers/GraphicsInputIcon.tsx
diff --git a/meteor/client/ui/PieceIcons/Renderers/LiveSpeakInputIcon.tsx b/packages/webui/src/client/ui/PieceIcons/Renderers/LiveSpeakInputIcon.tsx
similarity index 100%
rename from meteor/client/ui/PieceIcons/Renderers/LiveSpeakInputIcon.tsx
rename to packages/webui/src/client/ui/PieceIcons/Renderers/LiveSpeakInputIcon.tsx
diff --git a/meteor/client/ui/PieceIcons/Renderers/LocalInputIcon.tsx b/packages/webui/src/client/ui/PieceIcons/Renderers/LocalInputIcon.tsx
similarity index 91%
rename from meteor/client/ui/PieceIcons/Renderers/LocalInputIcon.tsx
rename to packages/webui/src/client/ui/PieceIcons/Renderers/LocalInputIcon.tsx
index b2717f0b62..00356ed2e1 100644
--- a/meteor/client/ui/PieceIcons/Renderers/LocalInputIcon.tsx
+++ b/packages/webui/src/client/ui/PieceIcons/Renderers/LocalInputIcon.tsx
@@ -1,4 +1,3 @@
-import React from 'react'
 import { BaseRemoteInputIcon } from './RemoteInputIcon'
 
 export default function LocalInputIcon(props: Readonly<{ inputIndex?: string; abbreviation?: string }>): JSX.Element {
diff --git a/meteor/client/ui/PieceIcons/Renderers/RemoteInputIcon.tsx b/packages/webui/src/client/ui/PieceIcons/Renderers/RemoteInputIcon.tsx
similarity index 100%
rename from meteor/client/ui/PieceIcons/Renderers/RemoteInputIcon.tsx
rename to packages/webui/src/client/ui/PieceIcons/Renderers/RemoteInputIcon.tsx
diff --git a/meteor/client/ui/PieceIcons/Renderers/SplitInputIcon.tsx b/packages/webui/src/client/ui/PieceIcons/Renderers/SplitInputIcon.tsx
similarity index 100%
rename from meteor/client/ui/PieceIcons/Renderers/SplitInputIcon.tsx
rename to packages/webui/src/client/ui/PieceIcons/Renderers/SplitInputIcon.tsx
diff --git a/meteor/client/ui/PieceIcons/Renderers/UnknownInputIcon.tsx b/packages/webui/src/client/ui/PieceIcons/Renderers/UnknownInputIcon.tsx
similarity index 100%
rename from meteor/client/ui/PieceIcons/Renderers/UnknownInputIcon.tsx
rename to packages/webui/src/client/ui/PieceIcons/Renderers/UnknownInputIcon.tsx
diff --git a/meteor/client/ui/PieceIcons/Renderers/VTInputIcon.tsx b/packages/webui/src/client/ui/PieceIcons/Renderers/VTInputIcon.tsx
similarity index 100%
rename from meteor/client/ui/PieceIcons/Renderers/VTInputIcon.tsx
rename to packages/webui/src/client/ui/PieceIcons/Renderers/VTInputIcon.tsx
diff --git a/meteor/client/ui/PieceIcons/utils.ts b/packages/webui/src/client/ui/PieceIcons/utils.ts
similarity index 97%
rename from meteor/client/ui/PieceIcons/utils.ts
rename to packages/webui/src/client/ui/PieceIcons/utils.ts
index 99d440369f..b871ef3b9a 100644
--- a/meteor/client/ui/PieceIcons/utils.ts
+++ b/packages/webui/src/client/ui/PieceIcons/utils.ts
@@ -2,7 +2,7 @@ import { SourceLayerType, ISourceLayer } from '@sofie-automation/blueprints-inte
 import { SourceLayers } from '@sofie-automation/corelib/dist/dataModel/ShowStyleBase'
 import { PieceInstance } from '@sofie-automation/corelib/dist/dataModel/PieceInstance'
 import { IPropsHeader } from './PieceIcon'
-import { PieceExtended } from '../../../lib/Rundown'
+import { PieceExtended } from '../../lib/RundownResolver'
 import { UIShowStyleBases } from '../Collections'
 import { PieceInstances } from '../../collections'
 import { ReadonlyDeep } from 'type-fest'
diff --git a/meteor/client/ui/Prompter/OverUnderTimer.tsx b/packages/webui/src/client/ui/Prompter/OverUnderTimer.tsx
similarity index 100%
rename from meteor/client/ui/Prompter/OverUnderTimer.tsx
rename to packages/webui/src/client/ui/Prompter/OverUnderTimer.tsx
diff --git a/meteor/client/ui/Prompter/PrompterView.tsx b/packages/webui/src/client/ui/Prompter/PrompterView.tsx
similarity index 73%
rename from meteor/client/ui/Prompter/PrompterView.tsx
rename to packages/webui/src/client/ui/Prompter/PrompterView.tsx
index 5230933ec9..0e13a5263b 100644
--- a/meteor/client/ui/Prompter/PrompterView.tsx
+++ b/packages/webui/src/client/ui/Prompter/PrompterView.tsx
@@ -1,38 +1,38 @@
 import React, { PropsWithChildren } from 'react'
 import _ from 'underscore'
-// @ts-expect-error No types available
-import Velocity from 'velocity-animate'
+import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
 import ClassNames from 'classnames'
 import { Meteor } from 'meteor/meteor'
+import { parse as queryStringParse } from 'query-string'
 import { Route } from 'react-router-dom'
+import Velocity from 'velocity-animate'
 import {
 	Translated,
-	useTracker,
 	useGlobalDelayedTrackerUpdateState,
 	useSubscription,
 	useSubscriptions,
+	useTracker,
 } from '../../lib/ReactMeteorData/ReactMeteorData'
-import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
-import { parse as queryStringParse } from 'query-string'
 
-import { Spinner } from '../../lib/Spinner'
-import { firstIfArray, protectString } from '../../../lib/lib'
-import { PrompterData, PrompterAPI, PrompterDataPart } from './prompter'
-import { PrompterControlManager } from './controller/manager'
-import { MeteorPubSub } from '../../../lib/api/pubsub'
-import { documentTitle } from '../../lib/DocumentTitleProvider'
-import { StudioScreenSaver } from '../StudioScreenSaver/StudioScreenSaver'
-import { RundownTimingProvider } from '../RundownView/RundownTiming/RundownTimingProvider'
-import { OverUnderTimer } from './OverUnderTimer'
-import { Rundown } from '@sofie-automation/corelib/dist/dataModel/Rundown'
 import { PartInstanceId, PieceId, RundownPlaylistId, StudioId } from '@sofie-automation/corelib/dist/dataModel/Ids'
-import { UIStudios } from '../Collections'
-import { UIStudio } from '../../../lib/api/studios'
-import { RundownPlaylists, Rundowns } from '../../collections'
-import { RundownPlaylistCollectionUtil } from '../../../lib/collections/rundownPlaylistUtil'
-import { logger } from '../../../lib/logging'
+import { Rundown } from '@sofie-automation/corelib/dist/dataModel/Rundown'
 import { CorelibPubSub } from '@sofie-automation/corelib/dist/pubsub'
 import { withTranslation } from 'react-i18next'
+import { MeteorPubSub } from '@sofie-automation/meteor-lib/dist/api/pubsub'
+import { UIStudio } from '@sofie-automation/meteor-lib/dist/api/studios'
+import { RundownPlaylistCollectionUtil } from '../../collections/rundownPlaylistUtil'
+import { firstIfArray } from '../../lib/lib'
+import { protectString } from '@sofie-automation/corelib/dist/protectedString'
+import { logger } from '../../lib/logging'
+import { RundownPlaylists, Rundowns } from '../../collections'
+import { documentTitle } from '../../lib/DocumentTitleProvider'
+import { Spinner } from '../../lib/Spinner'
+import { UIStudios } from '../Collections'
+import { RundownTimingProvider } from '../RundownView/RundownTiming/RundownTimingProvider'
+import { StudioScreenSaver } from '../StudioScreenSaver/StudioScreenSaver'
+import { PrompterControlManager } from './controller/manager'
+import { OverUnderTimer } from './OverUnderTimer'
+import { PrompterAPI, PrompterData, PrompterDataPart } from './prompter'
 
 const DEFAULT_UPDATE_THROTTLE = 250 //ms
 const PIECE_MISSING_UPDATE_THROTTLE = 2000 //ms
@@ -52,6 +52,7 @@ interface PrompterConfig {
 	joycon_rangeNeutralMin?: number
 	joycon_rangeNeutralMax?: number
 	joycon_rangeFwdMax?: number
+	joycon_rightHandOffset?: number
 	pedal_speedMap?: number[]
 	pedal_reverseSpeedMap?: number[]
 	pedal_rangeRevMin?: number
@@ -147,6 +148,7 @@ export class PrompterViewContent extends React.Component<Translated<IProps & ITr
 			joycon_rangeNeutralMin: parseInt(firstIfArray(queryParams['joycon_rangeNeutralMin']) as string, 10) || undefined,
 			joycon_rangeNeutralMax: parseInt(firstIfArray(queryParams['joycon_rangeNeutralMax']) as string, 10) || undefined,
 			joycon_rangeFwdMax: parseInt(firstIfArray(queryParams['joycon_rangeFwdMax']) as string, 10) || undefined,
+			joycon_rightHandOffset: parseInt(firstIfArray(queryParams['joycon_rightHandOffset']) as string, 10) || undefined,
 			pedal_speedMap:
 				queryParams['pedal_speedMap'] === undefined
 					? undefined
@@ -287,7 +289,7 @@ export class PrompterViewContent extends React.Component<Translated<IProps & ITr
 	}
 	scrollToPartInstance(partInstanceId: PartInstanceId): void {
 		const scrollMargin = this.calculateScrollPosition()
-		const target = document.querySelector(`#partInstance_${partInstanceId}`)
+		const target = document.querySelector<HTMLElement>(`[data-part-instance-id="${partInstanceId}"]`)
 
 		if (target) {
 			Velocity(document.body, 'finish')
@@ -296,7 +298,8 @@ export class PrompterViewContent extends React.Component<Translated<IProps & ITr
 	}
 	scrollToLive(): void {
 		const scrollMargin = this.calculateScrollPosition()
-		const current = document.querySelector('.prompter .live') || document.querySelector('.prompter .next')
+		const current =
+			document.querySelector<HTMLElement>('.prompter .live') || document.querySelector<HTMLElement>('.prompter .next')
 
 		if (current) {
 			Velocity(document.body, 'finish')
@@ -305,7 +308,7 @@ export class PrompterViewContent extends React.Component<Translated<IProps & ITr
 	}
 	scrollToNext(): void {
 		const scrollMargin = this.calculateScrollPosition()
-		const next = document.querySelector('.prompter .next')
+		const next = document.querySelector<HTMLElement>('.prompter .next')
 
 		if (next) {
 			Velocity(document.body, 'finish')
@@ -374,63 +377,60 @@ export class PrompterViewContent extends React.Component<Translated<IProps & ITr
 	private checkCurrentTakeMarkers = () => {
 		const playlist = this.props.rundownPlaylist
 
-		if (playlist !== undefined) {
-			const positionTop = window.scrollY
-			const positionBottom = positionTop + window.innerHeight
+		if (playlist === undefined) return
+		const positionTop = window.scrollY
+		const positionBottom = positionTop + window.innerHeight
 
-			let currentPartElement: Element | null = null
-			let currentPartElementAfter: Element | null = null
-			let nextPartElementAfter: Element | null = null
+		let currentPartElement: Element | null = null
+		let currentPartElementAfter: Element | null = null
+		let nextPartElementAfter: Element | null = null
 
-			const anchors: Array<Element> = Array.from(document.querySelectorAll('.scroll-anchor'))
+		const anchors: Array<Element> = Array.from(document.querySelectorAll('.scroll-anchor'))
 
-			for (let index = 0; index < anchors.length; index++) {
-				const current = anchors[index]
-				const next = index + 1 < anchors.length ? anchors[index + 1] : null
+		for (let index = 0; index < anchors.length; index++) {
+			const current = anchors[index]
+			const next = index + 1 < anchors.length ? anchors[index + 1] : null
 
-				if (playlist.currentPartInfo && current.classList.contains(`live`)) {
-					currentPartElement = current
-					currentPartElementAfter = next
-				}
-				if (playlist.nextPartInfo && current.classList.contains(`next`)) {
-					nextPartElementAfter = next
-				}
+			if (playlist.currentPartInfo && current.classList.contains(`live`)) {
+				currentPartElement = current
+				currentPartElementAfter = next
 			}
+			if (playlist.nextPartInfo && current.classList.contains(`next`)) {
+				nextPartElementAfter = next
+			}
+		}
 
-			const currentPositionStart = currentPartElement
-				? currentPartElement.getBoundingClientRect().top + positionTop
-				: null
-			const currentPositionEnd = currentPartElementAfter
-				? currentPartElementAfter.getBoundingClientRect().top + positionTop
-				: null
-
-			const nextPositionEnd = nextPartElementAfter
-				? nextPartElementAfter.getBoundingClientRect().top + positionTop
-				: null
-
-			const takeIndicator = document.querySelector('.take-indicator')
-			if (takeIndicator) {
-				if (currentPositionEnd && currentPositionEnd < positionTop) {
-					// Display take "^" indicator
-					takeIndicator.classList.remove('hidden')
-					takeIndicator.classList.add('top')
-				} else if (currentPositionStart && currentPositionStart > positionBottom) {
-					// Display take "v" indicator
-					takeIndicator.classList.remove('hidden', 'top')
-				} else {
-					takeIndicator.classList.add('hidden')
-				}
+		const currentPositionStart = currentPartElement
+			? currentPartElement.getBoundingClientRect().top + positionTop
+			: null
+		const currentPositionEnd = currentPartElementAfter
+			? currentPartElementAfter.getBoundingClientRect().top + positionTop
+			: null
+
+		const nextPositionEnd = nextPartElementAfter ? nextPartElementAfter.getBoundingClientRect().top + positionTop : null
+
+		const takeIndicator = document.querySelector('.take-indicator')
+		if (takeIndicator) {
+			if (currentPositionEnd && currentPositionEnd < positionTop) {
+				// Display take "^" indicator
+				takeIndicator.classList.remove('hidden')
+				takeIndicator.classList.add('top')
+			} else if (currentPositionStart && currentPositionStart > positionBottom) {
+				// Display take "v" indicator
+				takeIndicator.classList.remove('hidden', 'top')
+			} else {
+				takeIndicator.classList.add('hidden')
 			}
+		}
 
-			const nextIndicator = document.querySelector('.next-indicator')
-			if (nextIndicator) {
-				if (nextPositionEnd && nextPositionEnd < positionTop) {
-					// Display next "^" indicator
-					nextIndicator.classList.remove('hidden')
-					nextIndicator.classList.add('top')
-				} else {
-					nextIndicator.classList.add('hidden')
-				}
+		const nextIndicator = document.querySelector('.next-indicator')
+		if (nextIndicator) {
+			if (nextPositionEnd && nextPositionEnd < positionTop) {
+				// Display next "^" indicator
+				nextIndicator.classList.remove('hidden')
+				nextIndicator.classList.add('top')
+			} else {
+				nextIndicator.classList.add('hidden')
 			}
 		}
 	}
@@ -596,8 +596,8 @@ function Prompter(props: Readonly<PropsWithChildren<IPrompterProps>>): JSX.Eleme
 	)
 	const rundownIDs = playlist ? RundownPlaylistCollectionUtil.getRundownUnorderedIDs(playlist) : []
 	useSubscription(CorelibPubSub.segments, rundownIDs, {})
-	useSubscription(CorelibPubSub.parts, rundownIDs, null)
-	useSubscription(CorelibPubSub.partInstances, rundownIDs, playlist?.activationId ?? null)
+	useSubscription(MeteorPubSub.uiParts, props.rundownPlaylistId)
+	useSubscription(MeteorPubSub.uiPartInstances, rundownIDs, playlist?.activationId ?? null)
 	useSubscription(CorelibPubSub.pieces, rundownIDs, null)
 	useSubscription(CorelibPubSub.pieceInstancesSimple, rundownIDs, null)
 
@@ -738,24 +738,32 @@ const PrompterContent = withTranslation()(
 			// Go through the anchors and use the first one that we find:
 			for (const scrollAnchor of scrollAnchors) {
 				const anchor = document.getElementById(scrollAnchor.anchorId)
-				if (anchor) {
-					const { top } = anchor.getBoundingClientRect()
-
-					if (scrollAnchor.offset !== null) {
-						window.scrollBy({
-							top: top - scrollAnchor.offset,
-						})
-						// We've scrolled, exit the function!
-						return
-					} else {
-						// Note: config.margin does not have to be taken into account here,
-						// the css margins magically does it for us.
-						window.scrollBy({
-							top: top - readPosition,
-						})
-						// We've scrolled, exit the function!
-						return
-					}
+				if (!anchor) continue
+
+				const { top } = anchor.getBoundingClientRect()
+
+				if (scrollAnchor.offset !== null) {
+					this.props.config.debug &&
+						logger.debug(
+							`Selected anchor ${scrollAnchor.anchorId} as anchor element in view, restoring position ${scrollAnchor.offset}`
+						)
+
+					window.scrollBy({
+						top: top - scrollAnchor.offset,
+					})
+					// We've scrolled, exit the function!
+					return
+				} else {
+					this.props.config.debug &&
+						logger.debug(`Selected anchor ${scrollAnchor.anchorId} as anchor element outside of view, jumping to it`)
+
+					// Note: config.margin does not have to be taken into account here,
+					// the css margins magically does it for us.
+					window.scrollBy({
+						top: top - readPosition,
+					})
+					// We've scrolled, exit the function!
+					return
 				}
 			}
 			// None of the anchors where found at this point.
@@ -767,30 +775,35 @@ const PrompterContent = withTranslation()(
 					.join(', ')}`
 			)
 
+			// TODO: In the past 4 months this has been here, this hasn't logged a single line, should we keep it?
 			// Below is for troubleshooting, see if the anchor is in prompterData:
 			if (!this.props.prompterData) {
 				logger.error(`Read anchor troubleshooting: no prompterData`)
 				return
 			}
 
+			// TODO: In The 4 months this has been here (2024/09/19), not a single log line was recorded
+			// - does this still make sense?
 			for (const scrollAnchor of scrollAnchors) {
-				for (const segment of this.props.prompterData.segments) {
-					if (scrollAnchor.anchorId === `segment_${segment.id}`) {
-						logger.error(`Read anchor troubleshooting: segment "${segment.id}" was found in prompterData!`)
-						return
-					}
-
-					for (const part of segment.parts) {
-						if (scrollAnchor.anchorId === `partInstance_${part.id}`) {
-							logger.error(`Read anchor troubleshooting: part "${part.id}" was found in prompterData!`)
+				for (const rundown of this.props.prompterData.rundowns) {
+					for (const segment of rundown.segments) {
+						if (scrollAnchor.anchorId === `segment_${segment.id}`) {
+							logger.error(`Read anchor troubleshooting: segment "${segment.id}" was found in prompterData!`)
 							return
 						}
 
-						for (const piece of part.pieces) {
-							if (scrollAnchor.anchorId === `line_${piece.id}`) {
-								logger.error(`Read anchor troubleshooting: piece "${piece.id}" was found in prompterData!`)
+						for (const part of segment.parts) {
+							if (scrollAnchor.anchorId === `partInstance_${part.id}`) {
+								logger.error(`Read anchor troubleshooting: part "${part.id}" was found in prompterData!`)
 								return
 							}
+
+							for (const piece of part.pieces) {
+								if (scrollAnchor.anchorId === `line_${piece.id}`) {
+									logger.error(`Read anchor troubleshooting: piece "${piece.id}" was found in prompterData!`)
+									return
+								}
+							}
 						}
 					}
 				}
@@ -802,18 +815,22 @@ const PrompterContent = withTranslation()(
 			const { prompterData: nextPrompterData } = nextProps
 
 			const currentPrompterPieces = _.flatten(
-				prompterData?.segments.map((segment) =>
-					segment.parts.map((part) =>
-						// collect all the PieceId's of all the non-empty pieces of script
-						_.compact(part.pieces.map((dataPiece) => (dataPiece.text !== '' ? dataPiece.id : null)))
+				prompterData?.rundowns.map((rundown) =>
+					rundown.segments.map((segment) =>
+						segment.parts.map((part) =>
+							// collect all the PieceId's of all the non-empty pieces of script
+							_.compact(part.pieces.map((dataPiece) => (dataPiece.text !== '' ? dataPiece.id : null)))
+						)
 					)
 				) ?? []
 			) as PieceId[]
 			const nextPrompterPieces = _.flatten(
-				nextPrompterData?.segments.map((segment) =>
-					segment.parts.map((part) =>
-						// collect all the PieceId's of all the non-empty pieces of script
-						_.compact(part.pieces.map((dataPiece) => (dataPiece.text !== '' ? dataPiece.id : null)))
+				nextPrompterData?.rundowns.map((rundown) =>
+					rundown.segments.map((segment) =>
+						segment.parts.map((part) =>
+							// collect all the PieceId's of all the non-empty pieces of script
+							_.compact(part.pieces.map((dataPiece) => (dataPiece.text !== '' ? dataPiece.id : null)))
+						)
 					)
 				) ?? []
 			) as PieceId[]
@@ -852,9 +869,9 @@ const PrompterContent = withTranslation()(
 		}
 
 		private getPartStatus(prompterData: PrompterData, part: PrompterDataPart) {
-			if (prompterData.currentPartInstanceId === part.id) {
+			if (prompterData.currentPartInstanceId === part.partInstanceId) {
 				return 'live'
-			} else if (prompterData.nextPartInstanceId === part.id) {
+			} else if (prompterData.nextPartInstanceId === part.partInstanceId) {
 				return 'next'
 			} else {
 				return null
@@ -862,138 +879,155 @@ const PrompterContent = withTranslation()(
 		}
 
 		private renderPrompterData(prompterData: PrompterData) {
+			const { t } = this.props
+
 			const lines: React.ReactNode[] = []
+			let hasInsertedScript = false
 
-			prompterData.segments.forEach((segment) => {
-				if (segment.parts.length === 0) {
-					return
+			for (const rundown of prompterData.rundowns) {
+				if (prompterData.rundowns.length > 1) {
+					lines.push(
+						<div
+							id={`rundown_${rundown.id}`}
+							data-obj-id={rundown.id}
+							key={'rundown_' + rundown.id}
+							className={ClassNames('prompter-rundown')}
+						>
+							{rundown.title || 'N/A'}
+						</div>
+					)
 				}
 
-				const firstPart = segment.parts[0]
-				const firstPartStatus = this.getPartStatus(prompterData, firstPart)
+				for (const segment of rundown.segments) {
+					if (segment.parts.length === 0) {
+						return
+					}
 
-				lines.push(
-					<div
-						id={`segment_${segment.id}`}
-						data-obj-id={segment.id}
-						key={'segment_' + segment.id}
-						className={ClassNames('prompter-segment', 'scroll-anchor', firstPartStatus)}
-					>
-						{segment.title || 'N/A'}
-					</div>
-				)
+					const firstPart = segment.parts[0]
+					const firstPartStatus = this.getPartStatus(prompterData, firstPart)
 
-				segment.parts.forEach((part) => {
 					lines.push(
 						<div
-							id={`partInstance_${part.id}`}
-							data-obj-id={segment.id + '_' + part.id}
-							key={'partInstance_' + part.id}
-							className={ClassNames('prompter-part', 'scroll-anchor', this.getPartStatus(prompterData, part))}
+							id={`segment_${segment.id}`}
+							data-obj-id={segment.id}
+							key={'segment_' + segment.id}
+							className={ClassNames('prompter-segment', 'scroll-anchor', firstPartStatus)}
 						>
-							{part.title || 'N/A'}
+							{segment.title || 'N/A'}
 						</div>
 					)
 
-					part.pieces.forEach((line) => {
+					hasInsertedScript = true
+
+					for (const part of segment.parts) {
 						lines.push(
 							<div
-								id={`line_${line.id}`}
-								data-obj-id={segment.id + '_' + part.id + '_' + line.id}
-								key={'line_' + part.id + '_' + segment.id + '_' + line.id}
-								className={ClassNames(
-									'prompter-line',
-									this.props.config.addBlankLine ? 'add-blank' : undefined,
-									!line.text ? 'empty' : undefined
-								)}
+								id={`part_${part.id}`}
+								data-obj-id={segment.id + '_' + part.id}
+								data-part-instance-id={part.partInstanceId}
+								key={'part_' + part.id}
+								className={ClassNames('prompter-part', 'scroll-anchor', this.getPartStatus(prompterData, part))}
 							>
-								{line.text || ''}
+								{part.title || 'N/A'}
 							</div>
 						)
-					})
-				})
-			})
+
+						for (const line of part.pieces) {
+							lines.push(
+								<div
+									id={`line_${line.id}`}
+									data-obj-id={segment.id + '_' + part.id + '_' + line.id}
+									key={'line_' + part.id + '_' + segment.id + '_' + line.id}
+									className={ClassNames(
+										'prompter-line',
+										this.props.config.addBlankLine ? 'add-blank' : undefined,
+										!line.text ? 'empty' : undefined
+									)}
+								>
+									{line.text || ''}
+								</div>
+							)
+						}
+					}
+				}
+			}
+
+			if (hasInsertedScript) {
+				lines.push(<div className="prompter-break end">—{t('End of script')}—</div>)
+			}
 
 			return lines
 		}
 		render(): JSX.Element {
-			const { t } = this.props
-
-			if (this.props.prompterData) {
+			if (!this.props.prompterData) {
 				return (
-					<div
-						className={ClassNames(
-							'prompter',
-							this.props.config.mirror ? 'mirror' : undefined,
-							this.props.config.mirrorv ? 'mirrorv' : undefined
-						)}
-						style={{
-							fontSize: this.props.config.fontSize ? this.props.config.fontSize + 'vh' : undefined,
-						}}
-					>
-						{this.props.children}
-
-						<div className="overlay-fix">
-							<div
-								className={
-									'read-marker ' + (!this.props.config.showMarker ? 'hide' : this.props.config.marker || 'hide')
-								}
-							></div>
+					<div className="prompter prompter--loading">
+						<Spinner />
+					</div>
+				)
+			}
 
-							<div
-								className="indicators"
-								style={{
-									marginTop: this.props.config.margin ? `${this.props.config.margin}vh` : undefined,
-									marginLeft: this.props.config.margin ? `${this.props.config.margin}vw` : undefined,
-									marginRight: this.props.config.margin ? `${this.props.config.margin}vw` : undefined,
-									fontSize: (this.props.config.fontSize ?? 0) > 12 ? `12vmin` : undefined,
-								}}
-							>
-								<div className="take-indicator hidden"></div>
-								<div className="next-indicator hidden"></div>
-							</div>
-						</div>
+			return (
+				<div
+					className={ClassNames(
+						'prompter',
+						this.props.config.mirror ? 'mirror' : undefined,
+						this.props.config.mirrorv ? 'mirrorv' : undefined
+					)}
+					style={{
+						fontSize: this.props.config.fontSize ? this.props.config.fontSize + 'vh' : undefined,
+					}}
+				>
+					{this.props.children}
+
+					<div className="overlay-fix">
+						<div
+							className={'read-marker ' + (!this.props.config.showMarker ? 'hide' : this.props.config.marker || 'hide')}
+						></div>
 
 						<div
-							className="prompter-display"
+							className="indicators"
 							style={{
-								paddingLeft: this.props.config.margin ? this.props.config.margin + 'vw' : undefined,
-								paddingRight: this.props.config.margin ? this.props.config.margin + 'vw' : undefined,
-								paddingTop:
-									this.props.config.marker === 'center'
-										? '50vh'
-										: this.props.config.marker === 'bottom'
-										? '100vh'
-										: this.props.config.margin
-										? this.props.config.margin + 'vh'
-										: undefined,
-								paddingBottom:
-									this.props.config.marker === 'center'
-										? '50vh'
-										: this.props.config.marker === 'top'
-										? '100vh'
-										: this.props.config.margin
-										? this.props.config.margin + 'vh'
-										: undefined,
+								marginTop: this.props.config.margin ? `${this.props.config.margin}vh` : undefined,
+								marginLeft: this.props.config.margin ? `${this.props.config.margin}vw` : undefined,
+								marginRight: this.props.config.margin ? `${this.props.config.margin}vw` : undefined,
+								fontSize: (this.props.config.fontSize ?? 0) > 12 ? `12vmin` : undefined,
 							}}
 						>
-							<div className="prompter-break begin">{this.props.prompterData.title}</div>
-
-							{this.renderPrompterData(this.props.prompterData)}
-
-							{this.props.prompterData.segments.length ? (
-								<div className="prompter-break end">—{t('End of script')}—</div>
-							) : null}
+							<div className="take-indicator hidden"></div>
+							<div className="next-indicator hidden"></div>
 						</div>
 					</div>
-				)
-			} else {
-				return (
-					<div className="prompter prompter--loading">
-						<Spinner />
+
+					<div
+						className="prompter-display"
+						style={{
+							paddingLeft: this.props.config.margin ? this.props.config.margin + 'vw' : undefined,
+							paddingRight: this.props.config.margin ? this.props.config.margin + 'vw' : undefined,
+							paddingTop:
+								this.props.config.marker === 'center'
+									? '50vh'
+									: this.props.config.marker === 'bottom'
+									? '100vh'
+									: this.props.config.margin
+									? this.props.config.margin + 'vh'
+									: undefined,
+							paddingBottom:
+								this.props.config.marker === 'center'
+									? '50vh'
+									: this.props.config.marker === 'top'
+									? '100vh'
+									: this.props.config.margin
+									? this.props.config.margin + 'vh'
+									: undefined,
+						}}
+					>
+						<div className="prompter-break begin">{this.props.prompterData.title}</div>
+
+						{this.renderPrompterData(this.props.prompterData)}
 					</div>
-				)
-			}
+				</div>
+			)
 		}
 	}
 )
diff --git a/meteor/client/ui/Prompter/controller/joycon-device.ts b/packages/webui/src/client/ui/Prompter/controller/joycon-device.ts
similarity index 95%
rename from meteor/client/ui/Prompter/controller/joycon-device.ts
rename to packages/webui/src/client/ui/Prompter/controller/joycon-device.ts
index e2690712a7..119dfb742c 100644
--- a/meteor/client/ui/Prompter/controller/joycon-device.ts
+++ b/packages/webui/src/client/ui/Prompter/controller/joycon-device.ts
@@ -1,7 +1,7 @@
 import { ControllerAbstract } from './lib'
 import { PrompterConfigMode, PrompterViewContent } from '../PrompterView'
 import Spline from 'cubic-spline'
-import { logger } from '../../../../lib/logging'
+import { logger } from '../../../lib/logging'
 
 type JoyconWithData = { index: number; timestamp: number; mode: JoyconMode; axes: readonly number[]; buttons: number[] }
 type JoyconMode = 'L' | 'R' | 'LR' | null
@@ -17,6 +17,7 @@ export class JoyConController extends ControllerAbstract {
 	private rangeNeutralMin = -0.25 // pedal "back" position where reverse-range transistions to the neutral x
 	private rangeNeutralMax = 0.25 // pedal "front" position where scrolling starts, the 0 speed origin
 	private rangeFwdMax = 1 // pedal "all front" position where scrolling is maxed out
+	private rightHandOffset = 1.4 // factor increased by 1.4 to account for the R joystick being less sensitive than L
 	private speedMap = [1, 2, 3, 4, 5, 8, 12, 30]
 	private reverseSpeedMap = [1, 2, 3, 4, 5, 8, 12, 30]
 	private deadBand = 0.25
@@ -40,6 +41,7 @@ export class JoyConController extends ControllerAbstract {
 		this.rangeNeutralMin = view.configOptions.joycon_rangeNeutralMin || this.rangeNeutralMin
 		this.rangeNeutralMax = view.configOptions.joycon_rangeNeutralMax || this.rangeNeutralMax
 		this.rangeFwdMax = view.configOptions.joycon_rangeFwdMax || this.rangeFwdMax
+		this.rightHandOffset = view.configOptions.joycon_rightHandOffset || this.rightHandOffset
 		this.speedMap = view.configOptions.joycon_speedMap || this.speedMap
 		this.reverseSpeedMap = view.configOptions.joycon_reverseSpeedMap || this.reverseSpeedMap
 		this.deadBand = Math.min(Math.abs(this.rangeNeutralMin), Math.abs(this.rangeNeutralMax))
@@ -249,8 +251,8 @@ export class JoyConController extends ControllerAbstract {
 						if (joycon.mode === 'L') {
 							lastSeenSpeed = joycon.axes[0] * -1 // in this mode, L is "negative"
 						} else if (joycon.mode === 'R') {
-							lastSeenSpeed = joycon.axes[0] * 1.4 // in this mode, R is "positive"
-							// factor increased by 1.4 to account for the R joystick being less sensitive than L
+							lastSeenSpeed = joycon.axes[0] * this.rightHandOffset // in this mode, R is "positive"
+							// rightHandOffset allows for different rates between the two controllers
 						}
 						this.timestampOfLastUsedJoyconInput = joycon.timestamp
 					}
@@ -260,8 +262,8 @@ export class JoyConController extends ControllerAbstract {
 					if (Math.abs(joycon.axes[1]) > this.deadBand) {
 						lastSeenSpeed = joycon.axes[1] * -1 // in this mode, we are "negative" on both sticks....
 					} else if (Math.abs(joycon.axes[3]) > this.deadBand) {
-						lastSeenSpeed = joycon.axes[3] * -1.4 // in this mode, we are "negative" on both sticks....
-						// factor increased by 1.4 to account for the R joystick being less sensitive than L
+						lastSeenSpeed = joycon.axes[3] * this.rightHandOffset * -1 // in this mode, we are "negative" on both sticks....
+						// rightHandOffset allows for different rates between the two controllers
 					}
 					this.timestampOfLastUsedJoyconInput = joycon.timestamp
 				}
diff --git a/meteor/client/ui/Prompter/controller/keyboard-device.ts b/packages/webui/src/client/ui/Prompter/controller/keyboard-device.ts
similarity index 100%
rename from meteor/client/ui/Prompter/controller/keyboard-device.ts
rename to packages/webui/src/client/ui/Prompter/controller/keyboard-device.ts
diff --git a/meteor/client/ui/Prompter/controller/lib.ts b/packages/webui/src/client/ui/Prompter/controller/lib.ts
similarity index 100%
rename from meteor/client/ui/Prompter/controller/lib.ts
rename to packages/webui/src/client/ui/Prompter/controller/lib.ts
diff --git a/meteor/client/ui/Prompter/controller/manager.ts b/packages/webui/src/client/ui/Prompter/controller/manager.ts
similarity index 100%
rename from meteor/client/ui/Prompter/controller/manager.ts
rename to packages/webui/src/client/ui/Prompter/controller/manager.ts
diff --git a/meteor/client/ui/Prompter/controller/midi-pedal-device.ts b/packages/webui/src/client/ui/Prompter/controller/midi-pedal-device.ts
similarity index 99%
rename from meteor/client/ui/Prompter/controller/midi-pedal-device.ts
rename to packages/webui/src/client/ui/Prompter/controller/midi-pedal-device.ts
index 9946d63bc8..4fcbe77d29 100644
--- a/meteor/client/ui/Prompter/controller/midi-pedal-device.ts
+++ b/packages/webui/src/client/ui/Prompter/controller/midi-pedal-device.ts
@@ -3,7 +3,7 @@ import { PrompterViewContent, PrompterConfigMode } from '../PrompterView'
 import Spline from 'cubic-spline'
 
 import webmidi, { Input, InputEventControlchange } from 'webmidi'
-import { logger } from '../../../../lib/logging'
+import { logger } from '../../../lib/logging'
 
 /**
  * This class handles control of the prompter using
diff --git a/meteor/client/ui/Prompter/controller/mouse-ish-device.ts b/packages/webui/src/client/ui/Prompter/controller/mouse-ish-device.ts
similarity index 99%
rename from meteor/client/ui/Prompter/controller/mouse-ish-device.ts
rename to packages/webui/src/client/ui/Prompter/controller/mouse-ish-device.ts
index 2ebd9d5e07..7f26e92b75 100644
--- a/meteor/client/ui/Prompter/controller/mouse-ish-device.ts
+++ b/packages/webui/src/client/ui/Prompter/controller/mouse-ish-device.ts
@@ -1,6 +1,6 @@
 import { ControllerAbstract, LONGPRESS_TIME } from './lib'
 import { PrompterViewContent, PrompterConfigMode } from '../PrompterView'
-import { NotificationCenter, Notification, NoticeLevel } from '../../../../lib/notifications/notifications'
+import { NotificationCenter, Notification, NoticeLevel } from '../../../lib/notifications/notifications'
 
 const LOCALSTORAGE_MODE = 'prompter-controller-mouseish'
 /**
diff --git a/meteor/client/ui/Prompter/controller/shuttle-keyboard-device.ts b/packages/webui/src/client/ui/Prompter/controller/shuttle-keyboard-device.ts
similarity index 100%
rename from meteor/client/ui/Prompter/controller/shuttle-keyboard-device.ts
rename to packages/webui/src/client/ui/Prompter/controller/shuttle-keyboard-device.ts
diff --git a/meteor/client/ui/Prompter/prompter.ts b/packages/webui/src/client/ui/Prompter/prompter.ts
similarity index 79%
rename from meteor/client/ui/Prompter/prompter.ts
rename to packages/webui/src/client/ui/Prompter/prompter.ts
index 8980859b73..9a47b5531b 100644
--- a/meteor/client/ui/Prompter/prompter.ts
+++ b/packages/webui/src/client/ui/Prompter/prompter.ts
@@ -1,14 +1,4 @@
-import { check } from '../../../lib/check'
-import * as _ from 'underscore'
 import { ScriptContent, SourceLayerType } from '@sofie-automation/blueprints-integration'
-import { normalizeArrayToMap, protectString } from '../../../lib/lib'
-import { Piece } from '@sofie-automation/corelib/dist/dataModel/Piece'
-import { getPieceInstancesForPartInstance, getSegmentsWithPartInstances } from '../../../lib/Rundown'
-import { FindOptions } from '../../../lib/collections/lib'
-import { PieceInstance } from '@sofie-automation/corelib/dist/dataModel/PieceInstance'
-import { Rundown } from '@sofie-automation/corelib/dist/dataModel/Rundown'
-import { processAndPrunePieceInstanceTimings } from '@sofie-automation/corelib/dist/playout/processAndPrune'
-import { UIShowStyleBases } from '../Collections'
 import {
 	PartId,
 	PartInstanceId,
@@ -18,10 +8,21 @@ import {
 	SegmentId,
 	ShowStyleBaseId,
 } from '@sofie-automation/corelib/dist/dataModel/Ids'
-import { RundownPlaylists, PieceInstances, Pieces, Segments } from '../../collections'
-import { SourceLayers } from '@sofie-automation/corelib/dist/dataModel/ShowStyleBase'
-import { RundownPlaylistCollectionUtil } from '../../../lib/collections/rundownPlaylistUtil'
+import { Piece } from '@sofie-automation/corelib/dist/dataModel/Piece'
+import { PieceInstance } from '@sofie-automation/corelib/dist/dataModel/PieceInstance'
+import { Rundown } from '@sofie-automation/corelib/dist/dataModel/Rundown'
 import { DBSegment } from '@sofie-automation/corelib/dist/dataModel/Segment'
+import { RundownUtils } from '../../lib/rundown'
+import { RundownPlaylistClientUtil } from '../../lib/rundownPlaylistUtil'
+import { SourceLayers } from '@sofie-automation/corelib/dist/dataModel/ShowStyleBase'
+import { processAndPrunePieceInstanceTimings } from '@sofie-automation/corelib/dist/playout/processAndPrune'
+import * as _ from 'underscore'
+import { FindOptions } from '../../collections/lib'
+import { RundownPlaylistCollectionUtil } from '../../collections/rundownPlaylistUtil'
+import { normalizeArrayToMap, protectString } from '../../lib/tempLib'
+import { PieceInstances, Pieces, RundownPlaylists, Segments } from '../../collections'
+import { getPieceInstancesForPartInstance } from '../../lib/RundownResolver'
+import { UIShowStyleBases } from '../Collections'
 
 // export interface NewPrompterAPI {
 // 	getPrompterData (playlistId: RundownPlaylistId): Promise<PrompterData>
@@ -30,13 +31,20 @@ import { DBSegment } from '@sofie-automation/corelib/dist/dataModel/Segment'
 // 	'getPrompterData' = 'PrompterMethods.getPrompterData'
 // }
 
+export interface PrompterDataRundown {
+	id: RundownId
+	title: string
+	segments: PrompterDataSegment[]
+}
+
 export interface PrompterDataSegment {
 	id: SegmentId
-	title: string | undefined
+	title: string
 	parts: PrompterDataPart[]
 }
 export interface PrompterDataPart {
-	id: PartInstanceId
+	id: PartId
+	partInstanceId: PartInstanceId
 	title: string | undefined
 	pieces: PrompterDataPiece[]
 }
@@ -48,13 +56,13 @@ export interface PrompterData {
 	title: string
 	currentPartInstanceId: PartInstanceId | null
 	nextPartInstanceId: PartInstanceId | null
-	segments: Array<PrompterDataSegment>
+	rundowns: Array<PrompterDataRundown>
 }
 
 export namespace PrompterAPI {
 	// TODO: discuss: move this implementation to server-side?
 	export function getPrompterData(playlistId: RundownPlaylistId): PrompterData | null {
-		check(playlistId, String)
+		if (typeof playlistId !== 'string') throw new Error('Expected `playlistId` to be a string')
 
 		const playlist = RundownPlaylists.findOne(playlistId)
 
@@ -72,8 +80,7 @@ export namespace PrompterAPI {
 		}
 		const rundownMap = normalizeArrayToMap(rundowns, '_id')
 
-		const { currentPartInstance, nextPartInstance } =
-			RundownPlaylistCollectionUtil.getSelectedPartInstances(playlist)
+		const { currentPartInstance, nextPartInstance } = RundownPlaylistClientUtil.getSelectedPartInstances(playlist)
 
 		const currentSegment = currentPartInstance
 			? (Segments.findOne(currentPartInstance?.segmentId, {
@@ -84,7 +91,7 @@ export namespace PrompterAPI {
 			  }) as Pick<DBSegment, '_id' | 'orphaned'>)
 			: undefined
 
-		const groupedParts = getSegmentsWithPartInstances(
+		const groupedParts = RundownUtils.getSegmentsWithPartInstances(
 			playlist,
 			undefined,
 			undefined,
@@ -113,7 +120,7 @@ export namespace PrompterAPI {
 			title: playlist.name,
 			currentPartInstanceId: currentPartInstance ? currentPartInstance._id : null,
 			nextPartInstanceId: nextPartInstance ? nextPartInstance._id : null,
-			segments: [],
+			rundowns: [],
 		}
 
 		const piecesIncluded: PieceId[] = []
@@ -170,6 +177,8 @@ export namespace PrompterAPI {
 			  ).fetch()
 			: undefined
 
+		const orderedRundowns = new Map<RundownId, PrompterDataRundown>()
+
 		groupedParts.forEach(({ segment, partInstances }, segmentIndex) => {
 			const segmentId = segment._id
 			const rundown = rundownMap.get(segment.rundownId)
@@ -182,9 +191,19 @@ export namespace PrompterAPI {
 				return
 			}
 
+			let rundownObj = orderedRundowns.get(rundown._id)
+			if (!rundownObj) {
+				rundownObj = {
+					id: rundown._id,
+					title: rundown.name,
+					segments: [],
+				}
+				orderedRundowns.set(rundown._id, rundownObj)
+			}
+
 			const segmentData: PrompterDataSegment = {
 				id: segmentId,
-				title: segment ? segment.name : undefined,
+				title: segment.name,
 				parts: [],
 			}
 
@@ -193,7 +212,8 @@ export namespace PrompterAPI {
 			for (let partIndex = 0; partIndex < partInstances.length; partIndex++) {
 				const partInstance = partInstances[partIndex]
 				const partData: PrompterDataPart = {
-					id: partInstance._id,
+					id: partInstance.part._id,
+					partInstanceId: partInstance._id,
 					title: partInstance.part.prompterTitle || partInstance.part.title,
 					pieces: [],
 				}
@@ -230,19 +250,17 @@ export namespace PrompterAPI {
 						const piece = pieceInstance.piece
 						const sourceLayer = sourceLayers[piece.sourceLayerId]
 
-						if (piece.content && sourceLayer && sourceLayer.type === SourceLayerType.SCRIPT) {
-							const content = piece.content as ScriptContent
-							if (content.fullScript) {
-								if (piecesIncluded.indexOf(piece._id) >= 0) {
-									break // piece already included in prompter script
-								}
-								piecesIncluded.push(piece._id)
-								partData.pieces.push({
-									id: piece._id,
-									text: content.fullScript,
-								})
-							}
-						}
+						if (!piece.content || !sourceLayer || sourceLayer.type !== SourceLayerType.SCRIPT) continue
+
+						const content = piece.content as ScriptContent
+						if (!content.fullScript) continue
+						if (piecesIncluded.indexOf(piece._id) >= 0) continue // piece already included in prompter script
+
+						piecesIncluded.push(piece._id)
+						partData.pieces.push({
+							id: piece._id,
+							text: content.fullScript,
+						})
 					}
 				}
 
@@ -257,8 +275,11 @@ export namespace PrompterAPI {
 				segmentData.parts.push(partData)
 			}
 
-			data.segments.push(segmentData)
+			rundownObj.segments.push(segmentData)
 		})
+
+		data.rundowns = Array.from(orderedRundowns.values())
+
 		return data
 	}
 }
diff --git a/meteor/client/ui/RundownList.tsx b/packages/webui/src/client/ui/RundownList.tsx
similarity index 87%
rename from meteor/client/ui/RundownList.tsx
rename to packages/webui/src/client/ui/RundownList.tsx
index 4eace8ca18..1f2047f9b0 100644
--- a/meteor/client/ui/RundownList.tsx
+++ b/packages/webui/src/client/ui/RundownList.tsx
@@ -1,10 +1,9 @@
 import Tooltip from 'rc-tooltip'
-import * as React from 'react'
-import { MeteorPubSub } from '../../lib/api/pubsub'
-import { GENESIS_SYSTEM_VERSION } from '../../lib/collections/CoreSystem'
+import { MeteorPubSub } from '@sofie-automation/meteor-lib/dist/api/pubsub'
+import { GENESIS_SYSTEM_VERSION } from '@sofie-automation/meteor-lib/dist/collections/CoreSystem'
 import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
-import { getAllowConfigure, getAllowStudio, getHelpMode } from '../lib/localStorage'
-import { literal, unprotectString } from '../../lib/lib'
+import { getHelpMode } from '../lib/localStorage'
+import { literal, unprotectString } from '../lib/tempLib'
 import { useSubscription, useTracker } from '../lib/ReactMeteorData/react-meteor-data'
 import { Spinner } from '../lib/Spinner'
 import { GettingStarted } from './RundownList/GettingStarted'
@@ -13,14 +12,15 @@ import { RundownDropZone } from './RundownList/RundownDropZone'
 import { RundownListFooter } from './RundownList/RundownListFooter'
 import RundownPlaylistDragLayer from './RundownList/RundownPlaylistDragLayer'
 import { RundownPlaylistUi } from './RundownList/RundownPlaylistUi'
-import { RundownLayoutsAPI } from '../../lib/api/rundownLayouts'
+import { RundownLayoutsAPI } from '../lib/rundownLayouts'
 import { PlaylistTiming } from '@sofie-automation/corelib/dist/playout/rundownTiming'
 import { getCoreSystem, RundownLayouts, RundownPlaylists, Rundowns } from '../collections'
-import { RundownPlaylistCollectionUtil } from '../../lib/collections/rundownPlaylistUtil'
-import { useEffect, useMemo, useState } from 'react'
+import { RundownPlaylistCollectionUtil } from '../collections/rundownPlaylistUtil'
+import { useEffect, useMemo, useState, useContext } from 'react'
 import { useTranslation } from 'react-i18next'
 import { CorelibPubSub } from '@sofie-automation/corelib/dist/pubsub'
 import { CreateAdlibTestingRundownPanel } from './RundownList/CreateAdlibTestingRundownPanel'
+import { UserPermissionsContext } from './UserPermissions'
 
 export enum ToolTipStep {
 	TOOLTIP_START_HERE = 'TOOLTIP_START_HERE',
@@ -31,6 +31,8 @@ export enum ToolTipStep {
 export function RundownList(): JSX.Element {
 	const { t } = useTranslation()
 
+	const userPermissions = useContext(UserPermissionsContext)
+
 	const playlistIds = useTracker(
 		() =>
 			RundownPlaylists.find(undefined, {
@@ -114,11 +116,11 @@ export function RundownList(): JSX.Element {
 		}
 
 		if (coreSystem?.version === GENESIS_SYSTEM_VERSION && gotPlaylists === true) {
-			return getAllowConfigure() ? ToolTipStep.TOOLTIP_RUN_MIGRATIONS : ToolTipStep.TOOLTIP_START_HERE
+			return userPermissions.configure ? ToolTipStep.TOOLTIP_RUN_MIGRATIONS : ToolTipStep.TOOLTIP_START_HERE
 		} else {
 			return ToolTipStep.TOOLTIP_EXTRAS
 		}
-	}, [coreSystem, rundownPlaylists])
+	}, [coreSystem, rundownPlaylists, userPermissions])
 
 	const showGettingStarted = coreSystem?.version === GENESIS_SYSTEM_VERSION && rundownPlaylists.length === 0
 
@@ -186,7 +188,7 @@ export function RundownList(): JSX.Element {
 				)}
 			</section>
 
-			{getAllowStudio() && <CreateAdlibTestingRundownPanel />}
+			{userPermissions.studio && <CreateAdlibTestingRundownPanel />}
 
 			<RundownListFooter />
 		</>
diff --git a/meteor/client/ui/RundownList/ActiveProgressBar.tsx b/packages/webui/src/client/ui/RundownList/ActiveProgressBar.tsx
similarity index 96%
rename from meteor/client/ui/RundownList/ActiveProgressBar.tsx
rename to packages/webui/src/client/ui/RundownList/ActiveProgressBar.tsx
index c6c4b93a71..7f35f21d2f 100644
--- a/meteor/client/ui/RundownList/ActiveProgressBar.tsx
+++ b/packages/webui/src/client/ui/RundownList/ActiveProgressBar.tsx
@@ -1,4 +1,3 @@
-import React from 'react'
 import { PlaylistTiming } from '@sofie-automation/corelib/dist/playout/rundownTiming'
 import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
 import { useCurrentTime } from '../../lib/lib'
diff --git a/meteor/client/ui/RundownList/CreateAdlibTestingRundownPanel.tsx b/packages/webui/src/client/ui/RundownList/CreateAdlibTestingRundownPanel.tsx
similarity index 87%
rename from meteor/client/ui/RundownList/CreateAdlibTestingRundownPanel.tsx
rename to packages/webui/src/client/ui/RundownList/CreateAdlibTestingRundownPanel.tsx
index 46a87e8eef..93f87e75e5 100644
--- a/meteor/client/ui/RundownList/CreateAdlibTestingRundownPanel.tsx
+++ b/packages/webui/src/client/ui/RundownList/CreateAdlibTestingRundownPanel.tsx
@@ -1,7 +1,7 @@
 import React, { memo, useEffect, useState } from 'react'
-import { CreateAdlibTestingRundownOption } from '../../../lib/api/showStyles'
-import { MeteorCall } from '../../../lib/api/methods'
-import { UserAction, doUserAction } from '../../../lib/clientUserAction'
+import { CreateAdlibTestingRundownOption } from '@sofie-automation/meteor-lib/dist/api/showStyles'
+import { MeteorCall } from '../../lib/meteorApi'
+import { UserAction, doUserAction } from '../../lib/clientUserAction'
 import { useTranslation } from 'react-i18next'
 
 export const CreateAdlibTestingRundownPanel = memo(function CreateAdlibTestingRundownPanel(): JSX.Element | null {
diff --git a/meteor/client/ui/RundownList/DisplayFormattedTime.tsx b/packages/webui/src/client/ui/RundownList/DisplayFormattedTime.tsx
similarity index 95%
rename from meteor/client/ui/RundownList/DisplayFormattedTime.tsx
rename to packages/webui/src/client/ui/RundownList/DisplayFormattedTime.tsx
index 2e7184b7fc..8b90fa40f3 100644
--- a/meteor/client/ui/RundownList/DisplayFormattedTime.tsx
+++ b/packages/webui/src/client/ui/RundownList/DisplayFormattedTime.tsx
@@ -1,4 +1,3 @@
-import React from 'react'
 import { TFunction } from 'i18next'
 import { DisplayFormattedTimeInner } from './DisplayFormattedTimeInner'
 
diff --git a/meteor/client/ui/RundownList/DisplayFormattedTimeInner.ts b/packages/webui/src/client/ui/RundownList/DisplayFormattedTimeInner.ts
similarity index 96%
rename from meteor/client/ui/RundownList/DisplayFormattedTimeInner.ts
rename to packages/webui/src/client/ui/RundownList/DisplayFormattedTimeInner.ts
index d2e563fb81..f125a4dbe1 100644
--- a/meteor/client/ui/RundownList/DisplayFormattedTimeInner.ts
+++ b/packages/webui/src/client/ui/RundownList/DisplayFormattedTimeInner.ts
@@ -1,6 +1,6 @@
 import { TFunction } from 'i18next'
 import moment from 'moment'
-import { getCurrentTime } from '../../../lib/lib'
+import { getCurrentTime } from '../../lib/systemTime'
 
 export function DisplayFormattedTimeInner(
 	t: TFunction,
diff --git a/meteor/client/ui/RundownList/DragAndDropTypes.ts b/packages/webui/src/client/ui/RundownList/DragAndDropTypes.ts
similarity index 77%
rename from meteor/client/ui/RundownList/DragAndDropTypes.ts
rename to packages/webui/src/client/ui/RundownList/DragAndDropTypes.ts
index ca2d88c837..dc9dae1f78 100644
--- a/meteor/client/ui/RundownList/DragAndDropTypes.ts
+++ b/packages/webui/src/client/ui/RundownList/DragAndDropTypes.ts
@@ -1,5 +1,5 @@
-import { isProtectedString } from '../../../lib/lib'
-import { RundownLayoutBase } from '../../../lib/collections/RundownLayouts'
+import { isProtectedString } from '../../lib/tempLib'
+import { RundownLayoutBase } from '@sofie-automation/meteor-lib/dist/collections/RundownLayouts'
 import { RundownId, RundownPlaylistId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 
 enum RundownListDragDropTypes {
@@ -53,11 +53,6 @@ function isRundownPlaylistUiAction(obj: unknown): obj is IRundownPlaylistUiActio
 	return typeof type === 'string' && type in RundownPlaylistUiActionTypes
 }
 
-export {
-	IRundownDragObject,
-	IRundownPlaylistUiAction,
-	isRundownDragObject,
-	isRundownPlaylistUiAction,
-	RundownListDragDropTypes,
-	RundownPlaylistUiActionTypes,
-}
+export { isRundownDragObject, isRundownPlaylistUiAction, RundownListDragDropTypes, RundownPlaylistUiActionTypes }
+
+export type { IRundownDragObject, IRundownPlaylistUiAction }
diff --git a/meteor/client/ui/RundownList/GettingStarted.tsx b/packages/webui/src/client/ui/RundownList/GettingStarted.tsx
similarity index 97%
rename from meteor/client/ui/RundownList/GettingStarted.tsx
rename to packages/webui/src/client/ui/RundownList/GettingStarted.tsx
index d702928c26..0d13cd9f12 100644
--- a/meteor/client/ui/RundownList/GettingStarted.tsx
+++ b/packages/webui/src/client/ui/RundownList/GettingStarted.tsx
@@ -1,4 +1,3 @@
-import React from 'react'
 import Tooltip from 'rc-tooltip'
 import { useTranslation } from 'react-i18next'
 import { ToolTipStep } from '../RundownList'
diff --git a/meteor/client/ui/RundownList/PlaylistRankResetButton.tsx b/packages/webui/src/client/ui/RundownList/PlaylistRankResetButton.tsx
similarity index 97%
rename from meteor/client/ui/RundownList/PlaylistRankResetButton.tsx
rename to packages/webui/src/client/ui/RundownList/PlaylistRankResetButton.tsx
index 951b201530..476a712539 100644
--- a/meteor/client/ui/RundownList/PlaylistRankResetButton.tsx
+++ b/packages/webui/src/client/ui/RundownList/PlaylistRankResetButton.tsx
@@ -1,4 +1,3 @@
-import React from 'react'
 import Tooltip from 'rc-tooltip'
 import { useTranslation } from 'react-i18next'
 import { TOOLTIP_DEFAULT_DELAY } from '../../lib/lib'
diff --git a/meteor/client/ui/RundownList/RegisterHelp.tsx b/packages/webui/src/client/ui/RundownList/RegisterHelp.tsx
similarity index 91%
rename from meteor/client/ui/RundownList/RegisterHelp.tsx
rename to packages/webui/src/client/ui/RundownList/RegisterHelp.tsx
index 2be7fb2a77..8079f274e9 100644
--- a/meteor/client/ui/RundownList/RegisterHelp.tsx
+++ b/packages/webui/src/client/ui/RundownList/RegisterHelp.tsx
@@ -1,9 +1,9 @@
 import React from 'react'
 import { useTranslation } from 'react-i18next'
-import { literal } from '../../../lib/lib'
+import { literal } from '../../lib/tempLib'
 import { ReactNotification } from '../../lib/notifications/ReactNotification'
 import { ToolTipStep } from '../RundownList'
-import { NotificationAction } from '../../../lib/notifications/notifications'
+import { NotificationAction } from '../../lib/notifications/notifications'
 
 export interface IRegisterHelpProps {
 	step: ToolTipStep
diff --git a/meteor/client/ui/RundownList/RundownDropZone.tsx b/packages/webui/src/client/ui/RundownList/RundownDropZone.tsx
similarity index 87%
rename from meteor/client/ui/RundownList/RundownDropZone.tsx
rename to packages/webui/src/client/ui/RundownList/RundownDropZone.tsx
index d41968cf30..c55aa184b2 100644
--- a/meteor/client/ui/RundownList/RundownDropZone.tsx
+++ b/packages/webui/src/client/ui/RundownList/RundownDropZone.tsx
@@ -1,8 +1,7 @@
-import React from 'react'
 import { useDrop } from 'react-dnd'
 import { useTranslation } from 'react-i18next'
-import { MeteorCall } from '../../../lib/api/methods'
-import { doUserAction, UserAction } from '../../../lib/clientUserAction'
+import { MeteorCall } from '../../lib/meteorApi'
+import { doUserAction, UserAction } from '../../lib/clientUserAction'
 import { IRundownDragObject, RundownListDragDropTypes } from './DragAndDropTypes'
 
 export function RundownDropZone(): JSX.Element {
diff --git a/meteor/client/ui/RundownList/RundownListFooter.tsx b/packages/webui/src/client/ui/RundownList/RundownListFooter.tsx
similarity index 83%
rename from meteor/client/ui/RundownList/RundownListFooter.tsx
rename to packages/webui/src/client/ui/RundownList/RundownListFooter.tsx
index 99945f74ae..3d6d4d18ec 100644
--- a/meteor/client/ui/RundownList/RundownListFooter.tsx
+++ b/packages/webui/src/client/ui/RundownList/RundownListFooter.tsx
@@ -1,13 +1,12 @@
-import React, { useEffect, useState } from 'react'
+import { useEffect, useState } from 'react'
 import Tooltip from 'rc-tooltip'
 import { getHelpMode } from '../../lib/localStorage'
-import { StatusResponse } from '../../../lib/api/systemStatus'
+import { StatusResponse } from '@sofie-automation/meteor-lib/dist/api/systemStatus'
 import { TOOLTIP_DEFAULT_DELAY } from '../../lib/lib'
 import { useTranslation } from 'react-i18next'
-import { MeteorCall } from '../../../lib/api/methods'
-import { NoticeLevel, Notification, NotificationCenter } from '../../../lib/notifications/notifications'
-
-const PackageInfo = require('../../../package.json') as Record<string, any>
+import { MeteorCall } from '../../lib/meteorApi'
+import { NoticeLevel, Notification, NotificationCenter } from '../../lib/notifications/notifications'
+import { APP_VERSION_EXTENDED } from '../../lib/Settings'
 
 export function RundownListFooter(): JSX.Element {
 	const { t } = useTranslation()
@@ -41,8 +40,8 @@ export function RundownListFooter(): JSX.Element {
 		}
 	}, [])
 
-	const version = PackageInfo.version || 'UNSTABLE'
-	const versionExtended = PackageInfo.versionExtended || version
+	const version = __APP_VERSION__ || 'UNSTABLE'
+	const versionExtended = APP_VERSION_EXTENDED || version
 
 	return (
 		<div className="mtl gutter version-info">
diff --git a/meteor/client/ui/RundownList/RundownListItem.tsx b/packages/webui/src/client/ui/RundownList/RundownListItem.tsx
similarity index 86%
rename from meteor/client/ui/RundownList/RundownListItem.tsx
rename to packages/webui/src/client/ui/RundownList/RundownListItem.tsx
index 5eaf623d08..f62fd844a2 100644
--- a/meteor/client/ui/RundownList/RundownListItem.tsx
+++ b/packages/webui/src/client/ui/RundownList/RundownListItem.tsx
@@ -1,20 +1,20 @@
-import React, { useEffect } from 'react'
+import { useContext, useEffect } from 'react'
 import classNames from 'classnames'
 import { Rundown } from '@sofie-automation/corelib/dist/dataModel/Rundown'
-import { getAllowConfigure, getAllowService, getAllowStudio } from '../../lib/localStorage'
 import { useTracker } from '../../lib/ReactMeteorData/ReactMeteorData'
 import { confirmDeleteRundown, confirmReSyncRundown, getShowStyleBaseLink } from './util'
 import { useDrag, useDrop } from 'react-dnd'
 import { IRundownDragObject, IRundownPlaylistUiAction, RundownListDragDropTypes } from './DragAndDropTypes'
 import { getEmptyImage } from 'react-dnd-html5-backend'
-import { unprotectString } from '../../../lib/lib'
+import { unprotectString } from '../../lib/tempLib'
 import RundownListItemView from './RundownListItemView'
-import { RundownLayoutBase } from '../../../lib/collections/RundownLayouts'
+import { RundownLayoutBase } from '@sofie-automation/meteor-lib/dist/collections/RundownLayouts'
 import { RundownId, RundownPlaylistId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import { ShowStyleBases, ShowStyleVariants } from '../../collections'
 import { useTranslation } from 'react-i18next'
 import { DBShowStyleBase } from '@sofie-automation/corelib/dist/dataModel/ShowStyleBase'
 import { DBShowStyleVariant } from '@sofie-automation/corelib/dist/dataModel/ShowStyleVariant'
+import { UserPermissionsContext } from '../UserPermissions'
 
 export const HTML_ID_PREFIX = 'rundown-'
 
@@ -36,6 +36,7 @@ export function RundownListItem({
 	action?: IRundownPlaylistUiAction
 }>): JSX.Element | null {
 	const { t } = useTranslation()
+	const userPermissions = useContext(UserPermissionsContext)
 
 	const showStyleBase = useTracker(
 		() =>
@@ -52,8 +53,6 @@ export function RundownListItem({
 		[rundown.showStyleVariantId]
 	)
 
-	const userCanConfigure = getAllowConfigure()
-
 	const [dragState, connectDragSource, connectDragPreview] = useDrag<IRundownDragObject, void, { isDragging: boolean }>(
 		{
 			type: RundownListDragDropTypes.RUNDOWN,
@@ -118,17 +117,17 @@ export function RundownListItem({
 			isOnlyRundownInPlaylist={isOnlyRundownInPlaylist}
 			rundownLayouts={rundownLayouts}
 			showStyleName={showStyleLabel}
-			showStyleBaseURL={userCanConfigure ? getShowStyleBaseLink(rundown.showStyleBaseId) : undefined}
+			showStyleBaseURL={userPermissions.configure ? getShowStyleBaseLink(rundown.showStyleBaseId) : undefined}
 			confirmDeleteRundownHandler={
-				(getAllowStudio() &&
+				(userPermissions.studio &&
 					(rundown.orphaned || rundown.source.type === 'testing' || rundown.source.type === 'snapshot')) ||
-				userCanConfigure ||
-				getAllowService()
+				userPermissions.configure ||
+				userPermissions.service
 					? () => confirmDeleteRundown(rundown, t)
 					: undefined
 			}
 			confirmReSyncRundownHandler={
-				rundown.orphaned && getAllowStudio() ? () => confirmReSyncRundown(rundown, t) : undefined
+				rundown.orphaned && userPermissions.studio ? () => confirmReSyncRundown(userPermissions, rundown, t) : undefined
 			}
 		/>
 	)
diff --git a/meteor/client/ui/RundownList/RundownListItemProblems.tsx b/packages/webui/src/client/ui/RundownList/RundownListItemProblems.tsx
similarity index 96%
rename from meteor/client/ui/RundownList/RundownListItemProblems.tsx
rename to packages/webui/src/client/ui/RundownList/RundownListItemProblems.tsx
index d0684ea043..3024dde3a3 100644
--- a/meteor/client/ui/RundownList/RundownListItemProblems.tsx
+++ b/packages/webui/src/client/ui/RundownList/RundownListItemProblems.tsx
@@ -1,4 +1,3 @@
-import React from 'react'
 import { INoteBase } from '@sofie-automation/corelib/dist/dataModel/Notes'
 import { CriticalIconSmall, WarningIconSmall } from '../../lib/ui/icons/notifications'
 
diff --git a/meteor/client/ui/RundownList/RundownListItemView.tsx b/packages/webui/src/client/ui/RundownList/RundownListItemView.tsx
similarity index 92%
rename from meteor/client/ui/RundownList/RundownListItemView.tsx
rename to packages/webui/src/client/ui/RundownList/RundownListItemView.tsx
index 7b24652ab9..4565baf736 100644
--- a/meteor/client/ui/RundownList/RundownListItemView.tsx
+++ b/packages/webui/src/client/ui/RundownList/RundownListItemView.tsx
@@ -1,21 +1,22 @@
 import Tooltip from 'rc-tooltip'
-import React from 'react'
+import React, { useContext } from 'react'
 import { useTranslation } from 'react-i18next'
 import { Link } from 'react-router-dom'
 import { Rundown, getRundownNrcsName } from '@sofie-automation/corelib/dist/dataModel/Rundown'
-import { getAllowStudio } from '../../lib/localStorage'
 import { RundownUtils } from '../../lib/rundown'
 import { iconDragHandle, iconRemove, iconResync } from './icons'
 import { DisplayFormattedTime } from './DisplayFormattedTime'
 import { PathIcon } from '../../lib/ui/icons/rundownList'
 import { LoopingIcon } from '../../lib/ui/icons/looping'
 import { RundownViewLayoutSelection } from './RundownViewLayoutSelection'
-import { RundownLayoutBase } from '../../../lib/collections/RundownLayouts'
-import { RundownLayoutsAPI } from '../../../lib/api/rundownLayouts'
+import { RundownLayoutBase } from '@sofie-automation/meteor-lib/dist/collections/RundownLayouts'
+import { RundownLayoutsAPI } from '../../lib/rundownLayouts'
 import { PlaylistTiming } from '@sofie-automation/corelib/dist/playout/rundownTiming'
 import { TOOLTIP_DEFAULT_DELAY } from '../../lib/lib'
 import { Meteor } from 'meteor/meteor'
 import { RundownPlaylists } from '../../collections'
+import { isLoopDefined } from '../../lib/RundownResolver'
+import { UserPermissionsContext } from '../UserPermissions'
 
 interface IRundownListItemViewProps {
 	isActive: boolean
@@ -54,13 +55,15 @@ export default React.memo(function RundownListItemView({
 }: IRundownListItemViewProps): JSX.Element | null {
 	const { t } = useTranslation()
 
+	const userPermissions = useContext(UserPermissionsContext)
+
 	if (!rundown.playlistId) throw new Meteor.Error(500, 'Rundown is not a part of a rundown playlist!')
 	const playlist = RundownPlaylists.findOne(rundown.playlistId)
 	if (!playlist) throw new Meteor.Error(404, `Rundown Playlist "${rundown.playlistId}" not found!`)
 
 	const rundownNameContent = rundownViewUrl ? (
 		<Link to={rundownViewUrl}>
-			{isOnlyRundownInPlaylist && playlist.loop && <LoopingIcon />}
+			{isOnlyRundownInPlaylist && isLoopDefined(playlist) && <LoopingIcon />}
 			{rundown.name}
 		</Link>
 	) : (
@@ -80,7 +83,7 @@ export default React.memo(function RundownListItemView({
 		>
 			<span className="rundown-list-item__name" role="rowheader">
 				<>
-					{getAllowStudio() ? (
+					{userPermissions.studio ? (
 						<span className="draghandle" ref={connectDragSource}>
 							<Tooltip
 								overlay={t('Drag to reorder or move out of playlist')}
@@ -134,7 +137,7 @@ export default React.memo(function RundownListItemView({
 			</span>
 			<span className="rundown-list-item__text" role="gridcell">
 				{expectedDuration ? (
-					isOnlyRundownInPlaylist && playlist.loop ? (
+					isOnlyRundownInPlaylist && isLoopDefined(playlist) ? (
 						<Tooltip
 							overlay={t('This rundown will loop indefinitely')}
 							mouseEnterDelay={TOOLTIP_DEFAULT_DELAY}
@@ -151,7 +154,7 @@ export default React.memo(function RundownListItemView({
 					) : (
 						RundownUtils.formatDiffToTimecode(expectedDuration, false, true, true, false, true)
 					)
-				) : isOnlyRundownInPlaylist && playlist.loop ? (
+				) : isOnlyRundownInPlaylist && isLoopDefined(playlist) ? (
 					<Tooltip
 						overlay={t('This rundown will loop indefinitely')}
 						mouseEnterDelay={TOOLTIP_DEFAULT_DELAY}
diff --git a/meteor/client/ui/RundownList/RundownPlaylistDragLayer.tsx b/packages/webui/src/client/ui/RundownList/RundownPlaylistDragLayer.tsx
similarity index 100%
rename from meteor/client/ui/RundownList/RundownPlaylistDragLayer.tsx
rename to packages/webui/src/client/ui/RundownList/RundownPlaylistDragLayer.tsx
diff --git a/meteor/client/ui/RundownList/RundownPlaylistUi.tsx b/packages/webui/src/client/ui/RundownList/RundownPlaylistUi.tsx
similarity index 92%
rename from meteor/client/ui/RundownList/RundownPlaylistUi.tsx
rename to packages/webui/src/client/ui/RundownList/RundownPlaylistUi.tsx
index ee745d9ca4..eee24a4d04 100644
--- a/meteor/client/ui/RundownList/RundownPlaylistUi.tsx
+++ b/packages/webui/src/client/ui/RundownList/RundownPlaylistUi.tsx
@@ -1,9 +1,9 @@
-import React, { useCallback, useEffect, useState } from 'react'
+import { useCallback, useContext, useEffect, useState } from 'react'
 import Tooltip from 'rc-tooltip'
 import ClassNames from 'classnames'
 import { useTranslation } from 'react-i18next'
-import { RundownLayoutBase } from '../../../lib/collections/RundownLayouts'
-import { unprotectString } from '../../../lib/lib'
+import { RundownLayoutBase } from '@sofie-automation/meteor-lib/dist/collections/RundownLayouts'
+import { unprotectString } from '../../lib/tempLib'
 import { ActiveProgressBar } from './ActiveProgressBar'
 import { RundownListItem } from './RundownListItem'
 import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
@@ -15,17 +15,18 @@ import { LoopingIcon } from '../../lib/ui/icons/looping'
 import { getRundownPlaylistLink } from './util'
 import { useDrop } from 'react-dnd'
 import { IRundownDragObject, RundownListDragDropTypes } from './DragAndDropTypes'
-import { MeteorCall } from '../../../lib/api/methods'
+import { MeteorCall } from '../../lib/meteorApi'
 import { RundownUtils } from '../../lib/rundown'
 import PlaylistRankResetButton from './PlaylistRankResetButton'
 import { DisplayFormattedTime } from './DisplayFormattedTime'
-import { getAllowStudio } from '../../lib/localStorage'
-import { doUserAction, UserAction } from '../../../lib/clientUserAction'
+import { doUserAction, UserAction } from '../../lib/clientUserAction'
 import { RundownViewLayoutSelection } from './RundownViewLayoutSelection'
-import { RundownLayoutsAPI } from '../../../lib/api/rundownLayouts'
+import { RundownLayoutsAPI } from '../../lib/rundownLayouts'
 import { PlaylistTiming } from '@sofie-automation/corelib/dist/playout/rundownTiming'
 import { TOOLTIP_DEFAULT_DELAY } from '../../lib/lib'
 import { RundownId } from '@sofie-automation/corelib/dist/dataModel/Ids'
+import { isLoopDefined } from '../../lib/RundownResolver'
+import { UserPermissionsContext } from '../UserPermissions'
 
 export interface RundownPlaylistUi extends DBRundownPlaylist {
 	rundowns: Rundown[]
@@ -42,6 +43,8 @@ export function RundownPlaylistUi({
 	const { t } = useTranslation()
 	const [rundownOrder, setRundownOrder] = useState(playlist.rundowns.map((rundown) => rundown._id))
 
+	const userPermissions = useContext(UserPermissionsContext)
+
 	useEffect(() => {
 		setRundownOrder(playlist.rundowns.map((rundown) => rundown._id))
 	}, [playlist.rundowns.map((rundown) => rundown._id).join(',')])
@@ -166,10 +169,11 @@ export function RundownPlaylistUi({
 	const playlistExpectedDuration = PlaylistTiming.getExpectedDuration(playlist.timing)
 	const playlistExpectedStart = PlaylistTiming.getExpectedStart(playlist.timing)
 	const playlistExpectedEnd = PlaylistTiming.getExpectedEnd(playlist.timing)
+	const isPlaylistLooping = isLoopDefined(playlist)
 
 	const expectedDuration =
 		playlistExpectedDuration !== undefined &&
-		(playlist.loop ? (
+		(isPlaylistLooping ? (
 			<Tooltip
 				overlay={t('This rundown will loop indefinitely')}
 				mouseEnterDelay={TOOLTIP_DEFAULT_DELAY}
@@ -200,12 +204,12 @@ export function RundownPlaylistUi({
 						<FontAwesomeIcon icon={faFolderOpen} />
 						<span className="rundown-playlist__heading-text">
 							<Link to={playlistViewURL}>
-								{playlist.loop && <LoopingIcon />}
+								{isPlaylistLooping && <LoopingIcon />}
 								{playlist.name}
 							</Link>
 						</span>
 					</h2>
-					{getAllowStudio() ? (
+					{userPermissions.studio ? (
 						<PlaylistRankResetButton
 							manualSortingActive={playlist.rundownRanksAreSetInSofie === true}
 							nrcsName={getRundownNrcsName(playlist.rundowns[0])}
@@ -225,7 +229,7 @@ export function RundownPlaylistUi({
 				<span className="rundown-list-item__text" role="gridcell">
 					{expectedDuration ? (
 						expectedDuration
-					) : playlist.loop ? (
+					) : isPlaylistLooping ? (
 						<Tooltip
 							mouseEnterDelay={TOOLTIP_DEFAULT_DELAY}
 							overlay={t('This rundown will loop indefinitely')}
diff --git a/meteor/client/ui/RundownList/RundownViewLayoutSelection.tsx b/packages/webui/src/client/ui/RundownList/RundownViewLayoutSelection.tsx
similarity index 95%
rename from meteor/client/ui/RundownList/RundownViewLayoutSelection.tsx
rename to packages/webui/src/client/ui/RundownList/RundownViewLayoutSelection.tsx
index ddd664f627..eb5f037104 100644
--- a/meteor/client/ui/RundownList/RundownViewLayoutSelection.tsx
+++ b/packages/webui/src/client/ui/RundownList/RundownViewLayoutSelection.tsx
@@ -4,12 +4,12 @@ import { Link } from 'react-router-dom'
 import { SplitDropdown } from '../../lib/SplitDropdown'
 import { getRundownPlaylistLink, getRundownWithShelfLayoutLink as getRundownWithLayoutLink, getShelfLink } from './util'
 import { Rundown } from '@sofie-automation/corelib/dist/dataModel/Rundown'
-import { RundownLayoutBase } from '../../../lib/collections/RundownLayouts'
+import { RundownLayoutBase } from '@sofie-automation/meteor-lib/dist/collections/RundownLayouts'
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
 import classNames from 'classnames'
 import { IconProp } from '@fortawesome/fontawesome-svg-core'
 import { useTranslation } from 'react-i18next'
-import { RundownLayoutsAPI } from '../../../lib/api/rundownLayouts'
+import { RundownLayoutsAPI } from '../../lib/rundownLayouts'
 import { RundownPlaylistId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 
 export const RundownViewLayoutSelection = React.memo(function RundownViewLayoutSelection2({
diff --git a/meteor/client/ui/RundownList/__tests__/DisplayFormattedTime.test.ts b/packages/webui/src/client/ui/RundownList/__tests__/DisplayFormattedTime.test.ts
similarity index 100%
rename from meteor/client/ui/RundownList/__tests__/DisplayFormattedTime.test.ts
rename to packages/webui/src/client/ui/RundownList/__tests__/DisplayFormattedTime.test.ts
diff --git a/meteor/client/ui/RundownList/__tests__/DragAndDropTypes.test.ts b/packages/webui/src/client/ui/RundownList/__tests__/DragAndDropTypes.test.ts
similarity index 98%
rename from meteor/client/ui/RundownList/__tests__/DragAndDropTypes.test.ts
rename to packages/webui/src/client/ui/RundownList/__tests__/DragAndDropTypes.test.ts
index 39dac624f7..5016059da0 100644
--- a/meteor/client/ui/RundownList/__tests__/DragAndDropTypes.test.ts
+++ b/packages/webui/src/client/ui/RundownList/__tests__/DragAndDropTypes.test.ts
@@ -1,4 +1,4 @@
-import { protectString } from '../../../../lib/lib'
+import { protectString } from '../../../lib/tempLib'
 import { isRundownDragObject, isRundownPlaylistUiAction, RundownPlaylistUiActionTypes } from '../DragAndDropTypes'
 
 describe('ui/RundownList/DragAndDropTypes', () => {
diff --git a/meteor/client/ui/RundownList/icons.tsx b/packages/webui/src/client/ui/RundownList/icons.tsx
similarity index 100%
rename from meteor/client/ui/RundownList/icons.tsx
rename to packages/webui/src/client/ui/RundownList/icons.tsx
diff --git a/meteor/client/ui/RundownList/util.ts b/packages/webui/src/client/ui/RundownList/util.ts
similarity index 87%
rename from meteor/client/ui/RundownList/util.ts
rename to packages/webui/src/client/ui/RundownList/util.ts
index 107344008e..ac1d8bc3cf 100644
--- a/meteor/client/ui/RundownList/util.ts
+++ b/packages/webui/src/client/ui/RundownList/util.ts
@@ -1,8 +1,8 @@
 import { Rundown } from '@sofie-automation/corelib/dist/dataModel/Rundown'
-import { unprotectString } from '../../../lib/lib'
+import { unprotectString } from '../../lib/tempLib'
 import { doModalDialog } from '../../lib/ModalDialog'
-import { doUserAction, UserAction } from '../../../lib/clientUserAction'
-import { MeteorCall } from '../../../lib/api/methods'
+import { doUserAction, UserAction } from '../../lib/clientUserAction'
+import { MeteorCall } from '../../lib/meteorApi'
 import { TFunction } from 'i18next'
 import { handleRundownReloadResponse } from '../RundownView'
 import {
@@ -12,6 +12,7 @@ import {
 	ShowStyleBaseId,
 	StudioId,
 } from '@sofie-automation/corelib/dist/dataModel/Ids'
+import { UserPermissions } from '../UserPermissions'
 
 export function getRundownPlaylistLink(rundownPlaylistId: RundownPlaylistId): string {
 	// double encoding so that "/" are handled correctly
@@ -70,7 +71,7 @@ export function confirmDeleteRundown(rundown: Rundown, t: TFunction): void {
 	})
 }
 
-export function confirmReSyncRundown(rundown: Rundown, t: TFunction): void {
+export function confirmReSyncRundown(userPermissions: Readonly<UserPermissions>, rundown: Rundown, t: TFunction): void {
 	doModalDialog({
 		title: t('Re-Sync rundown?'),
 		yes: t('Re-Sync'),
@@ -83,7 +84,7 @@ export function confirmReSyncRundown(rundown: Rundown, t: TFunction): void {
 				async (e, ts) => MeteorCall.userAction.resyncRundown(e, ts, rundown._id),
 				(err, res) => {
 					if (!err && res) {
-						return handleRundownReloadResponse(t, rundown._id, res)
+						return handleRundownReloadResponse(t, userPermissions, rundown._id, res)
 					}
 				}
 			)
diff --git a/meteor/client/ui/RundownView.tsx b/packages/webui/src/client/ui/RundownView.tsx
similarity index 93%
rename from meteor/client/ui/RundownView.tsx
rename to packages/webui/src/client/ui/RundownView.tsx
index a6ce8517e3..fa83c0b877 100644
--- a/meteor/client/ui/RundownView.tsx
+++ b/packages/webui/src/client/ui/RundownView.tsx
@@ -1,5 +1,5 @@
 import { Meteor } from 'meteor/meteor'
-import * as React from 'react'
+import React, { useContext } from 'react'
 import { parse as queryStringParse } from 'query-string'
 // @ts-expect-error No types available
 import * as VelocityReact from 'velocity-react'
@@ -13,7 +13,7 @@ import {
 import { VTContent, TSR, NoteSeverity, ISourceLayer } from '@sofie-automation/blueprints-integration'
 import { withTranslation, WithTranslation } from 'react-i18next'
 import timer from 'react-timer-hoc'
-import CoreIcon from '@nrk/core-icons/jsx'
+import * as CoreIcon from '@nrk/core-icons/jsx'
 import { Spinner } from '../lib/Spinner'
 import ClassNames from 'classnames'
 import * as _ from 'underscore'
@@ -22,7 +22,11 @@ import Escape from './../lib/Escape'
 import * as i18next from 'i18next'
 import Tooltip from 'rc-tooltip'
 import { NavLink, Route, Prompt } from 'react-router-dom'
-import { DBRundownPlaylist, RundownHoldState } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
+import {
+	DBRundownPlaylist,
+	QuickLoopMarker,
+	RundownHoldState,
+} from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
 import { Rundown, getRundownNrcsName } from '@sofie-automation/corelib/dist/dataModel/Rundown'
 import { DBSegment, SegmentOrphanedReason } from '@sofie-automation/corelib/dist/dataModel/Segment'
 import { StudioRouteSet } from '@sofie-automation/corelib/dist/dataModel/Studio'
@@ -30,18 +34,19 @@ import { DBPart } from '@sofie-automation/corelib/dist/dataModel/Part'
 import { ContextMenu, MenuItem, ContextMenuTrigger } from '@jstarpl/react-contextmenu'
 import { RundownTimingProvider } from './RundownView/RundownTiming/RundownTimingProvider'
 import { withTiming, WithTiming } from './RundownView/RundownTiming/withTiming'
-import { CurrentPartRemaining } from './RundownView/RundownTiming/CurrentPartRemaining'
+import { CurrentPartOrSegmentRemaining } from './RundownView/RundownTiming/CurrentPartOrSegmentRemaining'
 import { AutoNextStatus } from './RundownView/RundownTiming/AutoNextStatus'
 import { SegmentTimelineContainer, PieceUi, PartUi, SegmentUi } from './SegmentTimeline/SegmentTimelineContainer'
 import { SegmentContextMenu } from './SegmentTimeline/SegmentContextMenu'
 import { Shelf, ShelfTabs } from './Shelf/Shelf'
 import { RundownSystemStatus } from './RundownView/RundownSystemStatus'
-import { getCurrentTime, unprotectString, protectString } from '../../lib/lib'
+import { unprotectString, protectString } from '@sofie-automation/shared-lib/dist/lib/protectedString'
+import { getCurrentTime } from '../lib/systemTime'
 import { RundownUtils } from '../lib/rundown'
 import { ErrorBoundary } from '../lib/ErrorBoundary'
 import { ModalDialog, doModalDialog, isModalShowing } from '../lib/ModalDialog'
-import { getAllowStudio, getAllowDeveloper, getHelpMode } from '../lib/localStorage'
-import { ClientAPI } from '../../lib/api/client'
+import { getHelpMode } from '../lib/localStorage'
+import { ClientAPI } from '@sofie-automation/meteor-lib/dist/api/client'
 import {
 	scrollToPosition,
 	scrollToSegment,
@@ -61,14 +66,19 @@ import {
 	reloadRundownPlaylistClick,
 } from './RundownView/RundownNotifier'
 import { NotificationCenterPanel } from '../lib/notifications/NotificationCenterPanel'
-import { NotificationCenter, NoticeLevel, Notification } from '../../lib/notifications/notifications'
+import { NotificationCenter, NoticeLevel, Notification } from '../lib/notifications/notifications'
 import { SupportPopUp } from './SupportPopUp'
 import { KeyboardFocusIndicator } from '../lib/KeyboardFocusIndicator'
 import { PeripheralDevice, PeripheralDeviceType } from '@sofie-automation/corelib/dist/dataModel/PeripheralDevice'
-import { doUserAction, UserAction } from '../../lib/clientUserAction'
-import { hashSingleUseToken, ReloadRundownPlaylistResponse, TriggerReloadDataResponse } from '../../lib/api/userActions'
+import { doUserAction, UserAction } from '../lib/clientUserAction'
+import {
+	ReloadRundownPlaylistResponse,
+	TriggerReloadDataResponse,
+} from '@sofie-automation/meteor-lib/dist/api/userActions'
+import { hashSingleUseToken } from '../lib/lib'
 import { ClipTrimDialog } from './ClipTrimPanel/ClipTrimDialog'
-import { MeteorPubSub, meteorSubscribe } from '../../lib/api/pubsub'
+import { MeteorPubSub } from '@sofie-automation/meteor-lib/dist/api/pubsub'
+import { meteorSubscribe } from '../lib/meteorApi'
 import {
 	RundownLayoutType,
 	RundownLayoutBase,
@@ -76,30 +86,30 @@ import {
 	RundownLayoutShelfBase,
 	RundownLayoutRundownHeader,
 	RundownLayoutFilterBase,
-} from '../../lib/collections/RundownLayouts'
+} from '@sofie-automation/meteor-lib/dist/collections/RundownLayouts'
 import { VirtualElement } from '../lib/VirtualElement'
 import { SEGMENT_TIMELINE_ELEMENT_ID } from './SegmentTimeline/SegmentTimeline'
 import { NoraPreviewRenderer } from './FloatingInspectors/NoraFloatingInspector'
-import { Bucket } from '../../lib/collections/Buckets'
+import { Bucket } from '@sofie-automation/meteor-lib/dist/collections/Buckets'
 import { contextMenuHoldToDisplayTime, isEventInInputField } from '../lib/lib'
 import { OffsetPosition } from '../utils/positions'
-import { MeteorCall } from '../../lib/api/methods'
-import { Settings } from '../../lib/Settings'
+import { MeteorCall } from '../lib/meteorApi'
+import { Settings } from '../lib/Settings'
 import { PointerLockCursor } from '../lib/PointerLockCursor'
 import { documentTitle } from '../lib/DocumentTitleProvider'
-import { PartInstance } from '../../lib/collections/PartInstances'
+import { PartInstance } from '@sofie-automation/meteor-lib/dist/collections/PartInstances'
 import { RundownDividerHeader } from './RundownView/RundownDividerHeader'
 import { PlaylistLoopingHeader } from './RundownView/PlaylistLoopingHeader'
-import { memoizedIsolatedAutorun } from '../../lib/memoizedIsolatedAutorun'
+import { memoizedIsolatedAutorun } from '../lib/memoizedIsolatedAutorun'
 import RundownViewEventBus, {
 	ActivateRundownPlaylistEvent,
 	DeactivateRundownPlaylistEvent,
 	IEventContext,
 	MiniShelfQueueAdLibEvent,
 	RundownViewEvents,
-} from '../../lib/api/triggers/RundownViewEventBus'
+} from '@sofie-automation/meteor-lib/dist/triggers/RundownViewEventBus'
 import StudioContext from './RundownView/StudioContext'
-import { RundownLayoutsAPI } from '../../lib/api/rundownLayouts'
+import { RundownLayoutsAPI } from '../lib/rundownLayouts'
 import { TriggersHandler } from '../lib/triggers/TriggersHandler'
 import { SorensenContext } from '../lib/SorensenContext'
 import { PlaylistTiming } from '@sofie-automation/corelib/dist/playout/rundownTiming'
@@ -125,8 +135,8 @@ import { ExecuteActionResult } from '@sofie-automation/corelib/dist/worker/studi
 import { SegmentListContainer } from './SegmentList/SegmentListContainer'
 import { getNextMode as getNextSegmentViewMode } from './SegmentContainer/SwitchViewModeButton'
 import { IResolvedSegmentProps } from './SegmentContainer/withResolvedSegment'
-import { UIShowStyleBases, UIStudios } from './Collections'
-import { UIStudio } from '../../lib/api/studios'
+import { UIParts, UIShowStyleBases, UIStudios } from './Collections'
+import { UIStudio } from '@sofie-automation/meteor-lib/dist/api/studios'
 import {
 	PartId,
 	PartInstanceId,
@@ -138,24 +148,26 @@ import {
 } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import {
 	Buckets,
-	Parts,
 	PeripheralDevices,
 	RundownLayouts,
 	RundownPlaylists,
 	Rundowns,
 	ShowStyleVariants,
 } from '../collections'
-import { UIShowStyleBase } from '../../lib/api/showStyles'
-import { RundownPlaylistCollectionUtil } from '../../lib/collections/rundownPlaylistUtil'
+import { UIShowStyleBase } from '@sofie-automation/meteor-lib/dist/api/showStyles'
+import { RundownPlaylistCollectionUtil } from '../collections/rundownPlaylistUtil'
 import { SegmentAdlibTestingContainer } from './SegmentAdlibTesting/SegmentAdlibTestingContainer'
 import { PromiseButton } from '../lib/Components/PromiseButton'
-import { logger } from '../../lib/logging'
+import { logger } from '../lib/logging'
 import { isTranslatableMessage, translateMessage } from '@sofie-automation/corelib/dist/TranslatableMessage'
 import { i18nTranslator } from './i18n'
 import { CorelibPubSub } from '@sofie-automation/corelib/dist/pubsub'
+import { isEntirePlaylistLooping, isLoopRunning } from '../lib/RundownResolver'
 import { useRundownAndShowStyleIdsForPlaylist } from './util/useRundownAndShowStyleIdsForPlaylist'
+import { RundownPlaylistClientUtil } from '../lib/rundownPlaylistUtil'
+import { UserPermissionsContext, UserPermissions } from './UserPermissions'
 
-export const MAGIC_TIME_SCALE_FACTOR = 0.03
+import { MAGIC_TIME_SCALE_FACTOR } from './SegmentTimeline/Constants'
 
 const REHEARSAL_MARGIN = 1 * 60 * 1000
 const HIDE_NOTIFICATIONS_AFTER_MOUNT: number | undefined = 5000
@@ -299,9 +311,10 @@ const TimingDisplay = withTranslation()(
 						<TimeOfDay />
 						{rundownPlaylist.currentPartInfo && (
 							<span className="timing-clock current-remaining">
-								<CurrentPartRemaining
+								<CurrentPartOrSegmentRemaining
 									currentPartInstanceId={rundownPlaylist.currentPartInfo.partInstanceId}
 									heavyClassName="overtime"
+									preferSegmentTime={true}
 								/>
 								<AutoNextStatus />
 								{rundownPlaylist.holdState && rundownPlaylist.holdState !== RundownHoldState.COMPLETE ? (
@@ -312,7 +325,7 @@ const TimingDisplay = withTranslation()(
 						{showEndTiming ? (
 							<PlaylistEndTiming
 								rundownPlaylist={rundownPlaylist}
-								loop={rundownPlaylist.loop}
+								loop={isLoopRunning(rundownPlaylist)}
 								expectedStart={expectedStart}
 								expectedEnd={expectedEnd}
 								expectedDuration={expectedDuration}
@@ -343,9 +356,9 @@ interface IRundownHeaderProps {
 	rundownIds: RundownId[]
 	firstRundown: Rundown | undefined
 	onActivate?: (isRehearsal: boolean) => void
-	studioMode: boolean
 	inActiveRundownView?: boolean
 	layout: RundownLayoutRundownHeader | undefined
+	userPermissions: Readonly<UserPermissions>
 }
 
 interface IRundownHeaderState {
@@ -437,7 +450,7 @@ const RundownHeader = withTranslation()(
 		disableNextPiece = (e: any) => {
 			const { t } = this.props
 
-			if (this.props.studioMode) {
+			if (this.props.userPermissions.studio) {
 				doUserAction(
 					t,
 					e,
@@ -451,7 +464,7 @@ const RundownHeader = withTranslation()(
 		disableNextPieceUndo = (e: any) => {
 			const { t } = this.props
 
-			if (this.props.studioMode) {
+			if (this.props.userPermissions.studio) {
 				doUserAction(
 					t,
 					e,
@@ -464,7 +477,7 @@ const RundownHeader = withTranslation()(
 
 		take = (e: any) => {
 			const { t } = this.props
-			if (this.props.studioMode) {
+			if (this.props.userPermissions.studio) {
 				if (!this.props.playlist.activationId) {
 					const onSuccess = () => {
 						if (typeof this.props.onActivate === 'function') this.props.onActivate(false)
@@ -535,7 +548,7 @@ const RundownHeader = withTranslation()(
 
 		hold = (e: any) => {
 			const { t } = this.props
-			if (this.props.studioMode && this.props.playlist.activationId) {
+			if (this.props.userPermissions.studio && this.props.playlist.activationId) {
 				doUserAction(t, e, UserAction.ACTIVATE_HOLD, (e, ts) =>
 					MeteorCall.userAction.activateHold(e, ts, this.props.playlist._id, false)
 				)
@@ -545,7 +558,7 @@ const RundownHeader = withTranslation()(
 		holdUndo = (e: any) => {
 			const { t } = this.props
 			if (
-				this.props.studioMode &&
+				this.props.userPermissions.studio &&
 				this.props.playlist.activationId &&
 				this.props.playlist.holdState === RundownHoldState.PENDING
 			) {
@@ -642,7 +655,7 @@ const RundownHeader = withTranslation()(
 			if (e.persist) e.persist()
 
 			if (
-				this.props.studioMode &&
+				this.props.userPermissions.studio &&
 				(!this.props.playlist.activationId || (this.props.playlist.activationId && this.props.playlist.rehearsal))
 			) {
 				const onSuccess = () => {
@@ -716,7 +729,7 @@ const RundownHeader = withTranslation()(
 			if (e.persist) e.persist()
 
 			if (
-				this.props.studioMode &&
+				this.props.userPermissions.studio &&
 				(!this.props.playlist.activationId || (this.props.playlist.activationId && !this.props.playlist.rehearsal))
 			) {
 				const onSuccess = () => {
@@ -796,7 +809,7 @@ const RundownHeader = withTranslation()(
 			const { t } = this.props
 			if (e.persist) e.persist()
 
-			if (this.props.studioMode && this.props.playlist.activationId) {
+			if (this.props.userPermissions.studio && this.props.playlist.activationId) {
 				if (this.rundownShouldHaveStarted()) {
 					if (this.props.playlist.rehearsal) {
 						// We're in rehearsal mode
@@ -828,7 +841,7 @@ const RundownHeader = withTranslation()(
 			if (e.persist) e.persist()
 
 			if (
-				this.props.studioMode &&
+				this.props.userPermissions.studio &&
 				this.props.studio.settings.allowAdlibTestingSegment &&
 				this.props.playlist.activationId &&
 				this.props.currentRundown
@@ -878,7 +891,7 @@ const RundownHeader = withTranslation()(
 
 		reloadRundownPlaylist = (e: any) => {
 			const { t } = this.props
-			if (this.props.studioMode) {
+			if (this.props.userPermissions.studio) {
 				doUserAction(
 					t,
 					e,
@@ -886,7 +899,7 @@ const RundownHeader = withTranslation()(
 					(e, ts) => MeteorCall.userAction.resyncRundownPlaylist(e, ts, this.props.playlist._id),
 					(err, reloadResponse) => {
 						if (!err && reloadResponse) {
-							if (!handleRundownPlaylistReloadResponse(t, reloadResponse)) {
+							if (!handleRundownPlaylistReloadResponse(t, this.props.userPermissions, reloadResponse)) {
 								if (this.props.playlist && this.props.playlist.nextPartInfo) {
 									scrollToPartInstance(this.props.playlist.nextPartInfo.partInstanceId).catch((error) => {
 										if (!error.toString().match(/another scroll/)) console.warn(error)
@@ -901,7 +914,7 @@ const RundownHeader = withTranslation()(
 
 		takeRundownSnapshot = (e: any) => {
 			const { t } = this.props
-			if (this.props.studioMode) {
+			if (this.props.userPermissions.studio) {
 				const doneMessage = t('A snapshot of the current Running\xa0Order has been created for troubleshooting.')
 				doUserAction(
 					t,
@@ -944,7 +957,7 @@ const RundownHeader = withTranslation()(
 
 		resetAndActivateRundown = (e: any) => {
 			// Called from the ModalDialog, 1 minute before broadcast starts
-			if (this.props.studioMode) {
+			if (this.props.userPermissions.studio) {
 				const { t } = this.props
 				this.rewindSegments() // Do a rewind right away
 
@@ -996,7 +1009,7 @@ const RundownHeader = withTranslation()(
 					<Escape to="document">
 						<ContextMenu id="rundown-context-menu">
 							<div className="react-contextmenu-label">{this.props.playlist && this.props.playlist.name}</div>
-							{this.props.studioMode ? (
+							{this.props.userPermissions.studio ? (
 								<React.Fragment>
 									{!(this.props.playlist.activationId && this.props.playlist.rehearsal) ? (
 										!this.rundownShouldHaveStarted() && !this.props.playlist.activationId ? (
@@ -1060,7 +1073,7 @@ const RundownHeader = withTranslation()(
 							holdToDisplay={contextMenuHoldToDisplayTime()}
 						>
 							<WarningDisplay
-								studioMode={this.props.studioMode}
+								studioMode={this.props.userPermissions.studio}
 								inActiveRundownView={this.props.inActiveRundownView}
 								playlist={this.props.playlist}
 								oneMinuteBeforeAction={this.resetAndActivateRundown}
@@ -1070,7 +1083,7 @@ const RundownHeader = withTranslation()(
 									<div className="badge mod">
 										<Tooltip
 											overlay={t('Add ?studio=1 to the URL to enter studio mode')}
-											visible={getHelpMode() && !getAllowStudio()}
+											visible={getHelpMode() && !this.props.userPermissions.studio}
 											placement="bottom"
 										>
 											<div className="media-elem mrs sofie-logo" />
@@ -1087,7 +1100,7 @@ const RundownHeader = withTranslation()(
 										showStyleBase={this.props.showStyleBase}
 										showStyleVariant={this.props.showStyleVariant}
 										studio={this.props.studio}
-										studioMode={this.props.studioMode}
+										studioMode={this.props.userPermissions.studio}
 										shouldQueue={this.state.shouldQueue}
 										onChangeQueueAdLib={this.changeQueueAdLib}
 										selectedPiece={this.state.selectedPiece}
@@ -1151,7 +1164,6 @@ export interface IContextMenuContext {
 
 interface IState {
 	timeScale: number
-	studioMode: boolean
 	contextMenuContext: IContextMenuContext | null
 	bottomMargin: string
 	followLiveSegments: boolean
@@ -1210,6 +1222,8 @@ interface ITrackedProps {
 	nextSegmentPartIds: PartId[]
 }
 export function RundownView(props: Readonly<IProps>): JSX.Element {
+	const userPermissions = useContext(UserPermissionsContext)
+
 	const playlistId = props.playlistId
 
 	const requiredSubsReady: boolean[] = []
@@ -1273,10 +1287,10 @@ export function RundownView(props: Readonly<IProps>): JSX.Element {
 	auxSubsReady.push(
 		useSubscriptionIfEnabled(CorelibPubSub.rundownBaselineAdLibActions, rundownIds.length > 0, rundownIds)
 	)
-	auxSubsReady.push(useSubscriptionIfEnabled(CorelibPubSub.parts, rundownIds.length > 0, rundownIds, null))
+	auxSubsReady.push(useSubscriptionIfEnabled(MeteorPubSub.uiParts, rundownIds.length > 0, playlistId))
 	auxSubsReady.push(
 		useSubscriptionIfEnabled(
-			CorelibPubSub.partInstances,
+			MeteorPubSub.uiPartInstances,
 			rundownIds.length > 0,
 			rundownIds,
 			playlistActivationId ?? null
@@ -1306,32 +1320,16 @@ export function RundownView(props: Readonly<IProps>): JSX.Element {
 				].filter((p): p is PartInstanceId => p !== null),
 				{}
 			)
-			const { previousPartInstance, currentPartInstance } =
-				RundownPlaylistCollectionUtil.getSelectedPartInstances(playlist)
-
-			if (previousPartInstance) {
-				meteorSubscribe(
-					CorelibPubSub.partInstancesForSegmentPlayout,
-					previousPartInstance.rundownId,
-					previousPartInstance.segmentPlayoutId
-				)
-			}
-			if (currentPartInstance) {
-				meteorSubscribe(
-					CorelibPubSub.partInstancesForSegmentPlayout,
-					currentPartInstance.rundownId,
-					currentPartInstance.segmentPlayoutId
-				)
-			}
 		}
 	}, [playlistId])
 
 	const subsReady = requiredSubsReady.findIndex((ready) => !ready) === -1
-	return <RundownViewContent {...props} subsReady={subsReady} />
+	return <RundownViewContent {...props} subsReady={subsReady} userPermissions={userPermissions} />
 }
 
 interface IPropsWithReady extends IProps {
 	subsReady: boolean
+	userPermissions: Readonly<UserPermissions>
 }
 
 interface IRundownViewContentSnapshot {
@@ -1355,7 +1353,7 @@ const RundownViewContent = translateWithTracker<IPropsWithReady, IState, ITracke
 			'playlist.getRundowns',
 			playlistId
 		)
-		;({ currentPartInstance, nextPartInstance } = RundownPlaylistCollectionUtil.getSelectedPartInstances(playlist))
+		;({ currentPartInstance, nextPartInstance } = RundownPlaylistClientUtil.getSelectedPartInstances(playlist))
 		const somePartInstance = currentPartInstance || nextPartInstance
 		if (somePartInstance) {
 			currentRundown = rundowns.find((rundown) => rundown._id === somePartInstance?.rundownId)
@@ -1387,7 +1385,7 @@ const RundownViewContent = translateWithTracker<IPropsWithReady, IState, ITracke
 		rundowns,
 		currentRundown,
 		matchedSegments: playlist
-			? RundownPlaylistCollectionUtil.getRundownsAndSegments(playlist, {}).map((input, rundownIndex, rundownArray) => ({
+			? RundownPlaylistClientUtil.getRundownsAndSegments(playlist, {}).map((input, rundownIndex, rundownArray) => ({
 					...input,
 					segmentIdsBeforeEachSegment: input.segments.map(
 						(_segment, segmentIndex, segmentArray) =>
@@ -1446,7 +1444,7 @@ const RundownViewContent = translateWithTracker<IPropsWithReady, IState, ITracke
 		currentPartInstance,
 		nextPartInstance,
 		currentSegmentPartIds: currentPartInstance
-			? Parts.find(
+			? UIParts.find(
 					{
 						segmentId: currentPartInstance?.part.segmentId,
 					},
@@ -1458,7 +1456,7 @@ const RundownViewContent = translateWithTracker<IPropsWithReady, IState, ITracke
 			  ).map((part) => part._id)
 			: [],
 		nextSegmentPartIds: nextPartInstance
-			? Parts.find(
+			? UIParts.find(
 					{
 						segmentId: nextPartInstance?.part.segmentId,
 					},
@@ -1491,7 +1489,6 @@ const RundownViewContent = translateWithTracker<IPropsWithReady, IState, ITracke
 
 			this.state = {
 				timeScale: MAGIC_TIME_SCALE_FACTOR * Settings.defaultTimeScale,
-				studioMode: getAllowStudio(),
 				contextMenuContext: null,
 				bottomMargin: '',
 				followLiveSegments: true,
@@ -1771,9 +1768,6 @@ const RundownViewContent = translateWithTracker<IPropsWithReady, IState, ITracke
 					documentTitle.set(null)
 				}
 			}
-			if (Settings.enableUserAccounts && getAllowStudio() !== this.state.studioMode) {
-				this.setState({ studioMode: getAllowStudio() })
-			}
 
 			this.handleMiniShelfRequeue(prevProps)
 		}
@@ -1891,22 +1885,26 @@ const RundownViewContent = translateWithTracker<IPropsWithReady, IState, ITracke
 				const diff = top - snapshot.top
 				window.scrollBy({
 					top: diff,
-					// @ts-expect-error 'instant' value has been introduced in browsers, but is not supported by TS 4.9
 					behavior: 'instant',
 				})
 			}
 		}
 
-		private handleBeforeUnloadEventAttach(prevProps: ITrackedProps, prevState: IState) {
+		private handleBeforeUnloadEventAttach(prevProps: IPropsWithReady & ITrackedProps, _prevState: IState) {
 			if (this.props.onlyShelf) return
 
 			if (
 				typeof this.props.playlist !== typeof prevProps.playlist ||
 				this.props.playlist?._id !== prevProps.playlist?._id ||
 				!!this.props.playlist?.activationId !== !!prevProps.playlist?.activationId ||
-				this.state.studioMode !== prevState.studioMode
+				this.props.userPermissions.studio !== prevProps.userPermissions.studio
 			) {
-				if (this.props.playlist && this.props.playlist.activationId && this.state.studioMode && !getAllowDeveloper()) {
+				if (
+					this.props.playlist &&
+					this.props.playlist.activationId &&
+					this.props.userPermissions.studio &&
+					!this.props.userPermissions.developer
+				) {
 					window.addEventListener('beforeunload', this.onBeforeUnload)
 				} else {
 					window.removeEventListener('beforeunload', this.onBeforeUnload)
@@ -2115,7 +2113,7 @@ const RundownViewContent = translateWithTracker<IPropsWithReady, IState, ITracke
 
 		onSetNext = (part: DBPart | undefined, e: any, offset?: number, take?: boolean) => {
 			const { t } = this.props
-			if (this.state.studioMode && part && part._id && this.props.playlist) {
+			if (this.props.userPermissions.studio && part && part._id && this.props.playlist) {
 				const playlistId = this.props.playlist._id
 				doUserAction(
 					t,
@@ -2140,7 +2138,7 @@ const RundownViewContent = translateWithTracker<IPropsWithReady, IState, ITracke
 
 		onSetNextSegment = (segmentId: SegmentId, e: any) => {
 			const { t } = this.props
-			if (this.state.studioMode && segmentId && this.props.playlist) {
+			if (this.props.userPermissions.studio && segmentId && this.props.playlist) {
 				const playlistId = this.props.playlist._id
 				doUserAction(
 					t,
@@ -2159,7 +2157,7 @@ const RundownViewContent = translateWithTracker<IPropsWithReady, IState, ITracke
 
 		onQueueNextSegment = (segmentId: SegmentId | null, e: any) => {
 			const { t } = this.props
-			if (this.state.studioMode && (segmentId || segmentId === null) && this.props.playlist) {
+			if (this.props.userPermissions.studio && (segmentId || segmentId === null) && this.props.playlist) {
 				const playlistId = this.props.playlist._id
 				doUserAction(
 					t,
@@ -2176,10 +2174,42 @@ const RundownViewContent = translateWithTracker<IPropsWithReady, IState, ITracke
 			}
 		}
 
+		onSetQuickLoopStart = (marker: QuickLoopMarker | null, e: any) => {
+			const { t } = this.props
+			if (this.props.userPermissions.studio && this.props.playlist) {
+				const playlistId = this.props.playlist._id
+				doUserAction(
+					t,
+					e,
+					UserAction.SET_QUICK_LOOP_START,
+					(e, ts) => MeteorCall.userAction.setQuickLoopStart(e, ts, playlistId, marker),
+					(err) => {
+						if (err) logger.error(err)
+					}
+				)
+			}
+		}
+
+		onSetQuickLoopEnd = (marker: QuickLoopMarker | null, e: any) => {
+			const { t } = this.props
+			if (this.props.userPermissions.studio && this.props.playlist) {
+				const playlistId = this.props.playlist._id
+				doUserAction(
+					t,
+					e,
+					UserAction.SET_QUICK_LOOP_END,
+					(e, ts) => MeteorCall.userAction.setQuickLoopEnd(e, ts, playlistId, marker),
+					(err) => {
+						if (err) logger.error(err)
+					}
+				)
+			}
+		}
+
 		onPieceDoubleClick = (item: PieceUi, e: React.MouseEvent<HTMLDivElement>) => {
 			const { t } = this.props
 			if (
-				this.state.studioMode &&
+				this.props.userPermissions.studio &&
 				item &&
 				item.instance &&
 				this.props.playlist &&
@@ -2200,7 +2230,7 @@ const RundownViewContent = translateWithTracker<IPropsWithReady, IState, ITracke
 
 				if (!segmentId) {
 					if (e.sourceLocator.partId) {
-						const part = Parts.findOne(e.sourceLocator.partId)
+						const part = UIParts.findOne(e.sourceLocator.partId)
 						if (part) {
 							segmentId = part.segmentId
 						}
@@ -2623,7 +2653,7 @@ const RundownViewContent = translateWithTracker<IPropsWithReady, IState, ITracke
 				miniShelfFilter: this.state.miniShelfFilter,
 				countdownToSegmentRequireLayers: this.state.rundownViewLayout?.countdownToSegmentRequireLayers,
 				fixedSegmentDuration: this.state.rundownViewLayout?.fixedSegmentDuration,
-				studioMode: this.state.studioMode,
+				studioMode: this.props.userPermissions.studio,
 				adLibSegmentUi: this.state.uiSegmentMap.get(segment._id),
 				showDurationSourceLayers: showDurationSourceLayers,
 			}
@@ -2651,16 +2681,15 @@ const RundownViewContent = translateWithTracker<IPropsWithReady, IState, ITracke
 					</div>
 				)
 			}
-
 			return (
 				<React.Fragment>
-					{this.props.playlist?.loop && (
+					{isEntirePlaylistLooping(this.props.playlist) && (
 						<PlaylistLoopingHeader position="start" multiRundown={this.props.matchedSegments.length > 1} />
 					)}
 					<div className="segment-timeline-container" role="main" aria-labelledby="rundown-playlist-name">
 						{this.renderSegments()}
 					</div>
-					{this.props.playlist?.loop && (
+					{isEntirePlaylistLooping(this.props.playlist) && (
 						<PlaylistLoopingHeader
 							position="end"
 							multiRundown={this.props.matchedSegments.length > 1}
@@ -2678,7 +2707,7 @@ const RundownViewContent = translateWithTracker<IPropsWithReady, IState, ITracke
 		}
 
 		onContextMenuTop = (e: React.MouseEvent<HTMLDivElement>): boolean => {
-			if (!getAllowDeveloper()) {
+			if (!this.props.userPermissions.developer) {
 				e.preventDefault()
 				e.stopPropagation()
 			}
@@ -2942,7 +2971,7 @@ const RundownViewContent = translateWithTracker<IPropsWithReady, IState, ITracke
 						<div
 							className={ClassNames('rundown-view', {
 								'notification-center-open': this.state.isNotificationsCenterOpen !== undefined,
-								'rundown-view--studio-mode': this.state.studioMode,
+								'rundown-view--studio-mode': this.props.userPermissions.studio,
 							})}
 							style={this.getStyle()}
 							onWheelCapture={this.onWheel}
@@ -2950,9 +2979,9 @@ const RundownViewContent = translateWithTracker<IPropsWithReady, IState, ITracke
 						>
 							{this.renderSegmentsList()}
 							<ErrorBoundary>
-								{this.props.matchedSegments && this.props.matchedSegments.length > 0 && getAllowStudio() && (
-									<AfterBroadcastForm playlist={playlist} />
-								)}
+								{this.props.matchedSegments &&
+									this.props.matchedSegments.length > 0 &&
+									this.props.userPermissions.studio && <AfterBroadcastForm playlist={playlist} />}
 							</ErrorBoundary>
 							<ErrorBoundary>
 								<RundownHeader
@@ -2961,7 +2990,7 @@ const RundownViewContent = translateWithTracker<IPropsWithReady, IState, ITracke
 									rundownIds={this.props.rundowns.map((r) => r._id)}
 									firstRundown={this.props.rundowns[0]}
 									onActivate={this.onActivate}
-									studioMode={this.state.studioMode}
+									userPermissions={this.props.userPermissions}
 									inActiveRundownView={this.props.inActiveRundownView}
 									currentRundown={this.state.currentRundown || this.props.rundowns[0]}
 									layout={this.state.rundownHeaderLayout}
@@ -2970,11 +2999,11 @@ const RundownViewContent = translateWithTracker<IPropsWithReady, IState, ITracke
 								/>
 							</ErrorBoundary>
 							<ErrorBoundary>
-								{this.state.studioMode && !Settings.disableBlurBorder && (
-									<KeyboardFocusIndicator>
+								{this.props.userPermissions.studio && !Settings.disableBlurBorder && (
+									<KeyboardFocusIndicator userPermissions={this.props.userPermissions}>
 										<div
 											className={ClassNames('rundown-view__focus-lost-frame', {
-												'rundown-view__focus-lost-frame--reduce-animation': Meteor.isDevelopment,
+												'rundown-view__focus-lost-frame--reduce-animation': import.meta.env.DEV,
 											})}
 										></div>
 									</KeyboardFocusIndicator>
@@ -2990,7 +3019,7 @@ const RundownViewContent = translateWithTracker<IPropsWithReady, IState, ITracke
 									onToggleNotifications={this.onToggleNotifications}
 									isSupportPanelOpen={this.state.isSupportPanelOpen}
 									onToggleSupportPanel={this.onToggleSupportPanel}
-									isStudioMode={this.state.studioMode}
+									isStudioMode={this.props.userPermissions.studio}
 									onTake={this.onTake}
 									studioRouteSets={studio.routeSets}
 									studioRouteSetExclusivityGroups={studio.routeSetExclusivityGroups}
@@ -3051,7 +3080,7 @@ const RundownViewContent = translateWithTracker<IPropsWithReady, IState, ITracke
 												{t('Take a Snapshot')}
 											</PromiseButton>
 											<hr />
-											{this.state.studioMode && (
+											{this.props.userPermissions.studio && (
 												<>
 													<button className="btn btn-secondary" onClick={this.onRestartPlayout}>
 														{t('Restart Playout')}
@@ -3059,7 +3088,7 @@ const RundownViewContent = translateWithTracker<IPropsWithReady, IState, ITracke
 													<hr />
 												</>
 											)}
-											{this.state.studioMode &&
+											{this.props.userPermissions.studio &&
 												this.props.casparCGPlayoutDevices &&
 												this.props.casparCGPlayoutDevices.map((i) => (
 													<React.Fragment key={unprotectString(i._id)}>
@@ -3074,7 +3103,7 @@ const RundownViewContent = translateWithTracker<IPropsWithReady, IState, ITracke
 								</VelocityReact.VelocityTransitionGroup>
 							</ErrorBoundary>
 							<ErrorBoundary>
-								{this.state.studioMode && (
+								{this.props.userPermissions.studio && (
 									<Prompt
 										when={!!playlist.activationId}
 										message={t('This rundown is now active. Are you sure you want to exit this screen?')}
@@ -3091,8 +3120,11 @@ const RundownViewContent = translateWithTracker<IPropsWithReady, IState, ITracke
 									onSetNext={this.onSetNext}
 									onSetNextSegment={this.onSetNextSegment}
 									onQueueNextSegment={this.onQueueNextSegment}
-									studioMode={this.state.studioMode}
+									onSetQuickLoopStart={this.onSetQuickLoopStart}
+									onSetQuickLoopEnd={this.onSetQuickLoopEnd}
+									studioMode={this.props.userPermissions.studio}
 									enablePlayFromAnywhere={!!studio.settings.enablePlayFromAnywhere}
+									enableQuickLoop={!!studio.settings.enableQuickLoop}
 								/>
 							</ErrorBoundary>
 							<ErrorBoundary>
@@ -3134,7 +3166,7 @@ const RundownViewContent = translateWithTracker<IPropsWithReady, IState, ITracke
 									playlist={this.props.playlist}
 									showStyleBase={this.props.showStyleBase}
 									showStyleVariant={this.props.showStyleVariant}
-									studioMode={this.state.studioMode}
+									studioMode={this.props.userPermissions.studio}
 									onChangeBottomMargin={this.onChangeBottomMargin}
 									rundownLayout={this.state.shelfLayout}
 									shelfDisplayOptions={this.props.shelfDisplayOptions}
@@ -3181,7 +3213,7 @@ const RundownViewContent = translateWithTracker<IPropsWithReady, IState, ITracke
 							playlist={this.props.playlist}
 							showStyleBase={this.props.showStyleBase}
 							showStyleVariant={this.props.showStyleVariant}
-							studioMode={this.state.studioMode}
+							studioMode={this.props.userPermissions.studio}
 							onChangeBottomMargin={this.onChangeBottomMargin}
 							rundownLayout={this.state.shelfLayout}
 							studio={this.props.studio}
@@ -3200,10 +3232,11 @@ const RundownViewContent = translateWithTracker<IPropsWithReady, IState, ITracke
 				<SorensenContext.Consumer>
 					{(sorensen) =>
 						sorensen &&
-						this.state.studioMode &&
+						this.props.userPermissions.studio &&
 						this.props.studio &&
 						this.props.showStyleBase && (
 							<TriggersHandler
+								studioId={this.props.studio._id}
 								rundownPlaylistId={this.props.rundownPlaylistId}
 								showStyleBaseId={this.props.showStyleBase._id}
 								currentRundownId={this.props.currentRundown?._id || null}
@@ -3293,7 +3326,11 @@ const RundownViewContent = translateWithTracker<IPropsWithReady, IState, ITracke
 	}
 )
 
-function handleRundownPlaylistReloadResponse(t: i18next.TFunction, result: ReloadRundownPlaylistResponse): boolean {
+function handleRundownPlaylistReloadResponse(
+	t: i18next.TFunction,
+	userPermissions: Readonly<UserPermissions>,
+	result: ReloadRundownPlaylistResponse
+): boolean {
 	const rundownsInNeedOfHandling = result.rundownsResponses.filter(
 		(r) => r.response === TriggerReloadDataResponse.MISSING
 	)
@@ -3329,7 +3366,7 @@ function handleRundownPlaylistReloadResponse(t: i18next.TFunction, result: Reloa
 	}
 
 	const handled = rundownsInNeedOfHandling.map((r) =>
-		handleRundownReloadResponse(t, r.rundownId, r.response, onActionTaken)
+		handleRundownReloadResponse(t, userPermissions, r.rundownId, r.response, onActionTaken)
 	)
 	return handled.reduce((previousValue, value) => previousValue || value, false)
 }
@@ -3338,6 +3375,7 @@ type RundownReloadResponseUserAction = 'removed' | 'unsynced' | 'error'
 
 export function handleRundownReloadResponse(
 	t: i18next.TFunction,
+	userPermissions: Readonly<UserPermissions>,
 	rundownId: RundownId,
 	result: TriggerReloadDataResponse,
 	clb?: (action: RundownReloadResponseUserAction) => void
@@ -3368,7 +3406,7 @@ export function handleRundownReloadResponse(
 				{
 					label: t('Leave Unsynced'),
 					type: 'default',
-					disabled: !getAllowStudio(),
+					disabled: !userPermissions.studio,
 					action: () => {
 						doUserAction(
 							t,
diff --git a/meteor/client/ui/RundownView/Fullscreen_MouseOut.json b/packages/webui/src/client/ui/RundownView/Fullscreen_MouseOut.json
similarity index 100%
rename from meteor/client/ui/RundownView/Fullscreen_MouseOut.json
rename to packages/webui/src/client/ui/RundownView/Fullscreen_MouseOut.json
diff --git a/meteor/client/ui/RundownView/Fullscreen_MouseOver.json b/packages/webui/src/client/ui/RundownView/Fullscreen_MouseOver.json
similarity index 100%
rename from meteor/client/ui/RundownView/Fullscreen_MouseOver.json
rename to packages/webui/src/client/ui/RundownView/Fullscreen_MouseOver.json
diff --git a/meteor/client/ui/RundownView/MediaStatusPopUp/MediaStatusPopUp.scss b/packages/webui/src/client/ui/RundownView/MediaStatusPopUp/MediaStatusPopUp.scss
similarity index 100%
rename from meteor/client/ui/RundownView/MediaStatusPopUp/MediaStatusPopUp.scss
rename to packages/webui/src/client/ui/RundownView/MediaStatusPopUp/MediaStatusPopUp.scss
diff --git a/meteor/client/ui/RundownView/MediaStatusPopUp/MediaStatusPopUpHeader.scss b/packages/webui/src/client/ui/RundownView/MediaStatusPopUp/MediaStatusPopUpHeader.scss
similarity index 100%
rename from meteor/client/ui/RundownView/MediaStatusPopUp/MediaStatusPopUpHeader.scss
rename to packages/webui/src/client/ui/RundownView/MediaStatusPopUp/MediaStatusPopUpHeader.scss
diff --git a/meteor/client/ui/RundownView/MediaStatusPopUp/MediaStatusPopUpHeader.tsx b/packages/webui/src/client/ui/RundownView/MediaStatusPopUp/MediaStatusPopUpHeader.tsx
similarity index 100%
rename from meteor/client/ui/RundownView/MediaStatusPopUp/MediaStatusPopUpHeader.tsx
rename to packages/webui/src/client/ui/RundownView/MediaStatusPopUp/MediaStatusPopUpHeader.tsx
diff --git a/meteor/client/ui/RundownView/MediaStatusPopUp/MediaStatusPopUpItem.scss b/packages/webui/src/client/ui/RundownView/MediaStatusPopUp/MediaStatusPopUpItem.scss
similarity index 100%
rename from meteor/client/ui/RundownView/MediaStatusPopUp/MediaStatusPopUpItem.scss
rename to packages/webui/src/client/ui/RundownView/MediaStatusPopUp/MediaStatusPopUpItem.scss
diff --git a/meteor/client/ui/RundownView/MediaStatusPopUp/MediaStatusPopUpItem.tsx b/packages/webui/src/client/ui/RundownView/MediaStatusPopUp/MediaStatusPopUpItem.tsx
similarity index 97%
rename from meteor/client/ui/RundownView/MediaStatusPopUp/MediaStatusPopUpItem.tsx
rename to packages/webui/src/client/ui/RundownView/MediaStatusPopUp/MediaStatusPopUpItem.tsx
index 7bfb1a131f..cc36eaf7e7 100644
--- a/meteor/client/ui/RundownView/MediaStatusPopUp/MediaStatusPopUpItem.tsx
+++ b/packages/webui/src/client/ui/RundownView/MediaStatusPopUp/MediaStatusPopUpItem.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback, JSX } from 'react'
+import { useCallback, JSX } from 'react'
 import { PartId, PartInstanceId, SegmentId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import { SourceLayerType } from '@sofie-automation/blueprints-integration'
 import { PieceStatusCode } from '@sofie-automation/corelib/dist/dataModel/Piece'
@@ -8,7 +8,7 @@ import { RundownUtils } from '../../../lib/rundown'
 import classNames from 'classnames'
 import { MediaStatusIndicator } from '../../MediaStatus/MediaStatusIndicator'
 import { scrollToPart, scrollToSegment } from '../../../lib/viewPort'
-import { logger } from '../../../../lib/logging'
+import { logger } from '../../../lib/logging'
 
 export const MediaStatusPopUpItem = withTiming<
 	{
diff --git a/meteor/client/ui/RundownView/MediaStatusPopUp/MediaStatusPopUpSegmentRule.scss b/packages/webui/src/client/ui/RundownView/MediaStatusPopUp/MediaStatusPopUpSegmentRule.scss
similarity index 100%
rename from meteor/client/ui/RundownView/MediaStatusPopUp/MediaStatusPopUpSegmentRule.scss
rename to packages/webui/src/client/ui/RundownView/MediaStatusPopUp/MediaStatusPopUpSegmentRule.scss
diff --git a/meteor/client/ui/RundownView/MediaStatusPopUp/MediaStatusPopUpSegmentRule.tsx b/packages/webui/src/client/ui/RundownView/MediaStatusPopUp/MediaStatusPopUpSegmentRule.tsx
similarity index 88%
rename from meteor/client/ui/RundownView/MediaStatusPopUp/MediaStatusPopUpSegmentRule.tsx
rename to packages/webui/src/client/ui/RundownView/MediaStatusPopUp/MediaStatusPopUpSegmentRule.tsx
index 8f8a481e73..c802bd8f25 100644
--- a/meteor/client/ui/RundownView/MediaStatusPopUp/MediaStatusPopUpSegmentRule.tsx
+++ b/packages/webui/src/client/ui/RundownView/MediaStatusPopUp/MediaStatusPopUpSegmentRule.tsx
@@ -1,4 +1,4 @@
-import React, { JSX } from 'react'
+import { JSX } from 'react'
 
 export function MediaStatusPopUpSegmentRule(): JSX.Element {
 	return (
diff --git a/meteor/client/ui/RundownView/MediaStatusPopUp/index.tsx b/packages/webui/src/client/ui/RundownView/MediaStatusPopUp/index.tsx
similarity index 100%
rename from meteor/client/ui/RundownView/MediaStatusPopUp/index.tsx
rename to packages/webui/src/client/ui/RundownView/MediaStatusPopUp/index.tsx
diff --git a/meteor/client/ui/RundownView/On_Air_MouseOut.json b/packages/webui/src/client/ui/RundownView/On_Air_MouseOut.json
similarity index 100%
rename from meteor/client/ui/RundownView/On_Air_MouseOut.json
rename to packages/webui/src/client/ui/RundownView/On_Air_MouseOut.json
diff --git a/meteor/client/ui/RundownView/On_Air_MouseOver.json b/packages/webui/src/client/ui/RundownView/On_Air_MouseOver.json
similarity index 100%
rename from meteor/client/ui/RundownView/On_Air_MouseOver.json
rename to packages/webui/src/client/ui/RundownView/On_Air_MouseOver.json
diff --git a/meteor/client/ui/RundownView/PlaylistLoopingHeader.tsx b/packages/webui/src/client/ui/RundownView/PlaylistLoopingHeader.tsx
similarity index 100%
rename from meteor/client/ui/RundownView/PlaylistLoopingHeader.tsx
rename to packages/webui/src/client/ui/RundownView/PlaylistLoopingHeader.tsx
diff --git a/meteor/client/ui/RundownView/RundownDividerHeader.tsx b/packages/webui/src/client/ui/RundownView/RundownDividerHeader.tsx
similarity index 99%
rename from meteor/client/ui/RundownView/RundownDividerHeader.tsx
rename to packages/webui/src/client/ui/RundownView/RundownDividerHeader.tsx
index 9d40d4ae5b..3c372db734 100644
--- a/meteor/client/ui/RundownView/RundownDividerHeader.tsx
+++ b/packages/webui/src/client/ui/RundownView/RundownDividerHeader.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react'
 import { Rundown } from '@sofie-automation/corelib/dist/dataModel/Rundown'
 import { Translated } from '../../lib/ReactMeteorData/ReactMeteorData'
 import Moment from 'react-moment'
diff --git a/meteor/client/ui/RundownView/RundownNotifier.tsx b/packages/webui/src/client/ui/RundownView/RundownNotifier.tsx
similarity index 90%
rename from meteor/client/ui/RundownView/RundownNotifier.tsx
rename to packages/webui/src/client/ui/RundownView/RundownNotifier.tsx
index 7938089931..3438e37c51 100644
--- a/meteor/client/ui/RundownView/RundownNotifier.tsx
+++ b/packages/webui/src/client/ui/RundownView/RundownNotifier.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react'
+import React, { useContext } from 'react'
 import * as _ from 'underscore'
 import { Meteor } from 'meteor/meteor'
 import { Tracker } from 'meteor/tracker'
@@ -9,28 +9,29 @@ import {
 	Notification,
 	NoticeLevel,
 	getNoticeLevelForPieceStatus,
-} from '../../../lib/notifications/notifications'
+} from '../../lib/notifications/notifications'
 import { WithManagedTracker } from '../../lib/reactiveData/reactiveDataHelper'
 import { reactiveData } from '../../lib/reactiveData/reactiveData'
 import { PeripheralDevice } from '@sofie-automation/corelib/dist/dataModel/PeripheralDevice'
-import { getCurrentTime, unprotectString } from '../../../lib/lib'
-import { meteorSubscribe } from '../../../lib/api/pubsub'
+import { unprotectString } from '@sofie-automation/shared-lib/dist/lib/protectedString'
+import { getCurrentTime } from '../../lib/systemTime'
+import { meteorSubscribe } from '../../lib/meteorApi'
 import { ReactiveVar } from 'meteor/reactive-var'
 import { Rundown, getRundownNrcsName } from '@sofie-automation/corelib/dist/dataModel/Rundown'
 import { doModalDialog } from '../../lib/ModalDialog'
-import { doUserAction, UserAction } from '../../../lib/clientUserAction'
+import { doUserAction, UserAction } from '../../lib/clientUserAction'
 // import { withTranslation, getI18n, getDefaults } from 'react-i18next'
 import { i18nTranslator as t } from '../i18n'
 import { PieceStatusCode } from '@sofie-automation/corelib/dist/dataModel/Piece'
 import { PeripheralDevicesAPI } from '../../lib/clientAPI'
 import { handleRundownReloadResponse } from '../RundownView'
-import { MeteorCall } from '../../../lib/api/methods'
-import { UIPieceContentStatus, UISegmentPartNote } from '../../../lib/api/rundownNotifications'
+import { MeteorCall } from '../../lib/meteorApi'
+import { UIPieceContentStatus, UISegmentPartNote } from '@sofie-automation/meteor-lib/dist/api/rundownNotifications'
 import { isTranslatableMessage, translateMessage } from '@sofie-automation/corelib/dist/TranslatableMessage'
 import { NoteSeverity, StatusCode } from '@sofie-automation/blueprints-integration'
-import { getAllowStudio, getIgnorePieceContentStatus } from '../../lib/localStorage'
+import { getIgnorePieceContentStatus } from '../../lib/localStorage'
 import { RundownPlaylists } from '../../collections'
-import { UIStudio } from '../../../lib/api/studios'
+import { UIStudio } from '@sofie-automation/meteor-lib/dist/api/studios'
 import {
 	PartId,
 	PeripheralDeviceId,
@@ -42,9 +43,10 @@ import {
 	StudioId,
 } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import { UIPieceContentStatuses, UISegmentPartNotes } from '../Collections'
-import { RundownPlaylistCollectionUtil } from '../../../lib/collections/rundownPlaylistUtil'
-import { logger } from '../../../lib/logging'
+import { RundownPlaylistCollectionUtil } from '../../collections/rundownPlaylistUtil'
+import { logger } from '../../lib/logging'
 import { CorelibPubSub } from '@sofie-automation/corelib/dist/pubsub'
+import { UserPermissionsContext, UserPermissions } from '../UserPermissions'
 
 export const onRONotificationClick = new ReactiveVar<((e: RONotificationEvent) => void) | undefined>(undefined)
 export const reloadRundownPlaylistClick = new ReactiveVar<((e: any) => void) | undefined>(undefined)
@@ -75,6 +77,8 @@ function getNoticeLevelForNoteSeverity(type: NoteSeverity): NoticeLevel {
 }
 
 class RundownViewNotifier extends WithManagedTracker {
+	private readonly userPermissions: Readonly<UserPermissions>
+
 	private _notificationList: NotificationList
 	private _notifier: NotifierHandle
 
@@ -99,8 +103,10 @@ class RundownViewNotifier extends WithManagedTracker {
 	private _unsentExternalMessagesStatus: Notification | undefined = undefined
 	private _unsentExternalMessageStatusDep: Tracker.Dependency
 
-	constructor(playlistId: RundownPlaylistId | undefined, studio: UIStudio) {
+	constructor(playlistId: RundownPlaylistId | undefined, studio: UIStudio, userPermissions: Readonly<UserPermissions>) {
 		super()
+		this.userPermissions = userPermissions
+
 		this._notificationList = new NotificationList([])
 		this._mediaStatusDep = new Tracker.Dependency()
 		this._rundownStatusDep = new Tracker.Dependency()
@@ -189,6 +195,28 @@ class RundownViewNotifier extends WithManagedTracker {
 			const playlist = RundownPlaylists.findOne(playlistId)
 			const rundowns = rRundowns.get()
 
+			if (playlist?.notes) {
+				const playlistNotesId = playlist._id + '_playlistnotes_'
+				playlist.notes.forEach((note) => {
+					const noteId = playlistNotesId + note.origin.name + '_' + note.message + '_' + note.type
+					const notificationFromNote = new Notification(
+						noteId,
+						getNoticeLevelForNoteSeverity(note.type),
+						note.message,
+						'RundownPlaylist',
+						getCurrentTime(),
+						true,
+						[],
+						-1
+					)
+					if (!Notification.isEqual(this._rundownStatus[noteId], notificationFromNote)) {
+						this._rundownStatus[noteId] = notificationFromNote
+						this._rundownStatusDep.changed()
+					}
+					newNoteIds.push(noteId)
+				})
+			}
+
 			if (playlist && rundowns) {
 				rundowns.forEach((rundown) => {
 					const unsyncedId = rundown._id + '_unsynced'
@@ -212,7 +240,7 @@ class RundownViewNotifier extends WithManagedTracker {
 								{
 									label: t('Re-sync'),
 									type: 'primary',
-									disabled: !getAllowStudio(),
+									disabled: !this.userPermissions.studio,
 									action: () => {
 										doModalDialog({
 											title: t('Re-sync Rundown'),
@@ -229,7 +257,7 @@ class RundownViewNotifier extends WithManagedTracker {
 													(e, ts) => MeteorCall.userAction.resyncRundown(e, ts, rundown._id),
 													(err, reloadResult) => {
 														if (!err && reloadResult) {
-															handleRundownReloadResponse(t, rundown._id, reloadResult)
+															handleRundownReloadResponse(t, this.userPermissions, rundown._id, reloadResult)
 														}
 													}
 												)
@@ -328,7 +356,7 @@ class RundownViewNotifier extends WithManagedTracker {
 										{
 											label: t('Restart'),
 											type: 'primary',
-											disabled: !getAllowStudio(),
+											disabled: !this.userPermissions.studio,
 											action: () => {
 												doModalDialog({
 													title: t('Restart {{device}}', { device: parent.name }),
@@ -626,7 +654,7 @@ class RundownViewNotifier extends WithManagedTracker {
 									nrcsName: getRundownNrcsName(firstRundown),
 								}),
 								type: 'primary',
-								disabled: !getAllowStudio(),
+								disabled: !this.userPermissions.studio,
 								action: (e) => {
 									const reloadFunc = reloadRundownPlaylistClick.get()
 									if (reloadFunc) {
@@ -701,7 +729,7 @@ class RundownViewNotifier extends WithManagedTracker {
 	}
 }
 
-interface IProps {
+interface RundownNotifierProps {
 	// match?: {
 	// 	params: {
 	// 		rundownId?: RundownId
@@ -712,32 +740,16 @@ interface IProps {
 	studio: UIStudio
 }
 
-export const RundownNotifier = class RundownNotifier extends React.Component<IProps> {
-	private notifier: RundownViewNotifier
+export function RundownNotifier({ playlistId, studio }: RundownNotifierProps): JSX.Element | null {
+	const userPermissions = useContext(UserPermissionsContext)
 
-	constructor(props: IProps) {
-		super(props)
-		this.notifier = new RundownViewNotifier(props.playlistId, props.studio)
-	}
+	React.useEffect(() => {
+		const notifier = new RundownViewNotifier(playlistId, studio, userPermissions)
 
-	shouldComponentUpdate(nextProps: IProps): boolean {
-		if (this.props.playlistId === nextProps.playlistId && this.props.studio._id === nextProps.studio._id) {
-			return false
+		return () => {
+			notifier.stop()
 		}
-		return true
-	}
+	}, [playlistId, studio._id, userPermissions])
 
-	componentDidUpdate(): void {
-		this.notifier.stop()
-		this.notifier = new RundownViewNotifier(this.props.playlistId, this.props.studio)
-	}
-
-	componentWillUnmount(): void {
-		this.notifier.stop()
-	}
-
-	render(): React.ReactNode {
-		// this.props.connected
-		return null
-	}
+	return null
 }
diff --git a/meteor/client/ui/RundownView/RundownRightHandControls.tsx b/packages/webui/src/client/ui/RundownView/RundownRightHandControls.tsx
similarity index 97%
rename from meteor/client/ui/RundownView/RundownRightHandControls.tsx
rename to packages/webui/src/client/ui/RundownView/RundownRightHandControls.tsx
index 18a3dcce3d..7063581d2b 100644
--- a/meteor/client/ui/RundownView/RundownRightHandControls.tsx
+++ b/packages/webui/src/client/ui/RundownView/RundownRightHandControls.tsx
@@ -12,13 +12,11 @@ import { RewindAllSegmentsIcon } from '../../lib/ui/icons/rewindAllSegmentsIcon'
 import { Lottie } from '@crello/react-lottie'
 import { NotificationCenterPanelToggle } from '../../lib/notifications/NotificationCenterPanel'
 
-// @ts-expect-error Not recognized by Typescript
 import * as On_Air_MouseOut from './On_Air_MouseOut.json'
-// @ts-expect-error Not recognized by Typescript
 import * as On_Air_MouseOver from './On_Air_MouseOver.json'
 import { SupportPopUpToggle } from '../SupportPopUp'
 import classNames from 'classnames'
-import { NoticeLevel } from '../../../lib/notifications/notifications'
+import { NoticeLevel } from '../../lib/notifications/notifications'
 import { SwitchboardIcon, RouteSetOverrideIcon } from '../../lib/ui/icons/switchboard'
 import { SwitchboardPopUp } from './SwitchboardPopUp'
 import { useTranslation } from 'react-i18next'
@@ -108,9 +106,13 @@ export function RundownRightHandControls(props: Readonly<IProps>): JSX.Element {
 		setSwitchboardOpen(false)
 	}
 
-	const availableRouteSets = Object.entries<StudioRouteSet>(props.studioRouteSets).filter(
-		([_id, routeSet]) => routeSet.behavior !== StudioRouteBehavior.HIDDEN
-	)
+	const availableRouteSets = Object.entries<StudioRouteSet>(props.studioRouteSets)
+		.filter(([_id, routeSet]) => routeSet.behavior !== StudioRouteBehavior.HIDDEN)
+		.sort((a, b) => {
+			if (a[1].name < b[1].name) return -1
+			if (a[1].name > b[1].name) return 1
+			return 0
+		})
 	const nonDefaultRoutes = availableRouteSets.filter(
 		([_id, routeSet]) => routeSet.defaultActive !== undefined && routeSet.active !== routeSet.defaultActive
 	).length
diff --git a/meteor/client/ui/RundownView/RundownSystemStatus.tsx b/packages/webui/src/client/ui/RundownView/RundownSystemStatus.tsx
similarity index 99%
rename from meteor/client/ui/RundownView/RundownSystemStatus.tsx
rename to packages/webui/src/client/ui/RundownView/RundownSystemStatus.tsx
index 11e0654211..412309a2b3 100644
--- a/meteor/client/ui/RundownView/RundownSystemStatus.tsx
+++ b/packages/webui/src/client/ui/RundownView/RundownSystemStatus.tsx
@@ -7,7 +7,7 @@ import {
 	PeripheralDeviceType,
 } from '@sofie-automation/corelib/dist/dataModel/PeripheralDevice'
 import { Rundown, getRundownNrcsName } from '@sofie-automation/corelib/dist/dataModel/Rundown'
-import { Time, unprotectString } from '../../../lib/lib'
+import { Time, unprotectString } from '../../lib/tempLib'
 import { useTranslation } from 'react-i18next'
 import { StatusCode } from '@sofie-automation/blueprints-integration'
 import { RundownPlaylistId, StudioId } from '@sofie-automation/corelib/dist/dataModel/Ids'
diff --git a/meteor/client/ui/RundownView/RundownTiming/AutoNextStatus.tsx b/packages/webui/src/client/ui/RundownView/RundownTiming/AutoNextStatus.tsx
similarity index 94%
rename from meteor/client/ui/RundownView/RundownTiming/AutoNextStatus.tsx
rename to packages/webui/src/client/ui/RundownView/RundownTiming/AutoNextStatus.tsx
index e1abb17407..738abb4d9d 100644
--- a/meteor/client/ui/RundownView/RundownTiming/AutoNextStatus.tsx
+++ b/packages/webui/src/client/ui/RundownView/RundownTiming/AutoNextStatus.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react'
 import { useTranslation } from 'react-i18next'
 import { TimingDataResolution, TimingTickResolution, withTiming, WithTiming } from './withTiming'
 
diff --git a/meteor/client/ui/RundownView/RundownTiming/CurrentPartElapsed.tsx b/packages/webui/src/client/ui/RundownView/RundownTiming/CurrentPartElapsed.tsx
similarity index 95%
rename from meteor/client/ui/RundownView/RundownTiming/CurrentPartElapsed.tsx
rename to packages/webui/src/client/ui/RundownView/RundownTiming/CurrentPartElapsed.tsx
index 319d9b350d..b068d3d2b5 100644
--- a/meteor/client/ui/RundownView/RundownTiming/CurrentPartElapsed.tsx
+++ b/packages/webui/src/client/ui/RundownView/RundownTiming/CurrentPartElapsed.tsx
@@ -2,7 +2,7 @@ import * as React from 'react'
 import ClassNames from 'classnames'
 import { TimingDataResolution, TimingTickResolution, withTiming, WithTiming } from './withTiming'
 import { RundownUtils } from '../../../lib/rundown'
-import { unprotectString } from '../../../../lib/lib'
+import { unprotectString } from '../../../lib/tempLib'
 import { PartId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 
 interface IPartElapsedProps {
diff --git a/meteor/client/ui/RundownView/RundownTiming/CurrentPartRemaining.tsx b/packages/webui/src/client/ui/RundownView/RundownTiming/CurrentPartOrSegmentRemaining.tsx
similarity index 85%
rename from meteor/client/ui/RundownView/RundownTiming/CurrentPartRemaining.tsx
rename to packages/webui/src/client/ui/RundownView/RundownTiming/CurrentPartOrSegmentRemaining.tsx
index 2e987c7ea8..519650e05c 100644
--- a/meteor/client/ui/RundownView/RundownTiming/CurrentPartRemaining.tsx
+++ b/packages/webui/src/client/ui/RundownView/RundownTiming/CurrentPartOrSegmentRemaining.tsx
@@ -14,25 +14,31 @@ interface IPartRemainingProps {
 	heavyClassName?: string
 	speaking?: boolean
 	vibrating?: boolean
+	/** Use the segment budget instead of the part duration if available */
+	preferSegmentTime?: boolean
 }
 
 // global variable for remembering last uttered displayTime
 let prevDisplayTime: number | undefined = undefined
 
 /**
- * A presentational component that will render a countdown to the end of the current part
- * @class CurrentPartRemaining
+ * A presentational component that will render a countdown to the end of the current part or segment,
+ * depending on the value of segmentTiming.countdownType
+ *
+ * @class CurrentPartOrSegmentRemaining
  * @extends React.Component<WithTiming<{}>>
  */
-export const CurrentPartRemaining = withTiming<IPartRemainingProps, {}>({
+export const CurrentPartOrSegmentRemaining = withTiming<IPartRemainingProps, {}>({
 	tickResolution: TimingTickResolution.Synced,
 	dataResolution: TimingDataResolution.Synced,
 })(
-	class CurrentPartRemaining extends React.Component<WithTiming<IPartRemainingProps>> {
+	class CurrentPartOrSegmentRemaining extends React.Component<WithTiming<IPartRemainingProps>> {
 		render(): JSX.Element | null {
 			if (!this.props.timingDurations || !this.props.timingDurations.currentTime) return null
 			if (this.props.timingDurations.currentPartInstanceId !== this.props.currentPartInstanceId) return null
 			let displayTimecode = this.props.timingDurations.remainingTimeOnCurrentPart
+			if (this.props.preferSegmentTime)
+				displayTimecode = this.props.timingDurations.remainingBudgetOnCurrentSegment ?? displayTimecode
 			if (displayTimecode === undefined) return null
 			displayTimecode *= -1
 			return (
diff --git a/meteor/client/ui/RundownView/RundownTiming/NextBreakTiming.tsx b/packages/webui/src/client/ui/RundownView/RundownTiming/NextBreakTiming.tsx
similarity index 98%
rename from meteor/client/ui/RundownView/RundownTiming/NextBreakTiming.tsx
rename to packages/webui/src/client/ui/RundownView/RundownTiming/NextBreakTiming.tsx
index 514bf2a67b..b7d494d071 100644
--- a/meteor/client/ui/RundownView/RundownTiming/NextBreakTiming.tsx
+++ b/packages/webui/src/client/ui/RundownView/RundownTiming/NextBreakTiming.tsx
@@ -1,4 +1,3 @@
-import React from 'react'
 import { useTranslation } from 'react-i18next'
 import Moment from 'react-moment'
 import { Rundown } from '@sofie-automation/corelib/dist/dataModel/Rundown'
diff --git a/meteor/client/ui/RundownView/RundownTiming/PartCountdown.tsx b/packages/webui/src/client/ui/RundownView/RundownTiming/PartCountdown.tsx
similarity index 95%
rename from meteor/client/ui/RundownView/RundownTiming/PartCountdown.tsx
rename to packages/webui/src/client/ui/RundownView/RundownTiming/PartCountdown.tsx
index 2fea896fb9..2bc75f6729 100644
--- a/meteor/client/ui/RundownView/RundownTiming/PartCountdown.tsx
+++ b/packages/webui/src/client/ui/RundownView/RundownTiming/PartCountdown.tsx
@@ -1,7 +1,7 @@
-import React, { ReactNode } from 'react'
+import { ReactNode } from 'react'
 import Moment from 'react-moment'
 import { withTiming, WithTiming } from './withTiming'
-import { unprotectString } from '../../../../lib/lib'
+import { unprotectString } from '../../../lib/tempLib'
 import { RundownUtils } from '../../../lib/rundown'
 import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
 import { PlaylistTiming } from '@sofie-automation/corelib/dist/playout/rundownTiming'
diff --git a/meteor/client/ui/RundownView/RundownTiming/PartDuration.tsx b/packages/webui/src/client/ui/RundownView/RundownTiming/PartDuration.tsx
similarity index 98%
rename from meteor/client/ui/RundownView/RundownTiming/PartDuration.tsx
rename to packages/webui/src/client/ui/RundownView/RundownTiming/PartDuration.tsx
index c5f93056d8..1061c4f6a8 100644
--- a/meteor/client/ui/RundownView/RundownTiming/PartDuration.tsx
+++ b/packages/webui/src/client/ui/RundownView/RundownTiming/PartDuration.tsx
@@ -1,5 +1,5 @@
 import ClassNames from 'classnames'
-import React, { ReactNode } from 'react'
+import { ReactNode } from 'react'
 import { withTiming, WithTiming } from './withTiming'
 import { RundownUtils } from '../../../lib/rundown'
 import { PartUi } from '../../SegmentTimeline/SegmentTimelineContainer'
diff --git a/meteor/client/ui/RundownView/RundownTiming/PlaylistEndTiming.tsx b/packages/webui/src/client/ui/RundownView/RundownTiming/PlaylistEndTiming.tsx
similarity index 96%
rename from meteor/client/ui/RundownView/RundownTiming/PlaylistEndTiming.tsx
rename to packages/webui/src/client/ui/RundownView/RundownTiming/PlaylistEndTiming.tsx
index 2d2406e14d..d48b6b22b8 100644
--- a/meteor/client/ui/RundownView/RundownTiming/PlaylistEndTiming.tsx
+++ b/packages/webui/src/client/ui/RundownView/RundownTiming/PlaylistEndTiming.tsx
@@ -1,13 +1,14 @@
 import React from 'react'
 import { WithTranslation, withTranslation } from 'react-i18next'
 import Moment from 'react-moment'
-import { getCurrentTime } from '../../../../lib/lib'
+import { getCurrentTime } from '../../../lib/systemTime'
 import { Translated } from '../../../lib/ReactMeteorData/ReactMeteorData'
 import { RundownUtils } from '../../../lib/rundown'
 import { withTiming, WithTiming } from './withTiming'
 import ClassNames from 'classnames'
 import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
 import { getPlaylistTimingDiff } from '../../../lib/rundownTiming'
+import { isLoopRunning } from '../../../lib/RundownResolver'
 
 interface IEndTimingProps {
 	rundownPlaylist: DBRundownPlaylist
@@ -54,7 +55,7 @@ export const PlaylistEndTiming = withTranslation()(
 									</span>
 								)
 							) : this.props.timingDurations ? (
-								this.props.rundownPlaylist.loop ? (
+								isLoopRunning(this.props.rundownPlaylist) ? (
 									this.props.timingDurations.partCountdown &&
 									rundownPlaylist.activationId &&
 									rundownPlaylist.currentPartInfo ? (
diff --git a/meteor/client/ui/RundownView/RundownTiming/PlaylistStartTiming.tsx b/packages/webui/src/client/ui/RundownView/RundownTiming/PlaylistStartTiming.tsx
similarity index 98%
rename from meteor/client/ui/RundownView/RundownTiming/PlaylistStartTiming.tsx
rename to packages/webui/src/client/ui/RundownView/RundownTiming/PlaylistStartTiming.tsx
index 8b7e1be7bc..9acf15cbd2 100644
--- a/meteor/client/ui/RundownView/RundownTiming/PlaylistStartTiming.tsx
+++ b/packages/webui/src/client/ui/RundownView/RundownTiming/PlaylistStartTiming.tsx
@@ -5,7 +5,7 @@ import { Translated } from '../../../lib/ReactMeteorData/ReactMeteorData'
 import { withTiming, WithTiming } from './withTiming'
 import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
 import { RundownUtils } from '../../../lib/rundown'
-import { getCurrentTime } from '../../../../lib/lib'
+import { getCurrentTime } from '../../../lib/systemTime'
 import ClassNames from 'classnames'
 import { PlaylistTiming } from '@sofie-automation/corelib/dist/playout/rundownTiming'
 
diff --git a/meteor/client/ui/RundownView/RundownTiming/RundownName.tsx b/packages/webui/src/client/ui/RundownView/RundownTiming/RundownName.tsx
similarity index 88%
rename from meteor/client/ui/RundownView/RundownTiming/RundownName.tsx
rename to packages/webui/src/client/ui/RundownView/RundownTiming/RundownName.tsx
index 3ffedf5476..08dc97104d 100644
--- a/meteor/client/ui/RundownView/RundownTiming/RundownName.tsx
+++ b/packages/webui/src/client/ui/RundownView/RundownTiming/RundownName.tsx
@@ -7,8 +7,9 @@ import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/Rund
 import { LoopingIcon } from '../../../lib/ui/icons/looping'
 import { Rundown } from '@sofie-automation/corelib/dist/dataModel/Rundown'
 import { RundownUtils } from '../../../lib/rundown'
-import { getCurrentTime } from '../../../../lib/lib'
+import { getCurrentTime } from '../../../lib/systemTime'
 import { PlaylistTiming } from '@sofie-automation/corelib/dist/playout/rundownTiming'
+import { isLoopDefined } from '../../../lib/RundownResolver'
 
 interface IRundownNameProps {
 	rundownPlaylist: DBRundownPlaylist
@@ -23,6 +24,7 @@ export const RundownName = withTranslation()(
 			render(): JSX.Element {
 				const { rundownPlaylist, currentRundown, rundownCount, t } = this.props
 				const expectedStart = PlaylistTiming.getExpectedStart(rundownPlaylist.timing)
+				const isPlaylistLooping = isLoopDefined(rundownPlaylist)
 				return (
 					<div
 						className={ClassNames('timing-clock countdown left', {
@@ -43,7 +45,7 @@ export const RundownName = withTranslation()(
 							<h1
 								className="timing-clock-label left hide-overflow rundown-name"
 								title={
-									rundownPlaylist.loop
+									isPlaylistLooping
 										? t('{{currentRundownName}} - {{rundownPlaylistName}} (Looping)', {
 												currentRundownName: currentRundown.name,
 												rundownPlaylistName: rundownPlaylist.name,
@@ -55,13 +57,13 @@ export const RundownName = withTranslation()(
 								}
 								id="rundown-playlist-name"
 							>
-								{rundownPlaylist.loop && <LoopingIcon />} <strong>{currentRundown.name}</strong> {rundownPlaylist.name}
+								{isPlaylistLooping && <LoopingIcon />} <strong>{currentRundown.name}</strong> {rundownPlaylist.name}
 							</h1>
 						) : (
 							<h1
 								className="timing-clock-label left hide-overflow rundown-name"
 								title={
-									rundownPlaylist.loop
+									isPlaylistLooping
 										? t('{{rundownPlaylistName}} (Looping)', {
 												rundownPlaylistName: rundownPlaylist.name,
 										  })
@@ -69,7 +71,7 @@ export const RundownName = withTranslation()(
 								}
 								id="rundown-playlist-name"
 							>
-								{rundownPlaylist.loop && <LoopingIcon />} {rundownPlaylist.name}
+								{isPlaylistLooping && <LoopingIcon />} {rundownPlaylist.name}
 							</h1>
 						)}
 						{!this.props.hideDiff &&
diff --git a/meteor/client/ui/RundownView/RundownTiming/RundownTiming.ts b/packages/webui/src/client/ui/RundownView/RundownTiming/RundownTiming.ts
similarity index 100%
rename from meteor/client/ui/RundownView/RundownTiming/RundownTiming.ts
rename to packages/webui/src/client/ui/RundownView/RundownTiming/RundownTiming.ts
diff --git a/meteor/client/ui/RundownView/RundownTiming/RundownTimingConsumer.tsx b/packages/webui/src/client/ui/RundownView/RundownTiming/RundownTimingConsumer.tsx
similarity index 100%
rename from meteor/client/ui/RundownView/RundownTiming/RundownTimingConsumer.tsx
rename to packages/webui/src/client/ui/RundownView/RundownTiming/RundownTimingConsumer.tsx
diff --git a/meteor/client/ui/RundownView/RundownTiming/RundownTimingProvider.tsx b/packages/webui/src/client/ui/RundownView/RundownTiming/RundownTimingProvider.tsx
similarity index 78%
rename from meteor/client/ui/RundownView/RundownTiming/RundownTimingProvider.tsx
rename to packages/webui/src/client/ui/RundownView/RundownTiming/RundownTimingProvider.tsx
index 9ebe7b4091..e06e402da5 100644
--- a/meteor/client/ui/RundownView/RundownTiming/RundownTimingProvider.tsx
+++ b/packages/webui/src/client/ui/RundownView/RundownTiming/RundownTimingProvider.tsx
@@ -2,16 +2,25 @@ import React, { PropsWithChildren } from 'react'
 import { Meteor } from 'meteor/meteor'
 import * as PropTypes from 'prop-types'
 import { withTracker } from '../../../lib/ReactMeteorData/react-meteor-data'
-import { getCurrentTime, protectString } from '../../../../lib/lib'
+import { protectString } from '../../../lib/tempLib'
 import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
-import { PartInstance, wrapPartToTemporaryInstance } from '../../../../lib/collections/PartInstances'
+import { PartInstance, wrapPartToTemporaryInstance } from '@sofie-automation/meteor-lib/dist/collections/PartInstances'
 import { RundownTiming, TimeEventArgs } from './RundownTiming'
 import { Rundown } from '@sofie-automation/corelib/dist/dataModel/Rundown'
 import { DBSegment } from '@sofie-automation/corelib/dist/dataModel/Segment'
-import { RundownTimingCalculator, RundownTimingContext } from '../../../lib/rundownTiming'
+import {
+	MinimalPartInstance,
+	RundownTimingCalculator,
+	RundownTimingContext,
+	TimingId,
+	findPartInstancesInQuickLoop,
+} from '../../../lib/rundownTiming'
 import { PartId, PartInstanceId, SegmentId } from '@sofie-automation/corelib/dist/dataModel/Ids'
-import { RundownPlaylistCollectionUtil } from '../../../../lib/collections/rundownPlaylistUtil'
+import { RundownPlaylistCollectionUtil } from '../../../collections/rundownPlaylistUtil'
 import { sortPartInstancesInSortedSegments } from '@sofie-automation/corelib/dist/playout/playlist'
+import { RundownUtils } from '../../../lib/rundown'
+import { RundownPlaylistClientUtil } from '../../../lib/rundownPlaylistUtil'
+import { getCurrentTime } from '../../../lib/systemTime'
 
 const TIMING_DEFAULT_REFRESH_INTERVAL = 1000 / 60 // the interval for high-resolution events (timeupdateHR)
 const LOW_RESOLUTION_TIMING_DECIMATOR = 15
@@ -45,16 +54,11 @@ interface IRundownTimingProviderTrackedProps {
 	currentRundown: Rundown | undefined
 	partInstances: Array<MinimalPartInstance>
 	partInstancesMap: Map<PartId, MinimalPartInstance>
-	segmentEntryPartInstances: MinimalPartInstance[]
 	segments: DBSegment[]
 	segmentsMap: Map<SegmentId, DBSegment>
+	partsInQuickLoop: Record<TimingId, boolean>
 }
 
-type MinimalPartInstance = Pick<
-	PartInstance,
-	'_id' | 'isTemporary' | 'rundownId' | 'segmentId' | 'segmentPlayoutId' | 'takeCount' | 'part' | 'timings' | 'orphaned'
->
-
 /**
  * RundownTimingProvider is a container component that provides a timing context to all child elements.
  * It allows calculating a single
@@ -72,20 +76,19 @@ export const RundownTimingProvider = withTracker<
 			currentRundown: undefined,
 			partInstances: [],
 			partInstancesMap: new Map(),
-			segmentEntryPartInstances: [],
 			segments: [],
 			segmentsMap: new Map(),
+			partsInQuickLoop: {},
 		}
 	}
 
 	const partInstancesMap = new Map<PartId, MinimalPartInstance>()
-	const segmentEntryPartInstances: MinimalPartInstance[] = []
 
 	const rundowns = RundownPlaylistCollectionUtil.getRundownsOrdered(playlist)
-	const segments = RundownPlaylistCollectionUtil.getSegments(playlist)
+	const segments = RundownPlaylistClientUtil.getSegments(playlist)
 	const segmentsMap = new Map<SegmentId, DBSegment>(segments.map((segment) => [segment._id, segment]))
-	const unorderedParts = RundownPlaylistCollectionUtil.getUnorderedParts(playlist)
-	const activePartInstances = RundownPlaylistCollectionUtil.getActivePartInstances(playlist, undefined, {
+	const unorderedParts = RundownPlaylistClientUtil.getUnorderedParts(playlist)
+	const activePartInstances = RundownPlaylistClientUtil.getActivePartInstances(playlist, undefined, {
 		projection: {
 			_id: 1,
 			rundownId: 1,
@@ -112,7 +115,7 @@ export const RundownTimingProvider = withTracker<
 		>
 	>
 
-	const { currentPartInstance, previousPartInstance } = findCurrentAndPreviousPartInstance(
+	const { currentPartInstance } = findCurrentAndPreviousPartInstance(
 		activePartInstances,
 		playlist.currentPartInfo?.partInstanceId,
 		playlist.previousPartInfo?.partInstanceId
@@ -121,35 +124,12 @@ export const RundownTimingProvider = withTracker<
 	const currentRundown = currentPartInstance
 		? rundowns.find((r) => r._id === currentPartInstance.rundownId)
 		: rundowns[0]
-	// These are needed to retrieve the start time of a segment for calculating the remaining budget, in case the first partInstance was removed
-
-	let firstPartInstanceInCurrentSegmentPlay: MinimalPartInstance | undefined
-	let firstPartInstanceInCurrentSegmentPlayPartInstanceTakeCount = Number.POSITIVE_INFINITY
-	let firstPartInstanceInPreviousSegmentPlay: MinimalPartInstance | undefined
-	let firstPartInstanceInPreviousSegmentPlayPartInstanceTakeCount = Number.POSITIVE_INFINITY
 
 	let partInstances: MinimalPartInstance[] = []
 
 	const allPartIds: Set<PartId> = new Set()
 
 	for (const partInstance of activePartInstances) {
-		if (
-			currentPartInstance &&
-			partInstance.segmentPlayoutId === currentPartInstance.segmentPlayoutId &&
-			partInstance.takeCount < firstPartInstanceInCurrentSegmentPlayPartInstanceTakeCount
-		) {
-			firstPartInstanceInCurrentSegmentPlay = partInstance
-			firstPartInstanceInCurrentSegmentPlayPartInstanceTakeCount = partInstance.takeCount
-		}
-		if (
-			previousPartInstance &&
-			partInstance.segmentPlayoutId === previousPartInstance.segmentPlayoutId &&
-			partInstance.takeCount < firstPartInstanceInPreviousSegmentPlayPartInstanceTakeCount
-		) {
-			firstPartInstanceInPreviousSegmentPlay = partInstance
-			firstPartInstanceInPreviousSegmentPlayPartInstanceTakeCount = partInstance.takeCount
-		}
-
 		allPartIds.add(partInstance.part._id)
 	}
 
@@ -162,17 +142,18 @@ export const RundownTimingProvider = withTracker<
 
 	partInstances = sortPartInstancesInSortedSegments(partInstances, segments)
 
-	if (firstPartInstanceInCurrentSegmentPlay) segmentEntryPartInstances.push(firstPartInstanceInCurrentSegmentPlay)
-	if (firstPartInstanceInPreviousSegmentPlay) segmentEntryPartInstances.push(firstPartInstanceInPreviousSegmentPlay)
+	partInstances = RundownUtils.deduplicatePartInstancesForQuickLoop(playlist, partInstances, currentPartInstance)
+
+	const partsInQuickLoop = findPartInstancesInQuickLoop(playlist, partInstances)
 
 	return {
 		rundowns,
 		currentRundown,
 		partInstances,
 		partInstancesMap,
-		segmentEntryPartInstances,
 		segments,
 		segmentsMap,
+		partsInQuickLoop,
 	}
 })(
 	class RundownTimingProvider
@@ -302,15 +283,7 @@ export const RundownTimingProvider = withTracker<
 		}
 
 		updateDurations(now: number, isSynced: boolean) {
-			const {
-				playlist,
-				rundowns,
-				currentRundown,
-				partInstances,
-				partInstancesMap,
-				segmentsMap,
-				segmentEntryPartInstances,
-			} = this.props
+			const { playlist, rundowns, currentRundown, partInstances, partInstancesMap, segmentsMap } = this.props
 
 			const updatedDurations = this.timingCalculator.updateDurations(
 				now,
@@ -322,7 +295,7 @@ export const RundownTimingProvider = withTracker<
 				partInstancesMap,
 				segmentsMap,
 				this.props.defaultDuration,
-				segmentEntryPartInstances
+				this.props.partsInQuickLoop
 			)
 			if (!isSynced) {
 				this.durations = Object.assign(this.durations, updatedDurations)
diff --git a/meteor/client/ui/RundownView/RundownTiming/SegmentDuration.tsx b/packages/webui/src/client/ui/RundownView/RundownTiming/SegmentDuration.tsx
similarity index 50%
rename from meteor/client/ui/RundownView/RundownTiming/SegmentDuration.tsx
rename to packages/webui/src/client/ui/RundownView/RundownTiming/SegmentDuration.tsx
index 7ec57ad546..47e4c000ef 100644
--- a/meteor/client/ui/RundownView/RundownTiming/SegmentDuration.tsx
+++ b/packages/webui/src/client/ui/RundownView/RundownTiming/SegmentDuration.tsx
@@ -1,15 +1,15 @@
 import classNames from 'classnames'
-import React, { ReactNode } from 'react'
+import { ReactNode } from 'react'
 import { withTiming, WithTiming } from './withTiming'
-import { unprotectString } from '../../../../lib/lib'
 import { RundownUtils } from '../../../lib/rundown'
 import { PartUi } from '../../SegmentTimeline/SegmentTimelineContainer'
-import { calculatePartInstanceExpectedDurationWithPreroll } from '@sofie-automation/corelib/dist/playout/timings'
-import { SegmentId } from '@sofie-automation/corelib/dist/dataModel/Ids'
+import { calculatePartInstanceExpectedDurationWithTransition } from '@sofie-automation/corelib/dist/playout/timings'
 import { getPartInstanceTimingId } from '../../../lib/rundownTiming'
+import { DBSegment } from '@sofie-automation/corelib/dist/dataModel/Segment'
+import { CountdownType } from '@sofie-automation/blueprints-integration'
 
 interface ISegmentDurationProps {
-	segmentId: SegmentId
+	segment: DBSegment
 	parts: PartUi[]
 	label?: ReactNode
 	className?: string
@@ -29,32 +29,40 @@ export const SegmentDuration = withTiming<ISegmentDurationProps, {}>()(function
 	props: WithTiming<ISegmentDurationProps>
 ) {
 	let duration: number | undefined = undefined
-	let budget = 0
 	let playedOut = 0
 
-	const segmentBudgetDuration =
-		props.timingDurations.segmentBudgetDurations &&
-		props.timingDurations.segmentBudgetDurations[unprotectString(props.segmentId)]
+	const segmentBudgetDuration = props.segment.segmentTiming?.budgetDuration
+	const segmentTimingType = props.segment.segmentTiming?.countdownType ?? CountdownType.PART_EXPECTED_DURATION
 
-	if (segmentBudgetDuration !== undefined) {
-		budget = segmentBudgetDuration
-	}
-	if (props.parts && props.timingDurations.partPlayed) {
-		const { partPlayed } = props.timingDurations
-		if (segmentBudgetDuration === undefined) {
-			props.parts.forEach((part) => {
-				budget +=
-					part.instance.orphaned || part.instance.part.untimed
-						? 0
-						: calculatePartInstanceExpectedDurationWithPreroll(part.instance) || 0
-			})
+	let budget = segmentBudgetDuration ?? 0
+	let hardFloor = false
+
+	if (segmentTimingType === CountdownType.SEGMENT_BUDGET_DURATION) {
+		hardFloor = true
+
+		if (props.timingDurations.currentSegmentId === props.segment._id) {
+			duration = props.timingDurations.remainingBudgetOnCurrentSegment ?? segmentBudgetDuration ?? 0
+		} else {
+			duration = segmentBudgetDuration ?? 0
 		}
-		props.parts.forEach((part) => {
-			playedOut += (!part.instance.part.untimed ? partPlayed[getPartInstanceTimingId(part.instance)] : 0) || 0
-		})
-	}
+	} else {
+		if (props.parts && props.timingDurations.partPlayed) {
+			const { partPlayed } = props.timingDurations
 
-	duration = budget - playedOut
+			for (const part of props.parts) {
+				playedOut += (!part.instance.part.untimed ? partPlayed[getPartInstanceTimingId(part.instance)] : 0) || 0
+
+				if (segmentBudgetDuration === undefined) {
+					budget +=
+						part.instance.orphaned || part.instance.part.untimed
+							? 0
+							: calculatePartInstanceExpectedDurationWithTransition(part.instance) || 0
+				}
+			}
+		}
+
+		duration = budget - playedOut
+	}
 
 	const showNegativeStyling = !props.fixed && !props.countUp
 
@@ -75,7 +83,7 @@ export const SegmentDuration = withTiming<ISegmentDurationProps, {}>()(function
 					})}
 					role="timer"
 				>
-					{RundownUtils.formatDiffToTimecode(value, false, false, true, false, true, '+')}
+					{RundownUtils.formatDiffToTimecode(value, false, false, true, false, true, '+', false, hardFloor)}
 				</span>
 			</>
 		)
diff --git a/meteor/client/ui/RundownView/RundownTiming/SegmentTimeAnchorTime.tsx b/packages/webui/src/client/ui/RundownView/RundownTiming/SegmentTimeAnchorTime.tsx
similarity index 98%
rename from meteor/client/ui/RundownView/RundownTiming/SegmentTimeAnchorTime.tsx
rename to packages/webui/src/client/ui/RundownView/RundownTiming/SegmentTimeAnchorTime.tsx
index 3f546d05a9..59a3c4b541 100644
--- a/meteor/client/ui/RundownView/RundownTiming/SegmentTimeAnchorTime.tsx
+++ b/packages/webui/src/client/ui/RundownView/RundownTiming/SegmentTimeAnchorTime.tsx
@@ -1,5 +1,4 @@
 import classNames from 'classnames'
-import React from 'react'
 import { SegmentUi } from '../../SegmentTimeline/SegmentTimelineContainer'
 import { useTranslation } from 'react-i18next'
 import { useCurrentTime } from '../../../lib/lib'
diff --git a/meteor/client/ui/RundownView/RundownTiming/TimeOfDay.tsx b/packages/webui/src/client/ui/RundownView/RundownTiming/TimeOfDay.tsx
similarity index 95%
rename from meteor/client/ui/RundownView/RundownTiming/TimeOfDay.tsx
rename to packages/webui/src/client/ui/RundownView/RundownTiming/TimeOfDay.tsx
index fb3db93975..bbbdd0ed2f 100644
--- a/meteor/client/ui/RundownView/RundownTiming/TimeOfDay.tsx
+++ b/packages/webui/src/client/ui/RundownView/RundownTiming/TimeOfDay.tsx
@@ -1,4 +1,3 @@
-import React from 'react'
 import { WithTranslation, withTranslation } from 'react-i18next'
 import { Translated } from '../../../lib/ReactMeteorData/ReactMeteorData'
 import { withTiming, WithTiming } from './withTiming'
diff --git a/meteor/client/ui/RundownView/RundownTiming/withTiming.tsx b/packages/webui/src/client/ui/RundownView/RundownTiming/withTiming.tsx
similarity index 99%
rename from meteor/client/ui/RundownView/RundownTiming/withTiming.tsx
rename to packages/webui/src/client/ui/RundownView/RundownTiming/withTiming.tsx
index a5cf4a0770..f54c6c0d1e 100644
--- a/meteor/client/ui/RundownView/RundownTiming/withTiming.tsx
+++ b/packages/webui/src/client/ui/RundownView/RundownTiming/withTiming.tsx
@@ -64,7 +64,7 @@ export function withTiming<IProps, IState>(
 			}
 
 			// Setup by React.Component constructor
-			context!: {
+			declare context: {
 				durations: RundownTimingContext
 				syncedDurations: RundownTimingContext
 			}
diff --git a/meteor/client/ui/RundownView/RundownViewShelf.tsx b/packages/webui/src/client/ui/RundownView/RundownViewShelf.tsx
similarity index 94%
rename from meteor/client/ui/RundownView/RundownViewShelf.tsx
rename to packages/webui/src/client/ui/RundownView/RundownViewShelf.tsx
index abbfd2bf8f..44cf106f93 100644
--- a/meteor/client/ui/RundownView/RundownViewShelf.tsx
+++ b/packages/webui/src/client/ui/RundownView/RundownViewShelf.tsx
@@ -2,7 +2,7 @@ import * as React from 'react'
 import * as _ from 'underscore'
 import { Translated, translateWithTracker } from '../../lib/ReactMeteorData/ReactMeteorData'
 import { SegmentUi } from '../SegmentTimeline/SegmentTimelineContainer'
-import { unprotectString } from '../../../lib/lib'
+import { unprotectString } from '../../lib/tempLib'
 import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
 import { OutputLayers, SourceLayers } from '@sofie-automation/corelib/dist/dataModel/ShowStyleBase'
 import { DashboardPieceButton } from '../Shelf/DashboardPieceButton'
@@ -12,11 +12,11 @@ import {
 	DashboardLayoutFilter,
 	PieceDisplayStyle,
 	RundownLayoutFilterBase,
-} from '../../../lib/collections/RundownLayouts'
-import { NoticeLevel, Notification, NotificationCenter } from '../../../lib/notifications/notifications'
-import { memoizedIsolatedAutorun } from '../../../lib/memoizedIsolatedAutorun'
-import { doUserAction, UserAction } from '../../../lib/clientUserAction'
-import { MeteorCall } from '../../../lib/api/methods'
+} from '@sofie-automation/meteor-lib/dist/collections/RundownLayouts'
+import { NoticeLevel, Notification, NotificationCenter } from '../../lib/notifications/notifications'
+import { memoizedIsolatedAutorun } from '../../lib/memoizedIsolatedAutorun'
+import { doUserAction, UserAction } from '../../lib/clientUserAction'
+import { MeteorCall } from '../../lib/meteorApi'
 import {
 	AdLibPieceUi,
 	AdlibSegmentUi,
@@ -27,8 +27,8 @@ import {
 } from '../../lib/shelf'
 import { ContextMenuTrigger } from '@jstarpl/react-contextmenu'
 import { ContextType, setShelfContextMenuContext } from '../Shelf/ShelfContextMenu'
-import { UIShowStyleBase } from '../../../lib/api/showStyles'
-import { UIStudio } from '../../../lib/api/studios'
+import { UIShowStyleBase } from '@sofie-automation/meteor-lib/dist/api/showStyles'
+import { UIStudio } from '@sofie-automation/meteor-lib/dist/api/studios'
 import { PartInstanceId, PieceId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 
 interface IRundownViewShelfProps {
diff --git a/meteor/client/ui/RundownView/Rundown_Fullscreen_Stage_01.json b/packages/webui/src/client/ui/RundownView/Rundown_Fullscreen_Stage_01.json
similarity index 100%
rename from meteor/client/ui/RundownView/Rundown_Fullscreen_Stage_01.json
rename to packages/webui/src/client/ui/RundownView/Rundown_Fullscreen_Stage_01.json
diff --git a/meteor/client/ui/RundownView/Rundown_Fullscreen_Stage_02.json b/packages/webui/src/client/ui/RundownView/Rundown_Fullscreen_Stage_02.json
similarity index 100%
rename from meteor/client/ui/RundownView/Rundown_Fullscreen_Stage_02.json
rename to packages/webui/src/client/ui/RundownView/Rundown_Fullscreen_Stage_02.json
diff --git a/meteor/client/ui/RundownView/StudioContext.tsx b/packages/webui/src/client/ui/RundownView/StudioContext.tsx
similarity index 70%
rename from meteor/client/ui/RundownView/StudioContext.tsx
rename to packages/webui/src/client/ui/RundownView/StudioContext.tsx
index 014861b34d..2c13d2f9a8 100644
--- a/meteor/client/ui/RundownView/StudioContext.tsx
+++ b/packages/webui/src/client/ui/RundownView/StudioContext.tsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { UIStudio } from '../../../lib/api/studios'
+import { UIStudio } from '@sofie-automation/meteor-lib/dist/api/studios'
 
 type StudioFromContext = UIStudio | undefined
 
diff --git a/meteor/client/ui/RundownView/SwitchboardPopUp.tsx b/packages/webui/src/client/ui/RundownView/SwitchboardPopUp.tsx
similarity index 100%
rename from meteor/client/ui/RundownView/SwitchboardPopUp.tsx
rename to packages/webui/src/client/ui/RundownView/SwitchboardPopUp.tsx
diff --git a/meteor/client/ui/RundownView/Windowed_MouseOut.json b/packages/webui/src/client/ui/RundownView/Windowed_MouseOut.json
similarity index 100%
rename from meteor/client/ui/RundownView/Windowed_MouseOut.json
rename to packages/webui/src/client/ui/RundownView/Windowed_MouseOut.json
diff --git a/meteor/client/ui/RundownView/Windowed_MouseOver.json b/packages/webui/src/client/ui/RundownView/Windowed_MouseOver.json
similarity index 100%
rename from meteor/client/ui/RundownView/Windowed_MouseOver.json
rename to packages/webui/src/client/ui/RundownView/Windowed_MouseOver.json
diff --git a/meteor/client/ui/SegmentAdlibTesting/SegmentAdlibTesting.scss b/packages/webui/src/client/ui/SegmentAdlibTesting/SegmentAdlibTesting.scss
similarity index 100%
rename from meteor/client/ui/SegmentAdlibTesting/SegmentAdlibTesting.scss
rename to packages/webui/src/client/ui/SegmentAdlibTesting/SegmentAdlibTesting.scss
diff --git a/meteor/client/ui/SegmentAdlibTesting/SegmentAdlibTesting.tsx b/packages/webui/src/client/ui/SegmentAdlibTesting/SegmentAdlibTesting.tsx
similarity index 98%
rename from meteor/client/ui/SegmentAdlibTesting/SegmentAdlibTesting.tsx
rename to packages/webui/src/client/ui/SegmentAdlibTesting/SegmentAdlibTesting.tsx
index 829d689bbc..6e5aaa427a 100644
--- a/meteor/client/ui/SegmentAdlibTesting/SegmentAdlibTesting.tsx
+++ b/packages/webui/src/client/ui/SegmentAdlibTesting/SegmentAdlibTesting.tsx
@@ -6,7 +6,7 @@ import { ContextMenuTrigger } from '@jstarpl/react-contextmenu'
 import { CriticalIconSmall, WarningIconSmall } from '../../lib/ui/icons/notifications'
 import { contextMenuHoldToDisplayTime, useCombinedRefs } from '../../lib/lib'
 import { useTranslation } from 'react-i18next'
-import { literal, unprotectString } from '../../../lib/lib'
+import { literal, unprotectString } from '../../lib/tempLib'
 import { lockPointer, unlockPointer } from '../../lib/viewPort'
 import { StoryboardPart } from '../SegmentStoryboard/StoryboardPart'
 import classNames from 'classnames'
@@ -14,17 +14,18 @@ import RundownViewEventBus, {
 	GoToPartEvent,
 	GoToPartInstanceEvent,
 	RundownViewEvents,
-} from '../../../lib/api/triggers/RundownViewEventBus'
+} from '@sofie-automation/meteor-lib/dist/triggers/RundownViewEventBus'
 import { getElementWidth } from '../../utils/dimensions'
 import { HOVER_TIMEOUT } from '../Shelf/DashboardPieceButton'
 import { Meteor } from 'meteor/meteor'
 import { hidePointerLockCursor, showPointerLockCursor } from '../../lib/PointerLockCursor'
 import { OptionalVelocityComponent } from '../../lib/utilComponents'
 import { filterSecondarySourceLayers } from '../SegmentStoryboard/StoryboardPartSecondaryPieces/StoryboardPartSecondaryPieces'
-import { UIStudio } from '../../../lib/api/studios'
+import { UIStudio } from '@sofie-automation/meteor-lib/dist/api/studios'
 import { SegmentId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import { DBRundownPlaylist, RundownHoldState } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
 import { isPartPlayable } from '@sofie-automation/corelib/dist/dataModel/Part'
+import { isLoopRunning } from '../../lib/RundownResolver'
 
 interface IProps {
 	id: string
@@ -53,7 +54,6 @@ interface IProps {
 	onHeaderNoteClick?: (segmentId: SegmentId, level: NoteSeverity) => void
 	isLastSegment: boolean
 	lastValidPartIndex: number | undefined
-	budgetDuration?: number
 	showCountdownToSegment: boolean
 	fixedSegmentDuration: boolean | undefined
 	subscriptionsReady: boolean
@@ -128,7 +128,7 @@ export const SegmentAdlibTesting = React.memo(
 			squishedPartsNum > 1 ? Math.max(4, (spaceLeft - PART_WIDTH) / (squishedPartsNum - 1)) : null
 
 		const playlistHasNextPart = !!props.playlist.nextPartInfo
-		const playlistIsLooping = props.playlist.loop
+		const playlistIsLooping = isLoopRunning(props.playlist)
 
 		renderedParts.forEach((part, index) => {
 			const isLivePart = part.instance._id === props.playlist.currentPartInfo?.partInstanceId
@@ -150,6 +150,8 @@ export const SegmentAdlibTesting = React.memo(
 					isLastPartInSegment={part.instance._id === lastValidPartId}
 					isLastSegment={props.isLastSegment}
 					isPlaylistLooping={playlistIsLooping}
+					isQuickLoopStart={false}
+					isQuickLoopEnd={false}
 					doesPlaylistHaveNextPart={playlistHasNextPart}
 					displayLiveLineCounter={props.displayLiveLineCounter}
 					inHold={!!(props.playlist.holdState && props.playlist.holdState !== RundownHoldState.COMPLETE)}
diff --git a/meteor/client/ui/SegmentAdlibTesting/SegmentAdlibTestingContainer.tsx b/packages/webui/src/client/ui/SegmentAdlibTesting/SegmentAdlibTestingContainer.tsx
similarity index 90%
rename from meteor/client/ui/SegmentAdlibTesting/SegmentAdlibTestingContainer.tsx
rename to packages/webui/src/client/ui/SegmentAdlibTesting/SegmentAdlibTestingContainer.tsx
index 3b62d974b5..32351ce686 100644
--- a/meteor/client/ui/SegmentAdlibTesting/SegmentAdlibTestingContainer.tsx
+++ b/packages/webui/src/client/ui/SegmentAdlibTesting/SegmentAdlibTestingContainer.tsx
@@ -1,5 +1,5 @@
-import React, { useCallback, useEffect, useRef, useState } from 'react'
-import { meteorSubscribe } from '../../../lib/api/pubsub'
+import { useCallback, useEffect, useRef, useState } from 'react'
+import { meteorSubscribe } from '../../lib/meteorApi'
 import { useSubscription, useTracker } from '../../lib/ReactMeteorData/ReactMeteorData'
 import {
 	// PartUi,
@@ -9,13 +9,14 @@ import {
 } from '../SegmentContainer/withResolvedSegment'
 import { SpeechSynthesiser } from '../../lib/speechSynthesis'
 import { SegmentAdlibTesting } from './SegmentAdlibTesting'
-import { unprotectString } from '../../../lib/lib'
-import { LIVELINE_HISTORY_SIZE as TIMELINE_LIVELINE_HISTORY_SIZE } from '../SegmentTimeline/SegmentTimelineContainer'
-import { PartInstances, Parts, Segments } from '../../collections'
+import { unprotectString } from '../../lib/tempLib'
+import { LIVELINE_HISTORY_SIZE as TIMELINE_LIVELINE_HISTORY_SIZE } from '../SegmentTimeline/Constants'
+import { Segments } from '../../collections'
 import { literal } from '@sofie-automation/shared-lib/dist/lib/lib'
 import { MongoFieldSpecifierOnes } from '@sofie-automation/corelib/dist/mongo'
-import { PartInstance } from '../../../lib/collections/PartInstances'
+import { PartInstance } from '@sofie-automation/meteor-lib/dist/collections/PartInstances'
 import { CorelibPubSub } from '@sofie-automation/corelib/dist/pubsub'
+import { UIPartInstances, UIParts } from '../Collections'
 
 export const LIVELINE_HISTORY_SIZE = TIMELINE_LIVELINE_HISTORY_SIZE
 
@@ -32,7 +33,7 @@ export const SegmentAdlibTestingContainer = withResolvedSegment<IProps>(function
 }: IProps & ITrackedResolvedSegmentProps) {
 	const partIds = useTracker(
 		() =>
-			Parts.find(
+			UIParts.find(
 				{
 					segmentId,
 				},
@@ -49,7 +50,7 @@ export const SegmentAdlibTestingContainer = withResolvedSegment<IProps>(function
 
 	const partInstanceIds = useTracker(
 		() =>
-			PartInstances.find(
+			UIPartInstances.find(
 				{
 					segmentId: segmentId,
 					reset: {
@@ -90,7 +91,7 @@ export const SegmentAdlibTestingContainer = withResolvedSegment<IProps>(function
 				return false
 			}
 
-			const currentPartInstance = PartInstances.findOne(props.playlist.currentPartInfo.partInstanceId)
+			const currentPartInstance = UIPartInstances.findOne(props.playlist.currentPartInfo.partInstanceId)
 			if (!currentPartInstance) {
 				return false
 			}
@@ -107,7 +108,7 @@ export const SegmentAdlibTestingContainer = withResolvedSegment<IProps>(function
 				return false
 			}
 
-			const partInstance = PartInstances.findOne(props.playlist.nextPartInfo.partInstanceId, {
+			const partInstance = UIPartInstances.findOne(props.playlist.nextPartInfo.partInstanceId, {
 				fields: literal<MongoFieldSpecifierOnes<PartInstance>>({
 					segmentId: 1,
 					//@ts-expect-error typescript doesnt like it
@@ -130,7 +131,7 @@ export const SegmentAdlibTestingContainer = withResolvedSegment<IProps>(function
 				return false
 			}
 
-			const currentPartInstance = PartInstances.findOne(props.playlist.currentPartInfo.partInstanceId, {
+			const currentPartInstance = UIPartInstances.findOne(props.playlist.currentPartInfo.partInstanceId, {
 				fields: {
 					//@ts-expect-error deep property
 					'part.autoNext': 1,
@@ -226,7 +227,6 @@ export const SegmentAdlibTestingContainer = withResolvedSegment<IProps>(function
 			isLastSegment={props.isLastSegment}
 			lastValidPartIndex={props.lastValidPartIndex}
 			onHeaderNoteClick={props.onHeaderNoteClick}
-			budgetDuration={props.budgetDuration}
 			showCountdownToSegment={props.showCountdownToSegment}
 			fixedSegmentDuration={props.fixedSegmentDuration}
 			subscriptionsReady={initialSubscriptionsReady}
diff --git a/meteor/client/ui/SegmentContainer/PieceElement.tsx b/packages/webui/src/client/ui/SegmentContainer/PieceElement.tsx
similarity index 80%
rename from meteor/client/ui/SegmentContainer/PieceElement.tsx
rename to packages/webui/src/client/ui/SegmentContainer/PieceElement.tsx
index c05bd74532..cc14b3b9e2 100644
--- a/meteor/client/ui/SegmentContainer/PieceElement.tsx
+++ b/packages/webui/src/client/ui/SegmentContainer/PieceElement.tsx
@@ -1,8 +1,9 @@
 import React from 'react'
 import { ISourceLayer } from '@sofie-automation/blueprints-integration'
-import { PieceExtended } from '../../../lib/Rundown'
+import { PieceExtended } from '../../lib/RundownResolver'
 import { pieceUiClassNames } from '../../lib/ui/pieceUiClassNames'
 import { PartId } from '@sofie-automation/corelib/dist/dataModel/Ids'
+import { useContentStatusForItem } from '../SegmentTimeline/withMediaObjectStatus'
 
 interface IProps {
 	className: string
@@ -36,9 +37,20 @@ export const PieceElement = React.forwardRef<HTMLDivElement, React.PropsWithChil
 	}: React.PropsWithChildren<IProps>,
 	ref
 ) {
+	const contentStatus = useContentStatusForItem(piece)
+
 	return (
 		<div
-			className={pieceUiClassNames(piece, className, layer?.type, partId, highlight, undefined, undefined)}
+			className={pieceUiClassNames(
+				piece,
+				contentStatus,
+				className,
+				layer?.type,
+				partId,
+				highlight,
+				undefined,
+				undefined
+			)}
 			data-obj-id={piece.instance._id}
 			onPointerEnter={onPointerEnter}
 			onPointerLeave={onPointerLeave}
diff --git a/meteor/client/ui/SegmentContainer/PieceMultistepChevron.tsx b/packages/webui/src/client/ui/SegmentContainer/PieceMultistepChevron.tsx
similarity index 75%
rename from meteor/client/ui/SegmentContainer/PieceMultistepChevron.tsx
rename to packages/webui/src/client/ui/SegmentContainer/PieceMultistepChevron.tsx
index 5b06f09377..66d93dc468 100644
--- a/meteor/client/ui/SegmentContainer/PieceMultistepChevron.tsx
+++ b/packages/webui/src/client/ui/SegmentContainer/PieceMultistepChevron.tsx
@@ -1,6 +1,6 @@
 import { NoraContent, SourceLayerType } from '@sofie-automation/blueprints-integration'
 import React from 'react'
-import { PieceExtended } from '../../../lib/Rundown'
+import { PieceExtended } from '../../lib/RundownResolver'
 
 export const PieceMultistepChevron = React.forwardRef<
 	HTMLSpanElement,
@@ -30,7 +30,7 @@ export function getPieceSteps(piece: PieceExtended): { currentStep: number; allS
 		(piece.sourceLayer?.type === SourceLayerType.GRAPHICS ||
 			piece.sourceLayer?.type === SourceLayerType.LOWER_THIRD ||
 			piece.sourceLayer?.type === SourceLayerType.STUDIO_SCREEN) &&
-		noraContent?.payload?.step?.enabled
+		!!noraContent?.step
 
 	if (!noraContent || !hasStepChevron) return null
 
@@ -40,16 +40,11 @@ export function getPieceSteps(piece: PieceExtended): { currentStep: number; allS
 export function getNoraContentSteps(
 	noraContent: NoraContent | undefined
 ): { currentStep: number; allSteps: number } | null {
-	const hasStepChevron = noraContent?.payload?.step?.enabled
+	if (!noraContent?.step) return null
 
-	if (!hasStepChevron) return null
-
-	const currentStep =
-		noraContent?.payload?.step?.to === 'next'
-			? (noraContent.payload.step?.from || 0) + 1
-			: noraContent.payload.step?.to || 1
+	const currentStep = noraContent.step.current || 1
 
-	const allSteps = (noraContent?.payload?.content?.steps as any[])?.length ?? 0
+	const allSteps = noraContent.step.count
 
 	return { currentStep, allSteps }
 }
diff --git a/meteor/client/ui/SegmentContainer/SegmentViewModes.ts b/packages/webui/src/client/ui/SegmentContainer/SegmentViewModes.ts
similarity index 100%
rename from meteor/client/ui/SegmentContainer/SegmentViewModes.ts
rename to packages/webui/src/client/ui/SegmentContainer/SegmentViewModes.ts
diff --git a/meteor/client/ui/SegmentContainer/SwitchViewModeButton.tsx b/packages/webui/src/client/ui/SegmentContainer/SwitchViewModeButton.tsx
similarity index 98%
rename from meteor/client/ui/SegmentContainer/SwitchViewModeButton.tsx
rename to packages/webui/src/client/ui/SegmentContainer/SwitchViewModeButton.tsx
index c7f66ff882..f454198a4f 100644
--- a/meteor/client/ui/SegmentContainer/SwitchViewModeButton.tsx
+++ b/packages/webui/src/client/ui/SegmentContainer/SwitchViewModeButton.tsx
@@ -1,5 +1,4 @@
 import Tooltip from 'rc-tooltip'
-import React from 'react'
 import { useTranslation } from 'react-i18next'
 import { SegmentViewMode as SegmentViewModeIcon } from '../../lib/ui/icons/listView'
 
diff --git a/meteor/client/ui/SegmentContainer/getReactivePieceNoteCountsForSegment.tsx b/packages/webui/src/client/ui/SegmentContainer/getReactivePieceNoteCountsForSegment.tsx
similarity index 94%
rename from meteor/client/ui/SegmentContainer/getReactivePieceNoteCountsForSegment.tsx
rename to packages/webui/src/client/ui/SegmentContainer/getReactivePieceNoteCountsForSegment.tsx
index 4b6ccbb5a0..c47c9e40f9 100644
--- a/meteor/client/ui/SegmentContainer/getReactivePieceNoteCountsForSegment.tsx
+++ b/packages/webui/src/client/ui/SegmentContainer/getReactivePieceNoteCountsForSegment.tsx
@@ -1,7 +1,7 @@
 import { NoteSeverity } from '@sofie-automation/blueprints-integration'
 import { assertNever, literal } from '@sofie-automation/corelib/dist/lib'
 import { MongoFieldSpecifierOnes } from '@sofie-automation/corelib/dist/mongo'
-import { UIPieceContentStatus, UISegmentPartNote } from '../../../lib/api/rundownNotifications'
+import { UIPieceContentStatus, UISegmentPartNote } from '@sofie-automation/meteor-lib/dist/api/rundownNotifications'
 import { PieceStatusCode } from '@sofie-automation/corelib/dist/dataModel/Piece'
 import { getIgnorePieceContentStatus } from '../../lib/localStorage'
 import { UIPieceContentStatuses, UISegmentPartNotes } from '../Collections'
diff --git a/meteor/client/ui/SegmentContainer/getSplitItems.tsx b/packages/webui/src/client/ui/SegmentContainer/getSplitItems.tsx
similarity index 97%
rename from meteor/client/ui/SegmentContainer/getSplitItems.tsx
rename to packages/webui/src/client/ui/SegmentContainer/getSplitItems.tsx
index 033682e769..7166032867 100644
--- a/meteor/client/ui/SegmentContainer/getSplitItems.tsx
+++ b/packages/webui/src/client/ui/SegmentContainer/getSplitItems.tsx
@@ -1,4 +1,3 @@
-import React from 'react'
 import classNames from 'classnames'
 import { SplitsContent } from '@sofie-automation/blueprints-integration'
 import { RundownUtils } from '../../lib/rundown'
diff --git a/meteor/client/ui/SegmentContainer/withResolvedSegment.ts b/packages/webui/src/client/ui/SegmentContainer/withResolvedSegment.ts
similarity index 88%
rename from meteor/client/ui/SegmentContainer/withResolvedSegment.ts
rename to packages/webui/src/client/ui/SegmentContainer/withResolvedSegment.ts
index d3d5eceb97..6fc6f946bb 100644
--- a/meteor/client/ui/SegmentContainer/withResolvedSegment.ts
+++ b/packages/webui/src/client/ui/SegmentContainer/withResolvedSegment.ts
@@ -3,29 +3,26 @@ import * as _ from 'underscore'
 import { ISourceLayer, NoteSeverity, PieceLifespan } from '@sofie-automation/blueprints-integration'
 import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
 import { withTracker } from '../../lib/ReactMeteorData/react-meteor-data'
-import {
-	IOutputLayerExtended,
-	ISourceLayerExtended,
-	PieceExtended,
-	PartExtended,
-	SegmentExtended,
-} from '../../../lib/Rundown'
+import { IOutputLayerExtended, ISourceLayerExtended, PartExtended, SegmentExtended } from '../../lib/RundownResolver'
 import { IContextMenuContext } from '../RundownView'
-import { equalSets } from '../../../lib/lib'
+import { equalSets } from '@sofie-automation/shared-lib/dist/lib/lib'
 import { RundownUtils } from '../../lib/rundown'
 import { Rundown } from '@sofie-automation/corelib/dist/dataModel/Rundown'
-import { PartInstance } from '../../../lib/collections/PartInstances'
+import { PartInstance } from '@sofie-automation/meteor-lib/dist/collections/PartInstances'
 import { DBPart } from '@sofie-automation/corelib/dist/dataModel/Part'
 import { slowDownReactivity } from '../../lib/reactiveData/reactiveDataHelper'
-import { memoizedIsolatedAutorun } from '../../../lib/memoizedIsolatedAutorun'
+import { memoizedIsolatedAutorun } from '../../lib/memoizedIsolatedAutorun'
 import { getIsFilterActive } from '../../lib/rundownLayouts'
-import { RundownLayoutFilterBase, RundownViewLayout } from '../../../lib/collections/RundownLayouts'
+import {
+	RundownLayoutFilterBase,
+	RundownViewLayout,
+} from '@sofie-automation/meteor-lib/dist/collections/RundownLayouts'
 import { getReactivePieceNoteCountsForSegment } from './getReactivePieceNoteCountsForSegment'
 import { SegmentViewMode } from './SegmentViewModes'
 import { PlaylistTiming } from '@sofie-automation/corelib/dist/playout/rundownTiming'
 import { AdlibSegmentUi } from '../../lib/shelf'
-import { UIShowStyleBase } from '../../../lib/api/showStyles'
-import { UIStudio } from '../../../lib/api/studios'
+import { UIShowStyleBase } from '@sofie-automation/meteor-lib/dist/api/showStyles'
+import { UIStudio } from '@sofie-automation/meteor-lib/dist/api/studios'
 import {
 	PartId,
 	RundownId,
@@ -34,10 +31,12 @@ import {
 	ShowStyleBaseId,
 } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import { PieceInstances, Segments } from '../../collections'
-import { RundownPlaylistCollectionUtil } from '../../../lib/collections/rundownPlaylistUtil'
-import { ReadonlyDeep } from 'type-fest'
-import { PieceContentStatusObj } from '../../../lib/api/pieceContentStatus'
+import { RundownPlaylistCollectionUtil } from '../../collections/rundownPlaylistUtil'
 import { SegmentOrphanedReason } from '@sofie-automation/corelib/dist/dataModel/Segment'
+import { RundownPlaylistClientUtil } from '../../lib/rundownPlaylistUtil'
+import type { PieceUi } from '@sofie-automation/meteor-lib/dist/uiTypes/Piece'
+
+export type { PieceUi } from '@sofie-automation/meteor-lib/dist/uiTypes/Piece'
 
 export interface SegmentUi extends SegmentExtended {
 	/** Output layers available in the installation used by this segment */
@@ -55,12 +54,6 @@ export interface IOutputLayerUi extends IOutputLayerExtended {
 	collapsed?: boolean
 }
 export type ISourceLayerUi = ISourceLayerExtended
-export interface PieceUi extends PieceExtended {
-	/** This item has already been linked to the parent item of the spanning item group */
-	linked?: boolean
-
-	contentStatus?: ReadonlyDeep<PieceContentStatusObj>
-}
 
 export type MinimalRundown = Pick<Rundown, '_id' | 'name' | 'timing' | 'showStyleBaseId' | 'endOfRundownIsShowBreak'>
 
@@ -118,13 +111,9 @@ export interface ITrackedResolvedSegmentProps {
 	showCountdownToSegment: boolean
 }
 
-type IWrappedComponent<IProps, IState, TrackedProps> =
-	| React.ComponentClass<IProps & TrackedProps, IState>
-	| ((props: IProps & TrackedProps) => JSX.Element | null)
-
 export function withResolvedSegment<T extends IResolvedSegmentProps, IState = {}>(
-	WrappedComponent: IWrappedComponent<T, IState, ITrackedResolvedSegmentProps>
-): new (props: T) => React.Component<T, IState> {
+	WrappedComponent: React.ComponentType<T & ITrackedResolvedSegmentProps>
+): React.ComponentType<T> {
 	return withTracker<T, IState, ITrackedResolvedSegmentProps>(
 		(props: T) => {
 			const segment = Segments.findOne(props.segmentId) as SegmentUi | undefined
@@ -173,7 +162,7 @@ export function withResolvedSegment<T extends IResolvedSegmentProps, IState = {}
 						memoizedIsolatedAutorun(
 							(_playlistId: RundownPlaylistId) =>
 								(
-									RundownPlaylistCollectionUtil.getSegmentsAndPartsSync(
+									RundownPlaylistClientUtil.getSegmentsAndPartsSync(
 										props.playlist,
 										undefined,
 										undefined,
@@ -188,7 +177,7 @@ export function withResolvedSegment<T extends IResolvedSegmentProps, IState = {}
 						),
 						memoizedIsolatedAutorun(
 							(_playlistId: RundownPlaylistId, _currentPartInstanceId, _nextPartInstanceId) =>
-								RundownPlaylistCollectionUtil.getSelectedPartInstances(props.playlist),
+								RundownPlaylistClientUtil.getSelectedPartInstances(props.playlist),
 							'playlist.getSelectedPartInstances',
 							props.playlist._id,
 							props.playlist.currentPartInfo?.partInstanceId,
@@ -257,12 +246,7 @@ export function withResolvedSegment<T extends IResolvedSegmentProps, IState = {}
 				}
 			}
 
-			let budgetDuration: number | undefined
-			for (const part of o.parts) {
-				if (part.instance.part.budgetDuration !== undefined) {
-					budgetDuration = (budgetDuration ?? 0) + part.instance.part.budgetDuration
-				}
-			}
+			const budgetDuration = segment.segmentTiming?.budgetDuration
 
 			let displayLiveLineCounter = true
 			if (props.rundownViewLayout && props.rundownViewLayout.liveLineProps?.requiredLayerIds) {
@@ -369,6 +353,8 @@ export function withResolvedSegment<T extends IResolvedSegmentProps, IState = {}
 				props.playlist.holdState !== nextProps.playlist.holdState ||
 				props.playlist.nextTimeOffset !== nextProps.playlist.nextTimeOffset ||
 				props.playlist.activationId !== nextProps.playlist.activationId ||
+				!_.isEqual(props.playlist.quickLoop?.start, nextProps.playlist.quickLoop?.start) ||
+				!_.isEqual(props.playlist.quickLoop?.end, nextProps.playlist.quickLoop?.end) ||
 				PlaylistTiming.getExpectedStart(props.playlist.timing) !==
 					PlaylistTiming.getExpectedStart(nextProps.playlist.timing)
 			) {
diff --git a/meteor/client/ui/SegmentList/LinePart.tsx b/packages/webui/src/client/ui/SegmentList/LinePart.tsx
similarity index 73%
rename from meteor/client/ui/SegmentList/LinePart.tsx
rename to packages/webui/src/client/ui/SegmentList/LinePart.tsx
index 0420bf63bb..e72f1ef6b9 100644
--- a/meteor/client/ui/SegmentList/LinePart.tsx
+++ b/packages/webui/src/client/ui/SegmentList/LinePart.tsx
@@ -2,18 +2,21 @@ import { ContextMenuTrigger } from '@jstarpl/react-contextmenu'
 import { literal } from '@sofie-automation/corelib/dist/lib'
 import classNames from 'classnames'
 import React, { useCallback, useState } from 'react'
-import { ISourceLayerExtended, PartExtended } from '../../../lib/Rundown'
+import { ISourceLayerExtended, PartExtended } from '../../lib/RundownResolver'
 import { contextMenuHoldToDisplayTime } from '../../lib/lib'
 import { RundownUtils } from '../../lib/rundown'
 import { getElementDocumentOffset } from '../../utils/positions'
 import { IContextMenuContext } from '../RundownView'
-import { CurrentPartRemaining } from '../RundownView/RundownTiming/CurrentPartRemaining'
+import { CurrentPartOrSegmentRemaining } from '../RundownView/RundownTiming/CurrentPartOrSegmentRemaining'
 import { PieceUi, SegmentUi } from '../SegmentContainer/withResolvedSegment'
 import { SegmentTimelinePartElementId } from '../SegmentTimeline/Parts/SegmentTimelinePart'
 import { LinePartIdentifier } from './LinePartIdentifier'
 import { LinePartPieceIndicators } from './LinePartPieceIndicators'
 import { LinePartTimeline } from './LinePartTimeline'
 import { LinePartTitle } from './LinePartTitle'
+import { TimingDataResolution, TimingTickResolution, withTiming } from '../RundownView/RundownTiming/withTiming'
+import { RundownTimingContext, getPartInstanceTimingId } from '../../lib/rundownTiming'
+import { LoopingIcon } from '../../lib/ui/icons/looping'
 
 interface IProps {
 	segment: SegmentUi
@@ -22,9 +25,11 @@ interface IProps {
 	isNextPart: boolean
 	isSinglePartInSegment: boolean
 	hasAlreadyPlayed: boolean
+	isQuickLoopStart: boolean
+	isQuickLoopEnd: boolean
 	// isLastSegment?: boolean
 	// isLastPartInSegment?: boolean
-	// isPlaylistLooping?: boolean
+	isPlaylistLooping: boolean
 	indicatorColumns: Record<string, ISourceLayerExtended[]>
 	adLibIndicatorColumns: Record<string, ISourceLayerExtended[]>
 	doesPlaylistHaveNextPart?: boolean
@@ -39,7 +44,18 @@ interface IProps {
 	onPieceDoubleClick?: (item: PieceUi, e: React.MouseEvent<HTMLDivElement>) => void
 }
 
-export const LinePart: React.FC<IProps> = function LinePart({
+export const LinePart = withTiming<IProps, {}>((props: IProps) => {
+	return {
+		tickResolution: TimingTickResolution.Synced,
+		dataResolution: TimingDataResolution.High,
+		filter: (durations: RundownTimingContext) => {
+			durations = durations || {}
+
+			const timingId = getPartInstanceTimingId(props.part.instance)
+			return [(durations.partsInQuickLoop || {})[timingId]]
+		},
+	}
+})(function LinePart({
 	part,
 	segment,
 	isNextPart,
@@ -49,6 +65,10 @@ export const LinePart: React.FC<IProps> = function LinePart({
 	currentPartWillAutonext,
 	indicatorColumns,
 	adLibIndicatorColumns,
+	isPlaylistLooping,
+	timingDurations,
+	isQuickLoopStart,
+	isQuickLoopEnd,
 	onContextMenu,
 	onPieceClick,
 	onPieceDoubleClick,
@@ -57,6 +77,10 @@ export const LinePart: React.FC<IProps> = function LinePart({
 		(part.instance.timings?.reportedStoppedPlayback ?? part.instance.timings?.plannedStoppedPlayback) !== undefined
 	const [highlight] = useState(false)
 
+	const timingId = getPartInstanceTimingId(part.instance)
+	const isInsideQuickLoop = (timingDurations.partsInQuickLoop || {})[timingId]
+	const isOutsideActiveQuickLoop = isPlaylistLooping && !isInsideQuickLoop && !isNextPart && !hasAlreadyPlayed
+
 	const getPartContext = useCallback(() => {
 		const partElement = document.querySelector('#' + SegmentTimelinePartElementId + part.instance._id)
 		const partDocumentOffset = getElementDocumentOffset(partElement)
@@ -111,7 +135,9 @@ export const LinePart: React.FC<IProps> = function LinePart({
 					'invert-flash': highlight,
 					'segment-opl__part--next': isNextPart,
 					'segment-opl__part--live': isLivePart,
-					'segment-opl__part--has-played': hasAlreadyPlayed,
+					'segment-opl__part--has-played': hasAlreadyPlayed && (!isPlaylistLooping || !isInsideQuickLoop),
+					'segment-opl__part--outside-quickloop': isOutsideActiveQuickLoop,
+					'segment-opl__part--quickloop-start': isQuickLoopStart,
 					'segment-opl__part--invalid': part.instance.part.invalid,
 					'segment-opl__part--timing-sibling': isPreceededByTimingGroupSibling,
 				}),
@@ -131,7 +157,7 @@ export const LinePart: React.FC<IProps> = function LinePart({
 				<div className="segment-opl__part-duration">
 					{/* <PartDisplayDuration part={part} fixed={true} /> */}
 					{isLivePart && (
-						<CurrentPartRemaining
+						<CurrentPartOrSegmentRemaining
 							currentPartInstanceId={part.instance._id}
 							speaking={false}
 							heavyClassName="overtime"
@@ -143,6 +169,17 @@ export const LinePart: React.FC<IProps> = function LinePart({
 				{part.instance.part.identifier !== undefined && (
 					<LinePartIdentifier identifier={part.instance.part.identifier} />
 				)}
+				{isQuickLoopStart && (
+					<div className="segment-opl__quickloop-start">
+						<LoopingIcon />
+					</div>
+				)}
+				{isQuickLoopEnd && (
+					<div className="segment-opl__quickloop-end">
+						<LoopingIcon />
+					</div>
+				)}
+				{isInsideQuickLoop && <div className="segment-opl__quickloop-background"></div>}
 			</div>
 			<LinePartPieceIndicators
 				partId={part.partId}
@@ -160,7 +197,9 @@ export const LinePart: React.FC<IProps> = function LinePart({
 				currentPartWillAutonext={currentPartWillAutonext}
 				hasAlreadyPlayed={hasAlreadyPlayed}
 				onPieceDoubleClick={onPieceDoubleClick}
+				isQuickLoopStart={isQuickLoopStart}
+				isQuickLoopEnd={isQuickLoopEnd}
 			/>
 		</ContextMenuTrigger>
 	)
-}
+})
diff --git a/meteor/client/ui/SegmentList/LinePartIdentifier.tsx b/packages/webui/src/client/ui/SegmentList/LinePartIdentifier.tsx
similarity index 89%
rename from meteor/client/ui/SegmentList/LinePartIdentifier.tsx
rename to packages/webui/src/client/ui/SegmentList/LinePartIdentifier.tsx
index 5ed3cae0a4..f8de70096e 100644
--- a/meteor/client/ui/SegmentList/LinePartIdentifier.tsx
+++ b/packages/webui/src/client/ui/SegmentList/LinePartIdentifier.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 export function LinePartIdentifier({ identifier }: Readonly<{ identifier: string }>): JSX.Element {
 	return (
 		<div className="segment-opl__identifier-area">
diff --git a/meteor/client/ui/SegmentList/LinePartMainPiece/LinePartMainPiece.scss b/packages/webui/src/client/ui/SegmentList/LinePartMainPiece/LinePartMainPiece.scss
similarity index 100%
rename from meteor/client/ui/SegmentList/LinePartMainPiece/LinePartMainPiece.scss
rename to packages/webui/src/client/ui/SegmentList/LinePartMainPiece/LinePartMainPiece.scss
diff --git a/meteor/client/ui/SegmentList/LinePartMainPiece/LinePartMainPiece.tsx b/packages/webui/src/client/ui/SegmentList/LinePartMainPiece/LinePartMainPiece.tsx
similarity index 87%
rename from meteor/client/ui/SegmentList/LinePartMainPiece/LinePartMainPiece.tsx
rename to packages/webui/src/client/ui/SegmentList/LinePartMainPiece/LinePartMainPiece.tsx
index b4818d513b..a124e5ffc9 100644
--- a/meteor/client/ui/SegmentList/LinePartMainPiece/LinePartMainPiece.tsx
+++ b/packages/webui/src/client/ui/SegmentList/LinePartMainPiece/LinePartMainPiece.tsx
@@ -1,11 +1,11 @@
 import { EvsContent, SourceLayerType } from '@sofie-automation/blueprints-integration'
 import React, { useMemo, useRef, useState } from 'react'
-import { PieceExtended } from '../../../../lib/Rundown'
+import { PieceExtended } from '../../../lib/RundownResolver'
 // TODO: Move to a shared lib file
 import { PartId, PartInstanceId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import classNames from 'classnames'
-import { UIStudio } from '../../../../lib/api/studios'
-import { getNoticeLevelForPieceStatus } from '../../../../lib/notifications/notifications'
+import { UIStudio } from '@sofie-automation/meteor-lib/dist/api/studios'
+import { getNoticeLevelForPieceStatus } from '../../../lib/notifications/notifications'
 import { LoopingPieceIcon } from '../../../lib/ui/icons/looping'
 import { PieceStatusIcon } from '../../../lib/ui/PieceStatusIcon'
 import { getElementWidth } from '../../../utils/dimensions'
@@ -13,8 +13,7 @@ import { getElementDocumentOffset, OffsetPosition } from '../../../utils/positio
 import { getSplitItems } from '../../SegmentContainer/getSplitItems'
 import { PieceElement } from '../../SegmentContainer/PieceElement'
 import { getPieceSteps, PieceMultistepChevron } from '../../SegmentContainer/PieceMultistepChevron'
-import { PieceUi } from '../../SegmentContainer/withResolvedSegment'
-import { withMediaObjectStatus } from '../../SegmentTimeline/withMediaObjectStatus'
+import { useContentStatusForPieceInstance } from '../../SegmentTimeline/withMediaObjectStatus'
 import { PieceHoverInspector } from '../PieceHoverInspector'
 
 interface IProps {
@@ -52,14 +51,16 @@ function widthInBase(pieceMaxDuration: number, timelineBase: number): number {
 }
 
 // TODO: Create useMediaObjectStatus that would set up new subscriptions
-export const LinePartMainPiece = withMediaObjectStatus<IProps, {}>()(function LinePartMainPiece({
+export function LinePartMainPiece({
 	partId,
 	piece,
 	partDuration,
 	timelineBase,
 	capToPartDuration,
 	studio,
-}) {
+}: IProps): JSX.Element {
+	const contentStatus = useContentStatusForPieceInstance(piece.instance)
+
 	const [hover, setHover] = useState(false)
 	const [origin, setOrigin] = useState<OffsetPosition>({ left: 0, top: 0 })
 	const [width, setWidth] = useState(0)
@@ -75,15 +76,13 @@ export const LinePartMainPiece = withMediaObjectStatus<IProps, {}>()(function Li
 		}
 	}, [pieceMaxDuration, timelineBase])
 
-	const pieceUi = piece as PieceUi
-
 	const seek = (piece.instance.piece.content as any).seek ?? 0
 
 	const anomalies = useMemo(
 		() => (
 			<>
-				{pieceUi.contentStatus?.scenes &&
-					pieceUi.contentStatus?.scenes.map(
+				{contentStatus?.scenes &&
+					contentStatus?.scenes.map(
 						(i) =>
 							i < pieceMaxDuration &&
 							i - seek >= 0 && (
@@ -94,8 +93,8 @@ export const LinePartMainPiece = withMediaObjectStatus<IProps, {}>()(function Li
 								></span>
 							)
 					)}
-				{pieceUi.contentStatus?.freezes &&
-					pieceUi.contentStatus?.freezes.map(
+				{contentStatus?.freezes &&
+					contentStatus?.freezes.map(
 						(i) =>
 							i.start < pieceMaxDuration &&
 							i.start - seek >= 0 && (
@@ -109,8 +108,8 @@ export const LinePartMainPiece = withMediaObjectStatus<IProps, {}>()(function Li
 								></span>
 							)
 					)}
-				{pieceUi.contentStatus?.blacks &&
-					pieceUi.contentStatus?.blacks.map(
+				{contentStatus?.blacks &&
+					contentStatus?.blacks.map(
 						(i) =>
 							i.start < pieceMaxDuration &&
 							i.start - seek >= 0 && (
@@ -126,7 +125,7 @@ export const LinePartMainPiece = withMediaObjectStatus<IProps, {}>()(function Li
 					)}
 			</>
 		),
-		[pieceUi.contentStatus?.blacks, pieceUi.contentStatus?.freezes, pieceUi.contentStatus?.scenes]
+		[contentStatus?.blacks, contentStatus?.freezes, contentStatus?.scenes]
 	)
 
 	const onPointerEnter = (e: React.PointerEvent<HTMLDivElement>) => {
@@ -161,7 +160,7 @@ export const LinePartMainPiece = withMediaObjectStatus<IProps, {}>()(function Li
 		setMousePosition(e.pageX - origin.left)
 	}
 
-	const noticeLevel = getNoticeLevelForPieceStatus(piece.contentStatus?.status)
+	const noticeLevel = getNoticeLevelForPieceStatus(contentStatus?.status)
 
 	const hasStepChevron = getPieceSteps(piece)
 
@@ -205,6 +204,7 @@ export const LinePartMainPiece = withMediaObjectStatus<IProps, {}>()(function Li
 					hoverScrubTimePosition={mouseTimePosition * (piece.instance.piece.content.sourceDuration || 0)}
 					hovering={hover}
 					pieceInstance={piece}
+					contentStatus={contentStatus}
 					layer={piece.sourceLayer}
 					originPosition={origin}
 					mousePosition={mousePosition}
@@ -213,7 +213,7 @@ export const LinePartMainPiece = withMediaObjectStatus<IProps, {}>()(function Li
 			)}
 		</PieceElement>
 	)
-})
+}
 
 const ColoredMark = React.memo(function ColoredMark({ color }: { color: string | undefined }) {
 	if (!color) return null
diff --git a/meteor/client/ui/SegmentList/LinePartPieceIndicator/LinePartAdLibIndicator.tsx b/packages/webui/src/client/ui/SegmentList/LinePartPieceIndicator/LinePartAdLibIndicator.tsx
similarity index 91%
rename from meteor/client/ui/SegmentList/LinePartPieceIndicator/LinePartAdLibIndicator.tsx
rename to packages/webui/src/client/ui/SegmentList/LinePartPieceIndicator/LinePartAdLibIndicator.tsx
index f41c7183e2..959a39e43a 100644
--- a/meteor/client/ui/SegmentList/LinePartPieceIndicator/LinePartAdLibIndicator.tsx
+++ b/packages/webui/src/client/ui/SegmentList/LinePartPieceIndicator/LinePartAdLibIndicator.tsx
@@ -2,15 +2,15 @@ import React, { useCallback, useMemo } from 'react'
 import { PartId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import { AdLibAction } from '@sofie-automation/corelib/dist/dataModel/AdlibAction'
 import { AdLibPiece } from '@sofie-automation/corelib/dist/dataModel/AdLibPiece'
-import { ISourceLayerExtended } from '../../../../lib/Rundown'
+import { ISourceLayerExtended } from '../../../lib/RundownResolver'
 import { useSubscription, useTracker } from '../../../lib/ReactMeteorData/ReactMeteorData'
 import { LinePartIndicator } from './LinePartIndicator'
 import { useTranslation } from 'react-i18next'
 import { translateMessage } from '@sofie-automation/corelib/dist/TranslatableMessage'
 import StudioContext from '../../RundownView/StudioContext'
 import { AdLibActions, AdLibPieces } from '../../../collections'
-import RundownViewEventBus, { RundownViewEvents } from '../../../../lib/api/triggers/RundownViewEventBus'
-import { MeteorPubSub } from '../../../../lib/api/pubsub'
+import RundownViewEventBus, { RundownViewEvents } from '@sofie-automation/meteor-lib/dist/triggers/RundownViewEventBus'
+import { MeteorPubSub } from '@sofie-automation/meteor-lib/dist/api/pubsub'
 
 interface IProps {
 	sourceLayers: ISourceLayerExtended[]
diff --git a/meteor/client/ui/SegmentList/LinePartPieceIndicator/LinePartIndicator.tsx b/packages/webui/src/client/ui/SegmentList/LinePartPieceIndicator/LinePartIndicator.tsx
similarity index 90%
rename from meteor/client/ui/SegmentList/LinePartPieceIndicator/LinePartIndicator.tsx
rename to packages/webui/src/client/ui/SegmentList/LinePartPieceIndicator/LinePartIndicator.tsx
index 3ff7841a9d..909e08c85a 100644
--- a/meteor/client/ui/SegmentList/LinePartPieceIndicator/LinePartIndicator.tsx
+++ b/packages/webui/src/client/ui/SegmentList/LinePartPieceIndicator/LinePartIndicator.tsx
@@ -1,11 +1,10 @@
 import classNames from 'classnames'
 import React, { useCallback, useEffect, useState } from 'react'
-import { UIStudio } from '../../../../lib/api/studios'
-import { ISourceLayerExtended } from '../../../../lib/Rundown'
+import { UIStudio } from '@sofie-automation/meteor-lib/dist/api/studios'
+import { ISourceLayerExtended } from '../../../lib/RundownResolver'
 import { RundownUtils } from '../../../lib/rundown'
 import { AdLibPieceUi } from '../../../lib/shelf'
 import { PieceUi } from '../../SegmentContainer/withResolvedSegment'
-import { withMediaObjectStatus } from '../../SegmentTimeline/withMediaObjectStatus'
 
 interface IProps {
 	overlay?: (ref: HTMLDivElement | null, setIsOver: (isOver: boolean) => void) => React.ReactNode
@@ -20,7 +19,7 @@ interface IProps {
 	onDoubleClick?: React.EventHandler<React.MouseEvent<HTMLDivElement>>
 }
 
-export const LinePartIndicator = withMediaObjectStatus<IProps, {}>()(function LinePartIndicator({
+export function LinePartIndicator({
 	overlay,
 	count,
 	allSourceLayers,
@@ -29,7 +28,7 @@ export const LinePartIndicator = withMediaObjectStatus<IProps, {}>()(function Li
 	label,
 	onClick: onClickExternal,
 	onDoubleClick,
-}) {
+}: IProps): JSX.Element {
 	let typeClass = thisSourceLayer?.type ? RundownUtils.getSourceLayerClassName(thisSourceLayer.type) : undefined
 	const [element, setElement] = useState<HTMLDivElement | null>(null)
 	const [isMenuOpen, setIsMenuOpen] = useState(false)
@@ -98,4 +97,4 @@ export const LinePartIndicator = withMediaObjectStatus<IProps, {}>()(function Li
 			{isMenuOpen && !!overlay && overlay(element, setIsMenuOpen)}
 		</>
 	)
-})
+}
diff --git a/meteor/client/ui/SegmentList/LinePartPieceIndicator/LinePartPieceIndicator.scss b/packages/webui/src/client/ui/SegmentList/LinePartPieceIndicator/LinePartPieceIndicator.scss
similarity index 100%
rename from meteor/client/ui/SegmentList/LinePartPieceIndicator/LinePartPieceIndicator.scss
rename to packages/webui/src/client/ui/SegmentList/LinePartPieceIndicator/LinePartPieceIndicator.scss
diff --git a/meteor/client/ui/SegmentList/LinePartPieceIndicator/LinePartPieceIndicator.tsx b/packages/webui/src/client/ui/SegmentList/LinePartPieceIndicator/LinePartPieceIndicator.tsx
similarity index 96%
rename from meteor/client/ui/SegmentList/LinePartPieceIndicator/LinePartPieceIndicator.tsx
rename to packages/webui/src/client/ui/SegmentList/LinePartPieceIndicator/LinePartPieceIndicator.tsx
index ebadd1fc38..18fd251099 100644
--- a/meteor/client/ui/SegmentList/LinePartPieceIndicator/LinePartPieceIndicator.tsx
+++ b/packages/webui/src/client/ui/SegmentList/LinePartPieceIndicator/LinePartPieceIndicator.tsx
@@ -1,5 +1,5 @@
 import React, { useMemo } from 'react'
-import { ISourceLayerExtended, PieceExtended } from '../../../../lib/Rundown'
+import { ISourceLayerExtended, PieceExtended } from '../../../lib/RundownResolver'
 import { PartId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import StudioContext from '../../RundownView/StudioContext'
 import { LinePartIndicator } from './LinePartIndicator'
diff --git a/meteor/client/ui/SegmentList/LinePartPieceIndicator/LinePartScriptPiece.tsx b/packages/webui/src/client/ui/SegmentList/LinePartPieceIndicator/LinePartScriptPiece.tsx
similarity index 95%
rename from meteor/client/ui/SegmentList/LinePartPieceIndicator/LinePartScriptPiece.tsx
rename to packages/webui/src/client/ui/SegmentList/LinePartPieceIndicator/LinePartScriptPiece.tsx
index a1ba83d488..23d638c1c3 100644
--- a/meteor/client/ui/SegmentList/LinePartPieceIndicator/LinePartScriptPiece.tsx
+++ b/packages/webui/src/client/ui/SegmentList/LinePartPieceIndicator/LinePartScriptPiece.tsx
@@ -1,6 +1,6 @@
 import { ScriptContent, SourceLayerType } from '@sofie-automation/blueprints-integration'
-import React, { useLayoutEffect, useMemo, useRef, useState } from 'react'
-import { PieceExtended } from '../../../../lib/Rundown'
+import { useLayoutEffect, useMemo, useRef, useState } from 'react'
+import { PieceExtended } from '../../../lib/RundownResolver'
 import { IFloatingInspectorPosition } from '../../FloatingInspectors/IFloatingInspectorPosition'
 import { MicFloatingInspector } from '../../FloatingInspectors/MicFloatingInspector'
 
diff --git a/meteor/client/ui/SegmentList/LinePartPieceIndicator/PieceIndicatorMenu.scss b/packages/webui/src/client/ui/SegmentList/LinePartPieceIndicator/PieceIndicatorMenu.scss
similarity index 100%
rename from meteor/client/ui/SegmentList/LinePartPieceIndicator/PieceIndicatorMenu.scss
rename to packages/webui/src/client/ui/SegmentList/LinePartPieceIndicator/PieceIndicatorMenu.scss
diff --git a/meteor/client/ui/SegmentList/LinePartPieceIndicator/PieceIndicatorMenu.tsx b/packages/webui/src/client/ui/SegmentList/LinePartPieceIndicator/PieceIndicatorMenu.tsx
similarity index 98%
rename from meteor/client/ui/SegmentList/LinePartPieceIndicator/PieceIndicatorMenu.tsx
rename to packages/webui/src/client/ui/SegmentList/LinePartPieceIndicator/PieceIndicatorMenu.tsx
index fa58f3b28c..1571d96058 100644
--- a/meteor/client/ui/SegmentList/LinePartPieceIndicator/PieceIndicatorMenu.tsx
+++ b/packages/webui/src/client/ui/SegmentList/LinePartPieceIndicator/PieceIndicatorMenu.tsx
@@ -1,6 +1,6 @@
 import React, { useEffect, useLayoutEffect, useState } from 'react'
 import Escape from './../../../lib/Escape'
-import { PieceExtended } from '../../../../lib/Rundown'
+import { PieceExtended } from '../../../lib/RundownResolver'
 import { unprotectString } from '@sofie-automation/corelib/dist/protectedString'
 import { usePopper } from 'react-popper'
 import { PartId } from '@sofie-automation/corelib/dist/dataModel/Ids'
diff --git a/meteor/client/ui/SegmentList/LinePartPieceIndicators.tsx b/packages/webui/src/client/ui/SegmentList/LinePartPieceIndicators.tsx
similarity index 95%
rename from meteor/client/ui/SegmentList/LinePartPieceIndicators.tsx
rename to packages/webui/src/client/ui/SegmentList/LinePartPieceIndicators.tsx
index d2cf8c083d..72330e3ad0 100644
--- a/meteor/client/ui/SegmentList/LinePartPieceIndicators.tsx
+++ b/packages/webui/src/client/ui/SegmentList/LinePartPieceIndicators.tsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { ISourceLayerExtended, PieceExtended } from '../../../lib/Rundown'
+import { ISourceLayerExtended, PieceExtended } from '../../lib/RundownResolver'
 import { PartId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import { LinePartAdLibIndicator } from './LinePartPieceIndicator/LinePartAdLibIndicator'
 import { LinePartPieceIndicator } from './LinePartPieceIndicator/LinePartPieceIndicator'
diff --git a/meteor/client/ui/SegmentList/LinePartSecondaryPiece/LinePartSecondaryPiece.scss b/packages/webui/src/client/ui/SegmentList/LinePartSecondaryPiece/LinePartSecondaryPiece.scss
similarity index 100%
rename from meteor/client/ui/SegmentList/LinePartSecondaryPiece/LinePartSecondaryPiece.scss
rename to packages/webui/src/client/ui/SegmentList/LinePartSecondaryPiece/LinePartSecondaryPiece.scss
diff --git a/meteor/client/ui/SegmentList/LinePartSecondaryPiece/LinePartSecondaryPiece.tsx b/packages/webui/src/client/ui/SegmentList/LinePartSecondaryPiece/LinePartSecondaryPiece.tsx
similarity index 90%
rename from meteor/client/ui/SegmentList/LinePartSecondaryPiece/LinePartSecondaryPiece.tsx
rename to packages/webui/src/client/ui/SegmentList/LinePartSecondaryPiece/LinePartSecondaryPiece.tsx
index ee257924a3..b62914bfe8 100644
--- a/meteor/client/ui/SegmentList/LinePartSecondaryPiece/LinePartSecondaryPiece.tsx
+++ b/packages/webui/src/client/ui/SegmentList/LinePartSecondaryPiece/LinePartSecondaryPiece.tsx
@@ -1,11 +1,12 @@
 import classNames from 'classnames'
 import React, { CSSProperties, useCallback, useMemo, useRef, useState } from 'react'
-import { PieceExtended } from '../../../../lib/Rundown'
+import { PieceExtended } from '../../../lib/RundownResolver'
 import { RundownUtils } from '../../../lib/rundown'
 import { PieceHoverInspector } from '../PieceHoverInspector'
 import { getElementDocumentOffset, OffsetPosition } from '../../../utils/positions'
 import { PieceUi } from '../../SegmentContainer/withResolvedSegment'
 import StudioContext from '../../RundownView/StudioContext'
+import { useContentStatusForPieceInstance } from '../../SegmentTimeline/withMediaObjectStatus'
 
 interface IProps {
 	piece: PieceExtended
@@ -28,6 +29,8 @@ export const LinePartSecondaryPiece: React.FC<IProps> = React.memo(function Line
 	onClick: incomingOnClick,
 	onDoubleClick: incomingOnDoubleClick,
 }) {
+	const contentStatus = useContentStatusForPieceInstance(piece.instance)
+
 	const pieceEl = useRef<HTMLDivElement>(null)
 	const [hovering, setHover] = useState(false)
 	const [origin, setOrigin] = useState<OffsetPosition>({ left: 0, top: 0 })
@@ -35,7 +38,7 @@ export const LinePartSecondaryPiece: React.FC<IProps> = React.memo(function Line
 	const typeClass = piece?.sourceLayer?.type ? RundownUtils.getSourceLayerClassName(piece?.sourceLayer?.type) : ''
 
 	const pieceStyle = useMemo<CSSProperties>(() => {
-		const width = timeInBase(piece.renderedDuration ?? partDuration, timelineBase, timelineBase)
+		const width = timeInBase(piece.renderedDuration ?? Math.max(timelineBase, partDuration), timelineBase, timelineBase)
 		const left = timeInBase(piece.renderedInPoint ?? 0, timelineBase, timelineBase)
 		const overflow = Math.max(0, left + width - 100)
 		return {
@@ -109,6 +112,7 @@ export const LinePartSecondaryPiece: React.FC<IProps> = React.memo(function Line
 							mousePosition={mousePosition}
 							originPosition={origin}
 							pieceInstance={piece}
+							contentStatus={contentStatus}
 							studio={studio}
 						/>
 					)
diff --git a/meteor/client/ui/SegmentList/LinePartTimeline.tsx b/packages/webui/src/client/ui/SegmentList/LinePartTimeline.tsx
similarity index 79%
rename from meteor/client/ui/SegmentList/LinePartTimeline.tsx
rename to packages/webui/src/client/ui/SegmentList/LinePartTimeline.tsx
index 3063753656..106d4b89a5 100644
--- a/meteor/client/ui/SegmentList/LinePartTimeline.tsx
+++ b/packages/webui/src/client/ui/SegmentList/LinePartTimeline.tsx
@@ -1,6 +1,6 @@
 import { PieceLifespan, SourceLayerType } from '@sofie-automation/blueprints-integration'
 import React, { useMemo } from 'react'
-import { PartExtended, PieceExtended } from '../../../lib/Rundown'
+import { PartExtended, PieceExtended } from '../../lib/RundownResolver'
 import { findPieceExtendedToShowFromOrderedResolvedInstances } from '../PieceIcons/utils'
 import { LinePartMainPiece } from './LinePartMainPiece/LinePartMainPiece'
 import { OnAirLine } from './OnAirLine'
@@ -14,9 +14,13 @@ import { PieceUi } from '../SegmentContainer/withResolvedSegment'
 import StudioContext from '../RundownView/StudioContext'
 import { InvalidPartCover } from '../SegmentTimeline/Parts/InvalidPartCover'
 import { getPartInstanceTimingId } from '../../lib/rundownTiming'
+import { QuickLoopEnd } from './QuickLoopEnd'
+import { getShowHiddenSourceLayers } from '../../lib/localStorage'
 
 const TIMELINE_DEFAULT_BASE = 30 * 1000
 
+const showHiddenSourceLayers = getShowHiddenSourceLayers()
+
 interface IProps {
 	part: PartExtended
 	isLive: boolean
@@ -24,6 +28,8 @@ interface IProps {
 	isFinished: boolean
 	currentPartWillAutonext: boolean
 	hasAlreadyPlayed: boolean
+	isQuickLoopStart: boolean
+	isQuickLoopEnd: boolean
 	onPieceClick?: (item: PieceUi, e: React.MouseEvent<HTMLDivElement>) => void
 	onPieceDoubleClick?: (item: PieceUi, e: React.MouseEvent<HTMLDivElement>) => void
 }
@@ -35,14 +41,9 @@ const supportedSourceLayerTypes = new Set(
 	)
 )
 
-function findMainPiece(pieces: PieceExtended[], original?: boolean) {
+function findMainPiece(pieces: PieceExtended[]) {
 	return findPieceExtendedToShowFromOrderedResolvedInstances(
-		pieces.filter(
-			(piece) =>
-				piece.outputLayer?.isPGM &&
-				piece.sourceLayer?.onPresenterScreen &&
-				(!original || !piece.instance.dynamicallyInserted)
-		),
+		pieces.filter((piece) => piece.outputLayer?.isPGM && piece.sourceLayer?.onPresenterScreen),
 		supportedSourceLayerTypes
 	)
 }
@@ -55,23 +56,28 @@ function findTransitionPiece(pieces: PieceExtended[]) {
 	})
 }
 
-function findTimedGraphics(pieces: PieceExtended[]) {
-	return pieces.slice().filter((piece) => {
-		if (
-			piece.sourceLayer?.type === SourceLayerType.LOWER_THIRD &&
-			!piece.sourceLayer?.isHidden &&
-			piece.instance.piece.lifespan === PieceLifespan.WithinPart &&
-			piece.instance.piece.enable.duration
-		) {
-			return true
-		}
-	})
+function findTimelineGraphics(pieces: PieceExtended[]) {
+	return pieces
+		.slice()
+		.filter((piece) => {
+			if (
+				piece.sourceLayer?.type === SourceLayerType.LOWER_THIRD &&
+				(showHiddenSourceLayers || !piece.sourceLayer?.isHidden) &&
+				((piece.instance.piece.lifespan === PieceLifespan.WithinPart && piece.instance.piece.enable.duration) ||
+					!piece.sourceLayer?.onListViewColumn)
+			) {
+				return true
+			}
+		})
+		.sort((a, b) => (a.sourceLayer?._rank ?? 0) - (b.sourceLayer?._rank ?? 0))
 }
 
 export const LinePartTimeline: React.FC<IProps> = function LinePartTimeline({
 	part,
 	isLive,
 	isNext,
+	isQuickLoopStart,
+	isQuickLoopEnd,
 	currentPartWillAutonext,
 	hasAlreadyPlayed,
 	onPieceClick,
@@ -80,9 +86,8 @@ export const LinePartTimeline: React.FC<IProps> = function LinePartTimeline({
 	// const [highlight] = useState(false)
 
 	const mainPiece = useMemo(() => findMainPiece(part.pieces), [part.pieces])
-	// const mainDisplayPiece = useMemo(() => findMainPiece(part.pieces), [part.pieces])
 	const transitionPiece = useMemo(() => findTransitionPiece(part.pieces), [part.pieces])
-	const timedGraphics = useMemo(() => findTimedGraphics(part.pieces), [part.pieces])
+	const timedGraphics = useMemo(() => findTimelineGraphics(part.pieces), [part.pieces])
 
 	const timings = part.instance.partPlayoutTimings
 	const toPartDelay = (timings?.toPartDelay ?? 0) - ((timings?.fromPartRemaining ?? 0) - (timings?.toPartDelay ?? 0))
@@ -138,7 +143,10 @@ export const LinePartTimeline: React.FC<IProps> = function LinePartTimeline({
 			{part.instance.part.invalid && !part.instance.part.gap && (
 				<InvalidPartCover className="segment-opl__main-piece invalid" part={part.instance.part} align="start" />
 			)}
-			{!isLive && !isInvalid && <TakeLine isNext={isNext} autoNext={willAutoNextIntoThisPart} />}
+			{!isLive && !isInvalid && (
+				<TakeLine isNext={isNext} autoNext={willAutoNextIntoThisPart} isQuickLoopStart={isQuickLoopStart} />
+			)}
+			{isQuickLoopStart && <div className="segment-opl__take-line__quickloop-start"></div>}
 			{transitionPiece && <LinePartTransitionPiece piece={transitionPiece} />}
 			{!willAutoNextOut && !isInvalid && (
 				<OvertimeShadow
@@ -155,6 +163,7 @@ export const LinePartTimeline: React.FC<IProps> = function LinePartTimeline({
 				/>
 			)}
 			{willAutoNextOut && <PartAutoNextMarker partDuration={renderedPartDuration} timelineBase={timelineBase} />}
+			{isQuickLoopEnd && <QuickLoopEnd partDuration={renderedPartDuration} timelineBase={timelineBase} />}
 			{isLive && (
 				<OnAirLine
 					partInstance={part.instance}
diff --git a/meteor/client/ui/SegmentList/LinePartTitle.tsx b/packages/webui/src/client/ui/SegmentList/LinePartTitle.tsx
similarity index 94%
rename from meteor/client/ui/SegmentList/LinePartTitle.tsx
rename to packages/webui/src/client/ui/SegmentList/LinePartTitle.tsx
index 1af80793ec..cd5c788829 100644
--- a/meteor/client/ui/SegmentList/LinePartTitle.tsx
+++ b/packages/webui/src/client/ui/SegmentList/LinePartTitle.tsx
@@ -1,4 +1,4 @@
-import React, { useRef, useLayoutEffect, useState } from 'react'
+import { useRef, useLayoutEffect, useState } from 'react'
 import Tooltip from 'rc-tooltip'
 import { TOOLTIP_DEFAULT_DELAY } from '../../lib/lib'
 import { TooltipProps } from 'rc-tooltip/lib/Tooltip'
diff --git a/meteor/client/ui/SegmentList/LinePartTransitionPiece/LinePartTransitionPiece.scss b/packages/webui/src/client/ui/SegmentList/LinePartTransitionPiece/LinePartTransitionPiece.scss
similarity index 100%
rename from meteor/client/ui/SegmentList/LinePartTransitionPiece/LinePartTransitionPiece.scss
rename to packages/webui/src/client/ui/SegmentList/LinePartTransitionPiece/LinePartTransitionPiece.scss
diff --git a/meteor/client/ui/SegmentList/LinePartTransitionPiece/LinePartTransitionPiece.tsx b/packages/webui/src/client/ui/SegmentList/LinePartTransitionPiece/LinePartTransitionPiece.tsx
similarity index 83%
rename from meteor/client/ui/SegmentList/LinePartTransitionPiece/LinePartTransitionPiece.tsx
rename to packages/webui/src/client/ui/SegmentList/LinePartTransitionPiece/LinePartTransitionPiece.tsx
index d3f21f909e..f222f76710 100644
--- a/meteor/client/ui/SegmentList/LinePartTransitionPiece/LinePartTransitionPiece.tsx
+++ b/packages/webui/src/client/ui/SegmentList/LinePartTransitionPiece/LinePartTransitionPiece.tsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { PieceExtended } from '../../../../lib/Rundown'
+import { PieceExtended } from '../../../lib/RundownResolver'
 
 interface IProps {
 	piece: PieceExtended
diff --git a/meteor/client/ui/SegmentList/OnAirLine.tsx b/packages/webui/src/client/ui/SegmentList/OnAirLine.tsx
similarity index 94%
rename from meteor/client/ui/SegmentList/OnAirLine.tsx
rename to packages/webui/src/client/ui/SegmentList/OnAirLine.tsx
index 120097cc22..e4d1fbf10e 100644
--- a/meteor/client/ui/SegmentList/OnAirLine.tsx
+++ b/packages/webui/src/client/ui/SegmentList/OnAirLine.tsx
@@ -5,11 +5,11 @@ import {
 	WithTiming,
 	withTiming,
 } from '../RundownView/RundownTiming/withTiming'
-import { SIMULATED_PLAYBACK_HARD_MARGIN } from '../SegmentTimeline/SegmentTimelineContainer'
-import { PartInstanceLimited } from '../../../lib/Rundown'
+import { SIMULATED_PLAYBACK_HARD_MARGIN } from '../SegmentTimeline/Constants'
+import { PartInstanceLimited } from '../../lib/RundownResolver'
 import { useTranslation } from 'react-i18next'
 import { getAllowSpeaking, getAllowVibrating } from '../../lib/localStorage'
-import { CurrentPartRemaining } from '../RundownView/RundownTiming/CurrentPartRemaining'
+import { CurrentPartOrSegmentRemaining } from '../RundownView/RundownTiming/CurrentPartOrSegmentRemaining'
 import { AutoNextStatus } from '../RundownView/RundownTiming/AutoNextStatus'
 import classNames from 'classnames'
 
@@ -107,7 +107,7 @@ export const OnAirLine = withTiming<IProps, {}>({
 				</div>
 				<div className="segment-opl__on-air-line__countdown">
 					<AutoNextStatus />
-					<CurrentPartRemaining
+					<CurrentPartOrSegmentRemaining
 						currentPartInstanceId={partInstance._id}
 						speaking={getAllowSpeaking()}
 						vibrating={getAllowVibrating()}
diff --git a/meteor/client/ui/SegmentList/OvertimeShadow.tsx b/packages/webui/src/client/ui/SegmentList/OvertimeShadow.tsx
similarity index 100%
rename from meteor/client/ui/SegmentList/OvertimeShadow.tsx
rename to packages/webui/src/client/ui/SegmentList/OvertimeShadow.tsx
diff --git a/meteor/client/ui/SegmentList/PartAutoNextMarker.tsx b/packages/webui/src/client/ui/SegmentList/PartAutoNextMarker.tsx
similarity index 100%
rename from meteor/client/ui/SegmentList/PartAutoNextMarker.tsx
rename to packages/webui/src/client/ui/SegmentList/PartAutoNextMarker.tsx
diff --git a/meteor/client/ui/SegmentList/PieceHoverInspector.tsx b/packages/webui/src/client/ui/SegmentList/PieceHoverInspector.tsx
similarity index 83%
rename from meteor/client/ui/SegmentList/PieceHoverInspector.tsx
rename to packages/webui/src/client/ui/SegmentList/PieceHoverInspector.tsx
index 811f250593..78229d6551 100644
--- a/meteor/client/ui/SegmentList/PieceHoverInspector.tsx
+++ b/packages/webui/src/client/ui/SegmentList/PieceHoverInspector.tsx
@@ -6,19 +6,21 @@ import {
 	VTContent,
 } from '@sofie-automation/blueprints-integration'
 import { PieceStatusCode } from '@sofie-automation/corelib/dist/dataModel/Piece'
-import React from 'react'
-import { UIStudio } from '../../../lib/api/studios'
-import { getNoticeLevelForPieceStatus } from '../../../lib/notifications/notifications'
+import { UIStudio } from '@sofie-automation/meteor-lib/dist/api/studios'
+import { getNoticeLevelForPieceStatus } from '../../lib/notifications/notifications'
 import { RundownUtils } from '../../lib/rundown'
 import { OffsetPosition } from '../../utils/positions'
 import { FloatingInspector } from '../FloatingInspector'
 import { L3rdFloatingInspector } from '../FloatingInspectors/L3rdFloatingInspector'
 import { VTFloatingInspector } from '../FloatingInspectors/VTFloatingInspector'
 import { PieceUi } from '../SegmentContainer/withResolvedSegment'
+import { ReadonlyDeep } from 'type-fest'
+import { PieceContentStatusObj } from '@sofie-automation/meteor-lib/dist/api/pieceContentStatus'
 
 export function PieceHoverInspector({
 	studio,
 	pieceInstance,
+	contentStatus,
 	hovering,
 	hoverScrubTimePosition,
 	originPosition,
@@ -27,19 +29,18 @@ export function PieceHoverInspector({
 }: Readonly<{
 	studio: UIStudio
 	pieceInstance: PieceUi
+	contentStatus: ReadonlyDeep<PieceContentStatusObj> | undefined
 	hovering: boolean
 	hoverScrubTimePosition: number
 	originPosition: OffsetPosition
 	mousePosition: number
 	layer: ISourceLayer | undefined
 }>): JSX.Element | null {
-	const status = pieceInstance.contentStatus?.status
-
 	const vtContent = pieceInstance.instance.piece.content as VTContent
 	const graphicsContent = pieceInstance.instance.piece.content as GraphicsContent
 	const transitionContent = pieceInstance.instance.piece.content as TransitionContent
 
-	const noticeLevel = getNoticeLevelForPieceStatus(status)
+	const noticeLevel = getNoticeLevelForPieceStatus(contentStatus?.status)
 
 	switch (layer?.type) {
 		case SourceLayerType.TRANSITION:
@@ -85,7 +86,7 @@ export function PieceHoverInspector({
 		case SourceLayerType.LIVE_SPEAK:
 			return (
 				<VTFloatingInspector
-					status={status ?? PieceStatusCode.UNKNOWN}
+					status={contentStatus?.status ?? PieceStatusCode.UNKNOWN}
 					showMiniInspector={hovering}
 					timePosition={hoverScrubTimePosition}
 					content={vtContent}
@@ -97,10 +98,10 @@ export function PieceHoverInspector({
 					}}
 					typeClass={layer && RundownUtils.getSourceLayerClassName(layer.type)}
 					itemElement={null}
-					noticeMessages={pieceInstance.contentStatus?.messages ?? null}
+					noticeMessages={contentStatus?.messages ?? null}
 					noticeLevel={noticeLevel}
 					studio={studio}
-					previewUrl={pieceInstance.contentStatus?.previewUrl}
+					previewUrl={contentStatus?.previewUrl}
 				/>
 			)
 	}
diff --git a/packages/webui/src/client/ui/SegmentList/QuickLoopEnd.tsx b/packages/webui/src/client/ui/SegmentList/QuickLoopEnd.tsx
new file mode 100644
index 0000000000..5fedc9e5d7
--- /dev/null
+++ b/packages/webui/src/client/ui/SegmentList/QuickLoopEnd.tsx
@@ -0,0 +1,23 @@
+import React, { useMemo } from 'react'
+
+function widthInBase(pieceMaxDuration: number, timelineBase: number): number {
+	const size = Math.min(1, pieceMaxDuration / timelineBase)
+	return size * 100
+}
+
+export function QuickLoopEnd({
+	partDuration,
+	timelineBase,
+}: {
+	partDuration: number
+	timelineBase: number
+}): JSX.Element {
+	const style = useMemo<React.CSSProperties>(
+		() => ({
+			left: `${widthInBase(partDuration, timelineBase)}%`,
+		}),
+		[partDuration, timelineBase]
+	)
+
+	return <div className="segment-opl__take-line__quickloop-end" style={style}></div>
+}
diff --git a/meteor/client/ui/SegmentList/SegmentList.scss b/packages/webui/src/client/ui/SegmentList/SegmentList.scss
similarity index 88%
rename from meteor/client/ui/SegmentList/SegmentList.scss
rename to packages/webui/src/client/ui/SegmentList/SegmentList.scss
index e4b76cb3f0..d52ccad341 100644
--- a/meteor/client/ui/SegmentList/SegmentList.scss
+++ b/packages/webui/src/client/ui/SegmentList/SegmentList.scss
@@ -149,6 +149,41 @@ $identifier-area-width: 3em;
 						width: max-content;
 					}
 				}
+
+				> .segment-opl__quickloop-start, > .segment-opl__quickloop-end {
+					position: absolute;
+					right: -10px;
+					filter: drop-shadow(0px 1px 2px rgba(0, 0, 0, 0.6));
+				}
+
+				> .segment-opl__quickloop-start {
+					top: -2px;
+				}
+
+				> .segment-opl__quickloop-end {
+					bottom: -2px;
+				}
+
+				> .segment-opl__quickloop-background {
+					position: absolute;
+					top: 0;
+					bottom: 0;
+					width: 2px;
+					right: -1px;
+					background-image: linear-gradient(to bottom, white 20%, rgba(255, 255, 255, 0) 0%);
+					background-position: top 5px left;
+					background-size: 2px 10px;
+					background-repeat: repeat-y;
+					filter: drop-shadow(0px 0px 1px rgba(0, 0, 0, 0.6));
+				}
+
+				> .segment-opl__quickloop-start ~ .segment-opl__quickloop-background {
+					top: 10px;
+				}
+
+				> .segment-opl__quickloop-end ~ .segment-opl__quickloop-background {
+					bottom: 20px;
+				}
 			}
 
 			&--next {
@@ -196,6 +231,21 @@ $identifier-area-width: 3em;
 				}
 			}
 
+			&--outside-quickloop {
+				&::before {
+					content: ' ';
+					display: block;
+					position: absolute;
+					top: 0;
+					left: 0;
+					bottom: 0;
+					right: 0;
+					background: rgba(0, 0, 0, 0.5);
+					z-index: 2;
+					pointer-events: none;
+				}
+			}
+
 			> .segment-opl__part-timeline {
 				position: relative;
 				margin-top: 0.6em;
@@ -256,6 +306,18 @@ $identifier-area-width: 3em;
 							@include take-arrow();
 							z-index: 1;
 						}
+
+						&.quickloop-start {
+							&::before, &::after {
+								left: 6px;
+							}
+
+							&:not(.next) {
+								&::before, &::after {
+									border-left-color: white;
+								}
+							}
+						}
 					}
 
 					&.next {
@@ -308,6 +370,27 @@ $identifier-area-width: 3em;
 						font-weight: 400;
 						text-shadow: 0 0 5px rgba(0, 0, 0, 1);
 					}
+
+				}
+
+				> .segment-opl__take-line__quickloop-start {
+					border-left: 3px solid white;
+					border-right: 1px solid white;
+					position: absolute;
+					top: -0.4em;
+					bottom: 0.3em;
+					left: 0;
+					width: 6px;
+				}
+
+				> .segment-opl__take-line__quickloop-end {
+					border-right: 3px solid white;
+					border-left: 1px solid white;
+					position: absolute;
+					top: -0.4em;
+					bottom: 0.3em;
+					margin-left: -4px;
+					width: 6px;
 				}
 
 				> .segment-opl__on-air-line {
@@ -483,6 +566,11 @@ $identifier-area-width: 3em;
 					}
 				}
 			}
+			&--next {
+				> .segment-opl__part-timeline > .segment-opl__take-line__quickloop-start {
+					border-color: $general-next-color;
+				}
+			}
 
 			> .segment-opl__piece-indicators {
 				background: #141414;
diff --git a/meteor/client/ui/SegmentList/SegmentList.tsx b/packages/webui/src/client/ui/SegmentList/SegmentList.tsx
similarity index 95%
rename from meteor/client/ui/SegmentList/SegmentList.tsx
rename to packages/webui/src/client/ui/SegmentList/SegmentList.tsx
index c474e39432..ceb6dae38b 100644
--- a/meteor/client/ui/SegmentList/SegmentList.tsx
+++ b/packages/webui/src/client/ui/SegmentList/SegmentList.tsx
@@ -9,13 +9,14 @@ import { literal } from '@sofie-automation/corelib/dist/lib'
 import { isPartPlayable } from '@sofie-automation/corelib/dist/dataModel/Part'
 import { LinePart } from './LinePart'
 import { unprotectString } from '@sofie-automation/corelib/dist/protectedString'
-import { ISourceLayerExtended } from '../../../lib/Rundown'
+import { ISourceLayerExtended } from '../../lib/RundownResolver'
 import { SegmentViewMode } from '../SegmentContainer/SegmentViewModes'
 import { SegmentListHeader } from './SegmentListHeader'
 import { useInView } from 'react-intersection-observer'
 import { getHeaderHeight } from '../../lib/viewPort'
 import { SegmentId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import { NoteSeverity } from '@sofie-automation/blueprints-integration'
+import * as RundownResolver from '../../lib/RundownResolver'
 
 interface IProps {
 	id: string
@@ -153,6 +154,9 @@ const SegmentListInner = React.forwardRef<HTMLDivElement, IProps>(function Segme
 				doesPlaylistHaveNextPart={playlistHasNextPart}
 				onPieceDoubleClick={props.onPieceDoubleClick}
 				onContextMenu={props.onContextMenu}
+				isPlaylistLooping={RundownResolver.isLoopRunning(props.playlist)}
+				isQuickLoopStart={RundownResolver.isQuickLoopStart(part.partId, props.playlist)}
+				isQuickLoopEnd={RundownResolver.isQuickLoopEnd(part.partId, props.playlist)}
 			/>
 		)
 
diff --git a/meteor/client/ui/SegmentList/SegmentListContainer.tsx b/packages/webui/src/client/ui/SegmentList/SegmentListContainer.tsx
similarity index 90%
rename from meteor/client/ui/SegmentList/SegmentListContainer.tsx
rename to packages/webui/src/client/ui/SegmentList/SegmentListContainer.tsx
index 576163c41b..d019f3da7a 100644
--- a/meteor/client/ui/SegmentList/SegmentListContainer.tsx
+++ b/packages/webui/src/client/ui/SegmentList/SegmentListContainer.tsx
@@ -1,5 +1,5 @@
-import React, { useEffect, useRef } from 'react'
-import { meteorSubscribe } from '../../../lib/api/pubsub'
+import { useEffect, useRef } from 'react'
+import { meteorSubscribe } from '../../lib/meteorApi'
 import { useSubscription, useTracker } from '../../lib/ReactMeteorData/ReactMeteorData'
 import {
 	withResolvedSegment,
@@ -8,10 +8,11 @@ import {
 } from '../SegmentContainer/withResolvedSegment'
 import { SpeechSynthesiser } from '../../lib/speechSynthesis'
 import { SegmentList } from './SegmentList'
-import { unprotectString } from '../../../lib/lib'
-import { LIVELINE_HISTORY_SIZE as TIMELINE_LIVELINE_HISTORY_SIZE } from '../SegmentTimeline/SegmentTimelineContainer'
-import { PartInstances, Parts, Segments } from '../../collections'
+import { unprotectString } from '../../lib/tempLib'
+import { LIVELINE_HISTORY_SIZE as TIMELINE_LIVELINE_HISTORY_SIZE } from '../SegmentTimeline/Constants'
+import { Segments } from '../../collections'
 import { CorelibPubSub } from '@sofie-automation/corelib/dist/pubsub'
+import { UIPartInstances, UIParts } from '../Collections'
 
 export const LIVELINE_HISTORY_SIZE = TIMELINE_LIVELINE_HISTORY_SIZE
 
@@ -28,7 +29,7 @@ export const SegmentListContainer = withResolvedSegment<IProps>(function Segment
 }: IProps & ITrackedResolvedSegmentProps) {
 	const partIds = useTracker(
 		() =>
-			Parts.find(
+			UIParts.find(
 				{
 					segmentId,
 				},
@@ -45,7 +46,7 @@ export const SegmentListContainer = withResolvedSegment<IProps>(function Segment
 
 	const partInstanceIds = useTracker(
 		() =>
-			PartInstances.find(
+			UIPartInstances.find(
 				{
 					segmentId: segmentId,
 					reset: {
@@ -86,7 +87,7 @@ export const SegmentListContainer = withResolvedSegment<IProps>(function Segment
 				return false
 			}
 
-			const currentPartInstance = PartInstances.findOne(props.playlist.currentPartInfo.partInstanceId)
+			const currentPartInstance = UIPartInstances.findOne(props.playlist.currentPartInfo.partInstanceId)
 			if (!currentPartInstance) {
 				return false
 			}
@@ -103,7 +104,7 @@ export const SegmentListContainer = withResolvedSegment<IProps>(function Segment
 				return false
 			}
 
-			const partInstance = PartInstances.findOne(props.playlist.nextPartInfo.partInstanceId, {
+			const partInstance = UIPartInstances.findOne(props.playlist.nextPartInfo.partInstanceId, {
 				fields: {
 					segmentId: 1,
 					'part._id': 1,
@@ -125,7 +126,7 @@ export const SegmentListContainer = withResolvedSegment<IProps>(function Segment
 				return false
 			}
 
-			const currentPartInstance = PartInstances.findOne(props.playlist.currentPartInfo.partInstanceId, {
+			const currentPartInstance = UIPartInstances.findOne(props.playlist.currentPartInfo.partInstanceId, {
 				fields: {
 					'part.autoNext': 1,
 					'part.expectedDuration': 1,
diff --git a/meteor/client/ui/SegmentList/SegmentListHeader.tsx b/packages/webui/src/client/ui/SegmentList/SegmentListHeader.tsx
similarity index 99%
rename from meteor/client/ui/SegmentList/SegmentListHeader.tsx
rename to packages/webui/src/client/ui/SegmentList/SegmentListHeader.tsx
index 0a54e1e537..069527b6d4 100644
--- a/meteor/client/ui/SegmentList/SegmentListHeader.tsx
+++ b/packages/webui/src/client/ui/SegmentList/SegmentListHeader.tsx
@@ -1,4 +1,3 @@
-import React from 'react'
 import { ContextMenuTrigger } from '@jstarpl/react-contextmenu'
 import classNames from 'classnames'
 // import { InView } from 'react-intersection-observer'
@@ -99,7 +98,7 @@ export function SegmentListHeader({
 				>
 					{playlist && parts && parts.length > 0 && (
 						<SegmentDuration
-							segmentId={segment._id}
+							segment={segment}
 							parts={parts}
 							label={<span className="segment-timeline__duration__label">{t('Duration')}</span>}
 							fixed={fixedSegmentDuration}
diff --git a/meteor/client/ui/SegmentList/TakeLine.tsx b/packages/webui/src/client/ui/SegmentList/TakeLine.tsx
similarity index 87%
rename from meteor/client/ui/SegmentList/TakeLine.tsx
rename to packages/webui/src/client/ui/SegmentList/TakeLine.tsx
index d58c86b199..a766ee31fe 100644
--- a/meteor/client/ui/SegmentList/TakeLine.tsx
+++ b/packages/webui/src/client/ui/SegmentList/TakeLine.tsx
@@ -5,9 +5,10 @@ import { useTranslation } from 'react-i18next'
 interface IProps {
 	isNext: boolean
 	autoNext: boolean
+	isQuickLoopStart: boolean
 }
 
-export const TakeLine: React.FC<IProps> = function TakeLine({ isNext, autoNext }) {
+export const TakeLine: React.FC<IProps> = function TakeLine({ isNext, autoNext, isQuickLoopStart }) {
 	const { t } = useTranslation()
 
 	return (
@@ -15,6 +16,7 @@ export const TakeLine: React.FC<IProps> = function TakeLine({ isNext, autoNext }
 			className={classNames('segment-opl__timeline-flag', 'segment-opl__take-line', {
 				next: isNext,
 				auto: autoNext,
+				'quickloop-start': isQuickLoopStart,
 			})}
 		>
 			{isNext && (
diff --git a/meteor/client/ui/SegmentList/utils/LiveLineIsPast.tsx b/packages/webui/src/client/ui/SegmentList/utils/LiveLineIsPast.tsx
similarity index 100%
rename from meteor/client/ui/SegmentList/utils/LiveLineIsPast.tsx
rename to packages/webui/src/client/ui/SegmentList/utils/LiveLineIsPast.tsx
diff --git a/meteor/client/ui/SegmentStoryboard/SegmentScrollbar.tsx b/packages/webui/src/client/ui/SegmentStoryboard/SegmentScrollbar.tsx
similarity index 100%
rename from meteor/client/ui/SegmentStoryboard/SegmentScrollbar.tsx
rename to packages/webui/src/client/ui/SegmentStoryboard/SegmentScrollbar.tsx
diff --git a/meteor/client/ui/SegmentStoryboard/SegmentStoryboard.scss b/packages/webui/src/client/ui/SegmentStoryboard/SegmentStoryboard.scss
similarity index 74%
rename from meteor/client/ui/SegmentStoryboard/SegmentStoryboard.scss
rename to packages/webui/src/client/ui/SegmentStoryboard/SegmentStoryboard.scss
index b67b4a9e2f..d48c116579 100644
--- a/meteor/client/ui/SegmentStoryboard/SegmentStoryboard.scss
+++ b/packages/webui/src/client/ui/SegmentStoryboard/SegmentStoryboard.scss
@@ -95,6 +95,8 @@ $break-width: 35rem;
 	}
 
 	> .segment-storyboard__part-list__container {
+		padding-left: 2px;
+
 		> .segment-storyboard__part-list {
 			position: relative;
 			display: flex;
@@ -166,6 +168,21 @@ $break-width: 35rem;
 		background: $segment-timeline-background-color;
 	}
 
+	&--outside-quickloop {
+		&::before {
+			content: ' ';
+			display: block;
+			position: absolute;
+			top: 0;
+			left: 0;
+			bottom: 0;
+			right: 0;
+			background: rgba(0, 0, 0, 0.5);
+			z-index: 2;
+			pointer-events: none;
+		}
+	}
+
 	> .segment-storyboard__part__background {
 		position: absolute;
 		background-image: linear-gradient(to bottom, $general-live-color 20px, black 8rem);
@@ -190,7 +207,7 @@ $break-width: 35rem;
 		bottom: 0;
 		width: 0;
 		border-left: 2px solid $part-start-color;
-		z-index: 2;
+		z-index: 3;
 
 		&--autonext {
 			top: 7px;
@@ -217,6 +234,10 @@ $break-width: 35rem;
 			right: -2px;
 		}
 
+		&--quickloop-start {
+			border: none;
+		}
+
 		&:not(.segment-storyboard__part__next-line--autonext):not(.segment-storyboard__part__next-line--live):not(
 				.segment-storyboard__part__next-line--invalid
 			) {
@@ -233,6 +254,15 @@ $break-width: 35rem;
 				bottom: -1px;
 			}
 
+			&.segment-storyboard__part__next-line--quickloop-start {
+				border: none;
+
+				&::before, &::after {
+					left: 3px;
+					border-color: transparent transparent transparent white;
+				}
+			}
+
 			&.segment-storyboard__part__next-line--next {
 				&:not(.segment-storyboard__part__next-line--opposite) {
 					&::before {
@@ -279,7 +309,7 @@ $break-width: 35rem;
 		word-wrap: none;
 		color: $part-start-color;
 		padding: 3px 0.3em 1px;
-		z-index: 2;
+		z-index: 5;
 
 		&.segment-storyboard__part__next-line-label--live {
 			background: $general-live-color;
@@ -331,6 +361,14 @@ $break-width: 35rem;
 			font-size: 0.9em;
 		}
 
+		&:not(.segment-storyboard__part__next-line-label--next).segment-storyboard__part__next-line-label--quickloop-start {
+			margin-left: 2px;
+		}
+
+		&.segment-storyboard__part__next-line-label--next.segment-storyboard__part__next-line-label--quickloop-start {
+			margin-left: -2px;
+		}
+
 		&.segment-storyboard__part__next-line-label--opposite {
 			left: 100% !important;
 
@@ -349,56 +387,143 @@ $break-width: 35rem;
 		}
 	}
 
-	> .segment-storyboard__identifier {
+	> .segment-storyboard__part__quickloop-start {
+		border-left: 3px solid white;
+		border-right: 1px solid white;
+		display: block;
 		position: absolute;
+		top: 7px;
 		bottom: 0;
-		left: 0;
-		z-index: -1;
-		padding: 0 4px 0 12px;
-		font-size: 0.85rem;
-		box-sizing: border-box;
-		background-color: $part-identifier;
-		border-radius: 0 10px 10px 0;
-		color: $part-identifier-text;
+		left: -2px;
+		width: 6px;
+		z-index: 5;
+		background: $segment-background-color;
 	}
 
-	> .segment-storyboard__part-timer {
+	&--next > .segment-storyboard__part__quickloop-start {
+		border-color: $general-next-color;
+	}
+
+	> .segment-storyboard__part__quickloop-end {
+		border-left: 1px solid white;
+		border-right: 3px solid white;
+		display: block;
 		position: absolute;
+		top: 7px;
 		bottom: 0;
-		right: $part-left-padding;
-		text-align: right;
-		z-index: 2;
-		white-space: nowrap;
+		right: -4px;
+		width: 6px;
+		z-index: 4;
 		background: $segment-background-color;
-		color: #888;
-		font-size: 0.9em;
+	}
+	
+	> .segment-storyboard__part__bottom-left {
+		position: absolute;
+		bottom: 0;
+		left: 0;
+		right: 0;
+		display: flex;
+		flex-direction: row;
+		align-items: flex-end;
 
-		opacity: 1;
-		visibility: visible;
+		> .segment-storyboard__part__quickloop-background {
+			position: absolute;
+			z-index: -2;
+			min-height: 1em;
+			background-image: linear-gradient(to right, white 20%, rgba(255, 255, 255, 0) 0%);
+			background-position: center left;
+			background-size: 10px 2px;
+			background-repeat: repeat-x;
+			left: $part-left-padding;
+			right: $part-left-padding;
+			bottom: 1px;
+		}
 
-		> .rundown-view__part__icon.rundown-view__part__icon--auto-next {
-			top: -0.2em;
-			margin-right: 0.2em;
+		> .segment-storyboard__identifier {
+			z-index: -1;
+			padding: 0 4px 0 12px;
+			font-size: 0.85rem;
+			box-sizing: border-box;
+			background-color: $part-identifier;
+			border-radius: 0 10px 10px 0;
+			color: $part-identifier-text;
 		}
+	}
 
-		@keyframes segment-storyboard__part-timer--fadeIn {
-			0% {
-				opacity: 0;
-			}
-			100% {
-				opacity: 1;
-			}
+	.segment-storyboard__part__quickloop-start-icon, .segment-storyboard__part__quickloop-end-icon {
+		background: $segment-background-color;
+		padding: 0 0.3em;
+		white-space: nowrap;
+		color: white;
+		margin-bottom: -1px;
+	}
+
+	&--quickloop-start {
+		.segment-storyboard__part__quickloop-start-icon:first-child {
+			padding-left: 0.6em;
 		}
+	}
 
-		&--live {
-			font-size: 1.2em;
-			line-height: 1em;
-			font-weight: 500;
-			color: $liveline-timecode-color;
-			opacity: 1;
+	&--quickloop-end + &, &--quickloop-end + .segment-storyboard__part-list--squished-parts > &:last-child {
+		> .segment-storyboard__part__next-line {
+			margin-left: 3px;
+			z-index: 6;
+		}
+		> .segment-storyboard__part__next-line-label {
+			margin-left: 3px;
+		}
+	}
+
+	.segment-storyboard__part__quickloop-end-icon {
+		padding-right: 3px;
+	}
 
-			> .overtime {
-				color: $general-late-color;
+	> .segment-storyboard__part__bottom-right {
+		display: flex;
+		flex-direction: row;
+		margin-left: auto;
+		align-items: flex-end;
+		position: absolute;
+		bottom: 0;
+		right: 0;
+
+		> .segment-storyboard__part-timer {
+			margin-right: $part-left-padding;
+			padding-left: 3px;
+			text-align: right;
+			z-index: 2;
+			white-space: nowrap;
+			background: $segment-background-color;
+			color: #888;
+			font-size: 0.9em;
+	
+			opacity: 1;
+			visibility: visible;
+	
+			> .rundown-view__part__icon.rundown-view__part__icon--auto-next {
+				top: -0.2em;
+				margin-right: 0.2em;
+			}
+	
+			@keyframes segment-storyboard__part-timer--fadeIn {
+				0% {
+					opacity: 0;
+				}
+				100% {
+					opacity: 1;
+				}
+			}
+	
+			&--live {
+				font-size: 1.2em;
+				line-height: 1em;
+				font-weight: 500;
+				color: $liveline-timecode-color;
+				opacity: 1;
+	
+				> .overtime {
+					color: $general-late-color;
+				}
 			}
 		}
 	}
@@ -520,7 +645,7 @@ $break-width: 35rem;
 			filter: brightness(0.3);
 		}
 
-		> .segment-storyboard__identifier,
+		> .segment-storyboard__part__bottom-line > .segment-storyboard__identifier,
 		> .segment-storyboard__part__thumbnail,
 		> .segment-storyboard__part__secondary-pieces
 			> .segment-storyboard__part__output-group
@@ -529,14 +654,14 @@ $break-width: 35rem;
 			box-shadow: $squished-shadow;
 		}
 
-		> .segment-storyboard__part-timer {
+		> .segment-storyboard__part__bottom-line .segment-storyboard__part-timer {
 			visibility: hidden;
 			opacity: 0;
 		}
 
 		/* Only child */
 		&:first-child:last-child {
-			> .segment-storyboard__part-timer {
+			> .segment-storyboard__part__bottom-line .segment-storyboard__part-timer {
 				visibility: visible;
 				opacity: 1;
 			}
@@ -559,7 +684,7 @@ $break-width: 35rem;
 				transition: filter 0s;
 				z-index: 3;
 
-				> .segment-storyboard__part-timer {
+				> .segment-storyboard__part__bottom-line .segment-storyboard__part-timer {
 					visibility: visible;
 					opacity: 1;
 				}
diff --git a/meteor/client/ui/SegmentStoryboard/SegmentStoryboard.tsx b/packages/webui/src/client/ui/SegmentStoryboard/SegmentStoryboard.tsx
similarity index 96%
rename from meteor/client/ui/SegmentStoryboard/SegmentStoryboard.tsx
rename to packages/webui/src/client/ui/SegmentStoryboard/SegmentStoryboard.tsx
index 2bc4c96422..f0342ea8c7 100644
--- a/meteor/client/ui/SegmentStoryboard/SegmentStoryboard.tsx
+++ b/packages/webui/src/client/ui/SegmentStoryboard/SegmentStoryboard.tsx
@@ -11,7 +11,7 @@ import { contextMenuHoldToDisplayTime, useCombinedRefs } from '../../lib/lib'
 import { isPartPlayable } from '@sofie-automation/corelib/dist/dataModel/Part'
 import { useTranslation } from 'react-i18next'
 import { UIStateStorage } from '../../lib/UIStateStorage'
-import { literal, unprotectString } from '../../../lib/lib'
+import { literal, unprotectString } from '../../lib/tempLib'
 import { lockPointer, scrollToPart, unlockPointer } from '../../lib/viewPort'
 import { StoryboardPart } from './StoryboardPart'
 import classNames from 'classnames'
@@ -20,7 +20,7 @@ import RundownViewEventBus, {
 	GoToPartInstanceEvent,
 	HighlightEvent,
 	RundownViewEvents,
-} from '../../../lib/api/triggers/RundownViewEventBus'
+} from '@sofie-automation/meteor-lib/dist/triggers/RundownViewEventBus'
 import { getElementWidth } from '../../utils/dimensions'
 import { HOVER_TIMEOUT } from '../Shelf/DashboardPieceButton'
 import { Meteor } from 'meteor/meteor'
@@ -31,11 +31,12 @@ import { filterSecondarySourceLayers } from './StoryboardPartSecondaryPieces/Sto
 import { SegmentViewMode } from '../SegmentContainer/SegmentViewModes'
 import { ErrorBoundary } from '../../lib/ErrorBoundary'
 import { SwitchViewModeButton } from '../SegmentContainer/SwitchViewModeButton'
-import { UIStudio } from '../../../lib/api/studios'
+import { UIStudio } from '@sofie-automation/meteor-lib/dist/api/studios'
 import { PartId, SegmentId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import { RundownHoldState } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
 import { SegmentTimeAnchorTime } from '../RundownView/RundownTiming/SegmentTimeAnchorTime'
-import { logger } from '../../../lib/logging'
+import * as RundownResolver from '../../lib/RundownResolver'
+import { logger } from '../../lib/logging'
 
 interface IProps {
 	id: string
@@ -195,7 +196,7 @@ export const SegmentStoryboard = React.memo(
 			squishedPartsNum > 1 ? Math.max(4, (spaceLeft - PART_WIDTH) / (squishedPartsNum - 1)) : null
 
 		const playlistHasNextPart = !!props.playlist.nextPartInfo
-		const playlistIsLooping = props.playlist.loop
+		const playlistIsLooping = RundownResolver.isLoopRunning(props.playlist)
 
 		renderedParts.forEach((part, index) => {
 			const isLivePart = part.instance._id === props.playlist.currentPartInfo?.partInstanceId
@@ -216,6 +217,14 @@ export const SegmentStoryboard = React.memo(
 					isNextPart={isNextPart}
 					isLastPartInSegment={part.instance._id === lastValidPartId}
 					isLastSegment={props.isLastSegment}
+					isEndOfLoopingShow={RundownResolver.isEndOfLoopingShow(
+						props.playlist,
+						props.isLastSegment,
+						part.instance._id === lastValidPartId,
+						part.instance.part
+					)}
+					isQuickLoopStart={RundownResolver.isQuickLoopStart(part.partId, props.playlist)}
+					isQuickLoopEnd={RundownResolver.isQuickLoopEnd(part.partId, props.playlist)}
 					isPlaylistLooping={playlistIsLooping}
 					doesPlaylistHaveNextPart={playlistHasNextPart}
 					displayLiveLineCounter={props.displayLiveLineCounter}
@@ -612,7 +621,7 @@ export const SegmentStoryboard = React.memo(
 						props.parts.length > 0 &&
 						(!props.hasAlreadyPlayed || props.isNextSegment || props.isLiveSegment) && (
 							<SegmentDuration
-								segmentId={props.segment._id}
+								segment={props.segment}
 								parts={props.parts}
 								label={<span className="segment-timeline__duration__label">{t('Duration')}</span>}
 								fixed={props.fixedSegmentDuration}
@@ -676,7 +685,7 @@ export const SegmentStoryboard = React.memo(
 					>
 						<div
 							className={classNames('segment-storyboard__part-list', {
-								loading: !props.subscriptionsReady /*  */,
+								loading: !props.subscriptionsReady,
 							})}
 							style={!animateScrollLeft ? { transform: `translateX(-${scrollLeft}px)` } : undefined}
 						>
diff --git a/meteor/client/ui/SegmentStoryboard/SegmentStoryboardContainer.tsx b/packages/webui/src/client/ui/SegmentStoryboard/SegmentStoryboardContainer.tsx
similarity index 90%
rename from meteor/client/ui/SegmentStoryboard/SegmentStoryboardContainer.tsx
rename to packages/webui/src/client/ui/SegmentStoryboard/SegmentStoryboardContainer.tsx
index 7ce171cc48..3acd103493 100644
--- a/meteor/client/ui/SegmentStoryboard/SegmentStoryboardContainer.tsx
+++ b/packages/webui/src/client/ui/SegmentStoryboard/SegmentStoryboardContainer.tsx
@@ -1,5 +1,5 @@
-import React, { useCallback, useEffect, useRef, useState } from 'react'
-import { meteorSubscribe } from '../../../lib/api/pubsub'
+import { useCallback, useEffect, useRef, useState } from 'react'
+import { meteorSubscribe } from '../../lib/meteorApi'
 import { useSubscription, useTracker } from '../../lib/ReactMeteorData/ReactMeteorData'
 import {
 	// PartUi,
@@ -9,13 +9,14 @@ import {
 } from '../SegmentContainer/withResolvedSegment'
 import { SpeechSynthesiser } from '../../lib/speechSynthesis'
 import { SegmentStoryboard } from './SegmentStoryboard'
-import { unprotectString } from '../../../lib/lib'
-import { LIVELINE_HISTORY_SIZE as TIMELINE_LIVELINE_HISTORY_SIZE } from '../SegmentTimeline/SegmentTimelineContainer'
-import { PartInstances, Parts, Segments } from '../../collections'
+import { unprotectString } from '../../lib/tempLib'
+import { LIVELINE_HISTORY_SIZE as TIMELINE_LIVELINE_HISTORY_SIZE } from '../SegmentTimeline/Constants'
+import { Segments } from '../../collections'
 import { literal } from '@sofie-automation/shared-lib/dist/lib/lib'
 import { MongoFieldSpecifierOnes } from '@sofie-automation/corelib/dist/mongo'
-import { PartInstance } from '../../../lib/collections/PartInstances'
+import { PartInstance } from '@sofie-automation/meteor-lib/dist/collections/PartInstances'
 import { CorelibPubSub } from '@sofie-automation/corelib/dist/pubsub'
+import { UIPartInstances, UIParts } from '../Collections'
 
 export const LIVELINE_HISTORY_SIZE = TIMELINE_LIVELINE_HISTORY_SIZE
 
@@ -32,7 +33,7 @@ export const SegmentStoryboardContainer = withResolvedSegment<IProps>(function S
 }: IProps & ITrackedResolvedSegmentProps) {
 	const partIds = useTracker(
 		() =>
-			Parts.find(
+			UIParts.find(
 				{
 					segmentId,
 				},
@@ -49,7 +50,7 @@ export const SegmentStoryboardContainer = withResolvedSegment<IProps>(function S
 
 	const partInstanceIds = useTracker(
 		() =>
-			PartInstances.find(
+			UIPartInstances.find(
 				{
 					segmentId: segmentId,
 					reset: {
@@ -90,7 +91,7 @@ export const SegmentStoryboardContainer = withResolvedSegment<IProps>(function S
 				return false
 			}
 
-			const currentPartInstance = PartInstances.findOne(props.playlist.currentPartInfo.partInstanceId)
+			const currentPartInstance = UIPartInstances.findOne(props.playlist.currentPartInfo.partInstanceId)
 			if (!currentPartInstance) {
 				return false
 			}
@@ -107,7 +108,7 @@ export const SegmentStoryboardContainer = withResolvedSegment<IProps>(function S
 				return false
 			}
 
-			const partInstance = PartInstances.findOne(props.playlist.nextPartInfo.partInstanceId, {
+			const partInstance = UIPartInstances.findOne(props.playlist.nextPartInfo.partInstanceId, {
 				fields: literal<MongoFieldSpecifierOnes<PartInstance>>({
 					segmentId: 1,
 					//@ts-expect-error typescript doesnt like it
@@ -130,7 +131,7 @@ export const SegmentStoryboardContainer = withResolvedSegment<IProps>(function S
 				return false
 			}
 
-			const currentPartInstance = PartInstances.findOne(props.playlist.currentPartInfo.partInstanceId, {
+			const currentPartInstance = UIPartInstances.findOne(props.playlist.currentPartInfo.partInstanceId, {
 				fields: {
 					//@ts-expect-error deep property
 					'part.autoNext': 1,
@@ -227,7 +228,6 @@ export const SegmentStoryboardContainer = withResolvedSegment<IProps>(function S
 			lastValidPartIndex={props.lastValidPartIndex}
 			onHeaderNoteClick={props.onHeaderNoteClick}
 			onSwitchViewMode={props.onSwitchViewMode}
-			budgetDuration={props.budgetDuration}
 			showCountdownToSegment={props.showCountdownToSegment}
 			fixedSegmentDuration={props.fixedSegmentDuration}
 			subscriptionsReady={initialSubscriptionsReady}
diff --git a/meteor/client/ui/SegmentStoryboard/StoryboardPart.tsx b/packages/webui/src/client/ui/SegmentStoryboard/StoryboardPart.tsx
similarity index 70%
rename from meteor/client/ui/SegmentStoryboard/StoryboardPart.tsx
rename to packages/webui/src/client/ui/SegmentStoryboard/StoryboardPart.tsx
index a61ea65970..2ad560f50f 100644
--- a/meteor/client/ui/SegmentStoryboard/StoryboardPart.tsx
+++ b/packages/webui/src/client/ui/SegmentStoryboard/StoryboardPart.tsx
@@ -1,7 +1,7 @@
 import React, { useCallback, useEffect, useRef, useState } from 'react'
 import classNames from 'classnames'
 import { useTranslation } from 'react-i18next'
-import { PartExtended } from '../../../lib/Rundown'
+import { PartExtended } from '../../lib/RundownResolver'
 import { IOutputLayerUi, SegmentUi } from '../SegmentContainer/withResolvedSegment'
 import { StoryboardPartSecondaryPieces } from './StoryboardPartSecondaryPieces/StoryboardPartSecondaryPieces'
 import { StoryboardPartThumbnail } from './StoryboardPartThumbnail/StoryboardPartThumbnail'
@@ -9,17 +9,28 @@ import { ContextMenuTrigger } from '@jstarpl/react-contextmenu'
 import { contextMenuHoldToDisplayTime } from '../../lib/lib'
 import { getElementDocumentOffset } from '../../utils/positions'
 import { IContextMenuContext } from '../RundownView'
-import { literal } from '../../../lib/lib'
+import { literal } from '../../lib/tempLib'
 import { SegmentTimelinePartElementId } from '../SegmentTimeline/Parts/SegmentTimelinePart'
-import { CurrentPartRemaining } from '../RundownView/RundownTiming/CurrentPartRemaining'
+import { CurrentPartOrSegmentRemaining } from '../RundownView/RundownTiming/CurrentPartOrSegmentRemaining'
 import { getAllowSpeaking, getAllowVibrating } from '../../lib/localStorage'
-import RundownViewEventBus, { HighlightEvent, RundownViewEvents } from '../../../lib/api/triggers/RundownViewEventBus'
+import RundownViewEventBus, {
+	HighlightEvent,
+	RundownViewEvents,
+} from '@sofie-automation/meteor-lib/dist/triggers/RundownViewEventBus'
 import { Meteor } from 'meteor/meteor'
 import { StoryboardPartTransitions } from './StoryboardPartTransitions'
 import { PartDisplayDuration } from '../RundownView/RundownTiming/PartDuration'
 import { InvalidPartCover } from '../SegmentTimeline/Parts/InvalidPartCover'
 import { SegmentEnd } from '../../lib/ui/icons/segment'
 import { AutoNextStatus } from '../RundownView/RundownTiming/AutoNextStatus'
+import { RundownTimingContext, getPartInstanceTimingId } from '../../lib/rundownTiming'
+import {
+	TimingDataResolution,
+	TimingTickResolution,
+	WithTiming,
+	withTiming,
+} from '../RundownView/RundownTiming/withTiming'
+import { LoopingIcon } from '../../lib/ui/icons/looping'
 
 interface IProps {
 	className?: string
@@ -31,6 +42,9 @@ interface IProps {
 	isLastSegment?: boolean
 	isLastPartInSegment?: boolean
 	isPlaylistLooping?: boolean
+	isEndOfLoopingShow?: boolean
+	isQuickLoopStart: boolean
+	isQuickLoopEnd: boolean
 	doesPlaylistHaveNextPart?: boolean
 	inHold: boolean
 	currentPartWillAutonext: boolean
@@ -41,8 +55,18 @@ interface IProps {
 	onHoverOver?: () => void
 	onHoverOut?: () => void
 }
+export const StoryboardPart = withTiming<IProps, {}>((props: IProps) => {
+	return {
+		tickResolution: TimingTickResolution.Synced,
+		dataResolution: TimingDataResolution.High,
+		filter: (durations: RundownTimingContext) => {
+			durations = durations || {}
 
-export function StoryboardPart({
+			const timingId = getPartInstanceTimingId(props.part.instance)
+			return [(durations.partsInQuickLoop || {})[timingId]]
+		},
+	}
+})(function StoryboardPart({
 	className,
 	segment,
 	part,
@@ -51,16 +75,20 @@ export function StoryboardPart({
 	isLastPartInSegment,
 	isLastSegment,
 	isPlaylistLooping,
+	isEndOfLoopingShow,
+	isQuickLoopStart,
+	isQuickLoopEnd,
 	doesPlaylistHaveNextPart,
 	currentPartWillAutonext,
 	outputLayers,
 	subscriptionsReady,
 	displayLiveLineCounter,
 	style,
+	timingDurations,
 	onContextMenu,
 	onHoverOver,
 	onHoverOut,
-}: Readonly<IProps>): JSX.Element {
+}: Readonly<WithTiming<IProps>>): JSX.Element {
 	const { t } = useTranslation()
 	const [highlight, setHighlight] = useState(false)
 	const willBeAutoNextedInto = isNextPart ? currentPartWillAutonext : part.willProbablyAutoNext
@@ -112,6 +140,8 @@ export function StoryboardPart({
 
 	const isInvalid = part.instance.part.invalid
 	const isFloated = part.instance.part.floated
+	const isInsideQuickLoop = timingDurations.partsInQuickLoop?.[getPartInstanceTimingId(part.instance)] ?? false
+	const isOutsideActiveQuickLoop = !isInsideQuickLoop && isPlaylistLooping && !isNextPart
 
 	return (
 		<ContextMenuTrigger
@@ -125,6 +155,9 @@ export function StoryboardPart({
 						'segment-storyboard__part--next': isNextPart,
 						'segment-storyboard__part--live': isLivePart,
 						'segment-storyboard__part--invalid': part.instance.part.invalid,
+						'segment-storyboard__part--outside-quickloop': isOutsideActiveQuickLoop,
+						'segment-storyboard__part--quickloop-start': isQuickLoopStart,
+						'segment-storyboard__part--quickloop-end': isQuickLoopEnd,
 					},
 					className
 				),
@@ -142,7 +175,6 @@ export function StoryboardPart({
 			collect={getPartContext}
 		>
 			{isLivePart ? <div className="segment-storyboard__part__background"></div> : null}
-			<div className="segment-storyboard__identifier">{part.instance.part.identifier}</div>
 			{subscriptionsReady ? (
 				<>
 					<StoryboardPartThumbnail part={part} isLive={isLivePart} isNext={isNextPart} />
@@ -163,12 +195,14 @@ export function StoryboardPart({
 			) : null}
 			{isFloated ? <div className="segment-storyboard__part__floated-cover"></div> : null}
 			<div className="segment-storyboard__part__title">{part.instance.part.title}</div>
+			{isQuickLoopStart && <div className="segment-storyboard__part__quickloop-start" />}
 			<div
 				className={classNames('segment-storyboard__part__next-line', {
 					'segment-storyboard__part__next-line--autonext': willBeAutoNextedInto,
 					'segment-storyboard__part__next-line--invalid': part.instance.part.invalid,
 					'segment-storyboard__part__next-line--next': isNextPart,
 					'segment-storyboard__part__next-line--live': isLivePart,
+					'segment-storyboard__part__next-line--quickloop-start': isQuickLoopStart,
 				})}
 			></div>
 			<div
@@ -176,6 +210,7 @@ export function StoryboardPart({
 					'segment-storyboard__part__next-line-label--autonext': willBeAutoNextedInto,
 					'segment-storyboard__part__next-line-label--next': isNextPart,
 					'segment-storyboard__part__next-line-label--live': isLivePart,
+					'segment-storyboard__part__next-line-label--quickloop-start': isQuickLoopStart,
 				})}
 			>
 				{isLivePart ? t('On Air') : willBeAutoNextedInto ? t('Auto') : isNextPart ? t('Next') : null}
@@ -213,7 +248,7 @@ export function StoryboardPart({
 					</div>
 				</>
 			)}
-			{!isLastSegment && isLastPartInSegment && !part.instance.part.invalid && (
+			{!isLastSegment && isLastPartInSegment && !isEndOfLoopingShow && !part.instance.part.invalid && (
 				<div
 					className={classNames('segment-storyboard__part__segment-end', {
 						'segment-storyboard__part__segment-end--next': isLivePart && (!isLastSegment || doesPlaylistHaveNextPart),
@@ -224,7 +259,7 @@ export function StoryboardPart({
 					</div>
 				</div>
 			)}
-			{isLastSegment && (
+			{(isLastSegment || isEndOfLoopingShow) && (
 				<div
 					className={classNames('segment-storyboard__part__show-end', {
 						'segment-storyboard__part__show-end--loop': isPlaylistLooping,
@@ -232,26 +267,45 @@ export function StoryboardPart({
 				>
 					{(!isLivePart || !doesPlaylistHaveNextPart || isPlaylistLooping) && isLastPartInSegment && (
 						<div className="segment-storyboard__part__show-end__label">
-							{isPlaylistLooping ? t('Loops to top') : t('Show End')}
+							{isEndOfLoopingShow ? t('Loops to Start') : t('Show End')}
 						</div>
 					)}
 				</div>
 			)}
-			{isLivePart && displayLiveLineCounter ? (
-				<div className="segment-storyboard__part-timer segment-storyboard__part-timer--live">
-					<AutoNextStatus />
-					<CurrentPartRemaining
-						currentPartInstanceId={part.instance._id}
-						speaking={getAllowSpeaking()}
-						vibrating={getAllowVibrating()}
-						heavyClassName="overtime"
-					/>
-				</div>
-			) : displayLiveLineCounter ? (
-				<div className="segment-storyboard__part-timer">
-					<PartDisplayDuration part={part} />
-				</div>
-			) : null}
+			<div className="segment-storyboard__part__bottom-left">
+				{part.instance.part.identifier && (
+					<div className="segment-storyboard__identifier">{part.instance.part.identifier}</div>
+				)}
+				{isQuickLoopStart ? (
+					<div className="segment-storyboard__part__quickloop-start-icon">
+						<LoopingIcon />
+					</div>
+				) : null}
+				{isInsideQuickLoop && <div className="segment-storyboard__part__quickloop-background"></div>}
+			</div>
+			<div className="segment-storyboard__part__bottom-right">
+				{isQuickLoopEnd ? (
+					<div className="segment-storyboard__part__quickloop-end-icon">
+						<LoopingIcon />
+					</div>
+				) : null}
+				{isLivePart && displayLiveLineCounter ? (
+					<div className="segment-storyboard__part-timer segment-storyboard__part-timer--live">
+						<AutoNextStatus />
+						<CurrentPartOrSegmentRemaining
+							currentPartInstanceId={part.instance._id}
+							speaking={getAllowSpeaking()}
+							vibrating={getAllowVibrating()}
+							heavyClassName="overtime"
+						/>
+					</div>
+				) : displayLiveLineCounter ? (
+					<div className="segment-storyboard__part-timer">
+						<PartDisplayDuration part={part} />
+					</div>
+				) : null}
+			</div>
+			{isQuickLoopEnd && <div className="segment-storyboard__part__quickloop-end" />}
 		</ContextMenuTrigger>
 	)
-}
+})
diff --git a/meteor/client/ui/SegmentStoryboard/StoryboardPartSecondaryPieces/Renderers/DefaultRenderer.tsx b/packages/webui/src/client/ui/SegmentStoryboard/StoryboardPartSecondaryPieces/Renderers/DefaultRenderer.tsx
similarity index 88%
rename from meteor/client/ui/SegmentStoryboard/StoryboardPartSecondaryPieces/Renderers/DefaultRenderer.tsx
rename to packages/webui/src/client/ui/SegmentStoryboard/StoryboardPartSecondaryPieces/Renderers/DefaultRenderer.tsx
index f778d2104d..21670e4bb4 100644
--- a/meteor/client/ui/SegmentStoryboard/StoryboardPartSecondaryPieces/Renderers/DefaultRenderer.tsx
+++ b/packages/webui/src/client/ui/SegmentStoryboard/StoryboardPartSecondaryPieces/Renderers/DefaultRenderer.tsx
@@ -1,7 +1,6 @@
 import { ISourceLayer } from '@sofie-automation/blueprints-integration'
 import { PartId } from '@sofie-automation/corelib/dist/dataModel/Ids'
-import React from 'react'
-import { UIStudio } from '../../../../../lib/api/studios'
+import { UIStudio } from '@sofie-automation/meteor-lib/dist/api/studios'
 import { PieceUi } from '../../../SegmentContainer/withResolvedSegment'
 
 export interface IDefaultRendererProps {
diff --git a/meteor/client/ui/SegmentStoryboard/StoryboardPartSecondaryPieces/Renderers/GraphicsRenderer.tsx b/packages/webui/src/client/ui/SegmentStoryboard/StoryboardPartSecondaryPieces/Renderers/GraphicsRenderer.tsx
similarity index 98%
rename from meteor/client/ui/SegmentStoryboard/StoryboardPartSecondaryPieces/Renderers/GraphicsRenderer.tsx
rename to packages/webui/src/client/ui/SegmentStoryboard/StoryboardPartSecondaryPieces/Renderers/GraphicsRenderer.tsx
index 92478c629d..7b911b4875 100644
--- a/meteor/client/ui/SegmentStoryboard/StoryboardPartSecondaryPieces/Renderers/GraphicsRenderer.tsx
+++ b/packages/webui/src/client/ui/SegmentStoryboard/StoryboardPartSecondaryPieces/Renderers/GraphicsRenderer.tsx
@@ -1,5 +1,4 @@
 import { GraphicsContent, NoraContent } from '@sofie-automation/blueprints-integration'
-import React from 'react'
 import { L3rdFloatingInspector } from '../../../FloatingInspectors/L3rdFloatingInspector'
 import { PieceMultistepChevron } from '../../../SegmentContainer/PieceMultistepChevron'
 import { IDefaultRendererProps } from './DefaultRenderer'
diff --git a/meteor/client/ui/SegmentStoryboard/StoryboardPartSecondaryPieces/Renderers/ScriptRenderer.tsx b/packages/webui/src/client/ui/SegmentStoryboard/StoryboardPartSecondaryPieces/Renderers/ScriptRenderer.tsx
similarity index 97%
rename from meteor/client/ui/SegmentStoryboard/StoryboardPartSecondaryPieces/Renderers/ScriptRenderer.tsx
rename to packages/webui/src/client/ui/SegmentStoryboard/StoryboardPartSecondaryPieces/Renderers/ScriptRenderer.tsx
index 91445cfd65..45d0dfa866 100644
--- a/meteor/client/ui/SegmentStoryboard/StoryboardPartSecondaryPieces/Renderers/ScriptRenderer.tsx
+++ b/packages/webui/src/client/ui/SegmentStoryboard/StoryboardPartSecondaryPieces/Renderers/ScriptRenderer.tsx
@@ -1,4 +1,3 @@
-import React from 'react'
 import { MicFloatingInspector } from '../../../FloatingInspectors/MicFloatingInspector'
 import { ScriptContent } from '@sofie-automation/blueprints-integration'
 import { IDefaultRendererProps } from './DefaultRenderer'
diff --git a/meteor/client/ui/SegmentStoryboard/StoryboardPartSecondaryPieces/Renderers/SplitsRenderer.tsx b/packages/webui/src/client/ui/SegmentStoryboard/StoryboardPartSecondaryPieces/Renderers/SplitsRenderer.tsx
similarity index 97%
rename from meteor/client/ui/SegmentStoryboard/StoryboardPartSecondaryPieces/Renderers/SplitsRenderer.tsx
rename to packages/webui/src/client/ui/SegmentStoryboard/StoryboardPartSecondaryPieces/Renderers/SplitsRenderer.tsx
index 8902d9c6b6..371ff70fff 100644
--- a/meteor/client/ui/SegmentStoryboard/StoryboardPartSecondaryPieces/Renderers/SplitsRenderer.tsx
+++ b/packages/webui/src/client/ui/SegmentStoryboard/StoryboardPartSecondaryPieces/Renderers/SplitsRenderer.tsx
@@ -1,4 +1,3 @@
-import React from 'react'
 import { SplitsContent } from '@sofie-automation/blueprints-integration'
 import { IDefaultRendererProps } from './DefaultRenderer'
 import { SplitsFloatingInspector } from '../../../FloatingInspectors/SplitsFloatingInspector'
diff --git a/meteor/client/ui/SegmentStoryboard/StoryboardPartSecondaryPieces/Renderers/VTRenderer.tsx b/packages/webui/src/client/ui/SegmentStoryboard/StoryboardPartSecondaryPieces/Renderers/VTRenderer.tsx
similarity index 71%
rename from meteor/client/ui/SegmentStoryboard/StoryboardPartSecondaryPieces/Renderers/VTRenderer.tsx
rename to packages/webui/src/client/ui/SegmentStoryboard/StoryboardPartSecondaryPieces/Renderers/VTRenderer.tsx
index f21d010cf7..56fe3bdf24 100644
--- a/meteor/client/ui/SegmentStoryboard/StoryboardPartSecondaryPieces/Renderers/VTRenderer.tsx
+++ b/packages/webui/src/client/ui/SegmentStoryboard/StoryboardPartSecondaryPieces/Renderers/VTRenderer.tsx
@@ -1,10 +1,10 @@
-import React from 'react'
 import { VTContent } from '@sofie-automation/blueprints-integration'
 import { VTFloatingInspector } from '../../../FloatingInspectors/VTFloatingInspector'
 import { IDefaultRendererProps } from './DefaultRenderer'
-import { getNoticeLevelForPieceStatus } from '../../../../../lib/notifications/notifications'
+import { getNoticeLevelForPieceStatus } from '../../../../lib/notifications/notifications'
 import { PieceStatusCode } from '@sofie-automation/corelib/dist/dataModel/Piece'
 import { LoopingPieceIcon } from '../../../../lib/ui/icons/looping'
+import { useContentStatusForPieceInstance } from '../../../SegmentTimeline/withMediaObjectStatus'
 
 export function VTRenderer({
 	piece: pieceInstance,
@@ -13,7 +13,7 @@ export function VTRenderer({
 	studio,
 	typeClass,
 }: Readonly<IDefaultRendererProps>): JSX.Element {
-	const status = pieceInstance.contentStatus?.status
+	const contentStatus = useContentStatusForPieceInstance(pieceInstance.instance)
 
 	const vtContent = pieceInstance.instance.piece.content as VTContent
 
@@ -22,7 +22,7 @@ export function VTRenderer({
 	return (
 		<>
 			<VTFloatingInspector
-				status={status || PieceStatusCode.UNKNOWN}
+				status={contentStatus?.status || PieceStatusCode.UNKNOWN}
 				showMiniInspector={!!hovering}
 				timePosition={timePosition}
 				content={vtContent}
@@ -34,10 +34,10 @@ export function VTRenderer({
 				}}
 				typeClass={typeClass}
 				itemElement={null}
-				noticeMessages={pieceInstance.contentStatus?.messages || null}
-				noticeLevel={getNoticeLevelForPieceStatus(status)}
+				noticeMessages={contentStatus?.messages || null}
+				noticeLevel={getNoticeLevelForPieceStatus(contentStatus?.status)}
 				studio={studio}
-				previewUrl={pieceInstance.contentStatus?.previewUrl}
+				previewUrl={contentStatus?.previewUrl}
 			/>
 			{pieceInstance.instance.piece.name}
 			{pieceInstance.instance.piece.content?.loop && (
diff --git a/meteor/client/ui/SegmentStoryboard/StoryboardPartSecondaryPieces/StoryboardPartSecondaryPieces.scss b/packages/webui/src/client/ui/SegmentStoryboard/StoryboardPartSecondaryPieces/StoryboardPartSecondaryPieces.scss
similarity index 100%
rename from meteor/client/ui/SegmentStoryboard/StoryboardPartSecondaryPieces/StoryboardPartSecondaryPieces.scss
rename to packages/webui/src/client/ui/SegmentStoryboard/StoryboardPartSecondaryPieces/StoryboardPartSecondaryPieces.scss
diff --git a/meteor/client/ui/SegmentStoryboard/StoryboardPartSecondaryPieces/StoryboardPartSecondaryPieces.tsx b/packages/webui/src/client/ui/SegmentStoryboard/StoryboardPartSecondaryPieces/StoryboardPartSecondaryPieces.tsx
similarity index 95%
rename from meteor/client/ui/SegmentStoryboard/StoryboardPartSecondaryPieces/StoryboardPartSecondaryPieces.tsx
rename to packages/webui/src/client/ui/SegmentStoryboard/StoryboardPartSecondaryPieces/StoryboardPartSecondaryPieces.tsx
index 4aad8efb76..0405d6718f 100644
--- a/meteor/client/ui/SegmentStoryboard/StoryboardPartSecondaryPieces/StoryboardPartSecondaryPieces.tsx
+++ b/packages/webui/src/client/ui/SegmentStoryboard/StoryboardPartSecondaryPieces/StoryboardPartSecondaryPieces.tsx
@@ -1,6 +1,6 @@
 import { SourceLayerType } from '@sofie-automation/blueprints-integration'
 import React from 'react'
-import { ISourceLayerExtended, PartExtended } from '../../../../lib/Rundown'
+import { ISourceLayerExtended, PartExtended } from '../../../lib/RundownResolver'
 import { getShowHiddenSourceLayers } from '../../../lib/localStorage'
 import { IOutputLayerUi } from '../../SegmentContainer/withResolvedSegment'
 import { StoryboardSourceLayer } from './StoryboardSourceLayer'
diff --git a/meteor/client/ui/SegmentStoryboard/StoryboardPartSecondaryPieces/StoryboardSecondaryPiece.tsx b/packages/webui/src/client/ui/SegmentStoryboard/StoryboardPartSecondaryPieces/StoryboardSecondaryPiece.tsx
similarity index 92%
rename from meteor/client/ui/SegmentStoryboard/StoryboardPartSecondaryPieces/StoryboardSecondaryPiece.tsx
rename to packages/webui/src/client/ui/SegmentStoryboard/StoryboardPartSecondaryPieces/StoryboardSecondaryPiece.tsx
index b968127429..44eedb85c3 100644
--- a/meteor/client/ui/SegmentStoryboard/StoryboardPartSecondaryPieces/StoryboardSecondaryPiece.tsx
+++ b/packages/webui/src/client/ui/SegmentStoryboard/StoryboardPartSecondaryPieces/StoryboardSecondaryPiece.tsx
@@ -1,17 +1,16 @@
 import React, { useRef, useState } from 'react'
 import { RundownUtils } from '../../../lib/rundown'
 import { ISourceLayer, SourceLayerType } from '@sofie-automation/blueprints-integration'
-import { withMediaObjectStatus } from '../../SegmentTimeline/withMediaObjectStatus'
 import { PieceUi } from '../../SegmentContainer/withResolvedSegment'
 import { DefaultRenderer } from './Renderers/DefaultRenderer'
-import { assertNever } from '../../../../lib/lib'
+import { assertNever } from '../../../lib/tempLib'
 import { ScriptRenderer } from './Renderers/ScriptRenderer'
 import { getElementDocumentOffset } from '../../../utils/positions'
 import { getElementWidth } from '../../../utils/dimensions'
 import { GraphicsRenderer } from './Renderers/GraphicsRenderer'
 import { SplitsRenderer } from './Renderers/SplitsRenderer'
 import { PieceElement } from '../../SegmentContainer/PieceElement'
-import { UIStudio } from '../../../../lib/api/studios'
+import { UIStudio } from '@sofie-automation/meteor-lib/dist/api/studios'
 import { PartId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 
 interface IProps {
@@ -62,9 +61,7 @@ function renderPieceInside(
 
 type MousePagePosition = { pageX: number; pageY: number }
 
-export const StoryboardSecondaryPiece = withMediaObjectStatus<IProps, {}>()(function StoryboardSecondaryPiece(
-	props: IProps
-) {
+export function StoryboardSecondaryPiece(props: IProps): JSX.Element {
 	const {
 		piece,
 		partId,
@@ -75,6 +72,7 @@ export const StoryboardSecondaryPiece = withMediaObjectStatus<IProps, {}>()(func
 		onClick,
 		onDoubleClick,
 	} = props
+
 	const [highlight] = useState(false)
 	const element = useRef<HTMLDivElement>(null)
 	const [hovering, setHovering] = useState<MousePagePosition | null>(null)
@@ -126,4 +124,4 @@ export const StoryboardSecondaryPiece = withMediaObjectStatus<IProps, {}>()(func
 			{renderPieceInside(props, elementOffset, hovering, typeClass)}
 		</PieceElement>
 	)
-})
+}
diff --git a/meteor/client/ui/SegmentStoryboard/StoryboardPartSecondaryPieces/StoryboardSourceLayer.tsx b/packages/webui/src/client/ui/SegmentStoryboard/StoryboardPartSecondaryPieces/StoryboardSourceLayer.tsx
similarity index 98%
rename from meteor/client/ui/SegmentStoryboard/StoryboardPartSecondaryPieces/StoryboardSourceLayer.tsx
rename to packages/webui/src/client/ui/SegmentStoryboard/StoryboardPartSecondaryPieces/StoryboardSourceLayer.tsx
index 951026b3e6..e7af0b1910 100644
--- a/meteor/client/ui/SegmentStoryboard/StoryboardPartSecondaryPieces/StoryboardSourceLayer.tsx
+++ b/packages/webui/src/client/ui/SegmentStoryboard/StoryboardPartSecondaryPieces/StoryboardSourceLayer.tsx
@@ -2,10 +2,10 @@ import React, { useEffect, useMemo, useRef, useState } from 'react'
 import classNames from 'classnames'
 // @ts-expect-error No types available
 import * as VelocityReact from 'velocity-react'
-import { ISourceLayerExtended, PartExtended, PieceExtended } from '../../../../lib/Rundown'
+import { ISourceLayerExtended, PartExtended, PieceExtended } from '../../../lib/RundownResolver'
 import StudioContext from '../../RundownView/StudioContext'
 import { StoryboardSecondaryPiece } from './StoryboardSecondaryPiece'
-import { getCurrentTime } from '../../../../lib/lib'
+import { getCurrentTime } from '../../../lib/systemTime'
 import { useInvalidateTimeout } from '../../../lib/lib'
 import { Meteor } from 'meteor/meteor'
 import { HOVER_TIMEOUT } from '../../Shelf/DashboardPieceButton'
diff --git a/meteor/client/ui/SegmentStoryboard/StoryboardPartThumbnail/Renderers/CameraThumbnailRenderer.tsx b/packages/webui/src/client/ui/SegmentStoryboard/StoryboardPartThumbnail/Renderers/CameraThumbnailRenderer.tsx
similarity index 94%
rename from meteor/client/ui/SegmentStoryboard/StoryboardPartThumbnail/Renderers/CameraThumbnailRenderer.tsx
rename to packages/webui/src/client/ui/SegmentStoryboard/StoryboardPartThumbnail/Renderers/CameraThumbnailRenderer.tsx
index a4d038da4c..e07dd91076 100644
--- a/meteor/client/ui/SegmentStoryboard/StoryboardPartThumbnail/Renderers/CameraThumbnailRenderer.tsx
+++ b/packages/webui/src/client/ui/SegmentStoryboard/StoryboardPartThumbnail/Renderers/CameraThumbnailRenderer.tsx
@@ -1,4 +1,3 @@
-import React from 'react'
 import { getSizeClassForLabel } from '../../utils/getLabelClass'
 import { IProps } from './ThumbnailRendererFactory'
 
diff --git a/meteor/client/ui/SegmentStoryboard/StoryboardPartThumbnail/Renderers/DefaultThumbnailRenderer.tsx b/packages/webui/src/client/ui/SegmentStoryboard/StoryboardPartThumbnail/Renderers/DefaultThumbnailRenderer.tsx
similarity index 88%
rename from meteor/client/ui/SegmentStoryboard/StoryboardPartThumbnail/Renderers/DefaultThumbnailRenderer.tsx
rename to packages/webui/src/client/ui/SegmentStoryboard/StoryboardPartThumbnail/Renderers/DefaultThumbnailRenderer.tsx
index e01ccb8150..928b202566 100644
--- a/meteor/client/ui/SegmentStoryboard/StoryboardPartThumbnail/Renderers/DefaultThumbnailRenderer.tsx
+++ b/packages/webui/src/client/ui/SegmentStoryboard/StoryboardPartThumbnail/Renderers/DefaultThumbnailRenderer.tsx
@@ -1,4 +1,3 @@
-import React from 'react'
 import { IProps } from './ThumbnailRendererFactory'
 
 export function DefaultThumbnailRenderer({ pieceInstance }: Readonly<IProps>): JSX.Element {
diff --git a/meteor/client/ui/SegmentStoryboard/StoryboardPartThumbnail/Renderers/GraphicsThumbnailRenderer.tsx b/packages/webui/src/client/ui/SegmentStoryboard/StoryboardPartThumbnail/Renderers/GraphicsThumbnailRenderer.tsx
similarity index 98%
rename from meteor/client/ui/SegmentStoryboard/StoryboardPartThumbnail/Renderers/GraphicsThumbnailRenderer.tsx
rename to packages/webui/src/client/ui/SegmentStoryboard/StoryboardPartThumbnail/Renderers/GraphicsThumbnailRenderer.tsx
index 19cf3eb408..5f2727ab93 100644
--- a/meteor/client/ui/SegmentStoryboard/StoryboardPartThumbnail/Renderers/GraphicsThumbnailRenderer.tsx
+++ b/packages/webui/src/client/ui/SegmentStoryboard/StoryboardPartThumbnail/Renderers/GraphicsThumbnailRenderer.tsx
@@ -1,5 +1,4 @@
 import { GraphicsContent, NoraContent } from '@sofie-automation/blueprints-integration'
-import React from 'react'
 import { RundownUtils } from '../../../../lib/rundown'
 import { L3rdFloatingInspector } from '../../../FloatingInspectors/L3rdFloatingInspector'
 import { PieceMultistepChevron } from '../../../SegmentContainer/PieceMultistepChevron'
diff --git a/meteor/client/ui/SegmentStoryboard/StoryboardPartThumbnail/Renderers/LocalThumbnailRenderer.tsx b/packages/webui/src/client/ui/SegmentStoryboard/StoryboardPartThumbnail/Renderers/LocalThumbnailRenderer.tsx
similarity index 96%
rename from meteor/client/ui/SegmentStoryboard/StoryboardPartThumbnail/Renderers/LocalThumbnailRenderer.tsx
rename to packages/webui/src/client/ui/SegmentStoryboard/StoryboardPartThumbnail/Renderers/LocalThumbnailRenderer.tsx
index 23e7828ebe..5d024d2f7e 100644
--- a/meteor/client/ui/SegmentStoryboard/StoryboardPartThumbnail/Renderers/LocalThumbnailRenderer.tsx
+++ b/packages/webui/src/client/ui/SegmentStoryboard/StoryboardPartThumbnail/Renderers/LocalThumbnailRenderer.tsx
@@ -1,4 +1,3 @@
-import React from 'react'
 import { EvsContent } from '@sofie-automation/blueprints-integration'
 import { IProps } from './ThumbnailRendererFactory'
 import { getSizeClassForLabel } from '../../utils/getLabelClass'
diff --git a/meteor/client/ui/SegmentStoryboard/StoryboardPartThumbnail/Renderers/SplitsThumbnailRenderer.tsx b/packages/webui/src/client/ui/SegmentStoryboard/StoryboardPartThumbnail/Renderers/SplitsThumbnailRenderer.tsx
similarity index 97%
rename from meteor/client/ui/SegmentStoryboard/StoryboardPartThumbnail/Renderers/SplitsThumbnailRenderer.tsx
rename to packages/webui/src/client/ui/SegmentStoryboard/StoryboardPartThumbnail/Renderers/SplitsThumbnailRenderer.tsx
index dad24db64f..c9b7cc6ddf 100644
--- a/meteor/client/ui/SegmentStoryboard/StoryboardPartThumbnail/Renderers/SplitsThumbnailRenderer.tsx
+++ b/packages/webui/src/client/ui/SegmentStoryboard/StoryboardPartThumbnail/Renderers/SplitsThumbnailRenderer.tsx
@@ -1,4 +1,3 @@
-import React from 'react'
 import { SplitsContent } from '@sofie-automation/blueprints-integration'
 import { IProps } from './ThumbnailRendererFactory'
 import { RundownUtils } from '../../../../lib/rundown'
diff --git a/meteor/client/ui/SegmentStoryboard/StoryboardPartThumbnail/Renderers/ThumbnailRendererFactory.ts b/packages/webui/src/client/ui/SegmentStoryboard/StoryboardPartThumbnail/Renderers/ThumbnailRendererFactory.tsx
similarity index 72%
rename from meteor/client/ui/SegmentStoryboard/StoryboardPartThumbnail/Renderers/ThumbnailRendererFactory.ts
rename to packages/webui/src/client/ui/SegmentStoryboard/StoryboardPartThumbnail/Renderers/ThumbnailRendererFactory.tsx
index 129bedf49b..0fd0fb14ae 100644
--- a/meteor/client/ui/SegmentStoryboard/StoryboardPartThumbnail/Renderers/ThumbnailRendererFactory.ts
+++ b/packages/webui/src/client/ui/SegmentStoryboard/StoryboardPartThumbnail/Renderers/ThumbnailRendererFactory.tsx
@@ -1,7 +1,8 @@
+import React from 'react'
 import { ISourceLayer, SourceLayerType } from '@sofie-automation/blueprints-integration'
 import { PartId, PartInstanceId } from '@sofie-automation/corelib/dist/dataModel/Ids'
-import { UIStudio } from '../../../../../lib/api/studios'
-import { assertNever } from '../../../../../lib/lib'
+import { UIStudio } from '@sofie-automation/meteor-lib/dist/api/studios'
+import { assertNever } from '../../../../lib/tempLib'
 import { OffsetPosition } from '../../../../utils/positions'
 import { PieceUi } from '../../../SegmentContainer/withResolvedSegment'
 import { CameraThumbnailRenderer } from './CameraThumbnailRenderer'
@@ -27,31 +28,32 @@ export interface IProps {
 	isNext: boolean
 }
 
-export default function renderThumbnail(props: Readonly<IProps>): JSX.Element {
+export const ThumbnailRenderer = React.memo(function ThumbnailRenderer(props: Readonly<IProps>): JSX.Element {
 	const type = props.layer?.type
+
 	switch (type) {
 		case SourceLayerType.VT:
 		case SourceLayerType.LIVE_SPEAK:
-			return VTThumbnailRenderer(props)
+			return <VTThumbnailRenderer {...props} />
 		case SourceLayerType.CAMERA:
 		case SourceLayerType.REMOTE:
-			return CameraThumbnailRenderer(props)
+			return <CameraThumbnailRenderer {...props} />
 		case SourceLayerType.SPLITS:
-			return SplitsThumbnailRenderer(props)
+			return <SplitsThumbnailRenderer {...props} />
 		case SourceLayerType.GRAPHICS:
 		case SourceLayerType.LOWER_THIRD:
 		case SourceLayerType.STUDIO_SCREEN:
-			return GraphicsThumbnailRenderer(props)
+			return <GraphicsThumbnailRenderer {...props} />
 		case SourceLayerType.LOCAL:
-			return LocalThumbnailRenderer(props)
+			return <LocalThumbnailRenderer {...props} />
 		case SourceLayerType.AUDIO:
 		case SourceLayerType.SCRIPT:
 		case SourceLayerType.TRANSITION:
 		case SourceLayerType.UNKNOWN:
 		case undefined:
-			return DefaultThumbnailRenderer(props)
+			return <DefaultThumbnailRenderer {...props} />
 		default:
 			assertNever(type)
-			return DefaultThumbnailRenderer(props)
+			return <DefaultThumbnailRenderer {...props} />
 	}
-}
+})
diff --git a/meteor/client/ui/SegmentStoryboard/StoryboardPartThumbnail/Renderers/VTThumbnailRenderer.tsx b/packages/webui/src/client/ui/SegmentStoryboard/StoryboardPartThumbnail/Renderers/VTThumbnailRenderer.tsx
similarity index 84%
rename from meteor/client/ui/SegmentStoryboard/StoryboardPartThumbnail/Renderers/VTThumbnailRenderer.tsx
rename to packages/webui/src/client/ui/SegmentStoryboard/StoryboardPartThumbnail/Renderers/VTThumbnailRenderer.tsx
index 6c3a1c1bc5..58e46c98b6 100644
--- a/meteor/client/ui/SegmentStoryboard/StoryboardPartThumbnail/Renderers/VTThumbnailRenderer.tsx
+++ b/packages/webui/src/client/ui/SegmentStoryboard/StoryboardPartThumbnail/Renderers/VTThumbnailRenderer.tsx
@@ -1,17 +1,17 @@
-import React from 'react'
 import classNames from 'classnames'
 import { VTContent } from '@sofie-automation/blueprints-integration'
 import { VTFloatingInspector } from '../../../FloatingInspectors/VTFloatingInspector'
-import { getNoticeLevelForPieceStatus } from '../../../../../lib/notifications/notifications'
+import { getNoticeLevelForPieceStatus } from '../../../../lib/notifications/notifications'
 import { RundownUtils } from '../../../../lib/rundown'
 import { IProps } from './ThumbnailRendererFactory'
 import { RundownTimingConsumer } from '../../../RundownView/RundownTiming/RundownTimingConsumer'
-import { unprotectString } from '../../../../../lib/lib'
+import { unprotectString } from '../../../../lib/tempLib'
 import { FreezeFrameIcon } from '../../../../lib/ui/icons/freezeFrame'
 import { PieceStatusIcon } from '../../../../lib/ui/PieceStatusIcon'
 import { PieceStatusCode } from '@sofie-automation/corelib/dist/dataModel/Piece'
 import { FREEZE_FRAME_FLASH } from '../../../SegmentContainer/withResolvedSegment'
 import { LoopingPieceIcon } from '../../../../lib/ui/icons/looping'
+import { useContentStatusForPieceInstance } from '../../../SegmentTimeline/withMediaObjectStatus'
 
 export function VTThumbnailRenderer({
 	partId,
@@ -26,19 +26,19 @@ export function VTThumbnailRenderer({
 	layer,
 	height,
 }: Readonly<IProps>): JSX.Element {
-	const status = pieceInstance.contentStatus?.status
+	const contentStatus = useContentStatusForPieceInstance(pieceInstance.instance)
 
 	const vtContent = pieceInstance.instance.piece.content as VTContent
 
-	const previewUrl: string | undefined = pieceInstance.contentStatus?.previewUrl
-	const thumbnailUrl: string | undefined = pieceInstance.contentStatus?.thumbnailUrl
+	const previewUrl: string | undefined = contentStatus?.previewUrl
+	const thumbnailUrl: string | undefined = contentStatus?.thumbnailUrl
 
-	const noticeLevel = getNoticeLevelForPieceStatus(status)
+	const noticeLevel = getNoticeLevelForPieceStatus(contentStatus?.status)
 
 	return (
 		<>
 			<VTFloatingInspector
-				status={status ?? PieceStatusCode.UNKNOWN}
+				status={contentStatus?.status ?? PieceStatusCode.UNKNOWN}
 				showMiniInspector={hovering}
 				timePosition={hoverScrubTimePosition}
 				content={vtContent}
@@ -51,10 +51,10 @@ export function VTThumbnailRenderer({
 				}}
 				typeClass={layer && RundownUtils.getSourceLayerClassName(layer.type)}
 				itemElement={null}
-				noticeMessages={pieceInstance.contentStatus?.messages ?? null}
+				noticeMessages={contentStatus?.messages ?? null}
 				noticeLevel={noticeLevel}
 				studio={studio}
-				previewUrl={pieceInstance.contentStatus?.previewUrl}
+				previewUrl={contentStatus?.previewUrl}
 			/>
 			<RundownTimingConsumer
 				filter={(timingContext) => ({
diff --git a/meteor/client/ui/SegmentStoryboard/StoryboardPartThumbnail/StoryboardPartThumbnail.scss b/packages/webui/src/client/ui/SegmentStoryboard/StoryboardPartThumbnail/StoryboardPartThumbnail.scss
similarity index 100%
rename from meteor/client/ui/SegmentStoryboard/StoryboardPartThumbnail/StoryboardPartThumbnail.scss
rename to packages/webui/src/client/ui/SegmentStoryboard/StoryboardPartThumbnail/StoryboardPartThumbnail.scss
diff --git a/meteor/client/ui/SegmentStoryboard/StoryboardPartThumbnail/StoryboardPartThumbnail.tsx b/packages/webui/src/client/ui/SegmentStoryboard/StoryboardPartThumbnail/StoryboardPartThumbnail.tsx
similarity index 61%
rename from meteor/client/ui/SegmentStoryboard/StoryboardPartThumbnail/StoryboardPartThumbnail.tsx
rename to packages/webui/src/client/ui/SegmentStoryboard/StoryboardPartThumbnail/StoryboardPartThumbnail.tsx
index 177ba175e6..cf3cacbac5 100644
--- a/meteor/client/ui/SegmentStoryboard/StoryboardPartThumbnail/StoryboardPartThumbnail.tsx
+++ b/packages/webui/src/client/ui/SegmentStoryboard/StoryboardPartThumbnail/StoryboardPartThumbnail.tsx
@@ -1,7 +1,7 @@
 import { SourceLayerType } from '@sofie-automation/blueprints-integration'
 import classNames from 'classnames'
-import React, { useEffect, useState } from 'react'
-import { PartExtended, PieceExtended } from '../../../../lib/Rundown'
+import React, { useMemo, useState } from 'react'
+import { PartExtended, PieceExtended } from '../../../lib/RundownResolver'
 import { findPieceExtendedToShowFromOrderedResolvedInstances } from '../../PieceIcons/utils'
 import StudioContext from '../../RundownView/StudioContext'
 import { StoryboardPartThumbnailInner } from './StoryboardPartThumbnailInner'
@@ -21,7 +21,7 @@ const supportedSourceLayerTypes = new Set(
 
 function findMainPiece(pieces: PieceExtended[]) {
 	return findPieceExtendedToShowFromOrderedResolvedInstances(
-		pieces.filter((piece) => piece.outputLayer?.isPGM),
+		pieces.filter((piece) => piece.outputLayer?.isPGM && piece.sourceLayer?.onPresenterScreen),
 		supportedSourceLayerTypes
 	)
 }
@@ -31,30 +31,27 @@ export const StoryboardPartThumbnail = React.memo(function StoryboardPartThumbna
 	isLive,
 	isNext,
 }: Readonly<IProps>) {
-	const [mainPiece, setMainPiece] = useState<PieceExtended | undefined>(findMainPiece(part.pieces))
+	const mainPiece = useMemo<PieceExtended | undefined>(() => findMainPiece(part.pieces), [part.pieces])
 	const [highlight] = useState(false)
 
-	useEffect(() => {
-		const newMainPiece = findMainPiece(part.pieces)
-		setMainPiece(newMainPiece)
-	}, [part.pieces])
-
 	return mainPiece ? (
 		<StudioContext.Consumer>
-			{(studio) => (
-				<StoryboardPartThumbnailInner
-					piece={mainPiece}
-					isLive={isLive}
-					isNext={isNext}
-					layer={mainPiece?.sourceLayer}
-					studio={studio}
-					partId={part.partId}
-					partInstanceId={part.instance._id}
-					highlight={highlight}
-					partAutoNext={part.instance.part.autoNext ?? false}
-					partPlannedStoppedPlayback={part.instance.timings?.plannedStoppedPlayback}
-				/>
-			)}
+			{(studio) =>
+				studio ? (
+					<StoryboardPartThumbnailInner
+						piece={mainPiece}
+						isLive={isLive}
+						isNext={isNext}
+						layer={mainPiece?.sourceLayer}
+						studio={studio}
+						partId={part.partId}
+						partInstanceId={part.instance._id}
+						highlight={highlight}
+						partAutoNext={part.instance.part.autoNext ?? false}
+						partPlannedStoppedPlayback={part.instance.timings?.plannedStoppedPlayback}
+					/>
+				) : null
+			}
 		</StudioContext.Consumer>
 	) : (
 		<div
diff --git a/packages/webui/src/client/ui/SegmentStoryboard/StoryboardPartThumbnail/StoryboardPartThumbnailInner.tsx b/packages/webui/src/client/ui/SegmentStoryboard/StoryboardPartThumbnail/StoryboardPartThumbnailInner.tsx
new file mode 100644
index 0000000000..2f313f9735
--- /dev/null
+++ b/packages/webui/src/client/ui/SegmentStoryboard/StoryboardPartThumbnail/StoryboardPartThumbnailInner.tsx
@@ -0,0 +1,107 @@
+import React, { useRef, useState } from 'react'
+import { ISourceLayer } from '@sofie-automation/blueprints-integration'
+import { PieceExtended } from '../../../lib/RundownResolver'
+import { getElementDocumentOffset, OffsetPosition } from '../../../utils/positions'
+import { getElementHeight, getElementWidth } from '../../../utils/dimensions'
+import { ThumbnailRenderer } from './Renderers/ThumbnailRendererFactory'
+import { PieceElement } from '../../SegmentContainer/PieceElement'
+import { UIStudio } from '@sofie-automation/meteor-lib/dist/api/studios'
+import { PartId, PartInstanceId } from '@sofie-automation/corelib/dist/dataModel/Ids'
+
+interface IProps {
+	partId: PartId
+	partInstanceId: PartInstanceId
+	partAutoNext: boolean
+	partPlannedStoppedPlayback: number | undefined
+	layer: ISourceLayer | undefined
+	piece: PieceExtended
+	studio: UIStudio
+	isLive: boolean
+	isNext: boolean
+	highlight?: boolean
+}
+
+export function StoryboardPartThumbnailInner({
+	piece,
+	layer,
+	partId,
+	partInstanceId,
+	studio,
+	highlight,
+	partAutoNext,
+	partPlannedStoppedPlayback,
+	isLive,
+	isNext,
+}: IProps): JSX.Element {
+	const [hover, setHover] = useState(false)
+	const [origin, setOrigin] = useState<OffsetPosition>({ left: 0, top: 0 })
+	const [width, setWidth] = useState(0)
+	const [height, setHeight] = useState(0)
+	const [mousePosition, setMousePosition] = useState(0)
+	const thumbnailEl = useRef<HTMLDivElement>(null)
+
+	const onPointerEnter = (e: React.PointerEvent<HTMLDivElement>) => {
+		if (e.pointerType !== 'mouse') {
+			return
+		}
+		setHover(true)
+
+		const newOffset = thumbnailEl.current && getElementDocumentOffset(thumbnailEl.current)
+		if (newOffset !== null) {
+			setOrigin(newOffset)
+		}
+		const newWidth = thumbnailEl.current && getElementWidth(thumbnailEl.current)
+		if (newWidth !== null) {
+			setWidth(newWidth)
+		}
+		const newHeight = thumbnailEl.current && getElementHeight(thumbnailEl.current)
+		if (newHeight !== null) {
+			setHeight(newHeight)
+		}
+	}
+
+	const onPointerLeave = (e: React.PointerEvent<HTMLDivElement>) => {
+		if (e.pointerType !== 'mouse') {
+			return
+		}
+		setHover(false)
+	}
+
+	const onPointerMove = (e: React.PointerEvent<HTMLDivElement>) => {
+		if (e.pointerType !== 'mouse') {
+			return
+		}
+		const newMousePosition = Math.max(0, Math.min(1, (e.pageX - origin.left - 5) / (width - 10)))
+		setMousePosition(newMousePosition)
+	}
+
+	return (
+		<PieceElement
+			className="segment-storyboard__part__thumbnail"
+			layer={layer}
+			partId={partId}
+			piece={piece}
+			highlight={highlight}
+			onPointerEnter={onPointerEnter}
+			onPointerLeave={onPointerLeave}
+			onPointerMove={onPointerMove}
+			ref={thumbnailEl}
+		>
+			<ThumbnailRenderer
+				partId={partId}
+				partInstanceId={partInstanceId}
+				partAutoNext={partAutoNext}
+				partPlannedStoppedPlayback={partPlannedStoppedPlayback}
+				hoverScrubTimePosition={mousePosition * (piece.instance.piece.content.sourceDuration || 0)}
+				hovering={hover}
+				layer={layer}
+				height={height}
+				originPosition={origin}
+				pieceInstance={piece}
+				studio={studio}
+				isLive={isLive}
+				isNext={isNext}
+			/>
+		</PieceElement>
+	)
+}
diff --git a/meteor/client/ui/SegmentStoryboard/StoryboardPartTransitions.tsx b/packages/webui/src/client/ui/SegmentStoryboard/StoryboardPartTransitions.tsx
similarity index 93%
rename from meteor/client/ui/SegmentStoryboard/StoryboardPartTransitions.tsx
rename to packages/webui/src/client/ui/SegmentStoryboard/StoryboardPartTransitions.tsx
index 2a9d5310a8..53cb25f6bd 100644
--- a/meteor/client/ui/SegmentStoryboard/StoryboardPartTransitions.tsx
+++ b/packages/webui/src/client/ui/SegmentStoryboard/StoryboardPartTransitions.tsx
@@ -1,6 +1,6 @@
 import React from 'react'
 import { SourceLayerType } from '@sofie-automation/blueprints-integration'
-import { ISourceLayerExtended, PartExtended } from '../../../lib/Rundown'
+import { ISourceLayerExtended, PartExtended } from '../../lib/RundownResolver'
 import { IOutputLayerUi } from '../SegmentContainer/withResolvedSegment'
 import { StoryboardSourceLayer } from './StoryboardPartSecondaryPieces/StoryboardSourceLayer'
 
diff --git a/meteor/client/ui/SegmentStoryboard/utils/getLabelClass.ts b/packages/webui/src/client/ui/SegmentStoryboard/utils/getLabelClass.ts
similarity index 100%
rename from meteor/client/ui/SegmentStoryboard/utils/getLabelClass.ts
rename to packages/webui/src/client/ui/SegmentStoryboard/utils/getLabelClass.ts
diff --git a/meteor/client/ui/SegmentTimeline/BreakSegment.tsx b/packages/webui/src/client/ui/SegmentTimeline/BreakSegment.tsx
similarity index 100%
rename from meteor/client/ui/SegmentTimeline/BreakSegment.tsx
rename to packages/webui/src/client/ui/SegmentTimeline/BreakSegment.tsx
diff --git a/packages/webui/src/client/ui/SegmentTimeline/Constants.tsx b/packages/webui/src/client/ui/SegmentTimeline/Constants.tsx
new file mode 100644
index 0000000000..95ec0b00b7
--- /dev/null
+++ b/packages/webui/src/client/ui/SegmentTimeline/Constants.tsx
@@ -0,0 +1,16 @@
+import { Settings } from '../../lib/Settings'
+
+export const MAGIC_TIME_SCALE_FACTOR = 0.03
+
+export const SIMULATED_PLAYBACK_SOFT_MARGIN = 0
+export const SIMULATED_PLAYBACK_HARD_MARGIN = 3500
+
+export const LIVE_LINE_TIME_PADDING = 150
+export const LIVELINE_HISTORY_SIZE = 100
+export const TIMELINE_RIGHT_PADDING =
+	// TODO: This is only temporary, for hands-on tweaking -- Jan Starzak, 2021-06-01
+	parseInt(localStorage.getItem('EXP_timeline_right_padding')!) || LIVELINE_HISTORY_SIZE + LIVE_LINE_TIME_PADDING
+export const FALLBACK_ZOOM_FACTOR = MAGIC_TIME_SCALE_FACTOR
+
+export const MINIMUM_ZOOM_FACTOR = // TODO: This is only temporary, for hands-on tweaking -- Jan Starzak, 2021-06-01
+	parseInt(localStorage.getItem('EXP_timeline_min_time_scale')!) || MAGIC_TIME_SCALE_FACTOR * Settings.defaultTimeScale
diff --git a/meteor/client/ui/SegmentTimeline/Parts/FlattenedSourceLayers.tsx b/packages/webui/src/client/ui/SegmentTimeline/Parts/FlattenedSourceLayers.tsx
similarity index 95%
rename from meteor/client/ui/SegmentTimeline/Parts/FlattenedSourceLayers.tsx
rename to packages/webui/src/client/ui/SegmentTimeline/Parts/FlattenedSourceLayers.tsx
index c2c3b8ca3a..c2b1a78745 100644
--- a/meteor/client/ui/SegmentTimeline/Parts/FlattenedSourceLayers.tsx
+++ b/packages/webui/src/client/ui/SegmentTimeline/Parts/FlattenedSourceLayers.tsx
@@ -1,11 +1,10 @@
-import React from 'react'
 import * as _ from 'underscore'
-import { unprotectString } from '../../../../lib/lib'
+import { unprotectString } from '../../../lib/tempLib'
 import { ISourceLayerUi } from '../SegmentTimelineContainer'
 import { ContextMenuTrigger } from '@jstarpl/react-contextmenu'
 import { SourceLayerItemContainer } from '../SourceLayerItemContainer'
 import { ISourceLayerPropsBase, useMouseContext } from './SourceLayer'
-import { ISourceLayerExtended } from '../../../../lib/Rundown'
+import { ISourceLayerExtended } from '../../../lib/RundownResolver'
 
 interface IFlattenedSourceLayerProps extends ISourceLayerPropsBase {
 	layers: ISourceLayerUi[]
diff --git a/meteor/client/ui/SegmentTimeline/Parts/InvalidPartCover.tsx b/packages/webui/src/client/ui/SegmentTimeline/Parts/InvalidPartCover.tsx
similarity index 100%
rename from meteor/client/ui/SegmentTimeline/Parts/InvalidPartCover.tsx
rename to packages/webui/src/client/ui/SegmentTimeline/Parts/InvalidPartCover.tsx
diff --git a/meteor/client/ui/SegmentTimeline/Parts/OutputGroup.tsx b/packages/webui/src/client/ui/SegmentTimeline/Parts/OutputGroup.tsx
similarity index 97%
rename from meteor/client/ui/SegmentTimeline/Parts/OutputGroup.tsx
rename to packages/webui/src/client/ui/SegmentTimeline/Parts/OutputGroup.tsx
index ab6d9e54c1..5941f1267d 100644
--- a/meteor/client/ui/SegmentTimeline/Parts/OutputGroup.tsx
+++ b/packages/webui/src/client/ui/SegmentTimeline/Parts/OutputGroup.tsx
@@ -1,6 +1,6 @@
 import React from 'react'
 import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
-import { ISourceLayerExtended } from '../../../../lib/Rundown'
+import { ISourceLayerExtended } from '../../../lib/RundownResolver'
 import { IContextMenuContext } from '../../RundownView'
 import { IOutputLayerUi, PartUi, PieceUi, SegmentUi } from '../SegmentTimelineContainer'
 import { FlattenedSourceLayers } from './FlattenedSourceLayers'
@@ -9,7 +9,7 @@ import classNames from 'classnames'
 import { DEBUG_MODE } from '../SegmentTimelineDebugMode'
 import { RundownUtils } from '../../../lib/rundown'
 import { ISourceLayer } from '@sofie-automation/blueprints-integration'
-import { UIStudio } from '../../../../lib/api/studios'
+import { UIStudio } from '@sofie-automation/meteor-lib/dist/api/studios'
 
 interface IOutputGroupProps {
 	layer: IOutputLayerUi
diff --git a/meteor/client/ui/SegmentTimeline/Parts/SegmentTimelinePart.tsx b/packages/webui/src/client/ui/SegmentTimeline/Parts/SegmentTimelinePart.tsx
similarity index 89%
rename from meteor/client/ui/SegmentTimeline/Parts/SegmentTimelinePart.tsx
rename to packages/webui/src/client/ui/SegmentTimeline/Parts/SegmentTimelinePart.tsx
index a4678aca5a..1d8f31ce31 100644
--- a/meteor/client/ui/SegmentTimeline/Parts/SegmentTimelinePart.tsx
+++ b/packages/webui/src/client/ui/SegmentTimeline/Parts/SegmentTimelinePart.tsx
@@ -4,7 +4,7 @@ import { withTranslation, WithTranslation, TFunction } from 'react-i18next'
 
 import ClassNames from 'classnames'
 import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
-import { SegmentUi, PartUi, IOutputLayerUi, PieceUi, LIVE_LINE_TIME_PADDING } from '../SegmentTimelineContainer'
+import { SegmentUi, PartUi, IOutputLayerUi, PieceUi } from '../SegmentTimelineContainer'
 import {
 	TimingDataResolution,
 	TimingTickResolution,
@@ -14,7 +14,7 @@ import {
 import { RundownTiming } from '../../RundownView/RundownTiming/RundownTiming'
 
 import { RundownUtils } from '../../../lib/rundown'
-import { getCurrentTime } from '../../../../lib/lib'
+import { getCurrentTime } from '../../../lib/systemTime'
 
 import { DEBUG_MODE } from '../SegmentTimelineDebugMode'
 import { Translated } from '../../../lib/ReactMeteorData/ReactMeteorData'
@@ -24,7 +24,7 @@ import { CSSProperties } from '../../../styles/_cssVariables'
 import RundownViewEventBus, {
 	RundownViewEvents,
 	HighlightEvent,
-} from '../../../../lib/api/triggers/RundownViewEventBus'
+} from '@sofie-automation/meteor-lib/dist/triggers/RundownViewEventBus'
 import { LoopingIcon } from '../../../lib/ui/icons/looping'
 import { SegmentEnd } from '../../../lib/ui/icons/segment'
 import { getShowHiddenSourceLayers } from '../../../lib/localStorage'
@@ -33,7 +33,9 @@ import { getPartInstanceTimingId, getPartInstanceTimingValue, RundownTimingConte
 import { OutputGroup } from './OutputGroup'
 import { InvalidPartCover } from './InvalidPartCover'
 import { ISourceLayer } from '@sofie-automation/blueprints-integration'
-import { UIStudio } from '../../../../lib/api/studios'
+import { UIStudio } from '@sofie-automation/meteor-lib/dist/api/studios'
+import { LIVE_LINE_TIME_PADDING } from '../Constants'
+import * as RundownResolver from '../../../lib/RundownResolver'
 
 export const SegmentTimelineLineElementId = 'rundown__segment__line__'
 export const SegmentTimelinePartElementId = 'rundown__segment__part__'
@@ -91,6 +93,7 @@ interface IState {
 	isDurationSettling: boolean
 	durationSettlingStartsAt: number
 	liveDuration: number
+	isInQuickLoop: boolean
 
 	isInsideViewport: boolean
 	isTooSmallForText: boolean
@@ -105,6 +108,8 @@ export class SegmentTimelinePartClass extends React.Component<Translated<WithTim
 
 		const isLive = this.props.playlist.currentPartInfo?.partInstanceId === partInstance._id
 		const isNext = this.props.playlist.nextPartInfo?.partInstanceId === partInstance._id
+		const isInQuickLoop =
+			this.props.timingDurations.partsInQuickLoop?.[getPartInstanceTimingId(this.props.part.instance)] ?? false
 		const startedPlayback = partInstance.timings?.plannedStartedPlayback
 
 		this.state = {
@@ -115,6 +120,7 @@ export class SegmentTimelinePartClass extends React.Component<Translated<WithTim
 			isInsideViewport: false,
 			isTooSmallForText: false,
 			isTooSmallForDisplay: false,
+			isInQuickLoop,
 			highlight: false,
 			liveDuration: isLive
 				? Math.max(
@@ -142,6 +148,9 @@ export class SegmentTimelinePartClass extends React.Component<Translated<WithTim
 		const isLive = nextProps.playlist.currentPartInfo?.partInstanceId === nextProps.part.instance._id
 		const isNext = nextProps.playlist.nextPartInfo?.partInstanceId === nextProps.part.instance._id
 
+		const isInQuickLoop =
+			nextProps.timingDurations.partsInQuickLoop?.[getPartInstanceTimingId(nextProps.part.instance)] ?? false
+
 		const nextPartInstance = nextProps.part.instance
 
 		const startedPlayback = nextProps.part.instance.timings?.plannedStartedPlayback
@@ -207,6 +216,8 @@ export class SegmentTimelinePartClass extends React.Component<Translated<WithTim
 		const partial = {
 			isLive,
 			isNext,
+			isInQuickLoop,
+
 			isDurationSettling,
 			durationSettlingStartsAt,
 			liveDuration,
@@ -544,6 +555,7 @@ export class SegmentTimelinePartClass extends React.Component<Translated<WithTim
 			((!this.props.isLastSegment && !this.props.isLastInSegment) || !!this.props.playlist.nextPartInfo) &&
 			!innerPart.invalid
 		let timeOffset = SegmentTimelinePartClass.getPartDisplayDuration(this.props.part, this.props.timingDurations)
+
 		if (this.state.isLive) {
 			timeOffset += this.getFutureShadePaddingTime()
 		}
@@ -572,7 +584,7 @@ export class SegmentTimelinePartClass extends React.Component<Translated<WithTim
 						</div>
 					</div>
 				)}
-				{!isEndOfShow && this.props.isLastInSegment && !innerPart.invalid && (
+				{!isEndOfShow && !isEndOfLoopingShow && this.props.isLastInSegment && !innerPart.invalid && (
 					<div
 						className={ClassNames('segment-timeline__part__segment-end', {
 							'is-next': isNext,
@@ -583,17 +595,18 @@ export class SegmentTimelinePartClass extends React.Component<Translated<WithTim
 						</div>
 					</div>
 				)}
-				{isEndOfShow && (
+				{(isEndOfShow || isEndOfLoopingShow) && (
 					<div
 						className={ClassNames('segment-timeline__part__show-end', {
-							loop: this.props.playlist.loop,
+							loop: isEndOfLoopingShow,
 						})}
 					>
 						<div className="segment-timeline__part__show-end__label">
-							{this.props.playlist.loop ? t('Loops to top') : t('Show End')}
+							{isEndOfLoopingShow ? t('Loops to Start') : t('Show End')}
 						</div>
 					</div>
 				)}
+				{}
 			</div>
 		)
 	}
@@ -623,7 +636,13 @@ export class SegmentTimelinePartClass extends React.Component<Translated<WithTim
 			this.props.isLastSegment &&
 			this.props.isLastInSegment &&
 			(!this.state.isLive || (this.state.isLive && !this.props.playlist.nextPartInfo))
-		const isEndOfLoopingShow = this.props.isLastSegment && this.props.isLastInSegment && this.props.playlist.loop
+		const isPlaylistLooping = RundownResolver.isLoopRunning(this.props.playlist)
+		const isPartEndOfLoopingShow = RundownResolver.isEndOfLoopingShow(
+			this.props.playlist,
+			this.props.isLastSegment,
+			this.props.isLastInSegment,
+			this.props.part.instance.part
+		)
 		let invalidReasonColorVars: CSSProperties | undefined = undefined
 		if (innerPart.invalidReason && innerPart.invalidReason.color) {
 			const invalidColor = SegmentTimelinePartClass.convertHexToRgb(innerPart.invalidReason.color)
@@ -635,6 +654,11 @@ export class SegmentTimelinePartClass extends React.Component<Translated<WithTim
 			}
 		}
 
+		const isOutsideActiveQuickLoop =
+			!this.state.isInQuickLoop && RundownResolver.isLoopRunning(this.props.playlist) && !this.state.isNext
+		const isQuickLoopStart = RundownResolver.isQuickLoopStart(this.props.part.partId, this.props.playlist)
+		const isQuickLoopEnd = RundownResolver.isQuickLoopEnd(this.props.part.partId, this.props.playlist)
+
 		if (
 			this.state.isInsideViewport &&
 			(!this.state.isTooSmallForDisplay || this.state.isLive || this.state.isNext || this.props.isBudgetGap)
@@ -653,6 +677,10 @@ export class SegmentTimelinePartClass extends React.Component<Translated<WithTim
 
 							'duration-settling': this.state.isDurationSettling,
 							'budget-gap': this.props.isBudgetGap,
+
+							'outside-quickloop': isOutsideActiveQuickLoop,
+							'quickloop-start': isQuickLoopStart,
+							'quickloop-end': isQuickLoopEnd,
 						},
 						this.props.className
 					)}
@@ -678,7 +706,6 @@ export class SegmentTimelinePartClass extends React.Component<Translated<WithTim
 						<InvalidPartCover className="segment-timeline__part__invalid-cover" part={innerPart} />
 					) : null}
 					{innerPart.floated ? <div className="segment-timeline__part__floated-cover"></div> : null}
-
 					{this.props.playlist.nextTimeOffset &&
 						this.state.isNext && ( // This is the off-set line
 							<div
@@ -727,6 +754,7 @@ export class SegmentTimelinePartClass extends React.Component<Translated<WithTim
 								invalid: innerPart.invalid && !innerPart.gap,
 								floated: innerPart.floated,
 								offset: !!this.props.playlist.nextTimeOffset,
+								'quickloop-start': isQuickLoopStart,
 							})}
 						>
 							<div
@@ -745,15 +773,30 @@ export class SegmentTimelinePartClass extends React.Component<Translated<WithTim
 											: null}
 									</React.Fragment>
 								)}
-								{this.props.isAfterLastValidInSegmentAndItsLive && !this.props.playlist.loop && <SegmentEnd />}
-								{this.props.isAfterLastValidInSegmentAndItsLive && this.props.playlist.loop && <LoopingIcon />}
+								{this.props.isAfterLastValidInSegmentAndItsLive && !isPlaylistLooping && <SegmentEnd />}
+								{this.props.isAfterLastValidInSegmentAndItsLive && isPlaylistLooping && <LoopingIcon />}
+							</div>
+							<div className="segment-timeline__part__bottom-line">
+								{this.state.isInQuickLoop && <div className="segment-timeline__part__quickloop-background"></div>}
+								{!this.props.isPreview && this.props.part.instance.part.identifier && (
+									<div className="segment-timeline__identifier">{this.props.part.instance.part.identifier}</div>
+								)}
+								{isQuickLoopStart ? (
+									<div className="segment-timeline__part__quickloop-start">
+										<LoopingIcon />
+									</div>
+								) : null}
+								{isQuickLoopEnd ? (
+									<div className="segment-timeline__part__quickloop-end">
+										<LoopingIcon />
+									</div>
+								) : null}
 							</div>
-							{!this.props.isPreview && this.props.part.instance.part.identifier && (
-								<div className="segment-timeline__identifier">{this.props.part.instance.part.identifier}</div>
-							)}
+							{isQuickLoopStart && <div className="segment-timeline__part__nextline__quickloop-start" />}
 						</div>
 					)}
-					{this.renderEndOfSegment(t, innerPart, isEndOfShow, isEndOfLoopingShow)}
+					{isQuickLoopEnd && <div className="segment-timeline__part__nextline__quickloop-end" />}
+					{this.renderEndOfSegment(t, innerPart, isEndOfShow, isPartEndOfLoopingShow)}
 				</div>
 			)
 		} else {
@@ -773,7 +816,9 @@ export class SegmentTimelinePartClass extends React.Component<Translated<WithTim
 					style={this.getPartStyle()}
 				>
 					{/* render it empty, just to take up space */}
-					{this.state.isInsideViewport ? this.renderEndOfSegment(t, innerPart, isEndOfShow, isEndOfLoopingShow) : null}
+					{this.state.isInsideViewport
+						? this.renderEndOfSegment(t, innerPart, isEndOfShow, isPartEndOfLoopingShow)
+						: null}
 				</div>
 			)
 		}
@@ -796,6 +841,7 @@ export const SegmentTimelinePart = withTranslation()(
 					(durations.partDurations || {})[timingId],
 					(durations.partDisplayStartsAt || {})[timingId],
 					(durations.partDisplayDurations || {})[timingId],
+					(durations.partsInQuickLoop || {})[timingId],
 					firstPartInSegmentId ? (durations.partDisplayStartsAt || {})[firstPartInSegmentId] : undefined,
 					firstPartInSegmentId ? (durations.partDisplayDurations || {})[firstPartInSegmentId] : undefined,
 				]
diff --git a/meteor/client/ui/SegmentTimeline/Parts/SourceLayer.tsx b/packages/webui/src/client/ui/SegmentTimeline/Parts/SourceLayer.tsx
similarity index 97%
rename from meteor/client/ui/SegmentTimeline/Parts/SourceLayer.tsx
rename to packages/webui/src/client/ui/SegmentTimeline/Parts/SourceLayer.tsx
index 2ee4a99c56..4f3b7504ea 100644
--- a/meteor/client/ui/SegmentTimeline/Parts/SourceLayer.tsx
+++ b/packages/webui/src/client/ui/SegmentTimeline/Parts/SourceLayer.tsx
@@ -1,7 +1,7 @@
 import React, { useCallback, useState } from 'react'
 import _ from 'underscore'
 import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
-import { literal, unprotectString } from '../../../../lib/lib'
+import { literal, unprotectString } from '../../../lib/tempLib'
 import { getElementDocumentOffset, OffsetPosition } from '../../../utils/positions'
 import { IContextMenuContext } from '../../RundownView'
 import { IOutputLayerUi, ISourceLayerUi, PartUi, PieceUi, SegmentUi } from '../SegmentTimelineContainer'
@@ -9,7 +9,7 @@ import { SegmentTimelinePartElementId } from './SegmentTimelinePart'
 import { ContextMenuTrigger } from '@jstarpl/react-contextmenu'
 import { SourceLayerItemContainer } from '../SourceLayerItemContainer'
 import { contextMenuHoldToDisplayTime } from '../../../lib/lib'
-import { UIStudio } from '../../../../lib/api/studios'
+import { UIStudio } from '@sofie-automation/meteor-lib/dist/api/studios'
 
 export interface ISourceLayerPropsBase {
 	key: string
diff --git a/meteor/client/ui/SegmentTimeline/Renderers/CustomLayerItemRenderer.tsx b/packages/webui/src/client/ui/SegmentTimeline/Renderers/CustomLayerItemRenderer.tsx
similarity index 100%
rename from meteor/client/ui/SegmentTimeline/Renderers/CustomLayerItemRenderer.tsx
rename to packages/webui/src/client/ui/SegmentTimeline/Renderers/CustomLayerItemRenderer.tsx
diff --git a/meteor/client/ui/SegmentTimeline/Renderers/DefaultLayerItemRenderer.tsx b/packages/webui/src/client/ui/SegmentTimeline/Renderers/DefaultLayerItemRenderer.tsx
similarity index 98%
rename from meteor/client/ui/SegmentTimeline/Renderers/DefaultLayerItemRenderer.tsx
rename to packages/webui/src/client/ui/SegmentTimeline/Renderers/DefaultLayerItemRenderer.tsx
index 4b27975ead..2e05836de1 100644
--- a/meteor/client/ui/SegmentTimeline/Renderers/DefaultLayerItemRenderer.tsx
+++ b/packages/webui/src/client/ui/SegmentTimeline/Renderers/DefaultLayerItemRenderer.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react'
 import ClassNames from 'classnames'
 import { getElementWidth } from '../../../utils/dimensions'
 
diff --git a/meteor/client/ui/SegmentTimeline/Renderers/L3rdSourceRenderer.tsx b/packages/webui/src/client/ui/SegmentTimeline/Renderers/L3rdSourceRenderer.tsx
similarity index 100%
rename from meteor/client/ui/SegmentTimeline/Renderers/L3rdSourceRenderer.tsx
rename to packages/webui/src/client/ui/SegmentTimeline/Renderers/L3rdSourceRenderer.tsx
diff --git a/meteor/client/ui/SegmentTimeline/Renderers/LocalLayerItemRenderer.tsx b/packages/webui/src/client/ui/SegmentTimeline/Renderers/LocalLayerItemRenderer.tsx
similarity index 98%
rename from meteor/client/ui/SegmentTimeline/Renderers/LocalLayerItemRenderer.tsx
rename to packages/webui/src/client/ui/SegmentTimeline/Renderers/LocalLayerItemRenderer.tsx
index b6d6445006..9a30b69280 100644
--- a/meteor/client/ui/SegmentTimeline/Renderers/LocalLayerItemRenderer.tsx
+++ b/packages/webui/src/client/ui/SegmentTimeline/Renderers/LocalLayerItemRenderer.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react'
 import { getElementWidth } from '../../../utils/dimensions'
 import { EvsContent } from '@sofie-automation/blueprints-integration'
 
diff --git a/meteor/client/ui/SegmentTimeline/Renderers/MicSourceRenderer.tsx b/packages/webui/src/client/ui/SegmentTimeline/Renderers/MicSourceRenderer.tsx
similarity index 96%
rename from meteor/client/ui/SegmentTimeline/Renderers/MicSourceRenderer.tsx
rename to packages/webui/src/client/ui/SegmentTimeline/Renderers/MicSourceRenderer.tsx
index 0558047945..cf714c610a 100644
--- a/meteor/client/ui/SegmentTimeline/Renderers/MicSourceRenderer.tsx
+++ b/packages/webui/src/client/ui/SegmentTimeline/Renderers/MicSourceRenderer.tsx
@@ -1,5 +1,3 @@
-import * as React from 'react'
-
 import ClassNames from 'classnames'
 import { ScriptContent } from '@sofie-automation/blueprints-integration'
 import { CustomLayerItemRenderer, ICustomLayerItemProps } from './CustomLayerItemRenderer'
@@ -8,10 +6,10 @@ import * as _ from 'underscore'
 
 import { getElementWidth } from '../../../utils/dimensions'
 import { MicFloatingInspector } from '../../FloatingInspectors/MicFloatingInspector'
-import { calculatePartInstanceExpectedDurationWithPreroll } from '@sofie-automation/corelib/dist/playout/timings'
-import { unprotectString } from '../../../../lib/lib'
+import { calculatePartInstanceExpectedDurationWithTransition } from '@sofie-automation/corelib/dist/playout/timings'
+import { unprotectString } from '../../../lib/tempLib'
 import { IFloatingInspectorPosition } from '../../FloatingInspectors/IFloatingInspectorPosition'
-import { logger } from '../../../../lib/logging'
+import { logger } from '../../../lib/logging'
 
 type IProps = ICustomLayerItemProps
 interface IState {}
@@ -137,8 +135,8 @@ export const MicSourceRenderer = withTranslation()(
 				_forceSizingRecheck = true
 			}
 
-			const expectedDuration = calculatePartInstanceExpectedDurationWithPreroll(this.props.part.instance)
-			const prevExpectedDuration = calculatePartInstanceExpectedDurationWithPreroll(prevProps.part.instance)
+			const expectedDuration = calculatePartInstanceExpectedDurationWithTransition(this.props.part.instance)
+			const prevExpectedDuration = calculatePartInstanceExpectedDurationWithTransition(prevProps.part.instance)
 
 			if (
 				!_forceSizingRecheck &&
diff --git a/meteor/client/ui/SegmentTimeline/Renderers/SplitsSourceRenderer.tsx b/packages/webui/src/client/ui/SegmentTimeline/Renderers/SplitsSourceRenderer.tsx
similarity index 100%
rename from meteor/client/ui/SegmentTimeline/Renderers/SplitsSourceRenderer.tsx
rename to packages/webui/src/client/ui/SegmentTimeline/Renderers/SplitsSourceRenderer.tsx
diff --git a/meteor/client/ui/SegmentTimeline/Renderers/TransitionSourceRenderer.tsx b/packages/webui/src/client/ui/SegmentTimeline/Renderers/TransitionSourceRenderer.tsx
similarity index 98%
rename from meteor/client/ui/SegmentTimeline/Renderers/TransitionSourceRenderer.tsx
rename to packages/webui/src/client/ui/SegmentTimeline/Renderers/TransitionSourceRenderer.tsx
index a5cb8ec5b1..1a25c25b74 100644
--- a/meteor/client/ui/SegmentTimeline/Renderers/TransitionSourceRenderer.tsx
+++ b/packages/webui/src/client/ui/SegmentTimeline/Renderers/TransitionSourceRenderer.tsx
@@ -1,4 +1,4 @@
-import React, { useRef } from 'react'
+import { useRef } from 'react'
 import { getElementWidth } from '../../../utils/dimensions'
 
 import { TransitionContent } from '@sofie-automation/blueprints-integration'
diff --git a/meteor/client/ui/SegmentTimeline/Renderers/VTSourceRenderer.tsx b/packages/webui/src/client/ui/SegmentTimeline/Renderers/VTSourceRenderer.tsx
similarity index 88%
rename from meteor/client/ui/SegmentTimeline/Renderers/VTSourceRenderer.tsx
rename to packages/webui/src/client/ui/SegmentTimeline/Renderers/VTSourceRenderer.tsx
index 09b8d5bbe6..97a38d2dde 100644
--- a/meteor/client/ui/SegmentTimeline/Renderers/VTSourceRenderer.tsx
+++ b/packages/webui/src/client/ui/SegmentTimeline/Renderers/VTSourceRenderer.tsx
@@ -9,20 +9,24 @@ import { CustomLayerItemRenderer, ICustomLayerItemProps } from './CustomLayerIte
 import { withTranslation, WithTranslation } from 'react-i18next'
 import { VTContent } from '@sofie-automation/blueprints-integration'
 import { PieceStatusIcon } from '../../../lib/ui/PieceStatusIcon'
-import { NoticeLevel, getNoticeLevelForPieceStatus } from '../../../../lib/notifications/notifications'
+import { NoticeLevel, getNoticeLevelForPieceStatus } from '../../../lib/notifications/notifications'
 import { VTFloatingInspector } from '../../FloatingInspectors/VTFloatingInspector'
 import { RundownUtils } from '../../../lib/rundown'
 import { FreezeFrameIcon } from '../../../lib/ui/icons/freezeFrame'
 import StudioContext from '../../RundownView/StudioContext'
-import { Settings } from '../../../../lib/Settings'
-import { UIStudio } from '../../../../lib/api/studios'
+import { Settings } from '../../../lib/Settings'
+import { UIStudio } from '@sofie-automation/meteor-lib/dist/api/studios'
 import { PieceStatusCode } from '@sofie-automation/corelib/dist/dataModel/Piece'
 import { HourglassIconSmall } from '../../../lib/ui/icons/notifications'
 import { IFloatingInspectorPosition } from '../../FloatingInspectors/IFloatingInspectorPosition'
-import { logger } from '../../../../lib/logging'
+import { logger } from '../../../lib/logging'
+import { stringifyError } from '@sofie-automation/shared-lib/dist/lib/stringifyError'
+import { ReadonlyDeep } from 'type-fest'
+import { PieceContentStatusObj } from '@sofie-automation/meteor-lib/dist/api/pieceContentStatus'
 
 interface IProps extends ICustomLayerItemProps {
 	studio: UIStudio | undefined
+	contentStatus: ReadonlyDeep<PieceContentStatusObj> | undefined
 }
 interface IState {
 	rightLabelIsAppendage?: boolean
@@ -32,7 +36,7 @@ interface IState {
 
 	sourceEndCountdownAppendage?: boolean
 }
-export class VTSourceRendererBase extends CustomLayerItemRenderer<IProps & WithTranslation, IState> {
+class VTSourceRendererBase extends CustomLayerItemRenderer<IProps & WithTranslation, IState> {
 	private leftLabel: HTMLSpanElement | null = null
 	private rightLabel: HTMLSpanElement | null = null
 
@@ -50,7 +54,7 @@ export class VTSourceRendererBase extends CustomLayerItemRenderer<IProps & WithT
 		const labelItems = innerPiece.name.split('||')
 
 		this.state = {
-			noticeLevel: getNoticeLevelForPieceStatus(props.piece.contentStatus?.status),
+			noticeLevel: getNoticeLevelForPieceStatus(props.contentStatus?.status),
 			begin: labelItems[0] || '',
 			end: labelItems[1] || '',
 		}
@@ -93,7 +97,7 @@ export class VTSourceRendererBase extends CustomLayerItemRenderer<IProps & WithT
 					try {
 						this.rightLabelContainer?.remove()
 					} catch (err) {
-						logger.error('Error in VTSourceRendererBase.mountRightLabelContainer 1', err)
+						logger.error(`Error in VTSourceRendererBase.mountRightLabelContainer 1: ${stringifyError(err)}`)
 					}
 					itemElement.appendChild(this.rightLabelContainer)
 					newState.rightLabelIsAppendage = false
@@ -107,7 +111,7 @@ export class VTSourceRendererBase extends CustomLayerItemRenderer<IProps & WithT
 					try {
 						this.rightLabelContainer?.remove()
 					} catch (err) {
-						logger.error('Error in VTSourceRendererBase.mountRightLabelContainer 2', err)
+						logger.error(`Error in VTSourceRendererBase.mountRightLabelContainer 2: ${stringifyError(err)}`)
 					}
 					itemElement.appendChild(this.rightLabelContainer)
 					newState.rightLabelIsAppendage = false
@@ -148,7 +152,7 @@ export class VTSourceRendererBase extends CustomLayerItemRenderer<IProps & WithT
 			try {
 				this.countdownContainer.remove()
 			} catch (err) {
-				logger.error('Error in VTSourceRendererBase.mountSourceEndedCountdownContainer 1', err)
+				logger.error(`Error in VTSourceRendererBase.mountSourceEndedCountdownContainer 1: ${stringifyError(err)}`)
 			}
 			newState.sourceEndCountdownAppendage = false
 		}
@@ -197,10 +201,10 @@ export class VTSourceRendererBase extends CustomLayerItemRenderer<IProps & WithT
 		let newState: Partial<IState> = {}
 		if (
 			innerPiece.name !== prevProps.piece.instance.piece.name ||
-			this.props.piece.contentStatus?.status !== prevProps.piece.contentStatus?.status
+			this.props.contentStatus?.status !== prevProps.contentStatus?.status
 		) {
 			const labelItems = innerPiece.name.split('||')
-			newState.noticeLevel = getNoticeLevelForPieceStatus(this.props.piece.contentStatus?.status)
+			newState.noticeLevel = getNoticeLevelForPieceStatus(this.props.contentStatus?.status)
 			newState.begin = labelItems[0] || ''
 			newState.end = labelItems[1] || ''
 		}
@@ -226,7 +230,7 @@ export class VTSourceRendererBase extends CustomLayerItemRenderer<IProps & WithT
 			try {
 				this.rightLabelContainer.remove()
 			} catch (err) {
-				logger.error('Error in VTSourceRendererBase.componentWillUnmount 1', err)
+				logger.error(`Error in VTSourceRendererBase.componentWillUnmount 1: ${stringifyError(err)}`)
 			}
 			this.rightLabelContainer = null
 		}
@@ -235,7 +239,7 @@ export class VTSourceRendererBase extends CustomLayerItemRenderer<IProps & WithT
 			try {
 				this.countdownContainer.remove()
 			} catch (err) {
-				logger.error('Error in VTSourceRendererBase.componentWillUnmount 2', err)
+				logger.error(`Error in VTSourceRendererBase.componentWillUnmount 2: ${stringifyError(err)}`)
 			}
 			this.countdownContainer = null
 		}
@@ -249,7 +253,7 @@ export class VTSourceRendererBase extends CustomLayerItemRenderer<IProps & WithT
 		return !this.props.piece.hasOriginInPreceedingPart || this.props.isLiveLine ? (
 			<span className="segment-timeline__piece__label" ref={this.setLeftLabelRef} style={this.getItemLabelOffsetLeft()}>
 				{noticeLevel !== null && <PieceStatusIcon noticeLevel={noticeLevel} />}
-				{this.props.piece.contentStatus?.status === PieceStatusCode.SOURCE_NOT_READY && (
+				{this.props.contentStatus?.status === PieceStatusCode.SOURCE_NOT_READY && (
 					<div className="piece__status-icon type-hourglass">
 						<HourglassIconSmall />
 					</div>
@@ -329,8 +333,8 @@ export class VTSourceRendererBase extends CustomLayerItemRenderer<IProps & WithT
 
 			if (Settings.useCountdownToFreezeFrame) {
 				const lastFreeze =
-					this.props.piece.contentStatus?.freezes &&
-					this.props.piece.contentStatus?.freezes[this.props.piece.contentStatus?.freezes.length - 1]
+					this.props.contentStatus?.freezes &&
+					this.props.contentStatus?.freezes[this.props.contentStatus?.freezes.length - 1]
 				const endingFreezeStart =
 					lastFreeze &&
 					lastFreeze.start >= vtContent.sourceDuration &&
@@ -390,8 +394,8 @@ export class VTSourceRendererBase extends CustomLayerItemRenderer<IProps & WithT
 					<>
 						{this.renderInfiniteItemContentEnded()}
 						{this.renderContentEndCountdown()}
-						{this.props.piece.contentStatus?.scenes &&
-							this.props.piece.contentStatus?.scenes.map(
+						{this.props.contentStatus?.scenes &&
+							this.props.contentStatus?.scenes.map(
 								(i) =>
 									i < itemDuration &&
 									i - seek >= 0 && (
@@ -402,8 +406,8 @@ export class VTSourceRendererBase extends CustomLayerItemRenderer<IProps & WithT
 										></span>
 									)
 							)}
-						{this.props.piece.contentStatus?.freezes &&
-							this.props.piece.contentStatus?.freezes.map(
+						{this.props.contentStatus?.freezes &&
+							this.props.contentStatus?.freezes.map(
 								(i) =>
 									i.start < itemDuration &&
 									i.start - seek >= 0 && (
@@ -420,8 +424,8 @@ export class VTSourceRendererBase extends CustomLayerItemRenderer<IProps & WithT
 										></span>
 									)
 							)}
-						{this.props.piece.contentStatus?.blacks &&
-							this.props.piece.contentStatus?.blacks.map(
+						{this.props.contentStatus?.blacks &&
+							this.props.contentStatus?.blacks.map(
 								(i) =>
 									i.start < itemDuration &&
 									i.start - seek >= 0 && (
@@ -442,7 +446,7 @@ export class VTSourceRendererBase extends CustomLayerItemRenderer<IProps & WithT
 				{this.leftLabelNodes}
 				{this.rightLabelContainer && ReactDOM.createPortal(this.rightLabelNodes, this.rightLabelContainer)}
 				<VTFloatingInspector
-					status={this.props.piece.contentStatus?.status}
+					status={this.props.contentStatus?.status}
 					position={this.getFloatingInspectorStyle()}
 					content={vtContent}
 					itemElement={this.props.itemElement}
@@ -450,10 +454,10 @@ export class VTSourceRendererBase extends CustomLayerItemRenderer<IProps & WithT
 					showMiniInspector={this.props.showMiniInspector}
 					timePosition={realCursorTimePosition}
 					typeClass={this.props.typeClass}
-					noticeMessages={this.props.piece.contentStatus?.messages || []}
+					noticeMessages={this.props.contentStatus?.messages || []}
 					renderedDuration={this.props.piece.renderedDuration || undefined}
 					studio={this.props.studio}
-					previewUrl={this.props.piece.contentStatus?.previewUrl}
+					previewUrl={this.props.contentStatus?.previewUrl}
 				/>
 			</React.Fragment>
 		)
diff --git a/meteor/client/ui/SegmentTimeline/SegmentContextMenu.tsx b/packages/webui/src/client/ui/SegmentTimeline/SegmentContextMenu.tsx
similarity index 76%
rename from meteor/client/ui/SegmentTimeline/SegmentContextMenu.tsx
rename to packages/webui/src/client/ui/SegmentTimeline/SegmentContextMenu.tsx
index d06651944b..756859e2e7 100644
--- a/meteor/client/ui/SegmentTimeline/SegmentContextMenu.tsx
+++ b/packages/webui/src/client/ui/SegmentTimeline/SegmentContextMenu.tsx
@@ -3,22 +3,30 @@ import Escape from './../../lib/Escape'
 import { withTranslation } from 'react-i18next'
 import { ContextMenu, MenuItem } from '@jstarpl/react-contextmenu'
 import { DBPart } from '@sofie-automation/corelib/dist/dataModel/Part'
-import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
+import {
+	DBRundownPlaylist,
+	QuickLoopMarker,
+	QuickLoopMarkerType,
+} from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
 import { Translated } from '../../lib/ReactMeteorData/ReactMeteorData'
 import { RundownUtils } from '../../lib/rundown'
 import { IContextMenuContext } from '../RundownView'
 import { PartUi, SegmentUi } from './SegmentTimelineContainer'
 import { SegmentId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import { SegmentOrphanedReason } from '@sofie-automation/corelib/dist/dataModel/Segment'
+import * as RundownResolver from '../../lib/RundownResolver'
 
 interface IProps {
 	onSetNext: (part: DBPart | undefined, e: any, offset?: number, take?: boolean) => void
 	onSetNextSegment: (segmentId: SegmentId, e: any) => void
 	onQueueNextSegment: (segmentId: SegmentId | null, e: any) => void
+	onSetQuickLoopStart: (marker: QuickLoopMarker | null, e: any) => void
+	onSetQuickLoopEnd: (marker: QuickLoopMarker | null, e: any) => void
 	playlist?: DBRundownPlaylist
 	studioMode: boolean
 	contextMenuContext: IContextMenuContext | null
 	enablePlayFromAnywhere: boolean
+	enableQuickLoop: boolean
 }
 interface IState {}
 
@@ -99,6 +107,44 @@ export const SegmentContextMenu = withTranslation()(
 										</MenuItem>
 									</>
 								) : null}
+								{this.props.enableQuickLoop && !RundownResolver.isLoopLocked(this.props.playlist) && (
+									<>
+										{RundownResolver.isQuickLoopStart(part.partId, this.props.playlist) ? (
+											<MenuItem onClick={(e) => this.props.onSetQuickLoopStart(null, e)}>
+												<span>{t('Clear QuickLoop Start')}</span>
+											</MenuItem>
+										) : (
+											<MenuItem
+												onClick={(e) =>
+													this.props.onSetQuickLoopStart(
+														{ type: QuickLoopMarkerType.PART, id: part.instance.part._id },
+														e
+													)
+												}
+												disabled={!!part.instance.orphaned || !canSetAsNext}
+											>
+												<span>{t('Set as QuickLoop Start')}</span>
+											</MenuItem>
+										)}
+										{RundownResolver.isQuickLoopEnd(part.partId, this.props.playlist) ? (
+											<MenuItem onClick={(e) => this.props.onSetQuickLoopEnd(null, e)}>
+												<span>{t('Clear QuickLoop End')}</span>
+											</MenuItem>
+										) : (
+											<MenuItem
+												onClick={(e) =>
+													this.props.onSetQuickLoopEnd(
+														{ type: QuickLoopMarkerType.PART, id: part.instance.part._id },
+														e
+													)
+												}
+												disabled={!!part.instance.orphaned || !canSetAsNext}
+											>
+												<span>{t('Set as QuickLoop End')}</span>
+											</MenuItem>
+										)}
+									</>
+								)}
 							</>
 						)}
 					</ContextMenu>
diff --git a/meteor/client/ui/SegmentTimeline/SegmentNextPreview.tsx b/packages/webui/src/client/ui/SegmentTimeline/SegmentNextPreview.tsx
similarity index 100%
rename from meteor/client/ui/SegmentTimeline/SegmentNextPreview.tsx
rename to packages/webui/src/client/ui/SegmentTimeline/SegmentNextPreview.tsx
diff --git a/meteor/client/ui/SegmentTimeline/SegmentTimeline.scss b/packages/webui/src/client/ui/SegmentTimeline/SegmentTimeline.scss
similarity index 98%
rename from meteor/client/ui/SegmentTimeline/SegmentTimeline.scss
rename to packages/webui/src/client/ui/SegmentTimeline/SegmentTimeline.scss
index c778af78d8..23b506db6b 100644
--- a/meteor/client/ui/SegmentTimeline/SegmentTimeline.scss
+++ b/packages/webui/src/client/ui/SegmentTimeline/SegmentTimeline.scss
@@ -1,7 +1,7 @@
 $timeline-layer-height: 1em;
 
 .segment-timeline {
-	display: block;
+	// display: block;
 	width: 100%;
 	max-width: 100%;
 
@@ -61,6 +61,7 @@ $timeline-layer-height: 1em;
 		bottom: 0;
 
 		width: 100%;
+		padding-left: 2px;
 
 		contain: layout style;
 	}
@@ -115,7 +116,7 @@ $timeline-layer-height: 1em;
 		height: 100%;
 
 		&.is-live {
-			will-change: transform
+			will-change: transform;
 		}
 	}
 
diff --git a/meteor/client/ui/SegmentTimeline/SegmentTimeline.tsx b/packages/webui/src/client/ui/SegmentTimeline/SegmentTimeline.tsx
similarity index 96%
rename from meteor/client/ui/SegmentTimeline/SegmentTimeline.tsx
rename to packages/webui/src/client/ui/SegmentTimeline/SegmentTimeline.tsx
index af631be9bf..402c5484dd 100644
--- a/meteor/client/ui/SegmentTimeline/SegmentTimeline.tsx
+++ b/packages/webui/src/client/ui/SegmentTimeline/SegmentTimeline.tsx
@@ -13,7 +13,7 @@ import { SegmentTimelineZoomControls } from './SegmentTimelineZoomControls'
 import { SegmentDuration } from '../RundownView/RundownTiming/SegmentDuration'
 import { PartCountdown } from '../RundownView/RundownTiming/PartCountdown'
 import { RundownTiming } from '../RundownView/RundownTiming/RundownTiming'
-import { CurrentPartRemaining } from '../RundownView/RundownTiming/CurrentPartRemaining'
+import { CurrentPartOrSegmentRemaining } from '../RundownView/RundownTiming/CurrentPartOrSegmentRemaining'
 
 import { RundownUtils } from '../../lib/rundown'
 import { Translated } from '../../lib/ReactMeteorData/ReactMeteorData'
@@ -22,14 +22,17 @@ import { scrollToPart, lockPointer, unlockPointer } from '../../lib/viewPort'
 
 import { getAllowSpeaking, getAllowVibrating, getShowHiddenSourceLayers } from '../../lib/localStorage'
 import { showPointerLockCursor, hidePointerLockCursor } from '../../lib/PointerLockCursor'
-import { Settings } from '../../../lib/Settings'
+import { Settings } from '../../lib/Settings'
 import { IContextMenuContext } from '../RundownView'
-import { literal, protectString, unprotectString } from '../../../lib/lib'
+import { literal, protectString, unprotectString } from '../../lib/tempLib'
 import { isPartPlayable } from '@sofie-automation/corelib/dist/dataModel/Part'
 import { contextMenuHoldToDisplayTime } from '../../lib/lib'
 import { WarningIconSmall, CriticalIconSmall } from '../../lib/ui/icons/notifications'
-import RundownViewEventBus, { RundownViewEvents, HighlightEvent } from '../../../lib/api/triggers/RundownViewEventBus'
-import { wrapPartToTemporaryInstance } from '../../../lib/collections/PartInstances'
+import RundownViewEventBus, {
+	RundownViewEvents,
+	HighlightEvent,
+} from '@sofie-automation/meteor-lib/dist/triggers/RundownViewEventBus'
+import { wrapPartToTemporaryInstance } from '@sofie-automation/meteor-lib/dist/collections/PartInstances'
 
 import { SegmentTimelineSmallPartFlag } from './SmallParts/SegmentTimelineSmallPartFlag'
 import { UIStateStorage } from '../../lib/UIStateStorage'
@@ -38,11 +41,11 @@ import { IOutputLayer, ISourceLayer, NoteSeverity } from '@sofie-automation/blue
 import { SegmentTimelineZoomButtons } from './SegmentTimelineZoomButtons'
 import { SegmentViewMode } from '../SegmentContainer/SegmentViewModes'
 import { SwitchViewModeButton } from '../SegmentContainer/SwitchViewModeButton'
-import { UIStudio } from '../../../lib/api/studios'
+import { UIStudio } from '@sofie-automation/meteor-lib/dist/api/studios'
 import { PartId, PartInstanceId, SegmentId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import { RundownHoldState } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
 import { SegmentNoteCounts } from '../SegmentContainer/withResolvedSegment'
-import { PartExtended } from '../../../lib/Rundown'
+import { PartExtended } from '../../lib/RundownResolver'
 import {
 	withTiming,
 	TimingTickResolution,
@@ -50,7 +53,8 @@ import {
 	WithTiming,
 } from '../RundownView/RundownTiming/withTiming'
 import { SegmentTimeAnchorTime } from '../RundownView/RundownTiming/SegmentTimeAnchorTime'
-import { logger } from '../../../lib/logging'
+import { logger } from '../../lib/logging'
+import * as RundownResolver from '../../lib/RundownResolver'
 
 interface IProps {
 	id: string
@@ -93,7 +97,6 @@ interface IProps {
 	segmentRef?: (el: SegmentTimelineClass, segmentId: SegmentId) => void
 	isLastSegment: boolean
 	lastValidPartIndex: number | undefined
-	budgetDuration?: number
 	showCountdownToSegment: boolean
 	showDurationSourceLayers?: Set<ISourceLayer['_id']>
 	fixedSegmentDuration: boolean | undefined
@@ -129,7 +132,7 @@ const SegmentTimelineZoom = class SegmentTimelineZoom extends React.Component<
 		durations: PropTypes.object.isRequired,
 	}
 
-	context:
+	declare context:
 		| {
 				durations: RundownTimingContext
 		  }
@@ -229,7 +232,7 @@ export const BUDGET_GAP_PART = {
 		gap: true,
 		title: 'gap',
 		invalid: true,
-		expectedDurationWithPreroll: undefined,
+		expectedDurationWithTransition: undefined,
 	}),
 	pieces: [],
 	renderedDuration: 0,
@@ -619,6 +622,7 @@ export class SegmentTimelineClass extends React.Component<Translated<WithTiming<
 
 	private timelineStyle(outputGroups: IOutputLayerUi[]) {
 		const showHiddenSourceLayers = getShowHiddenSourceLayers()
+		const budgetDuration = this.getSegmentBudgetDuration()
 
 		return {
 			willChange: this.props.isLiveSegment ? 'transform' : 'none',
@@ -634,12 +638,16 @@ export class SegmentTimelineClass extends React.Component<Translated<WithTiming<
 				0
 			)} * var(--segment-layer-height) + var(--segment-timeline-padding-top) + var(--segment-timeline-padding-bottom))`,
 			minWidth:
-				this.props.budgetDuration !== undefined
-					? `calc(${this.convertTimeToPixels(this.props.budgetDuration).toString()}px + 100vW)`
+				budgetDuration !== undefined
+					? `calc(${this.convertTimeToPixels(budgetDuration).toString()}px + 100vW)`
 					: undefined,
 		}
 	}
 
+	private getSegmentBudgetDuration() {
+		return this.props.segment.segmentTiming?.budgetDuration
+	}
+
 	private renderLiveLine() {
 		if (!this.props.isLiveSegment) return null
 
@@ -665,12 +673,14 @@ export class SegmentTimelineClass extends React.Component<Translated<WithTiming<
 
 		return (
 			<>
-				<div
-					className="segment-timeline__liveline-shade"
-					style={{
-						width: lineStyle.left,
-					}}
-				/>
+				{!RundownResolver.isLoopRunning(this.props.playlist) && (
+					<div
+						className="segment-timeline__liveline-shade"
+						style={{
+							width: lineStyle.left,
+						}}
+					/>
+				)}
 				<div className="segment-timeline__liveline" style={lineStyle}>
 					<div
 						className="segment-timeline__liveline__label"
@@ -680,7 +690,7 @@ export class SegmentTimelineClass extends React.Component<Translated<WithTiming<
 					</div>
 					<div className="segment-timeline__liveline__timecode">
 						{this.props.displayLiveLineCounter && (
-							<CurrentPartRemaining
+							<CurrentPartOrSegmentRemaining
 								currentPartInstanceId={this.props.playlist.currentPartInfo?.partInstanceId ?? null}
 								speaking={getAllowSpeaking()}
 								vibrating={getAllowVibrating()}
@@ -825,7 +835,8 @@ export class SegmentTimelineClass extends React.Component<Translated<WithTiming<
 	}
 
 	private renderBudgetGapPart() {
-		if (this.props.budgetDuration === undefined) return null
+		const budgetDuration = this.getSegmentBudgetDuration()
+		if (budgetDuration === undefined) return null
 
 		const livePart = this.props.parts.find(
 			(part) => part.instance._id === this.props.playlist.currentPartInfo?.partInstanceId
@@ -865,7 +876,7 @@ export class SegmentTimelineClass extends React.Component<Translated<WithTiming<
 				anyPriorPartWasLive={true}
 				livePartStartsAt={livePartStartsAt}
 				livePartDisplayDuration={livePartDisplayDuration}
-				budgetDuration={this.props.budgetDuration}
+				budgetDuration={budgetDuration}
 			/>
 		)
 	}
@@ -944,12 +955,13 @@ export class SegmentTimelineClass extends React.Component<Translated<WithTiming<
 	}
 
 	private renderEditorialLine() {
-		if (this.props.budgetDuration === undefined) {
+		const budgetDuration = this.getSegmentBudgetDuration()
+		if (budgetDuration === undefined) {
 			return null
 		}
 
 		const lineStyle = {
-			left: this.props.budgetDuration * this.props.timeScale - this.props.scrollLeft * this.props.timeScale + 'px',
+			left: budgetDuration * this.props.timeScale - this.props.scrollLeft * this.props.timeScale + 'px',
 		}
 		return <div className="segment-timeline__editorialline" style={lineStyle}></div>
 	}
@@ -1100,7 +1112,7 @@ export class SegmentTimelineClass extends React.Component<Translated<WithTiming<
 						this.props.parts.length > 0 &&
 						(!this.props.hasAlreadyPlayed || this.props.isNextSegment || this.props.isLiveSegment) && (
 							<SegmentDuration
-								segmentId={this.props.segment._id}
+								segment={this.props.segment}
 								parts={this.props.parts}
 								label={<span className="segment-timeline__duration__label">{t('Duration')}</span>}
 								fixed={this.props.fixedSegmentDuration}
diff --git a/meteor/client/ui/SegmentTimeline/SegmentTimelineContainer.tsx b/packages/webui/src/client/ui/SegmentTimeline/SegmentTimelineContainer.tsx
similarity index 93%
rename from meteor/client/ui/SegmentTimeline/SegmentTimelineContainer.tsx
rename to packages/webui/src/client/ui/SegmentTimeline/SegmentTimelineContainer.tsx
index 4189d39133..efcc912a68 100644
--- a/meteor/client/ui/SegmentTimeline/SegmentTimelineContainer.tsx
+++ b/packages/webui/src/client/ui/SegmentTimeline/SegmentTimelineContainer.tsx
@@ -4,19 +4,18 @@ import * as _ from 'underscore'
 import { SegmentTimeline, SegmentTimelineClass } from './SegmentTimeline'
 import { computeSegmentDisplayDuration, RundownTiming, TimingEvent } from '../RundownView/RundownTiming/RundownTiming'
 import { UIStateStorage } from '../../lib/UIStateStorage'
-import { PartExtended } from '../../../lib/Rundown'
-import { MAGIC_TIME_SCALE_FACTOR } from '../RundownView'
+import { PartExtended } from '../../lib/RundownResolver'
 import { SpeechSynthesiser } from '../../lib/speechSynthesis'
 import { getElementWidth } from '../../utils/dimensions'
 import { isMaintainingFocus, scrollToSegment, getHeaderHeight } from '../../lib/viewPort'
-import { equivalentArrays, unprotectString } from '../../../lib/lib'
-import { Settings } from '../../../lib/Settings'
-import { Meteor } from 'meteor/meteor'
+import { unprotectString } from '../../lib/tempLib'
+import { equivalentArrays } from '@sofie-automation/shared-lib/dist/lib/lib'
+import { Settings } from '../../lib/Settings'
 import RundownViewEventBus, {
 	RundownViewEvents,
 	GoToPartEvent,
 	GoToPartInstanceEvent,
-} from '../../../lib/api/triggers/RundownViewEventBus'
+} from '@sofie-automation/meteor-lib/dist/triggers/RundownViewEventBus'
 import { SegmentTimelinePartClass } from './Parts/SegmentTimelinePart'
 import {
 	PartUi,
@@ -28,31 +27,27 @@ import {
 import { computeSegmentDuration, getPartInstanceTimingId, RundownTimingContext } from '../../lib/rundownTiming'
 import { RundownViewShelf } from '../RundownView/RundownViewShelf'
 import { PartInstanceId, SegmentId } from '@sofie-automation/corelib/dist/dataModel/Ids'
-import { PartInstances, Parts } from '../../collections'
 import { catchError, useDebounce } from '../../lib/lib'
 import { CorelibPubSub } from '@sofie-automation/corelib/dist/pubsub'
 import { useSubscription, useTracker } from '../../lib/ReactMeteorData/ReactMeteorData'
-import { logger } from '../../../lib/logging'
+import { logger } from '../../lib/logging'
+import {
+	FALLBACK_ZOOM_FACTOR,
+	LIVELINE_HISTORY_SIZE,
+	MINIMUM_ZOOM_FACTOR,
+	SIMULATED_PLAYBACK_HARD_MARGIN,
+	TIMELINE_RIGHT_PADDING,
+} from './Constants'
+import { UIPartInstances, UIParts } from '../Collections'
 
 // Kept for backwards compatibility
-export { SegmentUi, PartUi, PieceUi, ISourceLayerUi, IOutputLayerUi } from '../SegmentContainer/withResolvedSegment'
-
-export const SIMULATED_PLAYBACK_SOFT_MARGIN = 0
-export const SIMULATED_PLAYBACK_HARD_MARGIN = 3500
-
-export const LIVE_LINE_TIME_PADDING = 150
-export const LIVELINE_HISTORY_SIZE = 100
-export const TIMELINE_RIGHT_PADDING =
-	// TODO: This is only temporary, for hands-on tweaking -- Jan Starzak, 2021-06-01
-	parseInt(localStorage.getItem('EXP_timeline_right_padding')!) || LIVELINE_HISTORY_SIZE + LIVE_LINE_TIME_PADDING
-const FALLBACK_ZOOM_FACTOR = MAGIC_TIME_SCALE_FACTOR
-export let MINIMUM_ZOOM_FACTOR = FALLBACK_ZOOM_FACTOR
-
-Meteor.startup(() => {
-	MINIMUM_ZOOM_FACTOR = // TODO: This is only temporary, for hands-on tweaking -- Jan Starzak, 2021-06-01
-		parseInt(localStorage.getItem('EXP_timeline_min_time_scale')!) ||
-		MAGIC_TIME_SCALE_FACTOR * Settings.defaultTimeScale
-})
+export type {
+	SegmentUi,
+	PartUi,
+	PieceUi,
+	ISourceLayerUi,
+	IOutputLayerUi,
+} from '../SegmentContainer/withResolvedSegment'
 
 interface IState {
 	scrollLeft: number
@@ -81,7 +76,7 @@ interface IProps extends IResolvedSegmentProps {
 export function SegmentTimelineContainer(props: Readonly<IProps>): JSX.Element {
 	const partIds = useTracker(
 		() =>
-			Parts.find(
+			UIParts.find(
 				{
 					segmentId: props.segmentId,
 				},
@@ -98,7 +93,7 @@ export function SegmentTimelineContainer(props: Readonly<IProps>): JSX.Element {
 
 	const partInstanceIds = useTracker(
 		() =>
-			PartInstances.find(
+			UIPartInstances.find(
 				{
 					segmentId: props.segmentId,
 					reset: {
@@ -159,7 +154,7 @@ const SegmentTimelineContainerContent = withResolvedSegment(
 		nextPartOffset = 0
 
 		// Setup by React.Component constructor
-		context!: {
+		declare context: {
 			durations: RundownTimingContext
 			syncedDurations: RundownTimingContext
 		}
@@ -370,18 +365,7 @@ const SegmentTimelineContainerContent = withResolvedSegment(
 		}
 
 		private getSegmentBudgetDuration(): number | undefined {
-			let duration = 0
-			let anyBudgetDurations = false
-			for (const part of this.props.parts) {
-				if (part.instance.part.budgetDuration !== undefined) {
-					anyBudgetDurations = true
-					duration += part.instance.part.budgetDuration
-				}
-			}
-			if (anyBudgetDurations) {
-				return duration
-			}
-			return undefined
+			return this.props.segmentui?.segmentTiming?.budgetDuration
 		}
 
 		onWindowResize = _.throttle(() => {
@@ -707,7 +691,6 @@ const SegmentTimelineContainerContent = withResolvedSegment(
 							isLastSegment={this.props.isLastSegment}
 							lastValidPartIndex={this.props.lastValidPartIndex}
 							onHeaderNoteClick={this.props.onHeaderNoteClick}
-							budgetDuration={this.props.budgetDuration}
 							showCountdownToSegment={this.props.showCountdownToSegment}
 							fixedSegmentDuration={this.props.fixedSegmentDuration}
 							showDurationSourceLayers={this.props.showDurationSourceLayers}
diff --git a/meteor/client/ui/SegmentTimeline/SegmentTimelineDebugMode.ts b/packages/webui/src/client/ui/SegmentTimeline/SegmentTimelineDebugMode.ts
similarity index 100%
rename from meteor/client/ui/SegmentTimeline/SegmentTimelineDebugMode.ts
rename to packages/webui/src/client/ui/SegmentTimeline/SegmentTimelineDebugMode.ts
diff --git a/meteor/client/ui/SegmentTimeline/SegmentTimelineZoomButtons.tsx b/packages/webui/src/client/ui/SegmentTimeline/SegmentTimelineZoomButtons.tsx
similarity index 100%
rename from meteor/client/ui/SegmentTimeline/SegmentTimelineZoomButtons.tsx
rename to packages/webui/src/client/ui/SegmentTimeline/SegmentTimelineZoomButtons.tsx
diff --git a/meteor/client/ui/SegmentTimeline/SegmentTimelineZoomControls.tsx b/packages/webui/src/client/ui/SegmentTimeline/SegmentTimelineZoomControls.tsx
similarity index 98%
rename from meteor/client/ui/SegmentTimeline/SegmentTimelineZoomControls.tsx
rename to packages/webui/src/client/ui/SegmentTimeline/SegmentTimelineZoomControls.tsx
index c94fafad86..7f484dac78 100644
--- a/meteor/client/ui/SegmentTimeline/SegmentTimelineZoomControls.tsx
+++ b/packages/webui/src/client/ui/SegmentTimeline/SegmentTimelineZoomControls.tsx
@@ -3,7 +3,7 @@ import { getElementWidth } from '../../utils/dimensions'
 import { getElementDocumentOffset } from '../../utils/positions'
 import { onElementResize, offElementResize } from '../../lib/resizeObserver'
 import { LeftArrow, RightArrow } from '../../lib/ui/icons/segment'
-import { LIVELINE_HISTORY_SIZE } from './SegmentTimelineContainer'
+import { LIVELINE_HISTORY_SIZE } from './Constants'
 
 interface IPropsHeader {
 	scrollLeft: number
diff --git a/meteor/client/ui/SegmentTimeline/SmallParts/SegmentTimelinePartHoverPreview.tsx b/packages/webui/src/client/ui/SegmentTimeline/SmallParts/SegmentTimelinePartHoverPreview.tsx
similarity index 96%
rename from meteor/client/ui/SegmentTimeline/SmallParts/SegmentTimelinePartHoverPreview.tsx
rename to packages/webui/src/client/ui/SegmentTimeline/SmallParts/SegmentTimelinePartHoverPreview.tsx
index c229587862..1305f4aa99 100644
--- a/meteor/client/ui/SegmentTimeline/SmallParts/SegmentTimelinePartHoverPreview.tsx
+++ b/packages/webui/src/client/ui/SegmentTimeline/SmallParts/SegmentTimelinePartHoverPreview.tsx
@@ -1,12 +1,12 @@
-import React, { useState, useLayoutEffect } from 'react'
+import { useState, useLayoutEffect } from 'react'
 import { useTranslation } from 'react-i18next'
 import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
-import { unprotectString } from '../../../../lib/lib'
+import { unprotectString } from '../../../lib/tempLib'
 import { RundownUtils } from '../../../lib/rundown'
 import { PartUi, SegmentUi } from '../SegmentTimelineContainer'
 import { SegmentTimelinePart } from '../Parts/SegmentTimelinePart'
 import { ISourceLayer } from '@sofie-automation/blueprints-integration'
-import { UIStudio } from '../../../../lib/api/studios'
+import { UIStudio } from '@sofie-automation/meteor-lib/dist/api/studios'
 
 export const SegmentTimelinePartHoverPreview = ({
 	showMiniInspector,
diff --git a/meteor/client/ui/SegmentTimeline/SmallParts/SegmentTimelineSmallPartFlag.tsx b/packages/webui/src/client/ui/SegmentTimeline/SmallParts/SegmentTimelineSmallPartFlag.tsx
similarity index 95%
rename from meteor/client/ui/SegmentTimeline/SmallParts/SegmentTimelineSmallPartFlag.tsx
rename to packages/webui/src/client/ui/SegmentTimeline/SmallParts/SegmentTimelineSmallPartFlag.tsx
index 8a0d33fa79..28bed17510 100644
--- a/meteor/client/ui/SegmentTimeline/SmallParts/SegmentTimelineSmallPartFlag.tsx
+++ b/packages/webui/src/client/ui/SegmentTimeline/SmallParts/SegmentTimelineSmallPartFlag.tsx
@@ -2,15 +2,15 @@ import React, { CSSProperties, useMemo, useRef, useState } from 'react'
 import { SmallPartFlag } from '../../../lib/ui/icons/segment'
 import { ISourceLayer } from '@sofie-automation/blueprints-integration'
 import { SegmentTimelineSmallPartFlagIcon } from './SegmentTimelineSmallPartFlagIcon'
-import { protectString, unprotectString } from '../../../../lib/lib'
+import { protectString, unprotectString } from '../../../lib/tempLib'
 import { PartUi, SegmentUi } from '../SegmentTimelineContainer'
 import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
 import { SegmentTimelinePartHoverPreview } from './SegmentTimelinePartHoverPreview'
-import RundownViewEventBus, { RundownViewEvents } from '../../../../lib/api/triggers/RundownViewEventBus'
-import { UIStudio } from '../../../../lib/api/studios'
+import RundownViewEventBus, { RundownViewEvents } from '@sofie-automation/meteor-lib/dist/triggers/RundownViewEventBus'
+import { UIStudio } from '@sofie-automation/meteor-lib/dist/api/studios'
 import { TimingDataResolution, TimingTickResolution, withTiming } from '../../RundownView/RundownTiming/withTiming'
 import { SegmentTimelinePartClass } from '../Parts/SegmentTimelinePart'
-import { PartExtended } from '../../../../lib/Rundown'
+import { PartExtended } from '../../../lib/RundownResolver'
 import { getPartInstanceTimingId } from '../../../lib/rundownTiming'
 
 export const SegmentTimelineSmallPartFlag = withTiming<
diff --git a/meteor/client/ui/SegmentTimeline/SmallParts/SegmentTimelineSmallPartFlagIcon.tsx b/packages/webui/src/client/ui/SegmentTimeline/SmallParts/SegmentTimelineSmallPartFlagIcon.tsx
similarity index 100%
rename from meteor/client/ui/SegmentTimeline/SmallParts/SegmentTimelineSmallPartFlagIcon.tsx
rename to packages/webui/src/client/ui/SegmentTimeline/SmallParts/SegmentTimelineSmallPartFlagIcon.tsx
diff --git a/meteor/client/ui/SegmentTimeline/SourceLayerItem.tsx b/packages/webui/src/client/ui/SegmentTimeline/SourceLayerItem.tsx
similarity index 96%
rename from meteor/client/ui/SegmentTimeline/SourceLayerItem.tsx
rename to packages/webui/src/client/ui/SegmentTimeline/SourceLayerItem.tsx
index 048a56c020..5e45667218 100644
--- a/meteor/client/ui/SegmentTimeline/SourceLayerItem.tsx
+++ b/packages/webui/src/client/ui/SegmentTimeline/SourceLayerItem.tsx
@@ -5,7 +5,6 @@ import { RundownUtils } from '../../lib/rundown'
 import { DefaultLayerItemRenderer } from './Renderers/DefaultLayerItemRenderer'
 import { MicSourceRenderer } from './Renderers/MicSourceRenderer'
 import { VTSourceRenderer } from './Renderers/VTSourceRenderer'
-import { STKSourceRenderer } from './Renderers/STKSourceRenderer'
 import { L3rdSourceRenderer } from './Renderers/L3rdSourceRenderer'
 import { SplitsSourceRenderer } from './Renderers/SplitsSourceRenderer'
 import { LocalLayerItemRenderer } from './Renderers/LocalLayerItemRenderer'
@@ -13,12 +12,17 @@ import { LocalLayerItemRenderer } from './Renderers/LocalLayerItemRenderer'
 import { DEBUG_MODE } from './SegmentTimelineDebugMode'
 import { withTranslation, WithTranslation } from 'react-i18next'
 import { getElementDocumentOffset, OffsetPosition } from '../../utils/positions'
-import { unprotectString } from '../../../lib/lib'
-import RundownViewEventBus, { RundownViewEvents, HighlightEvent } from '../../../lib/api/triggers/RundownViewEventBus'
+import { unprotectString } from '../../lib/tempLib'
+import RundownViewEventBus, {
+	RundownViewEvents,
+	HighlightEvent,
+} from '@sofie-automation/meteor-lib/dist/triggers/RundownViewEventBus'
 import { pieceUiClassNames } from '../../lib/ui/pieceUiClassNames'
 import { SourceDurationLabelAlignment } from './Renderers/CustomLayerItemRenderer'
 import { TransitionSourceRenderer } from './Renderers/TransitionSourceRenderer'
-import { UIStudio } from '../../../lib/api/studios'
+import { UIStudio } from '@sofie-automation/meteor-lib/dist/api/studios'
+import { ReadonlyDeep } from 'type-fest'
+import { PieceContentStatusObj } from '@sofie-automation/meteor-lib/dist/api/pieceContentStatus'
 const LEFT_RIGHT_ANCHOR_SPACER = 15
 const MARGINAL_ANCHORED_WIDTH = 5
 
@@ -37,6 +41,8 @@ export interface ISourceLayerItemProps {
 	partDisplayDuration: number
 	/** The piece being rendered in this layer */
 	piece: PieceUi
+	/** The content status for the piece being rendered */
+	contentStatus: ReadonlyDeep<PieceContentStatusObj> | undefined
 	/** Scaling factor for this segment */
 	timeScale: number
 	/** Whether this part is live */
@@ -548,6 +554,7 @@ export const SourceLayerItem = withTranslation()(
 						/>
 					)
 				case SourceLayerType.VT:
+				case SourceLayerType.LIVE_SPEAK:
 					return (
 						<VTSourceRenderer
 							key={unprotectString(this.props.piece.instance._id)}
@@ -589,21 +596,6 @@ export const SourceLayerItem = withTranslation()(
 							{...this.state}
 						/>
 					)
-				case SourceLayerType.LIVE_SPEAK:
-					return (
-						<STKSourceRenderer
-							key={unprotectString(this.props.piece.instance._id)}
-							typeClass={typeClass}
-							getItemDuration={this.getItemDuration}
-							getSourceDurationLabelAlignment={this.getSourceDurationLabelAlignment}
-							getItemLabelOffsetLeft={this.getItemLabelOffsetLeft}
-							getItemLabelOffsetRight={this.getItemLabelOffsetRight}
-							setAnchoredElsWidths={this.setAnchoredElsWidths}
-							{...this.props}
-							{...this.state}
-							studio={this.props.studio}
-						/>
-					)
 
 				case SourceLayerType.TRANSITION:
 					// TODOSYNC: TV2 uses other renderers, to be discussed.
@@ -674,6 +666,7 @@ export const SourceLayerItem = withTranslation()(
 					<div
 						className={pieceUiClassNames(
 							piece,
+							this.props.contentStatus,
 							'segment-timeline__piece',
 							this.props.layer.type,
 							this.props.part.partId,
diff --git a/packages/webui/src/client/ui/SegmentTimeline/SourceLayerItemContainer.tsx b/packages/webui/src/client/ui/SegmentTimeline/SourceLayerItemContainer.tsx
new file mode 100644
index 0000000000..dfd59462e7
--- /dev/null
+++ b/packages/webui/src/client/ui/SegmentTimeline/SourceLayerItemContainer.tsx
@@ -0,0 +1,15 @@
+import { ISourceLayerItemProps, SourceLayerItem } from './SourceLayerItem'
+import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
+import { useContentStatusForPieceInstance } from './withMediaObjectStatus'
+import { UIStudio } from '@sofie-automation/meteor-lib/dist/api/studios'
+
+interface IPropsHeader extends Omit<ISourceLayerItemProps, 'contentStatus'> {
+	playlist: DBRundownPlaylist
+	studio: UIStudio
+}
+
+export function SourceLayerItemContainer(props: IPropsHeader): JSX.Element {
+	const contentStatus = useContentStatusForPieceInstance(props.piece.instance)
+
+	return <SourceLayerItem {...props} contentStatus={contentStatus} />
+}
diff --git a/meteor/client/ui/SegmentTimeline/TimelineGrid.tsx b/packages/webui/src/client/ui/SegmentTimeline/TimelineGrid.tsx
similarity index 98%
rename from meteor/client/ui/SegmentTimeline/TimelineGrid.tsx
rename to packages/webui/src/client/ui/SegmentTimeline/TimelineGrid.tsx
index 28e98bad07..661ce540e9 100644
--- a/meteor/client/ui/SegmentTimeline/TimelineGrid.tsx
+++ b/packages/webui/src/client/ui/SegmentTimeline/TimelineGrid.tsx
@@ -7,7 +7,7 @@ import { RundownUtils } from '../../lib/rundown'
 import { getElementWidth, getElementHeight } from '../../utils/dimensions'
 import { onElementResize } from '../../lib/resizeObserver'
 import { PartUi } from './SegmentTimelineContainer'
-import { getCurrentTime } from '../../../lib/lib'
+import { getCurrentTime } from '../../lib/systemTime'
 import { RundownTiming } from '../RundownView/RundownTiming/RundownTiming'
 import { SegmentTimelinePartClass } from './Parts/SegmentTimelinePart'
 import { RundownTimingContext } from '../../lib/rundownTiming'
@@ -21,7 +21,10 @@ declare class FontFace {
 	load(): void
 }
 
-const LABEL_FONT_URL = 'url("/fonts/roboto-gh-pages/fonts/Light/Roboto-Light.woff")'
+const LABEL_FONT_URL = `url("${new URL(
+	'../../../fonts/roboto-gh-pages/fonts/Light/Roboto-Light.woff2',
+	import.meta.url
+)}")`
 const LABEL_COLOR = 'rgb(80,80,80)'
 const SHORT_LINE_GRID_COLOR = 'rgb(112,112,112)'
 const LONG_LINE_GRID_COLOR = 'rgb(80,80,80)'
@@ -52,7 +55,7 @@ export class TimelineGrid extends React.Component<ITimelineGridProps> {
 		durations: PropTypes.object.isRequired,
 	}
 
-	context:
+	declare context:
 		| {
 				durations: RundownTimingContext
 		  }
diff --git a/meteor/client/ui/SegmentTimeline/Zoom_In_MouseOut.json b/packages/webui/src/client/ui/SegmentTimeline/Zoom_In_MouseOut.json
similarity index 100%
rename from meteor/client/ui/SegmentTimeline/Zoom_In_MouseOut.json
rename to packages/webui/src/client/ui/SegmentTimeline/Zoom_In_MouseOut.json
diff --git a/meteor/client/ui/SegmentTimeline/Zoom_In_MouseOver.json b/packages/webui/src/client/ui/SegmentTimeline/Zoom_In_MouseOver.json
similarity index 100%
rename from meteor/client/ui/SegmentTimeline/Zoom_In_MouseOver.json
rename to packages/webui/src/client/ui/SegmentTimeline/Zoom_In_MouseOver.json
diff --git a/meteor/client/ui/SegmentTimeline/Zoom_Normal_MouseOut.json b/packages/webui/src/client/ui/SegmentTimeline/Zoom_Normal_MouseOut.json
similarity index 100%
rename from meteor/client/ui/SegmentTimeline/Zoom_Normal_MouseOut.json
rename to packages/webui/src/client/ui/SegmentTimeline/Zoom_Normal_MouseOut.json
diff --git a/meteor/client/ui/SegmentTimeline/Zoom_Normal_MouseOver.json b/packages/webui/src/client/ui/SegmentTimeline/Zoom_Normal_MouseOver.json
similarity index 100%
rename from meteor/client/ui/SegmentTimeline/Zoom_Normal_MouseOver.json
rename to packages/webui/src/client/ui/SegmentTimeline/Zoom_Normal_MouseOver.json
diff --git a/meteor/client/ui/SegmentTimeline/Zoom_Out_MouseOut.json b/packages/webui/src/client/ui/SegmentTimeline/Zoom_Out_MouseOut.json
similarity index 100%
rename from meteor/client/ui/SegmentTimeline/Zoom_Out_MouseOut.json
rename to packages/webui/src/client/ui/SegmentTimeline/Zoom_Out_MouseOut.json
diff --git a/meteor/client/ui/SegmentTimeline/Zoom_Out_MouseOver.json b/packages/webui/src/client/ui/SegmentTimeline/Zoom_Out_MouseOver.json
similarity index 100%
rename from meteor/client/ui/SegmentTimeline/Zoom_Out_MouseOver.json
rename to packages/webui/src/client/ui/SegmentTimeline/Zoom_Out_MouseOver.json
diff --git a/packages/webui/src/client/ui/SegmentTimeline/withMediaObjectStatus.tsx b/packages/webui/src/client/ui/SegmentTimeline/withMediaObjectStatus.tsx
new file mode 100644
index 0000000000..106fb5c888
--- /dev/null
+++ b/packages/webui/src/client/ui/SegmentTimeline/withMediaObjectStatus.tsx
@@ -0,0 +1,115 @@
+import { PieceUi } from './SegmentTimelineContainer'
+import { RundownUtils } from '../../lib/rundown'
+import { IAdLibListItem } from '../Shelf/AdLibListItem'
+import { BucketAdLibUi, BucketAdLibActionUi } from '../Shelf/RundownViewBuckets'
+import { AdLibPieceUi } from '../../lib/shelf'
+import { UIBucketContentStatuses, UIPieceContentStatuses } from '../Collections'
+import { Piece } from '@sofie-automation/corelib/dist/dataModel/Piece'
+import { PieceContentStatusObj } from '@sofie-automation/meteor-lib/dist/api/pieceContentStatus'
+import { useTracker } from '../../lib/ReactMeteorData/ReactMeteorData'
+import { PieceInstance } from '@sofie-automation/corelib/dist/dataModel/PieceInstance'
+import { UIBucketContentStatus, UIPieceContentStatus } from '@sofie-automation/meteor-lib/dist/api/rundownNotifications'
+import { AdLibPiece } from '@sofie-automation/corelib/dist/dataModel/AdLibPiece'
+import { ReadonlyDeep } from 'type-fest'
+
+function unwrapPieceInstance(piece: BucketAdLibUi | IAdLibListItem | AdLibPieceUi | PieceUi | BucketAdLibActionUi) {
+	if (RundownUtils.isPieceInstance(piece)) {
+		return piece.instance.piece
+	} else {
+		return piece
+	}
+}
+
+function getStatusDocForPiece(
+	piece: BucketAdLibUi | IAdLibListItem | AdLibPieceUi | PieceUi | BucketAdLibActionUi
+): UIPieceContentStatus | UIBucketContentStatus | undefined {
+	const pieceUnwrapped = unwrapPieceInstance(piece)
+
+	// Bucket items use a different collection
+	if (RundownUtils.isBucketAdLibItem(piece)) {
+		return UIBucketContentStatuses.findOne({
+			bucketId: piece.bucketId,
+			docId: pieceUnwrapped._id,
+		})
+	}
+
+	// PieceInstance's might have a dedicated status
+	if (RundownUtils.isPieceInstance(piece)) {
+		const status = UIPieceContentStatuses.findOne({
+			// Future: It would be good for this to be stricter.
+			pieceId: piece.instance._id,
+		})
+		if (status) return status
+	}
+
+	// Fallback to using the one from the source piece
+	return UIPieceContentStatuses.findOne({
+		// Future: It would be good for this to be stricter.
+		pieceId: pieceUnwrapped._id,
+	})
+}
+
+/** @deprecated */
+export interface WithMediaObjectStatusProps {
+	contentStatus: ReadonlyDeep<PieceContentStatusObj> | undefined
+}
+
+export function useContentStatusForAdlibPiece(
+	piece: Pick<AdLibPiece, '_id' | 'rundownId'> | undefined
+): PieceContentStatusObj | undefined {
+	return useTracker(
+		() =>
+			piece
+				? UIPieceContentStatuses.findOne({
+						pieceId: piece._id,
+						rundownId: piece.rundownId || { $exists: false },
+				  })?.status
+				: undefined,
+		[piece?._id, piece?.rundownId]
+	)
+}
+
+export function useContentStatusForPiece(
+	piece: Pick<Piece, '_id' | 'startRundownId' | 'startSegmentId'> | undefined
+): PieceContentStatusObj | undefined {
+	return useTracker(
+		() =>
+			piece
+				? UIPieceContentStatuses.findOne({
+						pieceId: piece._id,
+						rundownId: piece.startRundownId || { $exists: false },
+						segmentId: piece.startSegmentId || { $exists: false },
+				  })?.status
+				: undefined,
+		[piece?._id, piece?.startRundownId, piece?.startSegmentId]
+	)
+}
+
+export function useContentStatusForPieceInstance(
+	piece: (Pick<PieceInstance, '_id' | 'rundownId'> & { piece: Pick<Piece, '_id'> }) | undefined
+): PieceContentStatusObj | undefined {
+	return useTracker(() => {
+		if (!piece) return undefined
+
+		// PieceInstance's might have a dedicated status
+		const instanceStatus = UIPieceContentStatuses.findOne({
+			pieceId: piece._id,
+			rundownId: piece.rundownId || { $exists: false },
+		})
+
+		if (instanceStatus) return instanceStatus.status
+
+		// Fallback to using the one from the source piece
+		return UIPieceContentStatuses.findOne({
+			pieceId: piece.piece._id,
+			// Future: It would be good for this to be stricter.
+			rundownId: piece.rundownId || { $exists: false },
+		})?.status
+	}, [piece?._id, piece?.rundownId])
+}
+
+export function useContentStatusForItem(
+	piece: BucketAdLibUi | IAdLibListItem | AdLibPieceUi | PieceUi | BucketAdLibActionUi | undefined
+): ReadonlyDeep<PieceContentStatusObj> | undefined {
+	return useTracker(() => piece && getStatusDocForPiece(piece)?.status, [piece])
+}
diff --git a/meteor/client/ui/Settings.tsx b/packages/webui/src/client/ui/Settings.tsx
similarity index 76%
rename from meteor/client/ui/Settings.tsx
rename to packages/webui/src/client/ui/Settings.tsx
index 81bd7c0e37..cc189af8e9 100644
--- a/meteor/client/ui/Settings.tsx
+++ b/packages/webui/src/client/ui/Settings.tsx
@@ -1,6 +1,5 @@
-import React, { useEffect } from 'react'
-import { useSubscription, useTracker } from '../lib/ReactMeteorData/react-meteor-data'
-import { Route, Switch, Redirect, useHistory } from 'react-router-dom'
+import { useSubscription } from '../lib/ReactMeteorData/react-meteor-data'
+import { Route, Switch, Redirect } from 'react-router-dom'
 import { ErrorBoundary } from '../lib/ErrorBoundary'
 
 import StudioSettings from './Settings/StudioSettings'
@@ -11,38 +10,24 @@ import BlueprintSettings from './Settings/BlueprintSettings'
 import SystemManagement from './Settings/SystemManagement'
 
 import { MigrationView } from './Settings/Migration'
-import { getUser } from '../../lib/collections/Users'
-import { Settings as MeteorSettings } from '../../lib/Settings'
 import { SettingsMenu } from './Settings/SettingsMenu'
-import { getAllowConfigure } from '../lib/localStorage'
 import { protectString } from '@sofie-automation/corelib/dist/protectedString'
 import { CorelibPubSub } from '@sofie-automation/corelib/dist/pubsub'
 
 export function Settings(): JSX.Element | null {
-	const user = useTracker(() => getUser(), [], null)
-
-	const history = useHistory()
-
 	useSubscription(CorelibPubSub.peripheralDevices, null)
 	useSubscription(CorelibPubSub.studios, null)
 	useSubscription(CorelibPubSub.showStyleBases, null)
 	useSubscription(CorelibPubSub.showStyleVariants, null, null)
 	useSubscription(CorelibPubSub.blueprints, null)
 
-	useEffect(() => {
-		if (MeteorSettings.enableUserAccounts && user) {
-			const access = getAllowConfigure()
-			if (!access) history.push('/')
-		}
-	}, [user])
-
 	return (
 		<div className="mtl gutter has-statusbar">
 			<div className="mod mvl mhs">
 				<div className="row">
 					<div className="col c12 rm-c3 settings-menu">
 						<ErrorBoundary>
-							<SettingsMenu superAdmin={user?.superAdmin ?? false} />
+							<SettingsMenu />
 						</ErrorBoundary>
 					</div>
 					<div className="col c12 rm-c9 settings-dialog">
@@ -57,7 +42,6 @@ export function Settings(): JSX.Element | null {
 									render={(props) => (
 										<BlueprintSettings
 											blueprintId={protectString(decodeURIComponent(props.match.params.blueprintId))}
-											userId={user?._id}
 										/>
 									)}
 								/>
diff --git a/meteor/client/ui/Settings/BlueprintConfigSchema/CategoryEntry.tsx b/packages/webui/src/client/ui/Settings/BlueprintConfigSchema/CategoryEntry.tsx
similarity index 98%
rename from meteor/client/ui/Settings/BlueprintConfigSchema/CategoryEntry.tsx
rename to packages/webui/src/client/ui/Settings/BlueprintConfigSchema/CategoryEntry.tsx
index d16de6ff07..1a48db871a 100644
--- a/meteor/client/ui/Settings/BlueprintConfigSchema/CategoryEntry.tsx
+++ b/packages/webui/src/client/ui/Settings/BlueprintConfigSchema/CategoryEntry.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback } from 'react'
+import { useCallback } from 'react'
 import ClassNames from 'classnames'
 import { useTranslation } from 'react-i18next'
 import { SchemaFormWithOverrides } from '../../../lib/forms/SchemaFormWithOverrides'
diff --git a/meteor/client/ui/Settings/BlueprintConfigSchema/index.tsx b/packages/webui/src/client/ui/Settings/BlueprintConfigSchema/index.tsx
similarity index 98%
rename from meteor/client/ui/Settings/BlueprintConfigSchema/index.tsx
rename to packages/webui/src/client/ui/Settings/BlueprintConfigSchema/index.tsx
index 8328300b7b..74770369fb 100644
--- a/meteor/client/ui/Settings/BlueprintConfigSchema/index.tsx
+++ b/packages/webui/src/client/ui/Settings/BlueprintConfigSchema/index.tsx
@@ -1,7 +1,7 @@
-import React, { useCallback, useMemo } from 'react'
+import { useCallback, useMemo } from 'react'
 import { MappingExt, MappingsExt } from '@sofie-automation/corelib/dist/dataModel/Studio'
 import { IBlueprintConfig, ISourceLayer, SchemaFormUIField } from '@sofie-automation/blueprints-integration'
-import { groupByToMapFunc, literal } from '../../../../lib/lib'
+import { groupByToMapFunc, literal } from '../../../lib/tempLib'
 import { useTranslation } from 'react-i18next'
 import {
 	applyAndValidateOverrides,
diff --git a/meteor/client/ui/Settings/BlueprintSettings.tsx b/packages/webui/src/client/ui/Settings/BlueprintSettings.tsx
similarity index 96%
rename from meteor/client/ui/Settings/BlueprintSettings.tsx
rename to packages/webui/src/client/ui/Settings/BlueprintSettings.tsx
index 96283487a1..47d8ae0435 100644
--- a/meteor/client/ui/Settings/BlueprintSettings.tsx
+++ b/packages/webui/src/client/ui/Settings/BlueprintSettings.tsx
@@ -8,22 +8,21 @@ import Moment from 'react-moment'
 import { Link } from 'react-router-dom'
 import { DBStudio } from '@sofie-automation/corelib/dist/dataModel/Studio'
 import { DBShowStyleBase } from '@sofie-automation/corelib/dist/dataModel/ShowStyleBase'
-import { ICoreSystem } from '../../../lib/collections/CoreSystem'
+import { ICoreSystem } from '@sofie-automation/meteor-lib/dist/collections/CoreSystem'
 import { BlueprintManifestType } from '@sofie-automation/blueprints-integration'
-import { NotificationCenter, Notification, NoticeLevel } from '../../../lib/notifications/notifications'
+import { NotificationCenter, Notification, NoticeLevel } from '../../lib/notifications/notifications'
 import { catchError, fetchFrom } from '../../lib/lib'
 import { UploadButton } from '../../lib/uploadButton'
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
 import { faUpload, faExclamationTriangle } from '@fortawesome/free-solid-svg-icons'
-import { unprotectString } from '../../../lib/lib'
-import { MeteorCall } from '../../../lib/api/methods'
-import { BlueprintId, UserId } from '@sofie-automation/corelib/dist/dataModel/Ids'
+import { unprotectString } from '../../lib/tempLib'
+import { MeteorCall } from '../../lib/meteorApi'
+import { BlueprintId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import { Blueprints, CoreSystem, ShowStyleBases, Studios } from '../../collections'
 import { LabelActual } from '../../lib/Components/LabelAndOverrides'
 
 interface IProps {
 	blueprintId: BlueprintId
-	userId?: UserId
 }
 interface IState {
 	uploadFileKey: number // Used to force clear the input after use
@@ -93,7 +92,7 @@ export default translateWithTracker<IProps, IState, ITrackedProps>((props: IProp
 								body: uploadFileContents,
 								headers: {
 									'content-type': 'text/javascript',
-									authorization: 'id ' + this.props.userId,
+									// authorization: 'id ' + this.props.userId,
 								},
 							})
 								.then(() => {
@@ -133,7 +132,7 @@ export default translateWithTracker<IProps, IState, ITrackedProps>((props: IProp
 														body: uploadFileContents,
 														headers: {
 															'content-type': 'text/javascript',
-															authorization: 'id ' + this.props.userId,
+															// authorization: 'id ' + this.props.userId,
 														},
 													})
 														.then(() => {
diff --git a/meteor/client/ui/Settings/DevicePackageManagerSettings.tsx b/packages/webui/src/client/ui/Settings/DevicePackageManagerSettings.tsx
similarity index 98%
rename from meteor/client/ui/Settings/DevicePackageManagerSettings.tsx
rename to packages/webui/src/client/ui/Settings/DevicePackageManagerSettings.tsx
index 818c081dc8..010fb79abc 100644
--- a/meteor/client/ui/Settings/DevicePackageManagerSettings.tsx
+++ b/packages/webui/src/client/ui/Settings/DevicePackageManagerSettings.tsx
@@ -6,11 +6,11 @@ import { doModalDialog } from '../../lib/ModalDialog'
 import { Meteor } from 'meteor/meteor'
 import { stringifyError } from '@sofie-automation/shared-lib/dist/lib/stringifyError'
 import { useTranslation } from 'react-i18next'
-import { MeteorCall } from '../../../lib/api/methods'
+import { MeteorCall } from '../../lib/meteorApi'
 import { PeripheralDeviceId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import { PeripheralDevices } from '../../collections'
-import { eventContextForLog } from '../../../lib/clientUserAction'
-import { logger } from '../../../lib/logging'
+import { eventContextForLog } from '../../lib/clientUserAction'
+import { logger } from '../../lib/logging'
 
 interface IDevicePackageManagerSettingsProps {
 	deviceId: PeripheralDeviceId
diff --git a/meteor/client/ui/Settings/DeviceSettings.tsx b/packages/webui/src/client/ui/Settings/DeviceSettings.tsx
similarity index 99%
rename from meteor/client/ui/Settings/DeviceSettings.tsx
rename to packages/webui/src/client/ui/Settings/DeviceSettings.tsx
index 3acf82a51d..b799ae1d10 100644
--- a/meteor/client/ui/Settings/DeviceSettings.tsx
+++ b/packages/webui/src/client/ui/Settings/DeviceSettings.tsx
@@ -11,7 +11,7 @@ import { Translated, translateWithTracker } from '../../lib/ReactMeteorData/reac
 import { Spinner } from '../../lib/Spinner'
 import { PeripheralDevicesAPI } from '../../lib/clientAPI'
 
-import { NotificationCenter, Notification, NoticeLevel } from '../../../lib/notifications/notifications'
+import { NotificationCenter, Notification, NoticeLevel } from '../../lib/notifications/notifications'
 import { StatusCodePill } from '../Status/StatusCodePill'
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
 import { faExclamationTriangle } from '@fortawesome/free-solid-svg-icons'
diff --git a/meteor/client/ui/Settings/Forms.scss b/packages/webui/src/client/ui/Settings/Forms.scss
similarity index 71%
rename from meteor/client/ui/Settings/Forms.scss
rename to packages/webui/src/client/ui/Settings/Forms.scss
index 018074d0f5..9d5849c0aa 100644
--- a/meteor/client/ui/Settings/Forms.scss
+++ b/packages/webui/src/client/ui/Settings/Forms.scss
@@ -1,6 +1,6 @@
 .properties-grid {
 	display: grid;
-	grid-auto-columns: fit-content(350px) minmax(350px, 1fr) fit-content(350px) minmax(max-content, 100px);
+	grid-auto-columns: fit-content(350px) auto minmax(350px, 1fr) fit-content(350px) minmax(max-content, 100px);
 	gap: 0 10px;
 	margin-left: 10px;
 
@@ -28,6 +28,14 @@
 	grid-column: 1 / 5;
 }
 
+.properties-grid > .field > .field-content {
+	text-wrap: nowrap;
+
+	.field-clear {
+		margin-bottom: -6px !important;
+	}
+}
+
 .properties-grid > .field > .field-hint {
 	grid-column: 1 / 5;
 }
diff --git a/meteor/client/ui/Settings/Migration.tsx b/packages/webui/src/client/ui/Settings/Migration.tsx
similarity index 98%
rename from meteor/client/ui/Settings/Migration.tsx
rename to packages/webui/src/client/ui/Settings/Migration.tsx
index d00b7d3c53..20f77b6a65 100644
--- a/meteor/client/ui/Settings/Migration.tsx
+++ b/packages/webui/src/client/ui/Settings/Migration.tsx
@@ -4,12 +4,16 @@ import { doModalDialog } from '../../lib/ModalDialog'
 import ClassNames from 'classnames'
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
 import { faClipboardCheck, faDatabase, faCoffee, faEye, faEyeSlash } from '@fortawesome/free-solid-svg-icons'
-import { logger } from '../../../lib/logging'
-import { GetMigrationStatusResult, RunMigrationResult, MigrationChunk } from '../../../lib/api/migration'
+import { logger } from '../../lib/logging'
+import {
+	GetMigrationStatusResult,
+	RunMigrationResult,
+	MigrationChunk,
+} from '@sofie-automation/meteor-lib/dist/api/migration'
 import { MigrationStepInput, MigrationStepInputResult } from '@sofie-automation/blueprints-integration'
 import * as _ from 'underscore'
 import { EditAttribute, EditAttributeBase } from '../../lib/EditAttribute'
-import { MeteorCall } from '../../../lib/api/methods'
+import { MeteorCall } from '../../lib/meteorApi'
 import { checkForOldDataAndCleanUp } from './SystemManagement'
 import { stringifyError } from '@sofie-automation/shared-lib/dist/lib/stringifyError'
 import { UpgradesView } from './Upgrades/View'
diff --git a/meteor/client/ui/Settings/RundownLayoutEditor.tsx b/packages/webui/src/client/ui/Settings/RundownLayoutEditor.tsx
similarity index 98%
rename from meteor/client/ui/Settings/RundownLayoutEditor.tsx
rename to packages/webui/src/client/ui/Settings/RundownLayoutEditor.tsx
index 24bb1c54e2..3ad49b4f8b 100644
--- a/meteor/client/ui/Settings/RundownLayoutEditor.tsx
+++ b/packages/webui/src/client/ui/Settings/RundownLayoutEditor.tsx
@@ -13,21 +13,21 @@ import {
 	ActionButtonType,
 	DashboardLayoutActionButton,
 	RundownLayoutElementType,
-} from '../../../lib/collections/RundownLayouts'
+} from '@sofie-automation/meteor-lib/dist/collections/RundownLayouts'
 import {
 	CustomizableRegionLayout,
 	CustomizableRegionSettingsManifest,
 	RundownLayoutsAPI,
-} from '../../../lib/api/rundownLayouts'
-import { MeteorPubSub } from '../../../lib/api/pubsub'
-import { getRandomString, literal, unprotectString } from '../../../lib/lib'
+} from '../../lib/rundownLayouts'
+import { MeteorPubSub } from '@sofie-automation/meteor-lib/dist/api/pubsub'
+import { getRandomString, literal, unprotectString } from '../../lib/tempLib'
 import { UploadButton } from '../../lib/uploadButton'
 import { doModalDialog } from '../../lib/ModalDialog'
-import { NotificationCenter, Notification, NoticeLevel } from '../../../lib/notifications/notifications'
+import { NotificationCenter, Notification, NoticeLevel } from '../../lib/notifications/notifications'
 import { catchError, fetchFrom } from '../../lib/lib'
 import { DBStudio } from '@sofie-automation/corelib/dist/dataModel/Studio'
 import { Link } from 'react-router-dom'
-import { MeteorCall } from '../../../lib/api/methods'
+import { MeteorCall } from '../../lib/meteorApi'
 import { defaultColorPickerPalette } from '../../lib/colorPicker'
 import FilterEditor from './components/FilterEditor'
 import ShelfLayoutSettings from './components/rundownLayouts/ShelfLayoutSettings'
diff --git a/meteor/client/ui/Settings/SettingsMenu.tsx b/packages/webui/src/client/ui/Settings/SettingsMenu.tsx
similarity index 96%
rename from meteor/client/ui/Settings/SettingsMenu.tsx
rename to packages/webui/src/client/ui/Settings/SettingsMenu.tsx
index 856299b76f..c49ecb9dde 100644
--- a/meteor/client/ui/Settings/SettingsMenu.tsx
+++ b/packages/webui/src/client/ui/Settings/SettingsMenu.tsx
@@ -1,29 +1,25 @@
 import React, { useCallback, useMemo } from 'react'
 import { useSubscription, useTracker } from '../../lib/ReactMeteorData/react-meteor-data'
-import { unprotectString } from '../../../lib/lib'
+import { unprotectString } from '../../lib/tempLib'
 import { doModalDialog } from '../../lib/ModalDialog'
 import { NavLink, useLocation } from 'react-router-dom'
 import { DBStudio } from '@sofie-automation/corelib/dist/dataModel/Studio'
 import { PeripheralDevice, PERIPHERAL_SUBTYPE_PROCESS } from '@sofie-automation/corelib/dist/dataModel/PeripheralDevice'
-import { NotificationCenter, Notification, NoticeLevel } from '../../../lib/notifications/notifications'
+import { NotificationCenter, Notification, NoticeLevel } from '../../lib/notifications/notifications'
 import { faPlus, faTrash, faExclamationTriangle, faCaretRight, faCaretDown } from '@fortawesome/free-solid-svg-icons'
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
 import { DBShowStyleBase } from '@sofie-automation/corelib/dist/dataModel/ShowStyleBase'
 import { Blueprint } from '@sofie-automation/corelib/dist/dataModel/Blueprint'
-import { MeteorCall } from '../../../lib/api/methods'
-import { Settings as MeteorSettings } from '../../../lib/Settings'
+import { MeteorCall } from '../../lib/meteorApi'
 import { IOutputLayer, StatusCode } from '@sofie-automation/blueprints-integration'
 import { TFunction, useTranslation } from 'react-i18next'
-import { RundownLayoutsAPI } from '../../../lib/api/rundownLayouts'
+import { RundownLayoutsAPI } from '../../lib/rundownLayouts'
 import { Blueprints, PeripheralDevices, ShowStyleBases, Studios } from '../../collections'
 import { applyAndValidateOverrides } from '@sofie-automation/corelib/dist/settings/objectWithOverrides'
 import { catchError } from '../../lib/lib'
 import { CorelibPubSub } from '@sofie-automation/corelib/dist/pubsub'
 
-interface ISettingsMenuProps {
-	superAdmin?: boolean
-}
-export function SettingsMenu({ superAdmin }: Readonly<ISettingsMenuProps>): JSX.Element {
+export function SettingsMenu(): JSX.Element {
 	const { t } = useTranslation()
 
 	return (
@@ -32,13 +28,13 @@ export function SettingsMenu({ superAdmin }: Readonly<ISettingsMenuProps>): JSX.
 
 			<SettingsMenuShowStyles />
 
-			{(!MeteorSettings.enableUserAccounts || superAdmin) && <SettingsMenuBlueprints />}
+			{<SettingsMenuBlueprints />}
 
 			<SettingsMenuPeripheralDevices />
 
 			<h2 className="mhs">{t('Tools')}</h2>
 			<hr className="vsubtle man" />
-			{(!MeteorSettings.enableUserAccounts || superAdmin) && (
+			{
 				<React.Fragment>
 					<NavLink
 						activeClassName="selectable-selected"
@@ -62,7 +58,7 @@ export function SettingsMenu({ superAdmin }: Readonly<ISettingsMenuProps>): JSX.
 						<h3>{t('Manage Snapshots')}</h3>
 					</NavLink>
 				</React.Fragment>
-			)}
+			}
 		</div>
 	)
 }
diff --git a/meteor/client/ui/Settings/ShowStyle/BlueprintConfiguration/SelectBlueprint.tsx b/packages/webui/src/client/ui/Settings/ShowStyle/BlueprintConfiguration/SelectBlueprint.tsx
similarity index 98%
rename from meteor/client/ui/Settings/ShowStyle/BlueprintConfiguration/SelectBlueprint.tsx
rename to packages/webui/src/client/ui/Settings/ShowStyle/BlueprintConfiguration/SelectBlueprint.tsx
index 3178c0c4af..333f1e3ea0 100644
--- a/meteor/client/ui/Settings/ShowStyle/BlueprintConfiguration/SelectBlueprint.tsx
+++ b/packages/webui/src/client/ui/Settings/ShowStyle/BlueprintConfiguration/SelectBlueprint.tsx
@@ -1,4 +1,4 @@
-import React, { useMemo } from 'react'
+import { useMemo } from 'react'
 import { useTracker } from '../../../../lib/ReactMeteorData/react-meteor-data'
 import { BlueprintManifestType } from '@sofie-automation/blueprints-integration'
 import { Blueprints, ShowStyleBases } from '../../../../collections'
diff --git a/meteor/client/ui/Settings/ShowStyle/BlueprintConfiguration/SelectConfigPreset.tsx b/packages/webui/src/client/ui/Settings/ShowStyle/BlueprintConfiguration/SelectConfigPreset.tsx
similarity index 98%
rename from meteor/client/ui/Settings/ShowStyle/BlueprintConfiguration/SelectConfigPreset.tsx
rename to packages/webui/src/client/ui/Settings/ShowStyle/BlueprintConfiguration/SelectConfigPreset.tsx
index c59ed65287..c8763f18cc 100644
--- a/meteor/client/ui/Settings/ShowStyle/BlueprintConfiguration/SelectConfigPreset.tsx
+++ b/packages/webui/src/client/ui/Settings/ShowStyle/BlueprintConfiguration/SelectConfigPreset.tsx
@@ -1,4 +1,4 @@
-import React, { useMemo } from 'react'
+import { useMemo } from 'react'
 import { useTracker } from '../../../../lib/ReactMeteorData/react-meteor-data'
 import { BlueprintManifestType, IShowStyleConfigPreset } from '@sofie-automation/blueprints-integration'
 import { Blueprints, ShowStyleBases } from '../../../../collections'
diff --git a/meteor/client/ui/Settings/ShowStyle/BlueprintConfiguration/index.tsx b/packages/webui/src/client/ui/Settings/ShowStyle/BlueprintConfiguration/index.tsx
similarity index 96%
rename from meteor/client/ui/Settings/ShowStyle/BlueprintConfiguration/index.tsx
rename to packages/webui/src/client/ui/Settings/ShowStyle/BlueprintConfiguration/index.tsx
index 67524a3947..ef3e341451 100644
--- a/meteor/client/ui/Settings/ShowStyle/BlueprintConfiguration/index.tsx
+++ b/packages/webui/src/client/ui/Settings/ShowStyle/BlueprintConfiguration/index.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback, useMemo } from 'react'
+import { useCallback, useMemo } from 'react'
 import { JSONSchema } from '@sofie-automation/blueprints-integration'
 import { BlueprintConfigSchemaSettings } from '../../BlueprintConfigSchema'
 import { SomeObjectOverrideOp } from '@sofie-automation/corelib/dist/settings/objectWithOverrides'
@@ -8,7 +8,7 @@ import { MappingsExt } from '@sofie-automation/corelib/dist/dataModel/Studio'
 import { DBShowStyleBase, SourceLayers } from '@sofie-automation/corelib/dist/dataModel/ShowStyleBase'
 import { SelectConfigPreset } from './SelectConfigPreset'
 import { SelectBlueprint } from './SelectBlueprint'
-import { MeteorPubSub } from '../../../../../lib/api/pubsub'
+import { MeteorPubSub } from '@sofie-automation/meteor-lib/dist/api/pubsub'
 import { useSubscription, useTracker } from '../../../../lib/ReactMeteorData/ReactMeteorData'
 import { UIBlueprintUpgradeStatuses } from '../../../Collections'
 import { getUpgradeStatusMessage, UpgradeStatusButtons } from '../../Upgrades/Components'
diff --git a/meteor/client/ui/Settings/ShowStyle/DragDropTypesShowStyle.ts b/packages/webui/src/client/ui/Settings/ShowStyle/DragDropTypesShowStyle.ts
similarity index 100%
rename from meteor/client/ui/Settings/ShowStyle/DragDropTypesShowStyle.ts
rename to packages/webui/src/client/ui/Settings/ShowStyle/DragDropTypesShowStyle.ts
diff --git a/meteor/client/ui/Settings/ShowStyle/Generic.tsx b/packages/webui/src/client/ui/Settings/ShowStyle/Generic.tsx
similarity index 95%
rename from meteor/client/ui/Settings/ShowStyle/Generic.tsx
rename to packages/webui/src/client/ui/Settings/ShowStyle/Generic.tsx
index 014f74d4a0..edfbfc1ca4 100644
--- a/meteor/client/ui/Settings/ShowStyle/Generic.tsx
+++ b/packages/webui/src/client/ui/Settings/ShowStyle/Generic.tsx
@@ -1,8 +1,7 @@
-import * as React from 'react'
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
 import { faExclamationTriangle } from '@fortawesome/free-solid-svg-icons'
 import { useTranslation } from 'react-i18next'
-import { unprotectString } from '../../../../lib/lib'
+import { unprotectString } from '../../../lib/tempLib'
 import { EditAttribute } from '../../../lib/EditAttribute'
 import { DBShowStyleBase } from '@sofie-automation/corelib/dist/dataModel/ShowStyleBase'
 import { Link } from 'react-router-dom'
diff --git a/meteor/client/ui/Settings/ShowStyle/HotkeyLegend.tsx b/packages/webui/src/client/ui/Settings/ShowStyle/HotkeyLegend.tsx
similarity index 97%
rename from meteor/client/ui/Settings/ShowStyle/HotkeyLegend.tsx
rename to packages/webui/src/client/ui/Settings/ShowStyle/HotkeyLegend.tsx
index 2bdf30fc6b..43fc678ebe 100644
--- a/meteor/client/ui/Settings/ShowStyle/HotkeyLegend.tsx
+++ b/packages/webui/src/client/ui/Settings/ShowStyle/HotkeyLegend.tsx
@@ -5,19 +5,23 @@ import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
 import { SourceLayerType } from '@sofie-automation/blueprints-integration'
 import { HotkeyDefinition } from '@sofie-automation/corelib/dist/dataModel/ShowStyleBase'
 import { literal, getRandomString } from '@sofie-automation/corelib/dist/lib'
-import { Random } from 'meteor/random'
 import { withTranslation } from 'react-i18next'
 import { DBShowStyleBase } from '@sofie-automation/corelib/dist/dataModel/ShowStyleBase'
-import { AHKBaseHeader, AHKModifierMap, AHKKeyboardMap, useAHKComboTemplate } from '../../../../lib/tv2/AHKkeyboardMap'
+import {
+	AHKBaseHeader,
+	AHKModifierMap,
+	AHKKeyboardMap,
+	useAHKComboTemplate,
+} from '@sofie-automation/meteor-lib/dist/tv2/AHKkeyboardMap'
 import { defaultColorPickerPalette } from '../../../lib/colorPicker'
 import { downloadBlob } from '../../../lib/downloadBlob'
 import { EditAttribute } from '../../../lib/EditAttribute'
 import { hotkeyHelper } from '../../../lib/hotkeyHelper'
-import { NotificationCenter, NoticeLevel, Notification } from '../../../../lib/notifications/notifications'
+import { NotificationCenter, NoticeLevel, Notification } from '../../../lib/notifications/notifications'
 import { Translated } from '../../../lib/ReactMeteorData/ReactMeteorData'
 import { UploadButton } from '../../../lib/uploadButton'
 import _ from 'underscore'
-import { Settings } from '../../../../lib/Settings'
+import { Settings } from '../../../lib/Settings'
 import { ShowStyleBases } from '../../../collections'
 import { LabelActual } from '../../../lib/Components/LabelAndOverrides'
 
@@ -190,7 +194,7 @@ export const HotkeyLegendSettings = withTranslation()(
 				const conformedConfig: Array<HotkeyDefinition> = []
 				_.forEach(newConfig, (entry) => {
 					const newEntry: HotkeyDefinition = {
-						_id: Random.id(),
+						_id: getRandomString(),
 						key: entry.key || '',
 						label: entry.label || '',
 						sourceLayerType: entry.sourceLayerType,
diff --git a/meteor/client/ui/Settings/ShowStyle/OutputLayer.tsx b/packages/webui/src/client/ui/Settings/ShowStyle/OutputLayer.tsx
similarity index 100%
rename from meteor/client/ui/Settings/ShowStyle/OutputLayer.tsx
rename to packages/webui/src/client/ui/Settings/ShowStyle/OutputLayer.tsx
diff --git a/meteor/client/ui/Settings/ShowStyle/SourceLayer.tsx b/packages/webui/src/client/ui/Settings/ShowStyle/SourceLayer.tsx
similarity index 100%
rename from meteor/client/ui/Settings/ShowStyle/SourceLayer.tsx
rename to packages/webui/src/client/ui/Settings/ShowStyle/SourceLayer.tsx
diff --git a/meteor/client/ui/Settings/ShowStyle/VariantListItem.tsx b/packages/webui/src/client/ui/Settings/ShowStyle/VariantListItem.tsx
similarity index 100%
rename from meteor/client/ui/Settings/ShowStyle/VariantListItem.tsx
rename to packages/webui/src/client/ui/Settings/ShowStyle/VariantListItem.tsx
diff --git a/meteor/client/ui/Settings/ShowStyle/VariantSettings.tsx b/packages/webui/src/client/ui/Settings/ShowStyle/VariantSettings.tsx
similarity index 99%
rename from meteor/client/ui/Settings/ShowStyle/VariantSettings.tsx
rename to packages/webui/src/client/ui/Settings/ShowStyle/VariantSettings.tsx
index b1d06a1aef..f851cafa58 100644
--- a/meteor/client/ui/Settings/ShowStyle/VariantSettings.tsx
+++ b/packages/webui/src/client/ui/Settings/ShowStyle/VariantSettings.tsx
@@ -10,12 +10,12 @@ import {
 import { MappingsExt } from '@sofie-automation/corelib/dist/dataModel/Studio'
 import { unprotectString } from '@sofie-automation/corelib/dist/protectedString'
 import { useTranslation } from 'react-i18next'
-import { MeteorCall } from '../../../../lib/api/methods'
+import { MeteorCall } from '../../../lib/meteorApi'
 import { DBShowStyleBase, SourceLayers } from '@sofie-automation/corelib/dist/dataModel/ShowStyleBase'
 import { DBShowStyleVariant } from '@sofie-automation/corelib/dist/dataModel/ShowStyleVariant'
 import { doModalDialog } from '../../../lib/ModalDialog'
 import { ShowStyleVariantId } from '@sofie-automation/corelib/dist/dataModel/Ids'
-import { NoticeLevel, NotificationCenter, Notification } from '../../../../lib/notifications/notifications'
+import { NoticeLevel, NotificationCenter, Notification } from '../../../lib/notifications/notifications'
 import { UploadButton } from '../../../lib/uploadButton'
 import update from 'immutability-helper'
 import { VariantListItem } from './VariantListItem'
diff --git a/meteor/client/ui/Settings/ShowStyleBaseSettings.tsx b/packages/webui/src/client/ui/Settings/ShowStyleBaseSettings.tsx
similarity index 99%
rename from meteor/client/ui/Settings/ShowStyleBaseSettings.tsx
rename to packages/webui/src/client/ui/Settings/ShowStyleBaseSettings.tsx
index 4024469dff..d4992cd48d 100644
--- a/meteor/client/ui/Settings/ShowStyleBaseSettings.tsx
+++ b/packages/webui/src/client/ui/Settings/ShowStyleBaseSettings.tsx
@@ -6,7 +6,7 @@ import { DBShowStyleVariant } from '@sofie-automation/corelib/dist/dataModel/Sho
 import RundownLayoutEditor from './RundownLayoutEditor'
 import { DBStudio, MappingsExt } from '@sofie-automation/corelib/dist/dataModel/Studio'
 import { BlueprintManifestType, IShowStyleConfigPreset } from '@sofie-automation/blueprints-integration'
-import { RundownLayoutsAPI } from '../../../lib/api/rundownLayouts'
+import { RundownLayoutsAPI } from '../../lib/rundownLayouts'
 import { TriggeredActionsEditor } from './components/triggeredActions/TriggeredActionsEditor'
 import { SourceLayerSettings } from './ShowStyle/SourceLayer'
 import { OutputLayerSettings } from './ShowStyle/OutputLayer'
diff --git a/meteor/client/ui/Settings/SnapshotsView.tsx b/packages/webui/src/client/ui/Settings/SnapshotsView.tsx
similarity index 95%
rename from meteor/client/ui/Settings/SnapshotsView.tsx
rename to packages/webui/src/client/ui/Settings/SnapshotsView.tsx
index 42d7bb4c62..dafef71d12 100644
--- a/meteor/client/ui/Settings/SnapshotsView.tsx
+++ b/packages/webui/src/client/ui/Settings/SnapshotsView.tsx
@@ -1,23 +1,23 @@
 import * as React from 'react'
 import { Translated, useSubscription, useTracker } from '../../lib/ReactMeteorData/react-meteor-data'
 import { doModalDialog } from '../../lib/ModalDialog'
-import { SnapshotItem } from '../../../lib/collections/Snapshots'
-import { unprotectString } from '../../../lib/lib'
+import { SnapshotItem } from '@sofie-automation/meteor-lib/dist/collections/Snapshots'
+import { unprotectString } from '../../lib/tempLib'
 import * as _ from 'underscore'
-import { logger } from '../../../lib/logging'
+import { logger } from '../../lib/logging'
 import { EditAttribute } from '../../lib/EditAttribute'
 import { faWindowClose, faUpload } from '@fortawesome/free-solid-svg-icons'
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
 import { DBStudio } from '@sofie-automation/corelib/dist/dataModel/Studio'
 import { multilineText, fetchFrom } from '../../lib/lib'
-import { NotificationCenter, Notification, NoticeLevel } from '../../../lib/notifications/notifications'
+import { NotificationCenter, Notification, NoticeLevel } from '../../lib/notifications/notifications'
 import { UploadButton } from '../../lib/uploadButton'
-import { MeteorPubSub } from '../../../lib/api/pubsub'
-import { MeteorCall } from '../../../lib/api/methods'
+import { MeteorPubSub } from '@sofie-automation/meteor-lib/dist/api/pubsub'
+import { MeteorCall } from '../../lib/meteorApi'
 import { SnapshotId, StudioId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import { Snapshots, Studios } from '../../collections'
-import { ClientAPI } from '../../../lib/api/client'
-import { hashSingleUseToken } from '../../../lib/api/userActions'
+import { ClientAPI } from '@sofie-automation/meteor-lib/dist/api/client'
+import { hashSingleUseToken } from '../../lib/lib'
 import { CorelibPubSub } from '@sofie-automation/corelib/dist/pubsub'
 import { withTranslation } from 'react-i18next'
 
@@ -324,7 +324,7 @@ const SnapshotsViewContent = withTranslation()(
 							</UploadButton>
 							<UploadButton
 								accept="application/json,.json"
-								className="btn btn-secondary"
+								className="btn btn-secondary mls"
 								onChange={(e) => this.onUploadFile(e, true)}
 								key={this.state.uploadFileKey2}
 							>
diff --git a/meteor/client/ui/Settings/Studio/Baseline.tsx b/packages/webui/src/client/ui/Settings/Studio/Baseline.tsx
similarity index 92%
rename from meteor/client/ui/Settings/Studio/Baseline.tsx
rename to packages/webui/src/client/ui/Settings/Studio/Baseline.tsx
index 8dfc724e13..e79fa224d7 100644
--- a/meteor/client/ui/Settings/Studio/Baseline.tsx
+++ b/packages/webui/src/client/ui/Settings/Studio/Baseline.tsx
@@ -1,14 +1,14 @@
-import React, { useCallback, useEffect, useState } from 'react'
+import { useCallback, useEffect, useState } from 'react'
 import { faExclamationTriangle } from '@fortawesome/free-solid-svg-icons'
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
 import { Meteor } from 'meteor/meteor'
 import Tooltip from 'rc-tooltip'
-import { MeteorCall } from '../../../../lib/api/methods'
+import { MeteorCall } from '../../../lib/meteorApi'
 import { getHelpMode } from '../../../lib/localStorage'
 import { useTranslation } from 'react-i18next'
 import { StudioId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import { LabelActual } from '../../../lib/Components/LabelAndOverrides'
-import { logger } from '../../../../lib/logging'
+import { logger } from '../../../lib/logging'
 
 interface IStudioBaselineStatusProps {
 	studioId: StudioId
diff --git a/meteor/client/ui/Settings/Studio/BlueprintConfiguration/SelectBlueprint.tsx b/packages/webui/src/client/ui/Settings/Studio/BlueprintConfiguration/SelectBlueprint.tsx
similarity index 98%
rename from meteor/client/ui/Settings/Studio/BlueprintConfiguration/SelectBlueprint.tsx
rename to packages/webui/src/client/ui/Settings/Studio/BlueprintConfiguration/SelectBlueprint.tsx
index cbca6052cd..4298b48e93 100644
--- a/meteor/client/ui/Settings/Studio/BlueprintConfiguration/SelectBlueprint.tsx
+++ b/packages/webui/src/client/ui/Settings/Studio/BlueprintConfiguration/SelectBlueprint.tsx
@@ -1,4 +1,4 @@
-import React, { useMemo } from 'react'
+import { useMemo } from 'react'
 import { useTracker } from '../../../../lib/ReactMeteorData/react-meteor-data'
 import { BlueprintManifestType } from '@sofie-automation/blueprints-integration'
 import { Blueprints, Studios } from '../../../../collections'
diff --git a/meteor/client/ui/Settings/Studio/BlueprintConfiguration/SelectConfigPreset.tsx b/packages/webui/src/client/ui/Settings/Studio/BlueprintConfiguration/SelectConfigPreset.tsx
similarity index 98%
rename from meteor/client/ui/Settings/Studio/BlueprintConfiguration/SelectConfigPreset.tsx
rename to packages/webui/src/client/ui/Settings/Studio/BlueprintConfiguration/SelectConfigPreset.tsx
index 915b6d8885..e2ad1bf169 100644
--- a/meteor/client/ui/Settings/Studio/BlueprintConfiguration/SelectConfigPreset.tsx
+++ b/packages/webui/src/client/ui/Settings/Studio/BlueprintConfiguration/SelectConfigPreset.tsx
@@ -1,4 +1,4 @@
-import React, { useMemo } from 'react'
+import { useMemo } from 'react'
 import { Studios } from '../../../../collections'
 import { useTranslation } from 'react-i18next'
 import { faExclamationTriangle } from '@fortawesome/free-solid-svg-icons'
diff --git a/meteor/client/ui/Settings/Studio/BlueprintConfiguration/index.tsx b/packages/webui/src/client/ui/Settings/Studio/BlueprintConfiguration/index.tsx
similarity index 96%
rename from meteor/client/ui/Settings/Studio/BlueprintConfiguration/index.tsx
rename to packages/webui/src/client/ui/Settings/Studio/BlueprintConfiguration/index.tsx
index 8d4824660a..9358e54068 100644
--- a/meteor/client/ui/Settings/Studio/BlueprintConfiguration/index.tsx
+++ b/packages/webui/src/client/ui/Settings/Studio/BlueprintConfiguration/index.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback, useMemo } from 'react'
+import { useCallback, useMemo } from 'react'
 import { useSubscription, useTracker } from '../../../../lib/ReactMeteorData/react-meteor-data'
 import { BlueprintManifestType } from '@sofie-automation/blueprints-integration'
 import { BlueprintConfigSchemaSettings } from '../../BlueprintConfigSchema'
@@ -12,7 +12,7 @@ import { useTranslation } from 'react-i18next'
 import { DBStudio } from '@sofie-automation/corelib/dist/dataModel/Studio'
 import { SelectConfigPreset } from './SelectConfigPreset'
 import { SelectBlueprint } from './SelectBlueprint'
-import { MeteorPubSub } from '../../../../../lib/api/pubsub'
+import { MeteorPubSub } from '@sofie-automation/meteor-lib/dist/api/pubsub'
 import { UIBlueprintUpgradeStatuses } from '../../../Collections'
 import { getUpgradeStatusMessage, UpgradeStatusButtons } from '../../Upgrades/Components'
 
diff --git a/meteor/client/ui/Settings/Studio/Devices/GenericSubDevices.tsx b/packages/webui/src/client/ui/Settings/Studio/Devices/GenericSubDevices.tsx
similarity index 100%
rename from meteor/client/ui/Settings/Studio/Devices/GenericSubDevices.tsx
rename to packages/webui/src/client/ui/Settings/Studio/Devices/GenericSubDevices.tsx
diff --git a/meteor/client/ui/Settings/Studio/Devices/IngestSubDevices.tsx b/packages/webui/src/client/ui/Settings/Studio/Devices/IngestSubDevices.tsx
similarity index 98%
rename from meteor/client/ui/Settings/Studio/Devices/IngestSubDevices.tsx
rename to packages/webui/src/client/ui/Settings/Studio/Devices/IngestSubDevices.tsx
index 57b043887b..ae746424d1 100644
--- a/meteor/client/ui/Settings/Studio/Devices/IngestSubDevices.tsx
+++ b/packages/webui/src/client/ui/Settings/Studio/Devices/IngestSubDevices.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback, useMemo } from 'react'
+import { useCallback, useMemo } from 'react'
 import { Studios } from '../../../../collections'
 import { StudioId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import { useTracker } from '../../../../lib/ReactMeteorData/ReactMeteorData'
diff --git a/meteor/client/ui/Settings/Studio/Devices/InputSubDevices.tsx b/packages/webui/src/client/ui/Settings/Studio/Devices/InputSubDevices.tsx
similarity index 98%
rename from meteor/client/ui/Settings/Studio/Devices/InputSubDevices.tsx
rename to packages/webui/src/client/ui/Settings/Studio/Devices/InputSubDevices.tsx
index 97cfb45da2..784225c564 100644
--- a/meteor/client/ui/Settings/Studio/Devices/InputSubDevices.tsx
+++ b/packages/webui/src/client/ui/Settings/Studio/Devices/InputSubDevices.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback, useMemo } from 'react'
+import { useCallback, useMemo } from 'react'
 import { Studios } from '../../../../collections'
 import { StudioId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import { useTracker } from '../../../../lib/ReactMeteorData/ReactMeteorData'
diff --git a/meteor/client/ui/Settings/Studio/Devices/PlayoutSubDevices.tsx b/packages/webui/src/client/ui/Settings/Studio/Devices/PlayoutSubDevices.tsx
similarity index 98%
rename from meteor/client/ui/Settings/Studio/Devices/PlayoutSubDevices.tsx
rename to packages/webui/src/client/ui/Settings/Studio/Devices/PlayoutSubDevices.tsx
index 9626eb27c7..32c030c53e 100644
--- a/meteor/client/ui/Settings/Studio/Devices/PlayoutSubDevices.tsx
+++ b/packages/webui/src/client/ui/Settings/Studio/Devices/PlayoutSubDevices.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback, useMemo } from 'react'
+import { useCallback, useMemo } from 'react'
 import { Studios } from '../../../../collections'
 import { StudioId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import { useTracker } from '../../../../lib/ReactMeteorData/ReactMeteorData'
diff --git a/meteor/client/ui/Settings/Studio/Devices/SelectDevices.tsx b/packages/webui/src/client/ui/Settings/Studio/Devices/SelectDevices.tsx
similarity index 97%
rename from meteor/client/ui/Settings/Studio/Devices/SelectDevices.tsx
rename to packages/webui/src/client/ui/Settings/Studio/Devices/SelectDevices.tsx
index ba4f73cc4d..9245171e51 100644
--- a/meteor/client/ui/Settings/Studio/Devices/SelectDevices.tsx
+++ b/packages/webui/src/client/ui/Settings/Studio/Devices/SelectDevices.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback, useState } from 'react'
+import { useCallback, useState } from 'react'
 import Tooltip from 'rc-tooltip'
 import { doModalDialog } from '../../../../lib/ModalDialog'
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
@@ -8,7 +8,7 @@ import { Link } from 'react-router-dom'
 import { MomentFromNow } from '../../../../lib/Moment'
 import { useTranslation } from 'react-i18next'
 import { getHelpMode } from '../../../../lib/localStorage'
-import { unprotectString } from '../../../../../lib/lib'
+import { unprotectString } from '../../../../lib/tempLib'
 import { PeripheralDevices } from '../../../../collections'
 import { PeripheralDeviceId, StudioId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import { useTracker } from '../../../../lib/ReactMeteorData/ReactMeteorData'
diff --git a/meteor/client/ui/Settings/Studio/Devices/index.tsx b/packages/webui/src/client/ui/Settings/Studio/Devices/index.tsx
similarity index 97%
rename from meteor/client/ui/Settings/Studio/Devices/index.tsx
rename to packages/webui/src/client/ui/Settings/Studio/Devices/index.tsx
index 087319758f..b88c4fa2e6 100644
--- a/meteor/client/ui/Settings/Studio/Devices/index.tsx
+++ b/packages/webui/src/client/ui/Settings/Studio/Devices/index.tsx
@@ -1,4 +1,3 @@
-import React from 'react'
 import { PeripheralDevices } from '../../../../collections'
 import { StudioId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import { useTracker } from '../../../../lib/ReactMeteorData/ReactMeteorData'
diff --git a/meteor/client/ui/Settings/Studio/Generic.tsx b/packages/webui/src/client/ui/Settings/Studio/Generic.tsx
similarity index 83%
rename from meteor/client/ui/Settings/Studio/Generic.tsx
rename to packages/webui/src/client/ui/Settings/Studio/Generic.tsx
index 5f11c85b2e..011672ff34 100644
--- a/meteor/client/ui/Settings/Studio/Generic.tsx
+++ b/packages/webui/src/client/ui/Settings/Studio/Generic.tsx
@@ -10,9 +10,10 @@ import { ShowStyleBaseId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import { DBShowStyleBase } from '@sofie-automation/corelib/dist/dataModel/ShowStyleBase'
 import { Studios } from '../../../collections'
 import { useHistory } from 'react-router-dom'
-import { MeteorCall } from '../../../../lib/api/methods'
+import { MeteorCall } from '../../../lib/meteorApi'
 import { LabelActual } from '../../../lib/Components/LabelAndOverrides'
 import { catchError } from '../../../lib/lib'
+import { ForceQuickLoopAutoNext } from '@sofie-automation/corelib/src/dataModel/RundownPlaylist'
 
 interface IStudioGenericPropertiesProps {
 	studio: DBStudio
@@ -247,6 +248,54 @@ export const StudioGenericProperties = withTranslation()(
 						/>
 					</label>
 
+					<label className="field">
+						<LabelActual label={t('Enable QuickLoop')} />
+						<EditAttribute
+							modifiedClassName="bghl"
+							attribute="settings.enableQuickLoop"
+							obj={this.props.studio}
+							type="checkbox"
+							collection={Studios}
+						/>
+					</label>
+
+					<label className="field">
+						<LabelActual label={t('Force Auto in a Loop')} />
+						<div className="mdi">
+							<EditAttribute
+								modifiedClassName="bghl"
+								attribute="settings.forceQuickLoopAutoNext"
+								obj={this.props.studio}
+								mutateDisplayValue={(v) => v ?? ForceQuickLoopAutoNext.DISABLED}
+								options={{
+									[t('Disabled')]: ForceQuickLoopAutoNext.DISABLED,
+									[t('Enabled, but skipping parts with undefined or 0 duration')]:
+										ForceQuickLoopAutoNext.ENABLED_WHEN_VALID_DURATION,
+									[t('Enabled on all Parts, applying QuickLoop Fallback Part Duration if needed')]:
+										ForceQuickLoopAutoNext.ENABLED_FORCING_MIN_DURATION,
+								}}
+								type="dropdown"
+								collection={Studios}
+								className="mdinput"
+							/>
+							<span className="mdfx"></span>
+						</div>
+					</label>
+
+					<label className="field">
+						<LabelActual label={t('QuickLoop Fallback Part Duration')} />
+						<div className="mdi">
+							<EditAttribute
+								modifiedClassName="bghl"
+								attribute="settings.fallbackPartDuration"
+								obj={this.props.studio}
+								type="int"
+								collection={Studios}
+								className="mdinput"
+							/>
+						</div>
+					</label>
+
 					<StudioBaselineStatus studioId={this.props.studio._id} />
 				</div>
 			)
diff --git a/meteor/client/ui/Settings/Studio/Mappings.tsx b/packages/webui/src/client/ui/Settings/Studio/Mappings.tsx
similarity index 98%
rename from meteor/client/ui/Settings/Studio/Mappings.tsx
rename to packages/webui/src/client/ui/Settings/Studio/Mappings.tsx
index b8e2106700..f47a0bc4fc 100644
--- a/meteor/client/ui/Settings/Studio/Mappings.tsx
+++ b/packages/webui/src/client/ui/Settings/Studio/Mappings.tsx
@@ -1,7 +1,7 @@
 import ClassNames from 'classnames'
 import React, { useCallback, useMemo } from 'react'
 import Tooltip from 'rc-tooltip'
-import { getActiveRoutes } from '../../../../lib/collections/Studios'
+import { getActiveRoutes } from '@sofie-automation/meteor-lib/dist/collections/Studios'
 import { DBStudio, MappingExt, ResultingMappingRoutes } from '@sofie-automation/corelib/dist/dataModel/Studio'
 import { doModalDialog } from '../../../lib/ModalDialog'
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
@@ -110,7 +110,10 @@ export function StudioMappings({
 		}, 1)
 	}, [studio._id, studio.mappingsWithOverrides])
 
-	const activeRoutes = useMemo(() => getActiveRoutes(studio.routeSets), [studio.routeSets])
+	const activeRoutes = useMemo(
+		() => getActiveRoutes(applyAndValidateOverrides(studio.routeSetsWithOverrides).obj),
+		[studio.routeSetsWithOverrides]
+	)
 
 	const sortedMappings = useMemo(
 		() => getAllCurrentAndDeletedItemsFromOverrides(studio.mappingsWithOverrides, (a, b) => a[0].localeCompare(b[0])),
diff --git a/packages/webui/src/client/ui/Settings/Studio/PackageManager/AccessorTable.tsx b/packages/webui/src/client/ui/Settings/Studio/PackageManager/AccessorTable.tsx
new file mode 100644
index 0000000000..f34a59683c
--- /dev/null
+++ b/packages/webui/src/client/ui/Settings/Studio/PackageManager/AccessorTable.tsx
@@ -0,0 +1,77 @@
+import * as React from 'react'
+import * as _ from 'underscore'
+import { StudioPackageContainer } from '@sofie-automation/corelib/dist/dataModel/Studio'
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
+import { faPlus } from '@fortawesome/free-solid-svg-icons'
+import { useTranslation } from 'react-i18next'
+import { Accessor } from '@sofie-automation/blueprints-integration'
+import { useToggleExpandHelper } from '../../../util/useToggleExpandHelper'
+import { OverrideOpHelper, WrappedOverridableItemNormal } from '../../util/OverrideOpHelper'
+import { AccessorTableRow } from './AccessorTableRow'
+
+interface AccessorsTableProps {
+	packageContainer: WrappedOverridableItemNormal<StudioPackageContainer>
+	overrideHelper: OverrideOpHelper
+}
+
+export function AccessorsTable({ packageContainer, overrideHelper }: AccessorsTableProps): React.JSX.Element {
+	const { t } = useTranslation()
+	const { toggleExpanded, isExpanded } = useToggleExpandHelper()
+
+	const addNewAccessor = React.useCallback(() => {
+		const newKeyName = 'local'
+		let iter = 0
+		if (!packageContainer.id)
+			throw new Error(`Can't add an accessor to nonexistant Package Container "${packageContainer.id}"`)
+
+		while (packageContainer.computed?.container.accessors[newKeyName + iter]) {
+			iter++
+		}
+		const accessorId = newKeyName + iter
+
+		const newAccessor: Accessor.LocalFolder = {
+			type: Accessor.AccessType.LOCAL_FOLDER,
+			label: 'Local folder',
+			allowRead: true,
+			allowWrite: false,
+			folderPath: '',
+		}
+
+		overrideHelper().setItemValue(packageContainer.id, `container.accessors.${accessorId}`, newAccessor).commit()
+
+		setTimeout(() => {
+			toggleExpanded(accessorId, true)
+		}, 1)
+	}, [toggleExpanded, overrideHelper])
+
+	const container = packageContainer.computed.container
+
+	return (
+		<>
+			<table className="expando settings-studio-package-containers-accessors-table">
+				{Object.keys(container.accessors || {}).length === 0 ? (
+					<tr>
+						<td className="mhn dimmed">{t('There are no Accessors set up.')}</td>
+					</tr>
+				) : (
+					_.map(container.accessors || {}, (accessor: Accessor.Any, accessorId: string) => (
+						<AccessorTableRow
+							key={accessorId}
+							accessorId={accessorId}
+							accessor={accessor}
+							packageContainer={packageContainer}
+							overrideHelper={overrideHelper}
+							toggleExpanded={toggleExpanded}
+							isExpanded={isExpanded(accessorId)}
+						/>
+					))
+				)}
+			</table>
+			<div className="mod mhs">
+				<button className="btn btn-primary" onClick={addNewAccessor}>
+					<FontAwesomeIcon icon={faPlus} />
+				</button>
+			</div>
+		</>
+	)
+}
diff --git a/packages/webui/src/client/ui/Settings/Studio/PackageManager/AccessorTableRow.tsx b/packages/webui/src/client/ui/Settings/Studio/PackageManager/AccessorTableRow.tsx
new file mode 100644
index 0000000000..eee92146cd
--- /dev/null
+++ b/packages/webui/src/client/ui/Settings/Studio/PackageManager/AccessorTableRow.tsx
@@ -0,0 +1,565 @@
+import ClassNames from 'classnames'
+import * as React from 'react'
+import { Meteor } from 'meteor/meteor'
+import { StudioPackageContainer } from '@sofie-automation/corelib/dist/dataModel/Studio'
+import { doModalDialog } from '../../../../lib/ModalDialog'
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
+import { faTrash, faPencilAlt, faCheck } from '@fortawesome/free-solid-svg-icons'
+import { useTranslation } from 'react-i18next'
+import { Accessor } from '@sofie-automation/blueprints-integration'
+import {
+	LabelActual,
+	LabelAndOverrides,
+	LabelAndOverridesForCheckbox,
+	LabelAndOverridesForDropdown,
+} from '../../../../lib/Components/LabelAndOverrides'
+import { TextInputControl } from '../../../../lib/Components/TextInput'
+import { DropdownInputControl, getDropdownInputOptions } from '../../../../lib/Components/DropdownInput'
+import { OverrideOpHelper, WrappedOverridableItemNormal } from '../../util/OverrideOpHelper'
+import { CheckboxControl } from '../../../../lib/Components/Checkbox'
+
+interface AccessorTableRowProps {
+	packageContainer: WrappedOverridableItemNormal<StudioPackageContainer>
+	accessorId: string
+	accessor: Accessor.Any
+	overrideHelper: OverrideOpHelper
+	toggleExpanded: (exclusivityGroupId: string, force?: boolean) => void
+	isExpanded: boolean
+}
+
+export function AccessorTableRow({
+	accessor,
+	accessorId,
+	packageContainer,
+	overrideHelper,
+	toggleExpanded,
+	isExpanded,
+}: AccessorTableRowProps): React.JSX.Element {
+	const { t } = useTranslation()
+
+	const confirmRemoveAccessor = (accessorId: string) => {
+		doModalDialog({
+			title: t('Remove this Package Container Accessor?'),
+			yes: t('Remove'),
+			no: t('Cancel'),
+			onAccept: () => {
+				overrideHelper().setItemValue(packageContainer.id, `container.accessors.${accessorId}`, undefined).commit()
+			},
+			message: (
+				<React.Fragment>
+					<p>
+						{t('Are you sure you want to remove the Package Container Accessor "{{accessorId}}"?', {
+							accessorId: accessorId,
+						})}
+					</p>
+					<p>{t('Please note: This action is irreversible!')}</p>
+				</React.Fragment>
+			),
+		})
+	}
+
+	const updateAccessorId = React.useCallback(
+		(newAccessorId: string) => {
+			const oldAccessorId = accessorId
+			if (!packageContainer.id) throw new Error(`containerId not set`)
+			if (!packageContainer) throw new Error(`Can't edit an accessor to nonexistant Package Container"`)
+
+			const accessor = packageContainer.computed?.container.accessors[oldAccessorId]
+
+			if (packageContainer.computed?.container.accessors[newAccessorId]) {
+				throw new Meteor.Error(400, 'Accessor "' + newAccessorId + '" already exists')
+			}
+
+			// Add a copy of accessor with the new ID, and remove the old
+			overrideHelper()
+				.setItemValue(packageContainer.id, `container.accessors.${oldAccessorId}`, undefined)
+				.setItemValue(packageContainer.id, `container.accessors.${newAccessorId}`, accessor)
+				.commit()
+
+			setTimeout(() => {
+				toggleExpanded(oldAccessorId, false)
+				toggleExpanded(newAccessorId, true)
+			}, 100)
+		},
+		[overrideHelper, toggleExpanded, packageContainer, accessorId]
+	)
+
+	if (Object.keys(packageContainer.computed?.container || {}).length === 0) {
+		return (
+			<tr>
+				<td className="mhn dimmed">{t('There are no Accessors set up.')}</td>
+			</tr>
+		)
+	}
+
+	return (
+		<React.Fragment key={accessorId}>
+			<tr
+				className={ClassNames({
+					hl: isExpanded,
+				})}
+			>
+				<th className="settings-studio-accessor__id c2">{accessorId}</th>
+				{/* <td className="settings-studio-accessor__name c2">{accessor.name}</td> */}
+				<td className="settings-studio-accessor__type c1">{accessor.label}</td>
+				{/*<td className="settings-studio-accessor__accessorContent c7">{accessorContent.join(', ')}</td>*/}
+
+				<td className="settings-studio-accessor__actions table-item-actions c3">
+					<button className="action-btn" onClick={() => toggleExpanded(accessorId)}>
+						<FontAwesomeIcon icon={faPencilAlt} />
+					</button>
+					<button className="action-btn" onClick={() => confirmRemoveAccessor(accessorId)}>
+						<FontAwesomeIcon icon={faTrash} />
+					</button>
+				</td>
+			</tr>
+			{isExpanded && (
+				<tr className="expando-details hl">
+					<td colSpan={6}>
+						<div className="properties-grid">
+							<label className="field">
+								<LabelActual label={t('Accessor ID')} />
+								<TextInputControl
+									modifiedClassName="bghl"
+									classNames="input text-input input-l"
+									value={accessorId}
+									handleUpdate={updateAccessorId}
+									disabled={!!packageContainer.defaults}
+								/>
+							</label>
+							<LabelAndOverrides
+								label={t('Label')}
+								hint={t('Display name of the Package Container')}
+								item={packageContainer}
+								//@ts-expect-error can't be 4 levels deep
+								itemKey={`container.accessors.${accessorId}.label`}
+								opPrefix={packageContainer.id}
+								overrideHelper={overrideHelper}
+							>
+								{(value, handleUpdate) => (
+									<TextInputControl
+										modifiedClassName="bghl"
+										classNames="input text-input input-l"
+										value={value}
+										handleUpdate={handleUpdate}
+									/>
+								)}
+							</LabelAndOverrides>
+							<LabelAndOverridesForDropdown
+								label={t('Accessor Type')}
+								item={packageContainer}
+								//@ts-expect-error can't be 4 levels deep
+								itemKey={`container.accessors.${accessorId}.type`}
+								opPrefix={packageContainer.id}
+								overrideHelper={overrideHelper}
+								options={getDropdownInputOptions(Accessor.AccessType)}
+							>
+								{(value, handleUpdate, options) => {
+									return (
+										<DropdownInputControl
+											classNames="input text-input input-l"
+											options={options}
+											value={value}
+											handleUpdate={handleUpdate}
+										/>
+									)
+								}}
+							</LabelAndOverridesForDropdown>
+							{accessor.type === Accessor.AccessType.LOCAL_FOLDER ? (
+								<>
+									<LabelAndOverrides
+										label={t('Folder path')}
+										hint={t('File path to the folder of the local folder')}
+										item={packageContainer}
+										//@ts-expect-error can't be 4 levels deep
+										itemKey={`container.accessors.${accessorId}.folderPath`}
+										opPrefix={packageContainer.id}
+										overrideHelper={overrideHelper}
+									>
+										{(value, handleUpdate) => (
+											<TextInputControl
+												modifiedClassName="bghl"
+												classNames="input text-input input-l"
+												value={value}
+												handleUpdate={handleUpdate}
+											/>
+										)}
+									</LabelAndOverrides>
+									<LabelAndOverrides
+										label={t('Resourse Id')}
+										hint={t('(Optional) This could be the name of the computer on which the local folder is on')}
+										item={packageContainer}
+										//@ts-expect-error can't be 4 levels deep
+										itemKey={`container.accessors.${accessorId}.resourceId`}
+										opPrefix={packageContainer.id}
+										overrideHelper={overrideHelper}
+									>
+										{(value, handleUpdate) => (
+											<TextInputControl
+												modifiedClassName="bghl"
+												classNames="input text-input input-l"
+												value={value}
+												handleUpdate={handleUpdate}
+											/>
+										)}
+									</LabelAndOverrides>
+								</>
+							) : accessor.type === Accessor.AccessType.HTTP ? (
+								<>
+									<LabelAndOverrides
+										label={t('Base URL')}
+										hint={t('Base url to the resource (example: http://myserver/folder)')}
+										item={packageContainer}
+										//@ts-expect-error can't be 4 levels deep
+										itemKey={`container.accessors.${accessorId}.baseUrl`}
+										opPrefix={packageContainer.id}
+										overrideHelper={overrideHelper}
+									>
+										{(value, handleUpdate) => (
+											<TextInputControl
+												modifiedClassName="bghl"
+												classNames="input text-input input-l"
+												value={value}
+												handleUpdate={handleUpdate}
+											/>
+										)}
+									</LabelAndOverrides>
+									<LabelAndOverrides
+										label={t('Is Immutable')}
+										hint={t('When set, resources are considered immutable, ie they will not change')}
+										item={packageContainer}
+										//@ts-expect-error can't be 4 levels deep
+										itemKey={`container.accessors.${accessorId}.isImmutable`}
+										opPrefix={packageContainer.id}
+										overrideHelper={overrideHelper}
+									>
+										{(value, handleUpdate) => (
+											<CheckboxControl
+												classNames="input text-input input-l"
+												value={value}
+												handleUpdate={handleUpdate}
+											/>
+										)}
+									</LabelAndOverrides>
+									<LabelAndOverrides
+										label={t('Does NOT support HEAD requests')}
+										hint={t(
+											"If set, Package Manager assumes that the source doesn't support HEAD requests and will use GET instead. If false, HEAD requests will be sent to check availability."
+										)}
+										item={packageContainer}
+										//@ts-expect-error can't be 4 levels deep
+										itemKey={`container.accessors.${accessorId}.useGETinsteadOfHEAD`}
+										opPrefix={packageContainer.id}
+										overrideHelper={overrideHelper}
+									>
+										{(value, handleUpdate) => (
+											<CheckboxControl
+												classNames="input text-input input-l"
+												value={value}
+												handleUpdate={handleUpdate}
+											/>
+										)}
+									</LabelAndOverrides>
+
+									<LabelAndOverrides
+										label={t('Network Id')}
+										hint={t(
+											'(Optional) A name/identifier of the local network where the share is located, leave empty if globally accessible'
+										)}
+										item={packageContainer}
+										//@ts-expect-error can't be 4 levels deep
+										itemKey={`container.accessors.${accessorId}.networkId`}
+										opPrefix={packageContainer.id}
+										overrideHelper={overrideHelper}
+									>
+										{(value, handleUpdate) => (
+											<TextInputControl
+												modifiedClassName="bghl"
+												classNames="input text-input input-l"
+												value={value}
+												handleUpdate={handleUpdate}
+											/>
+										)}
+									</LabelAndOverrides>
+								</>
+							) : accessor.type === Accessor.AccessType.HTTP_PROXY ? (
+								<>
+									<LabelAndOverrides
+										label={t('Base URL')}
+										hint={t('Base url to the resource (example: http://myserver/folder)')}
+										item={packageContainer}
+										//@ts-expect-error can't be 4 levels deep
+										itemKey={`container.accessors.${accessorId}.baseUrl`}
+										opPrefix={packageContainer.id}
+										overrideHelper={overrideHelper}
+									>
+										{(value, handleUpdate) => (
+											<TextInputControl
+												modifiedClassName="bghl"
+												classNames="input text-input input-l"
+												value={value}
+												handleUpdate={handleUpdate}
+											/>
+										)}
+									</LabelAndOverrides>
+									<LabelAndOverrides
+										label={t('Network Id')}
+										hint={t(
+											'(Optional) A name/identifier of the local network where the share is located, leave empty if globally accessible'
+										)}
+										item={packageContainer}
+										//@ts-expect-error can't be 4 levels deep
+										itemKey={`container.accessors.${accessorId}.networkId`}
+										opPrefix={packageContainer.id}
+										overrideHelper={overrideHelper}
+									>
+										{(value, handleUpdate) => (
+											<TextInputControl
+												modifiedClassName="bghl"
+												classNames="input text-input input-l"
+												value={value}
+												handleUpdate={handleUpdate}
+											/>
+										)}
+									</LabelAndOverrides>
+								</>
+							) : accessor.type === Accessor.AccessType.FILE_SHARE ? (
+								<>
+									<LabelAndOverrides
+										label={t('Base URL')}
+										hint={t('Folder path to shared folder')}
+										item={packageContainer}
+										//@ts-expect-error can't be 4 levels deep
+										itemKey={`container.accessors.${accessorId}.folderPath`}
+										opPrefix={packageContainer.id}
+										overrideHelper={overrideHelper}
+									>
+										{(value, handleUpdate) => (
+											<TextInputControl
+												modifiedClassName="bghl"
+												classNames="input text-input input-l"
+												value={value}
+												handleUpdate={handleUpdate}
+											/>
+										)}
+									</LabelAndOverrides>
+									<LabelAndOverrides
+										label={t('User Name')}
+										hint={t('Username for authentication')}
+										item={packageContainer}
+										//@ts-expect-error can't be 4 levels deep
+										itemKey={`container.accessors.${accessorId}.userName`}
+										opPrefix={packageContainer.id}
+										overrideHelper={overrideHelper}
+									>
+										{(value, handleUpdate) => (
+											<TextInputControl
+												modifiedClassName="bghl"
+												classNames="input text-input input-l"
+												value={value}
+												handleUpdate={handleUpdate}
+											/>
+										)}
+									</LabelAndOverrides>
+									<LabelAndOverrides
+										label={t('Password')}
+										hint={t('Password for authentication')}
+										item={packageContainer}
+										//@ts-expect-error can't be 4 levels deep
+										itemKey={`container.accessors.${accessorId}.password`}
+										opPrefix={packageContainer.id}
+										overrideHelper={overrideHelper}
+									>
+										{(value, handleUpdate) => (
+											<TextInputControl
+												modifiedClassName="bghl"
+												classNames="input text-input input-l"
+												value={value}
+												handleUpdate={handleUpdate}
+											/>
+										)}
+									</LabelAndOverrides>
+									<LabelAndOverrides
+										label={t('Network Id')}
+										hint={t('(Optional) A name/identifier of the local network where the share is located')}
+										item={packageContainer}
+										//@ts-expect-error can't be 4 levels deep
+										itemKey={`container.accessors.${accessorId}.networkId`}
+										opPrefix={packageContainer.id}
+										overrideHelper={overrideHelper}
+									>
+										{(value, handleUpdate) => (
+											<TextInputControl
+												modifiedClassName="bghl"
+												classNames="input text-input input-l"
+												value={value}
+												handleUpdate={handleUpdate}
+											/>
+										)}
+									</LabelAndOverrides>
+								</>
+							) : accessor.type === Accessor.AccessType.QUANTEL ? (
+								<>
+									<LabelAndOverrides
+										label={t('Quantel gateway URL')}
+										hint={t('URL to the Quantel Gateway')}
+										item={packageContainer}
+										//@ts-expect-error can't be 4 levels deep
+										itemKey={`container.accessors.${accessorId}.quantelGatewayUrl`}
+										opPrefix={packageContainer.id}
+										overrideHelper={overrideHelper}
+									>
+										{(value, handleUpdate) => (
+											<TextInputControl
+												modifiedClassName="bghl"
+												classNames="input text-input input-l"
+												value={value}
+												handleUpdate={handleUpdate}
+											/>
+										)}
+									</LabelAndOverrides>
+									<LabelAndOverrides
+										label={t('ISA URLs')}
+										hint={t('URLs to the ISAs, in order of importance (comma separated)')}
+										item={packageContainer}
+										//@ts-expect-error can't be 4 levels deep
+										itemKey={`container.accessors.${accessorId}.ISAUrls`}
+										opPrefix={packageContainer.id}
+										overrideHelper={overrideHelper}
+									>
+										{(value, handleUpdate) => (
+											<TextInputControl
+												modifiedClassName="bghl"
+												classNames="input text-input input-l"
+												value={value}
+												handleUpdate={handleUpdate}
+											/>
+										)}
+									</LabelAndOverrides>
+									<LabelAndOverrides
+										label={t('Quantel Zone ID')}
+										hint={t('Zone ID')}
+										item={packageContainer}
+										//@ts-expect-error can't be 4 levels deep
+										itemKey={`container.accessors.${accessorId}.zoneId`}
+										opPrefix={packageContainer.id}
+										overrideHelper={overrideHelper}
+									>
+										{(value, handleUpdate) => (
+											<TextInputControl
+												modifiedClassName="bghl"
+												classNames="input text-input input-l"
+												value={value}
+												handleUpdate={handleUpdate}
+											/>
+										)}
+									</LabelAndOverrides>
+									<LabelAndOverrides
+										label={t('Server ID')}
+										hint={t(
+											'Server ID. For sources, this should generally be omitted (or set to 0) so clip-searches are zone-wide. If set, clip-searches are limited to that server.'
+										)}
+										item={packageContainer}
+										//@ts-expect-error can't be 4 levels deep
+										itemKey={`container.accessors.${accessorId}.serverId`}
+										opPrefix={packageContainer.id}
+										overrideHelper={overrideHelper}
+									>
+										{(value, handleUpdate) => (
+											<TextInputControl
+												modifiedClassName="bghl"
+												classNames="input text-input input-l"
+												value={value}
+												handleUpdate={handleUpdate}
+											/>
+										)}
+									</LabelAndOverrides>
+									<LabelAndOverrides
+										label={t('Quantel transformer URL')}
+										hint={t('URL to the Quantel HTTP transformer')}
+										item={packageContainer}
+										//@ts-expect-error can't be 4 levels deep
+										itemKey={`container.accessors.${accessorId}.transformerURL`}
+										opPrefix={packageContainer.id}
+										overrideHelper={overrideHelper}
+									>
+										{(value, handleUpdate) => (
+											<TextInputControl
+												modifiedClassName="bghl"
+												classNames="input text-input input-l"
+												value={value}
+												handleUpdate={handleUpdate}
+											/>
+										)}
+									</LabelAndOverrides>
+									<LabelAndOverrides
+										label={t('Quantel FileFlow URL')}
+										hint={t('URL to the Quantel FileFlow Manager')}
+										item={packageContainer}
+										//@ts-expect-error can't be 4 levels deep
+										itemKey={`container.accessors.${accessorId}.fileflowURL`}
+										opPrefix={packageContainer.id}
+										overrideHelper={overrideHelper}
+									>
+										{(value, handleUpdate) => (
+											<TextInputControl
+												modifiedClassName="bghl"
+												classNames="input text-input input-l"
+												value={value}
+												handleUpdate={handleUpdate}
+											/>
+										)}
+									</LabelAndOverrides>
+									<LabelAndOverrides
+										label={t('Quantel FileFlow Profile name')}
+										hint={t('Profile name to be used by FileFlow when exporting the clips')}
+										item={packageContainer}
+										//@ts-expect-error can't be 4 levels deep
+										itemKey={`container.accessors.${accessorId}.fileflowProfile`}
+										opPrefix={packageContainer.id}
+										overrideHelper={overrideHelper}
+									>
+										{(value, handleUpdate) => (
+											<TextInputControl
+												modifiedClassName="bghl"
+												classNames="input text-input input-l"
+												value={value}
+												handleUpdate={handleUpdate}
+											/>
+										)}
+									</LabelAndOverrides>
+								</>
+							) : null}
+
+							<LabelAndOverridesForCheckbox
+								label={t('Allow Read access')}
+								item={packageContainer}
+								//@ts-expect-error can't be 4 levels deep
+								itemKey={`container.accessors.${accessorId}.allowRead`}
+								opPrefix={packageContainer.id}
+								overrideHelper={overrideHelper}
+							>
+								{(value, handleUpdate) => <CheckboxControl value={!!value} handleUpdate={handleUpdate} />}
+							</LabelAndOverridesForCheckbox>
+							<LabelAndOverridesForCheckbox
+								label={t('Allow Write access')}
+								item={packageContainer}
+								//@ts-expect-error can't be 4 levels deep
+								itemKey={`container.accessors.${accessorId}.allowWrite`}
+								opPrefix={packageContainer.id}
+								overrideHelper={overrideHelper}
+							>
+								{(value, handleUpdate) => <CheckboxControl value={!!value} handleUpdate={handleUpdate} />}
+							</LabelAndOverridesForCheckbox>
+						</div>
+						<div className="mod">
+							<button className="btn btn-primary right" onClick={() => toggleExpanded(accessorId)}>
+								<FontAwesomeIcon icon={faCheck} />
+							</button>
+						</div>
+					</td>
+				</tr>
+			)}
+		</React.Fragment>
+	)
+}
diff --git a/packages/webui/src/client/ui/Settings/Studio/PackageManager/PackageContainerPickers.tsx b/packages/webui/src/client/ui/Settings/Studio/PackageManager/PackageContainerPickers.tsx
new file mode 100644
index 0000000000..576425b299
--- /dev/null
+++ b/packages/webui/src/client/ui/Settings/Studio/PackageManager/PackageContainerPickers.tsx
@@ -0,0 +1,75 @@
+import * as React from 'react'
+import { DBStudio, StudioPackageContainer } from '@sofie-automation/corelib/dist/dataModel/Studio'
+import { EditAttribute } from '../../../../lib/EditAttribute'
+import { useTranslation } from 'react-i18next'
+import { Accessor } from '@sofie-automation/blueprints-integration'
+import { Studios } from '../../../../collections'
+import { DropdownInputOption } from '../../../../lib/Components/DropdownInput'
+import { WrappedOverridableItem } from '../../util/OverrideOpHelper'
+
+interface PackageContainersPickersProps {
+	studio: DBStudio
+	packageContainersFromOverrides: WrappedOverridableItem<StudioPackageContainer>[]
+}
+
+export function PackageContainersPickers({
+	studio,
+	packageContainersFromOverrides,
+}: PackageContainersPickersProps): JSX.Element {
+	const { t } = useTranslation()
+
+	const availablePackageContainerOptions = React.useMemo(() => {
+		const arr: DropdownInputOption<string>[] = []
+
+		packageContainersFromOverrides.forEach((packageContainer) => {
+			let hasHttpAccessor = false
+			if (packageContainer.computed) {
+				for (const accessor of Object.values<Accessor.Any>(packageContainer.computed.container.accessors)) {
+					if (accessor.type === Accessor.AccessType.HTTP_PROXY) {
+						hasHttpAccessor = true
+						break
+					}
+				}
+				if (hasHttpAccessor) {
+					arr.push({
+						name: packageContainer.computed.container.label,
+						value: packageContainer.id,
+						i: arr.length,
+					})
+				}
+			}
+		})
+		return arr
+	}, [packageContainersFromOverrides])
+
+	return (
+		<div>
+			<div className="field mvs">
+				<label>{t('Package Containers to use for previews')}</label>
+				<div className="mdi">
+					<EditAttribute
+						attribute="previewContainerIds"
+						obj={studio}
+						options={availablePackageContainerOptions}
+						label={t('Click to show available Package Containers')}
+						type="multiselect"
+						collection={Studios}
+					/>
+				</div>
+			</div>
+			<div className="field mvs">
+				<label>{t('Package Containers to use for thumbnails')}</label>
+				<div className="mdi">
+					<EditAttribute
+						attribute="thumbnailContainerIds"
+						obj={studio}
+						options={availablePackageContainerOptions}
+						label={t('Click to show available Package Containers')}
+						type="multiselect"
+						collection={Studios}
+					/>
+				</div>
+			</div>
+		</div>
+	)
+}
diff --git a/packages/webui/src/client/ui/Settings/Studio/PackageManager/PackageContainers.tsx b/packages/webui/src/client/ui/Settings/Studio/PackageManager/PackageContainers.tsx
new file mode 100644
index 0000000000..d92e3e31c8
--- /dev/null
+++ b/packages/webui/src/client/ui/Settings/Studio/PackageManager/PackageContainers.tsx
@@ -0,0 +1,331 @@
+import ClassNames from 'classnames'
+import * as React from 'react'
+import { DBStudio, StudioPackageContainer } from '@sofie-automation/corelib/dist/dataModel/Studio'
+import { doModalDialog } from '../../../../lib/ModalDialog'
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
+import { faTrash, faPencilAlt, faPlus, faSync } from '@fortawesome/free-solid-svg-icons'
+import { useTranslation } from 'react-i18next'
+import { Studios } from '../../../../collections'
+import {
+	ObjectOverrideSetOp,
+	SomeObjectOverrideOp,
+	applyAndValidateOverrides,
+} from '@sofie-automation/corelib/dist/settings/objectWithOverrides'
+import {
+	LabelActual,
+	LabelAndOverrides,
+	LabelAndOverridesForMultiSelect,
+} from '../../../../lib/Components/LabelAndOverrides'
+import { useToggleExpandHelper } from '../../../util/useToggleExpandHelper'
+import { literal } from '@sofie-automation/corelib/dist/lib'
+import { TextInputControl } from '../../../../lib/Components/TextInput'
+import { DropdownInputOption } from '../../../../lib/Components/DropdownInput'
+import { MultiSelectInputControl } from '../../../../lib/Components/MultiSelectInput'
+import {
+	OverrideOpHelper,
+	WrappedOverridableItem,
+	WrappedOverridableItemNormal,
+	useOverrideOpHelper,
+} from '../../util/OverrideOpHelper'
+import { AccessorsTable } from './AccessorTable'
+
+interface PackageContainersTableProps {
+	studio: DBStudio
+	packageContainersFromOverrides: WrappedOverridableItem<StudioPackageContainer>[]
+}
+
+export function PackageContainersTable({
+	studio,
+	packageContainersFromOverrides,
+}: PackageContainersTableProps): React.JSX.Element {
+	const { t } = useTranslation()
+	const { toggleExpanded, isExpanded } = useToggleExpandHelper()
+
+	const saveOverrides = React.useCallback(
+		(newOps: SomeObjectOverrideOp[]) => {
+			Studios.update(studio._id, {
+				$set: {
+					'packageContainersWithOverrides.overrides': newOps,
+				},
+			})
+		},
+		[studio._id]
+	)
+
+	const overrideHelper = useOverrideOpHelper(saveOverrides, studio.packageContainersWithOverrides)
+
+	const addNewPackageContainer = React.useCallback(() => {
+		const resolvedPackageContainers = applyAndValidateOverrides(studio.packageContainersWithOverrides).obj
+
+		// find free key name
+		const newKeyName = 'newContainer'
+		let iter = 0
+		while (resolvedPackageContainers[newKeyName + iter.toString()]) {
+			iter++
+		}
+
+		const newId = newKeyName + iter.toString()
+		const newPackageContainer: StudioPackageContainer = {
+			deviceIds: [],
+			container: {
+				label: 'New Package Container ' + iter.toString(),
+				accessors: {},
+			},
+		}
+
+		const addOp = literal<ObjectOverrideSetOp>({
+			op: 'set',
+			path: newId,
+			value: newPackageContainer,
+		})
+
+		Studios.update(studio._id, {
+			$push: {
+				'packageContainersWithOverrides.overrides': addOp,
+			},
+		})
+
+		setTimeout(() => {
+			toggleExpanded(newId, true)
+		}, 1)
+	}, [studio._id, studio.packageContainersWithOverrides])
+
+	const confirmRemovePackageContainer = (containerId: string) => {
+		doModalDialog({
+			title: t('Remove this Package Container?'),
+			yes: t('Remove'),
+			no: t('Cancel'),
+			onAccept: () => {
+				overrideHelper().deleteItem(containerId).commit()
+			},
+			message: (
+				<React.Fragment>
+					<p>
+						{t('Are you sure you want to remove the Package Container "{{containerId}}"?', {
+							containerId: containerId,
+						})}
+					</p>
+					<p>{t('Please note: This action is irreversible!')}</p>
+				</React.Fragment>
+			),
+		})
+	}
+
+	const confirmReset = React.useCallback(
+		(packgageContainerId: string) => {
+			doModalDialog({
+				title: t('Reset this Package Container?'),
+				yes: t('Reset'),
+				no: t('Cancel'),
+				onAccept: () => {
+					overrideHelper().resetItem(packgageContainerId).commit()
+				},
+				message: (
+					<React.Fragment>
+						<p>
+							{t('Are you sure you want to reset all overrides for Packing Container "{{id}}"?', {
+								id: packgageContainerId,
+							})}
+						</p>
+						<p>{t('Please note: This action is irreversible!')}</p>
+					</React.Fragment>
+				),
+			})
+		},
+		[t, packageContainersFromOverrides, overrideHelper]
+	)
+
+	return (
+		<>
+			<table className="table expando settings-studio-package-containers-table">
+				{packageContainersFromOverrides.map(
+					(packageContainer: WrappedOverridableItem<StudioPackageContainer>): React.JSX.Element =>
+						packageContainer.type == 'normal' ? (
+							<PackageContainerRow
+								key={packageContainer.id}
+								studio={studio}
+								packageContainer={packageContainer}
+								overrideHelper={overrideHelper}
+								toggleExpanded={toggleExpanded}
+								isExpanded={isExpanded}
+								confirmRemovePackageContainer={confirmRemovePackageContainer}
+								confirmReset={confirmReset}
+							/>
+						) : (
+							<PackageContainerDeletedRow
+								key={packageContainer.id}
+								packageContainer={packageContainer}
+								overrideHelper={overrideHelper}
+							/>
+						)
+				)}
+			</table>
+			<div className="mod mhs">
+				<button className="btn btn-primary" onClick={addNewPackageContainer}>
+					<FontAwesomeIcon icon={faPlus} />
+				</button>
+			</div>
+		</>
+	)
+}
+
+interface PackageContainerDeletedRowProps {
+	packageContainer: WrappedOverridableItem<StudioPackageContainer>
+	overrideHelper: OverrideOpHelper
+}
+
+function PackageContainerDeletedRow({ packageContainer, overrideHelper }: Readonly<PackageContainerDeletedRowProps>) {
+	const doUndeleteItem = React.useCallback(
+		() => overrideHelper().resetItem(packageContainer.id).commit(),
+		[overrideHelper, packageContainer.id]
+	)
+
+	return (
+		<tr>
+			<th className="settings-studio-device__name c3 notifications-s notifications-text">{packageContainer.id}</th>
+			<td className="settings-studio-device__id c2 deleted">{packageContainer.defaults?.container.label}</td>
+			<td className="settings-studio-device__id c2 deleted">{packageContainer.id}</td>
+			<td className="settings-studio-output-table__actions table-item-actions c3">
+				<button className="action-btn" onClick={doUndeleteItem} title="Restore to defaults">
+					<FontAwesomeIcon icon={faSync} />
+				</button>
+			</td>
+		</tr>
+	)
+}
+
+interface PackageContainerRowProps {
+	studio: DBStudio
+	packageContainer: WrappedOverridableItemNormal<StudioPackageContainer>
+	overrideHelper: OverrideOpHelper
+	toggleExpanded: (id: string, forceState?: boolean | undefined) => void
+	isExpanded: (id: string) => boolean
+	confirmRemovePackageContainer: (id: string) => void
+	confirmReset: (id: string) => void
+}
+
+function PackageContainerRow({
+	studio,
+	packageContainer,
+	overrideHelper,
+	toggleExpanded,
+	isExpanded,
+	confirmRemovePackageContainer,
+	confirmReset,
+}: PackageContainerRowProps): React.JSX.Element {
+	const { t } = useTranslation()
+
+	const availablePlayoutDevicesOptions: DropdownInputOption<string>[] = React.useMemo(() => {
+		const playoutDevicesFromOverrrides = applyAndValidateOverrides(studio.peripheralDeviceSettings.playoutDevices).obj
+
+		const devices: DropdownInputOption<string>[] = []
+
+		for (const deviceId of Object.keys(playoutDevicesFromOverrrides)) {
+			devices.push({
+				name: deviceId,
+				value: deviceId,
+				i: devices.length,
+			})
+		}
+		return devices
+	}, [studio.peripheralDeviceSettings.playoutDevices])
+
+	const updatePackageContainerId = React.useCallback(
+		(newPackageContainerId: string) => {
+			overrideHelper().changeItemId(packageContainer.id, newPackageContainerId).commit()
+			toggleExpanded(newPackageContainerId, true)
+		},
+		[overrideHelper, toggleExpanded, packageContainer.id]
+	)
+
+	return (
+		<React.Fragment key={packageContainer.id}>
+			<tr
+				className={ClassNames({
+					hl: isExpanded(packageContainer.id),
+				})}
+			>
+				<th className="settings-studio-package-container__id c2">{packageContainer.id}</th>
+				<td className="settings-studio-package-container__name c2">{packageContainer.computed.container.label}</td>
+
+				<td className="settings-studio-package-container__actions table-item-actions c3">
+					{packageContainer.defaults && packageContainer.overrideOps.length > 0 && (
+						<button
+							className="action-btn"
+							onClick={() => confirmReset(packageContainer.id)}
+							title={t('Reset Package Container to default values')}
+						>
+							<FontAwesomeIcon icon={faSync} />
+						</button>
+					)}
+					<button className="action-btn" onClick={() => toggleExpanded(packageContainer.id)}>
+						<FontAwesomeIcon icon={faPencilAlt} />
+					</button>
+					<button className="action-btn" onClick={() => confirmRemovePackageContainer(packageContainer.id)}>
+						<FontAwesomeIcon icon={faTrash} />
+					</button>
+				</td>
+			</tr>
+			{isExpanded(packageContainer.id) && (
+				<tr className="expando-details hl">
+					<td colSpan={6}>
+						<div className="properties-grid">
+							<label className="field">
+								<LabelActual label={t('Package Container ID')} />
+								<TextInputControl
+									modifiedClassName="bghl"
+									classNames="input text-input input-l"
+									value={packageContainer.id}
+									handleUpdate={updatePackageContainerId}
+									disabled={!!packageContainer.defaults}
+								/>
+							</label>
+							<LabelAndOverrides
+								label={t('Label')}
+								item={packageContainer}
+								//@ts-expect-error can't be 2 levels deep
+								itemKey={'container.label'}
+								opPrefix={packageContainer.id}
+								overrideHelper={overrideHelper}
+							>
+								{(value, handleUpdate) => (
+									<TextInputControl
+										modifiedClassName="bghl"
+										classNames="input text-input input-l"
+										value={value}
+										handleUpdate={handleUpdate}
+									/>
+								)}
+							</LabelAndOverrides>
+							<LabelAndOverridesForMultiSelect
+								label={t('Playout devices which uses this package container')}
+								hint={t('Select which playout devices are using this package container')}
+								item={packageContainer}
+								itemKey={'deviceIds'}
+								opPrefix={packageContainer.id}
+								overrideHelper={overrideHelper}
+								options={availablePlayoutDevicesOptions}
+							>
+								{(value, handleUpdate, options) => (
+									<MultiSelectInputControl
+										classNames="input text-input input-l"
+										options={options}
+										value={value}
+										handleUpdate={handleUpdate}
+									/>
+								)}
+							</LabelAndOverridesForMultiSelect>
+							<div className="mdi"></div>
+						</div>
+						<div>
+							<div className="settings-studio-accessors">
+								<h3 className="mhn">{t('Accessors')}</h3>
+								<AccessorsTable packageContainer={packageContainer} overrideHelper={overrideHelper} />
+							</div>
+						</div>
+					</td>
+				</tr>
+			)}
+		</React.Fragment>
+	)
+}
diff --git a/packages/webui/src/client/ui/Settings/Studio/PackageManager/index.tsx b/packages/webui/src/client/ui/Settings/Studio/PackageManager/index.tsx
new file mode 100644
index 0000000000..707b1372f9
--- /dev/null
+++ b/packages/webui/src/client/ui/Settings/Studio/PackageManager/index.tsx
@@ -0,0 +1,37 @@
+import * as React from 'react'
+import { DBStudio } from '@sofie-automation/corelib/dist/dataModel/Studio'
+import { useTranslation } from 'react-i18next'
+import { getAllCurrentAndDeletedItemsFromOverrides } from '../../util/OverrideOpHelper'
+import { PackageContainersPickers } from './PackageContainerPickers'
+import { PackageContainersTable } from './PackageContainers'
+
+interface StudioPackageManagerSettingsProps {
+	studio: DBStudio
+}
+
+export function StudioPackageManagerSettings({ studio }: StudioPackageManagerSettingsProps): React.JSX.Element {
+	const { t } = useTranslation()
+
+	const packageContainersFromOverrides = React.useMemo(
+		() =>
+			getAllCurrentAndDeletedItemsFromOverrides(studio.packageContainersWithOverrides, (a, b) =>
+				a[0].localeCompare(b[0])
+			),
+		[studio.packageContainersWithOverrides]
+	)
+
+	return (
+		<div>
+			<h2 className="mhn mbs">{t('Package Manager')}</h2>
+
+			<div className="settings-studio-package-containers">
+				<h3 className="mhn">{t('Studio Settings')}</h3>
+
+				<PackageContainersPickers studio={studio} packageContainersFromOverrides={packageContainersFromOverrides} />
+
+				<h3 className="mhn">{t('Package Containers')}</h3>
+				<PackageContainersTable studio={studio} packageContainersFromOverrides={packageContainersFromOverrides} />
+			</div>
+		</div>
+	)
+}
diff --git a/packages/webui/src/client/ui/Settings/Studio/Routings/ExclusivityGroups.tsx b/packages/webui/src/client/ui/Settings/Studio/Routings/ExclusivityGroups.tsx
new file mode 100644
index 0000000000..7b3a167749
--- /dev/null
+++ b/packages/webui/src/client/ui/Settings/Studio/Routings/ExclusivityGroups.tsx
@@ -0,0 +1,279 @@
+import ClassNames from 'classnames'
+import * as React from 'react'
+import {
+	DBStudio,
+	StudioRouteSet,
+	StudioRouteSetExclusivityGroup,
+} from '@sofie-automation/corelib/dist/dataModel/Studio'
+import { doModalDialog } from '../../../../lib/ModalDialog'
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
+import { faTrash, faPencilAlt, faCheck, faSync, faPlus } from '@fortawesome/free-solid-svg-icons'
+import { useTranslation } from 'react-i18next'
+import { Studios } from '../../../../collections'
+import { LabelActual, LabelAndOverrides } from '../../../../lib/Components/LabelAndOverrides'
+import {
+	OverrideOpHelper,
+	WrappedOverridableItem,
+	WrappedOverridableItemDeleted,
+	WrappedOverridableItemNormal,
+	useOverrideOpHelper,
+} from '../../util/OverrideOpHelper'
+import {
+	applyAndValidateOverrides,
+	ObjectOverrideSetOp,
+	SomeObjectOverrideOp,
+} from '@sofie-automation/corelib/dist/settings/objectWithOverrides'
+import { TextInputControl } from '../../../../lib/Components/TextInput'
+import { literal } from '@sofie-automation/corelib/dist/lib'
+import { useToggleExpandHelper } from '../../../util/useToggleExpandHelper'
+
+interface ExclusivityGroupsTableProps {
+	studio: DBStudio
+	routeSetsFromOverrides: WrappedOverridableItem<StudioRouteSet>[]
+	exclusivityGroupsFromOverrides: WrappedOverridableItem<StudioRouteSetExclusivityGroup>[]
+}
+
+export function ExclusivityGroupsTable({
+	studio,
+	routeSetsFromOverrides,
+	exclusivityGroupsFromOverrides,
+}: Readonly<ExclusivityGroupsTableProps>): React.JSX.Element {
+	const { t } = useTranslation()
+	const { toggleExpanded, isExpanded } = useToggleExpandHelper()
+
+	const addNewExclusivityGroup = React.useCallback(() => {
+		const newGroupKeyName = 'exclusivityGroup'
+		const resolvedGroups = applyAndValidateOverrides(studio.routeSetExclusivityGroupsWithOverrides).obj
+
+		let iter = 0
+		while (resolvedGroups[newGroupKeyName + iter.toString()]) {
+			iter++
+		}
+
+		const newId = newGroupKeyName + iter.toString()
+		const newGroup: StudioRouteSetExclusivityGroup = {
+			name: 'New Exclusivity Group' + iter.toString(),
+		}
+		const addOp = literal<ObjectOverrideSetOp>({
+			op: 'set',
+			path: newId,
+			value: newGroup,
+		})
+
+		Studios.update(studio._id, {
+			$push: {
+				'routeSetExclusivityGroupsWithOverrides.overrides': addOp,
+			},
+		})
+
+		setTimeout(() => {
+			toggleExpanded(newId, true)
+		}, 1)
+	}, [studio._id, studio.routeSetExclusivityGroupsWithOverrides])
+
+	const saveExclusivityOverrides = React.useCallback(
+		(newOps: SomeObjectOverrideOp[]) => {
+			Studios.update(studio._id, {
+				$set: {
+					'routeSetExclusivityGroupsWithOverrides.overrides': newOps,
+				},
+			})
+		},
+		[studio._id]
+	)
+
+	const exclusivityOverrideHelper = useOverrideOpHelper(
+		saveExclusivityOverrides,
+		studio.routeSetExclusivityGroupsWithOverrides
+	)
+
+	return (
+		<>
+			<table className="expando settings-studio-mappings-table">
+				<tbody>
+					{exclusivityGroupsFromOverrides.length === 0 ? (
+						<tr>
+							<td className="mhn dimmed">{t('There are no exclusivity groups set up.')}</td>
+						</tr>
+					) : (
+						exclusivityGroupsFromOverrides.map(
+							(exclusivityGroup: WrappedOverridableItem<StudioRouteSetExclusivityGroup>) =>
+								exclusivityGroup.type === 'normal' ? (
+									<ExclusivityGroupRow
+										key={exclusivityGroup.id}
+										exclusivityGroup={exclusivityGroup}
+										toggleExpanded={toggleExpanded}
+										isExpanded={isExpanded(exclusivityGroup.id)}
+										routeSetsFromOverrides={routeSetsFromOverrides}
+										exclusivityOverrideHelper={exclusivityOverrideHelper}
+									/>
+								) : (
+									<ExclusivityGroupDeletedRow
+										key={exclusivityGroup.id}
+										exclusivityGroup={exclusivityGroup}
+										exlusivityOverrideHelper={exclusivityOverrideHelper}
+									/>
+								)
+						)
+					)}
+				</tbody>
+			</table>
+			<div className="mod mhs">
+				<button className="btn btn-primary" onClick={addNewExclusivityGroup}>
+					<FontAwesomeIcon icon={faPlus} />
+				</button>
+			</div>
+		</>
+	)
+}
+
+interface ExclusivityGroupRowProps {
+	exclusivityGroup: WrappedOverridableItemNormal<StudioRouteSetExclusivityGroup>
+	toggleExpanded: (exclusivityGroupId: string, force?: boolean) => void
+	isExpanded: boolean
+	routeSetsFromOverrides: WrappedOverridableItem<StudioRouteSet>[]
+	exclusivityOverrideHelper: OverrideOpHelper
+}
+
+function ExclusivityGroupRow({
+	exclusivityGroup,
+	toggleExpanded,
+	isExpanded,
+	routeSetsFromOverrides,
+	exclusivityOverrideHelper,
+}: Readonly<ExclusivityGroupRowProps>): React.JSX.Element {
+	const { t } = useTranslation()
+
+	const removeExclusivityGroup = (eGroupId: string) => {
+		exclusivityOverrideHelper().deleteItem(eGroupId).commit()
+	}
+
+	const confirmRemoveEGroup = () => {
+		doModalDialog({
+			title: t('Remove this Exclusivity Group?'),
+			yes: t('Remove'),
+			no: t('Cancel'),
+			onAccept: () => {
+				removeExclusivityGroup(exclusivityGroup.id)
+			},
+			message: (
+				<>
+					<p>
+						{t(
+							'Are you sure you want to remove exclusivity group "{{eGroupName}}"?\nRoute Sets assigned to this group will be reset to no group.',
+							{
+								eGroupName: exclusivityGroup.computed?.name,
+							}
+						)}
+					</p>
+					<p>{t('Please note: This action is irreversible!')}</p>
+				</>
+			),
+		})
+	}
+	const updateExclusivityGroupId = React.useCallback(
+		(newGroupId: string) => {
+			exclusivityOverrideHelper().changeItemId(exclusivityGroup.id, newGroupId).commit()
+			toggleExpanded(newGroupId, true)
+		},
+		[exclusivityOverrideHelper, toggleExpanded, exclusivityGroup.id]
+	)
+
+	return (
+		<>
+			<tr
+				className={ClassNames({
+					hl: isExpanded,
+				})}
+			>
+				<th className="settings-studio-device__name c3">{exclusivityGroup.id}</th>
+				<td className="settings-studio-device__id c5">{exclusivityGroup.computed?.name}</td>
+				<td className="settings-studio-device__id c3">
+					{
+						routeSetsFromOverrides.filter(
+							(routeSet) => routeSet.computed?.exclusivityGroup === exclusivityGroup.computed?.name
+						).length
+					}
+				</td>
+
+				<td className="settings-studio-device__actions table-item-actions c3">
+					<button className="action-btn" onClick={() => toggleExpanded(exclusivityGroup.id)}>
+						<FontAwesomeIcon icon={faPencilAlt} />
+					</button>
+					<button className="action-btn" onClick={confirmRemoveEGroup}>
+						<FontAwesomeIcon icon={faTrash} />
+					</button>
+				</td>
+			</tr>
+			{isExpanded && (
+				<tr className="expando-details hl">
+					<td colSpan={6}>
+						<div className="properties-grid">
+							<label className="field">
+								<LabelActual label={t('Exclusivity Group ID')} />
+								<TextInputControl
+									modifiedClassName="bghl"
+									classNames="input text-input input-l"
+									value={exclusivityGroup.id}
+									handleUpdate={updateExclusivityGroupId}
+									disabled={!!exclusivityGroup.defaults}
+								/>
+							</label>
+							<LabelAndOverrides
+								label={t('Exclusivity Group Name')}
+								item={exclusivityGroup}
+								itemKey={'name'}
+								opPrefix={exclusivityGroup.id}
+								overrideHelper={exclusivityOverrideHelper}
+							>
+								{(value, handleUpdate) => (
+									<TextInputControl
+										modifiedClassName="bghl"
+										classNames="input text-input input-l"
+										value={value}
+										handleUpdate={handleUpdate}
+									/>
+								)}
+							</LabelAndOverrides>
+						</div>
+						<div className="mod alright">
+							<button className="btn btn-primary" onClick={() => toggleExpanded(exclusivityGroup.id)}>
+								<FontAwesomeIcon icon={faCheck} />
+							</button>
+						</div>
+					</td>
+				</tr>
+			)}
+		</>
+	)
+}
+
+interface ExclusivityGroupDeletedRowProps {
+	exclusivityGroup: WrappedOverridableItemDeleted<StudioRouteSetExclusivityGroup>
+	exlusivityOverrideHelper: OverrideOpHelper
+}
+
+function ExclusivityGroupDeletedRow({
+	exclusivityGroup,
+	exlusivityOverrideHelper: overrideHelper,
+}: Readonly<ExclusivityGroupDeletedRowProps>): React.JSX.Element {
+	const doUndeleteItem = React.useCallback(
+		() => overrideHelper().resetItem(exclusivityGroup.id).commit(),
+		[overrideHelper, exclusivityGroup.id]
+	)
+
+	return (
+		<tr>
+			<th className="settings-studio-device__name c3 notifications-s notifications-text">
+				{exclusivityGroup.defaults?.name}
+			</th>
+			<td className="settings-studio-device__id c2 deleted">{exclusivityGroup.defaults?.name}</td>
+			<td className="settings-studio-device__id c2 deleted">{exclusivityGroup.id}</td>
+			<td className="settings-studio-output-table__actions table-item-actions c3">
+				<button className="action-btn" onClick={doUndeleteItem} title="Restore to defaults">
+					<FontAwesomeIcon icon={faSync} />
+				</button>
+			</td>
+		</tr>
+	)
+}
diff --git a/packages/webui/src/client/ui/Settings/Studio/Routings/RouteSetAbPlayers.tsx b/packages/webui/src/client/ui/Settings/Studio/Routings/RouteSetAbPlayers.tsx
new file mode 100644
index 0000000000..f6dc204d50
--- /dev/null
+++ b/packages/webui/src/client/ui/Settings/Studio/Routings/RouteSetAbPlayers.tsx
@@ -0,0 +1,152 @@
+import * as React from 'react'
+import { StudioRouteSet, StudioAbPlayerDisabling } from '@sofie-automation/corelib/dist/dataModel/Studio'
+import { doModalDialog } from '../../../../lib/ModalDialog'
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
+import { faTrash } from '@fortawesome/free-solid-svg-icons'
+import { useTranslation } from 'react-i18next'
+import { literal } from '@sofie-automation/corelib/dist/lib'
+import { LabelAndOverrides } from '../../../../lib/Components/LabelAndOverrides'
+import {
+	OverrideOpHelper,
+	OverrideOpHelperForItemContents,
+	WrappedOverridableItemNormal,
+} from '../../util/OverrideOpHelper'
+import { TextInputControl } from '../../../../lib/Components/TextInput'
+import { OverrideOpHelperArrayTable } from '../../../../lib/forms/SchemaFormTable/ArrayTableOpHelper'
+
+interface RouteSetAbPlayersProps {
+	routeSet: WrappedOverridableItemNormal<StudioRouteSet>
+	overrideHelper: OverrideOpHelper
+}
+
+export function RouteSetAbPlayers({ routeSet, overrideHelper }: Readonly<RouteSetAbPlayersProps>): React.JSX.Element {
+	const { t } = useTranslation()
+
+	const tableOverrideHelper = React.useCallback(
+		() => new OverrideOpHelperArrayTable(overrideHelper(), routeSet.id, routeSet.computed.abPlayers, 'abPlayers'),
+		[overrideHelper, routeSet.id, routeSet.computed.abPlayers]
+	)
+
+	const confirmRemoveAbPlayer = React.useCallback(
+		(route: WrappedOverridableItemNormal<StudioAbPlayerDisabling>) => {
+			doModalDialog({
+				title: t('Remove this AB PLayers from this Route Set?'),
+				yes: t('Remove'),
+				no: t('Cancel'),
+				onAccept: () => {
+					tableOverrideHelper().deleteRow(route.id).commit()
+				},
+				message: (
+					<>
+						<p>
+							{t('Are you sure you want to remove the AB Player "{{playerId}}"?', {
+								playerId: route.computed.playerId,
+							})}
+						</p>
+						<p>{t('Please note: This action is irreversible!')}</p>
+					</>
+				),
+			})
+		},
+		[tableOverrideHelper]
+	)
+
+	return (
+		<>
+			<h4 className="mod mhs">{t('AB Playout devices')}</h4>
+			<p className="text-s dimmed field-hint mhs">
+				{t(
+					'Any AB Playout devices here will only be active when this or another RouteSet that includes them is active'
+				)}
+			</p>
+			{routeSet.computed.abPlayers.length === 0 ? (
+				<p className="text-s dimmed field-hint mhs">{t('There are no AB Playout devices set up yet')}</p>
+			) : (
+				routeSet.computed.abPlayers.map((route, index) => (
+					<AbPlayerRow
+						key={index}
+						tableOverrideHelper={tableOverrideHelper}
+						abPlayer={route}
+						index={index}
+						confirmRemoveAbPlayer={confirmRemoveAbPlayer}
+					/>
+				))
+			)}
+		</>
+	)
+}
+
+interface AbPlayerRowProps {
+	tableOverrideHelper: OverrideOpHelperForItemContents
+	abPlayer: StudioAbPlayerDisabling
+	index: number
+	confirmRemoveAbPlayer: (route: WrappedOverridableItemNormal<any>) => void
+}
+
+function AbPlayerRow({
+	tableOverrideHelper,
+	abPlayer,
+	index,
+	confirmRemoveAbPlayer,
+}: Readonly<AbPlayerRowProps>): React.JSX.Element {
+	const { t } = useTranslation()
+
+	const player = React.useMemo(
+		() =>
+			literal<WrappedOverridableItemNormal<StudioAbPlayerDisabling>>({
+				type: 'normal',
+				id: index + '',
+				computed: abPlayer,
+				defaults: undefined,
+				overrideOps: [],
+			}),
+		[abPlayer, index]
+	)
+
+	const confirmRemoveRouteLocal = React.useCallback(
+		() => confirmRemoveAbPlayer(player),
+		[confirmRemoveAbPlayer, player]
+	)
+
+	return (
+		<div className="route-sets-editor mod pan mas">
+			<button className="action-btn right mod man pas" onClick={confirmRemoveRouteLocal}>
+				<FontAwesomeIcon icon={faTrash} />
+			</button>
+			<div className="properties-grid">
+				<LabelAndOverrides
+					label={t('Pool name')}
+					item={player}
+					itemKey={'poolName'}
+					opPrefix={player.id}
+					overrideHelper={tableOverrideHelper}
+				>
+					{(value, handleUpdate) => (
+						<TextInputControl
+							modifiedClassName="bghl"
+							classNames="input text-input input-l"
+							value={value}
+							handleUpdate={handleUpdate}
+						/>
+					)}
+				</LabelAndOverrides>
+				<LabelAndOverrides
+					label={t('Pool PlayerId')}
+					item={player}
+					itemKey={'playerId'}
+					opPrefix={player.id}
+					overrideHelper={tableOverrideHelper}
+				>
+					{(value, handleUpdate) => (
+						<TextInputControl
+							modifiedClassName="bghl"
+							classNames="input text-input input-l"
+							value={value}
+							handleUpdate={handleUpdate}
+						/>
+					)}
+				</LabelAndOverrides>
+			</div>
+		</div>
+	)
+}
diff --git a/packages/webui/src/client/ui/Settings/Studio/Routings/RouteSets.tsx b/packages/webui/src/client/ui/Settings/Studio/Routings/RouteSets.tsx
new file mode 100644
index 0000000000..cf555b4611
--- /dev/null
+++ b/packages/webui/src/client/ui/Settings/Studio/Routings/RouteSets.tsx
@@ -0,0 +1,781 @@
+import ClassNames from 'classnames'
+import * as React from 'react'
+import {
+	StudioRouteSet,
+	StudioRouteBehavior,
+	RouteMapping,
+	StudioRouteSetExclusivityGroup,
+	StudioRouteType,
+	MappingsExt,
+	MappingExt,
+	DBStudio,
+} from '@sofie-automation/corelib/dist/dataModel/Studio'
+import { doModalDialog } from '../../../../lib/ModalDialog'
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
+import { faTrash, faPencilAlt, faCheck, faPlus, faSync } from '@fortawesome/free-solid-svg-icons'
+import { useTranslation } from 'react-i18next'
+import { TSR } from '@sofie-automation/blueprints-integration'
+import { ReadonlyDeep } from 'type-fest'
+import { MappingsSettingsManifest, MappingsSettingsManifests } from '../Mappings'
+import { literal } from '@sofie-automation/corelib/dist/lib'
+import {
+	DropdownInputControl,
+	DropdownInputOption,
+	getDropdownInputOptions,
+} from '../../../../lib/Components/DropdownInput'
+import { JSONSchema } from '@sofie-automation/shared-lib/dist/lib/JSONSchemaTypes'
+import {
+	LabelActual,
+	LabelAndOverrides,
+	LabelAndOverridesForCheckbox,
+	LabelAndOverridesForDropdown,
+} from '../../../../lib/Components/LabelAndOverrides'
+import {
+	OverrideOpHelper,
+	OverrideOpHelperForItemContents,
+	useOverrideOpHelper,
+	WrappedOverridableItem,
+	WrappedOverridableItemDeleted,
+	WrappedOverridableItemNormal,
+} from '../../util/OverrideOpHelper'
+import { TextInputControl } from '../../../../lib/Components/TextInput'
+import { CheckboxControl } from '../../../../lib/Components/Checkbox'
+import { OverrideOpHelperArrayTable } from '../../../../lib/forms/SchemaFormTable/ArrayTableOpHelper'
+import { hasOpWithPath } from '../../../../lib/Components/util'
+import { SchemaFormWithOverrides } from '../../../../lib/forms/SchemaFormWithOverrides'
+import {
+	applyAndValidateOverrides,
+	ObjectOverrideSetOp,
+	SomeObjectOverrideOp,
+} from '@sofie-automation/corelib/dist/settings/objectWithOverrides'
+import { Studios } from '../../../../collections'
+import { useToggleExpandHelper } from '../../../util/useToggleExpandHelper'
+import { RouteSetAbPlayers } from './RouteSetAbPlayers'
+
+interface RouteSetsTable {
+	studio: DBStudio
+	routeSetsFromOverrides: WrappedOverridableItem<StudioRouteSet>[]
+	exclusivityGroupsFromOverrides: WrappedOverridableItem<StudioRouteSetExclusivityGroup>[]
+	studioMappings: ReadonlyDeep<MappingsExt>
+	manifest: MappingsSettingsManifests
+	translationNamespaces: string[]
+}
+
+export function RouteSetsTable({
+	studio,
+	routeSetsFromOverrides,
+	exclusivityGroupsFromOverrides,
+	studioMappings,
+	manifest,
+	translationNamespaces,
+}: Readonly<RouteSetsTable>): React.JSX.Element {
+	const { t } = useTranslation()
+	const { toggleExpanded, isExpanded } = useToggleExpandHelper()
+
+	const addNewRouteSet = React.useCallback(() => {
+		const resolvedRouteSets = applyAndValidateOverrides(studio.routeSetsWithOverrides).obj
+
+		// find free key name
+		const newRouteKeyName = 'newRouteSet'
+		let iter = 0
+		while (resolvedRouteSets[newRouteKeyName + iter.toString()]) {
+			iter++
+		}
+
+		const newId = newRouteKeyName + iter.toString()
+		const newRoute = literal<StudioRouteSet>({
+			name: 'New Route Set ' + iter.toString(),
+			active: false,
+			routes: [],
+			abPlayers: [],
+			behavior: StudioRouteBehavior.TOGGLE,
+			exclusivityGroup: undefined,
+		})
+
+		const addOp = literal<ObjectOverrideSetOp>({
+			op: 'set',
+			path: newId,
+			value: newRoute,
+		})
+
+		Studios.update(studio._id, {
+			$push: {
+				'routeSetsWithOverrides.overrides': addOp,
+			},
+		})
+
+		setTimeout(() => {
+			toggleExpanded(newId, true)
+		}, 1)
+	}, [studio._id, studio.routeSetsWithOverrides])
+
+	const saveOverrides = React.useCallback(
+		(newOps: SomeObjectOverrideOp[]) => {
+			Studios.update(studio._id, {
+				$set: {
+					'routeSetsWithOverrides.overrides': newOps,
+				},
+			})
+		},
+		[studio._id]
+	)
+
+	const overrideHelper = useOverrideOpHelper(saveOverrides, studio.routeSetsWithOverrides)
+
+	return (
+		<>
+			<table className="expando settings-studio-mappings-table">
+				<tbody>
+					{routeSetsFromOverrides.length === 0 ? (
+						<tr>
+							<td className="mhn dimmed">{t('There are no Route Sets set up.')}</td>
+						</tr>
+					) : (
+						routeSetsFromOverrides.map((routeSet: WrappedOverridableItem<StudioRouteSet>) =>
+							routeSet.type === 'normal' ? (
+								<RouteSetRow
+									key={routeSet.id}
+									routeSet={routeSet}
+									manifest={manifest}
+									translationNamespaces={translationNamespaces}
+									studioMappings={studioMappings}
+									toggleExpanded={toggleExpanded}
+									isExpanded={isExpanded(routeSet.id)}
+									overrideHelper={overrideHelper}
+									exclusivityGroupsFromOverrides={exclusivityGroupsFromOverrides}
+								/>
+							) : (
+								<RouteSetDeletedRow key={routeSet.id} routeSet={routeSet} overrideHelper={overrideHelper} />
+							)
+						)
+					)}
+				</tbody>
+			</table>
+			<div className="mod mhs">
+				<button className="btn btn-primary" onClick={addNewRouteSet}>
+					<FontAwesomeIcon icon={faPlus} />
+				</button>
+			</div>
+		</>
+	)
+}
+
+interface RouteSetRowProps {
+	routeSet: WrappedOverridableItemNormal<StudioRouteSet>
+	manifest: MappingsSettingsManifests
+	translationNamespaces: string[]
+	studioMappings: ReadonlyDeep<MappingsExt>
+	toggleExpanded: (layerId: string, force?: boolean) => void
+	isExpanded: boolean
+	overrideHelper: OverrideOpHelper
+	exclusivityGroupsFromOverrides: WrappedOverridableItem<StudioRouteSetExclusivityGroup>[]
+}
+
+function RouteSetRow({
+	routeSet,
+	manifest,
+	translationNamespaces,
+	toggleExpanded,
+	isExpanded,
+	studioMappings,
+	overrideHelper,
+	exclusivityGroupsFromOverrides,
+}: Readonly<RouteSetRowProps>): React.JSX.Element {
+	const { t } = useTranslation()
+	const toggleEditRouteSet = React.useCallback(() => toggleExpanded(routeSet.id), [toggleExpanded, routeSet.id])
+
+	const confirmRemove = (routeSetId: string) => {
+		doModalDialog({
+			title: t('Remove this Route Set?'),
+			yes: t('Remove'),
+			no: t('Cancel'),
+			onAccept: () => {
+				overrideHelper().deleteItem(routeSetId).commit()
+			},
+			message: (
+				<React.Fragment>
+					<p>{t('Are you sure you want to remove the Route Set "{{routeId}}"?', { routeId: routeSetId })}</p>
+					<p>{t('Please note: This action is irreversible!')}</p>
+				</React.Fragment>
+			),
+		})
+	}
+
+	const addNewRouteInSet = (routeId: string) => {
+		const newRoutes = routeSet.computed?.routes || []
+
+		newRoutes.push({
+			mappedLayer: '',
+			outputMappedLayer: '',
+			remapping: {},
+			routeType: StudioRouteType.REROUTE,
+		})
+
+		overrideHelper().setItemValue(routeId, 'routes', newRoutes).commit()
+	}
+
+	const addNewAbPlayerInSet = (routeId: string) => {
+		const newAbPlayers = routeSet.computed?.abPlayers || []
+
+		newAbPlayers.push({
+			poolName: '',
+			playerId: '',
+		})
+
+		overrideHelper().setItemValue(routeId, 'abPlayers', newAbPlayers).commit()
+	}
+
+	const updateRouteSetId = React.useCallback(
+		(newRouteSetId: string) => {
+			overrideHelper().changeItemId(routeSet.id, newRouteSetId).commit()
+			toggleExpanded(newRouteSetId, true)
+		},
+		[overrideHelper, toggleExpanded, routeSet.id]
+	)
+
+	const exclusivityGroupOptions = React.useMemo(() => {
+		return getDropdownInputOptions([
+			{
+				name: 'None',
+				value: undefined,
+			},
+			...exclusivityGroupsFromOverrides
+				.filter((group) => group.type === 'normal')
+				.map((group) => group.computed?.name || group.id),
+		])
+	}, [exclusivityGroupsFromOverrides])
+
+	const DEFAULT_ACTIVE_OPTIONS = {
+		[t('Active')]: true,
+		[t('Not Active')]: false,
+		[t('Not defined')]: undefined,
+	}
+
+	const resyncRoutesTable = React.useCallback(
+		() => overrideHelper().clearItemOverrides(routeSet.id, 'routes').commit(),
+		[overrideHelper, routeSet.id]
+	)
+	const routesIsOverridden = hasOpWithPath(routeSet.overrideOps, routeSet.id, 'routes')
+
+	const resyncAbPlayerTable = React.useCallback(
+		() => overrideHelper().clearItemOverrides(routeSet.id, 'abPlayers').commit(),
+		[overrideHelper, routeSet.id]
+	)
+	const abPlayerIsOverridden = hasOpWithPath(routeSet.overrideOps, routeSet.id, 'abPlayers')
+
+	return (
+		<React.Fragment>
+			<tr
+				className={ClassNames({
+					hl: isExpanded,
+				})}
+			>
+				<th className="settings-studio-device__name c2">{routeSet.id}</th>
+				<td className="settings-studio-device__id c3">{routeSet.computed?.name}</td>
+				<td className="settings-studio-device__id c4">{routeSet.computed?.exclusivityGroup}</td>
+				<td className="settings-studio-device__id c2">{routeSet.computed?.routes?.length}</td>
+				<td className="settings-studio-device__id c2">
+					{routeSet.computed?.active ? <span className="pill">{t('Active')}</span> : null}
+				</td>
+
+				<td className="settings-studio-device__actions table-item-actions c3">
+					<button className="action-btn" onClick={toggleEditRouteSet}>
+						<FontAwesomeIcon icon={faPencilAlt} />
+					</button>
+					<button className="action-btn" onClick={() => confirmRemove(routeSet.id)}>
+						<FontAwesomeIcon icon={faTrash} />
+					</button>
+				</td>
+			</tr>
+			{isExpanded && (
+				<tr className="expando-details hl">
+					<td colSpan={6}>
+						<div className="properties-grid">
+							<label className="field">
+								<LabelActual label={t('Route Set ID')} />
+								<TextInputControl
+									modifiedClassName="bghl"
+									classNames="input text-input input-l"
+									value={routeSet.id}
+									handleUpdate={updateRouteSetId}
+									disabled={!!routeSet.defaults}
+								/>
+							</label>
+							<LabelAndOverridesForDropdown
+								label={t('Default State')}
+								hint={t('he default state of this Route Set')}
+								item={routeSet}
+								itemKey={'defaultActive'}
+								opPrefix={routeSet.id}
+								overrideHelper={overrideHelper}
+								options={getDropdownInputOptions(DEFAULT_ACTIVE_OPTIONS)}
+							>
+								{(value, handleUpdate, options) => (
+									<DropdownInputControl
+										classNames="input text-input input-l"
+										options={options}
+										value={value}
+										handleUpdate={handleUpdate}
+									/>
+								)}
+							</LabelAndOverridesForDropdown>
+							<LabelAndOverridesForCheckbox
+								label={t('Active')}
+								item={routeSet}
+								itemKey={'active'}
+								opPrefix={routeSet.id}
+								overrideHelper={overrideHelper}
+							>
+								{(value, handleUpdate) => <CheckboxControl value={!!value} handleUpdate={handleUpdate} />}
+							</LabelAndOverridesForCheckbox>
+							<LabelAndOverrides
+								label={t('Route Set Name')}
+								item={routeSet}
+								itemKey={'name'}
+								opPrefix={routeSet.id}
+								overrideHelper={overrideHelper}
+							>
+								{(value, handleUpdate) => (
+									<TextInputControl
+										modifiedClassName="bghl"
+										classNames="input text-input input-l"
+										value={value}
+										handleUpdate={handleUpdate}
+									/>
+								)}
+							</LabelAndOverrides>
+
+							<LabelAndOverridesForDropdown
+								label={'Exclusivity group'}
+								hint={t('If set, only one Route Set will be active per exclusivity group')}
+								item={routeSet}
+								itemKey={'exclusivityGroup'}
+								opPrefix={routeSet.id}
+								overrideHelper={overrideHelper}
+								options={exclusivityGroupOptions}
+							>
+								{(value, handleUpdate, options) => (
+									<DropdownInputControl
+										classNames="input text-input input-l"
+										options={options}
+										value={value}
+										handleUpdate={handleUpdate}
+									/>
+								)}
+							</LabelAndOverridesForDropdown>
+
+							<LabelAndOverridesForDropdown
+								label={t('Behavior')}
+								hint={t('The way this Route Set should behave towards the user')}
+								item={routeSet}
+								itemKey={'behavior'}
+								opPrefix={routeSet.id}
+								overrideHelper={overrideHelper}
+								options={getDropdownInputOptions(StudioRouteBehavior)}
+							>
+								{(value, handleUpdate, options) => (
+									<DropdownInputControl
+										classNames="input text-input input-l"
+										options={options}
+										value={value}
+										handleUpdate={handleUpdate}
+									/>
+								)}
+							</LabelAndOverridesForDropdown>
+						</div>
+						<RenderRoutes
+							routeSet={routeSet}
+							manifest={manifest}
+							translationNamespaces={translationNamespaces}
+							overrideHelper={overrideHelper}
+							studioMappings={studioMappings}
+						/>
+						<div className="mod">
+							<button className="btn btn-secondary" onClick={() => addNewRouteInSet(routeSet.id)}>
+								<FontAwesomeIcon icon={faPlus} />
+							</button>
+							&nbsp;
+							{routeSet.defaults && (
+								<button
+									className="btn btn-primary"
+									onClick={resyncRoutesTable}
+									title="Reset to default"
+									disabled={!routesIsOverridden}
+								>
+									{t('Reset')}
+									&nbsp;
+									<FontAwesomeIcon icon={faSync} />
+								</button>
+							)}
+						</div>
+						<RouteSetAbPlayers routeSet={routeSet} overrideHelper={overrideHelper} />
+						<div className="mod">
+							<button className="btn btn-secondary" onClick={() => addNewAbPlayerInSet(routeSet.id)}>
+								<FontAwesomeIcon icon={faPlus} />
+							</button>
+							&nbsp;
+							{routeSet.defaults && (
+								<button
+									className="btn btn-primary"
+									onClick={resyncAbPlayerTable}
+									title="Reset to default"
+									disabled={!abPlayerIsOverridden}
+								>
+									{t('Reset')}
+									&nbsp;
+									<FontAwesomeIcon icon={faSync} />
+								</button>
+							)}
+						</div>
+						<button className="btn btn-primary right" onClick={() => toggleExpanded(routeSet.id)}>
+							<FontAwesomeIcon icon={faCheck} />
+						</button>
+					</td>
+				</tr>
+			)}
+		</React.Fragment>
+	)
+}
+
+interface RouteSetDeletedRowProps {
+	routeSet: WrappedOverridableItemDeleted<StudioRouteSet>
+	overrideHelper: OverrideOpHelper
+}
+
+function RouteSetDeletedRow({ routeSet, overrideHelper }: Readonly<RouteSetDeletedRowProps>) {
+	const doUndeleteItem = React.useCallback(
+		() => overrideHelper().resetItem(routeSet.id).commit(),
+		[overrideHelper, routeSet.id]
+	)
+
+	return (
+		<tr>
+			<th className="settings-studio-device__name c3 notifications-s notifications-text">{routeSet.defaults.name}</th>
+			<td className="settings-studio-device__id c2 deleted">{routeSet.defaults.name}</td>
+			<td className="settings-studio-device__id c2 deleted">{routeSet.id}</td>
+			<td className="settings-studio-output-table__actions table-item-actions c3">
+				<button className="action-btn" onClick={doUndeleteItem} title="Restore to defaults">
+					<FontAwesomeIcon icon={faSync} />
+				</button>
+			</td>
+		</tr>
+	)
+}
+
+interface IRenderRoutesProps {
+	routeSet: WrappedOverridableItemNormal<StudioRouteSet>
+	manifest: MappingsSettingsManifests
+	translationNamespaces: string[]
+	overrideHelper: OverrideOpHelper
+	studioMappings: ReadonlyDeep<MappingsExt>
+}
+
+function RenderRoutes({
+	routeSet,
+	manifest,
+	translationNamespaces,
+	overrideHelper,
+	studioMappings,
+}: Readonly<IRenderRoutesProps>): React.JSX.Element {
+	const { t } = useTranslation()
+
+	const routesBuffer = routeSet.computed.routes
+
+	const tableOverrideHelper = React.useCallback(
+		() => new OverrideOpHelperArrayTable(overrideHelper(), routeSet.id, routesBuffer, 'routes'),
+		[overrideHelper, routeSet.id, routesBuffer]
+	)
+
+	const confirmRemoveRoute = React.useCallback(
+		(route: WrappedOverridableItemNormal<RouteMapping>) => {
+			doModalDialog({
+				title: t('Remove this Route from this Route Set?'),
+				yes: t('Remove'),
+				no: t('Cancel'),
+				onAccept: () => {
+					tableOverrideHelper().deleteRow(route.id).commit()
+				},
+				message: (
+					<>
+						<p>
+							{t('Are you sure you want to remove the Route from "{{sourceLayerId}}" to "{{newLayerId}}"?', {
+								sourceLayerId: route.computed.mappedLayer,
+								newLayerId: route.computed.outputMappedLayer,
+							})}
+						</p>
+						<p>{t('Please note: This action is irreversible!')}</p>
+					</>
+				),
+			})
+		},
+		[tableOverrideHelper]
+	)
+
+	return (
+		<>
+			<h4 className="mod mhs">{t('Routes')}</h4>
+			{routeSet.computed?.routes?.length === 0 ? (
+				<p className="text-s dimmed field-hint mhs">{t('There are no routes set up yet')}</p>
+			) : null}
+			{routesBuffer.map((route, index) => (
+				<RenderRoutesRow
+					key={index}
+					manifest={manifest}
+					translationNamespaces={translationNamespaces}
+					tableOverrideHelper={tableOverrideHelper}
+					studioMappings={studioMappings}
+					rawRoute={route}
+					routeIndex={index}
+					confirmRemoveRoute={confirmRemoveRoute}
+				/>
+			))}
+		</>
+	)
+}
+
+interface RenderRoutesRowProps {
+	manifest: MappingsSettingsManifests
+	translationNamespaces: string[]
+	tableOverrideHelper: OverrideOpHelperForItemContents
+	studioMappings: ReadonlyDeep<MappingsExt>
+	rawRoute: RouteMapping
+	routeIndex: number
+	confirmRemoveRoute: (route: WrappedOverridableItemNormal<RouteMapping>) => void
+}
+
+function RenderRoutesRow({
+	manifest,
+	translationNamespaces,
+	tableOverrideHelper,
+	studioMappings,
+	rawRoute,
+	routeIndex,
+	confirmRemoveRoute,
+}: Readonly<RenderRoutesRowProps>): React.JSX.Element {
+	const { t } = useTranslation()
+
+	const mappedLayer = rawRoute.mappedLayer ? studioMappings[rawRoute.mappedLayer] : undefined
+	const deviceTypeFromMappedLayer: TSR.DeviceType | undefined = mappedLayer?.device
+
+	const routeDeviceType: TSR.DeviceType | undefined =
+		rawRoute.routeType === StudioRouteType.REMAP
+			? rawRoute.deviceType
+			: rawRoute.mappedLayer
+			? deviceTypeFromMappedLayer
+			: rawRoute.deviceType
+
+	const routeMappingSchema = manifest[(routeDeviceType ?? rawRoute.remapping?.device) as TSR.DeviceType]
+
+	const mappingTypeOptions: DropdownInputOption<string | number>[] = React.useMemo(() => {
+		const rawMappingTypeOptions = Object.entries<JSONSchema>(routeMappingSchema?.mappingsSchema || {})
+		return rawMappingTypeOptions.map(([id, entry], i) =>
+			literal<DropdownInputOption<string | number>>({
+				value: id + '',
+				name: entry?.title ?? id + '',
+				i,
+			})
+		)
+	}, [routeMappingSchema?.mappingsSchema])
+
+	const route = React.useMemo(
+		() =>
+			literal<WrappedOverridableItemNormal<RouteMapping>>({
+				type: 'normal',
+				id: routeIndex + '',
+				computed: rawRoute,
+				defaults: undefined,
+				overrideOps: [],
+			}),
+		[rawRoute, routeIndex]
+	)
+
+	const confirmRemoveRouteLocal = React.useCallback(() => confirmRemoveRoute(route), [confirmRemoveRoute, route])
+
+	return (
+		<div className="route-sets-editor mod pan mas">
+			<button className="action-btn right mod man pas" onClick={confirmRemoveRouteLocal}>
+				<FontAwesomeIcon icon={faTrash} />
+			</button>
+			<div className="properties-grid">
+				<LabelAndOverridesForDropdown
+					label={t('Original Layer')}
+					item={route}
+					itemKey={'mappedLayer'}
+					opPrefix={route.id}
+					overrideHelper={tableOverrideHelper}
+					options={getDropdownInputOptions(Object.keys(studioMappings))}
+				>
+					{(value, handleUpdate, options) => (
+						<DropdownInputControl
+							classNames="input text-input input-l"
+							options={options}
+							value={value}
+							handleUpdate={handleUpdate}
+						/>
+					)}
+				</LabelAndOverridesForDropdown>
+
+				<LabelAndOverrides
+					label={t('New Layer')}
+					item={route}
+					itemKey={'outputMappedLayer'}
+					opPrefix={route.id}
+					overrideHelper={tableOverrideHelper}
+				>
+					{(value, handleUpdate) => (
+						<TextInputControl
+							modifiedClassName="bghl"
+							classNames="input text-input input-l"
+							value={value}
+							handleUpdate={handleUpdate}
+						/>
+					)}
+				</LabelAndOverrides>
+
+				<LabelAndOverridesForDropdown
+					label={t('Route Type')}
+					item={route}
+					itemKey={'routeType'}
+					opPrefix={route.id}
+					overrideHelper={tableOverrideHelper}
+					options={getDropdownInputOptions(StudioRouteType)}
+				>
+					{(value, handleUpdate, options) => {
+						if (!rawRoute.mappedLayer) {
+							return <span className="mls">REMAP</span>
+						} else {
+							return (
+								<DropdownInputControl
+									classNames="input text-input input-l"
+									options={options}
+									value={value}
+									handleUpdate={handleUpdate}
+								/>
+							)
+						}
+					}}
+				</LabelAndOverridesForDropdown>
+
+				<LabelAndOverridesForDropdown
+					label={t('Device Type')}
+					item={route}
+					itemKey={'deviceType'}
+					opPrefix={route.id}
+					overrideHelper={tableOverrideHelper}
+					options={getDropdownInputOptions(TSR.DeviceType)}
+				>
+					{(value, handleUpdate, options) => {
+						if (rawRoute.routeType === StudioRouteType.REROUTE && rawRoute.mappedLayer) {
+							return deviceTypeFromMappedLayer !== undefined ? (
+								<span className="mls">{TSR.DeviceType[deviceTypeFromMappedLayer]}</span>
+							) : (
+								<span className="mls dimmed">{t('Original Layer not found')}</span>
+							)
+						} else {
+							return (
+								<DropdownInputControl
+									classNames="input text-input input-l"
+									options={options}
+									value={value}
+									handleUpdate={handleUpdate}
+								/>
+							)
+						}
+					}}
+				</LabelAndOverridesForDropdown>
+
+				{mappingTypeOptions.length > 0 && (
+					<LabelAndOverridesForDropdown<any> // Deep key is not allowed, but is fine for now
+						label={t('Mapping Type')}
+						item={route}
+						itemKey={'remapping.options.mappingType'}
+						opPrefix={route.id}
+						overrideHelper={tableOverrideHelper}
+						options={mappingTypeOptions}
+					>
+						{(value, handleUpdate, options) => (
+							<DropdownInputControl
+								classNames="input text-input input-l"
+								options={options}
+								value={value}
+								handleUpdate={handleUpdate}
+							/>
+						)}
+					</LabelAndOverridesForDropdown>
+				)}
+				{rawRoute.routeType === StudioRouteType.REMAP ||
+				(routeDeviceType !== undefined && rawRoute.remapping !== undefined) ? (
+					<>
+						<LabelAndOverrides<any> // Deep key is not allowed, but is fine for now
+							label={t('Device ID')}
+							item={route}
+							itemKey={'remapping.deviceId'}
+							opPrefix={route.id}
+							overrideHelper={tableOverrideHelper}
+							showClearButton={true}
+						>
+							{(value, handleUpdate) => (
+								<TextInputControl
+									modifiedClassName="bghl"
+									classNames="input text-input input-l"
+									value={value}
+									handleUpdate={handleUpdate}
+								/>
+							)}
+						</LabelAndOverrides>
+
+						<DeviceMappingSettings
+							translationNamespaces={translationNamespaces}
+							mappedLayer={mappedLayer}
+							manifest={routeMappingSchema}
+							overrideHelper={tableOverrideHelper}
+							route={route}
+						/>
+					</>
+				) : null}
+			</div>
+		</div>
+	)
+}
+
+interface IDeviceMappingSettingsProps {
+	translationNamespaces: string[]
+	manifest: MappingsSettingsManifest | undefined
+	mappedLayer: ReadonlyDeep<MappingExt> | undefined
+	overrideHelper: OverrideOpHelperForItemContents
+	route: WrappedOverridableItemNormal<RouteMapping>
+}
+
+function DeviceMappingSettings({
+	translationNamespaces,
+	manifest,
+	mappedLayer,
+	overrideHelper,
+	route,
+}: Readonly<IDeviceMappingSettingsProps>) {
+	const mappingType = route.computed?.remapping?.options?.mappingType ?? mappedLayer?.options?.mappingType
+	const mappingSchema = mappingType ? manifest?.mappingsSchema?.[mappingType] : undefined
+
+	// Remove the required field from the schema, as that the properties show the clear button
+	const mappingSchemaPartial = React.useMemo(() => {
+		if (!mappingSchema) return null
+
+		return { ...mappingSchema, required: [] }
+	}, [mappingSchema])
+
+	if (mappingSchemaPartial) {
+		return (
+			<SchemaFormWithOverrides
+				schema={mappingSchemaPartial}
+				translationNamespaces={translationNamespaces}
+				attr={'remapping.options'}
+				item={route}
+				overrideHelper={overrideHelper}
+				isRequired
+				showClearButtonForNonRequiredFields={true}
+			/>
+		)
+	} else {
+		return null
+	}
+}
diff --git a/packages/webui/src/client/ui/Settings/Studio/Routings/index.tsx b/packages/webui/src/client/ui/Settings/Studio/Routings/index.tsx
new file mode 100644
index 0000000000..abab3b3d0c
--- /dev/null
+++ b/packages/webui/src/client/ui/Settings/Studio/Routings/index.tsx
@@ -0,0 +1,68 @@
+import * as React from 'react'
+import { DBStudio, MappingsExt } from '@sofie-automation/corelib/dist/dataModel/Studio'
+import { useTranslation } from 'react-i18next'
+import { ReadonlyDeep } from 'type-fest'
+import { MappingsSettingsManifests } from '../Mappings'
+import { getAllCurrentAndDeletedItemsFromOverrides } from '../../util/OverrideOpHelper'
+import { ExclusivityGroupsTable } from './ExclusivityGroups'
+import { RouteSetsTable } from './RouteSets'
+
+interface IStudioRoutingsProps {
+	translationNamespaces: string[]
+	studio: DBStudio
+	studioMappings: ReadonlyDeep<MappingsExt>
+	manifest: MappingsSettingsManifests | undefined
+}
+
+export function StudioRoutings({
+	translationNamespaces,
+	studio,
+	studioMappings,
+	manifest,
+}: Readonly<IStudioRoutingsProps>): React.JSX.Element {
+	const { t } = useTranslation()
+
+	const routeSetsFromOverrides = React.useMemo(
+		() => getAllCurrentAndDeletedItemsFromOverrides(studio.routeSetsWithOverrides, null),
+		[studio.routeSetsWithOverrides]
+	)
+
+	const exclusivityGroupsFromOverrides = React.useMemo(
+		() =>
+			getAllCurrentAndDeletedItemsFromOverrides(studio.routeSetExclusivityGroupsWithOverrides, (a, b) =>
+				a[0].localeCompare(b[0])
+			),
+		[studio.routeSetExclusivityGroupsWithOverrides]
+	)
+
+	return (
+		<div>
+			<h2 className="mhn mbs">{t('Route Sets')}</h2>
+			{!manifest && <span>{t('Add a playout device to the studio in order to configure the route sets')}</span>}
+			{manifest && (
+				<>
+					<p className="mhn mvs text-s dimmed field-hint">
+						{t(
+							'Controls for exposed Route Sets will be displayed to the producer within the Rundown View in the Switchboard.'
+						)}
+					</p>
+					<h3 className="mhn">{t('Exclusivity Groups')}</h3>
+					<ExclusivityGroupsTable
+						studio={studio}
+						routeSetsFromOverrides={routeSetsFromOverrides}
+						exclusivityGroupsFromOverrides={exclusivityGroupsFromOverrides}
+					/>
+					<h3 className="mhn">{t('Route Sets')}</h3>
+					<RouteSetsTable
+						studio={studio}
+						routeSetsFromOverrides={routeSetsFromOverrides}
+						exclusivityGroupsFromOverrides={exclusivityGroupsFromOverrides}
+						studioMappings={studioMappings}
+						manifest={manifest}
+						translationNamespaces={translationNamespaces}
+					/>
+				</>
+			)}
+		</div>
+	)
+}
diff --git a/meteor/client/ui/Settings/StudioSettings.tsx b/packages/webui/src/client/ui/Settings/StudioSettings.tsx
similarity index 99%
rename from meteor/client/ui/Settings/StudioSettings.tsx
rename to packages/webui/src/client/ui/Settings/StudioSettings.tsx
index 3e0ae25bd0..1adb7c17d9 100644
--- a/meteor/client/ui/Settings/StudioSettings.tsx
+++ b/packages/webui/src/client/ui/Settings/StudioSettings.tsx
@@ -1,4 +1,4 @@
-import React, { useMemo } from 'react'
+import { useMemo } from 'react'
 import { useTracker } from '../../lib/ReactMeteorData/react-meteor-data'
 import { Spinner } from '../../lib/Spinner'
 import { PeripheralDeviceType } from '@sofie-automation/corelib/dist/dataModel/PeripheralDevice'
diff --git a/meteor/client/ui/Settings/SystemManagement.tsx b/packages/webui/src/client/ui/Settings/SystemManagement.tsx
similarity index 97%
rename from meteor/client/ui/Settings/SystemManagement.tsx
rename to packages/webui/src/client/ui/Settings/SystemManagement.tsx
index cdcb2e610b..742e04e5b2 100644
--- a/meteor/client/ui/Settings/SystemManagement.tsx
+++ b/packages/webui/src/client/ui/Settings/SystemManagement.tsx
@@ -1,17 +1,17 @@
 import React, { useCallback, useMemo } from 'react'
 import { useTracker, useSubscription } from '../../lib/ReactMeteorData/ReactMeteorData'
-import { ICoreSystem, SofieLogo } from '../../../lib/collections/CoreSystem'
-import { MeteorPubSub } from '../../../lib/api/pubsub'
+import { ICoreSystem, SofieLogo } from '@sofie-automation/meteor-lib/dist/collections/CoreSystem'
+import { MeteorPubSub } from '@sofie-automation/meteor-lib/dist/api/pubsub'
 import { EditAttribute } from '../../lib/EditAttribute'
 import { doModalDialog } from '../../lib/ModalDialog'
-import { MeteorCall } from '../../../lib/api/methods'
+import { MeteorCall } from '../../lib/meteorApi'
 import { languageAnd } from '../../lib/language'
 import { TriggeredActionsEditor } from './components/triggeredActions/TriggeredActionsEditor'
 import { TFunction, useTranslation } from 'react-i18next'
 import { Meteor } from 'meteor/meteor'
-import { LogLevel } from '../../../lib/lib'
+import { LogLevel } from '../../lib/tempLib'
 import { CoreSystem } from '../../collections'
-import { CollectionCleanupResult } from '../../../lib/api/system'
+import { CollectionCleanupResult } from '@sofie-automation/meteor-lib/dist/api/system'
 import { LabelActual } from '../../lib/Components/LabelAndOverrides'
 import { catchError } from '../../lib/lib'
 
diff --git a/meteor/client/ui/Settings/Upgrades/Components.tsx b/packages/webui/src/client/ui/Settings/Upgrades/Components.tsx
similarity index 97%
rename from meteor/client/ui/Settings/Upgrades/Components.tsx
rename to packages/webui/src/client/ui/Settings/Upgrades/Components.tsx
index 2a19966d05..19e7fc1778 100644
--- a/meteor/client/ui/Settings/Upgrades/Components.tsx
+++ b/packages/webui/src/client/ui/Settings/Upgrades/Components.tsx
@@ -1,18 +1,18 @@
-import React, { useCallback } from 'react'
+import { useCallback } from 'react'
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
 import { faDatabase, faEye, faWarning } from '@fortawesome/free-solid-svg-icons'
-import { MeteorCall } from '../../../../lib/api/methods'
+import { MeteorCall } from '../../../lib/meteorApi'
 import { TFunction, useTranslation } from 'react-i18next'
 import { i18nTranslator } from '../../i18n'
 import { translateMessage } from '@sofie-automation/corelib/dist/TranslatableMessage'
 import { doModalDialog } from '../../../lib/ModalDialog'
 import { NoteSeverity } from '@sofie-automation/blueprints-integration'
-import { NotificationCenter, NoticeLevel, Notification } from '../../../../lib/notifications/notifications'
+import { NotificationCenter, NoticeLevel, Notification } from '../../../lib/notifications/notifications'
 import {
 	UIBlueprintUpgradeStatusBase,
 	UIBlueprintUpgradeStatusShowStyle,
 	UIBlueprintUpgradeStatusStudio,
-} from '../../../../lib/api/upgradeStatus'
+} from '@sofie-automation/meteor-lib/dist/api/upgradeStatus'
 import { assertNever } from '@sofie-automation/corelib/dist/lib'
 import { catchError } from '../../../lib/lib'
 
diff --git a/meteor/client/ui/Settings/Upgrades/View.tsx b/packages/webui/src/client/ui/Settings/Upgrades/View.tsx
similarity index 91%
rename from meteor/client/ui/Settings/Upgrades/View.tsx
rename to packages/webui/src/client/ui/Settings/Upgrades/View.tsx
index e32ed40712..2e6f2bbfd7 100644
--- a/meteor/client/ui/Settings/Upgrades/View.tsx
+++ b/packages/webui/src/client/ui/Settings/Upgrades/View.tsx
@@ -1,11 +1,13 @@
-import React from 'react'
 import { useTranslation } from 'react-i18next'
 import { Spinner } from '../../../lib/Spinner'
 import { unprotectString } from '@sofie-automation/corelib/dist/protectedString'
 import { useSubscription, useTracker } from '../../../lib/ReactMeteorData/ReactMeteorData'
-import { MeteorPubSub } from '../../../../lib/api/pubsub'
+import { MeteorPubSub } from '@sofie-automation/meteor-lib/dist/api/pubsub'
 import { UIBlueprintUpgradeStatuses } from '../../Collections'
-import { UIBlueprintUpgradeStatusShowStyle, UIBlueprintUpgradeStatusStudio } from '../../../../lib/api/upgradeStatus'
+import {
+	UIBlueprintUpgradeStatusShowStyle,
+	UIBlueprintUpgradeStatusStudio,
+} from '@sofie-automation/meteor-lib/dist/api/upgradeStatus'
 import { getUpgradeStatusMessage, UpgradeStatusButtons } from './Components'
 
 export function UpgradesView(): JSX.Element {
diff --git a/meteor/client/ui/Settings/components/ConfigManifestOAuthFlow.tsx b/packages/webui/src/client/ui/Settings/components/ConfigManifestOAuthFlow.tsx
similarity index 99%
rename from meteor/client/ui/Settings/components/ConfigManifestOAuthFlow.tsx
rename to packages/webui/src/client/ui/Settings/components/ConfigManifestOAuthFlow.tsx
index 1be81e9a38..d1b286f1ce 100644
--- a/meteor/client/ui/Settings/components/ConfigManifestOAuthFlow.tsx
+++ b/packages/webui/src/client/ui/Settings/components/ConfigManifestOAuthFlow.tsx
@@ -3,7 +3,7 @@ import { withTranslation } from 'react-i18next'
 import { PeripheralDevice } from '@sofie-automation/corelib/dist/dataModel/PeripheralDevice'
 import { Translated } from '../../../lib/ReactMeteorData/react-meteor-data'
 import { IngestDeviceSettings } from '@sofie-automation/corelib/dist/dataModel/PeripheralDeviceSettings/ingestDevice'
-import { NotificationCenter, Notification, NoticeLevel } from '../../../../lib/notifications/notifications'
+import { NotificationCenter, Notification, NoticeLevel } from '../../../lib/notifications/notifications'
 import { fetchFrom } from '../../../lib/lib'
 
 interface IConfigManifestOAuthFlowComponentState {}
diff --git a/meteor/client/ui/Settings/components/FilterEditor.tsx b/packages/webui/src/client/ui/Settings/components/FilterEditor.tsx
similarity index 99%
rename from meteor/client/ui/Settings/components/FilterEditor.tsx
rename to packages/webui/src/client/ui/Settings/components/FilterEditor.tsx
index fad16479b0..1165e14383 100644
--- a/meteor/client/ui/Settings/components/FilterEditor.tsx
+++ b/packages/webui/src/client/ui/Settings/components/FilterEditor.tsx
@@ -3,7 +3,7 @@ import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
 import React from 'react'
 import ClassNames from 'classnames'
 import _ from 'underscore'
-import { RundownLayoutsAPI } from '../../../../lib/api/rundownLayouts'
+import { RundownLayoutsAPI } from '../../../lib/rundownLayouts'
 import {
 	DashboardPanelBase,
 	DashboardPanelUnit,
@@ -14,7 +14,7 @@ import {
 	RundownLayoutElementBase,
 	RundownLayoutElementType,
 	RundownLayoutFilterBase,
-} from '../../../../lib/collections/RundownLayouts'
+} from '@sofie-automation/meteor-lib/dist/collections/RundownLayouts'
 import { EditAttribute } from '../../../lib/EditAttribute'
 import { Translated } from '../../../lib/ReactMeteorData/react-meteor-data'
 import { IOutputLayer, ISourceLayer, SourceLayerType } from '@sofie-automation/blueprints-integration'
diff --git a/meteor/client/ui/Settings/components/GenericDeviceSettingsComponent.tsx b/packages/webui/src/client/ui/Settings/components/GenericDeviceSettingsComponent.tsx
similarity index 89%
rename from meteor/client/ui/Settings/components/GenericDeviceSettingsComponent.tsx
rename to packages/webui/src/client/ui/Settings/components/GenericDeviceSettingsComponent.tsx
index a8e7ec78fd..0d7c55fbd9 100644
--- a/meteor/client/ui/Settings/components/GenericDeviceSettingsComponent.tsx
+++ b/packages/webui/src/client/ui/Settings/components/GenericDeviceSettingsComponent.tsx
@@ -1,14 +1,15 @@
-import React, { useEffect, useMemo, useState } from 'react'
+import { useEffect, useMemo, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import { PeripheralDevice, PeripheralDeviceType } from '@sofie-automation/corelib/dist/dataModel/PeripheralDevice'
-import { DeviceItem } from '../../Status/SystemStatus'
+import { DeviceItem } from '../../Status/SystemStatus/DeviceItem'
 import { ConfigManifestOAuthFlowComponent } from './ConfigManifestOAuthFlow'
-import { protectString, unprotectString } from '../../../../lib/lib'
+import { protectString, unprotectString } from '../../../lib/tempLib'
 import { SchemaFormForCollection } from '../../../lib/forms/SchemaFormForCollection'
 import { JSONBlobParse } from '@sofie-automation/shared-lib/dist/lib/JSONBlob'
 import { PeripheralDevices } from '../../../collections'
-import { MeteorCall } from '../../../../lib/api/methods'
+import { MeteorCall } from '../../../lib/meteorApi'
 import { PeripheralDeviceId } from '@sofie-automation/corelib/dist/dataModel/Ids'
+import { stringifyError } from '@sofie-automation/shared-lib/dist/lib/stringifyError'
 
 interface IGenericDeviceSettingsComponentProps {
 	device: PeripheralDevice
@@ -39,7 +40,7 @@ export function GenericDeviceSettingsComponent({
 						}
 						setDebugStates(states)
 					})
-					.catch((err) => console.log(`Error fetching device states: ${err}`))
+					.catch((err) => console.log(`Error fetching device states: ${stringifyError(err)}`))
 			}, 1000)
 
 			return () => {
diff --git a/meteor/client/ui/Settings/components/rundownLayouts/RundownHeaderLayoutSettings.tsx b/packages/webui/src/client/ui/Settings/components/rundownLayouts/RundownHeaderLayoutSettings.tsx
similarity index 95%
rename from meteor/client/ui/Settings/components/rundownLayouts/RundownHeaderLayoutSettings.tsx
rename to packages/webui/src/client/ui/Settings/components/rundownLayouts/RundownHeaderLayoutSettings.tsx
index 1a3be5809d..5f7997750b 100644
--- a/meteor/client/ui/Settings/components/rundownLayouts/RundownHeaderLayoutSettings.tsx
+++ b/packages/webui/src/client/ui/Settings/components/rundownLayouts/RundownHeaderLayoutSettings.tsx
@@ -1,7 +1,7 @@
 import React from 'react'
 import { useTranslation } from 'react-i18next'
 import { RundownLayouts } from '../../../../collections'
-import { RundownLayoutBase, RundownLayoutType } from '../../../../../lib/collections/RundownLayouts'
+import { RundownLayoutBase, RundownLayoutType } from '@sofie-automation/meteor-lib/dist/collections/RundownLayouts'
 import { EditAttribute } from '../../../../lib/EditAttribute'
 import { LabelActual } from '../../../../lib/Components/LabelAndOverrides'
 
diff --git a/meteor/client/ui/Settings/components/rundownLayouts/RundownViewLayoutSettings.tsx b/packages/webui/src/client/ui/Settings/components/rundownLayouts/RundownViewLayoutSettings.tsx
similarity index 97%
rename from meteor/client/ui/Settings/components/rundownLayouts/RundownViewLayoutSettings.tsx
rename to packages/webui/src/client/ui/Settings/components/rundownLayouts/RundownViewLayoutSettings.tsx
index 071f8ca5f7..f8c2b14976 100644
--- a/meteor/client/ui/Settings/components/rundownLayouts/RundownViewLayoutSettings.tsx
+++ b/packages/webui/src/client/ui/Settings/components/rundownLayouts/RundownViewLayoutSettings.tsx
@@ -1,11 +1,11 @@
 import { ISourceLayer } from '@sofie-automation/blueprints-integration'
 import { SourceLayers } from '@sofie-automation/corelib/dist/dataModel/ShowStyleBase'
-import React, { useMemo } from 'react'
+import { useMemo } from 'react'
 import { useTranslation } from 'react-i18next'
-import { RundownLayoutsAPI } from '../../../../../lib/api/rundownLayouts'
+import { RundownLayoutsAPI } from '../../../../lib/rundownLayouts'
 import { RundownLayouts } from '../../../../collections'
-import { RundownLayoutBase } from '../../../../../lib/collections/RundownLayouts'
-import { unprotectString } from '../../../../../lib/lib'
+import { RundownLayoutBase } from '@sofie-automation/meteor-lib/dist/collections/RundownLayouts'
+import { unprotectString } from '../../../../lib/tempLib'
 import { EditAttribute } from '../../../../lib/EditAttribute'
 import { LabelActual } from '../../../../lib/Components/LabelAndOverrides'
 
diff --git a/meteor/client/ui/Settings/components/rundownLayouts/ShelfLayoutSettings.tsx b/packages/webui/src/client/ui/Settings/components/rundownLayouts/ShelfLayoutSettings.tsx
similarity index 95%
rename from meteor/client/ui/Settings/components/rundownLayouts/ShelfLayoutSettings.tsx
rename to packages/webui/src/client/ui/Settings/components/rundownLayouts/ShelfLayoutSettings.tsx
index 8c4b520c44..9dc2e31afd 100644
--- a/meteor/client/ui/Settings/components/rundownLayouts/ShelfLayoutSettings.tsx
+++ b/packages/webui/src/client/ui/Settings/components/rundownLayouts/ShelfLayoutSettings.tsx
@@ -1,7 +1,7 @@
 import React from 'react'
 import { useTranslation } from 'react-i18next'
 import { RundownLayouts } from '../../../../collections'
-import { RundownLayoutBase, RundownLayoutType } from '../../../../../lib/collections/RundownLayouts'
+import { RundownLayoutBase, RundownLayoutType } from '@sofie-automation/meteor-lib/dist/collections/RundownLayouts'
 import { EditAttribute } from '../../../../lib/EditAttribute'
 import { LabelActual } from '../../../../lib/Components/LabelAndOverrides'
 
diff --git a/meteor/client/ui/Settings/components/triggeredActions/TriggeredActionEntry.tsx b/packages/webui/src/client/ui/Settings/components/triggeredActions/TriggeredActionEntry.tsx
similarity index 95%
rename from meteor/client/ui/Settings/components/triggeredActions/TriggeredActionEntry.tsx
rename to packages/webui/src/client/ui/Settings/components/triggeredActions/TriggeredActionEntry.tsx
index 09ab381cf8..a9db70ce75 100644
--- a/meteor/client/ui/Settings/components/triggeredActions/TriggeredActionEntry.tsx
+++ b/packages/webui/src/client/ui/Settings/components/triggeredActions/TriggeredActionEntry.tsx
@@ -9,14 +9,14 @@ import {
 	TriggerType,
 } from '@sofie-automation/blueprints-integration'
 import classNames from 'classnames'
-import { DBBlueprintTrigger } from '../../../../../lib/collections/TriggeredActions'
+import { DBBlueprintTrigger } from '@sofie-automation/meteor-lib/dist/collections/TriggeredActions'
 import { useTracker } from '../../../../lib/ReactMeteorData/ReactMeteorData'
 import { ActionEditor } from './actionEditors/ActionEditor'
 import { OutputLayers, SourceLayers } from '@sofie-automation/corelib/dist/dataModel/ShowStyleBase'
-import { flatten, getRandomString, last, literal } from '../../../../../lib/lib'
-import { createAction, isPreviewableAction } from '../../../../../lib/api/triggers/actionFactory'
+import { flatten, getRandomString } from '../../../../lib/tempLib'
+import { createAction, isPreviewableAction } from '@sofie-automation/meteor-lib/dist/triggers/actionFactory'
 import { PreviewContext } from './TriggeredActionsEditor'
-import { IWrappedAdLib } from '../../../../../lib/api/triggers/actionFilterChainCompilers'
+import { IWrappedAdLib } from '@sofie-automation/meteor-lib/dist/triggers/actionFilterChainCompilers'
 import { RundownUtils } from '../../../../lib/rundown'
 import { useTranslation } from 'react-i18next'
 import { TriggerEditor } from './triggerEditors/TriggerEditor'
@@ -31,10 +31,12 @@ import {
 	wrapDefaultObject,
 } from '@sofie-automation/corelib/dist/settings/objectWithOverrides'
 import { ShowStyleBaseId, TriggeredActionId } from '@sofie-automation/corelib/dist/dataModel/Ids'
-import { isHotkeyTrigger } from '../../../../../lib/api/triggers/triggerTypeSelectors'
+import { isHotkeyTrigger } from '@sofie-automation/meteor-lib/dist/triggers/triggerTypeSelectors'
 import { getAllCurrentAndDeletedItemsFromOverrides, useOverrideOpHelper } from '../../util/OverrideOpHelper'
 import { TriggeredActions } from '../../../../collections'
 import { catchError } from '../../../../lib/lib'
+import { UiTriggersContext } from '../../../../lib/triggers/triggersContext'
+import { last, literal } from '@sofie-automation/shared-lib/dist/lib/lib'
 
 interface IProps {
 	sourceLayers: SourceLayers | undefined
@@ -182,7 +184,7 @@ export const TriggeredActionEntry: React.FC<IProps> = React.memo(function Trigge
 			try {
 				if (resolvedActions && selected && sourceLayers) {
 					const executableActions = Object.values<SomeAction>(resolvedActions).map((value) =>
-						createAction(value, sourceLayers)
+						createAction(UiTriggersContext, value, sourceLayers)
 					)
 					const ctx = previewContext
 					if (ctx && ctx.rundownPlaylist) {
diff --git a/meteor/client/ui/Settings/components/triggeredActions/TriggeredActionsEditor.scss b/packages/webui/src/client/ui/Settings/components/triggeredActions/TriggeredActionsEditor.scss
similarity index 100%
rename from meteor/client/ui/Settings/components/triggeredActions/TriggeredActionsEditor.scss
rename to packages/webui/src/client/ui/Settings/components/triggeredActions/TriggeredActionsEditor.scss
diff --git a/meteor/client/ui/Settings/components/triggeredActions/TriggeredActionsEditor.tsx b/packages/webui/src/client/ui/Settings/components/triggeredActions/TriggeredActionsEditor.tsx
similarity index 93%
rename from meteor/client/ui/Settings/components/triggeredActions/TriggeredActionsEditor.tsx
rename to packages/webui/src/client/ui/Settings/components/triggeredActions/TriggeredActionsEditor.tsx
index 61dfbf692f..1ff832302c 100644
--- a/meteor/client/ui/Settings/components/triggeredActions/TriggeredActionsEditor.tsx
+++ b/packages/webui/src/client/ui/Settings/components/triggeredActions/TriggeredActionsEditor.tsx
@@ -1,16 +1,16 @@
 import React, { useState, useEffect, useContext, useCallback } from 'react'
 import { useTranslation } from 'react-i18next'
 import { useSubscription, useTracker } from '../../../../lib/ReactMeteorData/ReactMeteorData'
-import { MeteorPubSub } from '../../../../../lib/api/pubsub'
+import { MeteorPubSub } from '@sofie-automation/meteor-lib/dist/api/pubsub'
 import { faCaretDown, faCaretRight, faDownload, faPlus, faUpload } from '@fortawesome/free-solid-svg-icons'
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
 import { TriggeredActionEntry, TRIGGERED_ACTION_ENTRY_DRAG_TYPE } from './TriggeredActionEntry'
-import { literal, unprotectString } from '../../../../../lib/lib'
+import { literal, unprotectString } from '../../../../lib/tempLib'
 import { TriggersHandler } from '../../../../lib/triggers/TriggersHandler'
 import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
 import { Rundown } from '@sofie-automation/corelib/dist/dataModel/Rundown'
 import { DBPart } from '@sofie-automation/corelib/dist/dataModel/Part'
-import { MeteorCall } from '../../../../../lib/api/methods'
+import { MeteorCall } from '../../../../lib/meteorApi'
 import { UploadButton } from '../../../../lib/uploadButton'
 import { ErrorBoundary } from '../../../../lib/ErrorBoundary'
 import { SorensenContext } from '../../../../lib/SorensenContext'
@@ -20,15 +20,15 @@ import { TriggerType } from '@sofie-automation/blueprints-integration'
 import { keyLabelsToCodes } from '../../../../lib/triggers/codesToKeyLabels'
 import classNames from 'classnames'
 import { catchError, fetchFrom } from '../../../../lib/lib'
-import { NotificationCenter, Notification, NoticeLevel } from '../../../../../lib/notifications/notifications'
-import { Meteor } from 'meteor/meteor'
+import { NotificationCenter, Notification, NoticeLevel } from '../../../../lib/notifications/notifications'
 import { doModalDialog } from '../../../../lib/ModalDialog'
 import { PartId, RundownId, ShowStyleBaseId, TriggeredActionId } from '@sofie-automation/corelib/dist/dataModel/Ids'
-import { PartInstances, Parts, RundownPlaylists, Rundowns, TriggeredActions } from '../../../../collections'
+import { RundownPlaylists, Rundowns, TriggeredActions } from '../../../../collections'
 import { applyAndValidateOverrides } from '@sofie-automation/corelib/dist/settings/objectWithOverrides'
 import { SourceLayers, OutputLayers } from '@sofie-automation/corelib/dist/dataModel/ShowStyleBase'
-import { RundownPlaylistCollectionUtil } from '../../../../../lib/collections/rundownPlaylistUtil'
+import { RundownPlaylistCollectionUtil } from '../../../../collections/rundownPlaylistUtil'
 import { CorelibPubSub } from '@sofie-automation/corelib/dist/pubsub'
+import { UIPartInstances, UIParts } from '../../../Collections'
 
 export interface PreviewContext {
 	rundownPlaylist: DBRundownPlaylist | null
@@ -191,7 +191,7 @@ export const TriggeredActionsEditor: React.FC<IProps> = function TriggeredAction
 		null
 	)
 
-	useSubscription(CorelibPubSub.partInstances, rundown ? [rundown._id] : [], rundownPlaylist?.activationId ?? null)
+	useSubscription(MeteorPubSub.uiPartInstances, rundown ? [rundown._id] : [], rundownPlaylist?.activationId ?? null)
 	useSubscription(CorelibPubSub.parts, rundown ? [rundown._id] : [], null)
 
 	const previewContext = useTracker(
@@ -202,19 +202,19 @@ export const TriggeredActionsEditor: React.FC<IProps> = function TriggeredAction
 			let thisNextSegmentPartIds: PartId[] = []
 			if (rundownPlaylist) {
 				if (rundownPlaylist.currentPartInfo) {
-					const currentPartInstance = PartInstances.findOne(rundownPlaylist.currentPartInfo.partInstanceId)
+					const currentPartInstance = UIPartInstances.findOne(rundownPlaylist.currentPartInfo.partInstanceId)
 					if (currentPartInstance) {
 						thisCurrentPart = currentPartInstance.part
-						thisCurrentSegmentPartIds = Parts.find({
+						thisCurrentSegmentPartIds = UIParts.find({
 							segmentId: currentPartInstance.segmentId,
 						}).map((part) => part._id)
 					}
 				}
 				if (rundownPlaylist.nextPartInfo) {
-					const nextPartInstance = PartInstances.findOne(rundownPlaylist.nextPartInfo.partInstanceId)
+					const nextPartInstance = UIPartInstances.findOne(rundownPlaylist.nextPartInfo.partInstanceId)
 					if (nextPartInstance) {
 						thisNextPart = nextPartInstance.part
-						thisNextSegmentPartIds = Parts.find({
+						thisNextSegmentPartIds = UIParts.find({
 							segmentId: nextPartInstance.segmentId,
 						}).map((part) => part._id)
 					}
@@ -340,7 +340,7 @@ export const TriggeredActionsEditor: React.FC<IProps> = function TriggeredAction
 						body: uploadFileContents,
 						headers: {
 							'content-type': 'application/json',
-							authorization: 'id ' + Meteor.userId(),
+							// authorization: 'id ' + Meteor.userId(),
 						},
 					})
 						.then(() => {
@@ -390,6 +390,7 @@ export const TriggeredActionsEditor: React.FC<IProps> = function TriggeredAction
 					<TriggersHandler
 						sorensen={sorensen}
 						simulateTriggerBinding={true}
+						studioId={previewContext.rundownPlaylist.studioId}
 						showStyleBaseId={showStyleBaseId}
 						currentRundownId={previewContext.currentRundownId}
 						rundownPlaylistId={previewContext.rundownPlaylist._id}
diff --git a/meteor/client/ui/Settings/components/triggeredActions/actionEditors/ActionEditor.tsx b/packages/webui/src/client/ui/Settings/components/triggeredActions/actionEditors/ActionEditor.tsx
similarity index 99%
rename from meteor/client/ui/Settings/components/triggeredActions/actionEditors/ActionEditor.tsx
rename to packages/webui/src/client/ui/Settings/components/triggeredActions/actionEditors/ActionEditor.tsx
index df1d2426c9..feccbd605c 100644
--- a/meteor/client/ui/Settings/components/triggeredActions/actionEditors/ActionEditor.tsx
+++ b/packages/webui/src/client/ui/Settings/components/triggeredActions/actionEditors/ActionEditor.tsx
@@ -8,7 +8,7 @@ import {
 	SomeAction,
 } from '@sofie-automation/blueprints-integration'
 import { AdLibFilter } from './filterPreviews/AdLibFilter'
-import { literal } from '../../../../../../lib/lib'
+import { literal } from '../../../../../lib/tempLib'
 import { ViewFilter } from './filterPreviews/ViewFilter'
 import { RundownPlaylistFilter } from './filterPreviews/RundownPlaylistFilter'
 import { OutputLayers, SourceLayers } from '@sofie-automation/corelib/dist/dataModel/ShowStyleBase'
diff --git a/meteor/client/ui/Settings/components/triggeredActions/actionEditors/actionSelector/ActionSelector.tsx b/packages/webui/src/client/ui/Settings/components/triggeredActions/actionEditors/actionSelector/ActionSelector.tsx
similarity index 75%
rename from meteor/client/ui/Settings/components/triggeredActions/actionEditors/actionSelector/ActionSelector.tsx
rename to packages/webui/src/client/ui/Settings/components/triggeredActions/actionEditors/actionSelector/ActionSelector.tsx
index 3a45be4756..d9f150dcf3 100644
--- a/meteor/client/ui/Settings/components/triggeredActions/actionEditors/actionSelector/ActionSelector.tsx
+++ b/packages/webui/src/client/ui/Settings/components/triggeredActions/actionEditors/actionSelector/ActionSelector.tsx
@@ -2,17 +2,20 @@ import React, { useEffect, useLayoutEffect, useState } from 'react'
 import { ClientActions, PlayoutActions, SomeAction } from '@sofie-automation/blueprints-integration'
 import { useTranslation } from 'react-i18next'
 import { TFunction } from 'react-i18next'
-import { assertNever } from '../../../../../../../lib/lib'
+import { assertNever } from '../../../../../../lib/tempLib'
 import { sameWidth } from '../../../../../../lib/popperUtils'
 import { usePopper } from 'react-popper'
 import classNames from 'classnames'
-import { EditAttribute } from '../../../../../../lib/EditAttribute'
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
 import { faAngleRight, faTrash } from '@fortawesome/free-solid-svg-icons'
 import { AdLibActionEditor } from './actionEditors/AdLibActionEditor'
 import { DeviceActions } from '@sofie-automation/shared-lib/dist/core/model/ShowStyle'
 import { catchError } from '../../../../../../lib/lib'
 import { preventOverflow } from '@popperjs/core'
+import { ToggleSwitchControl } from '../../../../../../lib/Components/ToggleSwitch'
+import { DropdownInputControl, DropdownInputOption } from '../../../../../../lib/Components/DropdownInput'
+import { IntInputControl } from '../../../../../../lib/Components/IntInput'
+import { SwitchRouteSetEditor } from './actionEditors/SwitchRouteSetEditor'
 
 interface IProps {
 	action: SomeAction
@@ -72,6 +75,9 @@ function getArguments(t: TFunction, action: SomeAction): string[] {
 			break
 		case PlayoutActions.resyncRundownPlaylist:
 			break
+		case PlayoutActions.switchRouteSet:
+			result.push(t('State "{{state}}"', { state: action.state }))
+			break
 		case ClientActions.shelf:
 			if (action.state === true) {
 				result.push(t('Open'))
@@ -125,6 +131,8 @@ function hasArguments(action: SomeAction): boolean {
 			return !!action.undo
 		case PlayoutActions.moveNext:
 			return !!(action.parts || action.segments)
+		case PlayoutActions.switchRouteSet:
+			return !!action.routeSetId
 		case PlayoutActions.reloadRundownPlaylistData:
 			return false
 		case PlayoutActions.resetRundownPlaylist:
@@ -177,6 +185,8 @@ function actionToLabel(t: TFunction, action: SomeAction['action']): string {
 			return t('Take')
 		case PlayoutActions.resyncRundownPlaylist:
 			return t('Resync with NRCS')
+		case PlayoutActions.switchRouteSet:
+			return t('Switch Route Set')
 		case ClientActions.shelf:
 			return t('Shelf')
 		case ClientActions.rewindSegments:
@@ -195,18 +205,12 @@ function actionToLabel(t: TFunction, action: SomeAction['action']): string {
 	}
 }
 
-function getAvailableActions(t: TFunction): Record<string, string> {
+function getAvailableActions(t: TFunction): DropdownInputOption<string>[] {
 	const actionEnums = [PlayoutActions, ClientActions, DeviceActions]
 
-	const result: Record<string, string> = {}
-
-	actionEnums.forEach((enumList) => {
-		Object.values<any>(enumList).forEach((key) => {
-			result[actionToLabel(t, key)] = key
-		})
-	})
+	const allOptions = actionEnums.flatMap((enumList) => Object.values<any>(enumList))
 
-	return result
+	return allOptions.map((key, i) => ({ value: key, name: actionToLabel(t, key), i }))
 }
 
 function getActionParametersEditor(
@@ -218,28 +222,23 @@ function getActionParametersEditor(
 		case PlayoutActions.activateRundownPlaylist:
 			return (
 				<div className="mts">
-					<EditAttribute
-						className="form-control"
-						modifiedClassName="bghl"
-						type={'toggle'}
+					<ToggleSwitchControl
+						classNames={'form-control'}
+						value={action.rehearsal}
 						label={t('Rehearsal')}
-						overrideDisplayValue={action.rehearsal}
-						attribute={''}
-						updateFunction={(_e, newVal) => {
+						handleUpdate={(newVal) => {
 							onChange({
 								...action,
 								rehearsal: newVal,
 							})
 						}}
 					/>
-					<EditAttribute
-						className="form-control"
-						modifiedClassName="bghl"
-						type={'toggle'}
+
+					<ToggleSwitchControl
+						classNames={'form-control'}
+						value={!!action.force}
 						label={t('Force (deactivate others)')}
-						overrideDisplayValue={action.force}
-						attribute={''}
-						updateFunction={(_e, newVal) => {
+						handleUpdate={(newVal) => {
 							onChange({
 								...action,
 								force: newVal,
@@ -256,17 +255,16 @@ function getActionParametersEditor(
 			return null
 		case PlayoutActions.activateAdlibTestingMode:
 			return null
+		case PlayoutActions.switchRouteSet:
+			return <SwitchRouteSetEditor action={action} onChange={onChange} />
 		case PlayoutActions.disableNextPiece:
 			return (
 				<div className="mts">
-					<EditAttribute
-						className="form-control"
-						modifiedClassName="bghl"
-						type={'toggle'}
+					<ToggleSwitchControl
+						classNames={'form-control'}
+						value={!!action.undo}
 						label={t('Undo')}
-						overrideDisplayValue={action.undo}
-						attribute={''}
-						updateFunction={(_e, newVal) => {
+						handleUpdate={(newVal) => {
 							onChange({
 								...action,
 								undo: newVal,
@@ -278,14 +276,11 @@ function getActionParametersEditor(
 		case PlayoutActions.hold:
 			return (
 				<div className="mts">
-					<EditAttribute
-						className="form-control"
-						modifiedClassName="bghl"
-						type={'toggle'}
+					<ToggleSwitchControl
+						classNames={'form-control'}
+						value={!!action.undo}
 						label={t('Undo')}
-						overrideDisplayValue={action.undo}
-						attribute={''}
-						updateFunction={(_e, newVal) => {
+						handleUpdate={(newVal) => {
 							onChange({
 								...action,
 								undo: newVal,
@@ -298,34 +293,30 @@ function getActionParametersEditor(
 			return (
 				<div className="mts">
 					<label className="block">{t('Move Segments')}</label>
-					<EditAttribute
-						className="form-control input text-input input-m"
+					<IntInputControl
+						classNames="input text-input input-m"
 						modifiedClassName="bghl"
-						type={'int'}
-						label={t('By Segments')}
-						overrideDisplayValue={action.segments}
-						attribute={''}
-						updateFunction={(_e, newVal) => {
+						value={action.segments}
+						placeholder={t('By Segments')}
+						handleUpdate={(newVal) =>
 							onChange({
 								...action,
 								segments: newVal,
 							})
-						}}
+						}
 					/>
 					<label className="block">{t('Move Parts')}</label>
-					<EditAttribute
-						className="form-control input text-input input-m"
+					<IntInputControl
+						classNames="input text-input input-m"
 						modifiedClassName="bghl"
-						type={'int'}
-						label={t('By Parts')}
-						overrideDisplayValue={action.parts}
-						attribute={''}
-						updateFunction={(_e, newVal) => {
+						value={action.parts}
+						placeholder={t('By Parts')}
+						handleUpdate={(newVal) =>
 							onChange({
 								...action,
 								parts: newVal,
 							})
-						}}
+						}
 					/>
 				</div>
 			)
@@ -341,19 +332,28 @@ function getActionParametersEditor(
 			return (
 				<div className="mts">
 					<label className="block">{t('State')}</label>
-					<EditAttribute
-						className="form-control input text-input input-m"
-						modifiedClassName="bghl"
-						type={'dropdown'}
-						label={t('State')}
-						options={{
-							[t('Open')]: true,
-							[t('Close')]: false,
-							[t('Toggle')]: 'toggle',
-						}}
-						overrideDisplayValue={action.state}
-						attribute={''}
-						updateFunction={(_e, newVal) => {
+					<DropdownInputControl<typeof action.state>
+						classNames="input text-input input-m"
+						value={action.state}
+						// placholder={t('State')}
+						options={[
+							{
+								name: t('Open'),
+								value: true,
+								i: 0,
+							},
+							{
+								name: t('Close'),
+								value: false,
+								i: 1,
+							},
+							{
+								name: t('Toggle'),
+								value: 'toggle',
+								i: 2,
+							},
+						]}
+						handleUpdate={(newVal) => {
 							onChange({
 								...action,
 								state: newVal,
@@ -369,14 +369,11 @@ function getActionParametersEditor(
 		case ClientActions.showEntireCurrentSegment:
 			return (
 				<div className="mts">
-					<EditAttribute
-						className="form-control"
-						modifiedClassName="bghl"
-						type={'toggle'}
+					<ToggleSwitchControl
+						classNames={'form-control'}
+						value={!!action.on}
 						label={t('On')}
-						overrideDisplayValue={action.on}
-						attribute={''}
-						updateFunction={(_e, newVal) => {
+						handleUpdate={(newVal) => {
 							onChange({
 								...action,
 								on: newVal,
@@ -388,14 +385,11 @@ function getActionParametersEditor(
 		case ClientActions.miniShelfQueueAdLib:
 			return (
 				<div className="mts">
-					<EditAttribute
-						className="form-control"
-						modifiedClassName="bghl"
-						type={'toggle'}
+					<ToggleSwitchControl
+						classNames={'form-control'}
+						value={!!action.forward}
 						label={t('Forward')}
-						overrideDisplayValue={action.forward}
-						attribute={''}
-						updateFunction={(_e, newVal) => {
+						handleUpdate={(newVal) => {
 							onChange({
 								...action,
 								forward: newVal,
@@ -408,78 +402,82 @@ function getActionParametersEditor(
 			return (
 				<div className="mts">
 					<label className="block">{t('Register ID')}</label>
-					<EditAttribute
-						className="form-control input text-input input-m"
+					<IntInputControl
+						classNames="input text-input input-m"
 						modifiedClassName="bghl"
-						type="int"
-						overrideDisplayValue={action.register}
-						updateFunction={(_e, newVal) => {
+						value={action.register}
+						handleUpdate={(newVal) =>
 							onChange({
 								...action,
 								register: Math.max(0, Number(newVal)),
 							})
-						}}
+						}
 					/>
+
 					<label className="block">{t('Operation')}</label>
-					<EditAttribute
-						className="form-control input text-input input-m"
-						modifiedClassName="bghl"
-						type="dropdown"
-						overrideDisplayValue={action.operation}
-						attribute={''}
-						options={{
-							[t('Set')]: '=',
-							[t('Add')]: '+',
-							[t('Subtract')]: '-',
-						}}
-						updateFunction={(_e, newVal) => {
+					<DropdownInputControl<typeof action.operation>
+						classNames="input text-input input-m"
+						value={action.operation}
+						options={[
+							{
+								name: t('Set'),
+								value: '=',
+								i: 0,
+							},
+							{
+								name: t('Add'),
+								value: '+',
+								i: 1,
+							},
+							{
+								name: t('Subtract'),
+								value: '-',
+								i: 2,
+							},
+						]}
+						handleUpdate={(newVal) => {
 							onChange({
 								...action,
 								operation: newVal,
 							})
 						}}
 					/>
+
 					<label className="block">{t('Value')}</label>
-					<EditAttribute
-						className="form-control input text-input input-m"
+					<IntInputControl
+						classNames="input text-input input-m"
 						modifiedClassName="bghl"
-						type="int"
-						overrideDisplayValue={action.value}
-						attribute={''}
-						updateFunction={(_e, newVal) => {
+						value={action.value}
+						handleUpdate={(newVal) =>
 							onChange({
 								...action,
 								value: newVal,
 							})
-						}}
+						}
 					/>
 					<label className="block">{t('Minimum register limit')}</label>
-					<EditAttribute
-						className="form-control input text-input input-m"
+					<IntInputControl
+						classNames="input text-input input-m"
 						modifiedClassName="bghl"
-						type="int"
-						overrideDisplayValue={action.limitMin}
-						attribute={''}
-						updateFunction={(_e, newVal) => {
+						value={action.limitMin}
+						handleUpdate={(newVal) =>
 							onChange({
 								...action,
 								limitMin: newVal,
 							})
-						}}
+						}
 					/>
 					<label className="block">{t('Maximum register limit')}</label>
-					<EditAttribute
-						className="form-control input text-input input-m"
+					<IntInputControl
+						classNames="input text-input input-m"
 						modifiedClassName="bghl"
-						type="int"
-						overrideDisplayValue={action.limitMax}
-						attribute={''}
-						updateFunction={(_e, newVal) => {
+						value={action.limitMax}
+						handleUpdate={(newVal) =>
 							onChange({
 								...action,
 								limitMax: newVal,
 							})
-						}}
+						}
 					/>
 				</div>
 			)
@@ -567,20 +565,17 @@ export const ActionSelector = function ActionSelector({
 					{...attributes.popper}
 				>
 					<div>
-						<EditAttribute
-							className="form-control input text-input input-m"
-							modifiedClassName="bghl"
-							type={'dropdown'}
-							label={t('Action')}
+						<DropdownInputControl
+							classNames="input text-input input-m"
+							value={action.action}
 							options={getAvailableActions(t)}
-							overrideDisplayValue={action.action}
-							attribute={''}
-							updateFunction={(_e, newVal) => {
+							// placeholder={t('Action')}
+							handleUpdate={(newVal) =>
 								onChange({
 									...action,
-									action: newVal,
+									action: newVal as any,
 								})
-							}}
+							}
 						/>
 					</div>
 					{getActionParametersEditor(t, action, (newVal: Partial<typeof action>) => {
diff --git a/meteor/client/ui/Settings/components/triggeredActions/actionEditors/actionSelector/actionEditors/AdLibActionEditor.tsx b/packages/webui/src/client/ui/Settings/components/triggeredActions/actionEditors/actionSelector/actionEditors/AdLibActionEditor.tsx
similarity index 65%
rename from meteor/client/ui/Settings/components/triggeredActions/actionEditors/actionSelector/actionEditors/AdLibActionEditor.tsx
rename to packages/webui/src/client/ui/Settings/components/triggeredActions/actionEditors/actionSelector/actionEditors/AdLibActionEditor.tsx
index d1f81d4c28..1c8cfc44c0 100644
--- a/meteor/client/ui/Settings/components/triggeredActions/actionEditors/actionSelector/actionEditors/AdLibActionEditor.tsx
+++ b/packages/webui/src/client/ui/Settings/components/triggeredActions/actionEditors/actionSelector/actionEditors/AdLibActionEditor.tsx
@@ -1,10 +1,10 @@
-import * as React from 'react'
 import _ from 'underscore'
 import { useTranslation } from 'react-i18next'
 import { PlayoutActions, SomeAction } from '@sofie-automation/blueprints-integration'
-import { EditAttribute } from '../../../../../../../lib/EditAttribute'
 import { useTracker } from '../../../../../../../lib/ReactMeteorData/ReactMeteorData'
 import { AdLibActions, RundownBaselineAdLibActions } from '../../../../../../../collections'
+import { ToggleSwitchControl } from '../../../../../../../lib/Components/ToggleSwitch'
+import { TextInputControl, TextInputSuggestion } from '../../../../../../../lib/Components/TextInput'
 
 export function AdLibActionEditor({
 	action,
@@ -14,9 +14,9 @@ export function AdLibActionEditor({
 	onChange: (newVal: Partial<typeof action>) => void
 }>): JSX.Element | null {
 	const { t } = useTranslation()
-	const allTriggerModes = useTracker<string[]>(
+	const allTriggerModes = useTracker<TextInputSuggestion[]>(
 		() => {
-			return _.chain([
+			const triggerModes = _.chain([
 				...RundownBaselineAdLibActions.find().map((action) =>
 					action.triggerModes?.map((triggerMode) => triggerMode.data)
 				),
@@ -25,7 +25,10 @@ export function AdLibActionEditor({
 				.flatten()
 				.compact()
 				.uniq()
+				.sort()
 				.value()
+
+			return triggerModes.map((triggerMode, i): TextInputSuggestion => ({ name: triggerMode, value: triggerMode, i }))
 		},
 		[],
 		[]
@@ -37,14 +40,11 @@ export function AdLibActionEditor({
 	return (
 		<>
 			<div className="mts">
-				<EditAttribute
-					className="form-control"
-					modifiedClassName="bghl"
-					type={'toggle'}
+				<ToggleSwitchControl
+					classNames={'form-control'}
+					value={!!action.arguments}
 					label={t('Use Trigger Mode')}
-					overrideDisplayValue={!!action.arguments}
-					attribute={''}
-					updateFunction={(_e, newVal) => {
+					handleUpdate={(newVal) => {
 						onChange({
 							...action,
 							arguments: newVal ? { triggerMode: '' } : null,
@@ -55,13 +55,11 @@ export function AdLibActionEditor({
 			{action.arguments && (
 				<div className="mts">
 					<label className="block">{t('Trigger Mode')}</label>
-					<EditAttribute
-						className="form-control input text-input input-m"
-						type="dropdowntext"
-						options={allTriggerModes}
-						overrideDisplayValue={action.arguments.triggerMode}
-						attribute={''}
-						updateFunction={(_e, newVal) => {
+					<TextInputControl
+						classNames={`input text-input input-m`}
+						updateOnKey={true}
+						value={action.arguments.triggerMode ?? ''}
+						handleUpdate={(newVal) =>
 							onChange({
 								...action,
 								arguments: {
@@ -69,7 +67,9 @@ export function AdLibActionEditor({
 									triggerMode: newVal,
 								},
 							})
-						}}
+						}
+						spellCheck={false}
+						suggestions={allTriggerModes}
 					/>
 				</div>
 			)}
diff --git a/packages/webui/src/client/ui/Settings/components/triggeredActions/actionEditors/actionSelector/actionEditors/SwitchRouteSetEditor.tsx b/packages/webui/src/client/ui/Settings/components/triggeredActions/actionEditors/actionSelector/actionEditors/SwitchRouteSetEditor.tsx
new file mode 100644
index 0000000000..2f7750e18e
--- /dev/null
+++ b/packages/webui/src/client/ui/Settings/components/triggeredActions/actionEditors/actionSelector/actionEditors/SwitchRouteSetEditor.tsx
@@ -0,0 +1,85 @@
+import { useTranslation } from 'react-i18next'
+import { useTracker } from '../../../../../../../lib/ReactMeteorData/ReactMeteorData'
+import { Studios } from '../../../../../../../collections'
+import { DropdownInputControl, DropdownInputOption } from '../../../../../../../lib/Components/DropdownInput'
+import { SwitchRouteSetProps } from '@sofie-automation/corelib/dist/worker/studio'
+import { applyAndValidateOverrides } from '@sofie-automation/corelib/dist/settings/objectWithOverrides'
+import { StudioRouteSet } from '@sofie-automation/blueprints-integration'
+
+export function SwitchRouteSetEditor({
+	action,
+	onChange,
+}: Readonly<{
+	action: SwitchRouteSetProps
+	onChange: (newVal: Partial<typeof action>) => void
+}>): JSX.Element | null {
+	const { t } = useTranslation()
+	const allRouteSetOptions = useTracker<DropdownInputOption<string>[]>(
+		() => {
+			const studios = Studios.find({}, { sort: { name: 1 } }).fetch()
+			const routeSetOptions = studios.flatMap((studio) => {
+				const routeSets = applyAndValidateOverrides(studio.routeSetsWithOverrides).obj
+				return Object.entries<StudioRouteSet>(routeSets).map(
+					([id, routeSet]): Omit<DropdownInputOption<string>, 'i'> => ({
+						value: id,
+						name: studios.length > 1 ? `${studio.name} - ${routeSet.name}` : routeSet.name,
+					})
+				)
+			})
+
+			return routeSetOptions.map((option, i): DropdownInputOption<string> => ({ ...option, i }))
+		},
+		[],
+		[]
+	)
+
+	return (
+		<>
+			<div className="mts">
+				<label className="block">{t('Route Set')}</label>
+				<DropdownInputControl<typeof action.routeSetId>
+					classNames="input text-input input-m"
+					value={action.routeSetId}
+					options={allRouteSetOptions}
+					handleUpdate={(newVal) => {
+						onChange({
+							...action,
+							routeSetId: newVal,
+						})
+					}}
+				/>
+			</div>
+
+			<div className="mts">
+				<label className="block">{t('State')}</label>
+				<DropdownInputControl<typeof action.state>
+					classNames="input text-input input-m"
+					value={action.state}
+					options={[
+						{
+							name: t('Enabled'),
+							value: true,
+							i: 0,
+						},
+						{
+							name: t('Disabled'),
+							value: false,
+							i: 1,
+						},
+						{
+							name: t('Toggle'),
+							value: 'toggle',
+							i: 2,
+						},
+					]}
+					handleUpdate={(newVal) => {
+						onChange({
+							...action,
+							state: newVal,
+						})
+					}}
+				/>
+			</div>
+		</>
+	)
+}
diff --git a/meteor/client/ui/Settings/components/triggeredActions/actionEditors/filterPreviews/AdLibFilter.tsx b/packages/webui/src/client/ui/Settings/components/triggeredActions/actionEditors/filterPreviews/AdLibFilter.tsx
similarity index 99%
rename from meteor/client/ui/Settings/components/triggeredActions/actionEditors/filterPreviews/AdLibFilter.tsx
rename to packages/webui/src/client/ui/Settings/components/triggeredActions/actionEditors/filterPreviews/AdLibFilter.tsx
index 8523ba9c72..53eadc09fa 100644
--- a/meteor/client/ui/Settings/components/triggeredActions/actionEditors/filterPreviews/AdLibFilter.tsx
+++ b/packages/webui/src/client/ui/Settings/components/triggeredActions/actionEditors/filterPreviews/AdLibFilter.tsx
@@ -3,7 +3,7 @@ import _ from 'underscore'
 import { IAdLibFilterLink, IOutputLayer, ISourceLayer, SourceLayerType } from '@sofie-automation/blueprints-integration'
 import { useTranslation } from 'react-i18next'
 import { TFunction } from 'i18next'
-import { assertNever } from '../../../../../../../lib/lib'
+import { assertNever } from '../../../../../../lib/tempLib'
 import { FilterEditor } from './FilterEditor'
 import { OutputLayers, SourceLayers } from '@sofie-automation/corelib/dist/dataModel/ShowStyleBase'
 import { EditAttributeType } from '../../../../../../lib/EditAttribute'
diff --git a/meteor/client/ui/Settings/components/triggeredActions/actionEditors/filterPreviews/FilterEditor.tsx b/packages/webui/src/client/ui/Settings/components/triggeredActions/actionEditors/filterPreviews/FilterEditor.tsx
similarity index 91%
rename from meteor/client/ui/Settings/components/triggeredActions/actionEditors/filterPreviews/FilterEditor.tsx
rename to packages/webui/src/client/ui/Settings/components/triggeredActions/actionEditors/filterPreviews/FilterEditor.tsx
index da80f6a954..535be62257 100644
--- a/meteor/client/ui/Settings/components/triggeredActions/actionEditors/filterPreviews/FilterEditor.tsx
+++ b/packages/webui/src/client/ui/Settings/components/triggeredActions/actionEditors/filterPreviews/FilterEditor.tsx
@@ -7,6 +7,7 @@ import { faAngleRight, faCheck, faTrash } from '@fortawesome/free-solid-svg-icon
 import { sameWidth } from '../../../../../../lib/popperUtils'
 import { catchError } from '../../../../../../lib/lib'
 import { preventOverflow } from '@popperjs/core'
+import { DropdownInputControl, getDropdownInputOptions } from '../../../../../../lib/Components/DropdownInput'
 
 interface IProps {
 	fieldLabel: string
@@ -98,15 +99,12 @@ export const FilterEditor: React.FC<IProps> = function FilterEditor(props: IProp
 				>
 					{props.description && <p className="man">{props.description}</p>}
 					<div>
-						<EditAttribute
-							className="form-control input text-input input-m"
-							modifiedClassName="bghl"
-							type={'dropdown'}
-							label={props.fieldLabel}
-							options={props.fields}
-							overrideDisplayValue={props.field}
-							attribute={''}
-							updateFunction={(_e, newVal) => props.onChangeField(newVal)}
+						<DropdownInputControl
+							classNames="input text-input input-m"
+							value={props.field}
+							options={getDropdownInputOptions(props.fields)}
+							// placeholder={props.fieldLabel}
+							handleUpdate={(newVal) => props.onChangeField(newVal)}
 						/>
 					</div>
 					<div>
diff --git a/meteor/client/ui/Settings/components/triggeredActions/actionEditors/filterPreviews/RundownPlaylistFilter.tsx b/packages/webui/src/client/ui/Settings/components/triggeredActions/actionEditors/filterPreviews/RundownPlaylistFilter.tsx
similarity index 94%
rename from meteor/client/ui/Settings/components/triggeredActions/actionEditors/filterPreviews/RundownPlaylistFilter.tsx
rename to packages/webui/src/client/ui/Settings/components/triggeredActions/actionEditors/filterPreviews/RundownPlaylistFilter.tsx
index f83ff10563..ba801e5066 100644
--- a/meteor/client/ui/Settings/components/triggeredActions/actionEditors/filterPreviews/RundownPlaylistFilter.tsx
+++ b/packages/webui/src/client/ui/Settings/components/triggeredActions/actionEditors/filterPreviews/RundownPlaylistFilter.tsx
@@ -2,7 +2,7 @@ import * as React from 'react'
 import { useTranslation } from 'react-i18next'
 import { TFunction } from 'i18next'
 import { IRundownPlaylistFilterLink } from '@sofie-automation/blueprints-integration'
-import { assertNever } from '../../../../../../../lib/lib'
+import { assertNever } from '../../../../../../lib/tempLib'
 import classNames from 'classnames'
 
 interface IProps {
diff --git a/meteor/client/ui/Settings/components/triggeredActions/actionEditors/filterPreviews/ViewFilter.tsx b/packages/webui/src/client/ui/Settings/components/triggeredActions/actionEditors/filterPreviews/ViewFilter.tsx
similarity index 100%
rename from meteor/client/ui/Settings/components/triggeredActions/actionEditors/filterPreviews/ViewFilter.tsx
rename to packages/webui/src/client/ui/Settings/components/triggeredActions/actionEditors/filterPreviews/ViewFilter.tsx
diff --git a/meteor/client/ui/Settings/components/triggeredActions/triggerEditors/DeviceEditor.tsx b/packages/webui/src/client/ui/Settings/components/triggeredActions/triggerEditors/DeviceEditor.tsx
similarity index 83%
rename from meteor/client/ui/Settings/components/triggeredActions/triggerEditors/DeviceEditor.tsx
rename to packages/webui/src/client/ui/Settings/components/triggeredActions/triggerEditors/DeviceEditor.tsx
index 755c582518..69557a76be 100644
--- a/meteor/client/ui/Settings/components/triggeredActions/triggerEditors/DeviceEditor.tsx
+++ b/packages/webui/src/client/ui/Settings/components/triggeredActions/triggerEditors/DeviceEditor.tsx
@@ -1,11 +1,11 @@
 import { IBlueprintDeviceTrigger } from '@sofie-automation/blueprints-integration'
 import { protectString, unprotectString } from '@sofie-automation/corelib/dist/protectedString'
 import classNames from 'classnames'
-import React, { useMemo } from 'react'
-import { MeteorPubSub } from '../../../../../../lib/api/pubsub'
+import { useMemo } from 'react'
+import { MeteorPubSub } from '@sofie-automation/meteor-lib/dist/api/pubsub'
 import { Studios } from '../../../../../collections'
-import { getCurrentTime } from '../../../../../../lib/lib'
-import { UIDeviceTriggerPreview } from '../../../../../../server/publications/deviceTriggersPreview'
+import { getCurrentTime } from '../../../../../lib/systemTime'
+import { UIDeviceTriggerPreview } from '@sofie-automation/meteor-lib/dist/api/MountedTriggers'
 import { useSubscription, useTracker } from '../../../../../lib/ReactMeteorData/ReactMeteorData'
 import { DeviceTriggersPreviews } from '../../../../Collections'
 import { DeviceTrigger } from './DeviceTrigger'
@@ -94,18 +94,6 @@ export const DeviceEditor = function DeviceEditor({ trigger, modified, readonly,
 					</li>
 				))}
 			</ul>
-			{/* <EditAttribute
-				type={'toggle'}
-				className="sb-nocolor"
-				overrideDisplayValue={trigger.up}
-				updateFunction={(_e, newValue) =>
-					onChange({
-						...trigger,
-						up: newValue,
-					})
-				}
-				label={t('On release')}
-			/> */}
 		</>
 	)
 }
diff --git a/meteor/client/ui/Settings/components/triggeredActions/triggerEditors/DeviceTrigger.tsx b/packages/webui/src/client/ui/Settings/components/triggeredActions/triggerEditors/DeviceTrigger.tsx
similarity index 100%
rename from meteor/client/ui/Settings/components/triggeredActions/triggerEditors/DeviceTrigger.tsx
rename to packages/webui/src/client/ui/Settings/components/triggeredActions/triggerEditors/DeviceTrigger.tsx
diff --git a/meteor/client/ui/Settings/components/triggeredActions/triggerEditors/HotkeyEditor.tsx b/packages/webui/src/client/ui/Settings/components/triggeredActions/triggerEditors/HotkeyEditor.tsx
similarity index 91%
rename from meteor/client/ui/Settings/components/triggeredActions/triggerEditors/HotkeyEditor.tsx
rename to packages/webui/src/client/ui/Settings/components/triggeredActions/triggerEditors/HotkeyEditor.tsx
index 3a66d5369a..4648eceefc 100644
--- a/meteor/client/ui/Settings/components/triggeredActions/triggerEditors/HotkeyEditor.tsx
+++ b/packages/webui/src/client/ui/Settings/components/triggeredActions/triggerEditors/HotkeyEditor.tsx
@@ -4,9 +4,9 @@ import React, { useContext, useState } from 'react'
 import { useLayoutEffect } from 'react'
 import { useEffect } from 'react'
 import { useTranslation } from 'react-i18next'
-import { EditAttribute } from '../../../../../lib/EditAttribute'
 import { SorensenContext } from '../../../../../lib/SorensenContext'
 import { codesToKeyLabels } from '../../../../../lib/triggers/codesToKeyLabels'
+import { ToggleSwitchControl } from '../../../../../lib/Components/ToggleSwitch'
 
 interface IProps {
 	trigger: IBlueprintHotkeyTrigger
@@ -98,18 +98,17 @@ export const HotkeyEditor = function HotkeyEditor({ trigger, modified, readonly,
 				}}
 				disabled={readonly}
 			/>
-			<EditAttribute
-				type={'toggle'}
-				className="sb-nocolor"
-				overrideDisplayValue={trigger.up}
-				updateFunction={(_e, newValue) =>
+			<ToggleSwitchControl
+				classNames={'sb-nocolor'}
+				value={!!trigger.up}
+				label={t('On release')}
+				disabled={readonly}
+				handleUpdate={(newVal) => {
 					onChange({
 						...trigger,
-						up: newValue,
+						up: newVal,
 					})
-				}
-				label={t('On release')}
-				disabled={readonly}
+				}}
 			/>
 		</>
 	)
diff --git a/meteor/client/ui/Settings/components/triggeredActions/triggerEditors/HotkeyTrigger.tsx b/packages/webui/src/client/ui/Settings/components/triggeredActions/triggerEditors/HotkeyTrigger.tsx
similarity index 100%
rename from meteor/client/ui/Settings/components/triggeredActions/triggerEditors/HotkeyTrigger.tsx
rename to packages/webui/src/client/ui/Settings/components/triggeredActions/triggerEditors/HotkeyTrigger.tsx
diff --git a/meteor/client/ui/Settings/components/triggeredActions/triggerEditors/TriggerEditor.tsx b/packages/webui/src/client/ui/Settings/components/triggeredActions/triggerEditors/TriggerEditor.tsx
similarity index 95%
rename from meteor/client/ui/Settings/components/triggeredActions/triggerEditors/TriggerEditor.tsx
rename to packages/webui/src/client/ui/Settings/components/triggeredActions/triggerEditors/TriggerEditor.tsx
index 934c418456..600c98aa50 100644
--- a/meteor/client/ui/Settings/components/triggeredActions/triggerEditors/TriggerEditor.tsx
+++ b/packages/webui/src/client/ui/Settings/components/triggeredActions/triggerEditors/TriggerEditor.tsx
@@ -1,14 +1,14 @@
-import React, { useCallback, useEffect, useLayoutEffect, useState } from 'react'
+import { useCallback, useEffect, useLayoutEffect, useState } from 'react'
 import { TFunction } from 'i18next'
 import { SomeBlueprintTrigger, TriggerType } from '@sofie-automation/blueprints-integration'
-import { DBBlueprintTrigger } from '../../../../../../lib/collections/TriggeredActions'
+import { DBBlueprintTrigger } from '@sofie-automation/meteor-lib/dist/collections/TriggeredActions'
 import { HotkeyTrigger } from './HotkeyTrigger'
 import { usePopper } from 'react-popper'
 import { sameWidth } from '../../../../../lib/popperUtils'
 import { useTranslation } from 'react-i18next'
 import { HotkeyEditor } from './HotkeyEditor'
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
-import { isDeviceTrigger, isHotkeyTrigger } from '../../../../../../lib/api/triggers/triggerTypeSelectors'
+import { isDeviceTrigger, isHotkeyTrigger } from '@sofie-automation/meteor-lib/dist/triggers/triggerTypeSelectors'
 import { DeviceTrigger } from './DeviceTrigger'
 import { DeviceEditor } from './DeviceEditor'
 import { faCheck, faSync, faTrash } from '@fortawesome/free-solid-svg-icons'
diff --git a/packages/webui/src/client/ui/Settings/util/OverrideOpHelper.tsx b/packages/webui/src/client/ui/Settings/util/OverrideOpHelper.tsx
new file mode 100644
index 0000000000..23b002232b
--- /dev/null
+++ b/packages/webui/src/client/ui/Settings/util/OverrideOpHelper.tsx
@@ -0,0 +1,29 @@
+import { SomeObjectOverrideOp, ObjectWithOverrides } from '@sofie-automation/corelib/dist/settings/objectWithOverrides'
+import { useRef, useEffect, useCallback } from 'react'
+import { OverrideOpHelper, OverrideOpHelperImpl } from '@sofie-automation/corelib/dist/overrideOpHelper'
+
+export type * from '@sofie-automation/corelib/dist/overrideOpHelper'
+export {
+	getAllCurrentAndDeletedItemsFromOverrides,
+	getAllCurrentItemsFromOverrides,
+} from '@sofie-automation/corelib/dist/overrideOpHelper'
+
+/**
+ * A helper to work with modifying an ObjectWithOverrides<T>
+ */
+export function useOverrideOpHelper<T extends object>(
+	saveOverrides: (newOps: SomeObjectOverrideOp[]) => void,
+	objectWithOverrides: ObjectWithOverrides<T>
+): OverrideOpHelper {
+	const objectWithOverridesRef = useRef(objectWithOverrides)
+
+	// Use a ref to minimise reactivity when it changes
+	useEffect(() => {
+		objectWithOverridesRef.current = objectWithOverrides
+	}, [objectWithOverrides])
+
+	return useCallback(() => {
+		if (!objectWithOverridesRef.current) throw new Error('No current object!')
+		return new OverrideOpHelperImpl(saveOverrides, objectWithOverridesRef.current)
+	}, [saveOverrides, objectWithOverridesRef])
+}
diff --git a/packages/webui/src/client/ui/Shelf/AdLibListItem.tsx b/packages/webui/src/client/ui/Shelf/AdLibListItem.tsx
new file mode 100644
index 0000000000..5ef502a019
--- /dev/null
+++ b/packages/webui/src/client/ui/Shelf/AdLibListItem.tsx
@@ -0,0 +1,77 @@
+import ClassNames from 'classnames'
+import { ISourceLayer, IBlueprintActionTriggerMode } from '@sofie-automation/blueprints-integration'
+import { unprotectString } from '../../lib/tempLib'
+import renderItem from './Renderers/ItemRendererFactory'
+import { useContentStatusForAdlibPiece } from '../SegmentTimeline/withMediaObjectStatus'
+import { ContextMenuTrigger } from '@jstarpl/react-contextmenu'
+import { contextMenuHoldToDisplayTime } from '../../lib/lib'
+import { setShelfContextMenuContext, ContextType as MenuContextType } from './ShelfContextMenu'
+import { UIStudio } from '@sofie-automation/meteor-lib/dist/api/studios'
+import { IAdLibListItem } from '@sofie-automation/meteor-lib/dist/uiTypes/Adlib'
+
+export type { IAdLibListItem } from '@sofie-automation/meteor-lib/dist/uiTypes/Adlib'
+
+interface IListViewItemProps {
+	piece: IAdLibListItem
+	studio: UIStudio
+	layer: ISourceLayer | undefined
+	selected: boolean
+	disabled?: boolean
+	onSelectAdLib?: (aSLine: IAdLibListItem) => void
+	onToggleAdLib?: (aSLine: IAdLibListItem, queue: boolean, context: any, mode?: IBlueprintActionTriggerMode) => void
+}
+
+export function AdLibListItem({
+	piece,
+	studio,
+	layer,
+	selected,
+	disabled,
+	onSelectAdLib,
+	onToggleAdLib,
+}: IListViewItemProps): JSX.Element {
+	const contentStatus = useContentStatusForAdlibPiece(piece)
+
+	return (
+		<ContextMenuTrigger
+			id="shelf-context-menu"
+			attributes={{
+				className: ClassNames('adlib-panel__list-view__list__segment__item', {
+					selected: selected,
+					invalid: piece.invalid,
+					floated: piece.floated,
+					disabled: disabled,
+				}),
+				//@ts-expect-error React.HTMLAttributes does not list data attributes, but that's fine
+				'data-obj-id': piece._id,
+				onClick: () => onSelectAdLib && onSelectAdLib(piece),
+				onContextMenu: () => onSelectAdLib && onSelectAdLib(piece),
+				onDoubleClick: (e) => !disabled && onToggleAdLib && onToggleAdLib(piece, e.shiftKey, e),
+			}}
+			collect={() =>
+				setShelfContextMenuContext({
+					type: MenuContextType.ADLIB,
+					details: {
+						adLib: piece,
+						onToggle: !disabled ? onToggleAdLib : undefined,
+						disabled: disabled,
+					},
+				})
+			}
+			holdToDisplay={contextMenuHoldToDisplayTime()}
+			renderTag="tr"
+			key={unprotectString(piece._id)}
+		>
+			{renderItem({
+				adLibListItem: piece,
+				contentStatus: contentStatus,
+				layer: layer,
+				outputLayer: piece.outputLayer,
+				selected: selected,
+				status: contentStatus?.status,
+				messages: contentStatus?.messages,
+				studio: studio,
+			})}
+		</ContextMenuTrigger>
+	)
+}
diff --git a/meteor/client/ui/Shelf/AdLibListView.tsx b/packages/webui/src/client/ui/Shelf/AdLibListView.tsx
similarity index 95%
rename from meteor/client/ui/Shelf/AdLibListView.tsx
rename to packages/webui/src/client/ui/Shelf/AdLibListView.tsx
index 78bc745899..176796bfdf 100644
--- a/meteor/client/ui/Shelf/AdLibListView.tsx
+++ b/packages/webui/src/client/ui/Shelf/AdLibListView.tsx
@@ -1,17 +1,19 @@
-import React, { useEffect, useMemo, useRef } from 'react'
+import { useEffect, useMemo, useRef } from 'react'
 import classNames from 'classnames'
 import { unprotectString } from '@sofie-automation/corelib/dist/protectedString'
 import { RundownUtils } from '../../lib/rundown'
 import { AdLibListItem, IAdLibListItem } from './AdLibListItem'
 import { AdLibPieceUi, AdlibSegmentUi } from '../../lib/shelf'
-import { RundownLayoutFilter, RundownLayoutFilterBase } from '../../../lib/collections/RundownLayouts'
-import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
+import {
+	RundownLayoutFilter,
+	RundownLayoutFilterBase,
+} from '@sofie-automation/meteor-lib/dist/collections/RundownLayouts'
 import { BucketAdLibActionUi, BucketAdLibUi } from './RundownViewBuckets'
 import { PieceUi } from '../SegmentContainer/withResolvedSegment'
 import { IBlueprintActionTriggerMode } from '@sofie-automation/blueprints-integration'
 import { getRandomString } from '@sofie-automation/corelib/dist/lib'
-import { UIShowStyleBase } from '../../../lib/api/showStyles'
-import { UIStudio } from '../../../lib/api/studios'
+import { UIShowStyleBase } from '@sofie-automation/meteor-lib/dist/api/showStyles'
+import { UIStudio } from '@sofie-automation/meteor-lib/dist/api/studios'
 
 interface IListViewPropsHeader {
 	uiSegments: Array<AdlibSegmentUi>
@@ -24,7 +26,6 @@ interface IListViewPropsHeader {
 	noSegments: boolean
 	filter: RundownLayoutFilter | undefined
 	rundownAdLibs?: Array<AdLibPieceUi>
-	playlist: DBRundownPlaylist
 	studio: UIStudio
 }
 
@@ -208,7 +209,6 @@ export function AdLibListView(props: Readonly<IListViewPropsHeader>): JSX.Elemen
 				disabled={adLibPiece.disabled ?? false}
 				onToggleAdLib={props.onToggleAdLib}
 				onSelectAdLib={props.onSelectAdLib}
-				playlist={props.playlist}
 			/>
 		)
 	}
diff --git a/meteor/client/ui/Shelf/AdLibPanel.tsx b/packages/webui/src/client/ui/Shelf/AdLibPanel.tsx
similarity index 93%
rename from meteor/client/ui/Shelf/AdLibPanel.tsx
rename to packages/webui/src/client/ui/Shelf/AdLibPanel.tsx
index 8e60f4408a..7cac019045 100644
--- a/meteor/client/ui/Shelf/AdLibPanel.tsx
+++ b/packages/webui/src/client/ui/Shelf/AdLibPanel.tsx
@@ -1,4 +1,4 @@
-import React, { useState, useCallback, useEffect } from 'react'
+import { useState, useCallback, useEffect } from 'react'
 import _ from 'underscore'
 import { Meteor } from 'meteor/meteor'
 import { useTracker } from '../../lib/ReactMeteorData/react-meteor-data'
@@ -18,18 +18,21 @@ import {
 	IBlueprintActionTriggerMode,
 	SomeContent,
 } from '@sofie-automation/blueprints-integration'
-import { doUserAction, UserAction } from '../../../lib/clientUserAction'
-import { NotificationCenter, Notification, NoticeLevel } from '../../../lib/notifications/notifications'
+import { doUserAction, UserAction } from '../../lib/clientUserAction'
+import { NotificationCenter, Notification, NoticeLevel } from '../../lib/notifications/notifications'
 import {
 	RundownLayoutFilter,
 	RundownLayoutFilterBase,
 	DashboardLayoutFilter,
-} from '../../../lib/collections/RundownLayouts'
+} from '@sofie-automation/meteor-lib/dist/collections/RundownLayouts'
 import { RundownBaselineAdLibItem } from '@sofie-automation/corelib/dist/dataModel/RundownBaselineAdLibPiece'
-import { literal, unprotectString, protectString } from '../../../lib/lib'
-import { memoizedIsolatedAutorun } from '../../../lib/memoizedIsolatedAutorun'
-import { findPartInstanceOrWrapToTemporary, PartInstance } from '../../../lib/collections/PartInstances'
-import { MeteorCall } from '../../../lib/api/methods'
+import { literal, unprotectString, protectString } from '../../lib/tempLib'
+import { memoizedIsolatedAutorun } from '../../lib/memoizedIsolatedAutorun'
+import {
+	findPartInstanceOrWrapToTemporary,
+	PartInstance,
+} from '@sofie-automation/meteor-lib/dist/collections/PartInstances'
+import { MeteorCall } from '../../lib/meteorApi'
 import { PieceUi } from '../SegmentTimeline/SegmentTimelineContainer'
 import { AdLibAction } from '@sofie-automation/corelib/dist/dataModel/AdlibAction'
 import { RundownUtils } from '../../lib/rundown'
@@ -39,26 +42,21 @@ import { BucketAdLibActionUi, BucketAdLibUi } from './RundownViewBuckets'
 import RundownViewEventBus, {
 	RundownViewEvents,
 	RevealInShelfEvent,
-} from '../../../lib/api/triggers/RundownViewEventBus'
+} from '@sofie-automation/meteor-lib/dist/triggers/RundownViewEventBus'
 import { translateMessage } from '@sofie-automation/corelib/dist/TranslatableMessage'
 import { i18nTranslator } from '../i18n'
 import { AdLibPieceUi, AdlibSegmentUi } from '../../lib/shelf'
 import { getShelfFollowsOnAir, getShowHiddenSourceLayers } from '../../lib/localStorage'
-import { sortAdlibs } from '../../../lib/Rundown'
+import { sortAdlibs } from '@sofie-automation/meteor-lib/dist/adlibs'
 import { AdLibPanelToolbar } from './AdLibPanelToolbar'
 import { AdLibListView } from './AdLibListView'
-import { UIShowStyleBase } from '../../../lib/api/showStyles'
-import { UIStudio } from '../../../lib/api/studios'
-import { UIStudios } from '../Collections'
+import { UIShowStyleBase } from '@sofie-automation/meteor-lib/dist/api/showStyles'
+import { UIStudio } from '@sofie-automation/meteor-lib/dist/api/studios'
+import { UIPartInstances, UIStudios } from '../Collections'
 import { PartId, PartInstanceId, RundownId, SegmentId } from '@sofie-automation/corelib/dist/dataModel/Ids'
-import {
-	AdLibActions,
-	AdLibPieces,
-	PartInstances,
-	RundownBaselineAdLibActions,
-	RundownBaselineAdLibPieces,
-} from '../../collections'
-import { RundownPlaylistCollectionUtil } from '../../../lib/collections/rundownPlaylistUtil'
+import { AdLibActions, AdLibPieces, RundownBaselineAdLibActions, RundownBaselineAdLibPieces } from '../../collections'
+import { RundownPlaylistCollectionUtil } from '../../collections/rundownPlaylistUtil'
+import { RundownPlaylistClientUtil } from '../../lib/rundownPlaylistUtil'
 
 export interface IAdLibPanelProps {
 	// liveSegment: Segment | undefined
@@ -193,7 +191,7 @@ export function fetchAndFilter(props: IFetchAndFilterProps): AdLibFetchAndFilter
 
 	const { segments, rundowns } = memoizedIsolatedAutorun(
 		(playlist) => {
-			const rundownsAndSegments = RundownPlaylistCollectionUtil.getRundownsAndSegments(playlist)
+			const rundownsAndSegments = RundownPlaylistClientUtil.getRundownsAndSegments(playlist)
 			const segments: DBSegment[] = []
 			const rundowns: Record<string, MinimalRundown> = {}
 			rundownsAndSegments.forEach((pair) => {
@@ -219,7 +217,7 @@ export function fetchAndFilter(props: IFetchAndFilterProps): AdLibFetchAndFilter
 		) => {
 			const currentPartInstance =
 				currentPartInstanceId &&
-				(PartInstances.findOne(currentPartInstanceId, {
+				(UIPartInstances.findOne(currentPartInstanceId, {
 					projection: {
 						_id: 1,
 						segmentId: 1,
@@ -228,7 +226,7 @@ export function fetchAndFilter(props: IFetchAndFilterProps): AdLibFetchAndFilter
 				}) as Pick<PartInstance, '_id' | 'segmentId' | 'rundownId'> | undefined)
 			const nextPartInstance =
 				nextPartInstanceId &&
-				(PartInstances.findOne(nextPartInstanceId, {
+				(UIPartInstances.findOne(nextPartInstanceId, {
 					projection: {
 						_id: 1,
 						segmentId: 1,
@@ -250,7 +248,7 @@ export function fetchAndFilter(props: IFetchAndFilterProps): AdLibFetchAndFilter
 				}
 			}
 
-			const partInstances = RundownPlaylistCollectionUtil.getActivePartInstancesMap(props.playlist)
+			const partInstances = RundownPlaylistClientUtil.getActivePartInstancesMap(props.playlist)
 
 			let liveSegment: AdlibSegmentUi | undefined
 			const uiSegmentMap = new Map<SegmentId, AdlibSegmentUi>()
@@ -272,7 +270,7 @@ export function fetchAndFilter(props: IFetchAndFilterProps): AdLibFetchAndFilter
 				return segmentUi
 			})
 
-			RundownPlaylistCollectionUtil.getUnorderedParts(props.playlist, {
+			RundownPlaylistClientUtil.getUnorderedParts(props.playlist, {
 				segmentId: {
 					$in: Array.from(uiSegmentMap.keys()),
 				},
@@ -428,7 +426,7 @@ export function fetchAndFilter(props: IFetchAndFilterProps): AdLibFetchAndFilter
 		currentRundown = rundowns[0]
 		const partInstanceId = props.playlist.currentPartInfo?.partInstanceId || props.playlist.nextPartInfo?.partInstanceId
 		if (partInstanceId) {
-			const partInstance = PartInstances.findOne(partInstanceId)
+			const partInstance = UIPartInstances.findOne(partInstanceId)
 			if (partInstance) {
 				currentRundown = rundowns.find((rd) => rd._id === partInstance.rundownId)
 			}
@@ -760,7 +758,6 @@ export function AdLibPanel({
 				showStyleBase={showStyleBase}
 				searchFilter={searchFilter}
 				filter={filter as RundownLayoutFilter}
-				playlist={playlist}
 				studio={studio}
 				noSegments={!withSegments}
 			/>
diff --git a/meteor/client/ui/Shelf/AdLibPanelToolbar.tsx b/packages/webui/src/client/ui/Shelf/AdLibPanelToolbar.tsx
similarity index 100%
rename from meteor/client/ui/Shelf/AdLibPanelToolbar.tsx
rename to packages/webui/src/client/ui/Shelf/AdLibPanelToolbar.tsx
diff --git a/meteor/client/ui/Shelf/AdLibRegionPanel.tsx b/packages/webui/src/client/ui/Shelf/AdLibRegionPanel.tsx
similarity index 87%
rename from meteor/client/ui/Shelf/AdLibRegionPanel.tsx
rename to packages/webui/src/client/ui/Shelf/AdLibRegionPanel.tsx
index e4333f385d..2582eac191 100644
--- a/meteor/client/ui/Shelf/AdLibRegionPanel.tsx
+++ b/packages/webui/src/client/ui/Shelf/AdLibRegionPanel.tsx
@@ -5,16 +5,16 @@ import {
 	RundownLayoutAdLibRegion,
 	DashboardLayoutAdLibRegion,
 	RundownLayoutAdLibRegionRole,
-} from '../../../lib/collections/RundownLayouts'
-import { RundownLayoutsAPI } from '../../../lib/api/rundownLayouts'
+} from '@sofie-automation/meteor-lib/dist/collections/RundownLayouts'
+import { RundownLayoutsAPI } from '../../lib/rundownLayouts'
 import { dashboardElementStyle, IDashboardPanelTrackedProps } from './DashboardPanel'
 import ClassNames from 'classnames'
 import { IAdLibPanelProps, AdLibFetchAndFilterProps, fetchAndFilter } from './AdLibPanel'
 import { matchFilter } from './AdLibListView'
-import { doUserAction, UserAction } from '../../../lib/clientUserAction'
+import { doUserAction, UserAction } from '../../lib/clientUserAction'
 import { translateWithTracker, Translated } from '../../lib/ReactMeteorData/ReactMeteorData'
-import { NotificationCenter, Notification, NoticeLevel } from '../../../lib/notifications/notifications'
-import { MeteorCall } from '../../../lib/api/methods'
+import { NotificationCenter, Notification, NoticeLevel } from '../../lib/notifications/notifications'
+import { MeteorCall } from '../../lib/meteorApi'
 import {
 	AdLibPieceUi,
 	getNextPieceInstancesGrouped,
@@ -25,7 +25,7 @@ import {
 } from '../../lib/shelf'
 import { PieceInstance } from '@sofie-automation/corelib/dist/dataModel/PieceInstance'
 import { PieceUi } from '../SegmentTimeline/SegmentTimelineContainer'
-import { withMediaObjectStatus } from '../SegmentTimeline/withMediaObjectStatus'
+import { useContentStatusForPieceInstance, WithMediaObjectStatusProps } from '../SegmentTimeline/withMediaObjectStatus'
 import { ISourceLayer } from '@sofie-automation/blueprints-integration'
 import { UIStudios } from '../Collections'
 import { Meteor } from 'meteor/meteor'
@@ -49,12 +49,22 @@ interface IAdLibRegionPanelTrackedProps extends IDashboardPanelTrackedProps {
 }
 
 class AdLibRegionPanelBase extends React.Component<
-	Translated<IAdLibPanelProps & IAdLibRegionPanelProps & AdLibFetchAndFilterProps & IAdLibRegionPanelTrackedProps>,
+	Translated<
+		IAdLibPanelProps &
+			IAdLibRegionPanelProps &
+			AdLibFetchAndFilterProps &
+			IAdLibRegionPanelTrackedProps &
+			WithMediaObjectStatusProps
+	>,
 	IState
 > {
 	constructor(
 		props: Translated<
-			IAdLibPanelProps & IAdLibRegionPanelProps & AdLibFetchAndFilterProps & IAdLibRegionPanelTrackedProps
+			IAdLibPanelProps &
+				IAdLibRegionPanelProps &
+				AdLibFetchAndFilterProps &
+				IAdLibRegionPanelTrackedProps &
+				WithMediaObjectStatusProps
 		>
 	) {
 		super(props)
@@ -172,7 +182,7 @@ class AdLibRegionPanelBase extends React.Component<
 	}
 
 	private renderPreview() {
-		const thumbnailUrl = this.props.piece?.contentStatus?.thumbnailUrl
+		const thumbnailUrl = this.props.contentStatus?.thumbnailUrl
 		if (thumbnailUrl) {
 			return <img src={thumbnailUrl} className="adlib-region-panel__image" />
 		}
@@ -223,13 +233,18 @@ class AdLibRegionPanelBase extends React.Component<
 	}
 }
 
-export const AdLibRegionPanelWithStatus = withMediaObjectStatus<
-	Translated<IAdLibPanelProps & IAdLibRegionPanelProps & AdLibFetchAndFilterProps & IAdLibRegionPanelTrackedProps>,
-	{}
->()(AdLibRegionPanelBase)
+function AdLibRegionPanelWithStatus(
+	props: Translated<
+		IAdLibPanelProps & IAdLibRegionPanelProps & AdLibFetchAndFilterProps & IAdLibRegionPanelTrackedProps
+	>
+) {
+	const contentStatus = useContentStatusForPieceInstance(props.piece?.instance)
+
+	return <AdLibRegionPanelBase {...props} contentStatus={contentStatus} />
+}
 
 export const AdLibRegionPanel = translateWithTracker<
-	Translated<IAdLibPanelProps & IAdLibRegionPanelProps>,
+	IAdLibPanelProps & IAdLibRegionPanelProps,
 	IState,
 	AdLibFetchAndFilterProps & IAdLibRegionPanelTrackedProps
 >(
diff --git a/meteor/client/ui/Shelf/BucketPanel.tsx b/packages/webui/src/client/ui/Shelf/BucketPanel.tsx
similarity index 96%
rename from meteor/client/ui/Shelf/BucketPanel.tsx
rename to packages/webui/src/client/ui/Shelf/BucketPanel.tsx
index be75b575e9..f6246f9513 100644
--- a/meteor/client/ui/Shelf/BucketPanel.tsx
+++ b/packages/webui/src/client/ui/Shelf/BucketPanel.tsx
@@ -21,32 +21,32 @@ import {
 	IBlueprintActionTriggerMode,
 	SomeContent,
 } from '@sofie-automation/blueprints-integration'
-import { MeteorPubSub } from '../../../lib/api/pubsub'
-import { doUserAction, getEventTimestamp, UserAction } from '../../../lib/clientUserAction'
-import { NotificationCenter, Notification, NoticeLevel } from '../../../lib/notifications/notifications'
-import { literal, unprotectString, partial, protectString } from '../../../lib/lib'
+import { MeteorPubSub } from '@sofie-automation/meteor-lib/dist/api/pubsub'
+import { doUserAction, getEventTimestamp, UserAction } from '../../lib/clientUserAction'
+import { NotificationCenter, Notification, NoticeLevel } from '../../lib/notifications/notifications'
+import { literal, unprotectString, protectString } from '../../lib/tempLib'
 import { contextMenuHoldToDisplayTime, UserAgentPointer, USER_AGENT_POINTER_PROPERTY } from '../../lib/lib'
 import { IDashboardPanelTrackedProps } from './DashboardPanel'
 import { BucketAdLib } from '@sofie-automation/corelib/dist/dataModel/BucketAdLibPiece'
-import { Bucket } from '../../../lib/collections/Buckets'
+import { Bucket } from '@sofie-automation/meteor-lib/dist/collections/Buckets'
 import { Events as MOSEvents } from '../../lib/data/mos/plugin-support'
 import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
-import { MeteorCall } from '../../../lib/api/methods'
+import { MeteorCall } from '../../lib/meteorApi'
 import { DragDropItemTypes } from '../DragDropItemTypes'
 import { BucketPieceButton, IBucketPieceDropResult } from './BucketPieceButton'
 import { ContextMenuTrigger } from '@jstarpl/react-contextmenu'
 import update from 'immutability-helper'
-import { PartInstance } from '../../../lib/collections/PartInstances'
+import { PartInstance } from '@sofie-automation/meteor-lib/dist/collections/PartInstances'
 import { BucketAdLibAction } from '@sofie-automation/corelib/dist/dataModel/BucketAdLibAction'
 import { RundownUtils } from '../../lib/rundown'
 import { BucketAdLibItem, BucketAdLibActionUi, isAdLibAction, isAdLib, BucketAdLibUi } from './RundownViewBuckets'
 import { PieceUi } from '../SegmentTimeline/SegmentTimelineContainer'
-import { PieceDisplayStyle } from '../../../lib/collections/RundownLayouts'
+import { PieceDisplayStyle } from '@sofie-automation/meteor-lib/dist/collections/RundownLayouts'
 import RundownViewEventBus, {
 	RundownViewEvents,
 	RevealInShelfEvent,
 	ToggleShelfDropzoneEvent,
-} from '../../../lib/api/triggers/RundownViewEventBus'
+} from '@sofie-automation/meteor-lib/dist/triggers/RundownViewEventBus'
 import { setShelfContextMenuContext, ContextType } from './ShelfContextMenu'
 import { translateMessage } from '@sofie-automation/corelib/dist/TranslatableMessage'
 import { i18nTranslator } from '../i18n'
@@ -58,11 +58,11 @@ import {
 	isAdLibOnAir,
 } from '../../lib/shelf'
 import { MongoFieldSpecifierOnes } from '@sofie-automation/corelib/dist/mongo'
-import { BucketAdLibActions, BucketAdLibs, PartInstances, Rundowns } from '../../collections'
+import { BucketAdLibActions, BucketAdLibs, Rundowns } from '../../collections'
 import { Rundown } from '@sofie-automation/corelib/dist/dataModel/Rundown'
-import { UIShowStyleBase } from '../../../lib/api/showStyles'
-import { UIStudio } from '../../../lib/api/studios'
-import { UIStudios } from '../Collections'
+import { UIShowStyleBase } from '@sofie-automation/meteor-lib/dist/api/showStyles'
+import { UIStudio } from '@sofie-automation/meteor-lib/dist/api/studios'
+import { UIPartInstances, UIStudios } from '../Collections'
 import {
 	AdLibActionId,
 	BucketId,
@@ -70,7 +70,7 @@ import {
 	ShowStyleBaseId,
 	ShowStyleVariantId,
 } from '@sofie-automation/corelib/dist/dataModel/Ids'
-import { RundownPlaylistCollectionUtil } from '../../../lib/collections/rundownPlaylistUtil'
+import { RundownPlaylistCollectionUtil } from '../../collections/rundownPlaylistUtil'
 import { CorelibPubSub } from '@sofie-automation/corelib/dist/pubsub'
 import { withTranslation } from 'react-i18next'
 import { useRundownAndShowStyleIdsForPlaylist } from '../util/useRundownAndShowStyleIdsForPlaylist'
@@ -292,7 +292,7 @@ export const BucketPanel = React.memo(
 			() => {
 				const selectedPartInstanceId =
 					props.playlist.currentPartInfo?.partInstanceId ?? props.playlist.nextPartInfo?.partInstanceId
-				const partInstance = PartInstances.findOne(selectedPartInstanceId, {
+				const partInstance = UIPartInstances.findOne(selectedPartInstanceId, {
 					fields: literal<MongoFieldSpecifierOnes<PartInstance>>({
 						rundownId: 1,
 						//@ts-expect-error deep property
@@ -380,7 +380,7 @@ export const BucketPanel = React.memo(
 		)
 	},
 	(props: IBucketPanelProps, nextProps: IBucketPanelProps) => {
-		return !_.isEqual(props, nextProps)
+		return _.isEqual(props, nextProps)
 	}
 )
 
@@ -662,7 +662,7 @@ const BucketPanelContent = withTranslation()(
 									e,
 									getEventTimestamp(e),
 									piece._id,
-									partial<BucketAdLib>({
+									literal<Partial<BucketAdLib>>({
 										name: newName,
 									})
 								)
@@ -677,7 +677,7 @@ const BucketPanelContent = withTranslation()(
 									e,
 									getEventTimestamp(e),
 									piece.adlibAction._id,
-									partial<BucketAdLibAction>({
+									literal<Partial<BucketAdLibAction>>({
 										//@ts-expect-error deep property
 										'display.label': newName,
 									})
@@ -721,7 +721,7 @@ const BucketPanelContent = withTranslation()(
 										e,
 										getEventTimestamp(e),
 										draggedB._id,
-										partial<BucketAdLib>({
+										literal<Partial<BucketAdLib>>({
 											_rank: newRank,
 										})
 									)
@@ -732,7 +732,7 @@ const BucketPanelContent = withTranslation()(
 										e,
 										getEventTimestamp(e),
 										draggedB.adlibAction._id,
-										partial<BucketAdLibAction>({
+										literal<Partial<BucketAdLibAction>>({
 											//@ts-expect-error deep property
 											'display._rank': newRank,
 										})
@@ -754,7 +754,7 @@ const BucketPanelContent = withTranslation()(
 									e,
 									getEventTimestamp(e),
 									draggedB._id,
-									partial<BucketAdLib>({
+									literal<Partial<BucketAdLib>>({
 										bucketId,
 									})
 								)
@@ -765,7 +765,7 @@ const BucketPanelContent = withTranslation()(
 									e,
 									getEventTimestamp(e),
 									draggedB.adlibAction._id,
-									partial<BucketAdLibAction>({
+									literal<Partial<BucketAdLibAction>>({
 										bucketId,
 									})
 								)
diff --git a/packages/webui/src/client/ui/Shelf/BucketPieceButton.tsx b/packages/webui/src/client/ui/Shelf/BucketPieceButton.tsx
new file mode 100644
index 0000000000..80319dae20
--- /dev/null
+++ b/packages/webui/src/client/ui/Shelf/BucketPieceButton.tsx
@@ -0,0 +1,141 @@
+import React from 'react'
+import { IDashboardButtonProps, DashboardPieceButtonBase } from './DashboardPieceButton'
+
+import {
+	ConnectDragSource,
+	ConnectDropTarget,
+	DragSourceMonitor,
+	ConnectDragPreview,
+	ConnectableElement,
+	useDrop,
+	useDrag,
+} from 'react-dnd'
+import { DragDropItemTypes } from '../DragDropItemTypes'
+import { BucketAdLib } from '@sofie-automation/corelib/dist/dataModel/BucketAdLibPiece'
+import { useContentStatusForItem } from '../SegmentTimeline/withMediaObjectStatus'
+import { BucketAdLibActionUi, BucketAdLibItem } from './RundownViewBuckets'
+import { IBlueprintActionTriggerMode } from '@sofie-automation/blueprints-integration'
+import { BucketId, PieceId } from '@sofie-automation/corelib/dist/dataModel/Ids'
+
+interface IBucketPieceDragObject {
+	id: PieceId
+	bucketId: BucketId
+	originalIndex: number
+}
+
+export interface IBucketPieceDropResult {
+	index: number
+	bucketId: BucketId
+	action: 'reorder' | 'move' | undefined
+}
+
+export interface BucketPieceButtonBaseProps {
+	moveAdLib: (id: PieceId, atIndex: number) => void
+	findAdLib: (id: PieceId) => { piece: BucketAdLib | BucketAdLibActionUi | undefined; index: number }
+	onAdLibReorder: (draggedId: PieceId, newIndex: number, oldIndex: number) => void
+	onAdLibMove: (id: PieceId, newBucketId: BucketId) => void
+	bucketId: BucketId
+	onToggleAdLib: (piece: BucketAdLibItem, queue: boolean, e: any, mode?: IBlueprintActionTriggerMode) => void
+}
+
+interface ButtonSourceCollectedProps {
+	connectDragSource: ConnectDragSource
+	connectDragPreview: ConnectDragPreview
+	isDragging: boolean
+}
+
+interface ButtonTargetCollectedProps {
+	connectDropTarget: ConnectDropTarget
+}
+
+class BucketPieceButtonBase extends DashboardPieceButtonBase<ButtonSourceCollectedProps & ButtonTargetCollectedProps> {
+	inBucket = true
+	render(): JSX.Element {
+		const { connectDragSource, connectDropTarget } = this.props
+
+		return connectDropTarget(connectDragSource(super.render() as ConnectableElement)) as JSX.Element
+	}
+}
+
+export function BucketPieceButton(
+	props: React.PropsWithChildren<IDashboardButtonProps> & BucketPieceButtonBaseProps
+): JSX.Element {
+	const contentStatus = useContentStatusForItem(props.piece)
+
+	const [, connectDropTarget] = useDrop<IBucketPieceDragObject, {}, {}>({
+		accept: DragDropItemTypes.BUCKET_ADLIB_PIECE,
+		canDrop(_props, _monitor) {
+			return true
+		},
+
+		hover(item, _monitor) {
+			const { id: draggedId } = item
+			const overId = props.piece._id
+
+			if (draggedId !== overId) {
+				const { index: overIndex } = props.findAdLib(overId)
+				props.moveAdLib(draggedId, overIndex)
+			}
+		},
+
+		drop(item, _monitor) {
+			const { index } = props.findAdLib(item.id)
+
+			return {
+				index,
+				action: 'reorder',
+			}
+		},
+	})
+
+	const [collectedProps, connectDragSource, connectDragPreview] = useDrag<
+		IBucketPieceDragObject,
+		{},
+		{ isDragging: boolean }
+	>({
+		type: DragDropItemTypes.BUCKET_ADLIB_PIECE,
+		item: (_monitor: DragSourceMonitor) => {
+			return {
+				id: props.piece._id,
+				originalIndex: props.findAdLib(props.piece._id).index,
+				bucketId: props.bucketId,
+			}
+		},
+
+		end: (item, monitor: DragSourceMonitor<IBucketPieceDragObject, IBucketPieceDropResult>) => {
+			const { id: droppedId, originalIndex } = item
+			const didDrop = monitor.didDrop()
+
+			if (!didDrop) {
+				props.moveAdLib(droppedId, originalIndex)
+			} else {
+				const dropResult = monitor.getDropResult()
+				if (!dropResult) return
+
+				const { action } = dropResult
+				if (action === 'reorder') {
+					const { index: newIndex } = props.findAdLib(droppedId)
+					props.onAdLibReorder(droppedId, newIndex, originalIndex)
+				} else if (action === 'move') {
+					const { bucketId } = dropResult
+					props.onAdLibMove(droppedId, bucketId)
+				}
+			}
+		},
+
+		collect: (monitor) => ({
+			isDragging: monitor.isDragging(),
+		}),
+	})
+
+	return (
+		<BucketPieceButtonBase
+			{...props}
+			contentStatus={contentStatus}
+			connectDropTarget={connectDropTarget}
+			connectDragPreview={connectDragPreview}
+			connectDragSource={connectDragSource}
+			isDragging={collectedProps.isDragging}
+		/>
+	)
+}
diff --git a/meteor/client/ui/Shelf/ColoredBoxPanel.tsx b/packages/webui/src/client/ui/Shelf/ColoredBoxPanel.tsx
similarity index 84%
rename from meteor/client/ui/Shelf/ColoredBoxPanel.tsx
rename to packages/webui/src/client/ui/Shelf/ColoredBoxPanel.tsx
index 40b3c55f20..0453aa9128 100644
--- a/meteor/client/ui/Shelf/ColoredBoxPanel.tsx
+++ b/packages/webui/src/client/ui/Shelf/ColoredBoxPanel.tsx
@@ -1,12 +1,11 @@
-import * as React from 'react'
 import {
 	DashboardLayoutColoredBox,
 	RundownLayoutBase,
 	RundownLayoutColoredBox,
-} from '../../../lib/collections/RundownLayouts'
+} from '@sofie-automation/meteor-lib/dist/collections/RundownLayouts'
 import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
 import { dashboardElementStyle } from './DashboardPanel'
-import { RundownLayoutsAPI } from '../../../lib/api/rundownLayouts'
+import { RundownLayoutsAPI } from '../../lib/rundownLayouts'
 
 interface IColoredBoxPanelProps {
 	visible?: boolean
diff --git a/meteor/client/ui/Shelf/DashboardActionButton.tsx b/packages/webui/src/client/ui/Shelf/DashboardActionButton.tsx
similarity index 96%
rename from meteor/client/ui/Shelf/DashboardActionButton.tsx
rename to packages/webui/src/client/ui/Shelf/DashboardActionButton.tsx
index 643ac41ce8..a3a5f9fa5e 100644
--- a/meteor/client/ui/Shelf/DashboardActionButton.tsx
+++ b/packages/webui/src/client/ui/Shelf/DashboardActionButton.tsx
@@ -1,7 +1,10 @@
 import * as React from 'react'
 import ClassNames from 'classnames'
 
-import { ActionButtonType, DashboardLayoutActionButton } from '../../../lib/collections/RundownLayouts'
+import {
+	ActionButtonType,
+	DashboardLayoutActionButton,
+} from '@sofie-automation/meteor-lib/dist/collections/RundownLayouts'
 import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
 
 export interface IDashboardButtonProps {
diff --git a/meteor/client/ui/Shelf/DashboardActionButtonGroup.tsx b/packages/webui/src/client/ui/Shelf/DashboardActionButtonGroup.tsx
similarity index 92%
rename from meteor/client/ui/Shelf/DashboardActionButtonGroup.tsx
rename to packages/webui/src/client/ui/Shelf/DashboardActionButtonGroup.tsx
index a7ccc25511..8e652677da 100644
--- a/meteor/client/ui/Shelf/DashboardActionButtonGroup.tsx
+++ b/packages/webui/src/client/ui/Shelf/DashboardActionButtonGroup.tsx
@@ -1,18 +1,21 @@
 import * as React from 'react'
 
-import { DashboardLayoutActionButton, ActionButtonType } from '../../../lib/collections/RundownLayouts'
+import {
+	DashboardLayoutActionButton,
+	ActionButtonType,
+} from '@sofie-automation/meteor-lib/dist/collections/RundownLayouts'
 import { DashboardActionButton } from './DashboardActionButton'
-import { doUserAction, UserAction } from '../../../lib/clientUserAction'
+import { doUserAction, UserAction } from '../../lib/clientUserAction'
 import { withTranslation } from 'react-i18next'
 import { Translated } from '../../lib/ReactMeteorData/react-meteor-data'
 import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
-import { MeteorCall } from '../../../lib/api/methods'
+import { MeteorCall } from '../../lib/meteorApi'
 import { doModalDialog } from '../../lib/ModalDialog'
-import { NoticeLevel, Notification, NotificationCenter } from '../../../lib/notifications/notifications'
+import { NoticeLevel, Notification, NotificationCenter } from '../../lib/notifications/notifications'
 import { RundownPlaylistId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import { RundownHoldState } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
-import { ClientAPI } from '../../../lib/api/client'
-import { hashSingleUseToken } from '../../../lib/api/userActions'
+import { ClientAPI } from '@sofie-automation/meteor-lib/dist/api/client'
+import { hashSingleUseToken } from '../../lib/lib'
 
 export interface IDashboardButtonGroupProps {
 	buttons: DashboardLayoutActionButton[]
diff --git a/meteor/client/ui/Shelf/DashboardPanel.tsx b/packages/webui/src/client/ui/Shelf/DashboardPanel.tsx
similarity index 97%
rename from meteor/client/ui/Shelf/DashboardPanel.tsx
rename to packages/webui/src/client/ui/Shelf/DashboardPanel.tsx
index 89f6589070..4404aeb074 100644
--- a/meteor/client/ui/Shelf/DashboardPanel.tsx
+++ b/packages/webui/src/client/ui/Shelf/DashboardPanel.tsx
@@ -5,16 +5,16 @@ import ClassNames from 'classnames'
 
 import { Spinner } from '../../lib/Spinner'
 import { ISourceLayer, IBlueprintActionTriggerMode } from '@sofie-automation/blueprints-integration'
-import { doUserAction, UserAction } from '../../../lib/clientUserAction'
-import { NotificationCenter, Notification, NoticeLevel } from '../../../lib/notifications/notifications'
-import { DashboardLayoutFilter, DashboardPanelUnit } from '../../../lib/collections/RundownLayouts'
-import { unprotectString } from '../../../lib/lib'
+import { doUserAction, UserAction } from '../../lib/clientUserAction'
+import { NotificationCenter, Notification, NoticeLevel } from '../../lib/notifications/notifications'
+import { DashboardLayoutFilter, DashboardPanelUnit } from '@sofie-automation/meteor-lib/dist/collections/RundownLayouts'
+import { unprotectString } from '../../lib/tempLib'
 import { IAdLibPanelProps, AdLibFetchAndFilterProps, useFetchAndFilter } from './AdLibPanel'
 import { AdLibPanelToolbar } from './AdLibPanelToolbar'
 import { matchFilter } from './AdLibListView'
 import { DashboardPieceButton } from './DashboardPieceButton'
 import { contextMenuHoldToDisplayTime, UserAgentPointer, USER_AGENT_POINTER_PROPERTY } from '../../lib/lib'
-import { MeteorCall } from '../../../lib/api/methods'
+import { MeteorCall } from '../../lib/meteorApi'
 import { ContextMenuTrigger } from '@jstarpl/react-contextmenu'
 import { setShelfContextMenuContext, ContextType } from './ShelfContextMenu'
 import { RundownUtils } from '../../lib/rundown'
@@ -26,10 +26,10 @@ import {
 	isAdLibNext,
 	isAdLibOnAir,
 } from '../../lib/shelf'
-import { UIStudio } from '../../../lib/api/studios'
+import { UIStudio } from '@sofie-automation/meteor-lib/dist/api/studios'
 import { UIStudios } from '../Collections'
 import { PieceId } from '@sofie-automation/corelib/dist/dataModel/Ids'
-import { RundownPlaylistCollectionUtil } from '../../../lib/collections/rundownPlaylistUtil'
+import { RundownPlaylistCollectionUtil } from '../../collections/rundownPlaylistUtil'
 import { CorelibPubSub } from '@sofie-automation/corelib/dist/pubsub'
 import { useTranslation } from 'react-i18next'
 
@@ -627,6 +627,6 @@ export const DashboardPanel = React.memo(
 		)
 	},
 	(props: IAdLibPanelProps, nextProps: IAdLibPanelProps) => {
-		return !_.isEqual(props, nextProps)
+		return _.isEqual(props, nextProps)
 	}
 )
diff --git a/meteor/client/ui/Shelf/DashboardPieceButton.tsx b/packages/webui/src/client/ui/Shelf/DashboardPieceButton.tsx
similarity index 92%
rename from meteor/client/ui/Shelf/DashboardPieceButton.tsx
rename to packages/webui/src/client/ui/Shelf/DashboardPieceButton.tsx
index 5cb6395f12..ac19329fd9 100644
--- a/meteor/client/ui/Shelf/DashboardPieceButton.tsx
+++ b/packages/webui/src/client/ui/Shelf/DashboardPieceButton.tsx
@@ -13,18 +13,18 @@ import {
 import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
 import { IAdLibListItem } from './AdLibListItem'
 import SplitInputIcon from '../PieceIcons/Renderers/SplitInputIcon'
-import { PieceDisplayStyle } from '../../../lib/collections/RundownLayouts'
+import { PieceDisplayStyle } from '@sofie-automation/meteor-lib/dist/collections/RundownLayouts'
 import { DashboardPieceButtonSplitPreview } from './DashboardPieceButtonSplitPreview'
 import { StyledTimecode } from '../../lib/StyledTimecode'
 import { VTFloatingInspector } from '../FloatingInspectors/VTFloatingInspector'
-import { getNoticeLevelForPieceStatus } from '../../../lib/notifications/notifications'
+import { getNoticeLevelForPieceStatus } from '../../lib/notifications/notifications'
 import { L3rdFloatingInspector } from '../FloatingInspectors/L3rdFloatingInspector'
-import { withMediaObjectStatus } from '../SegmentTimeline/withMediaObjectStatus'
+import { useContentStatusForAdlibPiece, WithMediaObjectStatusProps } from '../SegmentTimeline/withMediaObjectStatus'
 
 import { isTouchDevice } from '../../lib/lib'
 import { AdLibPieceUi } from '../../lib/shelf'
-import { protectString } from '../../../lib/lib'
-import { UIStudio } from '../../../lib/api/studios'
+import { protectString } from '../../lib/tempLib'
+import { UIStudio } from '@sofie-automation/meteor-lib/dist/api/studios'
 import { PieceStatusCode } from '@sofie-automation/corelib/dist/dataModel/Piece'
 
 export interface IDashboardButtonProps {
@@ -63,7 +63,7 @@ interface IState {
 }
 
 export class DashboardPieceButtonBase<T = {}> extends React.Component<
-	React.PropsWithChildren<IDashboardButtonProps> & T,
+	React.PropsWithChildren<IDashboardButtonProps> & T & WithMediaObjectStatusProps,
 	IState
 > {
 	private element: HTMLDivElement | null = null
@@ -79,7 +79,7 @@ export class DashboardPieceButtonBase<T = {}> extends React.Component<
 	private hoverTimeout: number | null = null
 	protected inBucket = false
 
-	constructor(props: IDashboardButtonProps & T) {
+	constructor(props: IDashboardButtonProps & T & WithMediaObjectStatusProps) {
 		super(props)
 
 		this.state = {
@@ -137,7 +137,7 @@ export class DashboardPieceButtonBase<T = {}> extends React.Component<
 	}
 
 	private renderVTLiveSpeak(renderThumbnail?: boolean) {
-		const thumbnailUrl = this.props.piece.contentStatus?.thumbnailUrl
+		const thumbnailUrl = this.props.contentStatus?.thumbnailUrl
 		const vtContent = this.props.piece.content as VTContent | undefined
 		const sourceDuration = vtContent?.sourceDuration
 
@@ -151,7 +151,7 @@ export class DashboardPieceButtonBase<T = {}> extends React.Component<
 					</span>
 				)}
 				<VTFloatingInspector
-					status={this.props.piece.contentStatus?.status ?? PieceStatusCode.UNKNOWN}
+					status={this.props.contentStatus?.status ?? PieceStatusCode.UNKNOWN}
 					showMiniInspector={this.state.isHovered}
 					timePosition={this.state.timePosition}
 					content={vtContent}
@@ -163,11 +163,11 @@ export class DashboardPieceButtonBase<T = {}> extends React.Component<
 					}}
 					typeClass={this.props.layer && RundownUtils.getSourceLayerClassName(this.props.layer.type)}
 					itemElement={null}
-					noticeMessages={this.props.piece.contentStatus?.messages || null}
-					noticeLevel={getNoticeLevelForPieceStatus(this.props.piece.contentStatus?.status)}
+					noticeMessages={this.props.contentStatus?.messages || null}
+					noticeLevel={getNoticeLevelForPieceStatus(this.props.contentStatus?.status)}
 					studio={this.props.studio}
 					displayOn="viewport"
-					previewUrl={this.props.piece.contentStatus?.previewUrl}
+					previewUrl={this.props.contentStatus?.previewUrl}
 				/>
 				{thumbnailUrl && renderThumbnail && (
 					<div className="dashboard-panel__panel__button__thumbnail">
@@ -416,7 +416,7 @@ export class DashboardPieceButtonBase<T = {}> extends React.Component<
 						selected: this.props.isNext || this.props.isSelected,
 					},
 					!this.inBucket && this.props.layer && RundownUtils.getSourceLayerClassName(this.props.layer.type),
-					RundownUtils.getPieceStatusClassName(this.props.piece.contentStatus?.status),
+					RundownUtils.getPieceStatusClassName(this.props.contentStatus?.status),
 					...(this.props.piece.tags ? this.props.piece.tags.map((tag) => `piece-tag--${tag}`) : [])
 				)}
 				style={{
@@ -489,6 +489,8 @@ export class DashboardPieceButtonBase<T = {}> extends React.Component<
 	}
 }
 
-export const DashboardPieceButton = withMediaObjectStatus<React.PropsWithChildren<IDashboardButtonProps>, {}>()(
-	DashboardPieceButtonBase
-)
+export function DashboardPieceButton(props: React.PropsWithChildren<IDashboardButtonProps>): JSX.Element {
+	const contentStatus = useContentStatusForAdlibPiece(props.piece)
+
+	return <DashboardPieceButtonBase {...props} contentStatus={contentStatus} />
+}
diff --git a/meteor/client/ui/Shelf/DashboardPieceButtonSplitPreview.tsx b/packages/webui/src/client/ui/Shelf/DashboardPieceButtonSplitPreview.tsx
similarity index 95%
rename from meteor/client/ui/Shelf/DashboardPieceButtonSplitPreview.tsx
rename to packages/webui/src/client/ui/Shelf/DashboardPieceButtonSplitPreview.tsx
index aaa2b99e5a..7d30950d79 100644
--- a/meteor/client/ui/Shelf/DashboardPieceButtonSplitPreview.tsx
+++ b/packages/webui/src/client/ui/Shelf/DashboardPieceButtonSplitPreview.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react'
 import { SplitsContent } from '@sofie-automation/blueprints-integration'
 import { PieceGeneric } from '@sofie-automation/corelib/dist/dataModel/Piece'
 import { getSplitPreview } from '../../lib/ui/splitPreview'
diff --git a/meteor/client/ui/Shelf/EndWordsPanel.tsx b/packages/webui/src/client/ui/Shelf/EndWordsPanel.tsx
similarity index 95%
rename from meteor/client/ui/Shelf/EndWordsPanel.tsx
rename to packages/webui/src/client/ui/Shelf/EndWordsPanel.tsx
index 29d6ff58d8..6c5a695856 100644
--- a/meteor/client/ui/Shelf/EndWordsPanel.tsx
+++ b/packages/webui/src/client/ui/Shelf/EndWordsPanel.tsx
@@ -5,8 +5,8 @@ import {
 	DashboardLayoutEndsWords,
 	RundownLayoutBase,
 	RundownLayoutEndWords,
-} from '../../../lib/collections/RundownLayouts'
-import { RundownLayoutsAPI } from '../../../lib/api/rundownLayouts'
+} from '@sofie-automation/meteor-lib/dist/collections/RundownLayouts'
+import { RundownLayoutsAPI } from '../../lib/rundownLayouts'
 import { dashboardElementStyle } from './DashboardPanel'
 import { Translated, translateWithTracker } from '../../lib/ReactMeteorData/ReactMeteorData'
 import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
@@ -14,7 +14,7 @@ import { PieceInstance } from '@sofie-automation/corelib/dist/dataModel/PieceIns
 import { ScriptContent } from '@sofie-automation/blueprints-integration'
 import { getUnfinishedPieceInstancesReactive } from '../../lib/rundownLayouts'
 import { getScriptPreview } from '../../lib/ui/scriptPreview'
-import { UIShowStyleBase } from '../../../lib/api/showStyles'
+import { UIShowStyleBase } from '@sofie-automation/meteor-lib/dist/api/showStyles'
 import { PieceInstances } from '../../collections'
 import { ReadonlyDeep } from 'type-fest'
 
diff --git a/meteor/client/ui/Shelf/ExternalFramePanel.tsx b/packages/webui/src/client/ui/Shelf/ExternalFramePanel.tsx
similarity index 93%
rename from meteor/client/ui/Shelf/ExternalFramePanel.tsx
rename to packages/webui/src/client/ui/Shelf/ExternalFramePanel.tsx
index d0694303d5..ad488d0d13 100644
--- a/meteor/client/ui/Shelf/ExternalFramePanel.tsx
+++ b/packages/webui/src/client/ui/Shelf/ExternalFramePanel.tsx
@@ -6,12 +6,12 @@ import {
 	RundownLayoutExternalFrame,
 	RundownLayoutBase,
 	DashboardLayoutExternalFrame,
-} from '../../../lib/collections/RundownLayouts'
-import { RundownLayoutsAPI } from '../../../lib/api/rundownLayouts'
+} from '@sofie-automation/meteor-lib/dist/collections/RundownLayouts'
+import { RundownLayoutsAPI } from '../../lib/rundownLayouts'
 import { dashboardElementStyle } from './DashboardPanel'
-import { assertNever, getRandomString, literal, protectString } from '../../../lib/lib'
+import { assertNever, getRandomString, literal, protectString } from '../../lib/tempLib'
 import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
-import { PartInstance } from '../../../lib/collections/PartInstances'
+import { PartInstance } from '@sofie-automation/meteor-lib/dist/collections/PartInstances'
 import { parseMosPluginMessageXml, MosPluginMessage } from '../../lib/parsers/mos/mosXml2Js'
 import {
 	createMosAppInfoXmlString,
@@ -19,23 +19,23 @@ import {
 	UIMetricMode as MOSUIMetricMode,
 	Events as MOSEvents,
 } from '../../lib/data/mos/plugin-support'
-import { MOS } from '@sofie-automation/corelib'
-import { doUserAction, UserAction } from '../../../lib/clientUserAction'
+import { doUserAction, UserAction } from '../../lib/clientUserAction'
 import { withTranslation } from 'react-i18next'
 import { Translated } from '../../lib/ReactMeteorData/ReactMeteorData'
 import { IngestAdlib } from '@sofie-automation/blueprints-integration'
-import { MeteorCall } from '../../../lib/api/methods'
-import { check } from '../../../lib/check'
+import { MeteorCall } from '../../lib/meteorApi'
 import { Rundown } from '@sofie-automation/corelib/dist/dataModel/Rundown'
-import { Buckets, PartInstances, Rundowns } from '../../collections'
+import { Buckets, Rundowns } from '../../collections'
 import { BucketId, PartInstanceId, RundownPlaylistId } from '@sofie-automation/corelib/dist/dataModel/Ids'
-import { MOS_DATA_IS_STRICT } from '../../../lib/mos'
-import { getMosTypes, stringifyMosObject } from '@mos-connection/helper'
-import { RundownPlaylistCollectionUtil } from '../../../lib/collections/rundownPlaylistUtil'
-import { logger } from '../../../lib/logging'
-import RundownViewEventBus, { ItemDroppedEvent, RundownViewEvents } from '../../../lib/api/triggers/RundownViewEventBus'
-
-const PackageInfo = require('../../../package.json')
+import { MOS_DATA_IS_STRICT } from '@sofie-automation/meteor-lib/dist/mos'
+import { mosTypes, MOS } from '@sofie-automation/meteor-lib/dist/mos'
+import { RundownPlaylistCollectionUtil } from '../../collections/rundownPlaylistUtil'
+import { logger } from '../../lib/logging'
+import RundownViewEventBus, {
+	ItemDroppedEvent,
+	RundownViewEvents,
+} from '@sofie-automation/meteor-lib/dist/triggers/RundownViewEventBus'
+import { UIPartInstances } from '../Collections'
 
 interface IProps {
 	layout: RundownLayoutBase
@@ -217,9 +217,9 @@ export const ExternalFramePanel = withTranslation()(
 			let currentPart: PartInstance | undefined
 			if (playlist.currentPartInfo || playlist.nextPartInfo) {
 				if (playlist.currentPartInfo !== null) {
-					currentPart = PartInstances.findOne(playlist.currentPartInfo.partInstanceId)
+					currentPart = UIPartInstances.findOne(playlist.currentPartInfo.partInstanceId)
 				} else if (playlist.nextPartInfo !== null) {
-					currentPart = PartInstances.findOne(playlist.nextPartInfo.partInstanceId)
+					currentPart = UIPartInstances.findOne(playlist.nextPartInfo.partInstanceId)
 				}
 
 				if (!currentPart) {
@@ -252,8 +252,6 @@ export const ExternalFramePanel = withTranslation()(
 
 			const showStyleBaseId = this.getShowStyleBaseId()
 
-			const mosTypes = getMosTypes(MOS_DATA_IS_STRICT)
-
 			const name = mosItem.Slug
 				? mosTypes.mosString128.stringify(mosItem.Slug)
 				: mosItem.ObjectSlug
@@ -270,7 +268,7 @@ export const ExternalFramePanel = withTranslation()(
 						externalId: mosItem.ObjectID ? mosTypes.mosString128.stringify(mosItem.ObjectID) : '',
 						name,
 						payloadType: 'MOS',
-						payload: stringifyMosObject(mosItem, MOS_DATA_IS_STRICT),
+						payload: MOS.stringifyMosObject(mosItem, MOS_DATA_IS_STRICT),
 					})
 				)
 			)
@@ -285,8 +283,8 @@ export const ExternalFramePanel = withTranslation()(
 		}
 
 		actSofieMessage = (message: SofieExternalMessage) => {
-			check(message.id, String)
-			check(message.type, String)
+			if (typeof message.id !== 'string') throw new Error('Expected `message.id` to be a string')
+			if (typeof message.type !== 'string') throw new Error('Expected `message.type` to be a string')
 
 			if (Object.values<SofieExternalMessageType>(SofieExternalMessageType as any).indexOf(message.type) < 0) {
 				logger.error(`ExternalFramePanel: Unknown message type: ${message.type}`)
@@ -309,7 +307,7 @@ export const ExternalFramePanel = withTranslation()(
 							type: SofieExternalMessageType.WELCOME,
 							payload: {
 								host: 'Sofie Automation System',
-								version: PackageInfo.version,
+								version: __APP_VERSION__,
 								rundownPlaylistId: this.props.playlist._id,
 							},
 						}),
@@ -569,8 +567,6 @@ export const ExternalFramePanel = withTranslation()(
 
 				const showStyleBaseId = this.getShowStyleBaseId()
 
-				const mosTypes = getMosTypes(MOS_DATA_IS_STRICT)
-
 				console.log('start transfer from ext panel')
 
 				doUserAction(t, e, UserAction.INGEST_BUCKET_ADLIB, async (e, ts) => {
@@ -596,7 +592,7 @@ export const ExternalFramePanel = withTranslation()(
 							externalId: mosItem.ObjectID ? mosTypes.mosString128.stringify(mosItem.ObjectID) : '',
 							name,
 							payloadType: 'MOS',
-							payload: stringifyMosObject(mosItem, MOS_DATA_IS_STRICT),
+							payload: MOS.stringifyMosObject(mosItem, MOS_DATA_IS_STRICT),
 						})
 					)
 				})
diff --git a/meteor/client/ui/Shelf/GlobalAdLibPanel.tsx b/packages/webui/src/client/ui/Shelf/GlobalAdLibPanel.tsx
similarity index 86%
rename from meteor/client/ui/Shelf/GlobalAdLibPanel.tsx
rename to packages/webui/src/client/ui/Shelf/GlobalAdLibPanel.tsx
index 0a9da1676d..2f9519d721 100644
--- a/meteor/client/ui/Shelf/GlobalAdLibPanel.tsx
+++ b/packages/webui/src/client/ui/Shelf/GlobalAdLibPanel.tsx
@@ -1,20 +1,20 @@
-import React, { useMemo } from 'react'
+import { useMemo } from 'react'
 import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
 import { IAdLibListItem } from './AdLibListItem'
 import { AdLibPanel } from './AdLibPanel'
 import { PieceUi } from '../SegmentTimeline/SegmentTimelineContainer'
 import { BucketAdLibActionUi, BucketAdLibUi } from './RundownViewBuckets'
-import { literal } from '../../../lib/lib'
+import { literal } from '../../lib/tempLib'
 import {
 	PieceDisplayStyle,
 	RundownLayoutElementType,
 	RundownLayoutFilter,
-} from '../../../lib/collections/RundownLayouts'
+} from '@sofie-automation/meteor-lib/dist/collections/RundownLayouts'
 import { ShelfTabs } from './Shelf'
 import { useTranslation } from 'react-i18next'
 import { AdLibPieceUi } from '../../lib/shelf'
-import { UIShowStyleBase } from '../../../lib/api/showStyles'
-import { UIStudio } from '../../../lib/api/studios'
+import { UIShowStyleBase } from '@sofie-automation/meteor-lib/dist/api/showStyles'
+import { UIStudio } from '@sofie-automation/meteor-lib/dist/api/studios'
 
 interface IProps {
 	playlist: DBRundownPlaylist
diff --git a/meteor/client/ui/Shelf/HotkeyHelpPanel.tsx b/packages/webui/src/client/ui/Shelf/HotkeyHelpPanel.tsx
similarity index 92%
rename from meteor/client/ui/Shelf/HotkeyHelpPanel.tsx
rename to packages/webui/src/client/ui/Shelf/HotkeyHelpPanel.tsx
index 419d1ffca9..92139b7de5 100644
--- a/meteor/client/ui/Shelf/HotkeyHelpPanel.tsx
+++ b/packages/webui/src/client/ui/Shelf/HotkeyHelpPanel.tsx
@@ -8,9 +8,9 @@ import { SorensenContext } from '../../lib/SorensenContext'
 import { codesToKeyLabels } from '../../lib/triggers/codesToKeyLabels'
 import { TFunction } from 'i18next'
 import { translateMessage } from '@sofie-automation/corelib/dist/TranslatableMessage'
-import { MongoCursor } from '../../../lib/collections/lib'
-import { UIShowStyleBase } from '../../../lib/api/showStyles'
-import { MountedTrigger } from '../../../lib/api/triggers/MountedTriggers'
+import { MongoCursor } from '../../collections/lib'
+import { UIShowStyleBase } from '@sofie-automation/meteor-lib/dist/api/showStyles'
+import { MountedTrigger } from '@sofie-automation/meteor-lib/dist/api/MountedTriggers'
 
 interface IProps {
 	visible?: boolean
diff --git a/meteor/client/ui/Shelf/Inspector/ItemRenderers/ActionItemRenderer.tsx b/packages/webui/src/client/ui/Shelf/Inspector/ItemRenderers/ActionItemRenderer.tsx
similarity index 93%
rename from meteor/client/ui/Shelf/Inspector/ItemRenderers/ActionItemRenderer.tsx
rename to packages/webui/src/client/ui/Shelf/Inspector/ItemRenderers/ActionItemRenderer.tsx
index 361b09e2d8..e6143d4517 100644
--- a/meteor/client/ui/Shelf/Inspector/ItemRenderers/ActionItemRenderer.tsx
+++ b/packages/webui/src/client/ui/Shelf/Inspector/ItemRenderers/ActionItemRenderer.tsx
@@ -6,21 +6,21 @@ import { Piece } from '@sofie-automation/corelib/dist/dataModel/Piece'
 import { IBlueprintActionTriggerMode } from '@sofie-automation/blueprints-integration'
 import { translateWithTracker, Translated } from '../../../../lib/ReactMeteorData/ReactMeteorData'
 import { AdLibActionCommon } from '@sofie-automation/corelib/dist/dataModel/AdlibAction'
-import { createInMemorySyncMongoCollection } from '../../../../../lib/collections/lib'
+import { createInMemorySyncMongoCollection } from '../../../../collections/lib'
 import { Spinner } from '../../../../lib/Spinner'
 import InspectorTitle from './InspectorTitle'
-import { ProtectedString } from '../../../../../lib/lib'
-import { doUserAction, UserAction } from '../../../../../lib/clientUserAction'
-import { MeteorCall } from '../../../../../lib/api/methods'
+import { ProtectedString } from '../../../../lib/tempLib'
+import { doUserAction, UserAction } from '../../../../lib/clientUserAction'
+import { MeteorCall } from '../../../../lib/meteorApi'
 import { BucketAdLibItem, BucketAdLibActionUi } from '../../RundownViewBuckets'
 import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
 import { actionToAdLibPieceUi } from '../../BucketPanel'
-import RundownViewEventBus, { RundownViewEvents } from '../../../../../lib/api/triggers/RundownViewEventBus'
+import RundownViewEventBus, { RundownViewEvents } from '@sofie-automation/meteor-lib/dist/triggers/RundownViewEventBus'
 import { IAdLibListItem } from '../../AdLibListItem'
 import { translateMessage } from '@sofie-automation/corelib/dist/TranslatableMessage'
 import { AdLibPieceUi } from '../../../../lib/shelf'
-import { UIShowStyleBase } from '../../../../../lib/api/showStyles'
-import { UIStudio } from '../../../../../lib/api/studios'
+import { UIShowStyleBase } from '@sofie-automation/meteor-lib/dist/api/showStyles'
+import { UIStudio } from '@sofie-automation/meteor-lib/dist/api/studios'
 import { BucketId, PartId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import { Buckets } from '../../../../collections'
 import { BucketAdLibAction } from '@sofie-automation/corelib/dist/dataModel/BucketAdLibAction'
diff --git a/meteor/client/ui/Shelf/Inspector/ItemRenderers/DefaultItemRenderer.tsx b/packages/webui/src/client/ui/Shelf/Inspector/ItemRenderers/DefaultItemRenderer.tsx
similarity index 80%
rename from meteor/client/ui/Shelf/Inspector/ItemRenderers/DefaultItemRenderer.tsx
rename to packages/webui/src/client/ui/Shelf/Inspector/ItemRenderers/DefaultItemRenderer.tsx
index d09f2f3713..0eece72ab4 100644
--- a/meteor/client/ui/Shelf/Inspector/ItemRenderers/DefaultItemRenderer.tsx
+++ b/packages/webui/src/client/ui/Shelf/Inspector/ItemRenderers/DefaultItemRenderer.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react'
 import { PieceUi } from '../../../SegmentTimeline/SegmentTimelineContainer'
 import { IAdLibListItem } from '../../AdLibListItem'
 import { RundownUtils } from '../../../../lib/rundown'
@@ -6,13 +5,16 @@ import { Piece } from '@sofie-automation/corelib/dist/dataModel/Piece'
 import InspectorTitle from './InspectorTitle'
 import { BucketAdLibUi } from '../../RundownViewBuckets'
 import { AdLibPieceUi } from '../../../../lib/shelf'
-import { UIShowStyleBase } from '../../../../../lib/api/showStyles'
-import { UIStudio } from '../../../../../lib/api/studios'
+import { UIShowStyleBase } from '@sofie-automation/meteor-lib/dist/api/showStyles'
+import { UIStudio } from '@sofie-automation/meteor-lib/dist/api/studios'
 import { unprotectString } from '@sofie-automation/corelib/dist/protectedString'
+import { ReadonlyDeep } from 'type-fest'
+import { PieceContentStatusObj } from '@sofie-automation/meteor-lib/dist/api/pieceContentStatus'
 
 export default function DefaultItemRenderer(
 	props: Readonly<{
 		piece: PieceUi | IAdLibListItem | BucketAdLibUi
+		contentStatus: ReadonlyDeep<PieceContentStatusObj> | undefined
 		showStyleBase: UIShowStyleBase
 		studio: UIStudio
 	}>
@@ -20,7 +22,7 @@ export default function DefaultItemRenderer(
 	if (RundownUtils.isAdLibPiece(props.piece)) {
 		const piece = props.piece as IAdLibListItem
 
-		const packageName = piece.contentStatus?.packageName ?? null
+		const packageName = props.contentStatus?.packageName ?? null
 
 		return (
 			<>
@@ -49,7 +51,7 @@ export default function DefaultItemRenderer(
 	} else {
 		const piece = props.piece.instance.piece as Piece
 
-		const packageName = props.piece.contentStatus?.packageName ?? null
+		const packageName = props.contentStatus?.packageName ?? null
 
 		return (
 			<>
diff --git a/meteor/client/ui/Shelf/Inspector/ItemRenderers/InspectorTitle.tsx b/packages/webui/src/client/ui/Shelf/Inspector/ItemRenderers/InspectorTitle.tsx
similarity index 68%
rename from meteor/client/ui/Shelf/Inspector/ItemRenderers/InspectorTitle.tsx
rename to packages/webui/src/client/ui/Shelf/Inspector/ItemRenderers/InspectorTitle.tsx
index 6dc6987579..df7aefafbf 100644
--- a/meteor/client/ui/Shelf/Inspector/ItemRenderers/InspectorTitle.tsx
+++ b/packages/webui/src/client/ui/Shelf/Inspector/ItemRenderers/InspectorTitle.tsx
@@ -1,14 +1,13 @@
-import * as React from 'react'
 import ClassNames from 'classnames'
 import { PieceUi } from '../../../SegmentTimeline/SegmentTimelineContainer'
 import { BucketAdLibUi, BucketAdLibActionUi } from '../../RundownViewBuckets'
 import { RundownUtils } from '../../../../lib/rundown'
 import { Piece } from '@sofie-automation/corelib/dist/dataModel/Piece'
-import { withMediaObjectStatus } from '../../../SegmentTimeline/withMediaObjectStatus'
+import { useContentStatusForItem } from '../../../SegmentTimeline/withMediaObjectStatus'
 import { IAdLibListItem } from '../../AdLibListItem'
 import { AdLibPieceUi } from '../../../../lib/shelf'
-import { UIShowStyleBase } from '../../../../../lib/api/showStyles'
-import { UIStudio } from '../../../../../lib/api/studios'
+import { UIShowStyleBase } from '@sofie-automation/meteor-lib/dist/api/showStyles'
+import { UIStudio } from '@sofie-automation/meteor-lib/dist/api/studios'
 
 interface IProps {
 	piece: PieceUi | IAdLibListItem | BucketAdLibUi | BucketAdLibActionUi
@@ -16,15 +15,13 @@ interface IProps {
 	studio: UIStudio
 }
 
-const InspectorTitle = withMediaObjectStatus<IProps, {}>()(function InspectorTitle(props: IProps) {
+function InspectorTitle(props: IProps): JSX.Element {
+	const contentStatus = useContentStatusForItem(props.piece)
+
 	const piece = RundownUtils.isPieceInstance(props.piece)
 		? (props.piece.instance.piece as Piece)
 		: (props.piece as AdLibPieceUi)
 
-	const status = RundownUtils.isPieceInstance(props.piece)
-		? props.piece.contentStatus?.status
-		: (props.piece as AdLibPieceUi).contentStatus?.status
-
 	const layer = props.showStyleBase.sourceLayers[piece.sourceLayerId]
 
 	return (
@@ -33,7 +30,7 @@ const InspectorTitle = withMediaObjectStatus<IProps, {}>()(function InspectorTit
 				className={ClassNames(
 					'shelf-inspector__title__icon',
 					layer && RundownUtils.getSourceLayerClassName(layer.type),
-					RundownUtils.getPieceStatusClassName(status)
+					RundownUtils.getPieceStatusClassName(contentStatus?.status)
 				)}
 			>
 				<div className="shelf-inspector__title__layer">{layer && (layer.abbreviation || layer.name)}</div>
@@ -41,6 +38,6 @@ const InspectorTitle = withMediaObjectStatus<IProps, {}>()(function InspectorTit
 			<span className="shelf-inspector__title__label">{piece.name}</span>
 		</h2>
 	)
-})
+}
 
 export default InspectorTitle
diff --git a/meteor/client/ui/Shelf/Inspector/ItemRenderers/ItemRendererFactory.ts b/packages/webui/src/client/ui/Shelf/Inspector/ItemRenderers/ItemRendererFactory.ts
similarity index 73%
rename from meteor/client/ui/Shelf/Inspector/ItemRenderers/ItemRendererFactory.ts
rename to packages/webui/src/client/ui/Shelf/Inspector/ItemRenderers/ItemRendererFactory.ts
index 1a629a78da..88755ddf81 100644
--- a/meteor/client/ui/Shelf/Inspector/ItemRenderers/ItemRendererFactory.ts
+++ b/packages/webui/src/client/ui/Shelf/Inspector/ItemRenderers/ItemRendererFactory.ts
@@ -8,11 +8,14 @@ import { BucketAdLibItem } from '../../RundownViewBuckets'
 import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
 import { IAdLibListItem } from '../../AdLibListItem'
 import { AdLibPieceUi } from '../../../../lib/shelf'
-import { UIShowStyleBase } from '../../../../../lib/api/showStyles'
-import { UIStudio } from '../../../../../lib/api/studios'
+import { UIShowStyleBase } from '@sofie-automation/meteor-lib/dist/api/showStyles'
+import { UIStudio } from '@sofie-automation/meteor-lib/dist/api/studios'
+import { ReadonlyDeep } from 'type-fest'
+import { PieceContentStatusObj } from '@sofie-automation/meteor-lib/dist/api/pieceContentStatus'
 
 export default function renderItem(
 	piece: BucketAdLibItem | IAdLibListItem | PieceUi,
+	contentStatus: ReadonlyDeep<PieceContentStatusObj> | undefined,
 	showStyleBase: UIShowStyleBase,
 	studio: UIStudio,
 	rundownPlaylist: DBRundownPlaylist,
@@ -31,5 +34,5 @@ export default function renderItem(
 		})
 	}
 
-	return React.createElement(DefaultItemRenderer, { piece, showStyleBase, studio })
+	return React.createElement(DefaultItemRenderer, { piece, contentStatus, showStyleBase, studio })
 }
diff --git a/meteor/client/ui/Shelf/Inspector/ItemRenderers/NoraItemEditor.tsx b/packages/webui/src/client/ui/Shelf/Inspector/ItemRenderers/NoraItemEditor.tsx
similarity index 98%
rename from meteor/client/ui/Shelf/Inspector/ItemRenderers/NoraItemEditor.tsx
rename to packages/webui/src/client/ui/Shelf/Inspector/ItemRenderers/NoraItemEditor.tsx
index f49d55e97d..c99c1a4e63 100644
--- a/meteor/client/ui/Shelf/Inspector/ItemRenderers/NoraItemEditor.tsx
+++ b/packages/webui/src/client/ui/Shelf/Inspector/ItemRenderers/NoraItemEditor.tsx
@@ -3,7 +3,7 @@ import { createMosObjectXmlStringNoraBluePrintPiece } from '../../../../lib/data
 import { parseMosPluginMessageXml, MosPluginMessage } from '../../../../lib/parsers/mos/mosXml2Js'
 import { PieceGeneric } from '@sofie-automation/corelib/dist/dataModel/Piece'
 import { createMosAppInfoXmlString } from '../../../../lib/data/mos/plugin-support'
-import { logger } from '../../../../../lib/logging'
+import { logger } from '../../../../lib/logging'
 import { ReadonlyDeep } from 'type-fest'
 
 //TODO: figure out what the origin should be
diff --git a/meteor/client/ui/Shelf/Inspector/ItemRenderers/NoraItemRenderer.tsx b/packages/webui/src/client/ui/Shelf/Inspector/ItemRenderers/NoraItemRenderer.tsx
similarity index 92%
rename from meteor/client/ui/Shelf/Inspector/ItemRenderers/NoraItemRenderer.tsx
rename to packages/webui/src/client/ui/Shelf/Inspector/ItemRenderers/NoraItemRenderer.tsx
index c0b1386d82..f24dafd760 100644
--- a/meteor/client/ui/Shelf/Inspector/ItemRenderers/NoraItemRenderer.tsx
+++ b/packages/webui/src/client/ui/Shelf/Inspector/ItemRenderers/NoraItemRenderer.tsx
@@ -8,8 +8,8 @@ import { withTranslation, WithTranslation } from 'react-i18next'
 import InspectorTitle from './InspectorTitle'
 import { ErrorBoundary } from '../../../../lib/ErrorBoundary'
 import { IAdLibListItem } from '../../AdLibListItem'
-import { UIShowStyleBase } from '../../../../../lib/api/showStyles'
-import { UIStudio } from '../../../../../lib/api/studios'
+import { UIShowStyleBase } from '@sofie-automation/meteor-lib/dist/api/showStyles'
+import { UIStudio } from '@sofie-automation/meteor-lib/dist/api/studios'
 
 export { isNoraItem }
 
@@ -85,7 +85,7 @@ function isNoraItem(item: IAdLibListItem | PieceUi): boolean {
 		? (item.content as NoraContent)
 		: (item.instance.piece.content as NoraContent)
 
-	if (!content || !content.payload || !content.payload.template) {
+	if (!content || !content.previewPayload) {
 		return false
 	}
 
diff --git a/meteor/client/ui/Shelf/Inspector/ShelfInspector.tsx b/packages/webui/src/client/ui/Shelf/Inspector/ShelfInspector.tsx
similarity index 64%
rename from meteor/client/ui/Shelf/Inspector/ShelfInspector.tsx
rename to packages/webui/src/client/ui/Shelf/Inspector/ShelfInspector.tsx
index 69ca8b58ec..6437abf8f3 100644
--- a/meteor/client/ui/Shelf/Inspector/ShelfInspector.tsx
+++ b/packages/webui/src/client/ui/Shelf/Inspector/ShelfInspector.tsx
@@ -7,10 +7,9 @@ import { contextMenuHoldToDisplayTime } from '../../../lib/lib'
 import { BucketAdLibItem } from '../RundownViewBuckets'
 import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
 import { IAdLibListItem } from '../AdLibListItem'
-import { UIShowStyleBase } from '../../../../lib/api/showStyles'
-import { UIStudio } from '../../../../lib/api/studios'
-
-export { ShelfInspector }
+import { UIShowStyleBase } from '@sofie-automation/meteor-lib/dist/api/showStyles'
+import { UIStudio } from '@sofie-automation/meteor-lib/dist/api/studios'
+import { useContentStatusForItem } from '../../SegmentTimeline/withMediaObjectStatus'
 
 interface IShelfInspectorProps {
 	selected: BucketAdLibItem | IAdLibListItem | PieceUi | undefined
@@ -20,19 +19,12 @@ interface IShelfInspectorProps {
 	onSelectPiece: (piece: BucketAdLibItem | IAdLibListItem | PieceUi | undefined) => void
 }
 
-class ShelfInspector extends React.Component<IShelfInspectorProps> {
-	constructor(props: IShelfInspectorProps) {
-		super(props)
-	}
+export const ShelfInspector = React.memo(
+	function ShelfInspector({ selected, showStyleBase, studio, rundownPlaylist, onSelectPiece }: IShelfInspectorProps) {
+		const contentStatus = useContentStatusForItem(selected)
 
-	shouldComponentUpdate(nextProps: IShelfInspectorProps): boolean {
-		if (_.isEqual(nextProps, this.props)) return false
-		return true
-	}
-
-	render(): JSX.Element {
-		const { selected, showStyleBase, studio, rundownPlaylist, onSelectPiece } = this.props
-		const content = selected && renderItem(selected, showStyleBase, studio, rundownPlaylist, onSelectPiece)
+		const content =
+			selected && renderItem(selected, contentStatus, showStyleBase, studio, rundownPlaylist, onSelectPiece)
 
 		return (
 			<ContextMenuTrigger
@@ -45,5 +37,8 @@ class ShelfInspector extends React.Component<IShelfInspectorProps> {
 				{content || false}
 			</ContextMenuTrigger>
 		)
+	},
+	(prevProps, nextProps) => {
+		return _.isEqual(nextProps, prevProps)
 	}
-}
+)
diff --git a/meteor/client/ui/Shelf/MiniRundownPanel.tsx b/packages/webui/src/client/ui/Shelf/MiniRundownPanel.tsx
similarity index 91%
rename from meteor/client/ui/Shelf/MiniRundownPanel.tsx
rename to packages/webui/src/client/ui/Shelf/MiniRundownPanel.tsx
index 70fda4ae57..88696dfa32 100644
--- a/meteor/client/ui/Shelf/MiniRundownPanel.tsx
+++ b/packages/webui/src/client/ui/Shelf/MiniRundownPanel.tsx
@@ -5,17 +5,17 @@ import {
 	RundownLayoutBase,
 	DashboardLayoutMiniRundown,
 	RundownLayoutMiniRundown,
-} from '../../../lib/collections/RundownLayouts'
-import { RundownLayoutsAPI } from '../../../lib/api/rundownLayouts'
+} from '@sofie-automation/meteor-lib/dist/collections/RundownLayouts'
+import { RundownLayoutsAPI } from '../../lib/rundownLayouts'
 import { withTracker } from '../../lib/ReactMeteorData/ReactMeteorData'
 import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
-import { PartInstance } from '../../../lib/collections/PartInstances'
+import { PartInstance } from '@sofie-automation/meteor-lib/dist/collections/PartInstances'
 import { DBSegment } from '@sofie-automation/corelib/dist/dataModel/Segment'
 import { dashboardElementStyle } from './DashboardPanel'
 import { Meteor } from 'meteor/meteor'
 import { PartInstanceId } from '@sofie-automation/corelib/dist/dataModel/Ids'
-import { PartInstances } from '../../collections'
-import { RundownPlaylistCollectionUtil } from '../../../lib/collections/rundownPlaylistUtil'
+import { UIPartInstances } from '../Collections'
+import { RundownPlaylistClientUtil } from '../../lib/rundownPlaylistUtil'
 
 interface IMiniRundownPanelProps {
 	key: string
@@ -123,14 +123,14 @@ export const MiniRundownPanel = withTracker<IMiniRundownPanelProps, IState, IMin
 
 		const currentPartInstanceId: PartInstanceId | undefined = props.playlist.currentPartInfo?.partInstanceId
 		if (currentPartInstanceId) {
-			currentPartInstance = PartInstances.findOne(currentPartInstanceId)
+			currentPartInstance = UIPartInstances.findOne(currentPartInstanceId)
 		}
 
 		if (props.playlist.nextPartInfo) {
-			nextPartInstance = PartInstances.findOne(props.playlist.nextPartInfo.partInstanceId)
+			nextPartInstance = UIPartInstances.findOne(props.playlist.nextPartInfo.partInstanceId)
 		}
 
-		const allSegments: DBSegment[] = RundownPlaylistCollectionUtil.getSegments(props.playlist)
+		const allSegments: DBSegment[] = RundownPlaylistClientUtil.getSegments(props.playlist)
 
 		return { currentPartInstance, nextPartInstance, allSegments }
 	},
diff --git a/meteor/client/ui/Shelf/NextBreakTimingPanel.tsx b/packages/webui/src/client/ui/Shelf/NextBreakTimingPanel.tsx
similarity index 84%
rename from meteor/client/ui/Shelf/NextBreakTimingPanel.tsx
rename to packages/webui/src/client/ui/Shelf/NextBreakTimingPanel.tsx
index b9d2a954e3..db2eb2668a 100644
--- a/meteor/client/ui/Shelf/NextBreakTimingPanel.tsx
+++ b/packages/webui/src/client/ui/Shelf/NextBreakTimingPanel.tsx
@@ -4,8 +4,8 @@ import {
 	DashboardLayoutNextBreakTiming,
 	RundownLayoutBase,
 	RundownLayoutNextBreakTiming,
-} from '../../../lib/collections/RundownLayouts'
-import { RundownLayoutsAPI } from '../../../lib/api/rundownLayouts'
+} from '@sofie-automation/meteor-lib/dist/collections/RundownLayouts'
+import { RundownLayoutsAPI } from '../../lib/rundownLayouts'
 import { dashboardElementStyle } from './DashboardPanel'
 import { Translated } from '../../lib/ReactMeteorData/ReactMeteorData'
 import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
@@ -21,7 +21,7 @@ interface INextBreakTimingPanelProps {
 
 export class NextBreakTimingPanelInner extends React.Component<Translated<INextBreakTimingPanelProps>> {
 	render(): JSX.Element {
-		const { playlist, panel, layout } = this.props
+		const { panel, layout } = this.props
 
 		const isDashboardLayout = RundownLayoutsAPI.isDashboardLayout(layout)
 
@@ -33,7 +33,7 @@ export class NextBreakTimingPanelInner extends React.Component<Translated<INextB
 				)}
 				style={isDashboardLayout ? dashboardElementStyle({ ...(panel as DashboardLayoutNextBreakTiming) }) : {}}
 			>
-				<NextBreakTiming loop={playlist.loop} breakText={panel.name} />
+				<NextBreakTiming breakText={panel.name} />
 			</div>
 		)
 	}
diff --git a/meteor/client/ui/Shelf/NextInfoPanel.tsx b/packages/webui/src/client/ui/Shelf/NextInfoPanel.tsx
similarity index 86%
rename from meteor/client/ui/Shelf/NextInfoPanel.tsx
rename to packages/webui/src/client/ui/Shelf/NextInfoPanel.tsx
index 6c83ce04a1..f614020cbf 100644
--- a/meteor/client/ui/Shelf/NextInfoPanel.tsx
+++ b/packages/webui/src/client/ui/Shelf/NextInfoPanel.tsx
@@ -5,14 +5,15 @@ import {
 	RundownLayoutBase,
 	DashboardLayoutNextInfo,
 	RundownLayoutNextInfo,
-} from '../../../lib/collections/RundownLayouts'
-import { RundownLayoutsAPI } from '../../../lib/api/rundownLayouts'
+} from '@sofie-automation/meteor-lib/dist/collections/RundownLayouts'
+import { RundownLayoutsAPI } from '../../lib/rundownLayouts'
 import { withTracker } from '../../lib/ReactMeteorData/ReactMeteorData'
 import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
-import { PartInstance } from '../../../lib/collections/PartInstances'
+import { PartInstance } from '@sofie-automation/meteor-lib/dist/collections/PartInstances'
 import { DBSegment } from '@sofie-automation/corelib/dist/dataModel/Segment'
 import { dashboardElementStyle } from './DashboardPanel'
-import { PartInstances, Segments } from '../../collections'
+import { Segments } from '../../collections'
+import { UIPartInstances } from '../Collections'
 
 interface INextInfoPanelProps {
 	visible?: boolean
@@ -64,7 +65,7 @@ export const NextInfoPanel = withTracker<INextInfoPanelProps, {}, INextInfoPanel
 		let nextSegment: DBSegment | undefined = undefined
 
 		if (props.playlist.nextPartInfo) {
-			nextPartInstance = PartInstances.findOne(props.playlist.nextPartInfo.partInstanceId)
+			nextPartInstance = UIPartInstances.findOne(props.playlist.nextPartInfo.partInstanceId)
 		}
 		if (nextPartInstance) {
 			nextSegment = Segments.findOne(nextPartInstance.segmentId)
diff --git a/meteor/client/ui/Shelf/OverflowingContainer.tsx b/packages/webui/src/client/ui/Shelf/OverflowingContainer.tsx
similarity index 100%
rename from meteor/client/ui/Shelf/OverflowingContainer.tsx
rename to packages/webui/src/client/ui/Shelf/OverflowingContainer.tsx
diff --git a/meteor/client/ui/Shelf/PartNamePanel.tsx b/packages/webui/src/client/ui/Shelf/PartNamePanel.tsx
similarity index 89%
rename from meteor/client/ui/Shelf/PartNamePanel.tsx
rename to packages/webui/src/client/ui/Shelf/PartNamePanel.tsx
index e2d93fbe6f..ab8af0d09c 100644
--- a/meteor/client/ui/Shelf/PartNamePanel.tsx
+++ b/packages/webui/src/client/ui/Shelf/PartNamePanel.tsx
@@ -5,17 +5,17 @@ import {
 	DashboardLayoutPartName,
 	RundownLayoutBase,
 	RundownLayoutPartName,
-} from '../../../lib/collections/RundownLayouts'
+} from '@sofie-automation/meteor-lib/dist/collections/RundownLayouts'
 import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
 import { dashboardElementStyle } from './DashboardPanel'
-import { RundownLayoutsAPI } from '../../../lib/api/rundownLayouts'
+import { RundownLayoutsAPI } from '../../lib/rundownLayouts'
 import { Translated, translateWithTracker } from '../../lib/ReactMeteorData/ReactMeteorData'
 import { findPieceInstanceToShowFromInstances, IFoundPieceInstance } from '../PieceIcons/utils'
 import { pieceIconSupportedLayers } from '../PieceIcons/PieceIcon'
 import { RundownUtils } from '../../lib/rundown'
-import { UIShowStyleBase } from '../../../lib/api/showStyles'
+import { UIShowStyleBase } from '@sofie-automation/meteor-lib/dist/api/showStyles'
 import { PieceInstances } from '../../collections'
-import { RundownPlaylistCollectionUtil } from '../../../lib/collections/rundownPlaylistUtil'
+import { RundownPlaylistClientUtil } from '../../lib/rundownPlaylistUtil'
 
 interface IPartNamePanelProps {
 	visible?: boolean
@@ -72,7 +72,7 @@ export const PartNamePanel = translateWithTracker<IPartNamePanelProps, IState, I
 		let instanceToShow: IFoundPieceInstance | undefined
 
 		if (selectedPartInstanceId) {
-			const selectedPartInstance = RundownPlaylistCollectionUtil.getActivePartInstances(props.playlist, {
+			const selectedPartInstance = RundownPlaylistClientUtil.getActivePartInstances(props.playlist, {
 				_id: selectedPartInstanceId,
 			})[0]
 			if (selectedPartInstance && props.panel.showPieceIconColor) {
diff --git a/meteor/client/ui/Shelf/PartTimingPanel.tsx b/packages/webui/src/client/ui/Shelf/PartTimingPanel.tsx
similarity index 80%
rename from meteor/client/ui/Shelf/PartTimingPanel.tsx
rename to packages/webui/src/client/ui/Shelf/PartTimingPanel.tsx
index 8cd75764fa..00e00ddb98 100644
--- a/meteor/client/ui/Shelf/PartTimingPanel.tsx
+++ b/packages/webui/src/client/ui/Shelf/PartTimingPanel.tsx
@@ -4,18 +4,18 @@ import {
 	DashboardLayoutPartCountDown,
 	RundownLayoutBase,
 	RundownLayoutPartTiming,
-} from '../../../lib/collections/RundownLayouts'
+} from '@sofie-automation/meteor-lib/dist/collections/RundownLayouts'
 import { Translated, translateWithTracker } from '../../lib/ReactMeteorData/ReactMeteorData'
 import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
-import { PartInstance } from '../../../lib/collections/PartInstances'
+import { PartInstance } from '@sofie-automation/meteor-lib/dist/collections/PartInstances'
 import { dashboardElementStyle } from './DashboardPanel'
-import { RundownLayoutsAPI } from '../../../lib/api/rundownLayouts'
+import { RundownLayoutsAPI } from '../../lib/rundownLayouts'
 import { getAllowSpeaking, getAllowVibrating } from '../../lib/localStorage'
-import { CurrentPartRemaining } from '../RundownView/RundownTiming/CurrentPartRemaining'
+import { CurrentPartOrSegmentRemaining } from '../RundownView/RundownTiming/CurrentPartOrSegmentRemaining'
 import { CurrentPartElapsed } from '../RundownView/RundownTiming/CurrentPartElapsed'
 import { getIsFilterActive } from '../../lib/rundownLayouts'
-import { UIShowStyleBase } from '../../../lib/api/showStyles'
-import { RundownPlaylistCollectionUtil } from '../../../lib/collections/rundownPlaylistUtil'
+import { UIShowStyleBase } from '@sofie-automation/meteor-lib/dist/api/showStyles'
+import { RundownPlaylistClientUtil } from '../../lib/rundownPlaylistUtil'
 
 interface IPartTimingPanelProps {
 	visible?: boolean
@@ -53,12 +53,13 @@ class PartTimingPanelInner extends React.Component<
 					)}
 					{this.props.active &&
 						(panel.timingType === 'count_down' ? (
-							<CurrentPartRemaining
+							<CurrentPartOrSegmentRemaining
 								currentPartInstanceId={this.props.playlist.currentPartInfo?.partInstanceId ?? null}
 								speaking={getAllowSpeaking() && panel.speakCountDown}
 								vibrating={getAllowVibrating() && panel.speakCountDown}
 								heavyClassName="overtime"
 								className="part-remaining"
+								preferSegmentTime={true}
 							/>
 						) : (
 							<CurrentPartElapsed currentPartId={this.props.livePart?.part._id} className="part-elapsed" />
@@ -72,7 +73,7 @@ class PartTimingPanelInner extends React.Component<
 export const PartTimingPanel = translateWithTracker<IPartTimingPanelProps, IState, IPartTimingPanelTrackedProps>(
 	(props: IPartTimingPanelProps) => {
 		if (props.playlist.currentPartInfo) {
-			const livePart = RundownPlaylistCollectionUtil.getActivePartInstances(props.playlist, {
+			const livePart = RundownPlaylistClientUtil.getActivePartInstances(props.playlist, {
 				_id: props.playlist.currentPartInfo.partInstanceId,
 			})[0]
 			const { active } = getIsFilterActive(props.playlist, props.showStyleBase, props.panel)
diff --git a/meteor/client/ui/Shelf/PieceCountdownPanel.tsx b/packages/webui/src/client/ui/Shelf/PieceCountdownPanel.tsx
similarity index 95%
rename from meteor/client/ui/Shelf/PieceCountdownPanel.tsx
rename to packages/webui/src/client/ui/Shelf/PieceCountdownPanel.tsx
index 952db419b8..1346552dda 100644
--- a/meteor/client/ui/Shelf/PieceCountdownPanel.tsx
+++ b/packages/webui/src/client/ui/Shelf/PieceCountdownPanel.tsx
@@ -5,8 +5,8 @@ import {
 	RundownLayoutBase,
 	RundownLayoutPieceCountdown,
 	DashboardLayoutPieceCountdown,
-} from '../../../lib/collections/RundownLayouts'
-import { RundownLayoutsAPI } from '../../../lib/api/rundownLayouts'
+} from '@sofie-automation/meteor-lib/dist/collections/RundownLayouts'
+import { RundownLayoutsAPI } from '../../lib/rundownLayouts'
 import { dashboardElementStyle } from './DashboardPanel'
 import { withTracker } from '../../lib/ReactMeteorData/ReactMeteorData'
 import { RundownUtils } from '../../lib/rundown'
@@ -15,7 +15,7 @@ import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/Rund
 import { PieceInstance } from '@sofie-automation/corelib/dist/dataModel/PieceInstance'
 import { VTContent } from '@sofie-automation/blueprints-integration'
 import { getUnfinishedPieceInstancesReactive } from '../../lib/rundownLayouts'
-import { UIShowStyleBase } from '../../../lib/api/showStyles'
+import { UIShowStyleBase } from '@sofie-automation/meteor-lib/dist/api/showStyles'
 import { ReadonlyDeep } from 'type-fest'
 interface IPieceCountdownPanelProps {
 	visible?: boolean
diff --git a/meteor/client/ui/Shelf/PlaylistEndTimerPanel.tsx b/packages/webui/src/client/ui/Shelf/PlaylistEndTimerPanel.tsx
similarity index 87%
rename from meteor/client/ui/Shelf/PlaylistEndTimerPanel.tsx
rename to packages/webui/src/client/ui/Shelf/PlaylistEndTimerPanel.tsx
index f1512f532d..1fa8d6c069 100644
--- a/meteor/client/ui/Shelf/PlaylistEndTimerPanel.tsx
+++ b/packages/webui/src/client/ui/Shelf/PlaylistEndTimerPanel.tsx
@@ -1,15 +1,15 @@
-import * as React from 'react'
 import ClassNames from 'classnames'
 import {
 	DashboardLayoutPlaylistEndTimer,
 	RundownLayoutBase,
 	RundownLayoutPlaylistEndTimer,
-} from '../../../lib/collections/RundownLayouts'
-import { RundownLayoutsAPI } from '../../../lib/api/rundownLayouts'
+} from '@sofie-automation/meteor-lib/dist/collections/RundownLayouts'
+import { RundownLayoutsAPI } from '../../lib/rundownLayouts'
 import { dashboardElementStyle } from './DashboardPanel'
 import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
 import { PlaylistEndTiming } from '../RundownView/RundownTiming/PlaylistEndTiming'
 import { PlaylistTiming } from '@sofie-automation/corelib/dist/playout/rundownTiming'
+import { isLoopRunning } from '../../lib/RundownResolver'
 
 interface IPlaylistEndTimerPanelProps {
 	visible?: boolean
@@ -31,7 +31,7 @@ export function PlaylistEndTimerPanel({ playlist, panel, layout }: Readonly<IPla
 		>
 			<PlaylistEndTiming
 				rundownPlaylist={playlist}
-				loop={playlist.loop}
+				loop={isLoopRunning(playlist)}
 				expectedStart={PlaylistTiming.getExpectedStart(playlist.timing)}
 				expectedEnd={PlaylistTiming.getExpectedEnd(playlist.timing)}
 				expectedDuration={PlaylistTiming.getExpectedDuration(playlist.timing)}
diff --git a/meteor/client/ui/Shelf/PlaylistNamePanel.tsx b/packages/webui/src/client/ui/Shelf/PlaylistNamePanel.tsx
similarity index 83%
rename from meteor/client/ui/Shelf/PlaylistNamePanel.tsx
rename to packages/webui/src/client/ui/Shelf/PlaylistNamePanel.tsx
index 293492afbc..d8be2534f7 100644
--- a/meteor/client/ui/Shelf/PlaylistNamePanel.tsx
+++ b/packages/webui/src/client/ui/Shelf/PlaylistNamePanel.tsx
@@ -4,16 +4,16 @@ import {
 	DashboardLayoutPlaylistName,
 	RundownLayoutBase,
 	RundownLayoutPlaylistName,
-} from '../../../lib/collections/RundownLayouts'
+} from '@sofie-automation/meteor-lib/dist/collections/RundownLayouts'
 import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
 import { dashboardElementStyle } from './DashboardPanel'
-import { RundownLayoutsAPI } from '../../../lib/api/rundownLayouts'
+import { RundownLayoutsAPI } from '../../lib/rundownLayouts'
 import { withTracker } from '../../lib/ReactMeteorData/ReactMeteorData'
 import { Rundown } from '@sofie-automation/corelib/dist/dataModel/Rundown'
 import { Rundowns } from '../../collections'
-import { PartInstance } from '../../../lib/collections/PartInstances'
-import { logger } from '../../../lib/logging'
-import { RundownPlaylistCollectionUtil } from '../../../lib/collections/rundownPlaylistUtil'
+import { PartInstance } from '@sofie-automation/meteor-lib/dist/collections/PartInstances'
+import { logger } from '../../lib/logging'
+import { RundownPlaylistClientUtil } from '../../lib/rundownPlaylistUtil'
 
 interface IPlaylistNamePanelProps {
 	visible?: boolean
@@ -55,7 +55,7 @@ class PlaylistNamePanelInner extends React.Component<IPlaylistNamePanelProps & I
 export const PlaylistNamePanel = withTracker<IPlaylistNamePanelProps, IState, IPlaylistNamePanelTrackedProps>(
 	(props: IPlaylistNamePanelProps) => {
 		if (props.playlist.currentPartInfo) {
-			const livePart: PartInstance = RundownPlaylistCollectionUtil.getActivePartInstances(props.playlist, {
+			const livePart: PartInstance = RundownPlaylistClientUtil.getActivePartInstances(props.playlist, {
 				_id: props.playlist.currentPartInfo.partInstanceId,
 			})[0]
 			if (!livePart) {
diff --git a/meteor/client/ui/Shelf/PlaylistStartTimerPanel.tsx b/packages/webui/src/client/ui/Shelf/PlaylistStartTimerPanel.tsx
similarity index 89%
rename from meteor/client/ui/Shelf/PlaylistStartTimerPanel.tsx
rename to packages/webui/src/client/ui/Shelf/PlaylistStartTimerPanel.tsx
index 935e38f476..109d0f0316 100644
--- a/meteor/client/ui/Shelf/PlaylistStartTimerPanel.tsx
+++ b/packages/webui/src/client/ui/Shelf/PlaylistStartTimerPanel.tsx
@@ -1,11 +1,10 @@
-import * as React from 'react'
 import ClassNames from 'classnames'
 import {
 	DashboardLayoutPlaylistStartTimer,
 	RundownLayoutBase,
 	RundownLayoutPlaylistStartTimer,
-} from '../../../lib/collections/RundownLayouts'
-import { RundownLayoutsAPI } from '../../../lib/api/rundownLayouts'
+} from '@sofie-automation/meteor-lib/dist/collections/RundownLayouts'
+import { RundownLayoutsAPI } from '../../lib/rundownLayouts'
 import { dashboardElementStyle } from './DashboardPanel'
 import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
 import { PlaylistStartTiming } from '../RundownView/RundownTiming/PlaylistStartTiming'
diff --git a/meteor/client/ui/Shelf/Renderers/DefaultListItemRenderer.tsx b/packages/webui/src/client/ui/Shelf/Renderers/DefaultListItemRenderer.tsx
similarity index 100%
rename from meteor/client/ui/Shelf/Renderers/DefaultListItemRenderer.tsx
rename to packages/webui/src/client/ui/Shelf/Renderers/DefaultListItemRenderer.tsx
diff --git a/meteor/client/ui/Shelf/Renderers/ItemRendererFactory.ts b/packages/webui/src/client/ui/Shelf/Renderers/ItemRendererFactory.ts
similarity index 85%
rename from meteor/client/ui/Shelf/Renderers/ItemRendererFactory.ts
rename to packages/webui/src/client/ui/Shelf/Renderers/ItemRendererFactory.ts
index 5de28c9c0b..2846dc2c85 100644
--- a/meteor/client/ui/Shelf/Renderers/ItemRendererFactory.ts
+++ b/packages/webui/src/client/ui/Shelf/Renderers/ItemRendererFactory.ts
@@ -5,12 +5,14 @@ import { DefaultListItemRenderer } from './DefaultListItemRenderer'
 import { VTListItemRenderer } from './VTListItemRenderer'
 import { L3rdListItemRenderer } from './L3rdListItemRenderer'
 import { PieceStatusCode } from '@sofie-automation/corelib/dist/dataModel/Piece'
-import { UIStudio } from '../../../../lib/api/studios'
+import { UIStudio } from '@sofie-automation/meteor-lib/dist/api/studios'
 import { ITranslatableMessage } from '@sofie-automation/corelib/dist/TranslatableMessage'
 import { ReadonlyDeep } from 'type-fest'
+import { PieceContentStatusObj } from '@sofie-automation/meteor-lib/dist/api/pieceContentStatus'
 
 export interface ILayerItemRendererProps {
 	adLibListItem: IAdLibListItem
+	contentStatus: ReadonlyDeep<PieceContentStatusObj> | undefined
 	selected: boolean
 	layer: ISourceLayer | undefined
 	outputLayer: IOutputLayer | undefined
diff --git a/meteor/client/ui/Shelf/Renderers/L3rdListItemRenderer.tsx b/packages/webui/src/client/ui/Shelf/Renderers/L3rdListItemRenderer.tsx
similarity index 98%
rename from meteor/client/ui/Shelf/Renderers/L3rdListItemRenderer.tsx
rename to packages/webui/src/client/ui/Shelf/Renderers/L3rdListItemRenderer.tsx
index 3bec99c87a..2b382de5ba 100644
--- a/meteor/client/ui/Shelf/Renderers/L3rdListItemRenderer.tsx
+++ b/packages/webui/src/client/ui/Shelf/Renderers/L3rdListItemRenderer.tsx
@@ -7,7 +7,7 @@ import { IBlueprintPieceType, NoraContent, PieceLifespan } from '@sofie-automati
 import { getElementDocumentOffset, OffsetPosition } from '../../../utils/positions'
 import { getElementWidth } from '../../../utils/dimensions'
 import { StyledTimecode } from '../../../lib/StyledTimecode'
-import { assertNever, protectString } from '../../../../lib/lib'
+import { assertNever, protectString } from '../../../lib/tempLib'
 import { L3rdFloatingInspector } from '../../FloatingInspectors/L3rdFloatingInspector'
 import { PieceInstancePiece } from '@sofie-automation/corelib/dist/dataModel/PieceInstance'
 import { AdLibPieceUi } from '../../../lib/shelf'
diff --git a/meteor/client/ui/Shelf/Renderers/VTListItemRenderer.tsx b/packages/webui/src/client/ui/Shelf/Renderers/VTListItemRenderer.tsx
similarity index 97%
rename from meteor/client/ui/Shelf/Renderers/VTListItemRenderer.tsx
rename to packages/webui/src/client/ui/Shelf/Renderers/VTListItemRenderer.tsx
index aa72988789..f3e71fe24d 100644
--- a/meteor/client/ui/Shelf/Renderers/VTListItemRenderer.tsx
+++ b/packages/webui/src/client/ui/Shelf/Renderers/VTListItemRenderer.tsx
@@ -4,7 +4,7 @@ import { RundownUtils } from '../../../lib/rundown'
 import { ILayerItemRendererProps } from './ItemRendererFactory'
 import { VTContent, LiveSpeakContent } from '@sofie-automation/blueprints-integration'
 import { VTFloatingInspector } from '../../FloatingInspectors/VTFloatingInspector'
-import { getNoticeLevelForPieceStatus } from '../../../../lib/notifications/notifications'
+import { getNoticeLevelForPieceStatus } from '../../../lib/notifications/notifications'
 import { getElementDocumentOffset, OffsetPosition } from '../../../utils/positions'
 import { getElementWidth } from '../../../utils/dimensions'
 import { StyledTimecode } from '../../../lib/StyledTimecode'
@@ -140,7 +140,7 @@ export const VTListItemRenderer: React.FunctionComponent<ILayerItemRendererProps
 					itemElement={itemIcon.current}
 					noticeMessages={props.messages || null}
 					noticeLevel={getNoticeLevelForPieceStatus(props.status ?? undefined)}
-					previewUrl={props.adLibListItem.contentStatus?.previewUrl}
+					previewUrl={props.contentStatus?.previewUrl}
 					studio={props.studio}
 				/>
 			</td>
diff --git a/meteor/client/ui/Shelf/RundownViewBuckets.tsx b/packages/webui/src/client/ui/Shelf/RundownViewBuckets.tsx
similarity index 90%
rename from meteor/client/ui/Shelf/RundownViewBuckets.tsx
rename to packages/webui/src/client/ui/Shelf/RundownViewBuckets.tsx
index aa36bf7a89..b688ef355b 100644
--- a/meteor/client/ui/Shelf/RundownViewBuckets.tsx
+++ b/packages/webui/src/client/ui/Shelf/RundownViewBuckets.tsx
@@ -1,17 +1,13 @@
 import * as React from 'react'
-import { Bucket } from '../../../lib/collections/Buckets'
-import { BucketAdLib } from '@sofie-automation/corelib/dist/dataModel/BucketAdLibPiece'
+import { Bucket } from '@sofie-automation/meteor-lib/dist/collections/Buckets'
 import { BucketPanel } from './BucketPanel'
-import { AdLibPiece } from '@sofie-automation/corelib/dist/dataModel/AdLibPiece'
-import { ISourceLayer, IOutputLayer } from '@sofie-automation/blueprints-integration'
-import { BucketAdLibAction } from '@sofie-automation/corelib/dist/dataModel/BucketAdLibAction'
-import { doUserAction, UserAction } from '../../../lib/clientUserAction'
-import { ClientAPI } from '../../../lib/api/client'
+import { doUserAction, UserAction } from '../../lib/clientUserAction'
+import { ClientAPI } from '@sofie-automation/meteor-lib/dist/api/client'
 
 import { withTranslation } from 'react-i18next'
 import { faBars } from '@fortawesome/free-solid-svg-icons'
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
-import { unprotectString, partial, literal, ProtectedString } from '../../../lib/lib'
+import { unprotectString, literal, ProtectedString } from '../../lib/tempLib'
 import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
 import { getElementDocumentOffset } from '../../utils/positions'
 import { UIStateStorage } from '../../lib/UIStateStorage'
@@ -19,7 +15,7 @@ import { doModalDialog, ModalDialogQueueItem } from '../../lib/ModalDialog'
 import { ContextMenuTrigger } from '@jstarpl/react-contextmenu'
 import { Translated } from '../../lib/ReactMeteorData/ReactMeteorData'
 
-import { MeteorCall } from '../../../lib/api/methods'
+import { MeteorCall } from '../../lib/meteorApi'
 import update from 'immutability-helper'
 
 import { contextMenuHoldToDisplayTime } from '../../lib/lib'
@@ -32,35 +28,17 @@ import RundownViewEventBus, {
 	BucketAdLibEvent,
 	BucketEvent,
 	IEventContext,
-} from '../../../lib/api/triggers/RundownViewEventBus'
-import { PieceStatusCode } from '@sofie-automation/corelib/dist/dataModel/Piece'
-import { UIShowStyleBase } from '../../../lib/api/showStyles'
-import { BucketId, ShowStyleBaseId, ShowStyleVariantId, StudioId } from '@sofie-automation/corelib/dist/dataModel/Ids'
-import { DashboardLayoutExternalFrame } from '../../../lib/collections/RundownLayouts'
-
-export interface BucketAdLibUi extends BucketAdLib {
-	sourceLayer?: ISourceLayer
-	outputLayer?: IOutputLayer
-	status: PieceStatusCode
-}
-
-export interface BucketAdLibActionUi extends Omit<AdLibPiece, 'timelineObjectsString'> {
-	bucketId: BucketId
-	sourceLayer?: ISourceLayer
-	outputLayer?: IOutputLayer
-	isGlobal?: boolean
-	isHidden?: boolean
-	isSticky?: boolean
-	isAction: true
-	isClearSourceLayer?: boolean
-	adlibAction: BucketAdLibAction
-	message?: string | null
-	showStyleBaseId: ShowStyleBaseId
-	showStyleVariantId: ShowStyleVariantId | null
-	studioId: StudioId
-}
-
-export type BucketAdLibItem = BucketAdLibUi | BucketAdLibActionUi
+} from '@sofie-automation/meteor-lib/dist/triggers/RundownViewEventBus'
+import { UIShowStyleBase } from '@sofie-automation/meteor-lib/dist/api/showStyles'
+import { BucketId } from '@sofie-automation/corelib/dist/dataModel/Ids'
+import { DashboardLayoutExternalFrame } from '@sofie-automation/meteor-lib/dist/collections/RundownLayouts'
+import { BucketAdLibItem, BucketAdLibUi, BucketAdLibActionUi } from '@sofie-automation/meteor-lib/dist/uiTypes/Bucket'
+
+export type {
+	BucketAdLibItem,
+	BucketAdLibUi,
+	BucketAdLibActionUi,
+} from '@sofie-automation/meteor-lib/dist/uiTypes/Bucket'
 
 export function isAdLibAction(item: BucketAdLibItem): item is BucketAdLibActionUi {
 	if ('adlibAction' in item && item['adlibAction']) {
@@ -373,12 +351,13 @@ export const RundownViewBuckets = withTranslation()(
 							}
 						}
 
-						if (isAdLibAction(bucketAdLib)) {
+						if ('adlibAction' in bucketAdLib && bucketAdLib.adlibAction) {
+							const id = bucketAdLib.adlibAction._id
 							doUserAction(
 								t,
 								e.context,
 								UserAction.REMOVE_BUCKET_ADLIB,
-								(e, ts) => MeteorCall.userAction.bucketsRemoveBucketAdLibAction(e, ts, bucketAdLib.adlibAction._id),
+								(e, ts) => MeteorCall.userAction.bucketsRemoveBucketAdLibAction(e, ts, id),
 								clb
 							)
 						} else {
@@ -451,7 +430,7 @@ export const RundownViewBuckets = withTranslation()(
 					e,
 					ts,
 					bucket._id,
-					partial<Bucket>({
+					literal<Partial<Bucket>>({
 						name: newName,
 					})
 				)
@@ -513,7 +492,7 @@ export const RundownViewBuckets = withTranslation()(
 							e,
 							ts,
 							draggedB._id,
-							partial<Bucket>({
+							literal<Partial<Bucket>>({
 								_rank: newRank,
 							})
 						)
diff --git a/meteor/client/ui/Shelf/SegmentNamePanel.tsx b/packages/webui/src/client/ui/Shelf/SegmentNamePanel.tsx
similarity index 79%
rename from meteor/client/ui/Shelf/SegmentNamePanel.tsx
rename to packages/webui/src/client/ui/Shelf/SegmentNamePanel.tsx
index 999dd8ed17..cd3478378c 100644
--- a/meteor/client/ui/Shelf/SegmentNamePanel.tsx
+++ b/packages/webui/src/client/ui/Shelf/SegmentNamePanel.tsx
@@ -4,14 +4,14 @@ import {
 	DashboardLayoutSegmentName,
 	RundownLayoutBase,
 	RundownLayoutSegmentName,
-} from '../../../lib/collections/RundownLayouts'
+} from '@sofie-automation/meteor-lib/dist/collections/RundownLayouts'
 import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
 import { dashboardElementStyle } from './DashboardPanel'
-import { RundownLayoutsAPI } from '../../../lib/api/rundownLayouts'
+import { RundownLayoutsAPI } from '../../lib/rundownLayouts'
 import { Translated, translateWithTracker } from '../../lib/ReactMeteorData/ReactMeteorData'
 import { DBSegment } from '@sofie-automation/corelib/dist/dataModel/Segment'
-import { PartInstance } from '../../../lib/collections/PartInstances'
-import { RundownPlaylistCollectionUtil } from '../../../lib/collections/rundownPlaylistUtil'
+import { PartInstance } from '@sofie-automation/meteor-lib/dist/collections/PartInstances'
+import { RundownPlaylistClientUtil } from '../../lib/rundownPlaylistUtil'
 
 interface ISegmentNamePanelProps {
 	visible?: boolean
@@ -55,7 +55,7 @@ class SegmentNamePanelInner extends React.Component<
 
 function getSegmentName(selectedSegment: 'current' | 'next', playlist: DBRundownPlaylist): string | undefined {
 	const currentPartInstance = playlist.currentPartInfo
-		? (RundownPlaylistCollectionUtil.getActivePartInstances(playlist, {
+		? (RundownPlaylistClientUtil.getActivePartInstances(playlist, {
 				_id: playlist.currentPartInfo.partInstanceId,
 		  })[0] as PartInstance | undefined)
 		: undefined
@@ -64,18 +64,18 @@ function getSegmentName(selectedSegment: 'current' | 'next', playlist: DBRundown
 
 	if (selectedSegment === 'current') {
 		if (currentPartInstance) {
-			const segment = RundownPlaylistCollectionUtil.getSegments(playlist, { _id: currentPartInstance.segmentId })[0] as
+			const segment = RundownPlaylistClientUtil.getSegments(playlist, { _id: currentPartInstance.segmentId })[0] as
 				| DBSegment
 				| undefined
 			return segment?.name
 		}
 	} else {
 		if (playlist.nextPartInfo) {
-			const nextPartInstance = RundownPlaylistCollectionUtil.getActivePartInstances(playlist, {
+			const nextPartInstance = RundownPlaylistClientUtil.getActivePartInstances(playlist, {
 				_id: playlist.nextPartInfo.partInstanceId,
 			})[0] as PartInstance | undefined
 			if (nextPartInstance && nextPartInstance.segmentId !== currentPartInstance.segmentId) {
-				const segment = RundownPlaylistCollectionUtil.getSegments(playlist, { _id: nextPartInstance.segmentId })[0] as
+				const segment = RundownPlaylistClientUtil.getSegments(playlist, { _id: nextPartInstance.segmentId })[0] as
 					| DBSegment
 					| undefined
 				return segment?.name
@@ -84,7 +84,7 @@ function getSegmentName(selectedSegment: 'current' | 'next', playlist: DBRundown
 
 		// Current and next part are same segment, or next is not set
 		// Find next segment in order
-		const orderedSegmentsAndParts = RundownPlaylistCollectionUtil.getSegmentsAndPartsSync(playlist)
+		const orderedSegmentsAndParts = RundownPlaylistClientUtil.getSegmentsAndPartsSync(playlist)
 		const segmentIndex = orderedSegmentsAndParts.segments.findIndex((s) => s._id === currentPartInstance.segmentId)
 		if (segmentIndex === -1) return
 
diff --git a/meteor/client/ui/Shelf/SegmentTimingPanel.tsx b/packages/webui/src/client/ui/Shelf/SegmentTimingPanel.tsx
similarity index 81%
rename from meteor/client/ui/Shelf/SegmentTimingPanel.tsx
rename to packages/webui/src/client/ui/Shelf/SegmentTimingPanel.tsx
index 1bf18c5bff..898bd6ffb3 100644
--- a/meteor/client/ui/Shelf/SegmentTimingPanel.tsx
+++ b/packages/webui/src/client/ui/Shelf/SegmentTimingPanel.tsx
@@ -5,23 +5,24 @@ import {
 	DashboardLayoutSegmentCountDown,
 	RundownLayoutBase,
 	RundownLayoutSegmentTiming,
-} from '../../../lib/collections/RundownLayouts'
+} from '@sofie-automation/meteor-lib/dist/collections/RundownLayouts'
 import { Translated, translateWithTracker } from '../../lib/ReactMeteorData/ReactMeteorData'
 import { RundownUtils } from '../../lib/rundown'
 import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
 import { DBSegment } from '@sofie-automation/corelib/dist/dataModel/Segment'
 import { SegmentDuration } from '../RundownView/RundownTiming/SegmentDuration'
-import { PartExtended } from '../../../lib/Rundown'
-import { memoizedIsolatedAutorun } from '../../../lib/memoizedIsolatedAutorun'
+import { PartExtended } from '../../lib/RundownResolver'
+import { memoizedIsolatedAutorun } from '../../lib/memoizedIsolatedAutorun'
 import { slowDownReactivity } from '../../lib/reactiveData/reactiveDataHelper'
 import { DBPart } from '@sofie-automation/corelib/dist/dataModel/Part'
-import { PartInstance } from '../../../lib/collections/PartInstances'
+import { PartInstance } from '@sofie-automation/meteor-lib/dist/collections/PartInstances'
 import { dashboardElementStyle } from './DashboardPanel'
-import { RundownLayoutsAPI } from '../../../lib/api/rundownLayouts'
+import { RundownLayoutsAPI } from '../../lib/rundownLayouts'
 import { getIsFilterActive } from '../../lib/rundownLayouts'
-import { UIShowStyleBase } from '../../../lib/api/showStyles'
+import { UIShowStyleBase } from '@sofie-automation/meteor-lib/dist/api/showStyles'
 import { PartId, RundownPlaylistId } from '@sofie-automation/corelib/dist/dataModel/Ids'
-import { RundownPlaylistCollectionUtil } from '../../../lib/collections/rundownPlaylistUtil'
+import { RundownPlaylistCollectionUtil } from '../../collections/rundownPlaylistUtil'
+import { RundownPlaylistClientUtil } from '../../lib/rundownPlaylistUtil'
 
 interface ISegmentTimingPanelProps {
 	visible?: boolean
@@ -63,7 +64,7 @@ class SegmentTimingPanelInner extends React.Component<
 					)}
 					{this.props.active && this.props.liveSegment && this.props.parts && (
 						<SegmentDuration
-							segmentId={this.props.liveSegment._id}
+							segment={this.props.liveSegment}
 							parts={this.props.parts}
 							countUp={panel.timingType === 'count_up'}
 							className="segment-duration"
@@ -82,11 +83,11 @@ export const SegmentTimingPanel = translateWithTracker<
 >(
 	(props: ISegmentTimingPanelProps) => {
 		if (props.playlist.currentPartInfo) {
-			const livePart = RundownPlaylistCollectionUtil.getActivePartInstances(props.playlist, {
+			const livePart = RundownPlaylistClientUtil.getActivePartInstances(props.playlist, {
 				_id: props.playlist.currentPartInfo.partInstanceId,
 			})[0]
 			const liveSegment = livePart
-				? RundownPlaylistCollectionUtil.getSegments(props.playlist, { _id: livePart.segmentId })[0]
+				? RundownPlaylistClientUtil.getSegments(props.playlist, { _id: livePart.segmentId })[0]
 				: undefined
 
 			const { active } = getIsFilterActive(props.playlist, props.showStyleBase, props.panel)
@@ -99,22 +100,16 @@ export const SegmentTimingPanel = translateWithTracker<
 						memoizedIsolatedAutorun(
 							(_playlistId: RundownPlaylistId) =>
 								(
-									RundownPlaylistCollectionUtil.getSegmentsAndPartsSync(
-										props.playlist,
-										undefined,
-										undefined,
-										undefined,
-										{
-											fields: { _id: 1 },
-										}
-									).parts as Pick<DBPart, '_id'>[]
+									RundownPlaylistClientUtil.getSegmentsAndPartsSync(props.playlist, undefined, undefined, undefined, {
+										fields: { _id: 1 },
+									}).parts as Pick<DBPart, '_id'>[]
 								).map((part) => part._id),
 							'playlist.getAllOrderedParts',
 							props.playlist._id
 						),
 						memoizedIsolatedAutorun(
 							(_playlistId: RundownPlaylistId, _currentPartInstanceId, _nextPartInstanceId) =>
-								RundownPlaylistCollectionUtil.getSelectedPartInstances(props.playlist),
+								RundownPlaylistClientUtil.getSelectedPartInstances(props.playlist),
 							'playlist.getSelectedPartInstances',
 							props.playlist._id,
 							props.playlist.currentPartInfo?.partInstanceId,
@@ -130,7 +125,7 @@ export const SegmentTimingPanel = translateWithTracker<
 				props.playlist.activationId === undefined ? 0 : Math.random() * 2000 + 500
 			)
 
-			const orderedSegmentsAndParts = RundownPlaylistCollectionUtil.getSegmentsAndPartsSync(props.playlist)
+			const orderedSegmentsAndParts = RundownPlaylistClientUtil.getSegmentsAndPartsSync(props.playlist)
 			const rundownOrder = RundownPlaylistCollectionUtil.getRundownOrderedIDs(props.playlist)
 			const rundownIndex = rundownOrder.indexOf(liveSegment.rundownId)
 			const rundowns = RundownPlaylistCollectionUtil.getRundownsOrdered(props.playlist)
diff --git a/meteor/client/ui/Shelf/Shelf.tsx b/packages/webui/src/client/ui/Shelf/Shelf.tsx
similarity index 95%
rename from meteor/client/ui/Shelf/Shelf.tsx
rename to packages/webui/src/client/ui/Shelf/Shelf.tsx
index 5a2e084171..e342d2c315 100644
--- a/meteor/client/ui/Shelf/Shelf.tsx
+++ b/packages/webui/src/client/ui/Shelf/Shelf.tsx
@@ -15,14 +15,14 @@ import {
 	RundownLayoutElementType,
 	RundownLayoutFilter,
 	RundownLayoutShelfBase,
-} from '../../../lib/collections/RundownLayouts'
+} from '@sofie-automation/meteor-lib/dist/collections/RundownLayouts'
 import { UIStateStorage } from '../../lib/UIStateStorage'
-import { RundownLayoutsAPI } from '../../../lib/api/rundownLayouts'
+import { RundownLayoutsAPI } from '../../lib/rundownLayouts'
 import { contextMenuHoldToDisplayTime } from '../../lib/lib'
 import { ErrorBoundary } from '../../lib/ErrorBoundary'
 import { ShelfRundownLayout } from './ShelfRundownLayout'
 import { ShelfDashboardLayout } from './ShelfDashboardLayout'
-import { Bucket } from '../../../lib/collections/Buckets'
+import { Bucket } from '@sofie-automation/meteor-lib/dist/collections/Buckets'
 import { RundownViewBuckets, BucketAdLibItem } from './RundownViewBuckets'
 import { ContextMenuTrigger } from '@jstarpl/react-contextmenu'
 import { ShelfInspector } from './Inspector/ShelfInspector'
@@ -32,23 +32,21 @@ import RundownViewEventBus, {
 	SelectPieceEvent,
 	ShelfStateEvent,
 	SwitchToShelfTabEvent,
-} from '../../../lib/api/triggers/RundownViewEventBus'
+} from '@sofie-automation/meteor-lib/dist/triggers/RundownViewEventBus'
 import { IAdLibListItem } from './AdLibListItem'
 import ShelfContextMenu from './ShelfContextMenu'
-import { doUserAction, UserAction } from '../../../lib/clientUserAction'
-import { MeteorCall } from '../../../lib/api/methods'
+import { doUserAction, UserAction } from '../../lib/clientUserAction'
+import { MeteorCall } from '../../lib/meteorApi'
 import { Rundown } from '@sofie-automation/corelib/dist/dataModel/Rundown'
 import { DBShowStyleVariant } from '@sofie-automation/corelib/dist/dataModel/ShowStyleVariant'
 import { ShelfDisplayOptions } from '../../lib/shelf'
-import { UIShowStyleBase } from '../../../lib/api/showStyles'
-import { UIStudio } from '../../../lib/api/studios'
-
-export enum ShelfTabs {
-	ADLIB = 'adlib',
-	ADLIB_LAYOUT_FILTER = 'adlib_layout_filter',
-	GLOBAL_ADLIB = 'global_adlib',
-	SYSTEM_HOTKEYS = 'system_hotkeys',
-}
+import { UIShowStyleBase } from '@sofie-automation/meteor-lib/dist/api/showStyles'
+import { UIStudio } from '@sofie-automation/meteor-lib/dist/api/studios'
+
+import { ShelfTabs } from '@sofie-automation/meteor-lib/dist/uiTypes/ShelfTabs'
+
+export { ShelfTabs } from '@sofie-automation/meteor-lib/dist/uiTypes/ShelfTabs'
+
 export interface IShelfProps extends React.ComponentPropsWithRef<any> {
 	isExpanded: boolean
 	buckets: Array<Bucket>
diff --git a/meteor/client/ui/Shelf/ShelfContextMenu.tsx b/packages/webui/src/client/ui/Shelf/ShelfContextMenu.tsx
similarity index 97%
rename from meteor/client/ui/Shelf/ShelfContextMenu.tsx
rename to packages/webui/src/client/ui/Shelf/ShelfContextMenu.tsx
index cfa552ad84..f9039c0eab 100644
--- a/meteor/client/ui/Shelf/ShelfContextMenu.tsx
+++ b/packages/webui/src/client/ui/Shelf/ShelfContextMenu.tsx
@@ -4,9 +4,9 @@ import { useTracker } from '../../lib/ReactMeteorData/ReactMeteorData'
 import Escape from './../../lib/Escape'
 import { ContextMenu, MenuItem } from '@jstarpl/react-contextmenu'
 import { ReactiveVar } from 'meteor/reactive-var'
-import { Bucket } from '../../../lib/collections/Buckets'
+import { Bucket } from '@sofie-automation/meteor-lib/dist/collections/Buckets'
 import { BucketAdLibItem, BucketAdLibActionUi } from './RundownViewBuckets'
-import RundownViewEventBus, { RundownViewEvents } from '../../../lib/api/triggers/RundownViewEventBus'
+import RundownViewEventBus, { RundownViewEvents } from '@sofie-automation/meteor-lib/dist/triggers/RundownViewEventBus'
 import { IAdLibListItem } from './AdLibListItem'
 import { isActionItem } from './Inspector/ItemRenderers/ActionItemRenderer'
 import { AdLibPieceUi, ShelfDisplayOptions } from '../../lib/shelf'
diff --git a/meteor/client/ui/Shelf/ShelfDashboardLayout.tsx b/packages/webui/src/client/ui/Shelf/ShelfDashboardLayout.tsx
similarity index 96%
rename from meteor/client/ui/Shelf/ShelfDashboardLayout.tsx
rename to packages/webui/src/client/ui/Shelf/ShelfDashboardLayout.tsx
index 0d562644c4..1667b9a4e6 100644
--- a/meteor/client/ui/Shelf/ShelfDashboardLayout.tsx
+++ b/packages/webui/src/client/ui/Shelf/ShelfDashboardLayout.tsx
@@ -1,6 +1,5 @@
-import * as React from 'react'
-import { DashboardLayout, DashboardLayoutFilter } from '../../../lib/collections/RundownLayouts'
-import { RundownLayoutsAPI } from '../../../lib/api/rundownLayouts'
+import { DashboardLayout, DashboardLayoutFilter } from '@sofie-automation/meteor-lib/dist/collections/RundownLayouts'
+import { RundownLayoutsAPI } from '../../lib/rundownLayouts'
 import { TimelineDashboardPanel } from './TimelineDashboardPanel'
 import { DashboardPanel } from './DashboardPanel'
 import { ExternalFramePanel } from './ExternalFramePanel'
@@ -29,8 +28,8 @@ import { StudioNamePanel } from './StudioNamePanel'
 import { SegmentNamePanel } from './SegmentNamePanel'
 import { PartNamePanel } from './PartNamePanel'
 import { ColoredBoxPanel } from './ColoredBoxPanel'
-import { UIShowStyleBase } from '../../../lib/api/showStyles'
-import { UIStudio } from '../../../lib/api/studios'
+import { UIShowStyleBase } from '@sofie-automation/meteor-lib/dist/api/showStyles'
+import { UIStudio } from '@sofie-automation/meteor-lib/dist/api/studios'
 
 export interface IShelfDashboardLayoutProps {
 	rundownLayout: DashboardLayout
diff --git a/meteor/client/ui/Shelf/ShelfRundownLayout.tsx b/packages/webui/src/client/ui/Shelf/ShelfRundownLayout.tsx
similarity index 94%
rename from meteor/client/ui/Shelf/ShelfRundownLayout.tsx
rename to packages/webui/src/client/ui/Shelf/ShelfRundownLayout.tsx
index 83128c4ea1..0b7ef79868 100644
--- a/meteor/client/ui/Shelf/ShelfRundownLayout.tsx
+++ b/packages/webui/src/client/ui/Shelf/ShelfRundownLayout.tsx
@@ -1,6 +1,5 @@
-import * as React from 'react'
-import { RundownLayout } from '../../../lib/collections/RundownLayouts'
-import { RundownLayoutsAPI } from '../../../lib/api/rundownLayouts'
+import { RundownLayout } from '@sofie-automation/meteor-lib/dist/collections/RundownLayouts'
+import { RundownLayoutsAPI } from '../../lib/rundownLayouts'
 import { ExternalFramePanel } from './ExternalFramePanel'
 import { OverflowingContainer } from './OverflowingContainer'
 import ClassNames from 'classnames'
@@ -14,8 +13,8 @@ import { PieceUi } from '../SegmentTimeline/SegmentTimelineContainer'
 import { useTranslation } from 'react-i18next'
 import { BucketAdLibItem } from './RundownViewBuckets'
 import { IAdLibListItem } from './AdLibListItem'
-import { UIShowStyleBase } from '../../../lib/api/showStyles'
-import { UIStudio } from '../../../lib/api/studios'
+import { UIShowStyleBase } from '@sofie-automation/meteor-lib/dist/api/showStyles'
+import { UIStudio } from '@sofie-automation/meteor-lib/dist/api/studios'
 
 export interface IShelfRundownLayoutProps {
 	rundownLayout: RundownLayout | undefined
diff --git a/meteor/client/ui/Shelf/ShowStylePanel.tsx b/packages/webui/src/client/ui/Shelf/ShowStylePanel.tsx
similarity index 87%
rename from meteor/client/ui/Shelf/ShowStylePanel.tsx
rename to packages/webui/src/client/ui/Shelf/ShowStylePanel.tsx
index b72a7ccd20..7941afe8e2 100644
--- a/meteor/client/ui/Shelf/ShowStylePanel.tsx
+++ b/packages/webui/src/client/ui/Shelf/ShowStylePanel.tsx
@@ -1,15 +1,14 @@
-import * as React from 'react'
 import {
 	DashboardLayoutShowStyleDisplay,
 	RundownLayoutBase,
 	RundownLayoutShowStyleDisplay,
-} from '../../../lib/collections/RundownLayouts'
+} from '@sofie-automation/meteor-lib/dist/collections/RundownLayouts'
 import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
 import { dashboardElementStyle } from './DashboardPanel'
-import { RundownLayoutsAPI } from '../../../lib/api/rundownLayouts'
+import { RundownLayoutsAPI } from '../../lib/rundownLayouts'
 import { DBShowStyleVariant } from '@sofie-automation/corelib/dist/dataModel/ShowStyleVariant'
 import { useTranslation } from 'react-i18next'
-import { UIShowStyleBase } from '../../../lib/api/showStyles'
+import { UIShowStyleBase } from '@sofie-automation/meteor-lib/dist/api/showStyles'
 
 interface IShowStylePanelProps {
 	visible?: boolean
diff --git a/meteor/client/ui/Shelf/StudioNamePanel.tsx b/packages/webui/src/client/ui/Shelf/StudioNamePanel.tsx
similarity index 82%
rename from meteor/client/ui/Shelf/StudioNamePanel.tsx
rename to packages/webui/src/client/ui/Shelf/StudioNamePanel.tsx
index 1ab8f892d1..4ababb2864 100644
--- a/meteor/client/ui/Shelf/StudioNamePanel.tsx
+++ b/packages/webui/src/client/ui/Shelf/StudioNamePanel.tsx
@@ -1,14 +1,13 @@
-import * as React from 'react'
 import ClassNames from 'classnames'
 import {
 	DashboardLayoutStudioName,
 	RundownLayoutBase,
 	RundownLayoutStudioName,
-} from '../../../lib/collections/RundownLayouts'
+} from '@sofie-automation/meteor-lib/dist/collections/RundownLayouts'
 import { dashboardElementStyle } from './DashboardPanel'
-import { RundownLayoutsAPI } from '../../../lib/api/rundownLayouts'
+import { RundownLayoutsAPI } from '../../lib/rundownLayouts'
 import { useTranslation } from 'react-i18next'
-import { UIStudio } from '../../../lib/api/studios'
+import { UIStudio } from '@sofie-automation/meteor-lib/dist/api/studios'
 
 interface IStudioNamePanelProps {
 	layout: RundownLayoutBase
diff --git a/meteor/client/ui/Shelf/SystemStatusPanel.tsx b/packages/webui/src/client/ui/Shelf/SystemStatusPanel.tsx
similarity index 90%
rename from meteor/client/ui/Shelf/SystemStatusPanel.tsx
rename to packages/webui/src/client/ui/Shelf/SystemStatusPanel.tsx
index 577f10cfee..9662e73d19 100644
--- a/meteor/client/ui/Shelf/SystemStatusPanel.tsx
+++ b/packages/webui/src/client/ui/Shelf/SystemStatusPanel.tsx
@@ -1,18 +1,17 @@
-import * as React from 'react'
 import ClassNames from 'classnames'
 import {
 	DashboardLayoutSystemStatus,
 	RundownLayoutBase,
 	RundownLayoutSytemStatus,
-} from '../../../lib/collections/RundownLayouts'
+} from '@sofie-automation/meteor-lib/dist/collections/RundownLayouts'
 import { useTracker } from '../../lib/ReactMeteorData/ReactMeteorData'
 import { dashboardElementStyle } from './DashboardPanel'
-import { RundownLayoutsAPI } from '../../../lib/api/rundownLayouts'
+import { RundownLayoutsAPI } from '../../lib/rundownLayouts'
 import { RundownSystemStatus } from '../RundownView/RundownSystemStatus'
 import { DBRundown } from '@sofie-automation/corelib/dist/dataModel/Rundown'
 import { RundownId, RundownPlaylistId, StudioId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import { RundownPlaylists, Rundowns } from '../../collections'
-import { RundownPlaylistCollectionUtil } from '../../../lib/collections/rundownPlaylistUtil'
+import { RundownPlaylistCollectionUtil } from '../../collections/rundownPlaylistUtil'
 import { useTranslation } from 'react-i18next'
 import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
 
diff --git a/meteor/client/ui/Shelf/TextLabelPanel.tsx b/packages/webui/src/client/ui/Shelf/TextLabelPanel.tsx
similarity index 86%
rename from meteor/client/ui/Shelf/TextLabelPanel.tsx
rename to packages/webui/src/client/ui/Shelf/TextLabelPanel.tsx
index c212fe468b..ef4c64b58d 100644
--- a/meteor/client/ui/Shelf/TextLabelPanel.tsx
+++ b/packages/webui/src/client/ui/Shelf/TextLabelPanel.tsx
@@ -1,13 +1,12 @@
-import * as React from 'react'
 import ClassNames from 'classnames'
 import {
 	DashboardLayoutTextLabel,
 	RundownLayoutBase,
 	RundownLayoutTextLabel,
-} from '../../../lib/collections/RundownLayouts'
+} from '@sofie-automation/meteor-lib/dist/collections/RundownLayouts'
 import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
 import { dashboardElementStyle } from './DashboardPanel'
-import { RundownLayoutsAPI } from '../../../lib/api/rundownLayouts'
+import { RundownLayoutsAPI } from '../../lib/rundownLayouts'
 
 interface ITextLabelPanelProps {
 	visible?: boolean
diff --git a/meteor/client/ui/Shelf/TimeOfDayPanel.tsx b/packages/webui/src/client/ui/Shelf/TimeOfDayPanel.tsx
similarity index 87%
rename from meteor/client/ui/Shelf/TimeOfDayPanel.tsx
rename to packages/webui/src/client/ui/Shelf/TimeOfDayPanel.tsx
index 27b0f85163..feeed3d27a 100644
--- a/meteor/client/ui/Shelf/TimeOfDayPanel.tsx
+++ b/packages/webui/src/client/ui/Shelf/TimeOfDayPanel.tsx
@@ -1,12 +1,11 @@
-import * as React from 'react'
 import {
 	DashboardLayoutTimeOfDay,
 	RundownLayoutBase,
 	RundownLayoutTimeOfDay,
-} from '../../../lib/collections/RundownLayouts'
+} from '@sofie-automation/meteor-lib/dist/collections/RundownLayouts'
 import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
 import { dashboardElementStyle } from './DashboardPanel'
-import { RundownLayoutsAPI } from '../../../lib/api/rundownLayouts'
+import { RundownLayoutsAPI } from '../../lib/rundownLayouts'
 import { useTranslation } from 'react-i18next'
 import { TimeOfDay } from '../RundownView/RundownTiming/TimeOfDay'
 
diff --git a/meteor/client/ui/Shelf/TimelineDashboardPanel.tsx b/packages/webui/src/client/ui/Shelf/TimelineDashboardPanel.tsx
similarity index 97%
rename from meteor/client/ui/Shelf/TimelineDashboardPanel.tsx
rename to packages/webui/src/client/ui/Shelf/TimelineDashboardPanel.tsx
index d4441b29a9..79512a894d 100644
--- a/meteor/client/ui/Shelf/TimelineDashboardPanel.tsx
+++ b/packages/webui/src/client/ui/Shelf/TimelineDashboardPanel.tsx
@@ -3,7 +3,7 @@ import * as _ from 'underscore'
 import { Translated } from '../../lib/ReactMeteorData/react-meteor-data'
 import ClassNames from 'classnames'
 import { Spinner } from '../../lib/Spinner'
-import { DashboardLayoutFilter, PieceDisplayStyle } from '../../../lib/collections/RundownLayouts'
+import { DashboardLayoutFilter, PieceDisplayStyle } from '@sofie-automation/meteor-lib/dist/collections/RundownLayouts'
 import { IAdLibPanelProps, AdLibFetchAndFilterProps } from './AdLibPanel'
 import { AdLibPanelToolbar } from './AdLibPanelToolbar'
 import { matchFilter } from './AdLibListView'
@@ -17,7 +17,7 @@ import {
 	DashboardPanelInnerProps,
 	useDashboardPanelTrackedProps,
 } from './DashboardPanel'
-import { unprotectString } from '../../../lib/lib'
+import { unprotectString } from '../../lib/tempLib'
 import { RundownUtils } from '../../lib/rundown'
 import { AdLibPieceUi } from '../../lib/shelf'
 import { ContextMenuTrigger } from '@jstarpl/react-contextmenu'
@@ -32,7 +32,7 @@ export const TimelineDashboardPanel = React.memo(
 		return <TimelineDashboardPanelContent {...props} {...trackedProps} studio={trackedProps.studio} />
 	},
 	(props: IAdLibPanelProps, nextProps: IAdLibPanelProps) => {
-		return !_.isEqual(props, nextProps)
+		return _.isEqual(props, nextProps)
 	}
 )
 
diff --git a/meteor/client/ui/Status.tsx b/packages/webui/src/client/ui/Status.tsx
similarity index 95%
rename from meteor/client/ui/Status.tsx
rename to packages/webui/src/client/ui/Status.tsx
index ab58ff2c56..1352a093cf 100644
--- a/meteor/client/ui/Status.tsx
+++ b/packages/webui/src/client/ui/Status.tsx
@@ -1,13 +1,12 @@
-import * as React from 'react'
 import { useSubscription } from '../lib/ReactMeteorData/react-meteor-data'
 import { useTranslation } from 'react-i18next'
 import { Route, Switch, Redirect, NavLink } from 'react-router-dom'
-import SystemStatus from './Status/SystemStatus'
+import { SystemStatus } from './Status/SystemStatus/SystemStatus'
 import { MediaManagerStatus } from './Status/MediaManager'
 import { ExternalMessages } from './Status/ExternalMessages'
 import { UserActivity } from './Status/UserActivity'
 import { EvaluationView } from './Status/Evaluations'
-import { MeteorPubSub } from '../../lib/api/pubsub'
+import { MeteorPubSub } from '@sofie-automation/meteor-lib/dist/api/pubsub'
 import { ExpectedPackagesStatus } from './Status/package-status'
 import { MediaStatus } from './Status/media-status'
 import { CorelibPubSub } from '@sofie-automation/corelib/dist/pubsub'
@@ -100,7 +99,7 @@ export default function Status(props: Readonly<IStatusProps>): JSX.Element {
 							<Route path="/status/system" component={SystemStatus} />
 							<Route path="/status/userLog" component={UserActivity} />
 							<Route path="/status/evaluations" component={EvaluationView} />
-							<Redirect to="/status/media" />
+							<Redirect to="/status/system" />
 						</Switch>
 					</div>
 				</div>
diff --git a/meteor/client/ui/Status/DebugState.tsx b/packages/webui/src/client/ui/Status/DebugState.tsx
similarity index 100%
rename from meteor/client/ui/Status/DebugState.tsx
rename to packages/webui/src/client/ui/Status/DebugState.tsx
diff --git a/meteor/client/ui/Status/Evaluations.tsx b/packages/webui/src/client/ui/Status/Evaluations.tsx
similarity index 91%
rename from meteor/client/ui/Status/Evaluations.tsx
rename to packages/webui/src/client/ui/Status/Evaluations.tsx
index 029e2fd6c6..286b2ff547 100644
--- a/meteor/client/ui/Status/Evaluations.tsx
+++ b/packages/webui/src/client/ui/Status/Evaluations.tsx
@@ -1,12 +1,12 @@
-import React, { useCallback, useMemo, useState } from 'react'
+import { useCallback, useMemo, useState } from 'react'
 import { useSubscription, useTracker } from '../../lib/ReactMeteorData/react-meteor-data'
 import Moment from 'react-moment'
-import { Time, unprotectString } from '../../../lib/lib'
-import { Evaluation } from '../../../lib/collections/Evaluations'
+import { Time, unprotectString } from '../../lib/tempLib'
+import { Evaluation } from '@sofie-automation/meteor-lib/dist/collections/Evaluations'
 import { DatePickerFromTo } from '../../lib/datePicker'
 import moment from 'moment'
 import { getQuestionOptions } from '../AfterBroadcastForm'
-import { MeteorPubSub } from '../../../lib/api/pubsub'
+import { MeteorPubSub } from '@sofie-automation/meteor-lib/dist/api/pubsub'
 import { Evaluations } from '../../collections'
 import { DropdownInputOption } from '../../lib/Components/DropdownInput'
 import { useTranslation } from 'react-i18next'
diff --git a/meteor/client/ui/Status/ExternalMessages.tsx b/packages/webui/src/client/ui/Status/ExternalMessages.tsx
similarity index 90%
rename from meteor/client/ui/Status/ExternalMessages.tsx
rename to packages/webui/src/client/ui/Status/ExternalMessages.tsx
index 08de2c1b62..85d226b1b0 100644
--- a/meteor/client/ui/Status/ExternalMessages.tsx
+++ b/packages/webui/src/client/ui/Status/ExternalMessages.tsx
@@ -1,8 +1,8 @@
-import React, { useCallback, useState } from 'react'
+import React, { useCallback, useContext, useState } from 'react'
 import { useSubscription, useTracker } from '../../lib/ReactMeteorData/react-meteor-data'
-import { getCurrentTime, Time, unprotectString } from '../../../lib/lib'
+import { Time, unprotectString } from '../../lib/tempLib'
+import { getCurrentTime } from '../../lib/systemTime'
 import { MomentFromNow } from '../../lib/Moment'
-import { getAllowConfigure } from '../../lib/localStorage'
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
 import { ExternalMessageQueueObj } from '@sofie-automation/corelib/dist/dataModel/ExternalMessageQueue'
 import { makeTableOfObject } from '../../lib/utilComponents'
@@ -10,14 +10,15 @@ import ClassNames from 'classnames'
 import { DatePickerFromTo } from '../../lib/datePicker'
 import moment from 'moment'
 import { faTrash, faPause, faPlay, faRedo } from '@fortawesome/free-solid-svg-icons'
-import { MeteorPubSub } from '../../../lib/api/pubsub'
-import { MeteorCall } from '../../../lib/api/methods'
+import { MeteorPubSub } from '@sofie-automation/meteor-lib/dist/api/pubsub'
+import { MeteorCall } from '../../lib/meteorApi'
 import { UIStudios } from '../Collections'
 import { StudioId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import { ExternalMessageQueue } from '../../collections'
 import { catchError } from '../../lib/lib'
 import { CorelibPubSub } from '@sofie-automation/corelib/dist/pubsub'
 import { useTranslation } from 'react-i18next'
+import { UserPermissionsContext } from '../UserPermissions'
 
 function ExternalMessages(): JSX.Element {
 	const { t } = useTranslation()
@@ -96,7 +97,7 @@ function ExternalMessagesQueuedMessages({ studioId }: Readonly<ExternalMessagesQ
 			ExternalMessageQueue.find(
 				{
 					studioId: studioId,
-					sent: { $gt: 0 },
+					sent: { $not: { $gt: 0 } },
 				},
 				{
 					sort: {
@@ -165,6 +166,8 @@ interface ExternalMessagesRowProps {
 	msg: ExternalMessageQueueObj
 }
 function ExternalMessagesRow({ msg }: Readonly<ExternalMessagesRowProps>) {
+	const userPermissions = useContext(UserPermissionsContext)
+
 	const removeMessage = useCallback(() => {
 		MeteorCall.externalMessages.remove(msg._id).catch(catchError('externalMessages.remove'))
 	}, [msg._id])
@@ -232,15 +235,15 @@ function ExternalMessagesRow({ msg }: Readonly<ExternalMessagesRowProps>) {
 	return (
 		<tr key={unprotectString(msg._id)} className={ClassNames(classes)}>
 			<td className="c2">
-				{getAllowConfigure() ? (
+				{userPermissions.configure ? (
 					<React.Fragment>
-						<button className="action-btn" onClick={removeMessage}>
+						<button className="action-btn mod mls" onClick={removeMessage}>
 							<FontAwesomeIcon icon={faTrash} />
 						</button>
-						<button className="action-btn" onClick={toggleHoldMessage}>
+						<button className="action-btn mod" onClick={toggleHoldMessage}>
 							{msg.hold ? <FontAwesomeIcon icon={faPlay} /> : <FontAwesomeIcon icon={faPause} />}
 						</button>
-						<button className="action-btn" onClick={retryMessage}>
+						<button className="action-btn mod" onClick={retryMessage}>
 							<FontAwesomeIcon icon={faRedo} />
 						</button>
 						<br />
diff --git a/meteor/client/ui/Status/MediaManager.tsx b/packages/webui/src/client/ui/Status/MediaManager.tsx
similarity index 94%
rename from meteor/client/ui/Status/MediaManager.tsx
rename to packages/webui/src/client/ui/Status/MediaManager.tsx
index c8a47260f6..3471ce6b0b 100644
--- a/meteor/client/ui/Status/MediaManager.tsx
+++ b/packages/webui/src/client/ui/Status/MediaManager.tsx
@@ -1,5 +1,5 @@
-import React, { useCallback } from 'react'
-import CoreIcons from '@nrk/core-icons/jsx'
+import React, { useCallback, useContext } from 'react'
+import * as CoreIcons from '@nrk/core-icons/jsx'
 import { faChevronDown, faChevronRight, faCheck, faStopCircle, faRedo, faFlag } from '@fortawesome/free-solid-svg-icons'
 // @ts-expect-error No types available
 import * as VelocityReact from 'velocity-react'
@@ -11,18 +11,18 @@ import { useSubscription, useTracker } from '../../lib/ReactMeteorData/react-met
 import { MediaWorkFlow } from '@sofie-automation/shared-lib/dist/core/model/MediaWorkFlows'
 import { MediaWorkFlowStep } from '@sofie-automation/shared-lib/dist/core/model/MediaWorkFlowSteps'
 import { useTranslation } from 'react-i18next'
-import { extendMandadory, unprotectString } from '../../../lib/lib'
-import { MeteorPubSub } from '../../../lib/api/pubsub'
+import { unprotectString } from '../../lib/tempLib'
+import { MeteorPubSub } from '@sofie-automation/meteor-lib/dist/api/pubsub'
 import { Spinner } from '../../lib/Spinner'
 import { sofieWarningIcon as WarningIcon } from '../../lib/notifications/warningIcon'
-import { doUserAction, UserAction } from '../../../lib/clientUserAction'
-import { MeteorCall } from '../../../lib/api/methods'
+import { doUserAction, UserAction } from '../../lib/clientUserAction'
+import { MeteorCall } from '../../lib/meteorApi'
 import Tooltip from 'rc-tooltip'
-import { MediaManagerAPI } from '../../../lib/api/mediaManager'
-import { getAllowConfigure, getAllowStudio } from '../../lib/localStorage'
+import { MediaManagerAPI } from '@sofie-automation/meteor-lib/dist/api/mediaManager'
 import { MediaWorkFlowId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import { MediaWorkFlows, MediaWorkFlowSteps } from '../../collections'
 import { useToggleExpandHelper } from '../util/useToggleExpandHelper'
+import { UserPermissionsContext } from '../UserPermissions'
 
 interface MediaWorkFlowUi extends MediaWorkFlow {
 	steps: MediaWorkFlowStep[]
@@ -338,6 +338,8 @@ function MediaManagerWorkFlowItem(props: Readonly<IItemProps>): JSX.Element {
 export function MediaManagerStatus(): JSX.Element {
 	const { t } = useTranslation()
 
+	const userPermissions = useContext(UserPermissionsContext)
+
 	// Subscribe to data:
 	useSubscription(MeteorPubSub.mediaWorkFlows) // TODO: add some limit
 	useSubscription(MeteorPubSub.mediaWorkFlowSteps)
@@ -384,17 +386,16 @@ export function MediaManagerStatus(): JSX.Element {
 		[t]
 	)
 
-	const allWorkFlows = useTracker(
+	const allWorkFlows: MediaWorkFlowUi[] = useTracker(
 		() =>
 			MediaWorkFlows.find({})
 				.fetch()
-				.map((i) =>
-					extendMandadory<MediaWorkFlow, MediaWorkFlowUi>(i, {
-						steps: MediaWorkFlowSteps.find({
-							workFlowId: i._id,
-						}).fetch(),
-					})
-				),
+				.map((i) => ({
+					...i,
+					steps: MediaWorkFlowSteps.find({
+						workFlowId: i._id,
+					}).fetch(),
+				})),
 		[],
 		[]
 	)
@@ -408,7 +409,7 @@ export function MediaManagerStatus(): JSX.Element {
 				<h1>{t('Media Transfer Status')}</h1>
 			</header>
 			<div className="mod mvl alright">
-				{getAllowStudio() || getAllowConfigure() ? (
+				{userPermissions.studio || userPermissions.configure ? (
 					<React.Fragment>
 						<button className="btn btn-secondary mls" onClick={actionAbortAll}>
 							{t('Abort All')}
diff --git a/meteor/client/ui/Status/StatusCodePill.tsx b/packages/webui/src/client/ui/Status/StatusCodePill.tsx
similarity index 71%
rename from meteor/client/ui/Status/StatusCodePill.tsx
rename to packages/webui/src/client/ui/Status/StatusCodePill.tsx
index 204d73ae8d..16deb47d78 100644
--- a/meteor/client/ui/Status/StatusCodePill.tsx
+++ b/packages/webui/src/client/ui/Status/StatusCodePill.tsx
@@ -1,9 +1,29 @@
 import * as React from 'react'
-import { useTranslation } from 'react-i18next'
-import { assertNever } from '../../../lib/lib'
+import { useTranslation, TFunction } from 'react-i18next'
+import { assertNever } from '../../lib/tempLib'
 import ClassNames from 'classnames'
 import { StatusCode } from '@sofie-automation/blueprints-integration'
-import { statusCodeToString } from './SystemStatus'
+import {} from './SystemStatus/SystemStatus'
+
+export function statusCodeToString(t: TFunction, statusCode: StatusCode): string {
+	switch (statusCode) {
+		case StatusCode.UNKNOWN:
+			return t('Unknown')
+		case StatusCode.GOOD:
+			return t('Good')
+		case StatusCode.WARNING_MINOR:
+			return t('Minor Warning')
+		case StatusCode.WARNING_MAJOR:
+			return t('Warning')
+		case StatusCode.BAD:
+			return t('Bad')
+		case StatusCode.FATAL:
+			return t('Fatal')
+		default:
+			assertNever(statusCode)
+			return t('Unknown')
+	}
+}
 
 export const StatusCodePill: React.FC<{
 	connected: boolean
diff --git a/packages/webui/src/client/ui/Status/SystemStatus/CoreItem.tsx b/packages/webui/src/client/ui/Status/SystemStatus/CoreItem.tsx
new file mode 100644
index 0000000000..6489cc9b4a
--- /dev/null
+++ b/packages/webui/src/client/ui/Status/SystemStatus/CoreItem.tsx
@@ -0,0 +1,137 @@
+import { useContext } from 'react'
+import { useTranslation } from 'react-i18next'
+import { unprotectString } from '../../../lib/tempLib'
+import { doModalDialog } from '../../../lib/ModalDialog'
+import { NotificationCenter, NoticeLevel, Notification } from '../../../lib/notifications/notifications'
+import ClassNames from 'classnames'
+import { ICoreSystem } from '@sofie-automation/meteor-lib/dist/collections/CoreSystem'
+import { StatusResponse } from '@sofie-automation/meteor-lib/dist/api/systemStatus'
+import { doUserAction, UserAction } from '../../../lib/clientUserAction'
+import { MeteorCall } from '../../../lib/meteorApi'
+import { hashSingleUseToken } from '../../../lib/lib'
+import { UserPermissionsContext } from '../../UserPermissions'
+import { ClientAPI } from '@sofie-automation/meteor-lib/dist/api/client'
+
+interface ICoreItemProps {
+	systemStatus: StatusResponse | undefined
+	coreSystem: ICoreSystem
+}
+
+export function CoreItem({ systemStatus, coreSystem }: ICoreItemProps): JSX.Element {
+	const { t } = useTranslation()
+
+	const userPermissions = useContext(UserPermissionsContext)
+
+	return (
+		<div key={unprotectString(coreSystem._id)} className="device-item">
+			<div className="status-container">
+				<div
+					className={ClassNames(
+						'device-status',
+						systemStatus &&
+							systemStatus.status && {
+								'device-status--unknown': systemStatus.status === 'UNDEFINED',
+								'device-status--good': systemStatus.status === 'OK',
+								'device-status--warning': systemStatus.status === 'WARNING',
+								'device-status--fatal': systemStatus.status === 'FAIL',
+							}
+					)}
+				>
+					<div className="value">
+						<span className="pill device-status__label">
+							<a
+								href="#"
+								title={
+									systemStatus && systemStatus._internal.messages
+										? systemStatus._internal.messages.join('\n')
+										: undefined
+								}
+							>
+								{systemStatus && systemStatus.status}
+							</a>
+						</span>
+					</div>
+				</div>
+			</div>
+			<div className="device-item__id">
+				<div className="value">
+					{t('Sofie Automation Server Core: {{name}}', { name: coreSystem.name || 'unnamed' })}
+				</div>
+			</div>
+			<div className="device-item__version">
+				<label>{t('Version')}: </label>
+				<div className="value">{__APP_VERSION__ || 'UNSTABLE'}</div>
+			</div>
+
+			{(userPermissions.configure || userPermissions.developer) && (
+				<div className="actions-container">
+					<div className="device-item__actions">
+						<button
+							className="btn btn-secondary"
+							onClick={(e) => {
+								e.preventDefault()
+								e.stopPropagation()
+
+								doModalDialog({
+									title: t('Restart this system?'),
+									yes: t('Restart'),
+									no: t('Cancel'),
+									message: (
+										<p>
+											{t('Are you sure you want to restart this Sofie Automation Server Core: {{name}}?', {
+												name: coreSystem.name || 'unnamed',
+											})}
+										</p>
+									),
+									onAccept: (e) => {
+										doUserAction(
+											t,
+											e,
+											UserAction.RESTART_CORE,
+											(e, ts) =>
+												MeteorCall.system.generateSingleUseToken().then((tokenResponse) => {
+													if (ClientAPI.isClientResponseError(tokenResponse) || !tokenResponse.result)
+														throw tokenResponse
+													return MeteorCall.userAction.restartCore(e, ts, hashSingleUseToken(tokenResponse.result))
+												}),
+											(err, restartMessage) => {
+												if (err || !restartMessage) {
+													NotificationCenter.push(
+														new Notification(
+															undefined,
+															NoticeLevel.CRITICAL,
+															t('Could not restart core: {{err}}', { err }),
+															'SystemStatus'
+														)
+													)
+													return
+												}
+												let time = 'unknown'
+												const match = restartMessage.match(/([\d.]+)s/)
+												if (match) {
+													time = match[1]
+												}
+												NotificationCenter.push(
+													new Notification(
+														undefined,
+														NoticeLevel.WARNING,
+														t('Sofie Automation Server Core will restart in {{time}}s...', { time }),
+														'SystemStatus'
+													)
+												)
+											}
+										)
+									},
+								})
+							}}
+						>
+							{t('Restart')}
+						</button>
+					</div>
+				</div>
+			)}
+
+			<div className="clear"></div>
+		</div>
+	)
+}
diff --git a/packages/webui/src/client/ui/Status/SystemStatus/DeviceItem.tsx b/packages/webui/src/client/ui/Status/SystemStatus/DeviceItem.tsx
new file mode 100644
index 0000000000..f0eb6c716f
--- /dev/null
+++ b/packages/webui/src/client/ui/Status/SystemStatus/DeviceItem.tsx
@@ -0,0 +1,314 @@
+import React, { useContext } from 'react'
+import {
+	PeripheralDevice,
+	PeripheralDeviceType,
+	PERIPHERAL_SUBTYPE_PROCESS,
+} from '@sofie-automation/corelib/dist/dataModel/PeripheralDevice'
+import { TFunction, useTranslation } from 'react-i18next'
+import Moment from 'react-moment'
+import { unprotectString } from '../../../lib/tempLib'
+import { getCurrentTime } from '../../../lib/systemTime'
+import { Link } from 'react-router-dom'
+import Tooltip from 'rc-tooltip'
+import { faTrash, faEye } from '@fortawesome/free-solid-svg-icons'
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
+import { doModalDialog } from '../../../lib/ModalDialog'
+import { callPeripheralDeviceAction, PeripheralDevicesAPI } from '../../../lib/clientAPI'
+import { NotificationCenter, NoticeLevel, Notification } from '../../../lib/notifications/notifications'
+import { getHelpMode } from '../../../lib/localStorage'
+import ClassNames from 'classnames'
+import { TSR } from '@sofie-automation/blueprints-integration'
+import { MeteorCall } from '../../../lib/meteorApi'
+import { DEFAULT_TSR_ACTION_TIMEOUT_TIME } from '@sofie-automation/shared-lib/dist/core/constants'
+import { SubdeviceAction } from '@sofie-automation/shared-lib/dist/core/deviceConfigManifest'
+import { StatusCodePill } from '../StatusCodePill'
+import { isTranslatableMessage, translateMessage } from '@sofie-automation/corelib/dist/TranslatableMessage'
+import { i18nTranslator } from '../../i18n'
+import { SchemaFormInPlace } from '../../../lib/forms/SchemaFormInPlace'
+import { PeripheralDevices } from '../../../collections'
+import { DebugStateTable } from '../DebugState'
+import { JSONBlobParse } from '@sofie-automation/shared-lib/dist/lib/JSONBlob'
+import { catchError } from '../../../lib/lib'
+import { UserPermissionsContext } from '../../UserPermissions'
+
+interface IDeviceItemProps {
+	parentDevice: PeripheralDevice | null
+	device: PeripheralDevice
+	showRemoveButtons?: boolean
+	hasChildren?: boolean
+
+	debugState: object | undefined
+}
+
+export function DeviceItem({
+	parentDevice,
+	device,
+	showRemoveButtons,
+	hasChildren,
+	debugState,
+}: IDeviceItemProps): JSX.Element {
+	const { t } = useTranslation()
+
+	const userPermissions = useContext(UserPermissionsContext)
+
+	const namespaces = ['peripheralDevice_' + device._id]
+
+	const configManifest = (parentDevice ?? device)?.configManifest?.subdeviceManifest?.[device.subType]
+
+	return (
+		<div key={unprotectString(device._id)} className="device-item">
+			<div className="status-container">
+				<StatusCodePill
+					connected={device.connected}
+					statusCode={device?.status.statusCode}
+					messages={device?.status.messages}
+				/>
+
+				<div className="device-item__last-seen">
+					<label>{t('Last seen')}: </label>
+					<div className="value">
+						<Moment from={getCurrentTime()} date={device.lastSeen} />
+					</div>
+				</div>
+			</div>
+			<div className="device-item__id">
+				<Tooltip
+					overlay={t('Connect some devices to the playout gateway')}
+					visible={
+						getHelpMode() &&
+						device.type === PeripheralDeviceType.PLAYOUT &&
+						!parentDevice &&
+						!hasChildren &&
+						hasChildren !== undefined
+					}
+					placement="right"
+				>
+					{userPermissions.configure ? (
+						<div className="value">
+							<Link to={'/settings/peripheralDevice/' + device._id}>{device.name}</Link>
+						</div>
+					) : (
+						<div className="value">{device.name}</div>
+					)}
+				</Tooltip>
+			</div>
+			{device.versions ? (
+				<div className="device-item__version">
+					<label>{t('Version')}: </label>
+					<div className="value">
+						<a title={getDeviceVersionsString(device)} href="#">
+							{device.versions._process || 'N/A'}
+						</a>
+					</div>
+				</div>
+			) : null}
+
+			{debugState ? <DebugStateTable debugState={debugState} /> : null}
+
+			<div className="actions-container">
+				<div className="device-item__actions">
+					{configManifest?.actions?.map((action) => (
+						<React.Fragment key={action.id}>
+							<button
+								className="btn btn-secondary"
+								onClick={(e) => {
+									e.preventDefault()
+									e.stopPropagation()
+									onExecuteAction(e, t, device, action)
+								}}
+							>
+								{translateMessage({ key: action.name, namespaces }, i18nTranslator)}
+							</button>
+						</React.Fragment>
+					))}
+					{userPermissions.developer ? (
+						<button
+							key="button-ignore"
+							className={ClassNames('btn btn-secondary', {
+								warn: device.ignore,
+							})}
+							onClick={(e) => {
+								e.preventDefault()
+								e.stopPropagation()
+								onToggleIgnore(device)
+							}}
+							title={device.ignore ? 'Click to show device status to users' : 'Click to hide device status from users'}
+						>
+							<FontAwesomeIcon icon={faEye} />
+						</button>
+					) : null}
+					{showRemoveButtons ? (
+						<button
+							key="button-device"
+							className="btn btn-primary"
+							onClick={(e) => {
+								e.preventDefault()
+								e.stopPropagation()
+
+								doModalDialog({
+									title: t('Delete'),
+									message: (
+										<p>
+											{t('Are you sure you want to delete this device: "{{deviceId}}"?', {
+												deviceId: device.name || device._id,
+											})}
+										</p>
+									),
+									onAccept: () => {
+										MeteorCall.peripheralDevice
+											.removePeripheralDevice(device._id)
+											.catch(catchError('peripheralDevice.removePeripheralDevice'))
+									},
+								})
+							}}
+						>
+							<FontAwesomeIcon icon={faTrash} />
+						</button>
+					) : null}
+					{userPermissions.studio && device.subType === PERIPHERAL_SUBTYPE_PROCESS ? (
+						<React.Fragment>
+							<button
+								className="btn btn-secondary"
+								onClick={(e) => {
+									e.preventDefault()
+									e.stopPropagation()
+									e.persist()
+
+									doModalDialog({
+										message: t('Are you sure you want to restart this device?'),
+										title: t('Restart this Device?'),
+										yes: t('Restart'),
+										no: t('Cancel'),
+										onAccept: () => {
+											PeripheralDevicesAPI.restartDevice(device, e)
+												.then(() => {
+													NotificationCenter.push(
+														new Notification(
+															undefined,
+															NoticeLevel.NOTIFICATION,
+															t('Device "{{deviceName}}" restarting...', {
+																deviceName: device.name,
+															}),
+															'SystemStatus'
+														)
+													)
+												})
+												.catch((err) => {
+													NotificationCenter.push(
+														new Notification(
+															undefined,
+															NoticeLevel.WARNING,
+															t('Failed to restart device: "{{deviceName}}": {{errorMessage}}', {
+																deviceName: device.name,
+																errorMessage: err + '',
+															}),
+															'SystemStatus'
+														)
+													)
+												})
+										},
+									})
+								}}
+							>
+								{t('Restart')}
+							</button>
+						</React.Fragment>
+					) : null}
+				</div>
+			</div>
+
+			<div className="clear"></div>
+		</div>
+	)
+}
+
+function getDeviceVersionsString(device: PeripheralDevice): string | undefined {
+	const versions = device.versions
+	if (!versions) return undefined
+
+	return Object.entries<string>(versions)
+		.map((version, packageName) => `${packageName}: ${version}`)
+		.join('\n')
+}
+
+function onExecuteAction(event: any, t: TFunction, device: PeripheralDevice, action: SubdeviceAction) {
+	const namespaces = ['peripheralDevice_' + device._id]
+
+	const processResponse = (r: TSR.ActionExecutionResult) => {
+		if (r?.result === TSR.ActionExecutionResultCode.Error) {
+			throw new Error(
+				r.response && isTranslatableMessage(r.response)
+					? translateMessage(r.response, i18nTranslator)
+					: t('Unknown error')
+			)
+		}
+		NotificationCenter.push(
+			new Notification(
+				undefined,
+				NoticeLevel.NOTIFICATION,
+				r?.response && isTranslatableMessage(r.response)
+					? t('Executed {{actionName}} on device "{{deviceName}}": {{response}}', {
+							actionName: action.name,
+							deviceName: device.name,
+							response: translateMessage(r.response, i18nTranslator),
+					  })
+					: t('Executed {{actionName}} on device "{{deviceName}}"...', {
+							actionName: action.name,
+							deviceName: device.name,
+					  }),
+				'SystemStatus'
+			)
+		)
+	}
+	const processError = (err: any) => {
+		NotificationCenter.push(
+			new Notification(
+				undefined,
+				NoticeLevel.WARNING,
+				t('Failed to execute {{actionName}} on device: "{{deviceName}}": {{errorMessage}}', {
+					actionName: action.name,
+					deviceName: device.name,
+					errorMessage: err,
+				}),
+				'SystemStatus'
+			)
+		)
+	}
+
+	if (action.destructive || action.payload) {
+		const payload = {}
+		doModalDialog({
+			title: translateMessage({ key: action.name, namespaces }, i18nTranslator),
+			yes: t('Execute'),
+			no: t('Cancel'),
+			message: action.payload ? (
+				<SchemaFormInPlace schema={JSONBlobParse(action.payload)} object={payload} translationNamespaces={namespaces} />
+			) : (
+				t('Do you want to execute {{actionName}}? This may the disrupt the output', { actionName: action.name })
+			),
+			onAccept: (event: any) => {
+				callPeripheralDeviceAction(
+					event,
+					device._id,
+					action.timeout || DEFAULT_TSR_ACTION_TIMEOUT_TIME,
+					action.id,
+					payload
+				)
+					.then(processResponse)
+					.catch(processError)
+			},
+		})
+	} else {
+		callPeripheralDeviceAction(event, device._id, action.timeout || DEFAULT_TSR_ACTION_TIMEOUT_TIME, action.id)
+			.then(processResponse)
+			.catch(processError)
+	}
+}
+
+function onToggleIgnore(device: PeripheralDevice): void {
+	PeripheralDevices.update(device._id, {
+		$set: {
+			ignore: !device.ignore,
+		},
+	})
+}
diff --git a/packages/webui/src/client/ui/Status/SystemStatus/SystemStatus.tsx b/packages/webui/src/client/ui/Status/SystemStatus/SystemStatus.tsx
new file mode 100644
index 0000000000..bc047ccc19
--- /dev/null
+++ b/packages/webui/src/client/ui/Status/SystemStatus/SystemStatus.tsx
@@ -0,0 +1,215 @@
+import { useEffect, useMemo, useState } from 'react'
+import { useSubscription, useTracker } from '../../../lib/ReactMeteorData/react-meteor-data'
+import { PeripheralDevice, PeripheralDeviceType } from '@sofie-automation/corelib/dist/dataModel/PeripheralDevice'
+import { useTranslation } from 'react-i18next'
+import { protectString, unprotectString } from '../../../lib/tempLib'
+import { NotificationCenter, NoticeLevel, Notification } from '../../../lib/notifications/notifications'
+import { StatusResponse } from '@sofie-automation/meteor-lib/dist/api/systemStatus'
+import { MeteorCall } from '../../../lib/meteorApi'
+import { CoreSystem, PeripheralDevices } from '../../../collections'
+import { PeripheralDeviceId } from '@sofie-automation/shared-lib/dist/core/model/Ids'
+import { logger } from '../../../lib/logging'
+import { CorelibPubSub } from '@sofie-automation/corelib/dist/pubsub'
+import { stringifyError } from '@sofie-automation/shared-lib/dist/lib/stringifyError'
+import { CoreItem } from './CoreItem'
+import { DeviceItem } from './DeviceItem'
+
+export function SystemStatus(): JSX.Element {
+	const { t } = useTranslation()
+
+	// Subscribe to data:
+	useSubscription(CorelibPubSub.peripheralDevices, null)
+
+	const coreSystem = useTracker(() => CoreSystem.findOne(), [])
+	const devices = useTracker(() => PeripheralDevices.find({}, { sort: { lastConnected: -1 } }).fetch(), [], [])
+
+	const systemStatus = useSystemStatus()
+	const playoutDebugStates = usePlayoutDebugStates(devices)
+
+	const devicesHierarchy = convertDevicesIntoHeirarchy(devices)
+
+	return (
+		<div className="mhl gutter system-status">
+			<header className="mbs">
+				<h1>{t('System Status')}</h1>
+			</header>
+			<div className="mod mvl">
+				{coreSystem && <CoreItem coreSystem={coreSystem} systemStatus={systemStatus} />}
+
+				{devicesHierarchy.map((d) => (
+					<DeviceItemWithChildren
+						key={unprotectString(d.device._id)}
+						playoutDebugStates={playoutDebugStates}
+						parentDevice={null}
+						device={d}
+					/>
+				))}
+			</div>
+		</div>
+	)
+}
+
+interface DeviceInHierarchy {
+	device: PeripheralDevice
+	children: Array<DeviceInHierarchy>
+}
+
+function useSystemStatus(): StatusResponse | undefined {
+	const { t } = useTranslation()
+
+	const [sytemStatus, setSystemStatus] = useState<StatusResponse | undefined>()
+
+	useEffect(() => {
+		let destroyed = false
+
+		const refreshSystemStatus = () => {
+			MeteorCall.systemStatus
+				.getSystemStatus()
+				.then((newSystemStatus: StatusResponse) => {
+					if (destroyed) return
+
+					setSystemStatus(newSystemStatus)
+				})
+				.catch((err) => {
+					if (destroyed) return
+
+					logger.error('systemStatus.getSystemStatus', err)
+					NotificationCenter.push(
+						new Notification(
+							'systemStatus_failed',
+							NoticeLevel.CRITICAL,
+							t('Could not get system status. Please consult system administrator.'),
+							'RundownList'
+						)
+					)
+				})
+		}
+
+		refreshSystemStatus()
+
+		const interval = setInterval(refreshSystemStatus, 5000)
+
+		return () => {
+			clearInterval(interval)
+			destroyed = true
+		}
+	}, [t])
+
+	return sytemStatus
+}
+
+function usePlayoutDebugStates(devices: PeripheralDevice[]): Map<PeripheralDeviceId, object> {
+	const { t } = useTranslation()
+
+	const [playoutDebugStates, setPlayoutDebugStates] = useState<Map<PeripheralDeviceId, object>>(new Map())
+
+	const playoutDeviceIds = useMemo(() => {
+		const deviceIds: PeripheralDeviceId[] = []
+
+		for (const device of devices) {
+			if (device.type === PeripheralDeviceType.PLAYOUT && device.settings && (device.settings as any)['debugState']) {
+				deviceIds.push(device._id)
+			}
+		}
+
+		deviceIds.sort()
+		return deviceIds
+	}, [devices])
+
+	useEffect(() => {
+		let destroyed = false
+
+		const refreshDebugStates = () => {
+			for (const deviceId of playoutDeviceIds) {
+				MeteorCall.systemStatus
+					.getDebugStates(deviceId)
+					.then((res) => {
+						if (destroyed) return
+
+						setPlayoutDebugStates((oldState) => {
+							// Create a new map based on the old one
+							const newStates = new Map(oldState.entries())
+							for (const [key, state] of Object.entries<any>(res)) {
+								newStates.set(protectString(key), state)
+							}
+							return newStates
+						})
+					})
+					.catch((err) => console.log(`Error fetching device states: ${stringifyError(err)}`))
+			}
+		}
+
+		const interval = setInterval(refreshDebugStates, 1000)
+
+		return () => {
+			clearInterval(interval)
+			destroyed = true
+		}
+	}, [t, JSON.stringify(playoutDeviceIds)])
+
+	return playoutDebugStates
+}
+
+function convertDevicesIntoHeirarchy(devices: PeripheralDevice[]): DeviceInHierarchy[] {
+	const devicesMap = new Map<PeripheralDeviceId, DeviceInHierarchy>()
+	const devicesToAdd: DeviceInHierarchy[] = []
+
+	// First, add all as references:
+	for (const device of devices) {
+		const entry: DeviceInHierarchy = {
+			device: device,
+			children: [],
+		}
+		devicesMap.set(device._id, entry)
+		devicesToAdd.push(entry)
+	}
+
+	// Then, map and add devices:
+	const devicesHeirarchy: Array<DeviceInHierarchy> = []
+	for (const entry of devicesToAdd) {
+		if (entry.device.parentDeviceId) {
+			const parent = devicesMap.get(entry.device.parentDeviceId)
+			if (parent) {
+				parent.children.push(entry)
+			} else {
+				// not found, add on top level then:
+				devicesHeirarchy.push(entry)
+			}
+		} else {
+			devicesHeirarchy.push(entry)
+		}
+	}
+
+	return devicesHeirarchy
+}
+
+interface DeviceItemWithChildrenProps {
+	playoutDebugStates: Map<PeripheralDeviceId, object>
+	parentDevice: DeviceInHierarchy | null
+	device: DeviceInHierarchy
+}
+
+function DeviceItemWithChildren({ playoutDebugStates, device, parentDevice }: DeviceItemWithChildrenProps) {
+	return (
+		<div key={device.device._id + '_parent'} className="device-item-container">
+			<DeviceItem
+				parentDevice={parentDevice?.device ?? null}
+				device={device.device}
+				hasChildren={device.children.length !== 0}
+				debugState={playoutDebugStates.get(device.device._id)}
+			/>
+
+			{device.children.length > 0 && (
+				<div className="children">
+					<ul className="childlist">
+						{device.children.map((child) => (
+							<li key={unprotectString(child.device._id)} className="child-device-li">
+								<DeviceItemWithChildren playoutDebugStates={playoutDebugStates} parentDevice={device} device={child} />
+							</li>
+						))}
+					</ul>
+				</div>
+			)}
+		</div>
+	)
+}
diff --git a/meteor/client/ui/Status/UserActivity.tsx b/packages/webui/src/client/ui/Status/UserActivity.tsx
similarity index 73%
rename from meteor/client/ui/Status/UserActivity.tsx
rename to packages/webui/src/client/ui/Status/UserActivity.tsx
index f4e868b795..166ff3d7dd 100644
--- a/meteor/client/ui/Status/UserActivity.tsx
+++ b/packages/webui/src/client/ui/Status/UserActivity.tsx
@@ -1,10 +1,10 @@
 import React, { useEffect, useState, useLayoutEffect } from 'react'
 import { useSubscription, useTracker } from '../../lib/ReactMeteorData/react-meteor-data'
-import { Time, unprotectString } from '../../../lib/lib'
-import { UserActionsLogItem } from '../../../lib/collections/UserActionsLog'
+import { Time, unprotectString } from '../../lib/tempLib'
+import { UserActionsLogItem } from '@sofie-automation/meteor-lib/dist/collections/UserActionsLog'
 import { DatePickerFromTo } from '../../lib/datePicker'
 import moment from 'moment'
-import { MeteorPubSub } from '../../../lib/api/pubsub'
+import { MeteorPubSub } from '@sofie-automation/meteor-lib/dist/api/pubsub'
 import { useTranslation } from 'react-i18next'
 import { parse as queryStringParse } from 'query-string'
 import { Link, useHistory, useLocation } from 'react-router-dom'
@@ -12,11 +12,13 @@ import classNames from 'classnames'
 import { getCoreSystem, UserActionsLog } from '../../collections'
 import Tooltip from 'rc-tooltip'
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
+import { CollapseJSON } from '../../lib/collapseJSON'
 import { faDownload } from '@fortawesome/free-solid-svg-icons'
 import { downloadBlob } from '../../lib/downloadBlob'
 
-const PARAM_DATE_FORMAT = 'YYYY-MM-DD'
+const PARAM_DATE_FORMAT = 'YYYY-MM-DDTHHmm'
 const PARAM_NAME_FROM_DATE = 'fromDate'
+const PARAM_NAME_TO_DATE = 'toDate'
 
 interface IUserActionsListProps {
 	logItems: UserActionsLogItem[]
@@ -26,14 +28,6 @@ interface IUserActionsListProps {
 	renderButtons?: (item: UserActionsLogItem) => React.ReactElement
 }
 
-function prettyPrintJsonString(str: string): string {
-	try {
-		return JSON.stringify(JSON.parse(str), undefined, 4)
-	} catch (_e) {
-		return str
-	}
-}
-
 function UserActionsList(props: Readonly<IUserActionsListProps>) {
 	const { t } = useTranslation()
 
@@ -47,7 +41,7 @@ function UserActionsList(props: Readonly<IUserActionsListProps>) {
 					<th className="c2 user-action-log__clientAddress">{t('Client IP')}</th>
 					<th className="c3 user-action-log__context">{t('Action')}</th>
 					<th className="c3 user-action-log__method">{t('Method')}</th>
-					<th className="c1 user-action-log__status">{t('Status')}</th>
+					<th className="c3 user-action-log__status">{t('Status')}</th>
 					<th className="c1 user-action-log__args">{t('Parameters')}</th>
 					{props.renderButtons ? <th className="c1 user-action-log__buttons"></th> : null}
 				</tr>
@@ -133,21 +127,68 @@ function UserActionsList(props: Readonly<IUserActionsListProps>) {
 							<td className="user-action-log__status">
 								{msg.success ? 'Success' : msg.success === false ? 'Error: ' + msg.errorMessage : null}
 							</td>
-							<td className="user-action-log__args">{prettyPrintJsonString(msg.args)}</td>
+							<td className="user-action-log__args">
+								<CollapseJSON json={msg.args} />
+							</td>
 							{props.renderButtons ? <td className="user-action-log__buttons">{props.renderButtons(msg)}</td> : null}
 						</tr>
 					)
 				})}
+				{props.logItems.length >= 10_000 && ( // The publication is capped at this amount of documents
+					<tr>
+						<td colSpan={10}>
+							<em>{t('Amount of entries exceeds the limt of 10 000 items.')}</em>
+						</td>
+					</tr>
+				)}
 			</tbody>
 		</table>
 	)
 }
 
+function getStartAndEndDateFromLocationSearch(locationSearch: string): { from: Time; to: Time } {
+	const queryParams = queryStringParse(locationSearch, {
+		arrayFormat: 'comma',
+	})
+
+	let qsStartDate: ReturnType<typeof moment> | null = null
+	let qsEndDate: ReturnType<typeof moment> | null = null
+	if (queryParams[PARAM_NAME_FROM_DATE]) {
+		qsStartDate = moment(queryParams[PARAM_NAME_FROM_DATE], PARAM_DATE_FORMAT, true)
+	}
+	if (queryParams[PARAM_NAME_TO_DATE]) {
+		qsEndDate = moment(queryParams[PARAM_NAME_TO_DATE], PARAM_DATE_FORMAT, true)
+	}
+
+	return qsStartDate?.isValid()
+		? {
+				from: qsStartDate.valueOf(),
+				to: qsEndDate?.isValid() ? qsEndDate.valueOf() : qsStartDate.add(1, 'days').valueOf(),
+		  }
+		: qsEndDate?.isValid()
+		? {
+				to: qsEndDate.valueOf(),
+				from: qsStartDate?.isValid() ? qsStartDate.valueOf() : qsEndDate.add(1, 'days').valueOf(),
+		  }
+		: {
+				from: moment().startOf('day').valueOf(),
+				to: moment().add(1, 'days').startOf('day').valueOf(),
+		  }
+}
+
 function UserActivity(): JSX.Element {
 	const { t } = useTranslation()
 
-	const [dateFrom, setDateFrom] = useState<Time>(moment().startOf('day').valueOf())
-	const [dateTo, setDateTo] = useState<Time>(moment().add(1, 'days').startOf('day').valueOf())
+	const location = useLocation()
+
+	const [dateFrom, setDateFrom] = useState<Time>(() => {
+		const { from } = getStartAndEndDateFromLocationSearch(location.search)
+		return from
+	})
+	const [dateTo, setDateTo] = useState<Time>(() => {
+		const { to } = getStartAndEndDateFromLocationSearch(location.search)
+		return to
+	})
 
 	useSubscription(MeteorPubSub.userActionsLog, dateFrom, dateTo)
 
@@ -165,26 +206,21 @@ function UserActivity(): JSX.Element {
 		[]
 	)
 
-	const location = useLocation()
 	const history = useHistory()
 
 	useEffect(() => {
-		const queryParams = queryStringParse(location.search, {
-			arrayFormat: 'comma',
-		})
-
-		const qsStartDate = moment(queryParams[PARAM_NAME_FROM_DATE], PARAM_DATE_FORMAT, true)
-
-		if (qsStartDate.isValid()) {
-			setDateFrom(qsStartDate.startOf('day').valueOf())
-			setDateTo(qsStartDate.add(1, 'days').startOf('day').valueOf())
-		}
+		const { from, to } = getStartAndEndDateFromLocationSearch(location.search)
+		setDateFrom(from)
+		setDateTo(to)
 	}, [location])
 
 	function onDateChange(from: Time, to: Time) {
 		setDateFrom(from)
 		setDateTo(to)
-		location.search = `?${PARAM_NAME_FROM_DATE}=` + moment(from).format(PARAM_DATE_FORMAT)
+		const newParams = new URLSearchParams(location.search)
+		newParams.set(PARAM_NAME_FROM_DATE, moment(from).format(PARAM_DATE_FORMAT))
+		newParams.set(PARAM_NAME_TO_DATE, moment(to).format(PARAM_DATE_FORMAT))
+		location.search = `?${newParams.toString()}`
 		history.replace(location)
 	}
 
diff --git a/meteor/client/ui/Status/media-status/MediaStatusList.scss b/packages/webui/src/client/ui/Status/media-status/MediaStatusList.scss
similarity index 100%
rename from meteor/client/ui/Status/media-status/MediaStatusList.scss
rename to packages/webui/src/client/ui/Status/media-status/MediaStatusList.scss
diff --git a/meteor/client/ui/Status/media-status/MediaStatusListHeader.scss b/packages/webui/src/client/ui/Status/media-status/MediaStatusListHeader.scss
similarity index 100%
rename from meteor/client/ui/Status/media-status/MediaStatusListHeader.scss
rename to packages/webui/src/client/ui/Status/media-status/MediaStatusListHeader.scss
diff --git a/meteor/client/ui/Status/media-status/MediaStatusListHeader.tsx b/packages/webui/src/client/ui/Status/media-status/MediaStatusListHeader.tsx
similarity index 98%
rename from meteor/client/ui/Status/media-status/MediaStatusListHeader.tsx
rename to packages/webui/src/client/ui/Status/media-status/MediaStatusListHeader.tsx
index 300bfbee60..35279f3d60 100644
--- a/meteor/client/ui/Status/media-status/MediaStatusListHeader.tsx
+++ b/packages/webui/src/client/ui/Status/media-status/MediaStatusListHeader.tsx
@@ -1,4 +1,4 @@
-import React, { JSX } from 'react'
+import { JSX } from 'react'
 import classNames from 'classnames'
 import { useTranslation } from 'react-i18next'
 import { SortOrderButton } from '../../MediaStatus/SortOrderButton'
diff --git a/meteor/client/ui/Status/media-status/MediaStatusListItem.scss b/packages/webui/src/client/ui/Status/media-status/MediaStatusListItem.scss
similarity index 100%
rename from meteor/client/ui/Status/media-status/MediaStatusListItem.scss
rename to packages/webui/src/client/ui/Status/media-status/MediaStatusListItem.scss
diff --git a/meteor/client/ui/Status/media-status/MediaStatusListItem.tsx b/packages/webui/src/client/ui/Status/media-status/MediaStatusListItem.tsx
similarity index 96%
rename from meteor/client/ui/Status/media-status/MediaStatusListItem.tsx
rename to packages/webui/src/client/ui/Status/media-status/MediaStatusListItem.tsx
index 8d1f1d7588..f64ec54ece 100644
--- a/meteor/client/ui/Status/media-status/MediaStatusListItem.tsx
+++ b/packages/webui/src/client/ui/Status/media-status/MediaStatusListItem.tsx
@@ -1,10 +1,10 @@
-import React, { JSX } from 'react'
+import { JSX } from 'react'
 import { SourceLayerType } from '@sofie-automation/blueprints-integration'
 import { PieceStatusCode } from '@sofie-automation/corelib/dist/dataModel/Piece'
 import { NavLink } from 'react-router-dom'
 import { RundownUtils } from '../../../lib/rundown'
 import classNames from 'classnames'
-import { formatTime } from '../../../../lib/lib'
+import { formatTime } from '@sofie-automation/meteor-lib/dist/time'
 import { MediaStatusIndicator } from '../../MediaStatus/MediaStatusIndicator'
 
 export function MediaStatusListItem({
diff --git a/meteor/client/ui/Status/media-status/index.tsx b/packages/webui/src/client/ui/Status/media-status/index.tsx
similarity index 98%
rename from meteor/client/ui/Status/media-status/index.tsx
rename to packages/webui/src/client/ui/Status/media-status/index.tsx
index f3bad5c805..019d836810 100644
--- a/meteor/client/ui/Status/media-status/index.tsx
+++ b/packages/webui/src/client/ui/Status/media-status/index.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback, useEffect, useMemo, useRef, useState, JSX, CSSProperties } from 'react'
+import { useCallback, useEffect, useMemo, useRef, useState, JSX, CSSProperties } from 'react'
 import {
 	MediaStatus as MediaStatusComponent,
 	MediaStatusListItem as IMediaStatusListItem,
diff --git a/meteor/client/ui/Status/package-status/JobStatusIcon.tsx b/packages/webui/src/client/ui/Status/package-status/JobStatusIcon.tsx
similarity index 100%
rename from meteor/client/ui/Status/package-status/JobStatusIcon.tsx
rename to packages/webui/src/client/ui/Status/package-status/JobStatusIcon.tsx
diff --git a/meteor/client/ui/Status/package-status/PackageContainerStatus.tsx b/packages/webui/src/client/ui/Status/package-status/PackageContainerStatus.tsx
similarity index 97%
rename from meteor/client/ui/Status/package-status/PackageContainerStatus.tsx
rename to packages/webui/src/client/ui/Status/package-status/PackageContainerStatus.tsx
index c502dae2bb..04300b5d39 100644
--- a/meteor/client/ui/Status/package-status/PackageContainerStatus.tsx
+++ b/packages/webui/src/client/ui/Status/package-status/PackageContainerStatus.tsx
@@ -4,8 +4,8 @@ import { useTranslation } from 'react-i18next'
 import ClassNames from 'classnames'
 import { PackageContainerStatusDB } from '@sofie-automation/corelib/dist/dataModel/PackageContainerStatus'
 import { StatusCodePill } from '../StatusCodePill'
-import { doUserAction, UserAction } from '../../../../lib/clientUserAction'
-import { MeteorCall } from '../../../../lib/api/methods'
+import { doUserAction, UserAction } from '../../../lib/clientUserAction'
+import { MeteorCall } from '../../../lib/meteorApi'
 import { ExpectedPackageStatusAPI } from '@sofie-automation/blueprints-integration'
 import { PeripheralDevice } from '@sofie-automation/corelib/dist/dataModel/PeripheralDevice'
 
diff --git a/meteor/client/ui/Status/package-status/PackageStatus.tsx b/packages/webui/src/client/ui/Status/package-status/PackageStatus.tsx
similarity index 96%
rename from meteor/client/ui/Status/package-status/PackageStatus.tsx
rename to packages/webui/src/client/ui/Status/package-status/PackageStatus.tsx
index fb4c461cee..a6bb6c7b84 100644
--- a/meteor/client/ui/Status/package-status/PackageStatus.tsx
+++ b/packages/webui/src/client/ui/Status/package-status/PackageStatus.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react'
 import { ExpectedPackageWorkStatus } from '@sofie-automation/corelib/dist/dataModel/ExpectedPackageWorkStatuses'
-import { assertNever, unprotectString } from '../../../../lib/lib'
+import { assertNever, unprotectString } from '../../../lib/tempLib'
 import { ExpectedPackageDB } from '@sofie-automation/corelib/dist/dataModel/ExpectedPackages'
 import Tooltip from 'rc-tooltip'
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
@@ -31,9 +31,13 @@ export const PackageStatus: React.FC<{
 			return p2.content.title || p2.content.guid || unprotectString(props.package._id)
 		} else if (p2.type === ExpectedPackage.PackageType.JSON_DATA) {
 			return p2.content.path || unprotectString(props.package._id)
+		} else if (p2.type === ExpectedPackage.PackageType.HTML_TEMPLATE) {
+			return p2.content.path || unprotectString(props.package._id)
 		} else {
 			assertNever(p2)
-			return unprotectString(props.package._id)
+
+			const anyContent = (p2 as any).content
+			return anyContent.path || anyContent.filePath || anyContent.title || unprotectString(props.package._id)
 		}
 	}, [props.package])
 
diff --git a/meteor/client/ui/Status/package-status/PackageWorkStatus.tsx b/packages/webui/src/client/ui/Status/package-status/PackageWorkStatus.tsx
similarity index 96%
rename from meteor/client/ui/Status/package-status/PackageWorkStatus.tsx
rename to packages/webui/src/client/ui/Status/package-status/PackageWorkStatus.tsx
index f351befd7c..dca37063f3 100644
--- a/meteor/client/ui/Status/package-status/PackageWorkStatus.tsx
+++ b/packages/webui/src/client/ui/Status/package-status/PackageWorkStatus.tsx
@@ -1,11 +1,11 @@
 import * as React from 'react'
 import { ExpectedPackageWorkStatus } from '@sofie-automation/corelib/dist/dataModel/ExpectedPackageWorkStatuses'
-import { unprotectString } from '../../../../lib/lib'
+import { unprotectString } from '../../../lib/tempLib'
 import Tooltip from 'rc-tooltip'
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
 import { faRedo, faStopCircle, faChevronDown, faChevronRight, faExclamation } from '@fortawesome/free-solid-svg-icons'
-import { MeteorCall } from '../../../../lib/api/methods'
-import { doUserAction, UserAction } from '../../../../lib/clientUserAction'
+import { MeteorCall } from '../../../lib/meteorApi'
+import { doUserAction, UserAction } from '../../../lib/clientUserAction'
 
 import { DisplayFormattedTime } from '../../RundownList/DisplayFormattedTime'
 import { JobStatusIcon } from './JobStatusIcon'
diff --git a/meteor/client/ui/Status/package-status/index.tsx b/packages/webui/src/client/ui/Status/package-status/index.tsx
similarity index 97%
rename from meteor/client/ui/Status/package-status/index.tsx
rename to packages/webui/src/client/ui/Status/package-status/index.tsx
index 87bfe5c125..ef92268e34 100644
--- a/meteor/client/ui/Status/package-status/index.tsx
+++ b/packages/webui/src/client/ui/Status/package-status/index.tsx
@@ -1,10 +1,10 @@
 import React, { useMemo } from 'react'
 import { useSubscription, useTracker } from '../../../lib/ReactMeteorData/react-meteor-data'
 import { ExpectedPackageWorkStatus } from '@sofie-automation/corelib/dist/dataModel/ExpectedPackageWorkStatuses'
-import { normalizeArrayToMap, unprotectString } from '../../../../lib/lib'
+import { normalizeArrayToMap, unprotectString } from '../../../lib/tempLib'
 import { ExpectedPackageDB } from '@sofie-automation/corelib/dist/dataModel/ExpectedPackages'
-import { MeteorCall } from '../../../../lib/api/methods'
-import { doUserAction, UserAction } from '../../../../lib/clientUserAction'
+import { MeteorCall } from '../../../lib/meteorApi'
+import { doUserAction, UserAction } from '../../../lib/clientUserAction'
 import { Meteor } from 'meteor/meteor'
 import { PackageStatus } from './PackageStatus'
 import { PackageContainerStatus } from './PackageContainerStatus'
diff --git a/meteor/client/ui/Status/package-status/package-status.scss b/packages/webui/src/client/ui/Status/package-status/package-status.scss
similarity index 100%
rename from meteor/client/ui/Status/package-status/package-status.scss
rename to packages/webui/src/client/ui/Status/package-status/package-status.scss
diff --git a/meteor/client/ui/StudioScreenSaver/Clock.tsx b/packages/webui/src/client/ui/StudioScreenSaver/Clock.tsx
similarity index 91%
rename from meteor/client/ui/StudioScreenSaver/Clock.tsx
rename to packages/webui/src/client/ui/StudioScreenSaver/Clock.tsx
index b59aa2872a..e0db0c7116 100644
--- a/meteor/client/ui/StudioScreenSaver/Clock.tsx
+++ b/packages/webui/src/client/ui/StudioScreenSaver/Clock.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react'
 import Moment from 'react-moment'
 import { useCurrentTime } from '../../lib/lib'
 
diff --git a/meteor/client/ui/StudioScreenSaver/Countdown.tsx b/packages/webui/src/client/ui/StudioScreenSaver/Countdown.tsx
similarity index 98%
rename from meteor/client/ui/StudioScreenSaver/Countdown.tsx
rename to packages/webui/src/client/ui/StudioScreenSaver/Countdown.tsx
index 0c32fbcb30..82a7f6d031 100644
--- a/meteor/client/ui/StudioScreenSaver/Countdown.tsx
+++ b/packages/webui/src/client/ui/StudioScreenSaver/Countdown.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react'
 import { useTranslation } from 'react-i18next'
 import { useCurrentTime } from '../../lib/lib'
 
diff --git a/meteor/client/ui/StudioScreenSaver/StudioScreenSaver.tsx b/packages/webui/src/client/ui/StudioScreenSaver/StudioScreenSaver.tsx
similarity index 97%
rename from meteor/client/ui/StudioScreenSaver/StudioScreenSaver.tsx
rename to packages/webui/src/client/ui/StudioScreenSaver/StudioScreenSaver.tsx
index 4461719f50..d316402d69 100644
--- a/meteor/client/ui/StudioScreenSaver/StudioScreenSaver.tsx
+++ b/packages/webui/src/client/ui/StudioScreenSaver/StudioScreenSaver.tsx
@@ -1,15 +1,15 @@
 import * as React from 'react'
 import { Translated, useSubscription, useTracker } from '../../lib/ReactMeteorData/ReactMeteorData'
 import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
-import { getCurrentTime } from '../../../lib/lib'
-import { invalidateAfter } from '../../../lib/invalidatingTime'
-import { MeteorPubSub } from '../../../lib/api/pubsub'
+import { getCurrentTime } from '../../lib/systemTime'
+import { invalidateAfter } from '../../lib/invalidatingTime'
+import { MeteorPubSub } from '@sofie-automation/meteor-lib/dist/api/pubsub'
 import classNames from 'classnames'
 import { Clock } from './Clock'
 import { Countdown } from './Countdown'
 import { PlaylistTiming } from '@sofie-automation/corelib/dist/playout/rundownTiming'
 import { UIStudios } from '../Collections'
-import { UIStudio } from '../../../lib/api/studios'
+import { UIStudio } from '@sofie-automation/meteor-lib/dist/api/studios'
 import { StudioId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import { RundownPlaylists } from '../../collections'
 import { CorelibPubSub } from '@sofie-automation/corelib/dist/pubsub'
diff --git a/meteor/client/ui/SupportPopUp.tsx b/packages/webui/src/client/ui/SupportPopUp.tsx
similarity index 100%
rename from meteor/client/ui/SupportPopUp.tsx
rename to packages/webui/src/client/ui/SupportPopUp.tsx
diff --git a/meteor/client/ui/TestTools/DeviceTriggers.tsx b/packages/webui/src/client/ui/TestTools/DeviceTriggers.tsx
similarity index 97%
rename from meteor/client/ui/TestTools/DeviceTriggers.tsx
rename to packages/webui/src/client/ui/TestTools/DeviceTriggers.tsx
index fc82378744..3a366e0655 100644
--- a/meteor/client/ui/TestTools/DeviceTriggers.tsx
+++ b/packages/webui/src/client/ui/TestTools/DeviceTriggers.tsx
@@ -1,12 +1,12 @@
 import React, { Fragment, useState } from 'react'
 import { useSubscription, useTracker } from '../../lib/ReactMeteorData/react-meteor-data'
 import { Mongo } from 'meteor/mongo'
-import {} from '../../../lib/api/pubsub'
+import {} from '@sofie-automation/meteor-lib/dist/api/pubsub'
 import { protectString, unprotectString } from '@sofie-automation/corelib/dist/protectedString'
 import { useTranslation } from 'react-i18next'
 import { Link, useParams } from 'react-router-dom'
 import { PeripheralDeviceId } from '@sofie-automation/corelib/dist/dataModel/Ids'
-import { DeviceTriggerMountedAction, PreviewWrappedAdLib } from '../../../lib/api/triggers/MountedTriggers'
+import { DeviceTriggerMountedAction, PreviewWrappedAdLib } from '@sofie-automation/meteor-lib/dist/api/MountedTriggers'
 import { PeripheralDevices } from '../../collections'
 import { CorelibPubSub } from '@sofie-automation/corelib/dist/pubsub'
 import {
diff --git a/meteor/client/ui/TestTools/Mappings.tsx b/packages/webui/src/client/ui/TestTools/Mappings.tsx
similarity index 94%
rename from meteor/client/ui/TestTools/Mappings.tsx
rename to packages/webui/src/client/ui/TestTools/Mappings.tsx
index 95541df490..86331cb5cf 100644
--- a/meteor/client/ui/TestTools/Mappings.tsx
+++ b/packages/webui/src/client/ui/TestTools/Mappings.tsx
@@ -1,13 +1,12 @@
-import * as React from 'react'
 import { useSubscription, useTracker } from '../../lib/ReactMeteorData/react-meteor-data'
 import * as _ from 'underscore'
-import { omit, unprotectString } from '../../../lib/lib'
-import { MeteorPubSub } from '../../../lib/api/pubsub'
+import { omit, unprotectString } from '../../lib/tempLib'
+import { MeteorPubSub } from '@sofie-automation/meteor-lib/dist/api/pubsub'
 import { makeTableOfObject } from '../../lib/utilComponents'
 import { StudioSelect } from './StudioSelect'
 import { MappingExt } from '@sofie-automation/corelib/dist/dataModel/Studio'
 import { LookaheadMode, TSR } from '@sofie-automation/blueprints-integration'
-import { createSyncPeripheralDeviceCustomPublicationMongoCollection } from '../../../lib/collections/lib'
+import { createSyncPeripheralDeviceCustomPublicationMongoCollection } from '../../collections/lib'
 import { StudioId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import { PeripheralDevicePubSubCollectionsNames } from '@sofie-automation/shared-lib/dist/pubsub/peripheralDevice'
 import { useTranslation } from 'react-i18next'
diff --git a/meteor/client/ui/TestTools/StudioSelect.tsx b/packages/webui/src/client/ui/TestTools/StudioSelect.tsx
similarity index 87%
rename from meteor/client/ui/TestTools/StudioSelect.tsx
rename to packages/webui/src/client/ui/TestTools/StudioSelect.tsx
index bb8857c92c..2ce8c69862 100644
--- a/meteor/client/ui/TestTools/StudioSelect.tsx
+++ b/packages/webui/src/client/ui/TestTools/StudioSelect.tsx
@@ -1,10 +1,9 @@
-import React from 'react'
 import { useTracker } from '../../lib/ReactMeteorData/react-meteor-data'
 import { Link } from 'react-router-dom'
-import { unprotectString } from '../../../lib/lib'
+import { unprotectString } from '../../lib/tempLib'
 import { UIStudios } from '../Collections'
 import { useTranslation } from 'react-i18next'
-import { UIStudio } from '../../../lib/api/studios'
+import { UIStudio } from '@sofie-automation/meteor-lib/dist/api/studios'
 
 function StudioSelect({ title, path }: Readonly<{ title: string; path: string }>): JSX.Element {
 	const studios = useTracker(
diff --git a/meteor/client/ui/TestTools/Timeline.tsx b/packages/webui/src/client/ui/TestTools/Timeline.tsx
similarity index 99%
rename from meteor/client/ui/TestTools/Timeline.tsx
rename to packages/webui/src/client/ui/TestTools/Timeline.tsx
index 57a03d8cd7..77f2af6bd8 100644
--- a/meteor/client/ui/TestTools/Timeline.tsx
+++ b/packages/webui/src/client/ui/TestTools/Timeline.tsx
@@ -2,8 +2,8 @@ import * as React from 'react'
 import { useSubscription, useTracker } from '../../lib/ReactMeteorData/react-meteor-data'
 import * as _ from 'underscore'
 import { deserializeTimelineBlob, TimelineHash } from '@sofie-automation/corelib/dist/dataModel/Timeline'
-import { applyToArray, clone, normalizeArray, protectString } from '../../../lib/lib'
-import { MeteorPubSub } from '../../../lib/api/pubsub'
+import { applyToArray, clone, normalizeArray, protectString } from '../../lib/tempLib'
+import { MeteorPubSub } from '@sofie-automation/meteor-lib/dist/api/pubsub'
 import {
 	TimelineState,
 	ResolvedTimelineObjectInstance,
@@ -20,7 +20,7 @@ import { useTranslation } from 'react-i18next'
 import { useParams } from 'react-router-dom'
 import { useCallback, useEffect, useMemo, useState } from 'react'
 import Classnames from 'classnames'
-import { createSyncPeripheralDeviceCustomPublicationMongoCollection } from '../../../lib/collections/lib'
+import { createSyncPeripheralDeviceCustomPublicationMongoCollection } from '../../collections/lib'
 import { StudioId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import { PeripheralDevicePubSubCollectionsNames } from '@sofie-automation/shared-lib/dist/pubsub/peripheralDevice'
 
diff --git a/meteor/client/ui/TestTools/TimelineDatastore.tsx b/packages/webui/src/client/ui/TestTools/TimelineDatastore.tsx
similarity index 98%
rename from meteor/client/ui/TestTools/TimelineDatastore.tsx
rename to packages/webui/src/client/ui/TestTools/TimelineDatastore.tsx
index afdcd77925..cabb4f7e1a 100644
--- a/meteor/client/ui/TestTools/TimelineDatastore.tsx
+++ b/packages/webui/src/client/ui/TestTools/TimelineDatastore.tsx
@@ -1,4 +1,3 @@
-import * as React from 'react'
 import { useSubscription, useTracker } from '../../lib/ReactMeteorData/react-meteor-data'
 import { StudioSelect } from './StudioSelect'
 import { Mongo } from 'meteor/mongo'
diff --git a/meteor/client/ui/TestTools/index.tsx b/packages/webui/src/client/ui/TestTools/index.tsx
similarity index 97%
rename from meteor/client/ui/TestTools/index.tsx
rename to packages/webui/src/client/ui/TestTools/index.tsx
index 73e1e3891a..cc02ce393b 100644
--- a/meteor/client/ui/TestTools/index.tsx
+++ b/packages/webui/src/client/ui/TestTools/index.tsx
@@ -1,9 +1,8 @@
-import * as React from 'react'
 import { useTranslation } from 'react-i18next'
 import { useSubscription } from '../../lib/ReactMeteorData/react-meteor-data'
 import { Route, Switch, NavLink, Redirect } from 'react-router-dom'
 import { TimelineView, TimelineStudioSelect } from './Timeline'
-import { MeteorPubSub } from '../../../lib/api/pubsub'
+import { MeteorPubSub } from '@sofie-automation/meteor-lib/dist/api/pubsub'
 import { MappingsStudioSelect, MappingsView } from './Mappings'
 import { TimelineDatastoreStudioSelect, TimelineDatastoreView } from './TimelineDatastore'
 import { DeviceTriggersDeviceSelect, DeviceTriggersView } from './DeviceTriggers'
diff --git a/packages/webui/src/client/ui/UserPermissions.tsx b/packages/webui/src/client/ui/UserPermissions.tsx
new file mode 100644
index 0000000000..a11fa4bb9e
--- /dev/null
+++ b/packages/webui/src/client/ui/UserPermissions.tsx
@@ -0,0 +1,74 @@
+import React, { useEffect, useMemo, useState } from 'react'
+import {
+	getLocalAllowStudio,
+	getLocalAllowConfigure,
+	getLocalAllowDeveloper,
+	getLocalAllowTesting,
+	getLocalAllowService,
+	setAllowStudio,
+	setAllowConfigure,
+	setAllowDeveloper,
+	setAllowTesting,
+	setAllowService,
+} from '../lib/localStorage'
+import { parse as queryStringParse } from 'query-string'
+
+export interface UserPermissions {
+	studio: boolean
+	configure: boolean
+	developer: boolean
+	testing: boolean
+	service: boolean
+}
+
+export const UserPermissionsContext = React.createContext<Readonly<UserPermissions>>({
+	studio: false,
+	configure: false,
+	developer: false,
+	testing: false,
+	service: false,
+})
+
+export function useUserPermissions(): UserPermissions {
+	const location = window.location
+
+	const [permissions, setPermissions] = useState({
+		studio: getLocalAllowStudio(),
+		configure: getLocalAllowConfigure(),
+		developer: getLocalAllowDeveloper(),
+		testing: getLocalAllowTesting(),
+		service: getLocalAllowService(),
+	})
+
+	useEffect(() => {
+		if (!location.search) return
+
+		const params = queryStringParse(location.search)
+
+		if (params['studio']) setAllowStudio(params['studio'] === '1')
+		if (params['configure']) setAllowConfigure(params['configure'] === '1')
+		if (params['develop']) setAllowDeveloper(params['develop'] === '1')
+		if (params['testing']) setAllowTesting(params['testing'] === '1')
+		if (params['service']) setAllowService(params['service'] === '1')
+
+		if (params['admin']) {
+			const val = params['admin'] === '1'
+			setAllowStudio(val)
+			setAllowConfigure(val)
+			setAllowDeveloper(val)
+			setAllowTesting(val)
+			setAllowService(val)
+		}
+
+		setPermissions({
+			studio: getLocalAllowStudio(),
+			configure: getLocalAllowConfigure(),
+			developer: getLocalAllowDeveloper(),
+			testing: getLocalAllowTesting(),
+			service: getLocalAllowService(),
+		})
+	}, [location.search])
+
+	// A naive memoizing of the value, to avoid reactions when the value is identical
+	return useMemo(() => permissions, [JSON.stringify(permissions)])
+}
diff --git a/meteor/client/ui/examples.tsx b/packages/webui/src/client/ui/examples.tsx
similarity index 100%
rename from meteor/client/ui/examples.tsx
rename to packages/webui/src/client/ui/examples.tsx
diff --git a/meteor/client/ui/globals/keyboardGlobals.d.ts b/packages/webui/src/client/ui/globals/keyboardGlobals.d.ts
similarity index 100%
rename from meteor/client/ui/globals/keyboardGlobals.d.ts
rename to packages/webui/src/client/ui/globals/keyboardGlobals.d.ts
diff --git a/meteor/client/ui/globals/wakeLockGlobals.d.ts b/packages/webui/src/client/ui/globals/wakeLockGlobals.d.ts
similarity index 91%
rename from meteor/client/ui/globals/wakeLockGlobals.d.ts
rename to packages/webui/src/client/ui/globals/wakeLockGlobals.d.ts
index f24709ea57..9141c2c4d7 100644
--- a/meteor/client/ui/globals/wakeLockGlobals.d.ts
+++ b/packages/webui/src/client/ui/globals/wakeLockGlobals.d.ts
@@ -1,7 +1,7 @@
 type WakeLockType = 'screen'
 
 declare type WakeLockSentinel = {
-	readonly release(): void
+	release(): void
 	readonly released: boolean
 	readonly type: WakeLockType
 }
diff --git a/meteor/client/ui/i18n.ts b/packages/webui/src/client/ui/i18n.ts
similarity index 94%
rename from meteor/client/ui/i18n.ts
rename to packages/webui/src/client/ui/i18n.ts
index ee0d20d6a2..7c4850e53d 100644
--- a/meteor/client/ui/i18n.ts
+++ b/packages/webui/src/client/ui/i18n.ts
@@ -5,11 +5,11 @@ import Backend from 'i18next-http-backend'
 import LanguageDetector from 'i18next-browser-languagedetector'
 import { initReactI18next } from 'react-i18next'
 import { WithManagedTracker } from '../lib/reactiveData/reactiveDataHelper'
-import { MeteorPubSub } from '../../lib/api/pubsub'
-import { Translation, TranslationsBundle } from '../../lib/collections/TranslationsBundles'
+import { MeteorPubSub } from '@sofie-automation/meteor-lib/dist/api/pubsub'
+import { Translation, TranslationsBundle } from '@sofie-automation/meteor-lib/dist/collections/TranslationsBundles'
 import { I18NextData } from '@sofie-automation/blueprints-integration'
-import { MeteorCall } from '../../lib/api/methods'
-import { ClientAPI } from '../../lib/api/client'
+import { MeteorCall } from '../lib/meteorApi'
+import { ClientAPI } from '@sofie-automation/meteor-lib/dist/api/client'
 import { interpollateTranslation } from '@sofie-automation/corelib/dist/TranslatableMessage'
 import { TranslationsBundleId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import { TranslationsBundles } from '../collections'
diff --git a/meteor/client/ui/util/useRundownAndShowStyleIdsForPlaylist.ts b/packages/webui/src/client/ui/util/useRundownAndShowStyleIdsForPlaylist.ts
similarity index 93%
rename from meteor/client/ui/util/useRundownAndShowStyleIdsForPlaylist.ts
rename to packages/webui/src/client/ui/util/useRundownAndShowStyleIdsForPlaylist.ts
index 5e5f3e5efb..0f164cefab 100644
--- a/meteor/client/ui/util/useRundownAndShowStyleIdsForPlaylist.ts
+++ b/packages/webui/src/client/ui/util/useRundownAndShowStyleIdsForPlaylist.ts
@@ -5,7 +5,7 @@ import {
 	ShowStyleVariantId,
 } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import { Rundown } from '@sofie-automation/corelib/dist/dataModel/Rundown'
-import { RundownPlaylistCollectionUtil } from '../../../lib/collections/rundownPlaylistUtil'
+import { RundownPlaylistCollectionUtil } from '../../collections/rundownPlaylistUtil'
 import { useTracker } from '../../lib/ReactMeteorData/ReactMeteorData'
 import _ from 'underscore'
 
diff --git a/meteor/client/ui/util/useSetDocumentClass.ts b/packages/webui/src/client/ui/util/useSetDocumentClass.ts
similarity index 100%
rename from meteor/client/ui/util/useSetDocumentClass.ts
rename to packages/webui/src/client/ui/util/useSetDocumentClass.ts
diff --git a/meteor/client/ui/util/useToggleExpandHelper.tsx b/packages/webui/src/client/ui/util/useToggleExpandHelper.tsx
similarity index 100%
rename from meteor/client/ui/util/useToggleExpandHelper.tsx
rename to packages/webui/src/client/ui/util/useToggleExpandHelper.tsx
diff --git a/meteor/client/utils/__tests__/dimensions.test.ts b/packages/webui/src/client/utils/__tests__/dimensions.test.ts
similarity index 100%
rename from meteor/client/utils/__tests__/dimensions.test.ts
rename to packages/webui/src/client/utils/__tests__/dimensions.test.ts
diff --git a/meteor/client/utils/__tests__/positions.test.ts b/packages/webui/src/client/utils/__tests__/positions.test.ts
similarity index 100%
rename from meteor/client/utils/__tests__/positions.test.ts
rename to packages/webui/src/client/utils/__tests__/positions.test.ts
diff --git a/meteor/client/utils/dimensions.ts b/packages/webui/src/client/utils/dimensions.ts
similarity index 100%
rename from meteor/client/utils/dimensions.ts
rename to packages/webui/src/client/utils/dimensions.ts
diff --git a/meteor/client/utils/positions.ts b/packages/webui/src/client/utils/positions.ts
similarity index 100%
rename from meteor/client/utils/positions.ts
rename to packages/webui/src/client/utils/positions.ts
diff --git a/meteor/public/fonts/Overpass/OFL.txt b/packages/webui/src/fonts/Overpass/OFL.txt
similarity index 100%
rename from meteor/public/fonts/Overpass/OFL.txt
rename to packages/webui/src/fonts/Overpass/OFL.txt
diff --git a/meteor/public/fonts/Overpass/Overpass-Black.ttf b/packages/webui/src/fonts/Overpass/Overpass-Black.ttf
similarity index 100%
rename from meteor/public/fonts/Overpass/Overpass-Black.ttf
rename to packages/webui/src/fonts/Overpass/Overpass-Black.ttf
diff --git a/meteor/public/fonts/Overpass/Overpass-BlackItalic.ttf b/packages/webui/src/fonts/Overpass/Overpass-BlackItalic.ttf
similarity index 100%
rename from meteor/public/fonts/Overpass/Overpass-BlackItalic.ttf
rename to packages/webui/src/fonts/Overpass/Overpass-BlackItalic.ttf
diff --git a/meteor/public/fonts/Overpass/Overpass-Bold.ttf b/packages/webui/src/fonts/Overpass/Overpass-Bold.ttf
similarity index 100%
rename from meteor/public/fonts/Overpass/Overpass-Bold.ttf
rename to packages/webui/src/fonts/Overpass/Overpass-Bold.ttf
diff --git a/meteor/public/fonts/Overpass/Overpass-BoldItalic.ttf b/packages/webui/src/fonts/Overpass/Overpass-BoldItalic.ttf
similarity index 100%
rename from meteor/public/fonts/Overpass/Overpass-BoldItalic.ttf
rename to packages/webui/src/fonts/Overpass/Overpass-BoldItalic.ttf
diff --git a/meteor/public/fonts/Overpass/Overpass-ExtraBold.ttf b/packages/webui/src/fonts/Overpass/Overpass-ExtraBold.ttf
similarity index 100%
rename from meteor/public/fonts/Overpass/Overpass-ExtraBold.ttf
rename to packages/webui/src/fonts/Overpass/Overpass-ExtraBold.ttf
diff --git a/meteor/public/fonts/Overpass/Overpass-ExtraBoldItalic.ttf b/packages/webui/src/fonts/Overpass/Overpass-ExtraBoldItalic.ttf
similarity index 100%
rename from meteor/public/fonts/Overpass/Overpass-ExtraBoldItalic.ttf
rename to packages/webui/src/fonts/Overpass/Overpass-ExtraBoldItalic.ttf
diff --git a/meteor/public/fonts/Overpass/Overpass-ExtraLight.ttf b/packages/webui/src/fonts/Overpass/Overpass-ExtraLight.ttf
similarity index 100%
rename from meteor/public/fonts/Overpass/Overpass-ExtraLight.ttf
rename to packages/webui/src/fonts/Overpass/Overpass-ExtraLight.ttf
diff --git a/meteor/public/fonts/Overpass/Overpass-ExtraLightItalic.ttf b/packages/webui/src/fonts/Overpass/Overpass-ExtraLightItalic.ttf
similarity index 100%
rename from meteor/public/fonts/Overpass/Overpass-ExtraLightItalic.ttf
rename to packages/webui/src/fonts/Overpass/Overpass-ExtraLightItalic.ttf
diff --git a/meteor/public/fonts/Overpass/Overpass-Italic.ttf b/packages/webui/src/fonts/Overpass/Overpass-Italic.ttf
similarity index 100%
rename from meteor/public/fonts/Overpass/Overpass-Italic.ttf
rename to packages/webui/src/fonts/Overpass/Overpass-Italic.ttf
diff --git a/meteor/public/fonts/Overpass/Overpass-Light.ttf b/packages/webui/src/fonts/Overpass/Overpass-Light.ttf
similarity index 100%
rename from meteor/public/fonts/Overpass/Overpass-Light.ttf
rename to packages/webui/src/fonts/Overpass/Overpass-Light.ttf
diff --git a/meteor/public/fonts/Overpass/Overpass-LightItalic.ttf b/packages/webui/src/fonts/Overpass/Overpass-LightItalic.ttf
similarity index 100%
rename from meteor/public/fonts/Overpass/Overpass-LightItalic.ttf
rename to packages/webui/src/fonts/Overpass/Overpass-LightItalic.ttf
diff --git a/meteor/public/fonts/Overpass/Overpass-Regular.ttf b/packages/webui/src/fonts/Overpass/Overpass-Regular.ttf
similarity index 100%
rename from meteor/public/fonts/Overpass/Overpass-Regular.ttf
rename to packages/webui/src/fonts/Overpass/Overpass-Regular.ttf
diff --git a/meteor/public/fonts/Overpass/Overpass-Regular.woff b/packages/webui/src/fonts/Overpass/Overpass-Regular.woff
similarity index 100%
rename from meteor/public/fonts/Overpass/Overpass-Regular.woff
rename to packages/webui/src/fonts/Overpass/Overpass-Regular.woff
diff --git a/meteor/public/fonts/Overpass/Overpass-SemiBold.ttf b/packages/webui/src/fonts/Overpass/Overpass-SemiBold.ttf
similarity index 100%
rename from meteor/public/fonts/Overpass/Overpass-SemiBold.ttf
rename to packages/webui/src/fonts/Overpass/Overpass-SemiBold.ttf
diff --git a/meteor/public/fonts/Overpass/Overpass-SemiBoldItalic.ttf b/packages/webui/src/fonts/Overpass/Overpass-SemiBoldItalic.ttf
similarity index 100%
rename from meteor/public/fonts/Overpass/Overpass-SemiBoldItalic.ttf
rename to packages/webui/src/fonts/Overpass/Overpass-SemiBoldItalic.ttf
diff --git a/meteor/public/fonts/Overpass/Overpass-Thin.ttf b/packages/webui/src/fonts/Overpass/Overpass-Thin.ttf
similarity index 100%
rename from meteor/public/fonts/Overpass/Overpass-Thin.ttf
rename to packages/webui/src/fonts/Overpass/Overpass-Thin.ttf
diff --git a/meteor/public/fonts/Overpass/Overpass-ThinItalic.ttf b/packages/webui/src/fonts/Overpass/Overpass-ThinItalic.ttf
similarity index 100%
rename from meteor/public/fonts/Overpass/Overpass-ThinItalic.ttf
rename to packages/webui/src/fonts/Overpass/Overpass-ThinItalic.ttf
diff --git a/meteor/public/fonts/Source_Serif_Pro/OFL.txt b/packages/webui/src/fonts/Source_Serif_Pro/OFL.txt
similarity index 100%
rename from meteor/public/fonts/Source_Serif_Pro/OFL.txt
rename to packages/webui/src/fonts/Source_Serif_Pro/OFL.txt
diff --git a/meteor/public/fonts/Source_Serif_Pro/SourceSerifPro-Bold.ttf b/packages/webui/src/fonts/Source_Serif_Pro/SourceSerifPro-Bold.ttf
similarity index 100%
rename from meteor/public/fonts/Source_Serif_Pro/SourceSerifPro-Bold.ttf
rename to packages/webui/src/fonts/Source_Serif_Pro/SourceSerifPro-Bold.ttf
diff --git a/meteor/public/fonts/Source_Serif_Pro/SourceSerifPro-Bold.woff b/packages/webui/src/fonts/Source_Serif_Pro/SourceSerifPro-Bold.woff
similarity index 100%
rename from meteor/public/fonts/Source_Serif_Pro/SourceSerifPro-Bold.woff
rename to packages/webui/src/fonts/Source_Serif_Pro/SourceSerifPro-Bold.woff
diff --git a/meteor/public/fonts/Source_Serif_Pro/SourceSerifPro-Regular.ttf b/packages/webui/src/fonts/Source_Serif_Pro/SourceSerifPro-Regular.ttf
similarity index 100%
rename from meteor/public/fonts/Source_Serif_Pro/SourceSerifPro-Regular.ttf
rename to packages/webui/src/fonts/Source_Serif_Pro/SourceSerifPro-Regular.ttf
diff --git a/meteor/public/fonts/Source_Serif_Pro/SourceSerifPro-Regular.woff b/packages/webui/src/fonts/Source_Serif_Pro/SourceSerifPro-Regular.woff
similarity index 100%
rename from meteor/public/fonts/Source_Serif_Pro/SourceSerifPro-Regular.woff
rename to packages/webui/src/fonts/Source_Serif_Pro/SourceSerifPro-Regular.woff
diff --git a/meteor/public/fonts/Source_Serif_Pro/SourceSerifPro-Semibold.ttf b/packages/webui/src/fonts/Source_Serif_Pro/SourceSerifPro-Semibold.ttf
similarity index 100%
rename from meteor/public/fonts/Source_Serif_Pro/SourceSerifPro-Semibold.ttf
rename to packages/webui/src/fonts/Source_Serif_Pro/SourceSerifPro-Semibold.ttf
diff --git a/meteor/public/fonts/Source_Serif_Pro/SourceSerifPro-Semibold.woff b/packages/webui/src/fonts/Source_Serif_Pro/SourceSerifPro-Semibold.woff
similarity index 100%
rename from meteor/public/fonts/Source_Serif_Pro/SourceSerifPro-Semibold.woff
rename to packages/webui/src/fonts/Source_Serif_Pro/SourceSerifPro-Semibold.woff
diff --git a/meteor/public/fonts/roboto-condensed-v18-latin_latin-ext/COPYRIGHT.txt b/packages/webui/src/fonts/roboto-condensed-v18-latin_latin-ext/COPYRIGHT.txt
similarity index 100%
rename from meteor/public/fonts/roboto-condensed-v18-latin_latin-ext/COPYRIGHT.txt
rename to packages/webui/src/fonts/roboto-condensed-v18-latin_latin-ext/COPYRIGHT.txt
diff --git a/meteor/public/fonts/roboto-condensed-v18-latin_latin-ext/LICENSE.txt b/packages/webui/src/fonts/roboto-condensed-v18-latin_latin-ext/LICENSE.txt
similarity index 100%
rename from meteor/public/fonts/roboto-condensed-v18-latin_latin-ext/LICENSE.txt
rename to packages/webui/src/fonts/roboto-condensed-v18-latin_latin-ext/LICENSE.txt
diff --git a/meteor/public/fonts/roboto-condensed-v18-latin_latin-ext/roboto-condensed-v18-latin_latin-ext-300.eot b/packages/webui/src/fonts/roboto-condensed-v18-latin_latin-ext/roboto-condensed-v18-latin_latin-ext-300.eot
similarity index 100%
rename from meteor/public/fonts/roboto-condensed-v18-latin_latin-ext/roboto-condensed-v18-latin_latin-ext-300.eot
rename to packages/webui/src/fonts/roboto-condensed-v18-latin_latin-ext/roboto-condensed-v18-latin_latin-ext-300.eot
diff --git a/meteor/public/fonts/roboto-condensed-v18-latin_latin-ext/roboto-condensed-v18-latin_latin-ext-300.svg b/packages/webui/src/fonts/roboto-condensed-v18-latin_latin-ext/roboto-condensed-v18-latin_latin-ext-300.svg
similarity index 100%
rename from meteor/public/fonts/roboto-condensed-v18-latin_latin-ext/roboto-condensed-v18-latin_latin-ext-300.svg
rename to packages/webui/src/fonts/roboto-condensed-v18-latin_latin-ext/roboto-condensed-v18-latin_latin-ext-300.svg
diff --git a/meteor/public/fonts/roboto-condensed-v18-latin_latin-ext/roboto-condensed-v18-latin_latin-ext-300.ttf b/packages/webui/src/fonts/roboto-condensed-v18-latin_latin-ext/roboto-condensed-v18-latin_latin-ext-300.ttf
similarity index 100%
rename from meteor/public/fonts/roboto-condensed-v18-latin_latin-ext/roboto-condensed-v18-latin_latin-ext-300.ttf
rename to packages/webui/src/fonts/roboto-condensed-v18-latin_latin-ext/roboto-condensed-v18-latin_latin-ext-300.ttf
diff --git a/meteor/public/fonts/roboto-condensed-v18-latin_latin-ext/roboto-condensed-v18-latin_latin-ext-300.woff b/packages/webui/src/fonts/roboto-condensed-v18-latin_latin-ext/roboto-condensed-v18-latin_latin-ext-300.woff
similarity index 100%
rename from meteor/public/fonts/roboto-condensed-v18-latin_latin-ext/roboto-condensed-v18-latin_latin-ext-300.woff
rename to packages/webui/src/fonts/roboto-condensed-v18-latin_latin-ext/roboto-condensed-v18-latin_latin-ext-300.woff
diff --git a/meteor/public/fonts/roboto-condensed-v18-latin_latin-ext/roboto-condensed-v18-latin_latin-ext-300.woff2 b/packages/webui/src/fonts/roboto-condensed-v18-latin_latin-ext/roboto-condensed-v18-latin_latin-ext-300.woff2
similarity index 100%
rename from meteor/public/fonts/roboto-condensed-v18-latin_latin-ext/roboto-condensed-v18-latin_latin-ext-300.woff2
rename to packages/webui/src/fonts/roboto-condensed-v18-latin_latin-ext/roboto-condensed-v18-latin_latin-ext-300.woff2
diff --git a/meteor/public/fonts/roboto-condensed-v18-latin_latin-ext/roboto-condensed-v18-latin_latin-ext-300italic.eot b/packages/webui/src/fonts/roboto-condensed-v18-latin_latin-ext/roboto-condensed-v18-latin_latin-ext-300italic.eot
similarity index 100%
rename from meteor/public/fonts/roboto-condensed-v18-latin_latin-ext/roboto-condensed-v18-latin_latin-ext-300italic.eot
rename to packages/webui/src/fonts/roboto-condensed-v18-latin_latin-ext/roboto-condensed-v18-latin_latin-ext-300italic.eot
diff --git a/meteor/public/fonts/roboto-condensed-v18-latin_latin-ext/roboto-condensed-v18-latin_latin-ext-300italic.svg b/packages/webui/src/fonts/roboto-condensed-v18-latin_latin-ext/roboto-condensed-v18-latin_latin-ext-300italic.svg
similarity index 100%
rename from meteor/public/fonts/roboto-condensed-v18-latin_latin-ext/roboto-condensed-v18-latin_latin-ext-300italic.svg
rename to packages/webui/src/fonts/roboto-condensed-v18-latin_latin-ext/roboto-condensed-v18-latin_latin-ext-300italic.svg
diff --git a/meteor/public/fonts/roboto-condensed-v18-latin_latin-ext/roboto-condensed-v18-latin_latin-ext-300italic.ttf b/packages/webui/src/fonts/roboto-condensed-v18-latin_latin-ext/roboto-condensed-v18-latin_latin-ext-300italic.ttf
similarity index 100%
rename from meteor/public/fonts/roboto-condensed-v18-latin_latin-ext/roboto-condensed-v18-latin_latin-ext-300italic.ttf
rename to packages/webui/src/fonts/roboto-condensed-v18-latin_latin-ext/roboto-condensed-v18-latin_latin-ext-300italic.ttf
diff --git a/meteor/public/fonts/roboto-condensed-v18-latin_latin-ext/roboto-condensed-v18-latin_latin-ext-300italic.woff b/packages/webui/src/fonts/roboto-condensed-v18-latin_latin-ext/roboto-condensed-v18-latin_latin-ext-300italic.woff
similarity index 100%
rename from meteor/public/fonts/roboto-condensed-v18-latin_latin-ext/roboto-condensed-v18-latin_latin-ext-300italic.woff
rename to packages/webui/src/fonts/roboto-condensed-v18-latin_latin-ext/roboto-condensed-v18-latin_latin-ext-300italic.woff
diff --git a/meteor/public/fonts/roboto-condensed-v18-latin_latin-ext/roboto-condensed-v18-latin_latin-ext-300italic.woff2 b/packages/webui/src/fonts/roboto-condensed-v18-latin_latin-ext/roboto-condensed-v18-latin_latin-ext-300italic.woff2
similarity index 100%
rename from meteor/public/fonts/roboto-condensed-v18-latin_latin-ext/roboto-condensed-v18-latin_latin-ext-300italic.woff2
rename to packages/webui/src/fonts/roboto-condensed-v18-latin_latin-ext/roboto-condensed-v18-latin_latin-ext-300italic.woff2
diff --git a/meteor/public/fonts/roboto-condensed-v18-latin_latin-ext/roboto-condensed-v18-latin_latin-ext-700.eot b/packages/webui/src/fonts/roboto-condensed-v18-latin_latin-ext/roboto-condensed-v18-latin_latin-ext-700.eot
similarity index 100%
rename from meteor/public/fonts/roboto-condensed-v18-latin_latin-ext/roboto-condensed-v18-latin_latin-ext-700.eot
rename to packages/webui/src/fonts/roboto-condensed-v18-latin_latin-ext/roboto-condensed-v18-latin_latin-ext-700.eot
diff --git a/meteor/public/fonts/roboto-condensed-v18-latin_latin-ext/roboto-condensed-v18-latin_latin-ext-700.svg b/packages/webui/src/fonts/roboto-condensed-v18-latin_latin-ext/roboto-condensed-v18-latin_latin-ext-700.svg
similarity index 100%
rename from meteor/public/fonts/roboto-condensed-v18-latin_latin-ext/roboto-condensed-v18-latin_latin-ext-700.svg
rename to packages/webui/src/fonts/roboto-condensed-v18-latin_latin-ext/roboto-condensed-v18-latin_latin-ext-700.svg
diff --git a/meteor/public/fonts/roboto-condensed-v18-latin_latin-ext/roboto-condensed-v18-latin_latin-ext-700.ttf b/packages/webui/src/fonts/roboto-condensed-v18-latin_latin-ext/roboto-condensed-v18-latin_latin-ext-700.ttf
similarity index 100%
rename from meteor/public/fonts/roboto-condensed-v18-latin_latin-ext/roboto-condensed-v18-latin_latin-ext-700.ttf
rename to packages/webui/src/fonts/roboto-condensed-v18-latin_latin-ext/roboto-condensed-v18-latin_latin-ext-700.ttf
diff --git a/meteor/public/fonts/roboto-condensed-v18-latin_latin-ext/roboto-condensed-v18-latin_latin-ext-700.woff b/packages/webui/src/fonts/roboto-condensed-v18-latin_latin-ext/roboto-condensed-v18-latin_latin-ext-700.woff
similarity index 100%
rename from meteor/public/fonts/roboto-condensed-v18-latin_latin-ext/roboto-condensed-v18-latin_latin-ext-700.woff
rename to packages/webui/src/fonts/roboto-condensed-v18-latin_latin-ext/roboto-condensed-v18-latin_latin-ext-700.woff
diff --git a/meteor/public/fonts/roboto-condensed-v18-latin_latin-ext/roboto-condensed-v18-latin_latin-ext-700.woff2 b/packages/webui/src/fonts/roboto-condensed-v18-latin_latin-ext/roboto-condensed-v18-latin_latin-ext-700.woff2
similarity index 100%
rename from meteor/public/fonts/roboto-condensed-v18-latin_latin-ext/roboto-condensed-v18-latin_latin-ext-700.woff2
rename to packages/webui/src/fonts/roboto-condensed-v18-latin_latin-ext/roboto-condensed-v18-latin_latin-ext-700.woff2
diff --git a/meteor/public/fonts/roboto-condensed-v18-latin_latin-ext/roboto-condensed-v18-latin_latin-ext-700italic.eot b/packages/webui/src/fonts/roboto-condensed-v18-latin_latin-ext/roboto-condensed-v18-latin_latin-ext-700italic.eot
similarity index 100%
rename from meteor/public/fonts/roboto-condensed-v18-latin_latin-ext/roboto-condensed-v18-latin_latin-ext-700italic.eot
rename to packages/webui/src/fonts/roboto-condensed-v18-latin_latin-ext/roboto-condensed-v18-latin_latin-ext-700italic.eot
diff --git a/meteor/public/fonts/roboto-condensed-v18-latin_latin-ext/roboto-condensed-v18-latin_latin-ext-700italic.svg b/packages/webui/src/fonts/roboto-condensed-v18-latin_latin-ext/roboto-condensed-v18-latin_latin-ext-700italic.svg
similarity index 100%
rename from meteor/public/fonts/roboto-condensed-v18-latin_latin-ext/roboto-condensed-v18-latin_latin-ext-700italic.svg
rename to packages/webui/src/fonts/roboto-condensed-v18-latin_latin-ext/roboto-condensed-v18-latin_latin-ext-700italic.svg
diff --git a/meteor/public/fonts/roboto-condensed-v18-latin_latin-ext/roboto-condensed-v18-latin_latin-ext-700italic.ttf b/packages/webui/src/fonts/roboto-condensed-v18-latin_latin-ext/roboto-condensed-v18-latin_latin-ext-700italic.ttf
similarity index 100%
rename from meteor/public/fonts/roboto-condensed-v18-latin_latin-ext/roboto-condensed-v18-latin_latin-ext-700italic.ttf
rename to packages/webui/src/fonts/roboto-condensed-v18-latin_latin-ext/roboto-condensed-v18-latin_latin-ext-700italic.ttf
diff --git a/meteor/public/fonts/roboto-condensed-v18-latin_latin-ext/roboto-condensed-v18-latin_latin-ext-700italic.woff b/packages/webui/src/fonts/roboto-condensed-v18-latin_latin-ext/roboto-condensed-v18-latin_latin-ext-700italic.woff
similarity index 100%
rename from meteor/public/fonts/roboto-condensed-v18-latin_latin-ext/roboto-condensed-v18-latin_latin-ext-700italic.woff
rename to packages/webui/src/fonts/roboto-condensed-v18-latin_latin-ext/roboto-condensed-v18-latin_latin-ext-700italic.woff
diff --git a/meteor/public/fonts/roboto-condensed-v18-latin_latin-ext/roboto-condensed-v18-latin_latin-ext-700italic.woff2 b/packages/webui/src/fonts/roboto-condensed-v18-latin_latin-ext/roboto-condensed-v18-latin_latin-ext-700italic.woff2
similarity index 100%
rename from meteor/public/fonts/roboto-condensed-v18-latin_latin-ext/roboto-condensed-v18-latin_latin-ext-700italic.woff2
rename to packages/webui/src/fonts/roboto-condensed-v18-latin_latin-ext/roboto-condensed-v18-latin_latin-ext-700italic.woff2
diff --git a/meteor/public/fonts/roboto-condensed-v18-latin_latin-ext/roboto-condensed-v18-latin_latin-ext-italic.eot b/packages/webui/src/fonts/roboto-condensed-v18-latin_latin-ext/roboto-condensed-v18-latin_latin-ext-italic.eot
similarity index 100%
rename from meteor/public/fonts/roboto-condensed-v18-latin_latin-ext/roboto-condensed-v18-latin_latin-ext-italic.eot
rename to packages/webui/src/fonts/roboto-condensed-v18-latin_latin-ext/roboto-condensed-v18-latin_latin-ext-italic.eot
diff --git a/meteor/public/fonts/roboto-condensed-v18-latin_latin-ext/roboto-condensed-v18-latin_latin-ext-italic.svg b/packages/webui/src/fonts/roboto-condensed-v18-latin_latin-ext/roboto-condensed-v18-latin_latin-ext-italic.svg
similarity index 100%
rename from meteor/public/fonts/roboto-condensed-v18-latin_latin-ext/roboto-condensed-v18-latin_latin-ext-italic.svg
rename to packages/webui/src/fonts/roboto-condensed-v18-latin_latin-ext/roboto-condensed-v18-latin_latin-ext-italic.svg
diff --git a/meteor/public/fonts/roboto-condensed-v18-latin_latin-ext/roboto-condensed-v18-latin_latin-ext-italic.ttf b/packages/webui/src/fonts/roboto-condensed-v18-latin_latin-ext/roboto-condensed-v18-latin_latin-ext-italic.ttf
similarity index 100%
rename from meteor/public/fonts/roboto-condensed-v18-latin_latin-ext/roboto-condensed-v18-latin_latin-ext-italic.ttf
rename to packages/webui/src/fonts/roboto-condensed-v18-latin_latin-ext/roboto-condensed-v18-latin_latin-ext-italic.ttf
diff --git a/meteor/public/fonts/roboto-condensed-v18-latin_latin-ext/roboto-condensed-v18-latin_latin-ext-italic.woff b/packages/webui/src/fonts/roboto-condensed-v18-latin_latin-ext/roboto-condensed-v18-latin_latin-ext-italic.woff
similarity index 100%
rename from meteor/public/fonts/roboto-condensed-v18-latin_latin-ext/roboto-condensed-v18-latin_latin-ext-italic.woff
rename to packages/webui/src/fonts/roboto-condensed-v18-latin_latin-ext/roboto-condensed-v18-latin_latin-ext-italic.woff
diff --git a/meteor/public/fonts/roboto-condensed-v18-latin_latin-ext/roboto-condensed-v18-latin_latin-ext-italic.woff2 b/packages/webui/src/fonts/roboto-condensed-v18-latin_latin-ext/roboto-condensed-v18-latin_latin-ext-italic.woff2
similarity index 100%
rename from meteor/public/fonts/roboto-condensed-v18-latin_latin-ext/roboto-condensed-v18-latin_latin-ext-italic.woff2
rename to packages/webui/src/fonts/roboto-condensed-v18-latin_latin-ext/roboto-condensed-v18-latin_latin-ext-italic.woff2
diff --git a/meteor/public/fonts/roboto-condensed-v18-latin_latin-ext/roboto-condensed-v18-latin_latin-ext-regular.eot b/packages/webui/src/fonts/roboto-condensed-v18-latin_latin-ext/roboto-condensed-v18-latin_latin-ext-regular.eot
similarity index 100%
rename from meteor/public/fonts/roboto-condensed-v18-latin_latin-ext/roboto-condensed-v18-latin_latin-ext-regular.eot
rename to packages/webui/src/fonts/roboto-condensed-v18-latin_latin-ext/roboto-condensed-v18-latin_latin-ext-regular.eot
diff --git a/meteor/public/fonts/roboto-condensed-v18-latin_latin-ext/roboto-condensed-v18-latin_latin-ext-regular.svg b/packages/webui/src/fonts/roboto-condensed-v18-latin_latin-ext/roboto-condensed-v18-latin_latin-ext-regular.svg
similarity index 100%
rename from meteor/public/fonts/roboto-condensed-v18-latin_latin-ext/roboto-condensed-v18-latin_latin-ext-regular.svg
rename to packages/webui/src/fonts/roboto-condensed-v18-latin_latin-ext/roboto-condensed-v18-latin_latin-ext-regular.svg
diff --git a/meteor/public/fonts/roboto-condensed-v18-latin_latin-ext/roboto-condensed-v18-latin_latin-ext-regular.ttf b/packages/webui/src/fonts/roboto-condensed-v18-latin_latin-ext/roboto-condensed-v18-latin_latin-ext-regular.ttf
similarity index 100%
rename from meteor/public/fonts/roboto-condensed-v18-latin_latin-ext/roboto-condensed-v18-latin_latin-ext-regular.ttf
rename to packages/webui/src/fonts/roboto-condensed-v18-latin_latin-ext/roboto-condensed-v18-latin_latin-ext-regular.ttf
diff --git a/meteor/public/fonts/roboto-condensed-v18-latin_latin-ext/roboto-condensed-v18-latin_latin-ext-regular.woff b/packages/webui/src/fonts/roboto-condensed-v18-latin_latin-ext/roboto-condensed-v18-latin_latin-ext-regular.woff
similarity index 100%
rename from meteor/public/fonts/roboto-condensed-v18-latin_latin-ext/roboto-condensed-v18-latin_latin-ext-regular.woff
rename to packages/webui/src/fonts/roboto-condensed-v18-latin_latin-ext/roboto-condensed-v18-latin_latin-ext-regular.woff
diff --git a/meteor/public/fonts/roboto-condensed-v18-latin_latin-ext/roboto-condensed-v18-latin_latin-ext-regular.woff2 b/packages/webui/src/fonts/roboto-condensed-v18-latin_latin-ext/roboto-condensed-v18-latin_latin-ext-regular.woff2
similarity index 100%
rename from meteor/public/fonts/roboto-condensed-v18-latin_latin-ext/roboto-condensed-v18-latin_latin-ext-regular.woff2
rename to packages/webui/src/fonts/roboto-condensed-v18-latin_latin-ext/roboto-condensed-v18-latin_latin-ext-regular.woff2
diff --git a/meteor/public/fonts/roboto-gh-pages/README.md b/packages/webui/src/fonts/roboto-gh-pages/README.md
similarity index 100%
rename from meteor/public/fonts/roboto-gh-pages/README.md
rename to packages/webui/src/fonts/roboto-gh-pages/README.md
diff --git a/meteor/public/fonts/roboto-gh-pages/bower.json b/packages/webui/src/fonts/roboto-gh-pages/bower.json
similarity index 100%
rename from meteor/public/fonts/roboto-gh-pages/bower.json
rename to packages/webui/src/fonts/roboto-gh-pages/bower.json
diff --git a/meteor/public/fonts/roboto-gh-pages/fonts/Black/Roboto-Black.ttf b/packages/webui/src/fonts/roboto-gh-pages/fonts/Black/Roboto-Black.ttf
similarity index 100%
rename from meteor/public/fonts/roboto-gh-pages/fonts/Black/Roboto-Black.ttf
rename to packages/webui/src/fonts/roboto-gh-pages/fonts/Black/Roboto-Black.ttf
diff --git a/meteor/public/fonts/roboto-gh-pages/fonts/Black/Roboto-Black.woff b/packages/webui/src/fonts/roboto-gh-pages/fonts/Black/Roboto-Black.woff
similarity index 100%
rename from meteor/public/fonts/roboto-gh-pages/fonts/Black/Roboto-Black.woff
rename to packages/webui/src/fonts/roboto-gh-pages/fonts/Black/Roboto-Black.woff
diff --git a/meteor/public/fonts/roboto-gh-pages/fonts/Black/Roboto-Black.woff2 b/packages/webui/src/fonts/roboto-gh-pages/fonts/Black/Roboto-Black.woff2
similarity index 100%
rename from meteor/public/fonts/roboto-gh-pages/fonts/Black/Roboto-Black.woff2
rename to packages/webui/src/fonts/roboto-gh-pages/fonts/Black/Roboto-Black.woff2
diff --git a/meteor/public/fonts/roboto-gh-pages/fonts/BlackItalic/Roboto-BlackItalic.ttf b/packages/webui/src/fonts/roboto-gh-pages/fonts/BlackItalic/Roboto-BlackItalic.ttf
similarity index 100%
rename from meteor/public/fonts/roboto-gh-pages/fonts/BlackItalic/Roboto-BlackItalic.ttf
rename to packages/webui/src/fonts/roboto-gh-pages/fonts/BlackItalic/Roboto-BlackItalic.ttf
diff --git a/meteor/public/fonts/roboto-gh-pages/fonts/BlackItalic/Roboto-BlackItalic.woff b/packages/webui/src/fonts/roboto-gh-pages/fonts/BlackItalic/Roboto-BlackItalic.woff
similarity index 100%
rename from meteor/public/fonts/roboto-gh-pages/fonts/BlackItalic/Roboto-BlackItalic.woff
rename to packages/webui/src/fonts/roboto-gh-pages/fonts/BlackItalic/Roboto-BlackItalic.woff
diff --git a/meteor/public/fonts/roboto-gh-pages/fonts/BlackItalic/Roboto-BlackItalic.woff2 b/packages/webui/src/fonts/roboto-gh-pages/fonts/BlackItalic/Roboto-BlackItalic.woff2
similarity index 100%
rename from meteor/public/fonts/roboto-gh-pages/fonts/BlackItalic/Roboto-BlackItalic.woff2
rename to packages/webui/src/fonts/roboto-gh-pages/fonts/BlackItalic/Roboto-BlackItalic.woff2
diff --git a/meteor/public/fonts/roboto-gh-pages/fonts/Bold/Roboto-Bold.ttf b/packages/webui/src/fonts/roboto-gh-pages/fonts/Bold/Roboto-Bold.ttf
similarity index 100%
rename from meteor/public/fonts/roboto-gh-pages/fonts/Bold/Roboto-Bold.ttf
rename to packages/webui/src/fonts/roboto-gh-pages/fonts/Bold/Roboto-Bold.ttf
diff --git a/meteor/public/fonts/roboto-gh-pages/fonts/Bold/Roboto-Bold.woff b/packages/webui/src/fonts/roboto-gh-pages/fonts/Bold/Roboto-Bold.woff
similarity index 100%
rename from meteor/public/fonts/roboto-gh-pages/fonts/Bold/Roboto-Bold.woff
rename to packages/webui/src/fonts/roboto-gh-pages/fonts/Bold/Roboto-Bold.woff
diff --git a/meteor/public/fonts/roboto-gh-pages/fonts/Bold/Roboto-Bold.woff2 b/packages/webui/src/fonts/roboto-gh-pages/fonts/Bold/Roboto-Bold.woff2
similarity index 100%
rename from meteor/public/fonts/roboto-gh-pages/fonts/Bold/Roboto-Bold.woff2
rename to packages/webui/src/fonts/roboto-gh-pages/fonts/Bold/Roboto-Bold.woff2
diff --git a/meteor/public/fonts/roboto-gh-pages/fonts/BoldItalic/Roboto-BoldItalic.ttf b/packages/webui/src/fonts/roboto-gh-pages/fonts/BoldItalic/Roboto-BoldItalic.ttf
similarity index 100%
rename from meteor/public/fonts/roboto-gh-pages/fonts/BoldItalic/Roboto-BoldItalic.ttf
rename to packages/webui/src/fonts/roboto-gh-pages/fonts/BoldItalic/Roboto-BoldItalic.ttf
diff --git a/meteor/public/fonts/roboto-gh-pages/fonts/BoldItalic/Roboto-BoldItalic.woff b/packages/webui/src/fonts/roboto-gh-pages/fonts/BoldItalic/Roboto-BoldItalic.woff
similarity index 100%
rename from meteor/public/fonts/roboto-gh-pages/fonts/BoldItalic/Roboto-BoldItalic.woff
rename to packages/webui/src/fonts/roboto-gh-pages/fonts/BoldItalic/Roboto-BoldItalic.woff
diff --git a/meteor/public/fonts/roboto-gh-pages/fonts/BoldItalic/Roboto-BoldItalic.woff2 b/packages/webui/src/fonts/roboto-gh-pages/fonts/BoldItalic/Roboto-BoldItalic.woff2
similarity index 100%
rename from meteor/public/fonts/roboto-gh-pages/fonts/BoldItalic/Roboto-BoldItalic.woff2
rename to packages/webui/src/fonts/roboto-gh-pages/fonts/BoldItalic/Roboto-BoldItalic.woff2
diff --git a/meteor/public/fonts/roboto-gh-pages/fonts/COPYRIGHT.txt b/packages/webui/src/fonts/roboto-gh-pages/fonts/COPYRIGHT.txt
similarity index 100%
rename from meteor/public/fonts/roboto-gh-pages/fonts/COPYRIGHT.txt
rename to packages/webui/src/fonts/roboto-gh-pages/fonts/COPYRIGHT.txt
diff --git a/meteor/public/fonts/roboto-gh-pages/fonts/DESCRIPTION.en_us.html b/packages/webui/src/fonts/roboto-gh-pages/fonts/DESCRIPTION.en_us.html
similarity index 100%
rename from meteor/public/fonts/roboto-gh-pages/fonts/DESCRIPTION.en_us.html
rename to packages/webui/src/fonts/roboto-gh-pages/fonts/DESCRIPTION.en_us.html
diff --git a/meteor/public/fonts/roboto-gh-pages/fonts/Italic/Roboto-Italic.ttf b/packages/webui/src/fonts/roboto-gh-pages/fonts/Italic/Roboto-Italic.ttf
similarity index 100%
rename from meteor/public/fonts/roboto-gh-pages/fonts/Italic/Roboto-Italic.ttf
rename to packages/webui/src/fonts/roboto-gh-pages/fonts/Italic/Roboto-Italic.ttf
diff --git a/meteor/public/fonts/roboto-gh-pages/fonts/Italic/Roboto-Italic.woff b/packages/webui/src/fonts/roboto-gh-pages/fonts/Italic/Roboto-Italic.woff
similarity index 100%
rename from meteor/public/fonts/roboto-gh-pages/fonts/Italic/Roboto-Italic.woff
rename to packages/webui/src/fonts/roboto-gh-pages/fonts/Italic/Roboto-Italic.woff
diff --git a/meteor/public/fonts/roboto-gh-pages/fonts/Italic/Roboto-Italic.woff2 b/packages/webui/src/fonts/roboto-gh-pages/fonts/Italic/Roboto-Italic.woff2
similarity index 100%
rename from meteor/public/fonts/roboto-gh-pages/fonts/Italic/Roboto-Italic.woff2
rename to packages/webui/src/fonts/roboto-gh-pages/fonts/Italic/Roboto-Italic.woff2
diff --git a/meteor/public/fonts/roboto-gh-pages/fonts/LICENSE.txt b/packages/webui/src/fonts/roboto-gh-pages/fonts/LICENSE.txt
similarity index 100%
rename from meteor/public/fonts/roboto-gh-pages/fonts/LICENSE.txt
rename to packages/webui/src/fonts/roboto-gh-pages/fonts/LICENSE.txt
diff --git a/meteor/public/fonts/roboto-gh-pages/fonts/Light/Roboto-Light.ttf b/packages/webui/src/fonts/roboto-gh-pages/fonts/Light/Roboto-Light.ttf
similarity index 100%
rename from meteor/public/fonts/roboto-gh-pages/fonts/Light/Roboto-Light.ttf
rename to packages/webui/src/fonts/roboto-gh-pages/fonts/Light/Roboto-Light.ttf
diff --git a/meteor/public/fonts/roboto-gh-pages/fonts/Light/Roboto-Light.woff b/packages/webui/src/fonts/roboto-gh-pages/fonts/Light/Roboto-Light.woff
similarity index 100%
rename from meteor/public/fonts/roboto-gh-pages/fonts/Light/Roboto-Light.woff
rename to packages/webui/src/fonts/roboto-gh-pages/fonts/Light/Roboto-Light.woff
diff --git a/meteor/public/fonts/roboto-gh-pages/fonts/Light/Roboto-Light.woff2 b/packages/webui/src/fonts/roboto-gh-pages/fonts/Light/Roboto-Light.woff2
similarity index 100%
rename from meteor/public/fonts/roboto-gh-pages/fonts/Light/Roboto-Light.woff2
rename to packages/webui/src/fonts/roboto-gh-pages/fonts/Light/Roboto-Light.woff2
diff --git a/meteor/public/fonts/roboto-gh-pages/fonts/LightItalic/Roboto-LightItalic.ttf b/packages/webui/src/fonts/roboto-gh-pages/fonts/LightItalic/Roboto-LightItalic.ttf
similarity index 100%
rename from meteor/public/fonts/roboto-gh-pages/fonts/LightItalic/Roboto-LightItalic.ttf
rename to packages/webui/src/fonts/roboto-gh-pages/fonts/LightItalic/Roboto-LightItalic.ttf
diff --git a/meteor/public/fonts/roboto-gh-pages/fonts/LightItalic/Roboto-LightItalic.woff b/packages/webui/src/fonts/roboto-gh-pages/fonts/LightItalic/Roboto-LightItalic.woff
similarity index 100%
rename from meteor/public/fonts/roboto-gh-pages/fonts/LightItalic/Roboto-LightItalic.woff
rename to packages/webui/src/fonts/roboto-gh-pages/fonts/LightItalic/Roboto-LightItalic.woff
diff --git a/meteor/public/fonts/roboto-gh-pages/fonts/LightItalic/Roboto-LightItalic.woff2 b/packages/webui/src/fonts/roboto-gh-pages/fonts/LightItalic/Roboto-LightItalic.woff2
similarity index 100%
rename from meteor/public/fonts/roboto-gh-pages/fonts/LightItalic/Roboto-LightItalic.woff2
rename to packages/webui/src/fonts/roboto-gh-pages/fonts/LightItalic/Roboto-LightItalic.woff2
diff --git a/meteor/public/fonts/roboto-gh-pages/fonts/METADATA.pb b/packages/webui/src/fonts/roboto-gh-pages/fonts/METADATA.pb
similarity index 100%
rename from meteor/public/fonts/roboto-gh-pages/fonts/METADATA.pb
rename to packages/webui/src/fonts/roboto-gh-pages/fonts/METADATA.pb
diff --git a/meteor/public/fonts/roboto-gh-pages/fonts/Medium/Roboto-Medium.ttf b/packages/webui/src/fonts/roboto-gh-pages/fonts/Medium/Roboto-Medium.ttf
similarity index 100%
rename from meteor/public/fonts/roboto-gh-pages/fonts/Medium/Roboto-Medium.ttf
rename to packages/webui/src/fonts/roboto-gh-pages/fonts/Medium/Roboto-Medium.ttf
diff --git a/meteor/public/fonts/roboto-gh-pages/fonts/Medium/Roboto-Medium.woff b/packages/webui/src/fonts/roboto-gh-pages/fonts/Medium/Roboto-Medium.woff
similarity index 100%
rename from meteor/public/fonts/roboto-gh-pages/fonts/Medium/Roboto-Medium.woff
rename to packages/webui/src/fonts/roboto-gh-pages/fonts/Medium/Roboto-Medium.woff
diff --git a/meteor/public/fonts/roboto-gh-pages/fonts/Medium/Roboto-Medium.woff2 b/packages/webui/src/fonts/roboto-gh-pages/fonts/Medium/Roboto-Medium.woff2
similarity index 100%
rename from meteor/public/fonts/roboto-gh-pages/fonts/Medium/Roboto-Medium.woff2
rename to packages/webui/src/fonts/roboto-gh-pages/fonts/Medium/Roboto-Medium.woff2
diff --git a/meteor/public/fonts/roboto-gh-pages/fonts/MediumItalic/Roboto-MediumItalic.ttf b/packages/webui/src/fonts/roboto-gh-pages/fonts/MediumItalic/Roboto-MediumItalic.ttf
similarity index 100%
rename from meteor/public/fonts/roboto-gh-pages/fonts/MediumItalic/Roboto-MediumItalic.ttf
rename to packages/webui/src/fonts/roboto-gh-pages/fonts/MediumItalic/Roboto-MediumItalic.ttf
diff --git a/meteor/public/fonts/roboto-gh-pages/fonts/MediumItalic/Roboto-MediumItalic.woff b/packages/webui/src/fonts/roboto-gh-pages/fonts/MediumItalic/Roboto-MediumItalic.woff
similarity index 100%
rename from meteor/public/fonts/roboto-gh-pages/fonts/MediumItalic/Roboto-MediumItalic.woff
rename to packages/webui/src/fonts/roboto-gh-pages/fonts/MediumItalic/Roboto-MediumItalic.woff
diff --git a/meteor/public/fonts/roboto-gh-pages/fonts/MediumItalic/Roboto-MediumItalic.woff2 b/packages/webui/src/fonts/roboto-gh-pages/fonts/MediumItalic/Roboto-MediumItalic.woff2
similarity index 100%
rename from meteor/public/fonts/roboto-gh-pages/fonts/MediumItalic/Roboto-MediumItalic.woff2
rename to packages/webui/src/fonts/roboto-gh-pages/fonts/MediumItalic/Roboto-MediumItalic.woff2
diff --git a/meteor/public/fonts/roboto-gh-pages/fonts/Regular/Roboto-Regular.ttf b/packages/webui/src/fonts/roboto-gh-pages/fonts/Regular/Roboto-Regular.ttf
similarity index 100%
rename from meteor/public/fonts/roboto-gh-pages/fonts/Regular/Roboto-Regular.ttf
rename to packages/webui/src/fonts/roboto-gh-pages/fonts/Regular/Roboto-Regular.ttf
diff --git a/meteor/public/fonts/roboto-gh-pages/fonts/Regular/Roboto-Regular.woff b/packages/webui/src/fonts/roboto-gh-pages/fonts/Regular/Roboto-Regular.woff
similarity index 100%
rename from meteor/public/fonts/roboto-gh-pages/fonts/Regular/Roboto-Regular.woff
rename to packages/webui/src/fonts/roboto-gh-pages/fonts/Regular/Roboto-Regular.woff
diff --git a/meteor/public/fonts/roboto-gh-pages/fonts/Regular/Roboto-Regular.woff2 b/packages/webui/src/fonts/roboto-gh-pages/fonts/Regular/Roboto-Regular.woff2
similarity index 100%
rename from meteor/public/fonts/roboto-gh-pages/fonts/Regular/Roboto-Regular.woff2
rename to packages/webui/src/fonts/roboto-gh-pages/fonts/Regular/Roboto-Regular.woff2
diff --git a/meteor/public/fonts/roboto-gh-pages/fonts/Thin/Roboto-Thin.ttf b/packages/webui/src/fonts/roboto-gh-pages/fonts/Thin/Roboto-Thin.ttf
similarity index 100%
rename from meteor/public/fonts/roboto-gh-pages/fonts/Thin/Roboto-Thin.ttf
rename to packages/webui/src/fonts/roboto-gh-pages/fonts/Thin/Roboto-Thin.ttf
diff --git a/meteor/public/fonts/roboto-gh-pages/fonts/Thin/Roboto-Thin.woff b/packages/webui/src/fonts/roboto-gh-pages/fonts/Thin/Roboto-Thin.woff
similarity index 100%
rename from meteor/public/fonts/roboto-gh-pages/fonts/Thin/Roboto-Thin.woff
rename to packages/webui/src/fonts/roboto-gh-pages/fonts/Thin/Roboto-Thin.woff
diff --git a/meteor/public/fonts/roboto-gh-pages/fonts/Thin/Roboto-Thin.woff2 b/packages/webui/src/fonts/roboto-gh-pages/fonts/Thin/Roboto-Thin.woff2
similarity index 100%
rename from meteor/public/fonts/roboto-gh-pages/fonts/Thin/Roboto-Thin.woff2
rename to packages/webui/src/fonts/roboto-gh-pages/fonts/Thin/Roboto-Thin.woff2
diff --git a/meteor/public/fonts/roboto-gh-pages/fonts/ThinItalic/Roboto-ThinItalic.ttf b/packages/webui/src/fonts/roboto-gh-pages/fonts/ThinItalic/Roboto-ThinItalic.ttf
similarity index 100%
rename from meteor/public/fonts/roboto-gh-pages/fonts/ThinItalic/Roboto-ThinItalic.ttf
rename to packages/webui/src/fonts/roboto-gh-pages/fonts/ThinItalic/Roboto-ThinItalic.ttf
diff --git a/meteor/public/fonts/roboto-gh-pages/fonts/ThinItalic/Roboto-ThinItalic.woff b/packages/webui/src/fonts/roboto-gh-pages/fonts/ThinItalic/Roboto-ThinItalic.woff
similarity index 100%
rename from meteor/public/fonts/roboto-gh-pages/fonts/ThinItalic/Roboto-ThinItalic.woff
rename to packages/webui/src/fonts/roboto-gh-pages/fonts/ThinItalic/Roboto-ThinItalic.woff
diff --git a/meteor/public/fonts/roboto-gh-pages/fonts/ThinItalic/Roboto-ThinItalic.woff2 b/packages/webui/src/fonts/roboto-gh-pages/fonts/ThinItalic/Roboto-ThinItalic.woff2
similarity index 100%
rename from meteor/public/fonts/roboto-gh-pages/fonts/ThinItalic/Roboto-ThinItalic.woff2
rename to packages/webui/src/fonts/roboto-gh-pages/fonts/ThinItalic/Roboto-ThinItalic.woff2
diff --git a/meteor/public/fonts/roboto-gh-pages/index.html b/packages/webui/src/fonts/roboto-gh-pages/index.html
similarity index 100%
rename from meteor/public/fonts/roboto-gh-pages/index.html
rename to packages/webui/src/fonts/roboto-gh-pages/index.html
diff --git a/meteor/public/fonts/roboto-gh-pages/less/_Black.less b/packages/webui/src/fonts/roboto-gh-pages/less/_Black.less
similarity index 100%
rename from meteor/public/fonts/roboto-gh-pages/less/_Black.less
rename to packages/webui/src/fonts/roboto-gh-pages/less/_Black.less
diff --git a/meteor/public/fonts/roboto-gh-pages/less/_BlackItalic.less b/packages/webui/src/fonts/roboto-gh-pages/less/_BlackItalic.less
similarity index 100%
rename from meteor/public/fonts/roboto-gh-pages/less/_BlackItalic.less
rename to packages/webui/src/fonts/roboto-gh-pages/less/_BlackItalic.less
diff --git a/meteor/public/fonts/roboto-gh-pages/less/_Bold.less b/packages/webui/src/fonts/roboto-gh-pages/less/_Bold.less
similarity index 100%
rename from meteor/public/fonts/roboto-gh-pages/less/_Bold.less
rename to packages/webui/src/fonts/roboto-gh-pages/less/_Bold.less
diff --git a/meteor/public/fonts/roboto-gh-pages/less/_BoldItalic.less b/packages/webui/src/fonts/roboto-gh-pages/less/_BoldItalic.less
similarity index 100%
rename from meteor/public/fonts/roboto-gh-pages/less/_BoldItalic.less
rename to packages/webui/src/fonts/roboto-gh-pages/less/_BoldItalic.less
diff --git a/meteor/public/fonts/roboto-gh-pages/less/_Italic.less b/packages/webui/src/fonts/roboto-gh-pages/less/_Italic.less
similarity index 100%
rename from meteor/public/fonts/roboto-gh-pages/less/_Italic.less
rename to packages/webui/src/fonts/roboto-gh-pages/less/_Italic.less
diff --git a/meteor/public/fonts/roboto-gh-pages/less/_Light.less b/packages/webui/src/fonts/roboto-gh-pages/less/_Light.less
similarity index 100%
rename from meteor/public/fonts/roboto-gh-pages/less/_Light.less
rename to packages/webui/src/fonts/roboto-gh-pages/less/_Light.less
diff --git a/meteor/public/fonts/roboto-gh-pages/less/_LightItalic.less b/packages/webui/src/fonts/roboto-gh-pages/less/_LightItalic.less
similarity index 100%
rename from meteor/public/fonts/roboto-gh-pages/less/_LightItalic.less
rename to packages/webui/src/fonts/roboto-gh-pages/less/_LightItalic.less
diff --git a/meteor/public/fonts/roboto-gh-pages/less/_Medium.less b/packages/webui/src/fonts/roboto-gh-pages/less/_Medium.less
similarity index 100%
rename from meteor/public/fonts/roboto-gh-pages/less/_Medium.less
rename to packages/webui/src/fonts/roboto-gh-pages/less/_Medium.less
diff --git a/meteor/public/fonts/roboto-gh-pages/less/_MediumItalic.less b/packages/webui/src/fonts/roboto-gh-pages/less/_MediumItalic.less
similarity index 100%
rename from meteor/public/fonts/roboto-gh-pages/less/_MediumItalic.less
rename to packages/webui/src/fonts/roboto-gh-pages/less/_MediumItalic.less
diff --git a/meteor/public/fonts/roboto-gh-pages/less/_Regular.less b/packages/webui/src/fonts/roboto-gh-pages/less/_Regular.less
similarity index 100%
rename from meteor/public/fonts/roboto-gh-pages/less/_Regular.less
rename to packages/webui/src/fonts/roboto-gh-pages/less/_Regular.less
diff --git a/meteor/public/fonts/roboto-gh-pages/less/_Thin.less b/packages/webui/src/fonts/roboto-gh-pages/less/_Thin.less
similarity index 100%
rename from meteor/public/fonts/roboto-gh-pages/less/_Thin.less
rename to packages/webui/src/fonts/roboto-gh-pages/less/_Thin.less
diff --git a/meteor/public/fonts/roboto-gh-pages/less/_ThinItalic.less b/packages/webui/src/fonts/roboto-gh-pages/less/_ThinItalic.less
similarity index 100%
rename from meteor/public/fonts/roboto-gh-pages/less/_ThinItalic.less
rename to packages/webui/src/fonts/roboto-gh-pages/less/_ThinItalic.less
diff --git a/meteor/public/fonts/roboto-gh-pages/less/_mixins.less b/packages/webui/src/fonts/roboto-gh-pages/less/_mixins.less
similarity index 100%
rename from meteor/public/fonts/roboto-gh-pages/less/_mixins.less
rename to packages/webui/src/fonts/roboto-gh-pages/less/_mixins.less
diff --git a/meteor/public/fonts/roboto-gh-pages/less/_variables.less b/packages/webui/src/fonts/roboto-gh-pages/less/_variables.less
similarity index 100%
rename from meteor/public/fonts/roboto-gh-pages/less/_variables.less
rename to packages/webui/src/fonts/roboto-gh-pages/less/_variables.less
diff --git a/meteor/public/fonts/roboto-gh-pages/package.json b/packages/webui/src/fonts/roboto-gh-pages/package.json
similarity index 100%
rename from meteor/public/fonts/roboto-gh-pages/package.json
rename to packages/webui/src/fonts/roboto-gh-pages/package.json
diff --git a/meteor/public/fonts/roboto-gh-pages/roboto.css b/packages/webui/src/fonts/roboto-gh-pages/roboto.css
similarity index 100%
rename from meteor/public/fonts/roboto-gh-pages/roboto.css
rename to packages/webui/src/fonts/roboto-gh-pages/roboto.css
diff --git a/meteor/public/fonts/roboto-gh-pages/roboto.css.map b/packages/webui/src/fonts/roboto-gh-pages/roboto.css.map
similarity index 100%
rename from meteor/public/fonts/roboto-gh-pages/roboto.css.map
rename to packages/webui/src/fonts/roboto-gh-pages/roboto.css.map
diff --git a/meteor/public/fonts/roboto-gh-pages/roboto.less b/packages/webui/src/fonts/roboto-gh-pages/roboto.less
similarity index 100%
rename from meteor/public/fonts/roboto-gh-pages/roboto.less
rename to packages/webui/src/fonts/roboto-gh-pages/roboto.less
diff --git a/meteor/client/main.tsx b/packages/webui/src/main.tsx
similarity index 72%
rename from meteor/client/main.tsx
rename to packages/webui/src/main.tsx
index e96564ad97..a45d07e984 100644
--- a/meteor/client/main.tsx
+++ b/packages/webui/src/main.tsx
@@ -1,26 +1,25 @@
-import * as React from 'react'
 import { Meteor } from 'meteor/meteor'
+import 'meteor/ddp'
 import { createRoot } from 'react-dom/client'
 
 import { DndProvider } from 'react-dnd'
 import { HTML5Backend } from 'react-dnd-html5-backend'
-import { SorensenContextProvider } from './lib/SorensenContext'
+import { SorensenContextProvider } from './client/lib/SorensenContext'
 
 // Import some browser polyfills to handle rare features
-import './lib/polyfill/polyfills'
+import './client/lib/polyfill/polyfills'
 
-import './ui/i18n'
-
-import '../lib/main'
+import './client/ui/i18n'
 
 // Import files that call Meteor.startup:
-import './lib/currentTimeReactive'
-import './lib/uncaughtErrorHandler'
-import './lib/dev'
-
-import App from './ui/App'
-import { logger } from '../lib/logging'
-import './lib/logStatus'
+import './client/lib/currentTimeReactive'
+import './client/lib/uncaughtErrorHandler'
+import './client/lib/dev'
+import './client/lib/systemTime'
+
+import App from './client/ui/App'
+import { logger } from './client/lib/logging'
+import './client/lib/logStatus'
 
 if ('serviceWorker' in navigator) {
 	// Use the window load event to keep the page load performant
diff --git a/packages/webui/src/meteor/ddp-common/heartbeat.js b/packages/webui/src/meteor/ddp-common/heartbeat.js
new file mode 100644
index 0000000000..36c40221a0
--- /dev/null
+++ b/packages/webui/src/meteor/ddp-common/heartbeat.js
@@ -0,0 +1,92 @@
+import { DDPCommon } from './namespace'
+import { Meteor } from '../meteor'
+
+// Heartbeat options:
+//   heartbeatInterval: interval to send pings, in milliseconds.
+//   heartbeatTimeout: timeout to close the connection if a reply isn't
+//     received, in milliseconds.
+//   sendPing: function to call to send a ping on the connection.
+//   onTimeout: function to call to close the connection.
+
+DDPCommon.Heartbeat = class Heartbeat {
+    constructor(options) {
+      this.heartbeatInterval = options.heartbeatInterval;
+      this.heartbeatTimeout = options.heartbeatTimeout;
+      this._sendPing = options.sendPing;
+      this._onTimeout = options.onTimeout;
+      this._seenPacket = false;
+  
+      this._heartbeatIntervalHandle = null;
+      this._heartbeatTimeoutHandle = null;
+    }
+  
+    stop() {
+      this._clearHeartbeatIntervalTimer();
+      this._clearHeartbeatTimeoutTimer();
+    }
+  
+    start() {
+      this.stop();
+      this._startHeartbeatIntervalTimer();
+    }
+  
+    _startHeartbeatIntervalTimer() {
+      this._heartbeatIntervalHandle = Meteor.setInterval(
+        () => this._heartbeatIntervalFired(),
+        this.heartbeatInterval
+      );
+    }
+  
+    _startHeartbeatTimeoutTimer() {
+      this._heartbeatTimeoutHandle = Meteor.setTimeout(
+        () => this._heartbeatTimeoutFired(),
+        this.heartbeatTimeout
+      );
+    }
+  
+    _clearHeartbeatIntervalTimer() {
+      if (this._heartbeatIntervalHandle) {
+        Meteor.clearInterval(this._heartbeatIntervalHandle);
+        this._heartbeatIntervalHandle = null;
+      }
+    }
+  
+    _clearHeartbeatTimeoutTimer() {
+      if (this._heartbeatTimeoutHandle) {
+        Meteor.clearTimeout(this._heartbeatTimeoutHandle);
+        this._heartbeatTimeoutHandle = null;
+      }
+    }
+  
+    // The heartbeat interval timer is fired when we should send a ping.
+    _heartbeatIntervalFired() {
+      // don't send ping if we've seen a packet since we last checked,
+      // *or* if we have already sent a ping and are awaiting a timeout.
+      // That shouldn't happen, but it's possible if
+      // `this.heartbeatInterval` is smaller than
+      // `this.heartbeatTimeout`.
+      if (! this._seenPacket && ! this._heartbeatTimeoutHandle) {
+        this._sendPing();
+        // Set up timeout, in case a pong doesn't arrive in time.
+        this._startHeartbeatTimeoutTimer();
+      }
+      this._seenPacket = false;
+    }
+  
+    // The heartbeat timeout timer is fired when we sent a ping, but we
+    // timed out waiting for the pong.
+    _heartbeatTimeoutFired() {
+      this._heartbeatTimeoutHandle = null;
+      this._onTimeout();
+    }
+  
+    messageReceived() {
+      // Tell periodic checkin that we have seen a packet, and thus it
+      // does not need to send a ping this cycle.
+      this._seenPacket = true;
+      // If we were waiting for a pong, we got it.
+      if (this._heartbeatTimeoutHandle) {
+        this._clearHeartbeatTimeoutTimer();
+      }
+    }
+  };
\ No newline at end of file
diff --git a/packages/webui/src/meteor/ddp-common/index.js b/packages/webui/src/meteor/ddp-common/index.js
new file mode 100644
index 0000000000..3c8a5e7677
--- /dev/null
+++ b/packages/webui/src/meteor/ddp-common/index.js
@@ -0,0 +1,5 @@
+import './heartbeat'
+import './utils'
+import './method_invocation'
+
+export * from './namespace'
diff --git a/packages/webui/src/meteor/ddp-common/method_invocation.js b/packages/webui/src/meteor/ddp-common/method_invocation.js
new file mode 100644
index 0000000000..8816819de4
--- /dev/null
+++ b/packages/webui/src/meteor/ddp-common/method_invocation.js
@@ -0,0 +1,81 @@
+import { DDPCommon } from './namespace'
+
+// Instance name is this because it is usually referred to as this inside a
+// method definition
+/**
+ * @summary The state for a single invocation of a method, referenced by this
+ * inside a method definition.
+ * @param {Object} options
+ * @instanceName this
+ * @showInstanceName true
+ */
+ DDPCommon.MethodInvocation = class MethodInvocation {
+    constructor(options) {
+      // true if we're running not the actual method, but a stub (that is,
+      // if we're on a client (which may be a browser, or in the future a
+      // server connecting to another server) and presently running a
+      // simulation of a server-side method for latency compensation
+      // purposes). not currently true except in a client such as a browser,
+      // since there's usually no point in running stubs unless you have a
+      // zero-latency connection to the user.
+
+  
+      // call this function to allow other method invocations (from the
+      // same client) to continue running without waiting for this one to
+      // complete.
+      this._unblock = options.unblock || function () {};
+      this._calledUnblock = false;
+  
+      // current user id
+  
+      /**
+       * @summary The id of the user that made this method call, or `null` if no user was logged in.
+       * @locus Anywhere
+       * @name  userId
+       * @memberOf DDPCommon.MethodInvocation
+       * @instance
+       */
+      this.userId = options.userId;
+  
+      // sets current user id in all appropriate server contexts and
+      // reruns subscriptions
+      this._setUserId = options.setUserId || function () {};
+  
+      // On the server, the connection this method call came in on.
+  
+      /**
+       * @summary Access inside a method invocation. The [connection](#meteor_onconnection) that this method was received on. `null` if the method is not associated with a connection, eg. a server initiated method call. Calls to methods made from a server method which was in turn initiated from the client share the same `connection`.
+       * @locus Server
+       * @name  connection
+       * @memberOf DDPCommon.MethodInvocation
+       * @instance
+       */
+      this.connection = options.connection;
+    }
+  
+    /**
+     * @summary Call inside a method invocation.  Allow subsequent method from this client to begin running in a new fiber.
+     * @locus Server
+     * @memberOf DDPCommon.MethodInvocation
+     * @instance
+     */
+    unblock() {
+      this._calledUnblock = true;
+      this._unblock();
+    }
+  
+    /**
+     * @summary Set the logged in user.
+     * @locus Server
+     * @memberOf DDPCommon.MethodInvocation
+     * @instance
+     * @param {String | null} userId The value that should be returned by `userId` on this connection.
+     */
+    setUserId(userId) {
+      if (this._calledUnblock) {
+        throw new Error("Can't call setUserId in a method after calling unblock");
+      }
+      this.userId = userId;
+      this._setUserId(userId);
+    }
+  };
\ No newline at end of file
diff --git a/packages/webui/src/meteor/ddp-common/namespace.js b/packages/webui/src/meteor/ddp-common/namespace.js
new file mode 100644
index 0000000000..8c4702a8a1
--- /dev/null
+++ b/packages/webui/src/meteor/ddp-common/namespace.js
@@ -0,0 +1,9 @@
+/**
+ * @namespace DDPCommon
+ * @summary Namespace for DDPCommon-related methods/classes. Shared between 
+ * `ddp-client` and `ddp-server`, where the ddp-client is the implementation
+ * of a ddp client for both client AND server; and the ddp server is the
+ * implementation of the livedata server and stream server. Common 
+ * functionality shared between both can be shared under this namespace
+ */
+export const DDPCommon = {};
\ No newline at end of file
diff --git a/packages/webui/src/meteor/ddp-common/utils.js b/packages/webui/src/meteor/ddp-common/utils.js
new file mode 100644
index 0000000000..ff8f628b35
--- /dev/null
+++ b/packages/webui/src/meteor/ddp-common/utils.js
@@ -0,0 +1,121 @@
+"use strict";
+
+import { DDPCommon } from './namespace'
+import { Meteor } from '../meteor'
+import EJSON from 'ejson'
+
+export const hasOwn = Object.prototype.hasOwnProperty;
+export const slice = Array.prototype.slice;
+
+export function keys(obj) {
+  return Object.keys(Object(obj));
+}
+
+export function isEmpty(obj) {
+  if (obj == null) {
+    return true;
+  }
+
+  if (Array.isArray(obj) ||
+      typeof obj === "string") {
+    return obj.length === 0;
+  }
+
+  for (const key in obj) {
+    if (hasOwn.call(obj, key)) {
+      return false;
+    }
+  }
+
+  return true;
+}
+
+export function last(array, n, guard) {
+  if (array == null) {
+    return;
+  }
+
+  if ((n == null) || guard) {
+    return array[array.length - 1];
+  }
+
+  return slice.call(array, Math.max(array.length - n, 0));
+}
+
+DDPCommon.SUPPORTED_DDP_VERSIONS = [ '1', 'pre2', 'pre1' ];
+
+DDPCommon.parseDDP = function (stringMessage) {
+  try {
+    var msg = JSON.parse(stringMessage);
+  } catch (e) {
+    Meteor._debug("Discarding message with invalid JSON", stringMessage);
+    return null;
+  }
+  // DDP messages must be objects.
+  if (msg === null || typeof msg !== 'object') {
+    Meteor._debug("Discarding non-object DDP message", stringMessage);
+    return null;
+  }
+
+  // massage msg to get it into "abstract ddp" rather than "wire ddp" format.
+
+  // switch between "cleared" rep of unsetting fields and "undefined"
+  // rep of same
+  if (hasOwn.call(msg, 'cleared')) {
+    if (! hasOwn.call(msg, 'fields')) {
+      msg.fields = {};
+    }
+    msg.cleared.forEach(clearKey => {
+      msg.fields[clearKey] = undefined;
+    });
+    delete msg.cleared;
+  }
+
+  ['fields', 'params', 'result'].forEach(field => {
+    if (hasOwn.call(msg, field)) {
+      msg[field] = EJSON._adjustTypesFromJSONValue(msg[field]);
+    }
+  });
+
+  return msg;
+};
+
+DDPCommon.stringifyDDP = function (msg) {
+  const copy = EJSON.clone(msg);
+
+  // swizzle 'changed' messages from 'fields undefined' rep to 'fields
+  // and cleared' rep
+  if (hasOwn.call(msg, 'fields')) {
+    const cleared = [];
+
+    Object.keys(msg.fields).forEach(key => {
+      const value = msg.fields[key];
+
+      if (typeof value === "undefined") {
+        cleared.push(key);
+        delete copy.fields[key];
+      }
+    });
+
+    if (! isEmpty(cleared)) {
+      copy.cleared = cleared;
+    }
+
+    if (isEmpty(copy.fields)) {
+      delete copy.fields;
+    }
+  }
+
+  // adjust types to basic
+  ['fields', 'params', 'result'].forEach(field => {
+    if (hasOwn.call(copy, field)) {
+      copy[field] = EJSON._adjustTypesToJSONValue(copy[field]);
+    }
+  });
+
+  if (msg.id && typeof msg.id !== 'string') {
+    throw new Error("Message id is not a string");
+  }
+
+  return JSON.stringify(copy);
+};
\ No newline at end of file
diff --git a/packages/webui/src/meteor/ddp/client_convenience.js b/packages/webui/src/meteor/ddp/client_convenience.js
new file mode 100644
index 0000000000..019a7b76a3
--- /dev/null
+++ b/packages/webui/src/meteor/ddp/client_convenience.js
@@ -0,0 +1,35 @@
+import { DDP } from './common/namespace.js';
+import { Meteor } from '../meteor';
+
+// By default, try to connect back to the same endpoint as the page
+// was served from.
+//
+// XXX We should be doing this a different way. Right now we don't
+// include ROOT_URL_PATH_PREFIX when computing ddpUrl. (We don't
+// include it on the server when computing
+// DDP_DEFAULT_CONNECTION_URL, and we don't include it in our
+// default, '/'.) We get by with this because DDP.connect then
+// forces the URL passed to it to be interpreted relative to the
+// app's deploy path, even if it is absolute. Instead, we should
+// make DDP_DEFAULT_CONNECTION_URL, if set, include the path prefix;
+// make the default ddpUrl be '' rather that '/'; and make
+// _translateUrl in stream_client_common.js not force absolute paths
+// to be treated like relative paths. See also
+// stream_client_common.js #RationalizingRelativeDDPURLs
+const runtimeConfig = typeof window.__meteor_runtime_config__ !== 'undefined' ? window.__meteor_runtime_config__ : Object.create(null);
+const ddpUrl = runtimeConfig.DDP_DEFAULT_CONNECTION_URL || '/';
+
+Meteor.connection = DDP.connect(ddpUrl);
+
+// Proxy the public methods of Meteor.connection so they can
+// be called directly on Meteor.
+[
+  'subscribe',
+  'call',
+  'apply',
+  'status',
+  'reconnect',
+  'disconnect'
+].forEach(name => {
+  Meteor[name] = Meteor.connection[name].bind(Meteor.connection);
+});
\ No newline at end of file
diff --git a/packages/webui/src/meteor/ddp/common/MethodInvoker.js b/packages/webui/src/meteor/ddp/common/MethodInvoker.js
new file mode 100644
index 0000000000..ee00cefc48
--- /dev/null
+++ b/packages/webui/src/meteor/ddp/common/MethodInvoker.js
@@ -0,0 +1,85 @@
+// A MethodInvoker manages sending a method to the server and calling the user's
+// callbacks. On construction, it registers itself in the connection's
+// _methodInvokers map; it removes itself once the method is fully finished and
+// the callback is invoked. This occurs when it has both received a result,
+// and the data written by it is fully visible.
+export default class MethodInvoker {
+    constructor(options) {
+      // Public (within this file) fields.
+      this.methodId = options.methodId;
+      this.sentMessage = false;
+  
+      this._callback = options.callback;
+      this._connection = options.connection;
+      this._message = options.message;
+      this._onResultReceived = options.onResultReceived || (() => {});
+      this._wait = options.wait;
+      this.noRetry = options.noRetry;
+      this._methodResult = null;
+      this._dataVisible = false;
+  
+      // Register with the connection.
+      this._connection._methodInvokers[this.methodId] = this;
+    }
+    // Sends the method message to the server. May be called additional times if
+    // we lose the connection and reconnect before receiving a result.
+    sendMessage() {
+      // This function is called before sending a method (including resending on
+      // reconnect). We should only (re)send methods where we don't already have a
+      // result!
+      if (this.gotResult())
+        throw new Error('sendingMethod is called on method with result');
+  
+      // If we're re-sending it, it doesn't matter if data was written the first
+      // time.
+      this._dataVisible = false;
+      this.sentMessage = true;
+  
+      // If this is a wait method, make all data messages be buffered until it is
+      // done.
+      if (this._wait)
+        this._connection._methodsBlockingQuiescence[this.methodId] = true;
+  
+      // Actually send the message.
+      this._connection._send(this._message);
+    }
+    // Invoke the callback, if we have both a result and know that all data has
+    // been written to the local cache.
+    _maybeInvokeCallback() {
+      if (this._methodResult && this._dataVisible) {
+        // Call the callback. (This won't throw: the callback was wrapped with
+        // bindEnvironment.)
+        this._callback(this._methodResult[0], this._methodResult[1]);
+  
+        // Forget about this method.
+        delete this._connection._methodInvokers[this.methodId];
+  
+        // Let the connection know that this method is finished, so it can try to
+        // move on to the next block of methods.
+        this._connection._outstandingMethodFinished();
+      }
+    }
+    // Call with the result of the method from the server. Only may be called
+    // once; once it is called, you should not call sendMessage again.
+    // If the user provided an onResultReceived callback, call it immediately.
+    // Then invoke the main callback if data is also visible.
+    receiveResult(err, result) {
+      if (this.gotResult())
+        throw new Error('Methods should only receive results once');
+      this._methodResult = [err, result];
+      this._onResultReceived(err, result);
+      this._maybeInvokeCallback();
+    }
+    // Call this when all data written by the method is visible. This means that
+    // the method has returns its "data is done" message *AND* all server
+    // documents that are buffered at that time have been written to the local
+    // cache. Invokes the main callback if the result has been received.
+    dataVisible() {
+      this._dataVisible = true;
+      this._maybeInvokeCallback();
+    }
+    // True if receiveResult has been called.
+    gotResult() {
+      return !!this._methodResult;
+    }
+  }
\ No newline at end of file
diff --git a/packages/webui/src/meteor/ddp/common/livedata_connection.js b/packages/webui/src/meteor/ddp/common/livedata_connection.js
new file mode 100644
index 0000000000..2433e9c085
--- /dev/null
+++ b/packages/webui/src/meteor/ddp/common/livedata_connection.js
@@ -0,0 +1,1473 @@
+import { Meteor } from '../../meteor';
+import { DDPCommon } from '../../ddp-common';
+import { Tracker } from '../../tracker';
+import EJSON from 'ejson';
+import { MongoID } from '../../mongo-id';
+import { DDP } from './namespace.js';
+import { DiffSequence } from '../../diff-sequence';
+import MethodInvoker from './MethodInvoker.js';
+import {
+  hasOwn,
+  slice,
+  keys,
+  isEmpty,
+  last,
+} from "../../ddp-common/utils.js";
+import { ClientStream } from "../../socket-stream-client"
+import { getRandomString } from '@sofie-automation/corelib/dist/lib'
+
+
+// @param url {String|Object} URL to Meteor app,
+//   or an object as a test hook (see code)
+// Options:
+//   reloadWithOutstanding: is it OK to reload if there are outstanding methods?
+//   headers: extra headers to send on the websockets connection, for
+//     server-to-server DDP only
+//   _sockjsOptions: Specifies options to pass through to the sockjs client
+//   onDDPNegotiationVersionFailure: callback when version negotiation fails.
+//
+// XXX There should be a way to destroy a DDP connection, causing all
+// outstanding method calls to fail.
+//
+// XXX Our current way of handling failure and reconnection is great
+// for an app (where we want to tolerate being disconnected as an
+// expect state, and keep trying forever to reconnect) but cumbersome
+// for something like a command line tool that wants to make a
+// connection, call a method, and print an error if connection
+// fails. We should have better usability in the latter case (while
+// still transparently reconnecting if it's just a transient failure
+// or the server migrating us).
+export class Connection {
+  constructor(url, options) {
+    const self = this;
+
+    this.options = options = {
+      onConnected() {},
+      onDDPVersionNegotiationFailure(description) {
+        Meteor._debug(description);
+      },
+      heartbeatInterval: 17500,
+      heartbeatTimeout: 15000,
+      npmFayeOptions: Object.create(null),
+      // These options are only for testing.
+      reloadWithOutstanding: false,
+      supportedDDPVersions: DDPCommon.SUPPORTED_DDP_VERSIONS,
+      retry: true,
+      respondToPings: true,
+      // When updates are coming within this ms interval, batch them together.
+      bufferedWritesInterval: 5,
+      // Flush buffers immediately if writes are happening continuously for more than this many ms.
+      bufferedWritesMaxAge: 500,
+
+      ...options
+    };
+
+    // If set, called when we reconnect, queuing method calls _before_ the
+    // existing outstanding ones.
+    // NOTE: This feature has been preserved for backwards compatibility. The
+    // preferred method of setting a callback on reconnect is to use
+    // DDP.onReconnect.
+    self.onReconnect = null;
+
+    // as a test hook, allow passing a stream instead of a url.
+    if (typeof url === 'object') {
+      self._stream = url;
+    } else {
+      self._stream = new ClientStream(url, {
+        retry: options.retry,
+        ConnectionError: DDP.ConnectionError,
+        headers: options.headers,
+        _sockjsOptions: options._sockjsOptions,
+        // Used to keep some tests quiet, or for other cases in which
+        // the right thing to do with connection errors is to silently
+        // fail (e.g. sending package usage stats). At some point we
+        // should have a real API for handling client-stream-level
+        // errors.
+        _dontPrintErrors: options._dontPrintErrors,
+        connectTimeoutMs: options.connectTimeoutMs,
+        npmFayeOptions: options.npmFayeOptions
+      });
+    }
+
+    self._lastSessionId = null;
+    self._versionSuggestion = null; // The last proposed DDP version.
+    self._version = null; // The DDP version agreed on by client and server.
+    self._stores = Object.create(null); // name -> object with methods
+    self._nextMethodId = 1;
+    self._supportedDDPVersions = options.supportedDDPVersions;
+
+    self._heartbeatInterval = options.heartbeatInterval;
+    self._heartbeatTimeout = options.heartbeatTimeout;
+
+    // Tracks methods which the user has tried to call but which have not yet
+    // called their user callback (ie, they are waiting on their result or for all
+    // of their writes to be written to the local cache). Map from method ID to
+    // MethodInvoker object.
+    self._methodInvokers = Object.create(null);
+
+    // Tracks methods which the user has called but whose result messages have not
+    // arrived yet.
+    //
+    // _outstandingMethodBlocks is an array of blocks of methods. Each block
+    // represents a set of methods that can run at the same time. The first block
+    // represents the methods which are currently in flight; subsequent blocks
+    // must wait for previous blocks to be fully finished before they can be sent
+    // to the server.
+    //
+    // Each block is an object with the following fields:
+    // - methods: a list of MethodInvoker objects
+    // - wait: a boolean; if true, this block had a single method invoked with
+    //         the "wait" option
+    //
+    // There will never be adjacent blocks with wait=false, because the only thing
+    // that makes methods need to be serialized is a wait method.
+    //
+    // Methods are removed from the first block when their "result" is
+    // received. The entire first block is only removed when all of the in-flight
+    // methods have received their results (so the "methods" list is empty) *AND*
+    // all of the data written by those methods are visible in the local cache. So
+    // it is possible for the first block's methods list to be empty, if we are
+    // still waiting for some objects to quiesce.
+    //
+    // Example:
+    //  _outstandingMethodBlocks = [
+    //    {wait: false, methods: []},
+    //    {wait: true, methods: [<MethodInvoker for 'login'>]},
+    //    {wait: false, methods: [<MethodInvoker for 'foo'>,
+    //                            <MethodInvoker for 'bar'>]}]
+    // This means that there were some methods which were sent to the server and
+    // which have returned their results, but some of the data written by
+    // the methods may not be visible in the local cache. Once all that data is
+    // visible, we will send a 'login' method. Once the login method has returned
+    // and all the data is visible (including re-running subs if userId changes),
+    // we will send the 'foo' and 'bar' methods in parallel.
+    self._outstandingMethodBlocks = [];
+
+    // method ID -> array of objects with keys 'collection' and 'id', listing
+    // documents written by a given method's stub. keys are associated with
+    // methods whose stub wrote at least one document, and whose data-done message
+    // has not yet been received.
+    self._documentsWrittenByStub = {};
+    // collection -> IdMap of "server document" object. A "server document" has:
+    // - "document": the version of the document according the
+    //   server (ie, the snapshot before a stub wrote it, amended by any changes
+    //   received from the server)
+    //   It is undefined if we think the document does not exist
+    // - "writtenByStubs": a set of method IDs whose stubs wrote to the document
+    //   whose "data done" messages have not yet been processed
+    self._serverDocuments = {};
+
+    // Array of callbacks to be called after the next update of the local
+    // cache. Used for:
+    //  - Calling methodInvoker.dataVisible and sub ready callbacks after
+    //    the relevant data is flushed.
+    //  - Invoking the callbacks of "half-finished" methods after reconnect
+    //    quiescence. Specifically, methods whose result was received over the old
+    //    connection (so we don't re-send it) but whose data had not been made
+    //    visible.
+    self._afterUpdateCallbacks = [];
+
+    // In two contexts, we buffer all incoming data messages and then process them
+    // all at once in a single update:
+    //   - During reconnect, we buffer all data messages until all subs that had
+    //     been ready before reconnect are ready again, and all methods that are
+    //     active have returned their "data done message"; then
+    //   - During the execution of a "wait" method, we buffer all data messages
+    //     until the wait method gets its "data done" message. (If the wait method
+    //     occurs during reconnect, it doesn't get any special handling.)
+    // all data messages are processed in one update.
+    //
+    // The following fields are used for this "quiescence" process.
+
+    // This buffers the messages that aren't being processed yet.
+    self._messagesBufferedUntilQuiescence = [];
+    // Map from method ID -> true. Methods are removed from this when their
+    // "data done" message is received, and we will not quiesce until it is
+    // empty.
+    self._methodsBlockingQuiescence = {};
+    // map from sub ID -> true for subs that were ready (ie, called the sub
+    // ready callback) before reconnect but haven't become ready again yet
+    self._subsBeingRevived = {}; // map from sub._id -> true
+    // if true, the next data update should reset all stores. (set during
+    // reconnect.)
+    self._resetStores = false;
+
+    // name -> array of updates for (yet to be created) collections
+    self._updatesForUnknownStores = {};
+    // if we're blocking a migration, the retry func
+    self._retryMigrate = null;
+
+    self.__flushBufferedWrites = Meteor.bindEnvironment(
+      self._flushBufferedWrites,
+      'flushing DDP buffered writes',
+      self
+    );
+    // Collection name -> array of messages.
+    self._bufferedWrites = {};
+    // When current buffer of updates must be flushed at, in ms timestamp.
+    self._bufferedWritesFlushAt = null;
+    // Timeout handle for the next processing of all pending writes
+    self._bufferedWritesFlushHandle = null;
+
+    self._bufferedWritesInterval = options.bufferedWritesInterval;
+    self._bufferedWritesMaxAge = options.bufferedWritesMaxAge;
+
+    // metadata for subscriptions.  Map from sub ID to object with keys:
+    //   - id
+    //   - name
+    //   - params
+    //   - inactive (if true, will be cleaned up if not reused in re-run)
+    //   - ready (has the 'ready' message been received?)
+    //   - readyCallback (an optional callback to call when ready)
+    //   - errorCallback (an optional callback to call if the sub terminates with
+    //                    an error, XXX COMPAT WITH 1.0.3.1)
+    //   - stopCallback (an optional callback to call when the sub terminates
+    //     for any reason, with an error argument if an error triggered the stop)
+    self._subscriptions = {};
+
+    // Reactive userId.
+    self._userId = null;
+    self._userIdDeps = new Tracker.Dependency();
+
+    const onDisconnect = () => {
+      if (self._heartbeat) {
+        self._heartbeat.stop();
+        self._heartbeat = null;
+      }
+    };
+
+    self._stream.on('message', this.onMessage.bind(this));
+    self._stream.on('reset', this.onReset.bind(this));
+    self._stream.on('disconnect', onDisconnect);
+  }
+
+  // 'name' is the name of the data on the wire that should go in the
+  // store. 'wrappedStore' should be an object with methods beginUpdate, update,
+  // endUpdate, saveOriginals, retrieveOriginals. see Collection for an example.
+  registerStore(name, wrappedStore) {
+    const self = this;
+
+    if (name in self._stores) return false;
+
+    // Wrap the input object in an object which makes any store method not
+    // implemented by 'store' into a no-op.
+    const store = Object.create(null);
+    const keysOfStore = [
+      'update',
+      'beginUpdate',
+      'endUpdate',
+      'saveOriginals',
+      'retrieveOriginals',
+      'getDoc',
+      '_getCollection'
+    ];
+    keysOfStore.forEach((method) => {
+      store[method] = (...args) => {
+        if (wrappedStore[method]) {
+          return wrappedStore[method](...args);
+        }
+      };
+    });
+    self._stores[name] = store;
+
+    const queued = self._updatesForUnknownStores[name];
+    if (Array.isArray(queued)) {
+      store.beginUpdate(queued.length, false);
+      queued.forEach(msg => {
+        store.update(msg);
+      });
+      store.endUpdate();
+      delete self._updatesForUnknownStores[name];
+    }
+
+    return true;
+  }
+
+  /**
+   * @memberOf Meteor
+   * @importFromPackage meteor
+   * @alias Meteor.subscribe
+   * @summary Subscribe to a record set.  Returns a handle that provides
+   * `stop()` and `ready()` methods.
+   * @locus Client
+   * @param {String} name Name of the subscription.  Matches the name of the
+   * server's `publish()` call.
+   * @param {EJSONable} [arg1,arg2...] Optional arguments passed to publisher
+   * function on server.
+   * @param {Function|Object} [callbacks] Optional. May include `onStop`
+   * and `onReady` callbacks. If there is an error, it is passed as an
+   * argument to `onStop`. If a function is passed instead of an object, it
+   * is interpreted as an `onReady` callback.
+   */
+  subscribe(name /* .. [arguments] .. (callback|callbacks) */) {
+    const self = this;
+
+    const params = slice.call(arguments, 1);
+    let callbacks = Object.create(null);
+    if (params.length) {
+      const lastParam = params[params.length - 1];
+      if (typeof lastParam === 'function') {
+        callbacks.onReady = params.pop();
+      } else if (lastParam && [
+        lastParam.onReady,
+        // XXX COMPAT WITH 1.0.3.1 onError used to exist, but now we use
+        // onStop with an error callback instead.
+        lastParam.onError,
+        lastParam.onStop
+      ].some(f => typeof f === "function")) {
+        callbacks = params.pop();
+      }
+    }
+
+    // Is there an existing sub with the same name and param, run in an
+    // invalidated Computation? This will happen if we are rerunning an
+    // existing computation.
+    //
+    // For example, consider a rerun of:
+    //
+    //     Tracker.autorun(function () {
+    //       Meteor.subscribe("foo", Session.get("foo"));
+    //       Meteor.subscribe("bar", Session.get("bar"));
+    //     });
+    //
+    // If "foo" has changed but "bar" has not, we will match the "bar"
+    // subcribe to an existing inactive subscription in order to not
+    // unsub and resub the subscription unnecessarily.
+    //
+    // We only look for one such sub; if there are N apparently-identical subs
+    // being invalidated, we will require N matching subscribe calls to keep
+    // them all active.
+    const existing = Object.values(self._subscriptions).find(
+      sub => (sub.inactive && sub.name === name && EJSON.equals(sub.params, params))
+    );
+
+    let id;
+    if (existing) {
+      id = existing.id;
+      existing.inactive = false; // reactivate
+
+      if (callbacks.onReady) {
+        // If the sub is not already ready, replace any ready callback with the
+        // one provided now. (It's not really clear what users would expect for
+        // an onReady callback inside an autorun; the semantics we provide is
+        // that at the time the sub first becomes ready, we call the last
+        // onReady callback provided, if any.)
+        // If the sub is already ready, run the ready callback right away.
+        // It seems that users would expect an onReady callback inside an
+        // autorun to trigger once the the sub first becomes ready and also
+        // when re-subs happens.
+        if (existing.ready) {
+          callbacks.onReady();
+        } else {
+          existing.readyCallback = callbacks.onReady;
+        }
+      }
+
+      // XXX COMPAT WITH 1.0.3.1 we used to have onError but now we call
+      // onStop with an optional error argument
+      if (callbacks.onError) {
+        // Replace existing callback if any, so that errors aren't
+        // double-reported.
+        existing.errorCallback = callbacks.onError;
+      }
+
+      if (callbacks.onStop) {
+        existing.stopCallback = callbacks.onStop;
+      }
+    } else {
+      // New sub! Generate an id, save it locally, and send message.
+      id = getRandomString();
+      self._subscriptions[id] = {
+        id: id,
+        name: name,
+        params: EJSON.clone(params),
+        inactive: false,
+        ready: false,
+        readyDeps: new Tracker.Dependency(),
+        readyCallback: callbacks.onReady,
+        // XXX COMPAT WITH 1.0.3.1 #errorCallback
+        errorCallback: callbacks.onError,
+        stopCallback: callbacks.onStop,
+        connection: self,
+        remove() {
+          delete this.connection._subscriptions[this.id];
+          this.ready && this.readyDeps.changed();
+        },
+        stop() {
+          this.connection._send({ msg: 'unsub', id: id });
+          this.remove();
+
+          if (callbacks.onStop) {
+            callbacks.onStop();
+          }
+        }
+      };
+      self._send({ msg: 'sub', id: id, name: name, params: params });
+    }
+
+    // return a handle to the application.
+    const handle = {
+      stop() {
+        if (! hasOwn.call(self._subscriptions, id)) {
+          return;
+        }
+        self._subscriptions[id].stop();
+      },
+      ready() {
+        // return false if we've unsubscribed.
+        if (!hasOwn.call(self._subscriptions, id)) {
+          return false;
+        }
+        const record = self._subscriptions[id];
+        record.readyDeps.depend();
+        return record.ready;
+      },
+      subscriptionId: id
+    };
+
+    if (Tracker.active) {
+      // We're in a reactive computation, so we'd like to unsubscribe when the
+      // computation is invalidated... but not if the rerun just re-subscribes
+      // to the same subscription!  When a rerun happens, we use onInvalidate
+      // as a change to mark the subscription "inactive" so that it can
+      // be reused from the rerun.  If it isn't reused, it's killed from
+      // an afterFlush.
+      Tracker.onInvalidate((c) => {
+        if (hasOwn.call(self._subscriptions, id)) {
+          self._subscriptions[id].inactive = true;
+        }
+
+        Tracker.afterFlush(() => {
+          if (hasOwn.call(self._subscriptions, id) &&
+              self._subscriptions[id].inactive) {
+            handle.stop();
+          }
+        });
+      });
+    }
+
+    return handle;
+  }
+
+  /**
+   * @memberOf Meteor
+   * @importFromPackage meteor
+   * @alias Meteor.call
+   * @summary Invokes a method passing any number of arguments.
+   * @locus Anywhere
+   * @param {String} name Name of method to invoke
+   * @param {EJSONable} [arg1,arg2...] Optional method arguments
+   * @param {Function} [asyncCallback] Optional callback, which is called asynchronously with the error or result after the method is complete. If not provided, the method runs synchronously if possible (see below).
+   */
+  call(name /* .. [arguments] .. callback */) {
+    // if it's a function, the last argument is the result callback,
+    // not a parameter to the remote method.
+    const args = slice.call(arguments, 1);
+    let callback;
+    if (args.length && typeof args[args.length - 1] === 'function') {
+      callback = args.pop();
+    }
+    return this.apply(name, args, callback);
+  }
+
+  /**
+   * @memberOf Meteor
+   * @importFromPackage meteor
+   * @alias Meteor.apply
+   * @summary Invoke a method passing an array of arguments.
+   * @locus Anywhere
+   * @param {String} name Name of method to invoke
+   * @param {EJSONable[]} args Method arguments
+   * @param {Object} [options]
+   * @param {Boolean} options.wait (Client only) If true, don't send this method until all previous method calls have completed, and don't send any subsequent method calls until this one is completed.
+   * @param {Function} options.onResultReceived (Client only) This callback is invoked with the error or result of the method (just like `asyncCallback`) as soon as the error or result is available. The local cache may not yet reflect the writes performed by the method.
+   * @param {Boolean} options.noRetry (Client only) if true, don't send this method again on reload, simply call the callback an error with the error code 'invocation-failed'.
+   * @param {Function} [asyncCallback] Optional callback; same semantics as in [`Meteor.call`](#meteor_call).
+   */
+  apply(name, args, options, callback) {
+    const self = this;
+
+    // We were passed 3 arguments. They may be either (name, args, options)
+    // or (name, args, callback)
+    if (!callback && typeof options === 'function') {
+      callback = options;
+      options = Object.create(null);
+    }
+    options = options || Object.create(null);
+
+    if (callback) {
+      // XXX would it be better form to do the binding in stream.on,
+      // or caller, instead of here?
+      // XXX improve error message (and how we report it)
+      callback = Meteor.bindEnvironment(
+        callback,
+        "delivering result of invoking '" + name + "'"
+      );
+    }
+
+    // Keep our args safe from mutation (eg if we don't send the message for a
+    // while because of a wait method).
+    args = EJSON.clone(args);
+
+    // We only create the methodId here because we don't actually need one if
+    // we're already in a simulation
+    const methodId = '' + self._nextMethodId++;
+
+    // Generate the DDP message for the method call. Note that on the client,
+    // it is important that the stub have finished before we send the RPC, so
+    // that we know we have a complete list of which local documents the stub
+    // wrote.
+    const message = {
+      msg: 'method',
+      id: methodId,
+      method: name,
+      params: args
+    };
+
+    // At this point we're definitely doing an RPC, and we're going to
+    // return the value of the RPC to the caller.
+
+    // If the caller didn't give a callback, decide what to do.
+    if (!callback) {
+      // On the client, we don't have fibers, so we can't block. The
+      // only thing we can do is to return undefined and discard the
+      // result of the RPC. If an error occurred then print the error
+      // to the console.
+      callback = err => {
+        err && Meteor._debug("Error invoking Method '" + name + "'", err);
+      };
+    }
+
+    const methodInvoker = new MethodInvoker({
+      methodId,
+      callback: callback,
+      connection: self,
+      onResultReceived: options.onResultReceived,
+      wait: !!options.wait,
+      message: message,
+      noRetry: !!options.noRetry
+    });
+
+    if (options.wait) {
+      // It's a wait method! Wait methods go in their own block.
+      self._outstandingMethodBlocks.push({
+        wait: true,
+        methods: [methodInvoker]
+      });
+    } else {
+      // Not a wait method. Start a new block if the previous block was a wait
+      // block, and add it to the last block of methods.
+      if (isEmpty(self._outstandingMethodBlocks) ||
+          last(self._outstandingMethodBlocks).wait) {
+        self._outstandingMethodBlocks.push({
+          wait: false,
+          methods: [],
+        });
+      }
+
+      last(self._outstandingMethodBlocks).methods.push(methodInvoker);
+    }
+
+    // If we added it to the first block, send it out now.
+    if (self._outstandingMethodBlocks.length === 1) methodInvoker.sendMessage();
+
+    return undefined;
+  }
+
+  // Sends the DDP stringification of the given message object
+  _send(obj) {
+    this._stream.send(DDPCommon.stringifyDDP(obj));
+  }
+
+  // We detected via DDP-level heartbeats that we've lost the
+  // connection.  Unlike `disconnect` or `close`, a lost connection
+  // will be automatically retried.
+  _lostConnection(error) {
+    this._stream._lostConnection(error);
+  }
+
+  /**
+   * @memberOf Meteor
+   * @importFromPackage meteor
+   * @alias Meteor.status
+   * @summary Get the current connection status. A reactive data source.
+   * @locus Client
+   */
+  status(...args) {
+    return this._stream.status(...args);
+  }
+
+  /**
+   * @summary Force an immediate reconnection attempt if the client is not connected to the server.
+
+  This method does nothing if the client is already connected.
+   * @memberOf Meteor
+   * @importFromPackage meteor
+   * @alias Meteor.reconnect
+   * @locus Client
+   */
+  reconnect(...args) {
+    return this._stream.reconnect(...args);
+  }
+
+  /**
+   * @memberOf Meteor
+   * @importFromPackage meteor
+   * @alias Meteor.disconnect
+   * @summary Disconnect the client from the server.
+   * @locus Client
+   */
+  disconnect(...args) {
+    return this._stream.disconnect(...args);
+  }
+
+  close() {
+    return this._stream.disconnect({ _permanent: true });
+  }
+
+  ///
+  /// Reactive user system
+  ///
+  userId() {
+    if (this._userIdDeps) this._userIdDeps.depend();
+    return this._userId;
+  }
+
+  setUserId(userId) {
+    // Avoid invalidating dependents if setUserId is called with current value.
+    if (this._userId === userId) return;
+    this._userId = userId;
+    if (this._userIdDeps) this._userIdDeps.changed();
+  }
+
+  // Returns true if we are in a state after reconnect of waiting for subs to be
+  // revived or early methods to finish their data, or we are waiting for a
+  // "wait" method to finish.
+  _waitingForQuiescence() {
+    return (
+      ! isEmpty(this._subsBeingRevived) ||
+      ! isEmpty(this._methodsBlockingQuiescence)
+    );
+  }
+
+  // Returns true if any method whose message has been sent to the server has
+  // not yet invoked its user callback.
+  _anyMethodsAreOutstanding() {
+    const invokers = this._methodInvokers;
+    return Object.values(invokers).some((invoker) => !!invoker.sentMessage);
+  }
+
+  _livedata_connected(msg) {
+    const self = this;
+
+    if (self._version !== 'pre1' && self._heartbeatInterval !== 0) {
+      self._heartbeat = new DDPCommon.Heartbeat({
+        heartbeatInterval: self._heartbeatInterval,
+        heartbeatTimeout: self._heartbeatTimeout,
+        onTimeout() {
+          self._lostConnection(
+            new DDP.ConnectionError('DDP heartbeat timed out')
+          );
+        },
+        sendPing() {
+          self._send({ msg: 'ping' });
+        }
+      });
+      self._heartbeat.start();
+    }
+
+    // If this is a reconnect, we'll have to reset all stores.
+    if (self._lastSessionId) self._resetStores = true;
+
+    let reconnectedToPreviousSession;
+    if (typeof msg.session === 'string') {
+      reconnectedToPreviousSession = self._lastSessionId === msg.session;
+      self._lastSessionId = msg.session;
+    }
+
+    if (reconnectedToPreviousSession) {
+      // Successful reconnection -- pick up where we left off.  Note that right
+      // now, this never happens: the server never connects us to a previous
+      // session, because DDP doesn't provide enough data for the server to know
+      // what messages the client has processed. We need to improve DDP to make
+      // this possible, at which point we'll probably need more code here.
+      return;
+    }
+
+    // Server doesn't have our data any more. Re-sync a new session.
+
+    // Forget about messages we were buffering for unknown collections. They'll
+    // be resent if still relevant.
+    self._updatesForUnknownStores = Object.create(null);
+
+    if (self._resetStores) {
+      // Forget about the effects of stubs. We'll be resetting all collections
+      // anyway.
+      self._documentsWrittenByStub = Object.create(null);
+      self._serverDocuments = Object.create(null);
+    }
+
+    // Clear _afterUpdateCallbacks.
+    self._afterUpdateCallbacks = [];
+
+    // Mark all named subscriptions which are ready (ie, we already called the
+    // ready callback) as needing to be revived.
+    // XXX We should also block reconnect quiescence until unnamed subscriptions
+    //     (eg, autopublish) are done re-publishing to avoid flicker!
+    self._subsBeingRevived = Object.create(null);
+    Object.entries(self._subscriptions).forEach(([id, sub]) => {
+      if (sub.ready) {
+        self._subsBeingRevived[id] = true;
+      }
+    });
+
+    // Arrange for "half-finished" methods to have their callbacks run, and
+    // track methods that were sent on this connection so that we don't
+    // quiesce until they are all done.
+    //
+    // Start by clearing _methodsBlockingQuiescence: methods sent before
+    // reconnect don't matter, and any "wait" methods sent on the new connection
+    // that we drop here will be restored by the loop below.
+    self._methodsBlockingQuiescence = Object.create(null);
+    if (self._resetStores) {
+      const invokers = self._methodInvokers;
+      keys(invokers).forEach(id => {
+        const invoker = invokers[id];
+        if (invoker.gotResult()) {
+          // This method already got its result, but it didn't call its callback
+          // because its data didn't become visible. We did not resend the
+          // method RPC. We'll call its callback when we get a full quiesce,
+          // since that's as close as we'll get to "data must be visible".
+          self._afterUpdateCallbacks.push(
+            (...args) => invoker.dataVisible(...args)
+          );
+        } else if (invoker.sentMessage) {
+          // This method has been sent on this connection (maybe as a resend
+          // from the last connection, maybe from onReconnect, maybe just very
+          // quickly before processing the connected message).
+          //
+          // We don't need to do anything special to ensure its callbacks get
+          // called, but we'll count it as a method which is preventing
+          // reconnect quiescence. (eg, it might be a login method that was run
+          // from onReconnect, and we don't want to see flicker by seeing a
+          // logged-out state.)
+          self._methodsBlockingQuiescence[invoker.methodId] = true;
+        }
+      });
+    }
+
+    self._messagesBufferedUntilQuiescence = [];
+
+    // If we're not waiting on any methods or subs, we can reset the stores and
+    // call the callbacks immediately.
+    if (! self._waitingForQuiescence()) {
+      if (self._resetStores) {
+        Object.values(self._stores).forEach((store) => {
+          store.beginUpdate(0, true);
+          store.endUpdate();
+        });
+        self._resetStores = false;
+      }
+      self._runAfterUpdateCallbacks();
+    }
+  }
+
+  _processOneDataMessage(msg, updates) {
+    const messageType = msg.msg;
+
+    // msg is one of ['added', 'changed', 'removed', 'ready', 'updated']
+    if (messageType === 'added') {
+      this._process_added(msg, updates);
+    } else if (messageType === 'changed') {
+      this._process_changed(msg, updates);
+    } else if (messageType === 'removed') {
+      this._process_removed(msg, updates);
+    } else if (messageType === 'ready') {
+      this._process_ready(msg, updates);
+    } else if (messageType === 'updated') {
+      this._process_updated(msg, updates);
+    } else if (messageType === 'nosub') {
+      // ignore this
+    } else {
+      Meteor._debug('discarding unknown livedata data message type', msg);
+    }
+  }
+
+  _livedata_data(msg) {
+    const self = this;
+
+    if (self._waitingForQuiescence()) {
+      self._messagesBufferedUntilQuiescence.push(msg);
+
+      if (msg.msg === 'nosub') {
+        delete self._subsBeingRevived[msg.id];
+      }
+
+      if (msg.subs) {
+        msg.subs.forEach(subId => {
+          delete self._subsBeingRevived[subId];
+        });
+      }
+
+      if (msg.methods) {
+        msg.methods.forEach(methodId => {
+          delete self._methodsBlockingQuiescence[methodId];
+        });
+      }
+
+      if (self._waitingForQuiescence()) {
+        return;
+      }
+
+      // No methods or subs are blocking quiescence!
+      // We'll now process and all of our buffered messages, reset all stores,
+      // and apply them all at once.
+
+      const bufferedMessages = self._messagesBufferedUntilQuiescence;
+      Object.values(bufferedMessages).forEach(bufferedMessage => {
+        self._processOneDataMessage(
+          bufferedMessage,
+          self._bufferedWrites
+        );
+      });
+
+      self._messagesBufferedUntilQuiescence = [];
+
+    } else {
+      self._processOneDataMessage(msg, self._bufferedWrites);
+    }
+
+    // Immediately flush writes when:
+    //  1. Buffering is disabled. Or;
+    //  2. any non-(added/changed/removed) message arrives.
+    const standardWrite =
+      msg.msg === "added" ||
+      msg.msg === "changed" ||
+      msg.msg === "removed";
+
+    if (self._bufferedWritesInterval === 0 || ! standardWrite) {
+      self._flushBufferedWrites();
+      return;
+    }
+
+    if (self._bufferedWritesFlushAt === null) {
+      self._bufferedWritesFlushAt =
+        new Date().valueOf() + self._bufferedWritesMaxAge;
+    } else if (self._bufferedWritesFlushAt < new Date().valueOf()) {
+      self._flushBufferedWrites();
+      return;
+    }
+
+    if (self._bufferedWritesFlushHandle) {
+      clearTimeout(self._bufferedWritesFlushHandle);
+    }
+    self._bufferedWritesFlushHandle = setTimeout(
+      self.__flushBufferedWrites,
+      self._bufferedWritesInterval
+    );
+  }
+
+  _flushBufferedWrites() {
+    const self = this;
+    if (self._bufferedWritesFlushHandle) {
+      clearTimeout(self._bufferedWritesFlushHandle);
+      self._bufferedWritesFlushHandle = null;
+    }
+
+    self._bufferedWritesFlushAt = null;
+    // We need to clear the buffer before passing it to
+    //  performWrites. As there's no guarantee that it
+    //  will exit cleanly.
+    const writes = self._bufferedWrites;
+    self._bufferedWrites = Object.create(null);
+    self._performWrites(writes);
+  }
+
+  _performWrites(updates) {
+    const self = this;
+
+    if (self._resetStores || ! isEmpty(updates)) {
+      // Begin a transactional update of each store.
+
+      Object.entries(self._stores).forEach(([storeName, store]) => {
+        store.beginUpdate(
+          hasOwn.call(updates, storeName)
+            ? updates[storeName].length
+            : 0,
+          self._resetStores
+        );
+      });
+
+      self._resetStores = false;
+
+      Object.entries(updates).forEach(([storeName, updateMessages]) => {
+        const store = self._stores[storeName];
+        if (store) {
+          updateMessages.forEach(updateMessage => {
+            store.update(updateMessage);
+          });
+        } else {
+          // Nobody's listening for this data. Queue it up until
+          // someone wants it.
+          // XXX memory use will grow without bound if you forget to
+          // create a collection or just don't care about it... going
+          // to have to do something about that.
+          const updates = self._updatesForUnknownStores;
+
+          if (! hasOwn.call(updates, storeName)) {
+            updates[storeName] = [];
+          }
+
+          updates[storeName].push(...updateMessages);
+        }
+      });
+
+      // End update transaction.
+      Object.values(self._stores).forEach((store) => {
+        store.endUpdate();
+      });
+    }
+
+    self._runAfterUpdateCallbacks();
+  }
+
+  // Call any callbacks deferred with _runWhenAllServerDocsAreFlushed whose
+  // relevant docs have been flushed, as well as dataVisible callbacks at
+  // reconnect-quiescence time.
+  _runAfterUpdateCallbacks() {
+    const self = this;
+    const callbacks = self._afterUpdateCallbacks;
+    self._afterUpdateCallbacks = [];
+    callbacks.forEach((c) => {
+      c();
+    });
+  }
+
+  _pushUpdate(updates, collection, msg) {
+    if (! hasOwn.call(updates, collection)) {
+      updates[collection] = [];
+    }
+    updates[collection].push(msg);
+  }
+
+  _getServerDoc(collection, id) {
+    const self = this;
+    if (! hasOwn.call(self._serverDocuments, collection)) {
+      return null;
+    }
+    const serverDocsForCollection = self._serverDocuments[collection];
+    return serverDocsForCollection.get(id) || null;
+  }
+
+  _process_added(msg, updates) {
+    const self = this;
+    const id = MongoID.idParse(msg.id);
+    const serverDoc = self._getServerDoc(msg.collection, id);
+    if (serverDoc) {
+      // Some outstanding stub wrote here.
+      const isExisting = serverDoc.document !== undefined;
+
+      serverDoc.document = msg.fields || Object.create(null);
+      serverDoc.document._id = id;
+
+      if (self._resetStores) {
+        // During reconnect the server is sending adds for existing ids.
+        // Always push an update so that document stays in the store after
+        // reset. Use current version of the document for this update, so
+        // that stub-written values are preserved.
+        const currentDoc = self._stores[msg.collection].getDoc(msg.id);
+        if (currentDoc !== undefined) msg.fields = currentDoc;
+
+        self._pushUpdate(updates, msg.collection, msg);
+      } else if (isExisting) {
+        throw new Error('Server sent add for existing id: ' + msg.id);
+      }
+    } else {
+      self._pushUpdate(updates, msg.collection, msg);
+    }
+  }
+
+  _process_changed(msg, updates) {
+    const self = this;
+    const serverDoc = self._getServerDoc(msg.collection, MongoID.idParse(msg.id));
+    if (serverDoc) {
+      if (serverDoc.document === undefined)
+        throw new Error('Server sent changed for nonexisting id: ' + msg.id);
+      DiffSequence.applyChanges(serverDoc.document, msg.fields);
+    } else {
+      self._pushUpdate(updates, msg.collection, msg);
+    }
+  }
+
+  _process_removed(msg, updates) {
+    const self = this;
+    const serverDoc = self._getServerDoc(msg.collection, MongoID.idParse(msg.id));
+    if (serverDoc) {
+      // Some outstanding stub wrote here.
+      if (serverDoc.document === undefined)
+        throw new Error('Server sent removed for nonexisting id:' + msg.id);
+      serverDoc.document = undefined;
+    } else {
+      self._pushUpdate(updates, msg.collection, {
+        msg: 'removed',
+        collection: msg.collection,
+        id: msg.id
+      });
+    }
+  }
+
+  _process_updated(msg, updates) {
+    const self = this;
+    // Process "method done" messages.
+
+    msg.methods.forEach((methodId) => {
+      const docs = self._documentsWrittenByStub[methodId] || {};
+      Object.values(docs).forEach((written) => {
+        const serverDoc = self._getServerDoc(written.collection, written.id);
+        if (! serverDoc) {
+          throw new Error('Lost serverDoc for ' + JSON.stringify(written));
+        }
+        if (! serverDoc.writtenByStubs[methodId]) {
+          throw new Error(
+            'Doc ' +
+              JSON.stringify(written) +
+              ' not written by  method ' +
+              methodId
+          );
+        }
+        delete serverDoc.writtenByStubs[methodId];
+        if (isEmpty(serverDoc.writtenByStubs)) {
+          // All methods whose stubs wrote this method have completed! We can
+          // now copy the saved document to the database (reverting the stub's
+          // change if the server did not write to this object, or applying the
+          // server's writes if it did).
+
+          // This is a fake ddp 'replace' message.  It's just for talking
+          // between livedata connections and minimongo.  (We have to stringify
+          // the ID because it's supposed to look like a wire message.)
+          self._pushUpdate(updates, written.collection, {
+            msg: 'replace',
+            id: MongoID.idStringify(written.id),
+            replace: serverDoc.document
+          });
+          // Call all flush callbacks.
+
+          serverDoc.flushCallbacks.forEach((c) => {
+            c();
+          });
+
+          // Delete this completed serverDocument. Don't bother to GC empty
+          // IdMaps inside self._serverDocuments, since there probably aren't
+          // many collections and they'll be written repeatedly.
+          self._serverDocuments[written.collection].remove(written.id);
+        }
+      });
+      delete self._documentsWrittenByStub[methodId];
+
+      // We want to call the data-written callback, but we can't do so until all
+      // currently buffered messages are flushed.
+      const callbackInvoker = self._methodInvokers[methodId];
+      if (! callbackInvoker) {
+        throw new Error('No callback invoker for method ' + methodId);
+      }
+
+      self._runWhenAllServerDocsAreFlushed(
+        (...args) => callbackInvoker.dataVisible(...args)
+      );
+    });
+  }
+
+  _process_ready(msg, updates) {
+    const self = this;
+    // Process "sub ready" messages. "sub ready" messages don't take effect
+    // until all current server documents have been flushed to the local
+    // database. We can use a write fence to implement this.
+
+    msg.subs.forEach((subId) => {
+      self._runWhenAllServerDocsAreFlushed(() => {
+        const subRecord = self._subscriptions[subId];
+        // Did we already unsubscribe?
+        if (!subRecord) return;
+        // Did we already receive a ready message? (Oops!)
+        if (subRecord.ready) return;
+        subRecord.ready = true;
+        subRecord.readyCallback && subRecord.readyCallback();
+        subRecord.readyDeps.changed();
+      });
+    });
+  }
+
+  // Ensures that "f" will be called after all documents currently in
+  // _serverDocuments have been written to the local cache. f will not be called
+  // if the connection is lost before then!
+  _runWhenAllServerDocsAreFlushed(f) {
+    const self = this;
+    const runFAfterUpdates = () => {
+      self._afterUpdateCallbacks.push(f);
+    };
+    let unflushedServerDocCount = 0;
+    const onServerDocFlush = () => {
+      --unflushedServerDocCount;
+      if (unflushedServerDocCount === 0) {
+        // This was the last doc to flush! Arrange to run f after the updates
+        // have been applied.
+        runFAfterUpdates();
+      }
+    };
+
+    Object.values(self._serverDocuments).forEach((serverDocuments) => {
+      serverDocuments.forEach((serverDoc) => {
+        const writtenByStubForAMethodWithSentMessage =
+          keys(serverDoc.writtenByStubs).some(methodId => {
+            const invoker = self._methodInvokers[methodId];
+            return invoker && invoker.sentMessage;
+          });
+
+        if (writtenByStubForAMethodWithSentMessage) {
+          ++unflushedServerDocCount;
+          serverDoc.flushCallbacks.push(onServerDocFlush);
+        }
+      });
+    });
+    if (unflushedServerDocCount === 0) {
+      // There aren't any buffered docs --- we can call f as soon as the current
+      // round of updates is applied!
+      runFAfterUpdates();
+    }
+  }
+
+  _livedata_nosub(msg) {
+    const self = this;
+
+    // First pass it through _livedata_data, which only uses it to help get
+    // towards quiescence.
+    self._livedata_data(msg);
+
+    // Do the rest of our processing immediately, with no
+    // buffering-until-quiescence.
+
+    // we weren't subbed anyway, or we initiated the unsub.
+    if (! hasOwn.call(self._subscriptions, msg.id)) {
+      return;
+    }
+
+    // XXX COMPAT WITH 1.0.3.1 #errorCallback
+    const errorCallback = self._subscriptions[msg.id].errorCallback;
+    const stopCallback = self._subscriptions[msg.id].stopCallback;
+
+    self._subscriptions[msg.id].remove();
+
+    const meteorErrorFromMsg = msgArg => {
+      return (
+        msgArg &&
+        msgArg.error &&
+        new Meteor.Error(
+          msgArg.error.error,
+          msgArg.error.reason,
+          msgArg.error.details
+        )
+      );
+    };
+
+    // XXX COMPAT WITH 1.0.3.1 #errorCallback
+    if (errorCallback && msg.error) {
+      errorCallback(meteorErrorFromMsg(msg));
+    }
+
+    if (stopCallback) {
+      stopCallback(meteorErrorFromMsg(msg));
+    }
+  }
+
+  _livedata_result(msg) {
+    // id, result or error. error has error (code), reason, details
+
+    const self = this;
+
+    // Lets make sure there are no buffered writes before returning result.
+    if (! isEmpty(self._bufferedWrites)) {
+      self._flushBufferedWrites();
+    }
+
+    // find the outstanding request
+    // should be O(1) in nearly all realistic use cases
+    if (isEmpty(self._outstandingMethodBlocks)) {
+      Meteor._debug('Received method result but no methods outstanding');
+      return;
+    }
+    const currentMethodBlock = self._outstandingMethodBlocks[0].methods;
+    let i;
+    const m = currentMethodBlock.find((method, idx) => {
+      const found = method.methodId === msg.id;
+      if (found) i = idx;
+      return found;
+    });
+    if (!m) {
+      Meteor._debug("Can't match method response to original method call", msg);
+      return;
+    }
+
+    // Remove from current method block. This may leave the block empty, but we
+    // don't move on to the next block until the callback has been delivered, in
+    // _outstandingMethodFinished.
+    currentMethodBlock.splice(i, 1);
+
+    if (hasOwn.call(msg, 'error')) {
+      m.receiveResult(
+        new Meteor.Error(msg.error.error, msg.error.reason, msg.error.details)
+      );
+    } else {
+      // msg.result may be undefined if the method didn't return a
+      // value
+      m.receiveResult(undefined, msg.result);
+    }
+  }
+
+  // Called by MethodInvoker after a method's callback is invoked.  If this was
+  // the last outstanding method in the current block, runs the next block. If
+  // there are no more methods, consider accepting a hot code push.
+  _outstandingMethodFinished() {
+    const self = this;
+    if (self._anyMethodsAreOutstanding()) return;
+
+    // No methods are outstanding. This should mean that the first block of
+    // methods is empty. (Or it might not exist, if this was a method that
+    // half-finished before disconnect/reconnect.)
+    if (! isEmpty(self._outstandingMethodBlocks)) {
+      const firstBlock = self._outstandingMethodBlocks.shift();
+      if (! isEmpty(firstBlock.methods))
+        throw new Error(
+          'No methods outstanding but nonempty block: ' +
+            JSON.stringify(firstBlock)
+        );
+
+      // Send the outstanding methods now in the first block.
+      if (! isEmpty(self._outstandingMethodBlocks))
+        self._sendOutstandingMethods();
+    }
+
+    // Maybe accept a hot code push.
+    self._maybeMigrate();
+  }
+
+  // Sends messages for all the methods in the first block in
+  // _outstandingMethodBlocks.
+  _sendOutstandingMethods() {
+    const self = this;
+
+    if (isEmpty(self._outstandingMethodBlocks)) {
+      return;
+    }
+
+    self._outstandingMethodBlocks[0].methods.forEach(m => {
+      m.sendMessage();
+    });
+  }
+
+  _livedata_error(msg) {
+    Meteor._debug('Received error from server: ', msg.reason);
+    if (msg.offendingMessage) Meteor._debug('For: ', msg.offendingMessage);
+  }
+
+  _callOnReconnectAndSendAppropriateOutstandingMethods() {
+    const self = this;
+    const oldOutstandingMethodBlocks = self._outstandingMethodBlocks;
+    self._outstandingMethodBlocks = [];
+
+    self.onReconnect && self.onReconnect();
+    DDP._reconnectHook.each(callback => {
+      callback(self);
+      return true;
+    });
+
+    if (isEmpty(oldOutstandingMethodBlocks)) return;
+
+    // We have at least one block worth of old outstanding methods to try
+    // again. First: did onReconnect actually send anything? If not, we just
+    // restore all outstanding methods and run the first block.
+    if (isEmpty(self._outstandingMethodBlocks)) {
+      self._outstandingMethodBlocks = oldOutstandingMethodBlocks;
+      self._sendOutstandingMethods();
+      return;
+    }
+
+    // OK, there are blocks on both sides. Special case: merge the last block of
+    // the reconnect methods with the first block of the original methods, if
+    // neither of them are "wait" blocks.
+    if (! last(self._outstandingMethodBlocks).wait &&
+        ! oldOutstandingMethodBlocks[0].wait) {
+      oldOutstandingMethodBlocks[0].methods.forEach(m => {
+        last(self._outstandingMethodBlocks).methods.push(m);
+
+        // If this "last block" is also the first block, send the message.
+        if (self._outstandingMethodBlocks.length === 1) {
+          m.sendMessage();
+        }
+      });
+
+      oldOutstandingMethodBlocks.shift();
+    }
+
+    // Now add the rest of the original blocks on.
+    self._outstandingMethodBlocks.push(...oldOutstandingMethodBlocks);
+  }
+
+  // We can accept a hot code push if there are no methods in flight.
+  _readyToMigrate() {
+    return isEmpty(this._methodInvokers);
+  }
+
+  // If we were blocking a migration, see if it's now possible to continue.
+  // Call whenever the set of outstanding/blocked methods shrinks.
+  _maybeMigrate() {
+    const self = this;
+    if (self._retryMigrate && self._readyToMigrate()) {
+      self._retryMigrate();
+      self._retryMigrate = null;
+    }
+  }
+
+  onMessage(raw_msg) {
+    let msg;
+    try {
+      msg = DDPCommon.parseDDP(raw_msg);
+    } catch (e) {
+      Meteor._debug('Exception while parsing DDP', e);
+      return;
+    }
+
+    // Any message counts as receiving a pong, as it demonstrates that
+    // the server is still alive.
+    if (this._heartbeat) {
+      this._heartbeat.messageReceived();
+    }
+
+    if (msg === null || !msg.msg) {
+      if(!msg || !msg.testMessageOnConnect) {
+        if (Object.keys(msg).length === 1 && msg.server_id) return;
+        Meteor._debug('discarding invalid livedata message', msg);
+      }
+      return;
+    }
+
+    if (msg.msg === 'connected') {
+      this._version = this._versionSuggestion;
+      this._livedata_connected(msg);
+      this.options.onConnected();
+    } else if (msg.msg === 'failed') {
+      if (this._supportedDDPVersions.indexOf(msg.version) >= 0) {
+        this._versionSuggestion = msg.version;
+        this._stream.reconnect({ _force: true });
+      } else {
+        const description =
+          'DDP version negotiation failed; server requested version ' +
+          msg.version;
+        this._stream.disconnect({ _permanent: true, _error: description });
+        this.options.onDDPVersionNegotiationFailure(description);
+      }
+    } else if (msg.msg === 'ping' && this.options.respondToPings) {
+      this._send({ msg: 'pong', id: msg.id });
+    } else if (msg.msg === 'pong') {
+      // noop, as we assume everything's a pong
+    } else if (
+      ['added', 'changed', 'removed', 'ready', 'updated'].includes(msg.msg)
+    ) {
+      this._livedata_data(msg);
+    } else if (msg.msg === 'nosub') {
+      this._livedata_nosub(msg);
+    } else if (msg.msg === 'result') {
+      this._livedata_result(msg);
+    } else if (msg.msg === 'error') {
+      this._livedata_error(msg);
+    } else {
+      Meteor._debug('discarding unknown livedata message type', msg);
+    }
+  }
+
+  onReset() {
+    // Send a connect message at the beginning of the stream.
+    // NOTE: reset is called even on the first connection, so this is
+    // the only place we send this message.
+    const msg = { msg: 'connect' };
+    if (this._lastSessionId) msg.session = this._lastSessionId;
+    msg.version = this._versionSuggestion || this._supportedDDPVersions[0];
+    this._versionSuggestion = msg.version;
+    msg.support = this._supportedDDPVersions;
+    this._send(msg);
+
+    // Mark non-retry calls as failed. This has to be done early as getting these methods out of the
+    // current block is pretty important to making sure that quiescence is properly calculated, as
+    // well as possibly moving on to another useful block.
+
+    // Only bother testing if there is an outstandingMethodBlock (there might not be, especially if
+    // we are connecting for the first time.
+    if (this._outstandingMethodBlocks.length > 0) {
+      // If there is an outstanding method block, we only care about the first one as that is the
+      // one that could have already sent messages with no response, that are not allowed to retry.
+      const currentMethodBlock = this._outstandingMethodBlocks[0].methods;
+      this._outstandingMethodBlocks[0].methods = currentMethodBlock.filter(
+        methodInvoker => {
+          // Methods with 'noRetry' option set are not allowed to re-send after
+          // recovering dropped connection.
+          if (methodInvoker.sentMessage && methodInvoker.noRetry) {
+            // Make sure that the method is told that it failed.
+            methodInvoker.receiveResult(
+              new Meteor.Error(
+                'invocation-failed',
+                'Method invocation might have failed due to dropped connection. ' +
+                  'Failing because `noRetry` option was passed to Meteor.apply.'
+              )
+            );
+          }
+
+          // Only keep a method if it wasn't sent or it's allowed to retry.
+          // This may leave the block empty, but we don't move on to the next
+          // block until the callback has been delivered, in _outstandingMethodFinished.
+          return !(methodInvoker.sentMessage && methodInvoker.noRetry);
+        }
+      );
+    }
+
+    // Now, to minimize setup latency, go ahead and blast out all of
+    // our pending methods ands subscriptions before we've even taken
+    // the necessary RTT to know if we successfully reconnected. (1)
+    // They're supposed to be idempotent, and where they are not,
+    // they can block retry in apply; (2) even if we did reconnect,
+    // we're not sure what messages might have gotten lost
+    // (in either direction) since we were disconnected (TCP being
+    // sloppy about that.)
+
+    // If the current block of methods all got their results (but didn't all get
+    // their data visible), discard the empty block now.
+    if (
+      this._outstandingMethodBlocks.length > 0 &&
+      this._outstandingMethodBlocks[0].methods.length === 0
+    ) {
+      this._outstandingMethodBlocks.shift();
+    }
+
+    // Mark all messages as unsent, they have not yet been sent on this
+    // connection.
+    keys(this._methodInvokers).forEach(id => {
+      this._methodInvokers[id].sentMessage = false;
+    });
+
+    // If an `onReconnect` handler is set, call it first. Go through
+    // some hoops to ensure that methods that are called from within
+    // `onReconnect` get executed _before_ ones that were originally
+    // outstanding (since `onReconnect` is used to re-establish auth
+    // certificates)
+    this._callOnReconnectAndSendAppropriateOutstandingMethods();
+
+    // add new subscriptions at the end. this way they take effect after
+    // the handlers and we don't see flicker.
+    Object.entries(this._subscriptions).forEach(([id, sub]) => {
+      this._send({
+        msg: 'sub',
+        id: id,
+        name: sub.name,
+        params: sub.params
+      });
+    });
+  }
+}
\ No newline at end of file
diff --git a/packages/webui/src/meteor/ddp/common/namespace.js b/packages/webui/src/meteor/ddp/common/namespace.js
new file mode 100644
index 0000000000..500898c65c
--- /dev/null
+++ b/packages/webui/src/meteor/ddp/common/namespace.js
@@ -0,0 +1,75 @@
+import { Meteor } from '../../meteor'
+import { Hook } from '../lib/callback-hook.js'
+
+import { Connection } from './livedata_connection.js'
+
+// This array allows the `_allSubscriptionsReady` method below, which
+// is used by the `spiderable` package, to keep track of whether all
+// data is ready.
+const allConnections = []
+
+/**
+ * @namespace DDP
+ * @summary Namespace for DDP-related methods/classes.
+ */
+export const DDP = {}
+
+Meteor.DDP = DDP
+
+// This is private but it's used in a few places. accounts-base uses
+// it to get the current user. Meteor.setTimeout and friends clear
+// it. We can probably find a better way to factor this.
+DDP._CurrentMethodInvocation = new Meteor.EnvironmentVariable()
+DDP._CurrentPublicationInvocation = new Meteor.EnvironmentVariable()
+
+// This is passed into a weird `makeErrorType` function that expects its thing
+// to be a constructor
+function connectionErrorConstructor(message) {
+	this.message = message
+}
+
+DDP.ConnectionError = Meteor.makeErrorType('DDP.ConnectionError', connectionErrorConstructor)
+
+DDP.ForcedReconnectError = Meteor.makeErrorType('DDP.ForcedReconnectError', () => {})
+
+// @param url {String} URL to Meteor app,
+//     e.g.:
+//     "subdomain.meteor.com",
+//     "http://subdomain.meteor.com",
+//     "/",
+//     "ddp+sockjs://ddp--****-foo.meteor.com/sockjs"
+
+/**
+ * @summary Connect to the server of a different Meteor application to subscribe to its document sets and invoke its remote methods.
+ * @locus Anywhere
+ * @param {String} url The URL of another Meteor application.
+ * @param {Object} [options]
+ * @param {Boolean} options.reloadWithOutstanding is it OK to reload if there are outstanding methods?
+ * @param {Object} options.headers extra headers to send on the websockets connection, for server-to-server DDP only
+ * @param {Object} options._sockjsOptions Specifies options to pass through to the sockjs client
+ * @param {Function} options.onDDPNegotiationVersionFailure callback when version negotiation fails.
+ */
+DDP.connect = (url, options) => {
+	const ret = new Connection(url, options)
+	allConnections.push(ret) // hack. see below.
+	return ret
+}
+
+DDP._reconnectHook = new Hook({ bindEnvironment: false })
+
+/**
+ * @summary Register a function to call as the first step of
+ * reconnecting. This function can call methods which will be executed before
+ * any other outstanding methods. For example, this can be used to re-establish
+ * the appropriate authentication context on the connection.
+ * @locus Anywhere
+ * @param {Function} callback The function to call. It will be called with a
+ * single argument, the [connection object](#ddp_connect) that is reconnecting.
+ */
+DDP.onReconnect = (callback) => DDP._reconnectHook.register(callback)
+
+// Hack for `spiderable` package: a way to see if the page is done
+// loading all the data it needs.
+//
+DDP._allSubscriptionsReady = () =>
+	allConnections.every((conn) => Object.values(conn._subscriptions).every((sub) => sub.ready))
diff --git a/packages/webui/src/meteor/ddp/index.d.ts b/packages/webui/src/meteor/ddp/index.d.ts
new file mode 100644
index 0000000000..3671dff016
--- /dev/null
+++ b/packages/webui/src/meteor/ddp/index.d.ts
@@ -0,0 +1,59 @@
+import { Meteor } from 'meteor/meteor';
+
+export namespace DDP {
+  interface DDPStatic {
+    subscribe(name: string, ...rest: any[]): Meteor.SubscriptionHandle;
+    call(method: string, ...parameters: any[]): any;
+    apply(method: string, ...parameters: any[]): any;
+    methods(IMeteorMethodsDictionary: any): any;
+    status(): DDPStatus;
+    reconnect(): void;
+    disconnect(): void;
+    onReconnect(): void;
+  }
+
+  function _allSubscriptionsReady(): boolean;
+
+  type Status = 'connected' | 'connecting' | 'failed' | 'waiting' | 'offline';
+
+  interface DDPStatus {
+    connected: boolean;
+    status: Status;
+    retryCount: number;
+    retryTime?: number | undefined;
+    reason?: string | undefined;
+  }
+
+  function connect(url: string): DDPStatic;
+}
+
+export namespace DDPCommon {
+  interface MethodInvocationOptions {
+    userId: string | null;
+    setUserId?: ((newUserId: string) => void) | undefined;
+    connection: Meteor.Connection;
+  }
+
+  /** The state for a single invocation of a method, referenced by this inside a method definition. */
+  interface MethodInvocation {
+    new (options: MethodInvocationOptions): MethodInvocation;
+    /**
+     * Call inside a method invocation.  Allow subsequent method from this client to begin running in a new fiber.
+     */
+    unblock(): void;
+    /**
+     * Set the logged in user.
+     * @param userId The value that should be returned by `userId` on this connection.
+     */
+    setUserId(userId: string | null): void;
+    /**
+     * The id of the user that made this method call, or `null` if no user was logged in.
+     */
+    userId: string | null;
+    /**
+     * Access inside a method invocation. The [connection](#meteor_onconnection) that this method was received on. `null` if the method is not associated with a connection, eg. a server
+     * initiated method call. Calls to methods made from a server method which was in turn initiated from the client share the same `connection`.
+     */
+    connection: Meteor.Connection;
+  }
+}1
\ No newline at end of file
diff --git a/packages/webui/src/meteor/ddp/index.js b/packages/webui/src/meteor/ddp/index.js
new file mode 100644
index 0000000000..1842d35079
--- /dev/null
+++ b/packages/webui/src/meteor/ddp/index.js
@@ -0,0 +1,7 @@
+
+import './common/livedata_connection';
+
+// Initialize the default server connection and put it on Meteor.connection
+import './client_convenience';
+
+export { DDP } from './common/namespace.js';
diff --git a/packages/webui/src/meteor/ddp/lib/callback-hook.js b/packages/webui/src/meteor/ddp/lib/callback-hook.js
new file mode 100644
index 0000000000..55bcbb8a8c
--- /dev/null
+++ b/packages/webui/src/meteor/ddp/lib/callback-hook.js
@@ -0,0 +1,143 @@
+// XXX This pattern is under development. Do not add more callsites
+// using this package for now. See:
+// https://meteor.hackpad.com/Design-proposal-Hooks-YxvgEW06q6f
+//
+// Encapsulates the pattern of registering callbacks on a hook.
+//
+// The `each` method of the hook calls its iterator function argument
+// with each registered callback.  This allows the hook to
+// conditionally decide not to call the callback (if, for example, the
+// observed object has been closed or terminated).
+//
+// By default, callbacks are bound with `Meteor.bindEnvironment`, so they will be
+// called with the Meteor environment of the calling code that
+// registered the callback. Override by passing { bindEnvironment: false }
+// to the constructor.
+//
+// Registering a callback returns an object with a single `stop`
+// method which unregisters the callback.
+//
+// The code is careful to allow a callback to be safely unregistered
+// while the callbacks are being iterated over.
+//
+// If the hook is configured with the `exceptionHandler` option, the
+// handler will be called if a called callback throws an exception.
+// By default (if the exception handler doesn't itself throw an
+// exception, or if the iterator function doesn't return a falsy value
+// to terminate the calling of callbacks), the remaining callbacks
+// will still be called.
+//
+// Alternatively, the `debugPrintExceptions` option can be specified
+// as string describing the callback.  On an exception the string and
+// the exception will be printed to the console log with
+// `Meteor._debug`, and the exception otherwise ignored.
+//
+// If an exception handler isn't specified, exceptions thrown in the
+// callback will propagate up to the iterator function, and will
+// terminate calling the remaining callbacks if not caught.
+
+import { Meteor } from '../../meteor'
+
+const hasOwn = Object.prototype.hasOwnProperty
+
+export class Hook {
+	constructor(options) {
+		options = options || {}
+		this.nextCallbackId = 0
+		this.callbacks = Object.create(null)
+		// Whether to wrap callbacks with Meteor.bindEnvironment
+		this.bindEnvironment = true
+		if (options.bindEnvironment === false) {
+			this.bindEnvironment = false
+		}
+
+		if (options.exceptionHandler) {
+			this.exceptionHandler = options.exceptionHandler
+		} else if (options.debugPrintExceptions) {
+			if (typeof options.debugPrintExceptions !== 'string') {
+				throw new Error('Hook option debugPrintExceptions should be a string')
+			}
+			this.exceptionHandler = options.debugPrintExceptions
+		}
+	}
+
+	register(callback) {
+		const exceptionHandler =
+			this.exceptionHandler ||
+			function (exception) {
+				// Note: this relies on the undocumented fact that if bindEnvironment's
+				// onException throws, and you are invoking the callback either in the
+				// browser or from within a Fiber in Node, the exception is propagated.
+				throw exception
+			}
+
+		if (this.bindEnvironment) {
+			callback = Meteor.bindEnvironment(callback, exceptionHandler)
+		} else {
+			callback = dontBindEnvironment(callback, exceptionHandler)
+		}
+
+		const id = this.nextCallbackId++
+		this.callbacks[id] = callback
+
+		return {
+			callback,
+			stop: () => {
+				delete this.callbacks[id]
+			},
+		}
+	}
+
+	/**
+	 * For each registered callback, call the passed iterator function with the callback.
+	 *
+	 * The iterator function can choose whether or not to call the
+	 * callback.  (For example, it might not call the callback if the
+	 * observed object has been closed or terminated).
+	 * The iteration is stopped if the iterator function returns a falsy
+	 * value or throws an exception.
+	 *
+	 * @param iterator
+	 */
+	forEach(iterator) {
+		const ids = Object.keys(this.callbacks)
+		for (let i = 0; i < ids.length; ++i) {
+			const id = ids[i]
+			// check to see if the callback was removed during iteration
+			if (hasOwn.call(this.callbacks, id)) {
+				const callback = this.callbacks[id]
+				if (!iterator(callback)) {
+					break
+				}
+			}
+		}
+	}
+
+	/**
+	 * @deprecated use forEach
+	 * @param iterator
+	 */
+	each(iterator) {
+		return this.forEach(iterator)
+	}
+}
+
+// Copied from Meteor.bindEnvironment and removed all the env stuff.
+function dontBindEnvironment(func, onException, _this) {
+	if (!onException || typeof onException === 'string') {
+		const description = onException || 'callback of async function'
+		onException = function (error) {
+			Meteor._debug('Exception in ' + description, error)
+		}
+	}
+
+	return function (...args) {
+		let ret
+		try {
+			ret = func.apply(_this, args)
+		} catch (e) {
+			onException(e)
+		}
+		return ret
+	}
+}
diff --git a/packages/webui/src/meteor/diff-sequence.js b/packages/webui/src/meteor/diff-sequence.js
new file mode 100644
index 0000000000..3e3b71da2e
--- /dev/null
+++ b/packages/webui/src/meteor/diff-sequence.js
@@ -0,0 +1,291 @@
+// https://github.com/meteor/meteor/blob/73fd519de6eef8e116d813fb457c8442db9d1cdd/packages/diff-sequence/diff.js
+
+import EJSON from 'ejson'
+import { Meteor } from './meteor'
+
+export const DiffSequence = {};
+
+const hasOwn = Object.prototype.hasOwnProperty;
+
+function isObjEmpty(obj) {
+  for (let key in Object(obj)) {
+    if (hasOwn.call(obj, key)) {
+      return false;
+    }
+  }
+  return true;
+}
+
+// ordered: bool.
+// old_results and new_results: collections of documents.
+//    if ordered, they are arrays.
+//    if unordered, they are IdMaps
+DiffSequence.diffQueryChanges = function (ordered, oldResults, newResults,
+                                              observer, options) {
+  if (ordered)
+    DiffSequence.diffQueryOrderedChanges(
+      oldResults, newResults, observer, options);
+  else
+    DiffSequence.diffQueryUnorderedChanges(
+      oldResults, newResults, observer, options);
+};
+
+DiffSequence.diffQueryUnorderedChanges = function (oldResults, newResults,
+                                                       observer, options) {
+  options = options || {};
+  var projectionFn = options.projectionFn || EJSON.clone;
+
+  if (observer.movedBefore) {
+    throw new Error("_diffQueryUnordered called with a movedBefore observer!");
+  }
+
+  newResults.forEach(function (newDoc, id) {
+    var oldDoc = oldResults.get(id);
+    if (oldDoc) {
+      if (observer.changed && !EJSON.equals(oldDoc, newDoc)) {
+        var projectedNew = projectionFn(newDoc);
+        var projectedOld = projectionFn(oldDoc);
+        var changedFields =
+              DiffSequence.makeChangedFields(projectedNew, projectedOld);
+        if (! isObjEmpty(changedFields)) {
+          observer.changed(id, changedFields);
+        }
+      }
+    } else if (observer.added) {
+      var fields = projectionFn(newDoc);
+      delete fields._id;
+      observer.added(newDoc._id, fields);
+    }
+  });
+
+  if (observer.removed) {
+    oldResults.forEach(function (oldDoc, id) {
+      if (!newResults.has(id))
+        observer.removed(id);
+    });
+  }
+};
+
+DiffSequence.diffQueryOrderedChanges = function (old_results, new_results,
+                                                     observer, options) {
+  options = options || {};
+  var projectionFn = options.projectionFn || EJSON.clone;
+
+  var new_presence_of_id = {};
+  new_results.forEach(function (doc) {
+    if (new_presence_of_id[doc._id])
+      Meteor._debug("Duplicate _id in new_results");
+    new_presence_of_id[doc._id] = true;
+  });
+
+  var old_index_of_id = {};
+  old_results.forEach(function (doc, i) {
+    if (doc._id in old_index_of_id)
+      Meteor._debug("Duplicate _id in old_results");
+    old_index_of_id[doc._id] = i;
+  });
+
+  // ALGORITHM:
+  //
+  // To determine which docs should be considered "moved" (and which
+  // merely change position because of other docs moving) we run
+  // a "longest common subsequence" (LCS) algorithm.  The LCS of the
+  // old doc IDs and the new doc IDs gives the docs that should NOT be
+  // considered moved.
+
+  // To actually call the appropriate callbacks to get from the old state to the
+  // new state:
+
+  // First, we call removed() on all the items that only appear in the old
+  // state.
+
+  // Then, once we have the items that should not move, we walk through the new
+  // results array group-by-group, where a "group" is a set of items that have
+  // moved, anchored on the end by an item that should not move.  One by one, we
+  // move each of those elements into place "before" the anchoring end-of-group
+  // item, and fire changed events on them if necessary.  Then we fire a changed
+  // event on the anchor, and move on to the next group.  There is always at
+  // least one group; the last group is anchored by a virtual "null" id at the
+  // end.
+
+  // Asymptotically: O(N k) where k is number of ops, or potentially
+  // O(N log N) if inner loop of LCS were made to be binary search.
+
+
+  //////// LCS (longest common sequence, with respect to _id)
+  // (see Wikipedia article on Longest Increasing Subsequence,
+  // where the LIS is taken of the sequence of old indices of the
+  // docs in new_results)
+  //
+  // unmoved: the output of the algorithm; members of the LCS,
+  // in the form of indices into new_results
+  var unmoved = [];
+  // max_seq_len: length of LCS found so far
+  var max_seq_len = 0;
+  // seq_ends[i]: the index into new_results of the last doc in a
+  // common subsequence of length of i+1 <= max_seq_len
+  var N = new_results.length;
+  var seq_ends = new Array(N);
+  // ptrs:  the common subsequence ending with new_results[n] extends
+  // a common subsequence ending with new_results[ptr[n]], unless
+  // ptr[n] is -1.
+  var ptrs = new Array(N);
+  // virtual sequence of old indices of new results
+  var old_idx_seq = function(i_new) {
+    return old_index_of_id[new_results[i_new]._id];
+  };
+  // for each item in new_results, use it to extend a common subsequence
+  // of length j <= max_seq_len
+  for(var i=0; i<N; i++) {
+    if (old_index_of_id[new_results[i]._id] !== undefined) {
+      var j = max_seq_len;
+      // this inner loop would traditionally be a binary search,
+      // but scanning backwards we will likely find a subseq to extend
+      // pretty soon, bounded for example by the total number of ops.
+      // If this were to be changed to a binary search, we'd still want
+      // to scan backwards a bit as an optimization.
+      while (j > 0) {
+        if (old_idx_seq(seq_ends[j-1]) < old_idx_seq(i))
+          break;
+        j--;
+      }
+
+      ptrs[i] = (j === 0 ? -1 : seq_ends[j-1]);
+      seq_ends[j] = i;
+      if (j+1 > max_seq_len)
+        max_seq_len = j+1;
+    }
+  }
+
+  // pull out the LCS/LIS into unmoved
+  var idx = (max_seq_len === 0 ? -1 : seq_ends[max_seq_len-1]);
+  while (idx >= 0) {
+    unmoved.push(idx);
+    idx = ptrs[idx];
+  }
+  // the unmoved item list is built backwards, so fix that
+  unmoved.reverse();
+
+  // the last group is always anchored by the end of the result list, which is
+  // an id of "null"
+  unmoved.push(new_results.length);
+
+  old_results.forEach(function (doc) {
+    if (!new_presence_of_id[doc._id])
+      observer.removed && observer.removed(doc._id);
+  });
+
+  // for each group of things in the new_results that is anchored by an unmoved
+  // element, iterate through the things before it.
+  var startOfGroup = 0;
+  unmoved.forEach(function (endOfGroup) {
+    var groupId = new_results[endOfGroup] ? new_results[endOfGroup]._id : null;
+    var oldDoc, newDoc, fields, projectedNew, projectedOld;
+    for (var i = startOfGroup; i < endOfGroup; i++) {
+      newDoc = new_results[i];
+      if (!hasOwn.call(old_index_of_id, newDoc._id)) {
+        fields = projectionFn(newDoc);
+        delete fields._id;
+        observer.addedBefore && observer.addedBefore(newDoc._id, fields, groupId);
+        observer.added && observer.added(newDoc._id, fields);
+      } else {
+        // moved
+        oldDoc = old_results[old_index_of_id[newDoc._id]];
+        projectedNew = projectionFn(newDoc);
+        projectedOld = projectionFn(oldDoc);
+        fields = DiffSequence.makeChangedFields(projectedNew, projectedOld);
+        if (!isObjEmpty(fields)) {
+          observer.changed && observer.changed(newDoc._id, fields);
+        }
+        observer.movedBefore && observer.movedBefore(newDoc._id, groupId);
+      }
+    }
+    if (groupId) {
+      newDoc = new_results[endOfGroup];
+      oldDoc = old_results[old_index_of_id[newDoc._id]];
+      projectedNew = projectionFn(newDoc);
+      projectedOld = projectionFn(oldDoc);
+      fields = DiffSequence.makeChangedFields(projectedNew, projectedOld);
+      if (!isObjEmpty(fields)) {
+        observer.changed && observer.changed(newDoc._id, fields);
+      }
+    }
+    startOfGroup = endOfGroup+1;
+  });
+
+
+};
+
+
+// General helper for diff-ing two objects.
+// callbacks is an object like so:
+// { leftOnly: function (key, leftValue) {...},
+//   rightOnly: function (key, rightValue) {...},
+//   both: function (key, leftValue, rightValue) {...},
+// }
+DiffSequence.diffObjects = function (left, right, callbacks) {
+  Object.keys(left).forEach(key => {
+    const leftValue = left[key];
+    if (hasOwn.call(right, key)) {
+      callbacks.both && callbacks.both(key, leftValue, right[key]);
+    } else {
+      callbacks.leftOnly && callbacks.leftOnly(key, leftValue);
+    }
+  });
+
+  if (callbacks.rightOnly) {
+    Object.keys(right).forEach(key => {
+      const rightValue = right[key];
+      if (! hasOwn.call(left, key)) {
+        callbacks.rightOnly(key, rightValue);
+      }
+    });
+  }
+};
+
+DiffSequence.diffMaps = function (left, right, callbacks) {
+  left.forEach(function (leftValue, key) {
+    if (right.has(key)){
+      callbacks.both && callbacks.both(key, leftValue, right.get(key));
+    } else {
+      callbacks.leftOnly && callbacks.leftOnly(key, leftValue);
+    }
+  });
+
+  if (callbacks.rightOnly) {
+    right.forEach(function (rightValue, key) {
+      if (!left.has(key)){
+        callbacks.rightOnly(key, rightValue);
+      }
+    });
+  }
+};
+
+
+DiffSequence.makeChangedFields = function (newDoc, oldDoc) {
+  var fields = {};
+  DiffSequence.diffObjects(oldDoc, newDoc, {
+    leftOnly: function (key, value) {
+      fields[key] = undefined;
+    },
+    rightOnly: function (key, value) {
+      fields[key] = value;
+    },
+    both: function (key, leftValue, rightValue) {
+      if (!EJSON.equals(leftValue, rightValue))
+        fields[key] = rightValue;
+    }
+  });
+  return fields;
+};
+
+DiffSequence.applyChanges = function (doc, changeFields) {
+  Object.keys(changeFields).forEach(key => {
+    const value = changeFields[key];
+    if (typeof value === "undefined") {
+      delete doc[key];
+    } else {
+      doc[key] = value;
+    }
+  });
+};
diff --git a/packages/webui/src/meteor/meteor.d.ts b/packages/webui/src/meteor/meteor.d.ts
new file mode 100644
index 0000000000..90ba3fcdba
--- /dev/null
+++ b/packages/webui/src/meteor/meteor.d.ts
@@ -0,0 +1,204 @@
+import { Mongo } from './mongo'
+import { EJSONable, EJSONableProperty } from 'meteor/ejson'
+import { Blaze } from 'meteor/blaze'
+import { DDP } from 'meteor/ddp'
+
+// declare module 'meteor/meteor' {
+type global_Error = Error
+export namespace Meteor {
+	/** Global props **/
+
+	/** Error **/
+	/**
+	 * This class represents a symbolic error thrown by a method.
+	 */
+	var Error: ErrorStatic
+	interface ErrorStatic {
+		/**
+		 * @param error A string code uniquely identifying this kind of error.
+		 * This string should be used by callers of the method to determine the
+		 * appropriate action to take, instead of attempting to parse the reason
+		 * or details fields. For example:
+		 *
+		 * ```
+		 * // on the server, pick a code unique to this error
+		 * // the reason field should be a useful debug message
+		 * throw new Meteor.Error("logged-out",
+		 *   "The user must be logged in to post a comment.");
+		 *
+		 * // on the client
+		 * Meteor.call("methodName", function (error) {
+		 *   // identify the error
+		 *   if (error && error.error === "logged-out") {
+		 *     // show a nice error message
+		 *     Session.set("errorMessage", "Please log in to post a comment.");
+		 *   }
+		 * });
+		 * ```
+		 *
+		 * For legacy reasons, some built-in Meteor functions such as `check` throw
+		 * errors with a number in this field.
+		 *
+		 * @param reason Optional. A short human-readable summary of the
+		 * error, like 'Not Found'.
+		 * @param details Optional. Additional information about the error,
+		 * like a textual stack trace.
+		 */
+		new (error: string | number, reason?: string, details?: string): Error
+	}
+	interface Error extends global_Error {
+		error: string | number
+		reason?: string | undefined
+		details?: string | undefined
+	}
+	var TypedError: TypedErrorStatic
+	interface TypedErrorStatic {
+		new (message: string, errorType: string): TypedError
+	}
+	interface TypedError extends global_Error {
+		message: string
+		errorType: string
+	}
+	/** Error **/
+
+	/**
+	 * Defines functions that can be invoked over the network by clients.
+	 * @param methods Dictionary whose keys are method names and values are functions.
+	 */
+	function methods(methods: { [key: string]: (this: MethodThisType, ...args: any[]) => any }): void
+
+	/**
+	 * Invokes a method passing any number of arguments.
+	 * @param name Name of method to invoke
+	 * @param args Optional method arguments
+	 */
+	function call(name: string, ...args: any[]): any
+
+	function apply<Result extends EJSONable | EJSONable[] | EJSONableProperty | EJSONableProperty[]>(
+		name: string,
+		args: ReadonlyArray<EJSONable | EJSONableProperty>,
+		options?: {
+			wait?: boolean | undefined
+			onResultReceived?: ((error: global_Error | Meteor.Error | undefined, result?: Result) => void) | undefined
+			/**
+			 * (Client only) if true, don't send this method again on reload, simply call the callback an error with the error code 'invocation-failed'.
+			 */
+			noRetry?: boolean | undefined
+		},
+		asyncCallback?: (error: global_Error | Meteor.Error | undefined, result?: Result) => void
+	): any
+	/** Method **/
+
+	/** Timeout **/
+	/**
+	 * Call a function repeatedly, with a time delay between calls.
+	 * @param func The function to run
+	 * @param delay Number of milliseconds to wait between each function call.
+	 */
+	function setInterval(func: Function, delay: number): number
+
+	/**
+	 * Call a function in the future after waiting for a specified delay.
+	 * @param func The function to run
+	 * @param delay Number of milliseconds to wait before calling function
+	 */
+	function setTimeout(func: Function, delay: number): number
+	/**
+	 * Cancel a repeating function call scheduled by `Meteor.setInterval`.
+	 * @param id The handle returned by `Meteor.setInterval`
+	 */
+	function clearInterval(id: number): void
+
+	/**
+	 * Cancel a function call scheduled by `Meteor.setTimeout`.
+	 * @param id The handle returned by `Meteor.setTimeout`
+	 */
+	function clearTimeout(id: number): void
+	/**
+	 * Defer execution of a function to run asynchronously in the background (similar to `Meteor.setTimeout(func, 0)`.
+	 * @param func The function to run
+	 */
+	function defer(func: Function): void
+	/** Timeout **/
+
+	/** utils **/
+	/**
+	 * Run code when a client or a server starts.
+	 * @param func A function to run on startup.
+	 */
+	function startup(func: Function): void
+
+	/**
+	 * Cancel a function call scheduled by `Meteor.setTimeout`.
+	 * @param id The handle returned by `Meteor.setTimeout`
+	 */
+	function clearTimeout(id: number): void
+	/**
+	 * Defer execution of a function to run asynchronously in the background (similar to `Meteor.setTimeout(func, 0)`.
+	 * @param func The function to run
+	 */
+	function defer(func: Function): void
+	/** Timeout **/
+
+	function bindEnvironment<TFunc extends Function>(func: TFunc): TFunc
+
+	/** utils **/
+
+	class EnvironmentVariable<T> {
+		readonly slot: number
+		constructor()
+		get(): T
+		getOrNullIfOutsideFiber(): T | null
+		withValue<U>(value: T, fn: () => U): U
+	}
+	/** utils **/
+
+	/** Pub/Sub **/
+	interface SubscriptionHandle {
+		/** Cancel the subscription. This will typically result in the server directing the client to remove the subscription’s data from the client’s cache. */
+		stop(): void
+		/** True if the server has marked the subscription as ready. A reactive data source. */
+		ready(): boolean
+	}
+	interface LiveQueryHandle {
+		stop(): void
+	}
+	/** Pub/Sub **/
+
+	/** Login **/
+
+	function loginWithPassword(
+		user: Object | string,
+		password: string,
+		callback?: (error?: global_Error | Meteor.Error | Meteor.TypedError) => void
+	): void
+
+	function logout(callback?: (error?: global_Error | Meteor.Error | Meteor.TypedError) => void): void
+
+	/** Login **/
+
+	/** Connection **/
+	function reconnect(): void
+
+	/** Connection **/
+
+	/** Status **/
+	function status(): DDP.DDPStatus
+	/** Status **/
+
+	/** Pub/Sub **/
+	/**
+	 * Subscribe to a record set.  Returns a handle that provides
+	 * `stop()` and `ready()` methods.
+	 * @param name Name of the subscription.  Matches the name of the
+	 * server's `publish()` call.
+	 * @param args Optional arguments passed to publisher
+	 * function on server.
+	 * @param callbacks Optional. May include `onStop`
+	 * and `onReady` callbacks. If there is an error, it is passed as an
+	 * argument to `onStop`. If a function is passed instead of an object, it
+	 * is interpreted as an `onReady` callback.
+	 */
+	function subscribe(name: string, ...args: any[]): Meteor.SubscriptionHandle
+	/** Pub/Sub **/
+}
diff --git a/packages/webui/src/meteor/meteor.js b/packages/webui/src/meteor/meteor.js
new file mode 100644
index 0000000000..7213f22d1c
--- /dev/null
+++ b/packages/webui/src/meteor/meteor.js
@@ -0,0 +1,335 @@
+const Meteor = {
+	_debug: (...args) => {
+		console.debug(...args)
+	},
+
+	_suppressed_log_expected: () => {
+		return true
+	},
+	_suppress_log: (i) => {
+		//
+	},
+
+	_setImmediate: (cb) => {
+		return setTimeout(cb, 0)
+	},
+
+	makeErrorType: (name, constructor) => {
+		var errorClass = function (/*arguments*/) {
+			// Ensure we get a proper stack trace in most Javascript environments
+			if (Error.captureStackTrace) {
+				// V8 environments (Chrome and Node.js)
+				Error.captureStackTrace(this, errorClass)
+			} else {
+				// Borrow the .stack property of a native Error object.
+				this.stack = new Error().stack
+			}
+			// Safari magically works.
+
+			constructor.apply(this, arguments)
+
+			this.errorType = name
+		}
+
+		Meteor._inherits(errorClass, Error)
+
+		return errorClass
+	},
+}
+
+function withoutInvocation(f) {
+	var DDP = Meteor.DDP
+	if (DDP) {
+		var CurrentInvocation = DDP._CurrentMethodInvocation
+
+		return function () {
+			CurrentInvocation.withValue(null, f)
+		}
+	} else {
+		return f
+	}
+}
+
+function bindAndCatch(context, f) {
+	return Meteor.bindEnvironment(withoutInvocation(f), context)
+}
+
+// Meteor.setTimeout and Meteor.setInterval callbacks scheduled
+// inside a server method are not part of the method invocation and
+// should clear out the CurrentMethodInvocation environment variable.
+
+/**
+ * @memberOf Meteor
+ * @summary Call a function in the future after waiting for a specified delay.
+ * @locus Anywhere
+ * @param {Function} func The function to run
+ * @param {Number} delay Number of milliseconds to wait before calling function
+ */
+Meteor.setTimeout = function (f, duration) {
+	return setTimeout(bindAndCatch('setTimeout callback', f), duration)
+}
+
+/**
+ * @memberOf Meteor
+ * @summary Call a function repeatedly, with a time delay between calls.
+ * @locus Anywhere
+ * @param {Function} func The function to run
+ * @param {Number} delay Number of milliseconds to wait between each function call.
+ */
+Meteor.setInterval = function (f, duration) {
+	return setInterval(bindAndCatch('setInterval callback', f), duration)
+}
+
+/**
+ * @memberOf Meteor
+ * @summary Cancel a repeating function call scheduled by `Meteor.setInterval`.
+ * @locus Anywhere
+ * @param {Object} id The handle returned by `Meteor.setInterval`
+ */
+Meteor.clearInterval = function (x) {
+	return clearInterval(x)
+}
+
+/**
+ * @memberOf Meteor
+ * @summary Cancel a function call scheduled by `Meteor.setTimeout`.
+ * @locus Anywhere
+ * @param {Object} id The handle returned by `Meteor.setTimeout`
+ */
+Meteor.clearTimeout = function (x) {
+	return clearTimeout(x)
+}
+
+// XXX consider making this guarantee ordering of defer'd callbacks, like
+// Tracker.afterFlush or Node's nextTick (in practice). Then tests can do:
+//    callSomethingThatDefersSomeWork();
+//    Meteor.defer(expect(somethingThatValidatesThatTheWorkHappened));
+
+/**
+ * @memberOf Meteor
+ * @summary Defer execution of a function to run asynchronously in the background (similar to `Meteor.setTimeout(func, 0)`.
+ * @locus Anywhere
+ * @param {Function} func The function to run
+ */
+Meteor.defer = function (f) {
+	Meteor._setImmediate(bindAndCatch('defer callback', f))
+}
+
+// Sets child's prototype to a new object whose prototype is parent's
+// prototype. Used as:
+//   Meteor._inherits(ClassB, ClassA).
+//   _.extend(ClassB.prototype, { ... })
+// Inspired by CoffeeScript's `extend` and Google Closure's `goog.inherits`.
+var hasOwn = Object.prototype.hasOwnProperty
+Meteor._inherits = function (Child, Parent) {
+	// copy Parent static properties
+	for (var key in Parent) {
+		// make sure we only copy hasOwnProperty properties vs. prototype
+		// properties
+		if (hasOwn.call(Parent, key)) {
+			Child[key] = Parent[key]
+		}
+	}
+
+	// a middle member of prototype chain: takes the prototype from the Parent
+	var Middle = function () {
+		this.constructor = Child
+	}
+	Middle.prototype = Parent.prototype
+	Child.prototype = new Middle()
+	Child.__super__ = Parent.prototype
+	return Child
+}
+
+{
+	// Simple implementation of dynamic scoping, for use in browsers
+
+	var nextSlot = 0
+	var currentValues = []
+
+	Meteor.EnvironmentVariable = function () {
+		this.slot = nextSlot++
+	}
+
+	var EVp = Meteor.EnvironmentVariable.prototype
+
+	EVp.get = function () {
+		return currentValues[this.slot]
+	}
+
+	EVp.getOrNullIfOutsideFiber = function () {
+		return this.get()
+	}
+
+	EVp.withValue = function (value, func) {
+		var saved = currentValues[this.slot]
+		try {
+			currentValues[this.slot] = value
+			var ret = func()
+		} finally {
+			currentValues[this.slot] = saved
+		}
+		return ret
+	}
+
+	Meteor.bindEnvironment = function (func, onException, _this) {
+		// needed in order to be able to create closures inside func and
+		// have the closed variables not change back to their original
+		// values
+		var boundValues = currentValues.slice()
+
+		if (!onException || typeof onException === 'string') {
+			var description = onException || 'callback of async function'
+			onException = function (error) {
+				Meteor._debug('Exception in ' + description + ':', error)
+			}
+		}
+
+		return function (/* arguments */) {
+			var savedValues = currentValues
+			try {
+				currentValues = boundValues
+				var ret = func.apply(_this, arguments)
+			} catch (e) {
+				// note: callback-hook currently relies on the fact that if onException
+				// throws in the browser, the wrapped call throws.
+				onException(e)
+			} finally {
+				currentValues = savedValues
+			}
+			return ret
+		}
+	}
+}
+
+Meteor.Error = Meteor.makeErrorType('Meteor.Error', function (error, reason, details) {
+	var self = this
+
+	// Newer versions of DDP use this property to signify that an error
+	// can be sent back and reconstructed on the calling client.
+	self.isClientSafe = true
+
+	// String code uniquely identifying this kind of error.
+	self.error = error
+
+	// Optional: A short human-readable summary of the error. Not
+	// intended to be shown to end users, just developers. ("Not Found",
+	// "Internal Server Error")
+	self.reason = reason
+
+	// Optional: Additional information about the error, say for
+	// debugging. It might be a (textual) stack trace if the server is
+	// willing to provide one. The corresponding thing in HTTP would be
+	// the body of a 404 or 500 response. (The difference is that we
+	// never expect this to be shown to end users, only developers, so
+	// it doesn't need to be pretty.)
+	self.details = details
+
+	// This is what gets displayed at the top of a stack trace. Current
+	// format is "[404]" (if no reason is set) or "File not found [404]"
+	if (self.reason) self.message = self.reason + ' [' + self.error + ']'
+	else self.message = '[' + self.error + ']'
+})
+
+// Meteor.Error is basically data and is sent over DDP, so you should be able to
+// properly EJSON-clone it. This is especially important because if a
+// Meteor.Error is thrown through a Future, the error, reason, and details
+// properties become non-enumerable so a standard Object clone won't preserve
+// them and they will be lost from DDP.
+Meteor.Error.prototype.clone = function () {
+	var self = this
+	return new Meteor.Error(self.error, self.reason, self.details)
+}
+
+/**
+ * @summary Generate an absolute URL pointing to the application. The server reads from the `ROOT_URL` environment variable to determine where it is running. This is taken care of automatically for apps deployed to Galaxy, but must be provided when using `meteor build`.
+ * @locus Anywhere
+ * @param {String} [path] A path to append to the root URL. Do not include a leading "`/`".
+ * @param {Object} [options]
+ * @param {Boolean} options.secure Create an HTTPS URL.
+ * @param {Boolean} options.replaceLocalhost Replace localhost with 127.0.0.1. Useful for services that don't recognize localhost as a domain name.
+ * @param {String} options.rootUrl Override the default ROOT_URL from the server environment. For example: "`http://foo.example.com`"
+ */
+Meteor.absoluteUrl = function (path, options) {
+	// path is optional
+	if (!options && typeof path === 'object') {
+		options = path
+		path = undefined
+	}
+	// merge options with defaults
+	options = Object.assign({}, Meteor.absoluteUrl.defaultOptions, options || {})
+
+	var url = options.rootUrl
+	if (!url) throw new Error('Must pass options.rootUrl or set ROOT_URL in the server environment')
+
+	if (!/^http[s]?:\/\//i.test(url))
+		// url starts with 'http://' or 'https://'
+		url = 'http://' + url // we will later fix to https if options.secure is set
+
+	if (!url.endsWith('/')) {
+		url += '/'
+	}
+
+	if (path) {
+		// join url and path with a / separator
+		while (path.startsWith('/')) {
+			path = path.slice(1)
+		}
+		url += path
+	}
+
+	// turn http to https if secure option is set, and we're not talking
+	// to localhost.
+	if (
+		options.secure &&
+		/^http:/.test(url) && // url starts with 'http:'
+		!/http:\/\/localhost[:\/]/.test(url) && // doesn't match localhost
+		!/http:\/\/127\.0\.0\.1[:\/]/.test(url)
+	)
+		// or 127.0.0.1
+		url = url.replace(/^http:/, 'https:')
+
+	if (options.replaceLocalhost) url = url.replace(/^http:\/\/localhost([:\/].*)/, 'http://127.0.0.1$1')
+
+	return url
+}
+
+// allow later packages to override default options
+var defaultOptions = (Meteor.absoluteUrl.defaultOptions = {})
+
+// available only in a browser environment
+var location = typeof window === 'object' && window.location
+
+if (typeof window.__meteor_runtime_config__ === 'object' && window.__meteor_runtime_config__.ROOT_URL) {
+	defaultOptions.rootUrl = window.__meteor_runtime_config__.ROOT_URL
+} else if (location && location.protocol && location.host) {
+	defaultOptions.rootUrl = location.protocol + '//' + location.host
+}
+
+// Make absolute URLs use HTTPS by default if the current window.location
+// uses HTTPS. Since this is just a default, it can be overridden by
+// passing { secure: false } if necessary.
+if (location && location.protocol === 'https:') {
+	defaultOptions.secure = true
+}
+
+Meteor._relativeToSiteRootUrl = function (link) {
+	if (typeof window.__meteor_runtime_config__ === 'object' && link.substr(0, 1) === '/')
+		link = (window.__meteor_runtime_config__.ROOT_URL_PATH_PREFIX || '') + link
+	return link
+}
+
+export { Meteor }
+window.Meteor = Meteor
+
+Meteor.startup = function (cb) {
+	cb()
+}
+
+Meteor.user = function () {
+	return null
+}
+
+Meteor.userId = function () {
+	return null
+}
diff --git a/packages/webui/src/meteor/minimongo/common.js b/packages/webui/src/meteor/minimongo/common.js
new file mode 100644
index 0000000000..bb2b6fefdf
--- /dev/null
+++ b/packages/webui/src/meteor/minimongo/common.js
@@ -0,0 +1,1548 @@
+import EJSON from 'ejson'
+
+export const hasOwn = Object.prototype.hasOwnProperty;
+
+// Each element selector contains:
+//  - compileElementSelector, a function with args:
+//    - operand - the "right hand side" of the operator
+//    - valueSelector - the "context" for the operator (so that $regex can find
+//      $options)
+//    - matcher - the Matcher this is going into (so that $elemMatch can compile
+//      more things)
+//    returning a function mapping a single value to bool.
+//  - dontExpandLeafArrays, a bool which prevents expandArraysInBranches from
+//    being called
+//  - dontIncludeLeafArrays, a bool which causes an argument to be passed to
+//    expandArraysInBranches if it is called
+export const ELEMENT_OPERATORS = {
+  $lt: makeInequality(cmpValue => cmpValue < 0),
+  $gt: makeInequality(cmpValue => cmpValue > 0),
+  $lte: makeInequality(cmpValue => cmpValue <= 0),
+  $gte: makeInequality(cmpValue => cmpValue >= 0),
+  $mod: {
+    compileElementSelector(operand) {
+      if (!(Array.isArray(operand) && operand.length === 2
+            && typeof operand[0] === 'number'
+            && typeof operand[1] === 'number')) {
+        throw Error('argument to $mod must be an array of two numbers');
+      }
+
+      // XXX could require to be ints or round or something
+      const divisor = operand[0];
+      const remainder = operand[1];
+      return value => (
+        typeof value === 'number' && value % divisor === remainder
+      );
+    },
+  },
+  $in: {
+    compileElementSelector(operand) {
+      if (!Array.isArray(operand)) {
+        throw Error('$in needs an array');
+      }
+
+      const elementMatchers = operand.map(option => {
+        if (option instanceof RegExp) {
+          return regexpElementMatcher(option);
+        }
+
+        if (isOperatorObject(option)) {
+          throw Error('cannot nest $ under $in');
+        }
+
+        return equalityElementMatcher(option);
+      });
+
+      return value => {
+        // Allow {a: {$in: [null]}} to match when 'a' does not exist.
+        if (value === undefined) {
+          value = null;
+        }
+
+        return elementMatchers.some(matcher => matcher(value));
+      };
+    },
+  },
+  $size: {
+    // {a: [[5, 5]]} must match {a: {$size: 1}} but not {a: {$size: 2}}, so we
+    // don't want to consider the element [5,5] in the leaf array [[5,5]] as a
+    // possible value.
+    dontExpandLeafArrays: true,
+    compileElementSelector(operand) {
+      if (typeof operand === 'string') {
+        // Don't ask me why, but by experimentation, this seems to be what Mongo
+        // does.
+        operand = 0;
+      } else if (typeof operand !== 'number') {
+        throw Error('$size needs a number');
+      }
+
+      return value => Array.isArray(value) && value.length === operand;
+    },
+  },
+  $type: {
+    // {a: [5]} must not match {a: {$type: 4}} (4 means array), but it should
+    // match {a: {$type: 1}} (1 means number), and {a: [[5]]} must match {$a:
+    // {$type: 4}}. Thus, when we see a leaf array, we *should* expand it but
+    // should *not* include it itself.
+    dontIncludeLeafArrays: true,
+    compileElementSelector(operand) {
+      if (typeof operand === 'string') {
+        const operandAliasMap = {
+          'double': 1,
+          'string': 2,
+          'object': 3,
+          'array': 4,
+          'binData': 5,
+          'undefined': 6,
+          'objectId': 7,
+          'bool': 8,
+          'date': 9,
+          'null': 10,
+          'regex': 11,
+          'dbPointer': 12,
+          'javascript': 13,
+          'symbol': 14,
+          'javascriptWithScope': 15,
+          'int': 16,
+          'timestamp': 17,
+          'long': 18,
+          'decimal': 19,
+          'minKey': -1,
+          'maxKey': 127,
+        };
+        if (!hasOwn.call(operandAliasMap, operand)) {
+          throw Error(`unknown string alias for $type: ${operand}`);
+        }
+        operand = operandAliasMap[operand];
+      } else if (typeof operand === 'number') {
+        if (operand === 0 || operand < -1
+          || (operand > 19 && operand !== 127)) {
+          throw Error(`Invalid numerical $type code: ${operand}`);
+        }
+      } else {
+        throw Error('argument to $type is not a number or a string');
+      }
+
+      return value => (
+        value !== undefined && bigBlobF._type(value) === operand
+      );
+    },
+  },
+  $bitsAllSet: {
+    compileElementSelector(operand) {
+      const mask = getOperandBitmask(operand, '$bitsAllSet');
+      return value => {
+        const bitmask = getValueBitmask(value, mask.length);
+        return bitmask && mask.every((byte, i) => (bitmask[i] & byte) === byte);
+      };
+    },
+  },
+  $bitsAnySet: {
+    compileElementSelector(operand) {
+      const mask = getOperandBitmask(operand, '$bitsAnySet');
+      return value => {
+        const bitmask = getValueBitmask(value, mask.length);
+        return bitmask && mask.some((byte, i) => (~bitmask[i] & byte) !== byte);
+      };
+    },
+  },
+  $bitsAllClear: {
+    compileElementSelector(operand) {
+      const mask = getOperandBitmask(operand, '$bitsAllClear');
+      return value => {
+        const bitmask = getValueBitmask(value, mask.length);
+        return bitmask && mask.every((byte, i) => !(bitmask[i] & byte));
+      };
+    },
+  },
+  $bitsAnyClear: {
+    compileElementSelector(operand) {
+      const mask = getOperandBitmask(operand, '$bitsAnyClear');
+      return value => {
+        const bitmask = getValueBitmask(value, mask.length);
+        return bitmask && mask.some((byte, i) => (bitmask[i] & byte) !== byte);
+      };
+    },
+  },
+  $regex: {
+    compileElementSelector(operand, valueSelector) {
+      if (!(typeof operand === 'string' || operand instanceof RegExp)) {
+        throw Error('$regex has to be a string or RegExp');
+      }
+
+      let regexp;
+      if (valueSelector.$options !== undefined) {
+        // Options passed in $options (even the empty string) always overrides
+        // options in the RegExp object itself.
+
+        // Be clear that we only support the JS-supported options, not extended
+        // ones (eg, Mongo supports x and s). Ideally we would implement x and s
+        // by transforming the regexp, but not today...
+        if (/[^gim]/.test(valueSelector.$options)) {
+          throw new Error('Only the i, m, and g regexp options are supported');
+        }
+
+        const source = operand instanceof RegExp ? operand.source : operand;
+        regexp = new RegExp(source, valueSelector.$options);
+      } else if (operand instanceof RegExp) {
+        regexp = operand;
+      } else {
+        regexp = new RegExp(operand);
+      }
+
+      return regexpElementMatcher(regexp);
+    },
+  },
+  $elemMatch: {
+    dontExpandLeafArrays: true,
+    compileElementSelector(operand, valueSelector, matcher) {
+      if (!_isPlainObject(operand)) {
+        throw Error('$elemMatch need an object');
+      }
+
+      const isDocMatcher = !isOperatorObject(
+        Object.keys(operand)
+          .filter(key => !hasOwn.call(LOGICAL_OPERATORS, key))
+          .reduce((a, b) => Object.assign(a, {[b]: operand[b]}), {}),
+        true);
+
+      let subMatcher;
+      if (isDocMatcher) {
+        // This is NOT the same as compileValueSelector(operand), and not just
+        // because of the slightly different calling convention.
+        // {$elemMatch: {x: 3}} means "an element has a field x:3", not
+        // "consists only of a field x:3". Also, regexps and sub-$ are allowed.
+        subMatcher =
+          compileDocumentSelector(operand, matcher, {inElemMatch: true});
+      } else {
+        subMatcher = compileValueSelector(operand, matcher);
+      }
+
+      return value => {
+        if (!Array.isArray(value)) {
+          return false;
+        }
+
+        for (let i = 0; i < value.length; ++i) {
+          const arrayElement = value[i];
+          let arg;
+          if (isDocMatcher) {
+            // We can only match {$elemMatch: {b: 3}} against objects.
+            // (We can also match against arrays, if there's numeric indices,
+            // eg {$elemMatch: {'0.b': 3}} or {$elemMatch: {0: 3}}.)
+            if (!isIndexable(arrayElement)) {
+              return false;
+            }
+
+            arg = arrayElement;
+          } else {
+            // dontIterate ensures that {a: {$elemMatch: {$gt: 5}}} matches
+            // {a: [8]} but not {a: [[8]]}
+            arg = [{value: arrayElement, dontIterate: true}];
+          }
+          // XXX support $near in $elemMatch by propagating $distance?
+          if (subMatcher(arg).result) {
+            return i; // specially understood to mean "use as arrayIndices"
+          }
+        }
+
+        return false;
+      };
+    },
+  },
+};
+
+// Operators that appear at the top level of a document selector.
+const LOGICAL_OPERATORS = {
+  $and(subSelector, matcher, inElemMatch) {
+    return andDocumentMatchers(
+      compileArrayOfDocumentSelectors(subSelector, matcher, inElemMatch)
+    );
+  },
+
+  $or(subSelector, matcher, inElemMatch) {
+    const matchers = compileArrayOfDocumentSelectors(
+      subSelector,
+      matcher,
+      inElemMatch
+    );
+
+    // Special case: if there is only one matcher, use it directly, *preserving*
+    // any arrayIndices it returns.
+    if (matchers.length === 1) {
+      return matchers[0];
+    }
+
+    return doc => {
+      const result = matchers.some(fn => fn(doc).result);
+      // $or does NOT set arrayIndices when it has multiple
+      // sub-expressions. (Tested against MongoDB.)
+      return {result};
+    };
+  },
+
+  $nor(subSelector, matcher, inElemMatch) {
+    const matchers = compileArrayOfDocumentSelectors(
+      subSelector,
+      matcher,
+      inElemMatch
+    );
+    return doc => {
+      const result = matchers.every(fn => !fn(doc).result);
+      // Never set arrayIndices, because we only match if nothing in particular
+      // 'matched' (and because this is consistent with MongoDB).
+      return {result};
+    };
+  },
+
+  $where(selectorValue, matcher) {
+    // Record that *any* path may be used.
+    matcher._recordPathUsed('');
+    matcher._hasWhere = true;
+
+    if (!(selectorValue instanceof Function)) {
+      // XXX MongoDB seems to have more complex logic to decide where or or not
+      // to add 'return'; not sure exactly what it is.
+      selectorValue = Function('obj', `return ${selectorValue}`);
+    }
+
+    // We make the document available as both `this` and `obj`.
+    // // XXX not sure what we should do if this throws
+    return doc => ({result: selectorValue.call(doc, doc)});
+  },
+
+  // This is just used as a comment in the query (in MongoDB, it also ends up in
+  // query logs); it has no effect on the actual selection.
+  $comment() {
+    return () => ({result: true});
+  },
+};
+
+// Operators that (unlike LOGICAL_OPERATORS) pertain to individual paths in a
+// document, but (unlike ELEMENT_OPERATORS) do not have a simple definition as
+// "match each branched value independently and combine with
+// convertElementMatcherToBranchedMatcher".
+const VALUE_OPERATORS = {
+  $eq(operand) {
+    return convertElementMatcherToBranchedMatcher(
+      equalityElementMatcher(operand)
+    );
+  },
+  $not(operand, valueSelector, matcher) {
+    return invertBranchedMatcher(compileValueSelector(operand, matcher));
+  },
+  $ne(operand) {
+    return invertBranchedMatcher(
+      convertElementMatcherToBranchedMatcher(equalityElementMatcher(operand))
+    );
+  },
+  $nin(operand) {
+    return invertBranchedMatcher(
+      convertElementMatcherToBranchedMatcher(
+        ELEMENT_OPERATORS.$in.compileElementSelector(operand)
+      )
+    );
+  },
+  $exists(operand) {
+    const exists = convertElementMatcherToBranchedMatcher(
+      value => value !== undefined
+    );
+    return operand ? exists : invertBranchedMatcher(exists);
+  },
+  // $options just provides options for $regex; its logic is inside $regex
+  $options(operand, valueSelector) {
+    if (!hasOwn.call(valueSelector, '$regex')) {
+      throw Error('$options needs a $regex');
+    }
+
+    return everythingMatcher;
+  },
+  // $maxDistance is basically an argument to $near
+  $maxDistance(operand, valueSelector) {
+    if (!valueSelector.$near) {
+      throw Error('$maxDistance needs a $near');
+    }
+
+    return everythingMatcher;
+  },
+  $all(operand, valueSelector, matcher) {
+    if (!Array.isArray(operand)) {
+      throw Error('$all requires array');
+    }
+
+    // Not sure why, but this seems to be what MongoDB does.
+    if (operand.length === 0) {
+      return nothingMatcher;
+    }
+
+    const branchedMatchers = operand.map(criterion => {
+      // XXX handle $all/$elemMatch combination
+      if (isOperatorObject(criterion)) {
+        throw Error('no $ expressions in $all');
+      }
+
+      // This is always a regexp or equality selector.
+      return compileValueSelector(criterion, matcher);
+    });
+
+    // andBranchedMatchers does NOT require all selectors to return true on the
+    // SAME branch.
+    return andBranchedMatchers(branchedMatchers);
+  },
+  $near(operand, valueSelector, matcher, isRoot) {
+	throw Error('$near is not implemented')
+  },
+};
+
+// NB: We are cheating and using this function to implement 'AND' for both
+// 'document matchers' and 'branched matchers'. They both return result objects
+// but the argument is different: for the former it's a whole doc, whereas for
+// the latter it's an array of 'branched values'.
+function andSomeMatchers(subMatchers) {
+  if (subMatchers.length === 0) {
+    return everythingMatcher;
+  }
+
+  if (subMatchers.length === 1) {
+    return subMatchers[0];
+  }
+
+  return docOrBranches => {
+    const match = {};
+    match.result = subMatchers.every(fn => {
+      const subResult = fn(docOrBranches);
+
+      // Copy a 'distance' number out of the first sub-matcher that has
+      // one. Yes, this means that if there are multiple $near fields in a
+      // query, something arbitrary happens; this appears to be consistent with
+      // Mongo.
+      if (subResult.result &&
+          subResult.distance !== undefined &&
+          match.distance === undefined) {
+        match.distance = subResult.distance;
+      }
+
+      // Similarly, propagate arrayIndices from sub-matchers... but to match
+      // MongoDB behavior, this time the *last* sub-matcher with arrayIndices
+      // wins.
+      if (subResult.result && subResult.arrayIndices) {
+        match.arrayIndices = subResult.arrayIndices;
+      }
+
+      return subResult.result;
+    });
+
+    // If we didn't actually match, forget any extra metadata we came up with.
+    if (!match.result) {
+      delete match.distance;
+      delete match.arrayIndices;
+    }
+
+    return match;
+  };
+}
+
+const andDocumentMatchers = andSomeMatchers;
+const andBranchedMatchers = andSomeMatchers;
+
+function compileArrayOfDocumentSelectors(selectors, matcher, inElemMatch) {
+  if (!Array.isArray(selectors) || selectors.length === 0) {
+    throw Error('$and/$or/$nor must be nonempty array');
+  }
+
+  return selectors.map(subSelector => {
+    if (!_isPlainObject(subSelector)) {
+      throw Error('$or/$and/$nor entries need to be full objects');
+    }
+
+    return compileDocumentSelector(subSelector, matcher, {inElemMatch});
+  });
+}
+
+// Takes in a selector that could match a full document (eg, the original
+// selector). Returns a function mapping document->result object.
+//
+// matcher is the Matcher object we are compiling.
+//
+// If this is the root document selector (ie, not wrapped in $and or the like),
+// then isRoot is true. (This is used by $near.)
+export function compileDocumentSelector(docSelector, matcher, options = {}) {
+  const docMatchers = Object.keys(docSelector).map(key => {
+    const subSelector = docSelector[key];
+
+    if (key.substr(0, 1) === '$') {
+      // Outer operators are either logical operators (they recurse back into
+      // this function), or $where.
+      if (!hasOwn.call(LOGICAL_OPERATORS, key)) {
+        throw new Error(`Unrecognized logical operator: ${key}`);
+      }
+
+      matcher._isSimple = false;
+      return LOGICAL_OPERATORS[key](subSelector, matcher, options.inElemMatch);
+    }
+
+    // Record this path, but only if we aren't in an elemMatcher, since in an
+    // elemMatch this is a path inside an object in an array, not in the doc
+    // root.
+    if (!options.inElemMatch) {
+      matcher._recordPathUsed(key);
+    }
+
+    // Don't add a matcher if subSelector is a function -- this is to match
+    // the behavior of Meteor on the server (inherited from the node mongodb
+    // driver), which is to ignore any part of a selector which is a function.
+    if (typeof subSelector === 'function') {
+      return undefined;
+    }
+
+    const lookUpByIndex = makeLookupFunction(key);
+    const valueMatcher = compileValueSelector(
+      subSelector,
+      matcher,
+      options.isRoot
+    );
+
+    return doc => valueMatcher(lookUpByIndex(doc));
+  }).filter(Boolean);
+
+  return andDocumentMatchers(docMatchers);
+}
+
+// Takes in a selector that could match a key-indexed value in a document; eg,
+// {$gt: 5, $lt: 9}, or a regular expression, or any non-expression object (to
+// indicate equality).  Returns a branched matcher: a function mapping
+// [branched value]->result object.
+function compileValueSelector(valueSelector, matcher, isRoot) {
+  if (valueSelector instanceof RegExp) {
+    matcher._isSimple = false;
+    return convertElementMatcherToBranchedMatcher(
+      regexpElementMatcher(valueSelector)
+    );
+  }
+
+  if (isOperatorObject(valueSelector)) {
+    return operatorBranchedMatcher(valueSelector, matcher, isRoot);
+  }
+
+  return convertElementMatcherToBranchedMatcher(
+    equalityElementMatcher(valueSelector)
+  );
+}
+
+// Given an element matcher (which evaluates a single value), returns a branched
+// value (which evaluates the element matcher on all the branches and returns a
+// more structured return value possibly including arrayIndices).
+function convertElementMatcherToBranchedMatcher(elementMatcher, options = {}) {
+  return branches => {
+    const expanded = options.dontExpandLeafArrays
+      ? branches
+      : expandArraysInBranches(branches, options.dontIncludeLeafArrays);
+
+    const match = {};
+    match.result = expanded.some(element => {
+      let matched = elementMatcher(element.value);
+
+      // Special case for $elemMatch: it means "true, and use this as an array
+      // index if I didn't already have one".
+      if (typeof matched === 'number') {
+        // XXX This code dates from when we only stored a single array index
+        // (for the outermost array). Should we be also including deeper array
+        // indices from the $elemMatch match?
+        if (!element.arrayIndices) {
+          element.arrayIndices = [matched];
+        }
+
+        matched = true;
+      }
+
+      // If some element matched, and it's tagged with array indices, include
+      // those indices in our result object.
+      if (matched && element.arrayIndices) {
+        match.arrayIndices = element.arrayIndices;
+      }
+
+      return matched;
+    });
+
+    return match;
+  };
+}
+
+// Helpers for $near.
+function distanceCoordinatePairs(a, b) {
+  const pointA = pointToArray(a);
+  const pointB = pointToArray(b);
+
+  return Math.hypot(pointA[0] - pointB[0], pointA[1] - pointB[1]);
+}
+
+// Takes something that is not an operator object and returns an element matcher
+// for equality with that thing.
+export function equalityElementMatcher(elementSelector) {
+  if (isOperatorObject(elementSelector)) {
+    throw Error('Can\'t create equalityValueSelector for operator object');
+  }
+
+  // Special-case: null and undefined are equal (if you got undefined in there
+  // somewhere, or if you got it due to some branch being non-existent in the
+  // weird special case), even though they aren't with EJSON.equals.
+  // undefined or null
+  if (elementSelector == null) {
+    return value => value == null;
+  }
+
+  return value => bigBlobF._equal(elementSelector, value);
+}
+
+function everythingMatcher(docOrBranchedValues) {
+  return {result: true};
+}
+
+export function expandArraysInBranches(branches, skipTheArrays) {
+  const branchesOut = [];
+
+  branches.forEach(branch => {
+    const thisIsArray = Array.isArray(branch.value);
+
+    // We include the branch itself, *UNLESS* we it's an array that we're going
+    // to iterate and we're told to skip arrays.  (That's right, we include some
+    // arrays even skipTheArrays is true: these are arrays that were found via
+    // explicit numerical indices.)
+    if (!(skipTheArrays && thisIsArray && !branch.dontIterate)) {
+      branchesOut.push({arrayIndices: branch.arrayIndices, value: branch.value});
+    }
+
+    if (thisIsArray && !branch.dontIterate) {
+      branch.value.forEach((value, i) => {
+        branchesOut.push({
+          arrayIndices: (branch.arrayIndices || []).concat(i),
+          value
+        });
+      });
+    }
+  });
+
+  return branchesOut;
+}
+
+// Helpers for $bitsAllSet/$bitsAnySet/$bitsAllClear/$bitsAnyClear.
+function getOperandBitmask(operand, selector) {
+  // numeric bitmask
+  // You can provide a numeric bitmask to be matched against the operand field.
+  // It must be representable as a non-negative 32-bit signed integer.
+  // Otherwise, $bitsAllSet will return an error.
+  if (Number.isInteger(operand) && operand >= 0) {
+    return new Uint8Array(new Int32Array([operand]).buffer);
+  }
+
+  // bindata bitmask
+  // You can also use an arbitrarily large BinData instance as a bitmask.
+  if (EJSON.isBinary(operand)) {
+    return new Uint8Array(operand.buffer);
+  }
+
+  // position list
+  // If querying a list of bit positions, each <position> must be a non-negative
+  // integer. Bit positions start at 0 from the least significant bit.
+  if (Array.isArray(operand) &&
+      operand.every(x => Number.isInteger(x) && x >= 0)) {
+    const buffer = new ArrayBuffer((Math.max(...operand) >> 3) + 1);
+    const view = new Uint8Array(buffer);
+
+    operand.forEach(x => {
+      view[x >> 3] |= 1 << (x & 0x7);
+    });
+
+    return view;
+  }
+
+  // bad operand
+  throw Error(
+    `operand to ${selector} must be a numeric bitmask (representable as a ` +
+    'non-negative 32-bit signed integer), a bindata bitmask or an array with ' +
+    'bit positions (non-negative integers)'
+  );
+}
+
+function getValueBitmask(value, length) {
+  // The field value must be either numerical or a BinData instance. Otherwise,
+  // $bits... will not match the current document.
+
+  // numerical
+  if (Number.isSafeInteger(value)) {
+    // $bits... will not match numerical values that cannot be represented as a
+    // signed 64-bit integer. This can be the case if a value is either too
+    // large or small to fit in a signed 64-bit integer, or if it has a
+    // fractional component.
+    const buffer = new ArrayBuffer(
+      Math.max(length, 2 * Uint32Array.BYTES_PER_ELEMENT)
+    );
+
+    let view = new Uint32Array(buffer, 0, 2);
+    view[0] = value % ((1 << 16) * (1 << 16)) | 0;
+    view[1] = value / ((1 << 16) * (1 << 16)) | 0;
+
+    // sign extension
+    if (value < 0) {
+      view = new Uint8Array(buffer, 2);
+      view.forEach((byte, i) => {
+        view[i] = 0xff;
+      });
+    }
+
+    return new Uint8Array(buffer);
+  }
+
+  // bindata
+  if (EJSON.isBinary(value)) {
+    return new Uint8Array(value.buffer);
+  }
+
+  // no match
+  return false;
+}
+
+// Actually inserts a key value into the selector document
+// However, this checks there is no ambiguity in setting
+// the value for the given key, throws otherwise
+function insertIntoDocument(document, key, value) {
+  Object.keys(document).forEach(existingKey => {
+    if (
+      (existingKey.length > key.length && existingKey.indexOf(`${key}.`) === 0) ||
+      (key.length > existingKey.length && key.indexOf(`${existingKey}.`) === 0)
+    ) {
+      throw new Error(
+        `cannot infer query fields to set, both paths '${existingKey}' and ` +
+        `'${key}' are matched`
+      );
+    } else if (existingKey === key) {
+      throw new Error(
+        `cannot infer query fields to set, path '${key}' is matched twice`
+      );
+    }
+  });
+
+  document[key] = value;
+}
+
+// Returns a branched matcher that matches iff the given matcher does not.
+// Note that this implicitly "deMorganizes" the wrapped function.  ie, it
+// means that ALL branch values need to fail to match innerBranchedMatcher.
+function invertBranchedMatcher(branchedMatcher) {
+  return branchValues => {
+    // We explicitly choose to strip arrayIndices here: it doesn't make sense to
+    // say "update the array element that does not match something", at least
+    // in mongo-land.
+    return {result: !branchedMatcher(branchValues).result};
+  };
+}
+
+export function isIndexable(obj) {
+  return Array.isArray(obj) || _isPlainObject(obj);
+}
+
+export function isNumericKey(s) {
+  return /^[0-9]+$/.test(s);
+}
+
+// Returns true if this is an object with at least one key and all keys begin
+// with $.  Unless inconsistentOK is set, throws if some keys begin with $ and
+// others don't.
+export function isOperatorObject(valueSelector, inconsistentOK) {
+  if (!_isPlainObject(valueSelector)) {
+    return false;
+  }
+
+  let theseAreOperators = undefined;
+  Object.keys(valueSelector).forEach(selKey => {
+    const thisIsOperator = selKey.substr(0, 1) === '$' || selKey === 'diff';
+
+    if (theseAreOperators === undefined) {
+      theseAreOperators = thisIsOperator;
+    } else if (theseAreOperators !== thisIsOperator) {
+      if (!inconsistentOK) {
+        throw new Error(
+          `Inconsistent operator: ${JSON.stringify(valueSelector)}`
+        );
+      }
+
+      theseAreOperators = false;
+    }
+  });
+
+  return !!theseAreOperators; // {} has no operators
+}
+
+// Helper for $lt/$gt/$lte/$gte.
+function makeInequality(cmpValueComparator) {
+  return {
+    compileElementSelector(operand) {
+      // Arrays never compare false with non-arrays for any inequality.
+      // XXX This was behavior we observed in pre-release MongoDB 2.5, but
+      //     it seems to have been reverted.
+      //     See https://jira.mongodb.org/browse/SERVER-11444
+      if (Array.isArray(operand)) {
+        return () => false;
+      }
+
+      // Special case: consider undefined and null the same (so true with
+      // $gte/$lte).
+      if (operand === undefined) {
+        operand = null;
+      }
+
+      const operandType = bigBlobF._type(operand);
+
+      return value => {
+        if (value === undefined) {
+          value = null;
+        }
+
+        // Comparisons are never true among things of different type (except
+        // null vs undefined).
+        if (bigBlobF._type(value) !== operandType) {
+          return false;
+        }
+
+        return cmpValueComparator(bigBlobF._cmp(value, operand));
+      };
+    },
+  };
+}
+
+// makeLookupFunction(key) returns a lookup function.
+//
+// A lookup function takes in a document and returns an array of matching
+// branches.  If no arrays are found while looking up the key, this array will
+// have exactly one branches (possibly 'undefined', if some segment of the key
+// was not found).
+//
+// If arrays are found in the middle, this can have more than one element, since
+// we 'branch'. When we 'branch', if there are more key segments to look up,
+// then we only pursue branches that are plain objects (not arrays or scalars).
+// This means we can actually end up with no branches!
+//
+// We do *NOT* branch on arrays that are found at the end (ie, at the last
+// dotted member of the key). We just return that array; if you want to
+// effectively 'branch' over the array's values, post-process the lookup
+// function with expandArraysInBranches.
+//
+// Each branch is an object with keys:
+//  - value: the value at the branch
+//  - dontIterate: an optional bool; if true, it means that 'value' is an array
+//    that expandArraysInBranches should NOT expand. This specifically happens
+//    when there is a numeric index in the key, and ensures the
+//    perhaps-surprising MongoDB behavior where {'a.0': 5} does NOT
+//    match {a: [[5]]}.
+//  - arrayIndices: if any array indexing was done during lookup (either due to
+//    explicit numeric indices or implicit branching), this will be an array of
+//    the array indices used, from outermost to innermost; it is falsey or
+//    absent if no array index is used. If an explicit numeric index is used,
+//    the index will be followed in arrayIndices by the string 'x'.
+//
+//    Note: arrayIndices is used for two purposes. First, it is used to
+//    implement the '$' modifier feature, which only ever looks at its first
+//    element.
+//
+//    Second, it is used for sort key generation, which needs to be able to tell
+//    the difference between different paths. Moreover, it needs to
+//    differentiate between explicit and implicit branching, which is why
+//    there's the somewhat hacky 'x' entry: this means that explicit and
+//    implicit array lookups will have different full arrayIndices paths. (That
+//    code only requires that different paths have different arrayIndices; it
+//    doesn't actually 'parse' arrayIndices. As an alternative, arrayIndices
+//    could contain objects with flags like 'implicit', but I think that only
+//    makes the code surrounding them more complex.)
+//
+//    (By the way, this field ends up getting passed around a lot without
+//    cloning, so never mutate any arrayIndices field/var in this package!)
+//
+//
+// At the top level, you may only pass in a plain object or array.
+//
+// See the test 'minimongo - lookup' for some examples of what lookup functions
+// return.
+export function makeLookupFunction(key, options = {}) {
+  const parts = key.split('.');
+  const firstPart = parts.length ? parts[0] : '';
+  const lookupRest = (
+    parts.length > 1 &&
+    makeLookupFunction(parts.slice(1).join('.'), options)
+  );
+
+  const omitUnnecessaryFields = result => {
+    if (!result.dontIterate) {
+      delete result.dontIterate;
+    }
+
+    if (result.arrayIndices && !result.arrayIndices.length) {
+      delete result.arrayIndices;
+    }
+
+    return result;
+  };
+
+  // Doc will always be a plain object or an array.
+  // apply an explicit numeric index, an array.
+  return (doc, arrayIndices = []) => {
+    if (Array.isArray(doc)) {
+      // If we're being asked to do an invalid lookup into an array (non-integer
+      // or out-of-bounds), return no results (which is different from returning
+      // a single undefined result, in that `null` equality checks won't match).
+      if (!(isNumericKey(firstPart) && firstPart < doc.length)) {
+        return [];
+      }
+
+      // Remember that we used this array index. Include an 'x' to indicate that
+      // the previous index came from being considered as an explicit array
+      // index (not branching).
+      arrayIndices = arrayIndices.concat(+firstPart, 'x');
+    }
+
+    // Do our first lookup.
+    const firstLevel = doc[firstPart];
+
+    // If there is no deeper to dig, return what we found.
+    //
+    // If what we found is an array, most value selectors will choose to treat
+    // the elements of the array as matchable values in their own right, but
+    // that's done outside of the lookup function. (Exceptions to this are $size
+    // and stuff relating to $elemMatch.  eg, {a: {$size: 2}} does not match {a:
+    // [[1, 2]]}.)
+    //
+    // That said, if we just did an *explicit* array lookup (on doc) to find
+    // firstLevel, and firstLevel is an array too, we do NOT want value
+    // selectors to iterate over it.  eg, {'a.0': 5} does not match {a: [[5]]}.
+    // So in that case, we mark the return value as 'don't iterate'.
+    if (!lookupRest) {
+      return [omitUnnecessaryFields({
+        arrayIndices,
+        dontIterate: Array.isArray(doc) && Array.isArray(firstLevel),
+        value: firstLevel
+      })];
+    }
+
+    // We need to dig deeper.  But if we can't, because what we've found is not
+    // an array or plain object, we're done. If we just did a numeric index into
+    // an array, we return nothing here (this is a change in Mongo 2.5 from
+    // Mongo 2.4, where {'a.0.b': null} stopped matching {a: [5]}). Otherwise,
+    // return a single `undefined` (which can, for example, match via equality
+    // with `null`).
+    if (!isIndexable(firstLevel)) {
+      if (Array.isArray(doc)) {
+        return [];
+      }
+
+      return [omitUnnecessaryFields({arrayIndices, value: undefined})];
+    }
+
+    const result = [];
+    const appendToResult = more => {
+      result.push(...more);
+    };
+
+    // Dig deeper: look up the rest of the parts on whatever we've found.
+    // (lookupRest is smart enough to not try to do invalid lookups into
+    // firstLevel if it's an array.)
+    appendToResult(lookupRest(firstLevel, arrayIndices));
+
+    // If we found an array, then in *addition* to potentially treating the next
+    // part as a literal integer lookup, we should also 'branch': try to look up
+    // the rest of the parts on each array element in parallel.
+    //
+    // In this case, we *only* dig deeper into array elements that are plain
+    // objects. (Recall that we only got this far if we have further to dig.)
+    // This makes sense: we certainly don't dig deeper into non-indexable
+    // objects. And it would be weird to dig into an array: it's simpler to have
+    // a rule that explicit integer indexes only apply to an outer array, not to
+    // an array you find after a branching search.
+    //
+    // In the special case of a numeric part in a *sort selector* (not a query
+    // selector), we skip the branching: we ONLY allow the numeric part to mean
+    // 'look up this index' in that case, not 'also look up this index in all
+    // the elements of the array'.
+    if (Array.isArray(firstLevel) &&
+        !(isNumericKey(parts[1]) && options.forSort)) {
+      firstLevel.forEach((branch, arrayIndex) => {
+        if (_isPlainObject(branch)) {
+          appendToResult(lookupRest(branch, arrayIndices.concat(arrayIndex)));
+        }
+      });
+    }
+
+    return result;
+  };
+}
+
+export const _isPlainObject = x => {
+  return x && bigBlobF._type(x) === 3;
+};
+
+// Object exported only for unit testing.
+// Use it to export private functions to test in Tinytest.
+// MinimongoTest = {makeLookupFunction};
+export const MinimongoError = (message, options = {}) => {
+  if (typeof message === 'string' && options.field) {
+    message += ` for field '${options.field}'`;
+  }
+
+  const error = new Error(message);
+  error.name = 'MinimongoError';
+  return error;
+};
+
+export function nothingMatcher(docOrBranchedValues) {
+  return {result: false};
+}
+
+// Takes an operator object (an object with $ keys) and returns a branched
+// matcher for it.
+function operatorBranchedMatcher(valueSelector, matcher, isRoot) {
+  // Each valueSelector works separately on the various branches.  So one
+  // operator can match one branch and another can match another branch.  This
+  // is OK.
+  const operatorMatchers = Object.keys(valueSelector).map(operator => {
+    const operand = valueSelector[operator];
+
+    const simpleRange = (
+      ['$lt', '$lte', '$gt', '$gte'].includes(operator) &&
+      typeof operand === 'number'
+    );
+
+    const simpleEquality = (
+      ['$ne', '$eq'].includes(operator) &&
+      operand !== Object(operand)
+    );
+
+    const simpleInclusion = (
+      ['$in', '$nin'].includes(operator)
+      && Array.isArray(operand)
+      && !operand.some(x => x === Object(x))
+    );
+
+    if (!(simpleRange || simpleInclusion || simpleEquality)) {
+      matcher._isSimple = false;
+    }
+
+    if (hasOwn.call(VALUE_OPERATORS, operator)) {
+      return VALUE_OPERATORS[operator](operand, valueSelector, matcher, isRoot);
+    }
+
+    if (hasOwn.call(ELEMENT_OPERATORS, operator)) {
+      const options = ELEMENT_OPERATORS[operator];
+      return convertElementMatcherToBranchedMatcher(
+        options.compileElementSelector(operand, valueSelector, matcher),
+        options
+      );
+    }
+
+    throw new Error(`Unrecognized operator: ${operator}`);
+  });
+
+  return andBranchedMatchers(operatorMatchers);
+}
+
+// paths - Array: list of mongo style paths
+// newLeafFn - Function: of form function(path) should return a scalar value to
+//                       put into list created for that path
+// conflictFn - Function: of form function(node, path, fullPath) is called
+//                        when building a tree path for 'fullPath' node on
+//                        'path' was already a leaf with a value. Must return a
+//                        conflict resolution.
+// initial tree - Optional Object: starting tree.
+// @returns - Object: tree represented as a set of nested objects
+export function pathsToTree(paths, newLeafFn, conflictFn, root = {}) {
+  paths.forEach(path => {
+    const pathArray = path.split('.');
+    let tree = root;
+
+    // use .every just for iteration with break
+    const success = pathArray.slice(0, -1).every((key, i) => {
+      if (!hasOwn.call(tree, key)) {
+        tree[key] = {};
+      } else if (tree[key] !== Object(tree[key])) {
+        tree[key] = conflictFn(
+          tree[key],
+          pathArray.slice(0, i + 1).join('.'),
+          path
+        );
+
+        // break out of loop if we are failing for this path
+        if (tree[key] !== Object(tree[key])) {
+          return false;
+        }
+      }
+
+      tree = tree[key];
+
+      return true;
+    });
+
+    if (success) {
+      const lastKey = pathArray[pathArray.length - 1];
+      if (hasOwn.call(tree, lastKey)) {
+        tree[lastKey] = conflictFn(tree[lastKey], path, path);
+      } else {
+        tree[lastKey] = newLeafFn(path);
+      }
+    }
+  });
+
+  return root;
+}
+
+// Makes sure we get 2 elements array and assume the first one to be x and
+// the second one to y no matter what user passes.
+// In case user passes { lon: x, lat: y } returns [x, y]
+function pointToArray(point) {
+  return Array.isArray(point) ? point.slice() : [point.x, point.y];
+}
+
+// Creating a document from an upsert is quite tricky.
+// E.g. this selector: {"$or": [{"b.foo": {"$all": ["bar"]}}]}, should result
+// in: {"b.foo": "bar"}
+// But this selector: {"$or": [{"b": {"foo": {"$all": ["bar"]}}}]} should throw
+// an error
+
+// Some rules (found mainly with trial & error, so there might be more):
+// - handle all childs of $and (or implicit $and)
+// - handle $or nodes with exactly 1 child
+// - ignore $or nodes with more than 1 child
+// - ignore $nor and $not nodes
+// - throw when a value can not be set unambiguously
+// - every value for $all should be dealt with as separate $eq-s
+// - threat all children of $all as $eq setters (=> set if $all.length === 1,
+//   otherwise throw error)
+// - you can not mix '$'-prefixed keys and non-'$'-prefixed keys
+// - you can only have dotted keys on a root-level
+// - you can not have '$'-prefixed keys more than one-level deep in an object
+
+// Handles one key/value pair to put in the selector document
+function populateDocumentWithKeyValue(document, key, value) {
+  if (value && Object.getPrototypeOf(value) === Object.prototype) {
+    populateDocumentWithObject(document, key, value);
+  } else if (!(value instanceof RegExp)) {
+    insertIntoDocument(document, key, value);
+  }
+}
+
+// Handles a key, value pair to put in the selector document
+// if the value is an object
+function populateDocumentWithObject(document, key, value) {
+  const keys = Object.keys(value);
+  const unprefixedKeys = keys.filter(op => op[0] !== '$');
+
+  if (unprefixedKeys.length > 0 || !keys.length) {
+    // Literal (possibly empty) object ( or empty object )
+    // Don't allow mixing '$'-prefixed with non-'$'-prefixed fields
+    if (keys.length !== unprefixedKeys.length) {
+      throw new Error(`unknown operator: ${unprefixedKeys[0]}`);
+    }
+
+    validateObject(value, key);
+    insertIntoDocument(document, key, value);
+  } else {
+    Object.keys(value).forEach(op => {
+      const object = value[op];
+
+      if (op === '$eq') {
+        populateDocumentWithKeyValue(document, key, object);
+      } else if (op === '$all') {
+        // every value for $all should be dealt with as separate $eq-s
+        object.forEach(element =>
+          populateDocumentWithKeyValue(document, key, element)
+        );
+      }
+    });
+  }
+}
+
+// Fills a document with certain fields from an upsert selector
+export function populateDocumentWithQueryFields(query, document = {}) {
+  if (Object.getPrototypeOf(query) === Object.prototype) {
+    // handle implicit $and
+    Object.keys(query).forEach(key => {
+      const value = query[key];
+
+      if (key === '$and') {
+        // handle explicit $and
+        value.forEach(element =>
+          populateDocumentWithQueryFields(element, document)
+        );
+      } else if (key === '$or') {
+        // handle $or nodes with exactly 1 child
+        if (value.length === 1) {
+          populateDocumentWithQueryFields(value[0], document);
+        }
+      } else if (key[0] !== '$') {
+        // Ignore other '$'-prefixed logical selectors
+        populateDocumentWithKeyValue(document, key, value);
+      }
+    });
+  } else {
+    // Handle meteor-specific shortcut for selecting _id
+    if (selectorIsId(query)) {
+      insertIntoDocument(document, '_id', query);
+    }
+  }
+
+  return document;
+}
+
+// Is this selector just shorthand for lookup by _id?
+export function selectorIsId (selector) {
+  return typeof selector === 'number' ||
+  typeof selector === 'string'
+};
+
+
+// Traverses the keys of passed projection and constructs a tree where all
+// leaves are either all True or all False
+// @returns Object:
+//  - tree - Object - tree representation of keys involved in projection
+//  (exception for '_id' as it is a special case handled separately)
+//  - including - Boolean - "take only certain fields" type of projection
+export function projectionDetails(fields) {
+  // Find the non-_id keys (_id is handled specially because it is included
+  // unless explicitly excluded). Sort the keys, so that our code to detect
+  // overlaps like 'foo' and 'foo.bar' can assume that 'foo' comes first.
+  let fieldsKeys = Object.keys(fields).sort();
+
+  // If _id is the only field in the projection, do not remove it, since it is
+  // required to determine if this is an exclusion or exclusion. Also keep an
+  // inclusive _id, since inclusive _id follows the normal rules about mixing
+  // inclusive and exclusive fields. If _id is not the only field in the
+  // projection and is exclusive, remove it so it can be handled later by a
+  // special case, since exclusive _id is always allowed.
+  if (!(fieldsKeys.length === 1 && fieldsKeys[0] === '_id') &&
+      !(fieldsKeys.includes('_id') && fields._id)) {
+    fieldsKeys = fieldsKeys.filter(key => key !== '_id');
+  }
+
+  let including = null; // Unknown
+
+  fieldsKeys.forEach(keyPath => {
+    const rule = !!fields[keyPath];
+
+    if (including === null) {
+      including = rule;
+    }
+
+    // This error message is copied from MongoDB shell
+    if (including !== rule) {
+      throw MinimongoError(
+        'You cannot currently mix including and excluding fields.'
+      );
+    }
+  });
+
+  const projectionRulesTree = pathsToTree(
+    fieldsKeys,
+    path => including,
+    (node, path, fullPath) => {
+      // Check passed projection fields' keys: If you have two rules such as
+      // 'foo.bar' and 'foo.bar.baz', then the result becomes ambiguous. If
+      // that happens, there is a probability you are doing something wrong,
+      // framework should notify you about such mistake earlier on cursor
+      // compilation step than later during runtime.  Note, that real mongo
+      // doesn't do anything about it and the later rule appears in projection
+      // project, more priority it takes.
+      //
+      // Example, assume following in mongo shell:
+      // > db.coll.insert({ a: { b: 23, c: 44 } })
+      // > db.coll.find({}, { 'a': 1, 'a.b': 1 })
+      // {"_id": ObjectId("520bfe456024608e8ef24af3"), "a": {"b": 23}}
+      // > db.coll.find({}, { 'a.b': 1, 'a': 1 })
+      // {"_id": ObjectId("520bfe456024608e8ef24af3"), "a": {"b": 23, "c": 44}}
+      //
+      // Note, how second time the return set of keys is different.
+      const currentPath = fullPath;
+      const anotherPath = path;
+      throw MinimongoError(
+        `both ${currentPath} and ${anotherPath} found in fields option, ` +
+        'using both of them may trigger unexpected behavior. Did you mean to ' +
+        'use only one of them?'
+      );
+    });
+
+  return {including, tree: projectionRulesTree};
+}
+
+// Takes a RegExp object and returns an element matcher.
+export function regexpElementMatcher(regexp) {
+  return value => {
+    if (value instanceof RegExp) {
+      return value.toString() === regexp.toString();
+    }
+
+    // Regexps only work against strings.
+    if (typeof value !== 'string') {
+      return false;
+    }
+
+    // Reset regexp's state to avoid inconsistent matching for objects with the
+    // same value on consecutive calls of regexp.test. This happens only if the
+    // regexp has the 'g' flag. Also note that ES6 introduces a new flag 'y' for
+    // which we should *not* change the lastIndex but MongoDB doesn't support
+    // either of these flags.
+    regexp.lastIndex = 0;
+
+    return regexp.test(value);
+  };
+}
+
+// Validates the key in a path.
+// Objects that are nested more then 1 level cannot have dotted fields
+// or fields starting with '$'
+function validateKeyInPath(key, path) {
+  if (key.includes('.')) {
+    throw new Error(
+      `The dotted field '${key}' in '${path}.${key} is not valid for storage.`
+    );
+  }
+
+  if (key[0] === '$') {
+    throw new Error(
+      `The dollar ($) prefixed field  '${path}.${key} is not valid for storage.`
+    );
+  }
+}
+
+// Recursively validates an object that is nested more than one level deep
+function validateObject(object, path) {
+  if (object && Object.getPrototypeOf(object) === Object.prototype) {
+    Object.keys(object).forEach(key => {
+      validateKeyInPath(key, path);
+      validateObject(object[key], path + '.' + key);
+    });
+  }
+}
+
+const Decimal = /*Package['mongo-decimal']?.Decimal ||*/ class DecimalStub {}
+
+export const bigBlobF = {
+  // XXX for _all and _in, consider building 'inquery' at compile time..
+  _type(v) {
+    if (typeof v === 'number') {
+      return 1;
+    }
+
+    if (typeof v === 'string') {
+      return 2;
+    }
+
+    if (typeof v === 'boolean') {
+      return 8;
+    }
+
+    if (Array.isArray(v)) {
+      return 4;
+    }
+
+    if (v === null) {
+      return 10;
+    }
+
+    // note that typeof(/x/) === "object"
+    if (v instanceof RegExp) {
+      return 11;
+    }
+
+    if (typeof v === 'function') {
+      return 13;
+    }
+
+    if (v instanceof Date) {
+      return 9;
+    }
+
+    if (EJSON.isBinary(v)) {
+      return 5;
+    }
+
+    if (v instanceof Decimal) {
+      return 1;
+    }
+
+    // object
+    return 3;
+
+    // XXX support some/all of these:
+    // 14, symbol
+    // 15, javascript code with scope
+    // 16, 18: 32-bit/64-bit integer
+    // 17, timestamp
+    // 255, minkey
+    // 127, maxkey
+  },
+
+  // deep equality test: use for literal document and array matches
+  _equal(a, b) {
+    return EJSON.equals(a, b, {keyOrderSensitive: true});
+  },
+
+  // maps a type code to a value that can be used to sort values of different
+  // types
+  _typeorder(t) {
+    // http://www.mongodb.org/display/DOCS/What+is+the+Compare+Order+for+BSON+Types
+    // XXX what is the correct sort position for Javascript code?
+    // ('100' in the matrix below)
+    // XXX minkey/maxkey
+    return [
+      -1,  // (not a type)
+      1,   // number
+      2,   // string
+      3,   // object
+      4,   // array
+      5,   // binary
+      -1,  // deprecated
+      6,   // ObjectID
+      7,   // bool
+      8,   // Date
+      0,   // null
+      9,   // RegExp
+      -1,  // deprecated
+      100, // JS code
+      2,   // deprecated (symbol)
+      100, // JS code
+      1,   // 32-bit int
+      8,   // Mongo timestamp
+      1    // 64-bit int
+    ][t];
+  },
+
+  // compare two values of unknown type according to BSON ordering
+  // semantics. (as an extension, consider 'undefined' to be less than
+  // any other value.) return negative if a is less, positive if b is
+  // less, or 0 if equal
+  _cmp(a, b) {
+    if (a === undefined) {
+      return b === undefined ? 0 : -1;
+    }
+
+    if (b === undefined) {
+      return 1;
+    }
+
+    let ta = bigBlobF._type(a);
+    let tb = bigBlobF._type(b);
+
+    const oa = bigBlobF._typeorder(ta);
+    const ob = bigBlobF._typeorder(tb);
+
+    if (oa !== ob) {
+      return oa < ob ? -1 : 1;
+    }
+
+    // XXX need to implement this if we implement Symbol or integers, or
+    // Timestamp
+    if (ta !== tb) {
+      throw Error('Missing type coercion logic in _cmp');
+    }
+
+    if (ta === 7) { // ObjectID
+      // Convert to string.
+      ta = tb = 2;
+      a = a.toHexString();
+      b = b.toHexString();
+    }
+
+    if (ta === 9) { // Date
+      // Convert to millis.
+      ta = tb = 1;
+      a = a.getTime();
+      b = b.getTime();
+    }
+
+    if (ta === 1) { // double
+      if (a instanceof Decimal) {
+        return a.minus(b).toNumber();
+      } else {
+        return a - b;
+      }
+    }
+
+    if (tb === 2) // string
+      return a < b ? -1 : a === b ? 0 : 1;
+
+    if (ta === 3) { // Object
+      // this could be much more efficient in the expected case ...
+      const toArray = object => {
+        const result = [];
+
+        Object.keys(object).forEach(key => {
+          result.push(key, object[key]);
+        });
+
+        return result;
+      };
+
+      return bigBlobF._cmp(toArray(a), toArray(b));
+    }
+
+    if (ta === 4) { // Array
+      for (let i = 0; ; i++) {
+        if (i === a.length) {
+          return i === b.length ? 0 : -1;
+        }
+
+        if (i === b.length) {
+          return 1;
+        }
+
+        const s = bigBlobF._cmp(a[i], b[i]);
+        if (s !== 0) {
+          return s;
+        }
+      }
+    }
+
+    if (ta === 5) { // binary
+      // Surprisingly, a small binary blob is always less than a large one in
+      // Mongo.
+      if (a.length !== b.length) {
+        return a.length - b.length;
+      }
+
+      for (let i = 0; i < a.length; i++) {
+        if (a[i] < b[i]) {
+          return -1;
+        }
+
+        if (a[i] > b[i]) {
+          return 1;
+        }
+      }
+
+      return 0;
+    }
+
+    if (ta === 8) { // boolean
+      if (a) {
+        return b ? 0 : 1;
+      }
+
+      return b ? -1 : 0;
+    }
+
+    if (ta === 10) // null
+      return 0;
+
+    if (ta === 11) // regexp
+      throw Error('Sorting not supported on regular expression'); // XXX
+
+    // 13: javascript code
+    // 14: symbol
+    // 15: javascript code with scope
+    // 16: 32-bit integer
+    // 17: timestamp
+    // 18: 64-bit integer
+    // 255: minkey
+    // 127: maxkey
+    if (ta === 13) // javascript code
+      throw Error('Sorting not supported on Javascript code'); // XXX
+
+    throw Error('Unknown type to sort');
+  },
+};
\ No newline at end of file
diff --git a/packages/webui/src/meteor/minimongo/index.js b/packages/webui/src/meteor/minimongo/index.js
new file mode 100644
index 0000000000..7dd62a20ad
--- /dev/null
+++ b/packages/webui/src/meteor/minimongo/index.js
@@ -0,0 +1,15 @@
+import {LocalCollection } from './local_collection.js';
+
+const Minimongo = {
+    LocalCollection: LocalCollection,
+    Matcher: LocalCollection.Matcher,
+    Sorter: LocalCollection.Sorter
+};
+
+window.LocalCollection = LocalCollection;
+window.Minimongo = Minimongo;
+
+export {
+    LocalCollection,
+    Minimongo,
+}
\ No newline at end of file
diff --git a/packages/webui/src/meteor/minimongo/lib/id-map.js b/packages/webui/src/meteor/minimongo/lib/id-map.js
new file mode 100644
index 0000000000..3b771287d0
--- /dev/null
+++ b/packages/webui/src/meteor/minimongo/lib/id-map.js
@@ -0,0 +1,83 @@
+// https://github.com/meteor/meteor/blob/73fd519de6eef8e116d813fb457c8442db9d1cdd/packages/id-map/id-map.js
+
+import EJSON from 'ejson'
+
+export class IdMap {
+    constructor(idStringify, idParse) {
+      this._map = new Map();
+      this._idStringify = idStringify || JSON.stringify;
+      this._idParse = idParse || JSON.parse;
+    }
+  
+  // Some of these methods are designed to match methods on OrderedDict, since
+  // (eg) ObserveMultiplex and _CachingChangeObserver use them interchangeably.
+  // (Conceivably, this should be replaced with "UnorderedDict" with a specific
+  // set of methods that overlap between the two.)
+  
+    get(id) {
+      const key = this._idStringify(id);
+      return this._map.get(key);
+    }
+  
+    set(id, value) {
+      const key = this._idStringify(id);
+      this._map.set(key, value);
+    }
+  
+    remove(id) {
+      const key = this._idStringify(id);
+      this._map.delete(key);
+    }
+  
+    has(id) {
+      const key = this._idStringify(id);
+      return this._map.has(key);
+    }
+  
+    empty() {
+      return this._map.size === 0;
+    }
+  
+    clear() {
+      this._map.clear();
+    }
+  
+    // Iterates over the items in the map. Return `false` to break the loop.
+    forEach(iterator) {
+      // don't use _.each, because we can't break out of it.
+      for (let [key, value] of this._map){
+        const breakIfFalse = iterator.call(
+          null,
+          value,
+          this._idParse(key)
+        );
+        if (breakIfFalse === false) {
+          return;
+        }
+      }
+    }
+  
+    size() {
+      return this._map.size;
+    }
+  
+    setDefault(id, def) {
+      const key = this._idStringify(id);
+      if (this._map.has(key)) {
+        return this._map.get(key);
+      }
+      this._map.set(key, def);
+      return def;
+    }
+  
+    // Assumes that values are EJSON-cloneable, and that we don't need to clone
+    // IDs (ie, that nobody is going to mutate an ObjectId).
+    clone() {
+      const clone = new IdMap(this._idStringify, this._idParse);
+      // copy directly to avoid stringify/parse overhead
+      this._map.forEach(function(value, key){
+        clone._map.set(key, EJSON.clone(value));
+      });
+      return clone;
+    }
+  }
\ No newline at end of file
diff --git a/packages/webui/src/meteor/minimongo/lib/ordered-dict.js b/packages/webui/src/meteor/minimongo/lib/ordered-dict.js
new file mode 100644
index 0000000000..3e6c0065cd
--- /dev/null
+++ b/packages/webui/src/meteor/minimongo/lib/ordered-dict.js
@@ -0,0 +1,223 @@
+// https://github.com/meteor/meteor/tree/73fd519de6eef8e116d813fb457c8442db9d1cdd/packages/ordered-dict
+
+// This file defines an ordered dictionary abstraction that is useful for
+// maintaining a dataset backed by observeChanges.  It supports ordering items
+// by specifying the item they now come before.
+
+// The implementation is a dictionary that contains nodes of a doubly-linked
+// list as its values.
+
+// constructs a new element struct
+// next and prev are whole elements, not keys.
+function element(key, value, next, prev) {
+    return {
+      key: key,
+      value: value,
+      next: next,
+      prev: prev
+    };
+  }
+  
+  export class OrderedDict {
+    constructor(...args) {
+      this._dict = Object.create(null);
+      this._first = null;
+      this._last = null;
+      this._size = 0;
+  
+      if (typeof args[0] === 'function') {
+        this._stringify = args.shift();
+      } else {
+        this._stringify = function (x) { return x; };
+      }
+  
+      args.forEach(kv => this.putBefore(kv[0], kv[1], null));
+    }
+  
+    // the "prefix keys with a space" thing comes from here
+    // https://github.com/documentcloud/underscore/issues/376#issuecomment-2815649
+    _k(key) {
+      return " " + this._stringify(key);
+    }
+  
+    empty() {
+      return !this._first;
+    }
+  
+    size() {
+      return this._size;
+    }
+  
+    _linkEltIn(elt) {
+      if (!elt.next) {
+        elt.prev = this._last;
+        if (this._last)
+          this._last.next = elt;
+        this._last = elt;
+      } else {
+        elt.prev = elt.next.prev;
+        elt.next.prev = elt;
+        if (elt.prev)
+          elt.prev.next = elt;
+      }
+      if (this._first === null || this._first === elt.next)
+        this._first = elt;
+    }
+  
+    _linkEltOut(elt) {
+      if (elt.next)
+        elt.next.prev = elt.prev;
+      if (elt.prev)
+        elt.prev.next = elt.next;
+      if (elt === this._last)
+        this._last = elt.prev;
+      if (elt === this._first)
+        this._first = elt.next;
+    }
+  
+    putBefore(key, item, before) {
+      if (this._dict[this._k(key)])
+        throw new Error("Item " + key + " already present in OrderedDict");
+      var elt = before ?
+        element(key, item, this._dict[this._k(before)]) :
+        element(key, item, null);
+      if (typeof elt.next === "undefined")
+        throw new Error("could not find item to put this one before");
+      this._linkEltIn(elt);
+      this._dict[this._k(key)] = elt;
+      this._size++;
+    }
+  
+    append(key, item) {
+      this.putBefore(key, item, null);
+    }
+  
+    remove(key) {
+      var elt = this._dict[this._k(key)];
+      if (typeof elt === "undefined")
+        throw new Error("Item " + key + " not present in OrderedDict");
+      this._linkEltOut(elt);
+      this._size--;
+      delete this._dict[this._k(key)];
+      return elt.value;
+    }
+  
+    get(key) {
+      if (this.has(key)) {
+        return this._dict[this._k(key)].value;
+      }
+    }
+  
+    has(key) {
+      return Object.prototype.hasOwnProperty.call(
+        this._dict,
+        this._k(key)
+      );
+    }
+  
+    // Iterate through the items in this dictionary in order, calling
+    // iter(value, key, index) on each one.
+  
+    // Stops whenever iter returns OrderedDict.BREAK, or after the last element.
+    forEach(iter, context = null) {
+      var i = 0;
+      var elt = this._first;
+      while (elt !== null) {
+        var b = iter.call(context, elt.value, elt.key, i);
+        if (b === OrderedDict.BREAK) return;
+        elt = elt.next;
+        i++;
+      }
+    }
+  
+    first() {
+      if (this.empty()) {
+        return;
+      }
+      return this._first.key;
+    }
+  
+    firstValue() {
+      if (this.empty()) {
+        return;
+      }
+      return this._first.value;
+    }
+  
+    last() {
+      if (this.empty()) {
+        return;
+      }
+      return this._last.key;
+    }
+  
+    lastValue() {
+      if (this.empty()) {
+        return;
+      }
+      return this._last.value;
+    }
+  
+    prev(key) {
+      if (this.has(key)) {
+        var elt = this._dict[this._k(key)];
+        if (elt.prev)
+          return elt.prev.key;
+      }
+      return null;
+    }
+  
+    next(key) {
+      if (this.has(key)) {
+        var elt = this._dict[this._k(key)];
+        if (elt.next)
+          return elt.next.key;
+      }
+      return null;
+    }
+  
+    moveBefore(key, before) {
+      var elt = this._dict[this._k(key)];
+      var eltBefore = before ? this._dict[this._k(before)] : null;
+      if (typeof elt === "undefined") {
+        throw new Error("Item to move is not present");
+      }
+      if (typeof eltBefore === "undefined") {
+        throw new Error("Could not find element to move this one before");
+      }
+      if (eltBefore === elt.next) // no moving necessary
+        return;
+      // remove from its old place
+      this._linkEltOut(elt);
+      // patch into its new place
+      elt.next = eltBefore;
+      this._linkEltIn(elt);
+    }
+  
+    // Linear, sadly.
+    indexOf(key) {
+      var ret = null;
+      this.forEach((v, k, i) => {
+        if (this._k(k) === this._k(key)) {
+          ret = i;
+          return OrderedDict.BREAK;
+        }
+        return;
+      });
+      return ret;
+    }
+  
+    _checkRep() {
+      Object.keys(this._dict).forEach(k => {
+        const v = this._dict[k];
+        if (v.next === v) {
+          throw new Error("Next is a loop");
+        }
+        if (v.prev === v) {
+          throw new Error("Prev is a loop");
+        }
+      });
+    }
+  }
+  
+  OrderedDict.BREAK = {"break": true};
\ No newline at end of file
diff --git a/packages/webui/src/meteor/minimongo/lib/synchronous-queue.js b/packages/webui/src/meteor/minimongo/lib/synchronous-queue.js
new file mode 100644
index 0000000000..5bde1093c7
--- /dev/null
+++ b/packages/webui/src/meteor/minimongo/lib/synchronous-queue.js
@@ -0,0 +1,82 @@
+// This would usually live at Meteor._SynchronousQueue
+
+// An even simpler queue of tasks than the fiber-enabled one.  This one just
+// runs all the tasks when you call runTask or flush, synchronously.
+//
+const SynchronousQueue = function () {
+	var self = this
+	self._tasks = []
+	self._running = false
+	self._runTimeout = null
+}
+
+const SQp = SynchronousQueue.prototype
+
+SQp.runTask = function (task) {
+	var self = this
+	if (!self.safeToRunTask()) throw new Error('Could not synchronously run a task from a running task')
+	self._tasks.push(task)
+	var tasks = self._tasks
+	self._tasks = []
+	self._running = true
+
+	if (self._runTimeout) {
+		// Since we're going to drain the queue, we can forget about the timeout
+		// which tries to run it.  (But if one of our tasks queues something else,
+		// the timeout will be correctly re-created.)
+		clearTimeout(self._runTimeout)
+		self._runTimeout = null
+	}
+
+	try {
+		while (tasks.length > 0) {
+			var t = tasks.shift()
+			try {
+				t()
+			} catch (e) {
+				if (tasks.length === 0) {
+					// this was the last task, that is, the one we're calling runTask
+					// for.
+					throw e
+				}
+				Meteor._debug('Exception in queued task', e)
+			}
+		}
+	} finally {
+		self._running = false
+	}
+}
+
+SQp.queueTask = function (task) {
+	var self = this
+	self._tasks.push(task)
+	// Intentionally not using Meteor.setTimeout, because it doesn't like runing
+	// in stubs for now.
+	if (!self._runTimeout) {
+		self._runTimeout = setTimeout(function () {
+			return self.flush.apply(self, arguments)
+		}, 0)
+	}
+}
+
+SQp.flush = function () {
+	var self = this
+	self.runTask(function () {})
+}
+
+SQp.drain = function () {
+	var self = this
+	if (!self.safeToRunTask()) {
+		return
+	}
+	while (self._tasks.length > 0) {
+		self.flush()
+	}
+}
+
+SQp.safeToRunTask = function () {
+	var self = this
+	return !self._running
+}
+
+export { SynchronousQueue }
diff --git a/packages/webui/src/meteor/minimongo/local_collection.js b/packages/webui/src/meteor/minimongo/local_collection.js
new file mode 100644
index 0000000000..d144707be1
--- /dev/null
+++ b/packages/webui/src/meteor/minimongo/local_collection.js
@@ -0,0 +1,2888 @@
+import ObserveHandle from './observe_handle.js';
+import {
+  hasOwn,
+  isIndexable,
+  isNumericKey,
+  isOperatorObject,
+  populateDocumentWithQueryFields,
+  projectionDetails,
+  MinimongoError,
+  compileDocumentSelector,
+  nothingMatcher,
+  expandArraysInBranches,
+  makeLookupFunction,
+  selectorIsId,
+  bigBlobF,
+  _isPlainObject,
+} from './common.js';
+import { Meteor }  from '../meteor'
+import EJSON from 'ejson'
+import { MongoID } from '../mongo-id'
+import { DiffSequence } from '../diff-sequence'
+import { Tracker } from '../tracker'
+import { IdMap } from './lib/id-map.js'
+import { OrderedDict } from './lib/ordered-dict.js'
+import { getRandomString } from '@sofie-automation/corelib/dist/lib'
+import { SynchronousQueue } from './lib/synchronous-queue.js';
+
+// XXX type checking on selectors (graceful error if malformed)
+
+// LocalCollection: a set of documents that supports queries and modifiers.
+export class LocalCollection {
+  constructor(name) {
+    this.name = name;
+    // _id -> document (also containing id)
+    this._docs = new LocalCollection._IdMap();
+
+    this._observeQueue = new SynchronousQueue();
+
+    this.next_qid = 1; // live query id generator
+
+    // qid -> live query object. keys:
+    //  ordered: bool. ordered queries have addedBefore/movedBefore callbacks.
+    //  results: array (ordered) or object (unordered) of current results
+    //    (aliased with this._docs!)
+    //  resultsSnapshot: snapshot of results. null if not paused.
+    //  cursor: Cursor object for the query.
+    //  selector, sorter, (callbacks): functions
+    this.queries = Object.create(null);
+
+    // null if not saving originals; an IdMap from id to original document value
+    // if saving originals. See comments before saveOriginals().
+    this._savedOriginals = null;
+
+    // True when observers are paused and we should not send callbacks.
+    this.paused = false;
+  }
+
+  // options may include sort, skip, limit, reactive
+  // sort may be any of these forms:
+  //     {a: 1, b: -1}
+  //     [["a", "asc"], ["b", "desc"]]
+  //     ["a", ["b", "desc"]]
+  //   (in the first form you're beholden to key enumeration order in
+  //   your javascript VM)
+  //
+  // reactive: if given, and false, don't register with Tracker (default
+  // is true)
+  //
+  // XXX possibly should support retrieving a subset of fields? and
+  // have it be a hint (ignored on the client, when not copying the
+  // doc?)
+  //
+  // XXX sort does not yet support subkeys ('a.b') .. fix that!
+  // XXX add one more sort form: "key"
+  // XXX tests
+  find(selector, options) {
+    // default syntax for everything is to omit the selector argument.
+    // but if selector is explicitly passed in as false or undefined, we
+    // want a selector that matches nothing.
+    if (arguments.length === 0) {
+      selector = {};
+    }
+
+    return new LocalCollection.Cursor(this, selector, options);
+  }
+
+  findOne(selector, options = {}) {
+    if (arguments.length === 0) {
+      selector = {};
+    }
+
+    // NOTE: by setting limit 1 here, we end up using very inefficient
+    // code that recomputes the whole query on each update. The upside is
+    // that when you reactively depend on a findOne you only get
+    // invalidated when the found object changes, not any object in the
+    // collection. Most findOne will be by id, which has a fast path, so
+    // this might not be a big deal. In most cases, invalidation causes
+    // the called to re-query anyway, so this should be a net performance
+    // improvement.
+    options.limit = 1;
+
+    return this.find(selector, options).fetch()[0];
+  }
+
+  // XXX possibly enforce that 'undefined' does not appear (we assume
+  // this in our handling of null and $exists)
+  insert(doc, callback) {
+    doc = EJSON.clone(doc);
+
+    assertHasValidFieldNames(doc);
+
+    // if you really want to use ObjectIDs, set this global.
+    // Mongo.Collection specifies its own ids and does not use this code.
+    if (!hasOwn.call(doc, '_id')) {
+      doc._id = getRandomString();
+    }
+
+    const id = doc._id;
+
+    if (this._docs.has(id)) {
+      throw MinimongoError(`Duplicate _id '${id}'`);
+    }
+
+    this._saveOriginal(id, undefined);
+    this._docs.set(id, doc);
+
+    const queriesToRecompute = [];
+
+    // trigger live queries that match
+    Object.keys(this.queries).forEach(qid => {
+      const query = this.queries[qid];
+
+      if (query.dirty) {
+        return;
+      }
+
+      const matchResult = query.matcher.documentMatches(doc);
+
+      if (matchResult.result) {
+        if (query.distances && matchResult.distance !== undefined) {
+          query.distances.set(id, matchResult.distance);
+        }
+
+        if (query.cursor.skip || query.cursor.limit) {
+          queriesToRecompute.push(qid);
+        } else {
+          LocalCollection._insertInResults(query, doc);
+        }
+      }
+    });
+
+    queriesToRecompute.forEach(qid => {
+      if (this.queries[qid]) {
+        this._recomputeResults(this.queries[qid]);
+      }
+    });
+
+    this._observeQueue.drain();
+
+    // Defer because the caller likely doesn't expect the callback to be run
+    // immediately.
+    if (callback) {
+      Meteor.defer(() => {
+        callback(null, id);
+      });
+    }
+
+    return id;
+  }
+
+  // Pause the observers. No callbacks from observers will fire until
+  // 'resumeObservers' is called.
+  pauseObservers() {
+    // No-op if already paused.
+    if (this.paused) {
+      return;
+    }
+
+    // Set the 'paused' flag such that new observer messages don't fire.
+    this.paused = true;
+
+    // Take a snapshot of the query results for each query.
+    Object.keys(this.queries).forEach(qid => {
+      const query = this.queries[qid];
+      query.resultsSnapshot = EJSON.clone(query.results);
+    });
+  }
+
+  remove(selector, callback) {
+    // Easy special case: if we're not calling observeChanges callbacks and
+    // we're not saving originals and we got asked to remove everything, then
+    // just empty everything directly.
+    if (this.paused && !this._savedOriginals && EJSON.equals(selector, {})) {
+      const result = this._docs.size();
+
+      this._docs.clear();
+
+      Object.keys(this.queries).forEach(qid => {
+        const query = this.queries[qid];
+
+        if (query.ordered) {
+          query.results = [];
+        } else {
+          query.results.clear();
+        }
+      });
+
+      if (callback) {
+        Meteor.defer(() => {
+          callback(null, result);
+        });
+      }
+
+      return result;
+    }
+
+    const matcher = new LocalCollection.Matcher(selector);
+    const remove = [];
+
+    this._eachPossiblyMatchingDoc(selector, (doc, id) => {
+      if (matcher.documentMatches(doc).result) {
+        remove.push(id);
+      }
+    });
+
+    const queriesToRecompute = [];
+    const queryRemove = [];
+
+    for (let i = 0; i < remove.length; i++) {
+      const removeId = remove[i];
+      const removeDoc = this._docs.get(removeId);
+
+      Object.keys(this.queries).forEach(qid => {
+        const query = this.queries[qid];
+
+        if (query.dirty) {
+          return;
+        }
+
+        if (query.matcher.documentMatches(removeDoc).result) {
+          if (query.cursor.skip || query.cursor.limit) {
+            queriesToRecompute.push(qid);
+          } else {
+            queryRemove.push({qid, doc: removeDoc});
+          }
+        }
+      });
+
+      this._saveOriginal(removeId, removeDoc);
+      this._docs.remove(removeId);
+    }
+
+    // run live query callbacks _after_ we've removed the documents.
+    queryRemove.forEach(remove => {
+      const query = this.queries[remove.qid];
+
+      if (query) {
+        query.distances && query.distances.remove(remove.doc._id);
+        LocalCollection._removeFromResults(query, remove.doc);
+      }
+    });
+
+    queriesToRecompute.forEach(qid => {
+      const query = this.queries[qid];
+
+      if (query) {
+        this._recomputeResults(query);
+      }
+    });
+
+    this._observeQueue.drain();
+
+    const result = remove.length;
+
+    if (callback) {
+      Meteor.defer(() => {
+        callback(null, result);
+      });
+    }
+
+    return result;
+  }
+
+  // Resume the observers. Observers immediately receive change
+  // notifications to bring them to the current state of the
+  // database. Note that this is not just replaying all the changes that
+  // happened during the pause, it is a smarter 'coalesced' diff.
+  resumeObservers() {
+    // No-op if not paused.
+    if (!this.paused) {
+      return;
+    }
+
+    // Unset the 'paused' flag. Make sure to do this first, otherwise
+    // observer methods won't actually fire when we trigger them.
+    this.paused = false;
+
+    Object.keys(this.queries).forEach(qid => {
+      const query = this.queries[qid];
+
+      if (query.dirty) {
+        query.dirty = false;
+
+        // re-compute results will perform `LocalCollection._diffQueryChanges`
+        // automatically.
+        this._recomputeResults(query, query.resultsSnapshot);
+      } else {
+        // Diff the current results against the snapshot and send to observers.
+        // pass the query object for its observer callbacks.
+        LocalCollection._diffQueryChanges(
+          query.ordered,
+          query.resultsSnapshot,
+          query.results,
+          query,
+          {projectionFn: query.projectionFn}
+        );
+      }
+
+      query.resultsSnapshot = null;
+    });
+
+    this._observeQueue.drain();
+  }
+
+  retrieveOriginals() {
+    if (!this._savedOriginals) {
+      throw new Error('Called retrieveOriginals without saveOriginals');
+    }
+
+    const originals = this._savedOriginals;
+
+    this._savedOriginals = null;
+
+    return originals;
+  }
+
+  // To track what documents are affected by a piece of code, call
+  // saveOriginals() before it and retrieveOriginals() after it.
+  // retrieveOriginals returns an object whose keys are the ids of the documents
+  // that were affected since the call to saveOriginals(), and the values are
+  // equal to the document's contents at the time of saveOriginals. (In the case
+  // of an inserted document, undefined is the value.) You must alternate
+  // between calls to saveOriginals() and retrieveOriginals().
+  saveOriginals() {
+    if (this._savedOriginals) {
+      throw new Error('Called saveOriginals twice without retrieveOriginals');
+    }
+
+    this._savedOriginals = new LocalCollection._IdMap;
+  }
+
+  // XXX atomicity: if multi is true, and one modification fails, do
+  // we rollback the whole operation, or what?
+  update(selector, mod, options, callback) {
+    if (! callback && options instanceof Function) {
+      callback = options;
+      options = null;
+    }
+
+    if (!options) {
+      options = {};
+    }
+
+    const matcher = new LocalCollection.Matcher(selector, true);
+
+    // Save the original results of any query that we might need to
+    // _recomputeResults on, because _modifyAndNotify will mutate the objects in
+    // it. (We don't need to save the original results of paused queries because
+    // they already have a resultsSnapshot and we won't be diffing in
+    // _recomputeResults.)
+    const qidToOriginalResults = {};
+
+    // We should only clone each document once, even if it appears in multiple
+    // queries
+    const docMap = new LocalCollection._IdMap;
+    const idsMatched = LocalCollection._idsMatchedBySelector(selector);
+
+    Object.keys(this.queries).forEach(qid => {
+      const query = this.queries[qid];
+
+      if ((query.cursor.skip || query.cursor.limit) && ! this.paused) {
+        // Catch the case of a reactive `count()` on a cursor with skip
+        // or limit, which registers an unordered observe. This is a
+        // pretty rare case, so we just clone the entire result set with
+        // no optimizations for documents that appear in these result
+        // sets and other queries.
+        if (query.results instanceof LocalCollection._IdMap) {
+          qidToOriginalResults[qid] = query.results.clone();
+          return;
+        }
+
+        if (!(query.results instanceof Array)) {
+          throw new Error('Assertion failed: query.results not an array');
+        }
+
+        // Clones a document to be stored in `qidToOriginalResults`
+        // because it may be modified before the new and old result sets
+        // are diffed. But if we know exactly which document IDs we're
+        // going to modify, then we only need to clone those.
+        const memoizedCloneIfNeeded = doc => {
+          if (docMap.has(doc._id)) {
+            return docMap.get(doc._id);
+          }
+
+          const docToMemoize = (
+            idsMatched &&
+            !idsMatched.some(id => EJSON.equals(id, doc._id))
+          ) ? doc : EJSON.clone(doc);
+
+          docMap.set(doc._id, docToMemoize);
+
+          return docToMemoize;
+        };
+
+        qidToOriginalResults[qid] = query.results.map(memoizedCloneIfNeeded);
+      }
+    });
+
+    const recomputeQids = {};
+
+    let updateCount = 0;
+
+    this._eachPossiblyMatchingDoc(selector, (doc, id) => {
+      const queryResult = matcher.documentMatches(doc);
+
+      if (queryResult.result) {
+        // XXX Should we save the original even if mod ends up being a no-op?
+        this._saveOriginal(id, doc);
+        this._modifyAndNotify(
+          doc,
+          mod,
+          recomputeQids,
+          queryResult.arrayIndices
+        );
+
+        ++updateCount;
+
+        if (!options.multi) {
+          return false; // break
+        }
+      }
+
+      return true;
+    });
+
+    Object.keys(recomputeQids).forEach(qid => {
+      const query = this.queries[qid];
+
+      if (query) {
+        this._recomputeResults(query, qidToOriginalResults[qid]);
+      }
+    });
+
+    this._observeQueue.drain();
+
+    // If we are doing an upsert, and we didn't modify any documents yet, then
+    // it's time to do an insert. Figure out what document we are inserting, and
+    // generate an id for it.
+    let insertedId;
+    if (updateCount === 0 && options.upsert) {
+      const doc = LocalCollection._createUpsertDocument(selector, mod);
+      if (! doc._id && options.insertedId) {
+        doc._id = options.insertedId;
+      }
+
+      insertedId = this.insert(doc);
+      updateCount = 1;
+    }
+
+    // Return the number of affected documents, or in the upsert case, an object
+    // containing the number of affected docs and the id of the doc that was
+    // inserted, if any.
+    let result;
+    if (options._returnObject) {
+      result = {numberAffected: updateCount};
+
+      if (insertedId !== undefined) {
+        result.insertedId = insertedId;
+      }
+    } else {
+      result = updateCount;
+    }
+
+    if (callback) {
+      Meteor.defer(() => {
+        callback(null, result);
+      });
+    }
+
+    return result;
+  }
+
+  // A convenience wrapper on update. LocalCollection.upsert(sel, mod) is
+  // equivalent to LocalCollection.update(sel, mod, {upsert: true,
+  // _returnObject: true}).
+  upsert(selector, mod, options, callback) {
+    if (!callback && typeof options === 'function') {
+      callback = options;
+      options = {};
+    }
+
+    return this.update(
+      selector,
+      mod,
+      Object.assign({}, options, {upsert: true, _returnObject: true}),
+      callback
+    );
+  }
+
+  // Iterates over a subset of documents that could match selector; calls
+  // fn(doc, id) on each of them.  Specifically, if selector specifies
+  // specific _id's, it only looks at those.  doc is *not* cloned: it is the
+  // same object that is in _docs.
+  _eachPossiblyMatchingDoc(selector, fn) {
+    const specificIds = LocalCollection._idsMatchedBySelector(selector);
+
+    if (specificIds) {
+      specificIds.some(id => {
+        const doc = this._docs.get(id);
+
+        if (doc) {
+          return fn(doc, id) === false;
+        }
+      });
+    } else {
+      this._docs.forEach(fn);
+    }
+  }
+
+  _modifyAndNotify(doc, mod, recomputeQids, arrayIndices) {
+    const matched_before = {};
+
+    Object.keys(this.queries).forEach(qid => {
+      const query = this.queries[qid];
+
+      if (query.dirty) {
+        return;
+      }
+
+      if (query.ordered) {
+        matched_before[qid] = query.matcher.documentMatches(doc).result;
+      } else {
+        // Because we don't support skip or limit (yet) in unordered queries, we
+        // can just do a direct lookup.
+        matched_before[qid] = query.results.has(doc._id);
+      }
+    });
+
+    const old_doc = EJSON.clone(doc);
+
+    LocalCollection._modify(doc, mod, {arrayIndices});
+
+    Object.keys(this.queries).forEach(qid => {
+      const query = this.queries[qid];
+
+      if (query.dirty) {
+        return;
+      }
+
+      const afterMatch = query.matcher.documentMatches(doc);
+      const after = afterMatch.result;
+      const before = matched_before[qid];
+
+      if (after && query.distances && afterMatch.distance !== undefined) {
+        query.distances.set(doc._id, afterMatch.distance);
+      }
+
+      if (query.cursor.skip || query.cursor.limit) {
+        // We need to recompute any query where the doc may have been in the
+        // cursor's window either before or after the update. (Note that if skip
+        // or limit is set, "before" and "after" being true do not necessarily
+        // mean that the document is in the cursor's output after skip/limit is
+        // applied... but if they are false, then the document definitely is NOT
+        // in the output. So it's safe to skip recompute if neither before or
+        // after are true.)
+        if (before || after) {
+          recomputeQids[qid] = true;
+        }
+      } else if (before && !after) {
+        LocalCollection._removeFromResults(query, doc);
+      } else if (!before && after) {
+        LocalCollection._insertInResults(query, doc);
+      } else if (before && after) {
+        LocalCollection._updateInResults(query, doc, old_doc);
+      }
+    });
+  }
+
+  // Recomputes the results of a query and runs observe callbacks for the
+  // difference between the previous results and the current results (unless
+  // paused). Used for skip/limit queries.
+  //
+  // When this is used by insert or remove, it can just use query.results for
+  // the old results (and there's no need to pass in oldResults), because these
+  // operations don't mutate the documents in the collection. Update needs to
+  // pass in an oldResults which was deep-copied before the modifier was
+  // applied.
+  //
+  // oldResults is guaranteed to be ignored if the query is not paused.
+  _recomputeResults(query, oldResults) {
+    if (this.paused) {
+      // There's no reason to recompute the results now as we're still paused.
+      // By flagging the query as "dirty", the recompute will be performed
+      // when resumeObservers is called.
+      query.dirty = true;
+      return;
+    }
+
+    if (!this.paused && !oldResults) {
+      oldResults = query.results;
+    }
+
+    if (query.distances) {
+      query.distances.clear();
+    }
+
+    query.results = query.cursor._getRawObjects({
+      distances: query.distances,
+      ordered: query.ordered
+    });
+
+    if (!this.paused) {
+      LocalCollection._diffQueryChanges(
+        query.ordered,
+        oldResults,
+        query.results,
+        query,
+        {projectionFn: query.projectionFn}
+      );
+    }
+  }
+
+  _saveOriginal(id, doc) {
+    // Are we even trying to save originals?
+    if (!this._savedOriginals) {
+      return;
+    }
+
+    // Have we previously mutated the original (and so 'doc' is not actually
+    // original)?  (Note the 'has' check rather than truth: we store undefined
+    // here for inserted docs!)
+    if (this._savedOriginals.has(id)) {
+      return;
+    }
+
+    this._savedOriginals.set(id, EJSON.clone(doc));
+  }
+}
+
+
+LocalCollection.ObserveHandle = ObserveHandle;
+
+// XXX maybe move these into another ObserveHelpers package or something
+
+// _CachingChangeObserver is an object which receives observeChanges callbacks
+// and keeps a cache of the current cursor state up to date in this.docs. Users
+// of this class should read the docs field but not modify it. You should pass
+// the "applyChange" field as the callbacks to the underlying observeChanges
+// call. Optionally, you can specify your own observeChanges callbacks which are
+// invoked immediately before the docs field is updated; this object is made
+// available as `this` to those callbacks.
+LocalCollection._CachingChangeObserver = class _CachingChangeObserver {
+  constructor(options = {}) {
+    const orderedFromCallbacks = (
+      options.callbacks &&
+      LocalCollection._observeChangesCallbacksAreOrdered(options.callbacks)
+    );
+
+    if (hasOwn.call(options, 'ordered')) {
+      this.ordered = options.ordered;
+
+      if (options.callbacks && options.ordered !== orderedFromCallbacks) {
+        throw Error('ordered option doesn\'t match callbacks');
+      }
+    } else if (options.callbacks) {
+      this.ordered = orderedFromCallbacks;
+    } else {
+      throw Error('must provide ordered or callbacks');
+    }
+
+    const callbacks = options.callbacks || {};
+
+    if (this.ordered) {
+      this.docs = new OrderedDict(MongoID.idStringify);
+      this.applyChange = {
+        addedBefore: (id, fields, before) => {
+          // Take a shallow copy since the top-level properties can be changed
+          const doc = { ...fields };
+
+          doc._id = id;
+
+          if (callbacks.addedBefore) {
+            callbacks.addedBefore.call(this, id, EJSON.clone(fields), before);
+          }
+
+          // This line triggers if we provide added with movedBefore.
+          if (callbacks.added) {
+            callbacks.added.call(this, id, EJSON.clone(fields));
+          }
+
+          // XXX could `before` be a falsy ID?  Technically
+          // idStringify seems to allow for them -- though
+          // OrderedDict won't call stringify on a falsy arg.
+          this.docs.putBefore(id, doc, before || null);
+        },
+        movedBefore: (id, before) => {
+          const doc = this.docs.get(id);
+
+          if (callbacks.movedBefore) {
+            callbacks.movedBefore.call(this, id, before);
+          }
+
+          this.docs.moveBefore(id, before || null);
+        },
+      };
+    } else {
+      this.docs = new LocalCollection._IdMap;
+      this.applyChange = {
+        added: (id, fields) => {
+          // Take a shallow copy since the top-level properties can be changed
+          const doc = { ...fields };
+
+          if (callbacks.added) {
+            callbacks.added.call(this, id, EJSON.clone(fields));
+          }
+
+          doc._id = id;
+
+          this.docs.set(id,  doc);
+        },
+      };
+    }
+
+    // The methods in _IdMap and OrderedDict used by these callbacks are
+    // identical.
+    this.applyChange.changed = (id, fields) => {
+      const doc = this.docs.get(id);
+
+      if (!doc) {
+        throw new Error(`Unknown id for changed: ${id}`);
+      }
+
+      if (callbacks.changed) {
+        callbacks.changed.call(this, id, EJSON.clone(fields));
+      }
+
+      DiffSequence.applyChanges(doc, fields);
+    };
+
+    this.applyChange.removed = id => {
+      if (callbacks.removed) {
+        callbacks.removed.call(this, id);
+      }
+
+      this.docs.remove(id);
+    };
+  }
+};
+
+LocalCollection._IdMap = class _IdMap extends IdMap {
+  constructor() {
+    super(MongoID.idStringify, MongoID.idParse);
+  }
+};
+
+// XXX the sorted-query logic below is laughably inefficient. we'll
+// need to come up with a better datastructure for this.
+//
+// XXX the logic for observing with a skip or a limit is even more
+// laughably inefficient. we recompute the whole results every time!
+
+// This binary search puts a value between any equal values, and the first
+// lesser value.
+LocalCollection._binarySearch = (cmp, array, value) => {
+  let first = 0;
+  let range = array.length;
+
+  while (range > 0) {
+    const halfRange = Math.floor(range / 2);
+
+    if (cmp(value, array[first + halfRange]) >= 0) {
+      first += halfRange + 1;
+      range -= halfRange + 1;
+    } else {
+      range = halfRange;
+    }
+  }
+
+  return first;
+};
+
+LocalCollection._checkSupportedProjection = fields => {
+  if (fields !== Object(fields) || Array.isArray(fields)) {
+    throw MinimongoError('fields option must be an object');
+  }
+
+  Object.keys(fields).forEach(keyPath => {
+    if (keyPath.split('.').includes('$')) {
+      throw MinimongoError(
+        'Minimongo doesn\'t support $ operator in projections yet.'
+      );
+    }
+
+    const value = fields[keyPath];
+
+    if (typeof value === 'object' &&
+        ['$elemMatch', '$meta', '$slice'].some(key =>
+          hasOwn.call(value, key)
+        )) {
+      throw MinimongoError(
+        'Minimongo doesn\'t support operators in projections yet.'
+      );
+    }
+
+    if (![1, 0, true, false].includes(value)) {
+      throw MinimongoError(
+        'Projection values should be one of 1, 0, true, or false'
+      );
+    }
+  });
+};
+
+// Knows how to compile a fields projection to a predicate function.
+// @returns - Function: a closure that filters out an object according to the
+//            fields projection rules:
+//            @param obj - Object: MongoDB-styled document
+//            @returns - Object: a document with the fields filtered out
+//                       according to projection rules. Doesn't retain subfields
+//                       of passed argument.
+LocalCollection._compileProjection = fields => {
+  LocalCollection._checkSupportedProjection(fields);
+
+  const _idProjection = fields._id === undefined ? true : fields._id;
+  const details = projectionDetails(fields);
+
+  // returns transformed doc according to ruleTree
+  const transform = (doc, ruleTree) => {
+    // Special case for "sets"
+    if (Array.isArray(doc)) {
+      return doc.map(subdoc => transform(subdoc, ruleTree));
+    }
+
+    const result = details.including ? {} : EJSON.clone(doc);
+
+    Object.keys(ruleTree).forEach(key => {
+      if (doc == null || !hasOwn.call(doc, key)) {
+        return;
+      }
+
+      const rule = ruleTree[key];
+
+      if (rule === Object(rule)) {
+        // For sub-objects/subsets we branch
+        if (doc[key] === Object(doc[key])) {
+          result[key] = transform(doc[key], rule);
+        }
+      } else if (details.including) {
+        // Otherwise we don't even touch this subfield
+        result[key] = EJSON.clone(doc[key]);
+      } else {
+        delete result[key];
+      }
+    });
+
+    return doc != null ? result : doc;
+  };
+
+  return doc => {
+    const result = transform(doc, details.tree);
+
+    if (_idProjection && hasOwn.call(doc, '_id')) {
+      result._id = doc._id;
+    }
+
+    if (!_idProjection && hasOwn.call(result, '_id')) {
+      delete result._id;
+    }
+
+    return result;
+  };
+};
+
+// Calculates the document to insert in case we're doing an upsert and the
+// selector does not match any elements
+LocalCollection._createUpsertDocument = (selector, modifier) => {
+  const selectorDocument = populateDocumentWithQueryFields(selector);
+  const isModify = LocalCollection._isModificationMod(modifier);
+
+  const newDoc = {};
+
+  if (selectorDocument._id) {
+    newDoc._id = selectorDocument._id;
+    delete selectorDocument._id;
+  }
+
+  // This double _modify call is made to help with nested properties (see issue
+  // #8631). We do this even if it's a replacement for validation purposes (e.g.
+  // ambiguous id's)
+  LocalCollection._modify(newDoc, {$set: selectorDocument});
+  LocalCollection._modify(newDoc, modifier, {isInsert: true});
+
+  if (isModify) {
+    return newDoc;
+  }
+
+  // Replacement can take _id from query document
+  const replacement = Object.assign({}, modifier);
+  if (newDoc._id) {
+    replacement._id = newDoc._id;
+  }
+
+  return replacement;
+};
+
+LocalCollection._diffObjects = (left, right, callbacks) => {
+  return DiffSequence.diffObjects(left, right, callbacks);
+};
+
+// ordered: bool.
+// old_results and new_results: collections of documents.
+//    if ordered, they are arrays.
+//    if unordered, they are IdMaps
+LocalCollection._diffQueryChanges = (ordered, oldResults, newResults, observer, options) =>
+  DiffSequence.diffQueryChanges(ordered, oldResults, newResults, observer, options)
+;
+
+LocalCollection._diffQueryOrderedChanges = (oldResults, newResults, observer, options) =>
+  DiffSequence.diffQueryOrderedChanges(oldResults, newResults, observer, options)
+;
+
+LocalCollection._diffQueryUnorderedChanges = (oldResults, newResults, observer, options) =>
+  DiffSequence.diffQueryUnorderedChanges(oldResults, newResults, observer, options)
+;
+
+LocalCollection._findInOrderedResults = (query, doc) => {
+  if (!query.ordered) {
+    throw new Error('Can\'t call _findInOrderedResults on unordered query');
+  }
+
+  for (let i = 0; i < query.results.length; i++) {
+    if (query.results[i] === doc) {
+      return i;
+    }
+  }
+
+  throw Error('object missing from query');
+};
+
+// If this is a selector which explicitly constrains the match by ID to a finite
+// number of documents, returns a list of their IDs.  Otherwise returns
+// null. Note that the selector may have other restrictions so it may not even
+// match those document!  We care about $in and $and since those are generated
+// access-controlled update and remove.
+LocalCollection._idsMatchedBySelector = selector => {
+  // Is the selector just an ID?
+  if (LocalCollection._selectorIsId(selector)) {
+    return [selector];
+  }
+
+  if (!selector) {
+    return null;
+  }
+
+  // Do we have an _id clause?
+  if (hasOwn.call(selector, '_id')) {
+    // Is the _id clause just an ID?
+    if (LocalCollection._selectorIsId(selector._id)) {
+      return [selector._id];
+    }
+
+    // Is the _id clause {_id: {$in: ["x", "y", "z"]}}?
+    if (selector._id
+        && Array.isArray(selector._id.$in)
+        && selector._id.$in.length
+        && selector._id.$in.every(LocalCollection._selectorIsId)) {
+      return selector._id.$in;
+    }
+
+    return null;
+  }
+
+  // If this is a top-level $and, and any of the clauses constrain their
+  // documents, then the whole selector is constrained by any one clause's
+  // constraint. (Well, by their intersection, but that seems unlikely.)
+  if (Array.isArray(selector.$and)) {
+    for (let i = 0; i < selector.$and.length; ++i) {
+      const subIds = LocalCollection._idsMatchedBySelector(selector.$and[i]);
+
+      if (subIds) {
+        return subIds;
+      }
+    }
+  }
+
+  return null;
+};
+
+LocalCollection._insertInResults = (query, doc) => {
+  const fields = EJSON.clone(doc);
+
+  delete fields._id;
+
+  if (query.ordered) {
+    if (!query.sorter) {
+      query.addedBefore(doc._id, query.projectionFn(fields), null);
+      query.results.push(doc);
+    } else {
+      const i = LocalCollection._insertInSortedList(
+        query.sorter.getComparator({distances: query.distances}),
+        query.results,
+        doc
+      );
+
+      let next = query.results[i + 1];
+      if (next) {
+        next = next._id;
+      } else {
+        next = null;
+      }
+
+      query.addedBefore(doc._id, query.projectionFn(fields), next);
+    }
+
+    query.added(doc._id, query.projectionFn(fields));
+  } else {
+    query.added(doc._id, query.projectionFn(fields));
+    query.results.set(doc._id, doc);
+  }
+};
+
+LocalCollection._insertInSortedList = (cmp, array, value) => {
+  if (array.length === 0) {
+    array.push(value);
+    return 0;
+  }
+
+  const i = LocalCollection._binarySearch(cmp, array, value);
+
+  array.splice(i, 0, value);
+
+  return i;
+};
+
+LocalCollection._isModificationMod = mod => {
+  let isModify = false;
+  let isReplace = false;
+
+  Object.keys(mod).forEach(key => {
+    if (key.substr(0, 1) === '$') {
+      isModify = true;
+    } else {
+      isReplace = true;
+    }
+  });
+
+  if (isModify && isReplace) {
+    throw new Error(
+      'Update parameter cannot have both modifier and non-modifier fields.'
+    );
+  }
+
+  return isModify;
+};
+
+// XXX maybe this should be EJSON.isObject, though EJSON doesn't know about
+// RegExp
+// XXX note that _type(undefined) === 3!!!!
+LocalCollection._isPlainObject = _isPlainObject
+
+// XXX need a strategy for passing the binding of $ into this
+// function, from the compiled selector
+//
+// maybe just {key.up.to.just.before.dollarsign: array_index}
+//
+// XXX atomicity: if one modification fails, do we roll back the whole
+// change?
+//
+// options:
+//   - isInsert is set when _modify is being called to compute the document to
+//     insert as part of an upsert operation. We use this primarily to figure
+//     out when to set the fields in $setOnInsert, if present.
+LocalCollection._modify = (doc, modifier, options = {}) => {
+  if (!LocalCollection._isPlainObject(modifier)) {
+    throw MinimongoError('Modifier must be an object');
+  }
+
+  // Make sure the caller can't mutate our data structures.
+  modifier = EJSON.clone(modifier);
+
+  const isModifier = isOperatorObject(modifier);
+  const newDoc = isModifier ? EJSON.clone(doc) : modifier;
+
+  if (isModifier) {
+    // apply modifiers to the doc.
+    Object.keys(modifier).forEach(operator => {
+      // Treat $setOnInsert as $set if this is an insert.
+      const setOnInsert = options.isInsert && operator === '$setOnInsert';
+      const modFunc = MODIFIERS[setOnInsert ? '$set' : operator];
+      const operand = modifier[operator];
+
+      if (!modFunc) {
+        throw MinimongoError(`Invalid modifier specified ${operator}`);
+      }
+
+      Object.keys(operand).forEach(keypath => {
+        const arg = operand[keypath];
+
+        if (keypath === '') {
+          throw MinimongoError('An empty update path is not valid.');
+        }
+
+        const keyparts = keypath.split('.');
+
+        if (!keyparts.every(Boolean)) {
+          throw MinimongoError(
+            `The update path '${keypath}' contains an empty field name, ` +
+            'which is not allowed.'
+          );
+        }
+
+        const target = findModTarget(newDoc, keyparts, {
+          arrayIndices: options.arrayIndices,
+          forbidArray: operator === '$rename',
+          noCreate: NO_CREATE_MODIFIERS[operator]
+        });
+
+        modFunc(target, keyparts.pop(), arg, keypath, newDoc);
+      });
+    });
+
+    if (doc._id && !EJSON.equals(doc._id, newDoc._id)) {
+      throw MinimongoError(
+        `After applying the update to the document {_id: "${doc._id}", ...},` +
+        ' the (immutable) field \'_id\' was found to have been altered to ' +
+        `_id: "${newDoc._id}"`
+      );
+    }
+  } else {
+    if (doc._id && modifier._id && !EJSON.equals(doc._id, modifier._id)) {
+      throw MinimongoError(
+        `The _id field cannot be changed from {_id: "${doc._id}"} to ` +
+        `{_id: "${modifier._id}"}`
+      );
+    }
+
+    // replace the whole document
+    assertHasValidFieldNames(modifier);
+  }
+
+  // move new document into place.
+  Object.keys(doc).forEach(key => {
+    // Note: this used to be for (var key in doc) however, this does not
+    // work right in Opera. Deleting from a doc while iterating over it
+    // would sometimes cause opera to skip some keys.
+    if (key !== '_id') {
+      delete doc[key];
+    }
+  });
+
+  Object.keys(newDoc).forEach(key => {
+    doc[key] = newDoc[key];
+  });
+};
+
+LocalCollection._observeFromObserveChanges = (cursor, observeCallbacks) => {
+  let suppressed = !!observeCallbacks._suppress_initial;
+
+  let observeChangesCallbacks;
+  if (LocalCollection._observeCallbacksAreOrdered(observeCallbacks)) {
+    // The "_no_indices" option sets all index arguments to -1 and skips the
+    // linear scans required to generate them.  This lets observers that don't
+    // need absolute indices benefit from the other features of this API --
+    // relative order, transforms, and applyChanges -- without the speed hit.
+    const indices = !observeCallbacks._no_indices;
+
+    observeChangesCallbacks = {
+      addedBefore(id, fields, before) {
+        if (suppressed || !(observeCallbacks.addedAt || observeCallbacks.added)) {
+          return;
+        }
+
+        const doc = Object.assign(fields, {_id: id});
+
+        if (observeCallbacks.addedAt) {
+          observeCallbacks.addedAt(
+            doc,
+            indices
+              ? before
+                ? this.docs.indexOf(before)
+                : this.docs.size()
+              : -1,
+            before
+          );
+        } else {
+          observeCallbacks.added(doc);
+        }
+      },
+      changed(id, fields) {
+        if (!(observeCallbacks.changedAt || observeCallbacks.changed)) {
+          return;
+        }
+
+        let doc = EJSON.clone(this.docs.get(id));
+        if (!doc) {
+          throw new Error(`Unknown id for changed: ${id}`);
+        }
+
+        const oldDoc = EJSON.clone(doc);
+
+        DiffSequence.applyChanges(doc, fields);
+
+        if (observeCallbacks.changedAt) {
+          observeCallbacks.changedAt(
+            doc,
+            oldDoc,
+            indices ? this.docs.indexOf(id) : -1
+          );
+        } else {
+          observeCallbacks.changed(doc, oldDoc);
+        }
+      },
+      movedBefore(id, before) {
+        if (!observeCallbacks.movedTo) {
+          return;
+        }
+
+        const from = indices ? this.docs.indexOf(id) : -1;
+        let to = indices
+          ? before
+            ? this.docs.indexOf(before)
+            : this.docs.size()
+          : -1;
+
+        // When not moving backwards, adjust for the fact that removing the
+        // document slides everything back one slot.
+        if (to > from) {
+          --to;
+        }
+
+        observeCallbacks.movedTo(
+          EJSON.clone(this.docs.get(id)),
+          from,
+          to,
+          before || null
+        );
+      },
+      removed(id) {
+        if (!(observeCallbacks.removedAt || observeCallbacks.removed)) {
+          return;
+        }
+
+        // technically maybe there should be an EJSON.clone here, but it's about
+        // to be removed from this.docs!
+        const doc = this.docs.get(id);
+
+        if (observeCallbacks.removedAt) {
+          observeCallbacks.removedAt(doc, indices ? this.docs.indexOf(id) : -1);
+        } else {
+          observeCallbacks.removed(doc);
+        }
+      },
+    };
+  } else {
+    observeChangesCallbacks = {
+      added(id, fields) {
+        if (!suppressed && observeCallbacks.added) {
+          observeCallbacks.added(Object.assign(fields, {_id: id}));
+        }
+      },
+      changed(id, fields) {
+        if (observeCallbacks.changed) {
+          const oldDoc = this.docs.get(id);
+          const doc = EJSON.clone(oldDoc);
+
+          DiffSequence.applyChanges(doc, fields);
+
+          observeCallbacks.changed(
+            doc,
+            EJSON.clone(oldDoc)
+          );
+        }
+      },
+      removed(id) {
+        if (observeCallbacks.removed) {
+          observeCallbacks.removed(this.docs.get(id));
+        }
+      },
+    };
+  }
+
+  const changeObserver = new LocalCollection._CachingChangeObserver({
+    callbacks: observeChangesCallbacks
+  });
+
+  // CachingChangeObserver clones all received input on its callbacks
+  // So we can mark it as safe to reduce the ejson clones.
+  // This is tested by the `mongo-livedata - (extended) scribbling` tests
+  changeObserver.applyChange._fromObserve = true;
+  const handle = cursor.observeChanges(changeObserver.applyChange,
+    { nonMutatingCallbacks: true });
+
+  suppressed = false;
+
+  return handle;
+};
+
+LocalCollection._observeCallbacksAreOrdered = callbacks => {
+  if (callbacks.added && callbacks.addedAt) {
+    throw new Error('Please specify only one of added() and addedAt()');
+  }
+
+  if (callbacks.changed && callbacks.changedAt) {
+    throw new Error('Please specify only one of changed() and changedAt()');
+  }
+
+  if (callbacks.removed && callbacks.removedAt) {
+    throw new Error('Please specify only one of removed() and removedAt()');
+  }
+
+  return !!(
+    callbacks.addedAt ||
+    callbacks.changedAt ||
+    callbacks.movedTo ||
+    callbacks.removedAt
+  );
+};
+
+LocalCollection._observeChangesCallbacksAreOrdered = callbacks => {
+  if (callbacks.added && callbacks.addedBefore) {
+    throw new Error('Please specify only one of added() and addedBefore()');
+  }
+
+  return !!(callbacks.addedBefore || callbacks.movedBefore);
+};
+
+LocalCollection._removeFromResults = (query, doc) => {
+  if (query.ordered) {
+    const i = LocalCollection._findInOrderedResults(query, doc);
+
+    query.removed(doc._id);
+    query.results.splice(i, 1);
+  } else {
+    const id = doc._id;  // in case callback mutates doc
+
+    query.removed(doc._id);
+    query.results.remove(id);
+  }
+};
+
+// Is this selector just shorthand for lookup by _id?
+LocalCollection._selectorIsId = selectorIsId;
+
+// Is the selector just lookup by _id (shorthand or not)?
+LocalCollection._selectorIsIdPerhapsAsObject = selector =>
+  LocalCollection._selectorIsId(selector) ||
+  LocalCollection._selectorIsId(selector && selector._id) &&
+  Object.keys(selector).length === 1
+;
+
+LocalCollection._updateInResults = (query, doc, old_doc) => {
+  if (!EJSON.equals(doc._id, old_doc._id)) {
+    throw new Error('Can\'t change a doc\'s _id while updating');
+  }
+
+  const projectionFn = query.projectionFn;
+  const changedFields = DiffSequence.makeChangedFields(
+    projectionFn(doc),
+    projectionFn(old_doc)
+  );
+
+  if (!query.ordered) {
+    if (Object.keys(changedFields).length) {
+      query.changed(doc._id, changedFields);
+      query.results.set(doc._id, doc);
+    }
+
+    return;
+  }
+
+  const old_idx = LocalCollection._findInOrderedResults(query, doc);
+
+  if (Object.keys(changedFields).length) {
+    query.changed(doc._id, changedFields);
+  }
+
+  if (!query.sorter) {
+    return;
+  }
+
+  // just take it out and put it back in again, and see if the index changes
+  query.results.splice(old_idx, 1);
+
+  const new_idx = LocalCollection._insertInSortedList(
+    query.sorter.getComparator({distances: query.distances}),
+    query.results,
+    doc
+  );
+
+  if (old_idx !== new_idx) {
+    let next = query.results[new_idx + 1];
+    if (next) {
+      next = next._id;
+    } else {
+      next = null;
+    }
+
+    query.movedBefore && query.movedBefore(doc._id, next);
+  }
+};
+
+const MODIFIERS = {
+  $currentDate(target, field, arg) {
+    if (typeof arg === 'object' && hasOwn.call(arg, '$type')) {
+      if (arg.$type !== 'date') {
+        throw MinimongoError(
+          'Minimongo does currently only support the date type in ' +
+          '$currentDate modifiers',
+          {field}
+        );
+      }
+    } else if (arg !== true) {
+      throw MinimongoError('Invalid $currentDate modifier', {field});
+    }
+
+    target[field] = new Date();
+  },
+  $inc(target, field, arg) {
+    if (typeof arg !== 'number') {
+      throw MinimongoError('Modifier $inc allowed for numbers only', {field});
+    }
+
+    if (field in target) {
+      if (typeof target[field] !== 'number') {
+        throw MinimongoError(
+          'Cannot apply $inc modifier to non-number',
+          {field}
+        );
+      }
+
+      target[field] += arg;
+    } else {
+      target[field] = arg;
+    }
+  },
+  $min(target, field, arg) {
+    if (typeof arg !== 'number') {
+      throw MinimongoError('Modifier $min allowed for numbers only', {field});
+    }
+
+    if (field in target) {
+      if (typeof target[field] !== 'number') {
+        throw MinimongoError(
+          'Cannot apply $min modifier to non-number',
+          {field}
+        );
+      }
+
+      if (target[field] > arg) {
+        target[field] = arg;
+      }
+    } else {
+      target[field] = arg;
+    }
+  },
+  $max(target, field, arg) {
+    if (typeof arg !== 'number') {
+      throw MinimongoError('Modifier $max allowed for numbers only', {field});
+    }
+
+    if (field in target) {
+      if (typeof target[field] !== 'number') {
+        throw MinimongoError(
+          'Cannot apply $max modifier to non-number',
+          {field}
+        );
+      }
+
+      if (target[field] < arg) {
+        target[field] = arg;
+      }
+    } else {
+      target[field] = arg;
+    }
+  },
+  $mul(target, field, arg) {
+    if (typeof arg !== 'number') {
+      throw MinimongoError('Modifier $mul allowed for numbers only', {field});
+    }
+
+    if (field in target) {
+      if (typeof target[field] !== 'number') {
+        throw MinimongoError(
+          'Cannot apply $mul modifier to non-number',
+          {field}
+        );
+      }
+
+      target[field] *= arg;
+    } else {
+      target[field] = 0;
+    }
+  },
+  $rename(target, field, arg, keypath, doc) {
+    // no idea why mongo has this restriction..
+    if (keypath === arg) {
+      throw MinimongoError('$rename source must differ from target', {field});
+    }
+
+    if (target === null) {
+      throw MinimongoError('$rename source field invalid', {field});
+    }
+
+    if (typeof arg !== 'string') {
+      throw MinimongoError('$rename target must be a string', {field});
+    }
+
+    if (arg.includes('\0')) {
+      // Null bytes are not allowed in Mongo field names
+      // https://docs.mongodb.com/manual/reference/limits/#Restrictions-on-Field-Names
+      throw MinimongoError(
+        'The \'to\' field for $rename cannot contain an embedded null byte',
+        {field}
+      );
+    }
+
+    if (target === undefined) {
+      return;
+    }
+
+    const object = target[field];
+
+    delete target[field];
+
+    const keyparts = arg.split('.');
+    const target2 = findModTarget(doc, keyparts, {forbidArray: true});
+
+    if (target2 === null) {
+      throw MinimongoError('$rename target field invalid', {field});
+    }
+
+    target2[keyparts.pop()] = object;
+  },
+  $set(target, field, arg) {
+    if (target !== Object(target)) { // not an array or an object
+      const error = MinimongoError(
+        'Cannot set property on non-object field',
+        {field}
+      );
+      error.setPropertyError = true;
+      throw error;
+    }
+
+    if (target === null) {
+      const error = MinimongoError('Cannot set property on null', {field});
+      error.setPropertyError = true;
+      throw error;
+    }
+
+    assertHasValidFieldNames(arg);
+
+    target[field] = arg;
+  },
+  $setOnInsert(target, field, arg) {
+    // converted to `$set` in `_modify`
+  },
+  $unset(target, field, arg) {
+    if (target !== undefined) {
+      if (target instanceof Array) {
+        if (field in target) {
+          target[field] = null;
+        }
+      } else {
+        delete target[field];
+      }
+    }
+  },
+  $push(target, field, arg) {
+    if (target[field] === undefined) {
+      target[field] = [];
+    }
+
+    if (!(target[field] instanceof Array)) {
+      throw MinimongoError('Cannot apply $push modifier to non-array', {field});
+    }
+
+    if (!(arg && arg.$each)) {
+      // Simple mode: not $each
+      assertHasValidFieldNames(arg);
+
+      target[field].push(arg);
+
+      return;
+    }
+
+    // Fancy mode: $each (and maybe $slice and $sort and $position)
+    const toPush = arg.$each;
+    if (!(toPush instanceof Array)) {
+      throw MinimongoError('$each must be an array', {field});
+    }
+
+    assertHasValidFieldNames(toPush);
+
+    // Parse $position
+    let position = undefined;
+    if ('$position' in arg) {
+      if (typeof arg.$position !== 'number') {
+        throw MinimongoError('$position must be a numeric value', {field});
+      }
+
+      // XXX should check to make sure integer
+      if (arg.$position < 0) {
+        throw MinimongoError(
+          '$position in $push must be zero or positive',
+          {field}
+        );
+      }
+
+      position = arg.$position;
+    }
+
+    // Parse $slice.
+    let slice = undefined;
+    if ('$slice' in arg) {
+      if (typeof arg.$slice !== 'number') {
+        throw MinimongoError('$slice must be a numeric value', {field});
+      }
+
+      // XXX should check to make sure integer
+      slice = arg.$slice;
+    }
+
+    // Parse $sort.
+    let sortFunction = undefined;
+    if (arg.$sort) {
+      if (slice === undefined) {
+        throw MinimongoError('$sort requires $slice to be present', {field});
+      }
+
+      // XXX this allows us to use a $sort whose value is an array, but that's
+      // actually an extension of the Node driver, so it won't work
+      // server-side. Could be confusing!
+      // XXX is it correct that we don't do geo-stuff here?
+      sortFunction = new LocalCollection.Sorter(arg.$sort).getComparator();
+
+      toPush.forEach(element => {
+        if (LocalCollection._f._type(element) !== 3) {
+          throw MinimongoError(
+            '$push like modifiers using $sort require all elements to be ' +
+            'objects',
+            {field}
+          );
+        }
+      });
+    }
+
+    // Actually push.
+    if (position === undefined) {
+      toPush.forEach(element => {
+        target[field].push(element);
+      });
+    } else {
+      const spliceArguments = [position, 0];
+
+      toPush.forEach(element => {
+        spliceArguments.push(element);
+      });
+
+      target[field].splice(...spliceArguments);
+    }
+
+    // Actually sort.
+    if (sortFunction) {
+      target[field].sort(sortFunction);
+    }
+
+    // Actually slice.
+    if (slice !== undefined) {
+      if (slice === 0) {
+        target[field] = []; // differs from Array.slice!
+      } else if (slice < 0) {
+        target[field] = target[field].slice(slice);
+      } else {
+        target[field] = target[field].slice(0, slice);
+      }
+    }
+  },
+  $pushAll(target, field, arg) {
+    if (!(typeof arg === 'object' && arg instanceof Array)) {
+      throw MinimongoError('Modifier $pushAll/pullAll allowed for arrays only');
+    }
+
+    assertHasValidFieldNames(arg);
+
+    const toPush = target[field];
+
+    if (toPush === undefined) {
+      target[field] = arg;
+    } else if (!(toPush instanceof Array)) {
+      throw MinimongoError(
+        'Cannot apply $pushAll modifier to non-array',
+        {field}
+      );
+    } else {
+      toPush.push(...arg);
+    }
+  },
+  $addToSet(target, field, arg) {
+    let isEach = false;
+
+    if (typeof arg === 'object') {
+      // check if first key is '$each'
+      const keys = Object.keys(arg);
+      if (keys[0] === '$each') {
+        isEach = true;
+      }
+    }
+
+    const values = isEach ? arg.$each : [arg];
+
+    assertHasValidFieldNames(values);
+
+    const toAdd = target[field];
+    if (toAdd === undefined) {
+      target[field] = values;
+    } else if (!(toAdd instanceof Array)) {
+      throw MinimongoError(
+        'Cannot apply $addToSet modifier to non-array',
+        {field}
+      );
+    } else {
+      values.forEach(value => {
+        if (toAdd.some(element => LocalCollection._f._equal(value, element))) {
+          return;
+        }
+
+        toAdd.push(value);
+      });
+    }
+  },
+  $pop(target, field, arg) {
+    if (target === undefined) {
+      return;
+    }
+
+    const toPop = target[field];
+
+    if (toPop === undefined) {
+      return;
+    }
+
+    if (!(toPop instanceof Array)) {
+      throw MinimongoError('Cannot apply $pop modifier to non-array', {field});
+    }
+
+    if (typeof arg === 'number' && arg < 0) {
+      toPop.splice(0, 1);
+    } else {
+      toPop.pop();
+    }
+  },
+  $pull(target, field, arg) {
+    if (target === undefined) {
+      return;
+    }
+
+    const toPull = target[field];
+    if (toPull === undefined) {
+      return;
+    }
+
+    if (!(toPull instanceof Array)) {
+      throw MinimongoError(
+        'Cannot apply $pull/pullAll modifier to non-array',
+        {field}
+      );
+    }
+
+    let out;
+    if (arg != null && typeof arg === 'object' && !(arg instanceof Array)) {
+      // XXX would be much nicer to compile this once, rather than
+      // for each document we modify.. but usually we're not
+      // modifying that many documents, so we'll let it slide for
+      // now
+
+      // XXX Minimongo.Matcher isn't up for the job, because we need
+      // to permit stuff like {$pull: {a: {$gt: 4}}}.. something
+      // like {$gt: 4} is not normally a complete selector.
+      // same issue as $elemMatch possibly?
+      const matcher = new LocalCollection.Matcher(arg);
+
+      out = toPull.filter(element => !matcher.documentMatches(element).result);
+    } else {
+      out = toPull.filter(element => !LocalCollection._f._equal(element, arg));
+    }
+
+    target[field] = out;
+  },
+  $pullAll(target, field, arg) {
+    if (!(typeof arg === 'object' && arg instanceof Array)) {
+      throw MinimongoError(
+        'Modifier $pushAll/pullAll allowed for arrays only',
+        {field}
+      );
+    }
+
+    if (target === undefined) {
+      return;
+    }
+
+    const toPull = target[field];
+
+    if (toPull === undefined) {
+      return;
+    }
+
+    if (!(toPull instanceof Array)) {
+      throw MinimongoError(
+        'Cannot apply $pull/pullAll modifier to non-array',
+        {field}
+      );
+    }
+
+    target[field] = toPull.filter(object =>
+      !arg.some(element => LocalCollection._f._equal(object, element))
+    );
+  },
+  $bit(target, field, arg) {
+    // XXX mongo only supports $bit on integers, and we only support
+    // native javascript numbers (doubles) so far, so we can't support $bit
+    throw MinimongoError('$bit is not supported', {field});
+  },
+  $v() {
+    // As discussed in https://github.com/meteor/meteor/issues/9623,
+    // the `$v` operator is not needed by Meteor, but problems can occur if
+    // it's not at least callable (as of Mongo >= 3.6). It's defined here as
+    // a no-op to work around these problems.
+  }
+};
+
+const NO_CREATE_MODIFIERS = {
+  $pop: true,
+  $pull: true,
+  $pullAll: true,
+  $rename: true,
+  $unset: true
+};
+
+// Make sure field names do not contain Mongo restricted
+// characters ('.', '$', '\0').
+// https://docs.mongodb.com/manual/reference/limits/#Restrictions-on-Field-Names
+const invalidCharMsg = {
+  $: 'start with \'$\'',
+  '.': 'contain \'.\'',
+  '\0': 'contain null bytes'
+};
+
+// checks if all field names in an object are valid
+function assertHasValidFieldNames(doc) {
+  if (doc && typeof doc === 'object') {
+    JSON.stringify(doc, (key, value) => {
+      assertIsValidFieldName(key);
+      return value;
+    });
+  }
+}
+
+function assertIsValidFieldName(key) {
+  let match;
+  if (typeof key === 'string' && (match = key.match(/^\$|\.|\0/))) {
+    throw MinimongoError(`Key ${key} must not ${invalidCharMsg[match[0]]}`);
+  }
+}
+
+// for a.b.c.2.d.e, keyparts should be ['a', 'b', 'c', '2', 'd', 'e'],
+// and then you would operate on the 'e' property of the returned
+// object.
+//
+// if options.noCreate is falsey, creates intermediate levels of
+// structure as necessary, like mkdir -p (and raises an exception if
+// that would mean giving a non-numeric property to an array.) if
+// options.noCreate is true, return undefined instead.
+//
+// may modify the last element of keyparts to signal to the caller that it needs
+// to use a different value to index into the returned object (for example,
+// ['a', '01'] -> ['a', 1]).
+//
+// if forbidArray is true, return null if the keypath goes through an array.
+//
+// if options.arrayIndices is set, use its first element for the (first) '$' in
+// the path.
+function findModTarget(doc, keyparts, options = {}) {
+  let usedArrayIndex = false;
+
+  for (let i = 0; i < keyparts.length; i++) {
+    const last = i === keyparts.length - 1;
+    let keypart = keyparts[i];
+
+    if (!isIndexable(doc)) {
+      if (options.noCreate) {
+        return undefined;
+      }
+
+      const error = MinimongoError(
+        `cannot use the part '${keypart}' to traverse ${doc}`
+      );
+      error.setPropertyError = true;
+      throw error;
+    }
+
+    if (doc instanceof Array) {
+      if (options.forbidArray) {
+        return null;
+      }
+
+      if (keypart === '$') {
+        if (usedArrayIndex) {
+          throw MinimongoError('Too many positional (i.e. \'$\') elements');
+        }
+
+        if (!options.arrayIndices || !options.arrayIndices.length) {
+          throw MinimongoError(
+            'The positional operator did not find the match needed from the ' +
+            'query'
+          );
+        }
+
+        keypart = options.arrayIndices[0];
+        usedArrayIndex = true;
+      } else if (isNumericKey(keypart)) {
+        keypart = parseInt(keypart);
+      } else {
+        if (options.noCreate) {
+          return undefined;
+        }
+
+        throw MinimongoError(
+          `can't append to array using string field name [${keypart}]`
+        );
+      }
+
+      if (last) {
+        keyparts[i] = keypart; // handle 'a.01'
+      }
+
+      if (options.noCreate && keypart >= doc.length) {
+        return undefined;
+      }
+
+      while (doc.length < keypart) {
+        doc.push(null);
+      }
+
+      if (!last) {
+        if (doc.length === keypart) {
+          doc.push({});
+        } else if (typeof doc[keypart] !== 'object') {
+          throw MinimongoError(
+            `can't modify field '${keyparts[i + 1]}' of list value ` +
+            JSON.stringify(doc[keypart])
+          );
+        }
+      }
+    } else {
+      assertIsValidFieldName(keypart);
+
+      if (!(keypart in doc)) {
+        if (options.noCreate) {
+          return undefined;
+        }
+
+        if (!last) {
+          doc[keypart] = {};
+        }
+      }
+    }
+
+    if (last) {
+      return doc;
+    }
+
+    doc = doc[keypart];
+  }
+
+  // notreached
+}
+
+
+
+// The minimongo selector compiler!
+
+// Terminology:
+//  - a 'selector' is the EJSON object representing a selector
+//  - a 'matcher' is its compiled form (whether a full Minimongo.Matcher
+//    object or one of the component lambdas that matches parts of it)
+//  - a 'result object' is an object with a 'result' field and maybe
+//    distance and arrayIndices.
+//  - a 'branched value' is an object with a 'value' field and maybe
+//    'dontIterate' and 'arrayIndices'.
+//  - a 'document' is a top-level object that can be stored in a collection.
+//  - a 'lookup function' is a function that takes in a document and returns
+//    an array of 'branched values'.
+//  - a 'branched matcher' maps from an array of branched values to a result
+//    object.
+//  - an 'element matcher' maps from a single value to a bool.
+
+// Main entry point.
+//   var matcher = new Minimongo.Matcher({a: {$gt: 5}});
+//   if (matcher.documentMatches({a: 7})) ...
+LocalCollection.Matcher = class Matcher {
+  constructor(selector, isUpdate) {
+    // A set (object mapping string -> *) of all of the document paths looked
+    // at by the selector. Also includes the empty string if it may look at any
+    // path (eg, $where).
+    this._paths = {};
+    // Set to true if compilation finds a $near.
+    this._hasGeoQuery = false;
+    // Set to true if compilation finds a $where.
+    this._hasWhere = false;
+    // Set to false if compilation finds anything other than a simple equality
+    // or one or more of '$gt', '$gte', '$lt', '$lte', '$ne', '$in', '$nin' used
+    // with scalars as operands.
+    this._isSimple = true;
+    // Set to a dummy document which always matches this Matcher. Or set to null
+    // if such document is too hard to find.
+    this._matchingDocument = undefined;
+    // A clone of the original selector. It may just be a function if the user
+    // passed in a function; otherwise is definitely an object (eg, IDs are
+    // translated into {_id: ID} first. Used by canBecomeTrueByModifier and
+    // Sorter._useWithMatcher.
+    this._selector = null;
+    this._docMatcher = this._compileSelector(selector);
+    // Set to true if selection is done for an update operation
+    // Default is false
+    // Used for $near array update (issue #3599)
+    this._isUpdate = isUpdate;
+  }
+
+  documentMatches(doc) {
+    if (doc !== Object(doc)) {
+      throw Error('documentMatches needs a document');
+    }
+
+    return this._docMatcher(doc);
+  }
+
+  hasGeoQuery() {
+    return this._hasGeoQuery;
+  }
+
+  hasWhere() {
+    return this._hasWhere;
+  }
+
+  isSimple() {
+    return this._isSimple;
+  }
+
+  // Given a selector, return a function that takes one argument, a
+  // document. It returns a result object.
+  _compileSelector(selector) {
+    // you can pass a literal function instead of a selector
+    if (selector instanceof Function) {
+      this._isSimple = false;
+      this._selector = selector;
+      this._recordPathUsed('');
+
+      return doc => ({result: !!selector.call(doc)});
+    }
+
+    // shorthand -- scalar _id
+    if (LocalCollection._selectorIsId(selector)) {
+      this._selector = {_id: selector};
+      this._recordPathUsed('_id');
+
+      return doc => ({result: EJSON.equals(doc._id, selector)});
+    }
+
+    // protect against dangerous selectors.  falsey and {_id: falsey} are both
+    // likely programmer error, and not what you want, particularly for
+    // destructive operations.
+    if (!selector || hasOwn.call(selector, '_id') && !selector._id) {
+      this._isSimple = false;
+      return nothingMatcher;
+    }
+
+    // Top level can't be an array or true or binary.
+    if (Array.isArray(selector) ||
+        EJSON.isBinary(selector) ||
+        typeof selector === 'boolean') {
+      throw new Error(`Invalid selector: ${selector}`);
+    }
+
+    this._selector = EJSON.clone(selector);
+
+    return compileDocumentSelector(selector, this, {isRoot: true});
+  }
+
+  // Returns a list of key paths the given selector is looking for. It includes
+  // the empty string if there is a $where.
+  _getPaths() {
+    return Object.keys(this._paths);
+  }
+
+  _recordPathUsed(path) {
+    this._paths[path] = true;
+  }
+}
+
+// helpers used by compiled selector code
+LocalCollection._f = bigBlobF
+
+
+  // Give a sort spec, which can be in any of these forms:
+  //   {"key1": 1, "key2": -1}
+  //   [["key1", "asc"], ["key2", "desc"]]
+  //   ["key1", ["key2", "desc"]]
+  //
+  // (.. with the first form being dependent on the key enumeration
+  // behavior of your javascript VM, which usually does what you mean in
+  // this case if the key names don't look like integers ..)
+  //
+  // return a function that takes two objects, and returns -1 if the
+  // first object comes first in order, 1 if the second object comes
+  // first, or 0 if neither object comes before the other.
+  
+  LocalCollection.Sorter = class Sorter {
+    constructor(spec) {
+      this._sortSpecParts = [];
+      this._sortFunction = null;
+  
+      const addSpecPart = (path, ascending) => {
+        if (!path) {
+          throw Error('sort keys must be non-empty');
+        }
+  
+        if (path.charAt(0) === '$') {
+          throw Error(`unsupported sort key: ${path}`);
+        }
+  
+        this._sortSpecParts.push({
+          ascending,
+          lookup: makeLookupFunction(path, {forSort: true}),
+          path
+        });
+      };
+  
+      if (spec instanceof Array) {
+        spec.forEach(element => {
+          if (typeof element === 'string') {
+            addSpecPart(element, true);
+          } else {
+            addSpecPart(element[0], element[1] !== 'desc');
+          }
+        });
+      } else if (typeof spec === 'object') {
+        Object.keys(spec).forEach(key => {
+          addSpecPart(key, spec[key] >= 0);
+        });
+      } else if (typeof spec === 'function') {
+        this._sortFunction = spec;
+      } else {
+        throw Error(`Bad sort specification: ${JSON.stringify(spec)}`);
+      }
+  
+      // If a function is specified for sorting, we skip the rest.
+      if (this._sortFunction) {
+        return;
+      }
+  
+      // To implement affectedByModifier, we piggy-back on top of Matcher's
+      // affectedByModifier code; we create a selector that is affected by the
+      // same modifiers as this sort order. This is only implemented on the
+      // server.
+      if (this.affectedByModifier) {
+        const selector = {};
+  
+        this._sortSpecParts.forEach(spec => {
+          selector[spec.path] = 1;
+        });
+  
+        this._selectorForAffectedByModifier = new LocalCollection.Matcher(selector);
+      }
+  
+      this._keyComparator = composeComparators(
+        this._sortSpecParts.map((spec, i) => this._keyFieldComparator(i))
+      );
+    }
+  
+    getComparator(options) {
+      // If sort is specified or have no distances, just use the comparator from
+      // the source specification (which defaults to "everything is equal".
+      // issue #3599
+      // https://docs.mongodb.com/manual/reference/operator/query/near/#sort-operation
+      // sort effectively overrides $near
+      if (this._sortSpecParts.length || !options || !options.distances) {
+        return this._getBaseComparator();
+      }
+  
+      const distances = options.distances;
+  
+      // Return a comparator which compares using $near distances.
+      return (a, b) => {
+        if (!distances.has(a._id)) {
+          throw Error(`Missing distance for ${a._id}`);
+        }
+  
+        if (!distances.has(b._id)) {
+          throw Error(`Missing distance for ${b._id}`);
+        }
+  
+        return distances.get(a._id) - distances.get(b._id);
+      };
+    }
+  
+    // Takes in two keys: arrays whose lengths match the number of spec
+    // parts. Returns negative, 0, or positive based on using the sort spec to
+    // compare fields.
+    _compareKeys(key1, key2) {
+      if (key1.length !== this._sortSpecParts.length ||
+          key2.length !== this._sortSpecParts.length) {
+        throw Error('Key has wrong length');
+      }
+  
+      return this._keyComparator(key1, key2);
+    }
+  
+    // Iterates over each possible "key" from doc (ie, over each branch), calling
+    // 'cb' with the key.
+    _generateKeysFromDoc(doc, cb) {
+      if (this._sortSpecParts.length === 0) {
+        throw new Error('can\'t generate keys without a spec');
+      }
+  
+      const pathFromIndices = indices => `${indices.join(',')},`;
+  
+      let knownPaths = null;
+  
+      // maps index -> ({'' -> value} or {path -> value})
+      const valuesByIndexAndPath = this._sortSpecParts.map(spec => {
+        // Expand any leaf arrays that we find, and ignore those arrays
+        // themselves.  (We never sort based on an array itself.)
+        let branches = expandArraysInBranches(spec.lookup(doc), true);
+  
+        // If there are no values for a key (eg, key goes to an empty array),
+        // pretend we found one undefined value.
+        if (!branches.length) {
+          branches = [{ value: void 0 }];
+        }
+  
+        const element = Object.create(null);
+        let usedPaths = false;
+  
+        branches.forEach(branch => {
+          if (!branch.arrayIndices) {
+            // If there are no array indices for a branch, then it must be the
+            // only branch, because the only thing that produces multiple branches
+            // is the use of arrays.
+            if (branches.length > 1) {
+              throw Error('multiple branches but no array used?');
+            }
+  
+            element[''] = branch.value;
+            return;
+          }
+  
+          usedPaths = true;
+  
+          const path = pathFromIndices(branch.arrayIndices);
+  
+          if (hasOwn.call(element, path)) {
+            throw Error(`duplicate path: ${path}`);
+          }
+  
+          element[path] = branch.value;
+  
+          // If two sort fields both go into arrays, they have to go into the
+          // exact same arrays and we have to find the same paths.  This is
+          // roughly the same condition that makes MongoDB throw this strange
+          // error message.  eg, the main thing is that if sort spec is {a: 1,
+          // b:1} then a and b cannot both be arrays.
+          //
+          // (In MongoDB it seems to be OK to have {a: 1, 'a.x.y': 1} where 'a'
+          // and 'a.x.y' are both arrays, but we don't allow this for now.
+          // #NestedArraySort
+          // XXX achieve full compatibility here
+          if (knownPaths && !hasOwn.call(knownPaths, path)) {
+            throw Error('cannot index parallel arrays');
+          }
+        });
+  
+        if (knownPaths) {
+          // Similarly to above, paths must match everywhere, unless this is a
+          // non-array field.
+          if (!hasOwn.call(element, '') &&
+              Object.keys(knownPaths).length !== Object.keys(element).length) {
+            throw Error('cannot index parallel arrays!');
+          }
+        } else if (usedPaths) {
+          knownPaths = {};
+  
+          Object.keys(element).forEach(path => {
+            knownPaths[path] = true;
+          });
+        }
+  
+        return element;
+      });
+  
+      if (!knownPaths) {
+        // Easy case: no use of arrays.
+        const soleKey = valuesByIndexAndPath.map(values => {
+          if (!hasOwn.call(values, '')) {
+            throw Error('no value in sole key case?');
+          }
+  
+          return values[''];
+        });
+  
+        cb(soleKey);
+  
+        return;
+      }
+  
+      Object.keys(knownPaths).forEach(path => {
+        const key = valuesByIndexAndPath.map(values => {
+          if (hasOwn.call(values, '')) {
+            return values[''];
+          }
+  
+          if (!hasOwn.call(values, path)) {
+            throw Error('missing path?');
+          }
+  
+          return values[path];
+        });
+  
+        cb(key);
+      });
+    }
+  
+    // Returns a comparator that represents the sort specification (but not
+    // including a possible geoquery distance tie-breaker).
+    _getBaseComparator() {
+      if (this._sortFunction) {
+        return this._sortFunction;
+      }
+  
+      // If we're only sorting on geoquery distance and no specs, just say
+      // everything is equal.
+      if (!this._sortSpecParts.length) {
+        return (doc1, doc2) => 0;
+      }
+  
+      return (doc1, doc2) => {
+        const key1 = this._getMinKeyFromDoc(doc1);
+        const key2 = this._getMinKeyFromDoc(doc2);
+        return this._compareKeys(key1, key2);
+      };
+    }
+  
+    // Finds the minimum key from the doc, according to the sort specs.  (We say
+    // "minimum" here but this is with respect to the sort spec, so "descending"
+    // sort fields mean we're finding the max for that field.)
+    //
+    // Note that this is NOT "find the minimum value of the first field, the
+    // minimum value of the second field, etc"... it's "choose the
+    // lexicographically minimum value of the key vector, allowing only keys which
+    // you can find along the same paths".  ie, for a doc {a: [{x: 0, y: 5}, {x:
+    // 1, y: 3}]} with sort spec {'a.x': 1, 'a.y': 1}, the only keys are [0,5] and
+    // [1,3], and the minimum key is [0,5]; notably, [0,3] is NOT a key.
+    _getMinKeyFromDoc(doc) {
+      let minKey = null;
+  
+      this._generateKeysFromDoc(doc, key => {
+        if (minKey === null) {
+          minKey = key;
+          return;
+        }
+  
+        if (this._compareKeys(key, minKey) < 0) {
+          minKey = key;
+        }
+      });
+  
+      return minKey;
+    }
+  
+    _getPaths() {
+      return this._sortSpecParts.map(part => part.path);
+    }
+  
+    // Given an index 'i', returns a comparator that compares two key arrays based
+    // on field 'i'.
+    _keyFieldComparator(i) {
+      const invert = !this._sortSpecParts[i].ascending;
+  
+      return (key1, key2) => {
+        const compare = LocalCollection._f._cmp(key1[i], key2[i]);
+        return invert ? -compare : compare;
+      };
+    }
+  }
+  
+  // Given an array of comparators
+  // (functions (a,b)->(negative or positive or zero)), returns a single
+  // comparator which uses each comparator in order and returns the first
+  // non-zero value.
+  function composeComparators(comparatorArray) {
+    return (a, b) => {
+      for (let i = 0; i < comparatorArray.length; ++i) {
+        const compare = comparatorArray[i](a, b);
+        if (compare !== 0) {
+          return compare;
+        }
+      }
+  
+      return 0;
+    };
+  }
+
+
+
+// Cursor: a specification for a particular subset of documents, w/ a defined
+// order, limit, and offset.  creating a Cursor with LocalCollection.find(),
+LocalCollection.Cursor = class Cursor {
+  // don't call this ctor directly.  use LocalCollection.find().
+  constructor(collection, selector, options = {}) {
+    this.collection = collection;
+    this.sorter = null;
+    this.matcher = new LocalCollection.Matcher(selector);
+
+    if (LocalCollection._selectorIsIdPerhapsAsObject(selector)) {
+      // stash for fast _id and { _id }
+      this._selectorId = hasOwn.call(selector, '_id')
+        ? selector._id
+        : selector;
+    } else {
+      this._selectorId = undefined;
+
+      if (this.matcher.hasGeoQuery() || options.sort) {
+        this.sorter = new LocalCollection.Sorter(options.sort || []);
+      }
+    }
+
+    this.skip = options.skip || 0;
+    this.limit = options.limit;
+    this.fields = options.projection || options.fields;
+
+    this._projectionFn = LocalCollection._compileProjection(this.fields || {});
+
+    // by default, queries register w/ Tracker when it is available.
+    if (typeof Tracker !== 'undefined') {
+      this.reactive = options.reactive === undefined ? true : options.reactive;
+    }
+  }
+
+  /**
+   * @summary Returns the number of documents that match a query.
+   * @memberOf Mongo.Cursor
+   * @method  count
+   * @instance
+   * @locus Anywhere
+   * @returns {Number}
+   */
+  count() {
+    if (this.reactive) {
+      // allow the observe to be unordered
+      this._depend({added: true, removed: true}, true);
+    }
+
+    return this._getRawObjects({
+      ordered: true,
+    }).length;
+  }
+
+  /**
+   * @summary Return all matching documents as an Array.
+   * @memberOf Mongo.Cursor
+   * @method  fetch
+   * @instance
+   * @locus Anywhere
+   * @returns {Object[]}
+   */
+  fetch() {
+    const result = [];
+
+    this.forEach(doc => {
+      result.push(doc);
+    });
+
+    return result;
+  }
+
+  [Symbol.iterator]() {
+    if (this.reactive) {
+      this._depend({
+        addedBefore: true,
+        removed: true,
+        changed: true,
+        movedBefore: true});
+    }
+
+    let index = 0;
+    const objects = this._getRawObjects({ordered: true});
+
+    return {
+      next: () => {
+        if (index < objects.length) {
+          // This doubles as a clone operation.
+          let element = this._projectionFn(objects[index++]);
+
+          return {value: element};
+        }
+
+        return {done: true};
+      }
+    };
+  }
+
+  /**
+   * @callback IterationCallback
+   * @param {Object} doc
+   * @param {Number} index
+   */
+  /**
+   * @summary Call `callback` once for each matching document, sequentially and
+   *          synchronously.
+   * @locus Anywhere
+   * @method  forEach
+   * @instance
+   * @memberOf Mongo.Cursor
+   * @param {IterationCallback} callback Function to call. It will be called
+   *                                     with three arguments: the document, a
+   *                                     0-based index, and <em>cursor</em>
+   *                                     itself.
+   * @param {Any} [thisArg] An object which will be the value of `this` inside
+   *                        `callback`.
+   */
+  forEach(callback, thisArg) {
+    if (this.reactive) {
+      this._depend({
+        addedBefore: true,
+        removed: true,
+        changed: true,
+        movedBefore: true});
+    }
+
+    this._getRawObjects({ordered: true}).forEach((element, i) => {
+      // This doubles as a clone operation.
+      element = this._projectionFn(element);
+
+      callback.call(thisArg, element, i, this);
+    });
+  }
+
+  /**
+   * @summary Map callback over all matching documents.  Returns an Array.
+   * @locus Anywhere
+   * @method map
+   * @instance
+   * @memberOf Mongo.Cursor
+   * @param {IterationCallback} callback Function to call. It will be called
+   *                                     with three arguments: the document, a
+   *                                     0-based index, and <em>cursor</em>
+   *                                     itself.
+   * @param {Any} [thisArg] An object which will be the value of `this` inside
+   *                        `callback`.
+   */
+  map(callback, thisArg) {
+    const result = [];
+
+    this.forEach((doc, i) => {
+      result.push(callback.call(thisArg, doc, i, this));
+    });
+
+    return result;
+  }
+
+  // options to contain:
+  //  * callbacks for observe():
+  //    - addedAt (document, atIndex)
+  //    - added (document)
+  //    - changedAt (newDocument, oldDocument, atIndex)
+  //    - changed (newDocument, oldDocument)
+  //    - removedAt (document, atIndex)
+  //    - removed (document)
+  //    - movedTo (document, oldIndex, newIndex)
+  //
+  // attributes available on returned query handle:
+  //  * stop(): end updates
+  //  * collection: the collection this query is querying
+  //
+  // iff x is a returned query handle, (x instanceof
+  // LocalCollection.ObserveHandle) is true
+  //
+  // initial results delivered through added callback
+  // XXX maybe callbacks should take a list of objects, to expose transactions?
+  // XXX maybe support field limiting (to limit what you're notified on)
+
+  /**
+   * @summary Watch a query.  Receive callbacks as the result set changes.
+   * @locus Anywhere
+   * @memberOf Mongo.Cursor
+   * @instance
+   * @param {Object} callbacks Functions to call to deliver the result set as it
+   *                           changes
+   */
+  observe(options) {
+    return LocalCollection._observeFromObserveChanges(this, options);
+  }
+
+  /**
+   * @summary Watch a query. Receive callbacks as the result set changes. Only
+   *          the differences between the old and new documents are passed to
+   *          the callbacks.
+   * @locus Anywhere
+   * @memberOf Mongo.Cursor
+   * @instance
+   * @param {Object} callbacks Functions to call to deliver the result set as it
+   *                           changes
+   */
+  observeChanges(options) {
+    const ordered = LocalCollection._observeChangesCallbacksAreOrdered(options);
+
+    // there are several places that assume you aren't combining skip/limit with
+    // unordered observe.  eg, update's EJSON.clone, and the "there are several"
+    // comment in _modifyAndNotify
+    // XXX allow skip/limit with unordered observe
+    if (!options._allow_unordered && !ordered && (this.skip || this.limit)) {
+      throw new Error(
+        "Must use an ordered observe with skip or limit (i.e. 'addedBefore' " +
+        "for observeChanges or 'addedAt' for observe, instead of 'added')."
+      );
+    }
+
+    if (this.fields && (this.fields._id === 0 || this.fields._id === false)) {
+      throw Error('You may not observe a cursor with {fields: {_id: 0}}');
+    }
+
+    const distances = (
+      this.matcher.hasGeoQuery() &&
+      ordered &&
+      new LocalCollection._IdMap
+    );
+
+    const query = {
+      cursor: this,
+      dirty: false,
+      distances,
+      matcher: this.matcher, // not fast pathed
+      ordered,
+      projectionFn: this._projectionFn,
+      resultsSnapshot: null,
+      sorter: ordered && this.sorter
+    };
+
+    let qid;
+
+    // Non-reactive queries call added[Before] and then never call anything
+    // else.
+    if (this.reactive) {
+      qid = this.collection.next_qid++;
+      this.collection.queries[qid] = query;
+    }
+
+    query.results = this._getRawObjects({ordered, distances: query.distances});
+
+    if (this.collection.paused) {
+      query.resultsSnapshot = ordered ? [] : new LocalCollection._IdMap;
+    }
+
+    // wrap callbacks we were passed. callbacks only fire when not paused and
+    // are never undefined
+    // Filters out blacklisted fields according to cursor's projection.
+    // XXX wrong place for this?
+
+    // furthermore, callbacks enqueue until the operation we're working on is
+    // done.
+    const wrapCallback = fn => {
+      if (!fn) {
+        return () => {};
+      }
+
+      const self = this;
+      return function(/* args*/) {
+        if (self.collection.paused) {
+          return;
+        }
+
+        const args = arguments;
+
+        self.collection._observeQueue.queueTask(() => {
+          fn.apply(this, args);
+        });
+      };
+    };
+
+    query.added = wrapCallback(options.added);
+    query.changed = wrapCallback(options.changed);
+    query.removed = wrapCallback(options.removed);
+
+    if (ordered) {
+      query.addedBefore = wrapCallback(options.addedBefore);
+      query.movedBefore = wrapCallback(options.movedBefore);
+    }
+
+    if (!options._suppress_initial && !this.collection.paused) {
+      query.results.forEach(doc => {
+        const fields = EJSON.clone(doc);
+
+        delete fields._id;
+
+        if (ordered) {
+          query.addedBefore(doc._id, this._projectionFn(fields), null);
+        }
+
+        query.added(doc._id, this._projectionFn(fields));
+      });
+    }
+
+    const handle = Object.assign(new LocalCollection.ObserveHandle, {
+      collection: this.collection,
+      stop: () => {
+        if (this.reactive) {
+          delete this.collection.queries[qid];
+        }
+      }
+    });
+
+    if (this.reactive && Tracker.active) {
+      // XXX in many cases, the same observe will be recreated when
+      // the current autorun is rerun.  we could save work by
+      // letting it linger across rerun and potentially get
+      // repurposed if the same observe is performed, using logic
+      // similar to that of Meteor.subscribe.
+      Tracker.onInvalidate(() => {
+        handle.stop();
+      });
+    }
+
+    // run the observe callbacks resulting from the initial contents
+    // before we leave the observe.
+    this.collection._observeQueue.drain();
+
+    return handle;
+  }
+
+  // XXX Maybe we need a version of observe that just calls a callback if
+  // anything changed.
+  _depend(changers, _allow_unordered) {
+    if (Tracker.active) {
+      const dependency = new Tracker.Dependency;
+      const notify = dependency.changed.bind(dependency);
+
+      dependency.depend();
+
+      const options = {_allow_unordered, _suppress_initial: true};
+
+      ['added', 'addedBefore', 'changed', 'movedBefore', 'removed']
+        .forEach(fn => {
+          if (changers[fn]) {
+            options[fn] = notify;
+          }
+        });
+
+      // observeChanges will stop() when this computation is invalidated
+      this.observeChanges(options);
+    }
+  }
+
+  _getCollectionName() {
+    return this.collection.name;
+  }
+
+  // Returns a collection of matching objects, but doesn't deep copy them.
+  //
+  // If ordered is set, returns a sorted array, respecting sorter, skip, and
+  // limit properties of the query provided that options.applySkipLimit is
+  // not set to false (#1201). If sorter is falsey, no sort -- you get the
+  // natural order.
+  //
+  // If ordered is not set, returns an object mapping from ID to doc (sorter,
+  // skip and limit should not be set).
+  //
+  // If ordered is set and this cursor is a $near geoquery, then this function
+  // will use an _IdMap to track each distance from the $near argument point in
+  // order to use it as a sort key. If an _IdMap is passed in the 'distances'
+  // argument, this function will clear it and use it for this purpose
+  // (otherwise it will just create its own _IdMap). The observeChanges
+  // implementation uses this to remember the distances after this function
+  // returns.
+  _getRawObjects(options = {}) {
+    // By default this method will respect skip and limit because .fetch(),
+    // .forEach() etc... expect this behaviour. It can be forced to ignore
+    // skip and limit by setting applySkipLimit to false (.count() does this,
+    // for example)
+    const applySkipLimit = options.applySkipLimit !== false;
+
+    // XXX use OrderedDict instead of array, and make IdMap and OrderedDict
+    // compatible
+    const results = options.ordered ? [] : new LocalCollection._IdMap;
+
+    // fast path for single ID value
+    if (this._selectorId !== undefined) {
+      // If you have non-zero skip and ask for a single id, you get nothing.
+      // This is so it matches the behavior of the '{_id: foo}' path.
+      if (applySkipLimit && this.skip) {
+        return results;
+      }
+
+      const selectedDoc = this.collection._docs.get(this._selectorId);
+
+      if (selectedDoc) {
+        if (options.ordered) {
+          results.push(selectedDoc);
+        } else {
+          results.set(this._selectorId, selectedDoc);
+        }
+      }
+
+      return results;
+    }
+
+    // slow path for arbitrary selector, sort, skip, limit
+
+    // in the observeChanges case, distances is actually part of the "query"
+    // (ie, live results set) object.  in other cases, distances is only used
+    // inside this function.
+    let distances;
+    if (this.matcher.hasGeoQuery() && options.ordered) {
+      if (options.distances) {
+        distances = options.distances;
+        distances.clear();
+      } else {
+        distances = new LocalCollection._IdMap();
+      }
+    }
+
+    this.collection._docs.forEach((doc, id) => {
+      const matchResult = this.matcher.documentMatches(doc);
+
+      if (matchResult.result) {
+        if (options.ordered) {
+          results.push(doc);
+
+          if (distances && matchResult.distance !== undefined) {
+            distances.set(id, matchResult.distance);
+          }
+        } else {
+          results.set(id, doc);
+        }
+      }
+
+      // Override to ensure all docs are matched if ignoring skip & limit
+      if (!applySkipLimit) {
+        return true;
+      }
+
+      // Fast path for limited unsorted queries.
+      // XXX 'length' check here seems wrong for ordered
+      return (
+        !this.limit ||
+        this.skip ||
+        this.sorter ||
+        results.length !== this.limit
+      );
+    });
+
+    if (!options.ordered) {
+      return results;
+    }
+
+    if (this.sorter) {
+      results.sort(this.sorter.getComparator({distances}));
+    }
+
+    // Return the full set of results if there is no skip or limit or if we're
+    // ignoring them
+    if (!applySkipLimit || (!this.limit && !this.skip)) {
+      return results;
+    }
+
+    return results.slice(
+      this.skip,
+      this.limit ? this.limit + this.skip : results.length
+    );
+  }
+}
\ No newline at end of file
diff --git a/packages/webui/src/meteor/minimongo/observe_handle.js b/packages/webui/src/meteor/minimongo/observe_handle.js
new file mode 100644
index 0000000000..d8580f93a9
--- /dev/null
+++ b/packages/webui/src/meteor/minimongo/observe_handle.js
@@ -0,0 +1,2 @@
+// ObserveHandle: the return value of a live query.
+export default class ObserveHandle {}
\ No newline at end of file
diff --git a/packages/webui/src/meteor/mongo-id.js b/packages/webui/src/meteor/mongo-id.js
new file mode 100644
index 0000000000..6af26c9374
--- /dev/null
+++ b/packages/webui/src/meteor/mongo-id.js
@@ -0,0 +1,39 @@
+const MongoID = {};
+
+MongoID.idStringify = (id) => {
+  if (typeof id === 'string') {
+    var firstChar = id.charAt(0);
+    if (id === '') {
+      return id;
+    } else if (firstChar === '-' || // escape previously dashed strings
+               firstChar === '~' || // escape escaped numbers, true, false
+               firstChar === '{') { // escape object-form strings, for maybe implementing later
+      return `-${id}`;
+    } else {
+      return id; // other strings go through unchanged.
+    }
+  } else if (id === undefined) {
+    return '-';
+  } else if (typeof id === 'object' && id !== null) {
+    throw new Error('Meteor does not currently support objects other than ObjectID as ids');
+  } else { // Numbers, true, false, null
+    return `~${JSON.stringify(id)}`;
+  }
+};
+
+MongoID.idParse = (id) => {
+  var firstChar = id.charAt(0);
+  if (id === '') {
+    return id;
+  } else if (id === '-') {
+    return undefined;
+  } else if (firstChar === '-') {
+    return id.substr(1);
+  } else if (firstChar === '~') {
+    return JSON.parse(id.substr(1));
+  } else {
+    return id;
+  }
+};
+
+export { MongoID };
\ No newline at end of file
diff --git a/packages/webui/src/meteor/mongo/index.d.ts b/packages/webui/src/meteor/mongo/index.d.ts
new file mode 100644
index 0000000000..fbf488e2ab
--- /dev/null
+++ b/packages/webui/src/meteor/mongo/index.d.ts
@@ -0,0 +1,469 @@
+import * as MongoNpmModule from 'mongodb';
+// tslint:disable-next-line:no-duplicate-imports
+import { Collection as MongoCollection, CreateIndexesOptions, Db as MongoDb, Hint, IndexSpecification, MongoClient } from 'mongodb';
+import { Meteor } from '../meteor';
+
+    // Based on https://github.com/microsoft/TypeScript/issues/28791#issuecomment-443520161
+    type UnionOmit<T, K extends keyof any> = T extends T ? Pick<T, Exclude<keyof T, K>> : never;
+
+export     namespace Mongo {
+        // prettier-ignore
+        type BsonType = 1 | "double" |
+            2 | "string" |
+            3 | "object" |
+            4 | "array" |
+            5 | "binData" |
+            6 | "undefined" |
+            7 | "objectId" |
+            8 | "bool" |
+            9 | "date" |
+            10 | "null" |
+            11 | "regex" |
+            12 | "dbPointer" |
+            13 | "javascript" |
+            14 | "symbol" |
+            15 | "javascriptWithScope" |
+            16 | "int" |
+            17 | "timestamp" |
+            18 | "long" |
+            19 | "decimal" |
+            -1 | "minKey" |
+            127 | "maxKey" | "number";
+
+        type FieldExpression<T> = {
+            $eq?: T | undefined;
+            $gt?: T | undefined;
+            $gte?: T | undefined;
+            $lt?: T | undefined;
+            $lte?: T | undefined;
+            $in?: T[] | undefined;
+            $nin?: T[] | undefined;
+            $ne?: T | undefined;
+            $exists?: boolean | undefined;
+            $type?: BsonType[] | BsonType | undefined;
+            $not?: FieldExpression<T> | undefined;
+            $expr?: FieldExpression<T> | undefined;
+            $jsonSchema?: any;
+            $mod?: number[] | undefined;
+            $regex?: RegExp | string | undefined;
+            $options?: string | undefined;
+            $text?:
+                | {
+                      $search: string;
+                      $language?: string | undefined;
+                      $caseSensitive?: boolean | undefined;
+                      $diacriticSensitive?: boolean | undefined;
+                  }
+                | undefined;
+            $where?: string | Function | undefined;
+            $geoIntersects?: any;
+            $geoWithin?: any;
+            $near?: any;
+            $nearSphere?: any;
+            $all?: T[] | undefined;
+            $elemMatch?: T extends {} ? Query<T> : FieldExpression<T> | undefined;
+            $size?: number | undefined;
+            $bitsAllClear?: any;
+            $bitsAllSet?: any;
+            $bitsAnyClear?: any;
+            $bitsAnySet?: any;
+            $comment?: string | undefined;
+        };
+
+        type Flatten<T> = T extends any[] ? T[0] : T;
+
+        type Query<T> = { [P in keyof T]?: Flatten<T[P]> | RegExp | FieldExpression<Flatten<T[P]>> } & {
+            $or?: Query<T>[] | undefined;
+            $and?: Query<T>[] | undefined;
+            $nor?: Query<T>[] | undefined;
+        } & Dictionary<any>;
+
+        type QueryWithModifiers<T> = {
+            $query: Query<T>;
+            $comment?: string | undefined;
+            $explain?: any;
+            $hint?: Hint;
+            $maxScan?: any;
+            $max?: any;
+            $maxTimeMS?: any;
+            $min?: any;
+            $orderby?: any;
+            $returnKey?: any;
+            $showDiskLoc?: any;
+            $natural?: any;
+        };
+
+        type Selector<T> = Query<T> | QueryWithModifiers<T>;
+
+        type Dictionary<T> = { [key: string]: T };
+        type PartialMapTo<T, M> = Partial<Record<keyof T, M>>;
+        type OnlyArrays<T> = T extends any[] ? T : never;
+        type OnlyElementsOfArrays<T> = T extends any[] ? Partial<T[0]> : never;
+        type ElementsOf<T> = {
+            [P in keyof T]?: OnlyElementsOfArrays<T[P]>;
+        };
+        type PushModifier<T> = {
+            [P in keyof T]?:
+                | OnlyElementsOfArrays<T[P]>
+                | {
+                      $each?: T[P] | undefined;
+                      $position?: number | undefined;
+                      $slice?: number | undefined;
+                      $sort?: 1 | -1 | Dictionary<number> | undefined;
+                  };
+        };
+        type ArraysOrEach<T> = {
+            [P in keyof T]?: OnlyElementsOfArrays<T[P]> | { $each: T[P] };
+        };
+        type CurrentDateModifier = { $type: 'timestamp' | 'date' } | true;
+        type Modifier<T> =
+            | T
+            | {
+                  $currentDate?:
+                      | (Partial<Record<keyof T, CurrentDateModifier>> & Dictionary<CurrentDateModifier>)
+                      | undefined;
+                  $inc?: (PartialMapTo<T, number> & Dictionary<number>) | undefined;
+                  $min?: (PartialMapTo<T, Date | number> & Dictionary<Date | number>) | undefined;
+                  $max?: (PartialMapTo<T, Date | number> & Dictionary<Date | number>) | undefined;
+                  $mul?: (PartialMapTo<T, number> & Dictionary<number>) | undefined;
+                  $rename?: (PartialMapTo<T, string> & Dictionary<string>) | undefined;
+                  $set?: (Partial<T> & Dictionary<any>) | undefined;
+                  $setOnInsert?: (Partial<T> & Dictionary<any>) | undefined;
+                  $unset?: (PartialMapTo<T, string | boolean | 1 | 0> & Dictionary<any>) | undefined;
+                  $addToSet?: (ArraysOrEach<T> & Dictionary<any>) | undefined;
+                  $push?: (PushModifier<T> & Dictionary<any>) | undefined;
+                  $pull?: (ElementsOf<T> & Dictionary<any>) | undefined;
+                  $pullAll?: (Partial<T> & Dictionary<any>) | undefined;
+                  $pop?: (PartialMapTo<T, 1 | -1> & Dictionary<1 | -1>) | undefined;
+              };
+
+        type OptionalId<TSchema> = UnionOmit<TSchema, '_id'> & { _id?: any };
+
+        interface SortSpecifier {}
+        interface FieldSpecifier {
+            [id: string]: Number;
+        }
+
+        type Transform<T> = ((doc: T) => any) | null | undefined;
+
+        type Options<T> = {
+            /** Sort order (default: natural order) */
+            sort?: SortSpecifier | undefined;
+            /** Number of results to skip at the beginning */
+            skip?: number | undefined;
+            /** Maximum number of results to return */
+            limit?: number | undefined;
+            /** Dictionary of fields to return or exclude. */
+            fields?: FieldSpecifier | undefined;
+            /** (Server only) Overrides MongoDB's default index selection and query optimization process. Specify an index to force its use, either by its name or index specification. */
+            hint?: Hint | undefined;
+            /** (Client only) Default `true`; pass `false` to disable reactivity */
+            reactive?: boolean | undefined;
+        };
+
+        var Collection: CollectionStatic;
+        interface CollectionStatic {
+            /**
+             * Constructor for a Collection
+             * @param name The name of the collection. If null, creates an unmanaged (unsynchronized) local collection.
+             */
+            new <T extends MongoNpmModule.Document>(
+                name: string | null,
+                options?: {
+                    /**
+                     * The server connection that will manage this collection. Uses the default connection if not specified. Pass the return value of calling `DDP.connect` to specify a different
+                     * server. Pass `null` to specify no connection. Unmanaged (`name` is null) collections cannot specify a connection.
+                     */
+                    connection?: Object | null | undefined;
+                },
+            ): Collection<T>;
+        }
+        interface Collection<T extends MongoNpmModule.Document> {
+            createCappedCollectionAsync(byteSize?: number, maxDocuments?: number): Promise<void>;
+            createIndex(indexSpec: IndexSpecification, options?: CreateIndexesOptions): void;
+            createIndexAsync(indexSpec: IndexSpecification, options?: CreateIndexesOptions): Promise<void>;
+            dropCollectionAsync(): Promise<void>;
+            dropIndexAsync(indexName: string): void;
+            /**
+             * Find the documents in a collection that match the selector.
+             * @param selector A query describing the documents to find
+             */
+            find(selector?: Selector<T> | ObjectID | string): Cursor<T>;
+            /**
+             * Find the documents in a collection that match the selector.
+             * @param selector A query describing the documents to find
+             */
+            find<O extends Options<T>>(
+                selector?: Selector<T> | ObjectID | string,
+                options?: O,
+            ): Cursor<T>;
+            /**
+             * Finds the first document that matches the selector, as ordered by sort and skip options. Returns `undefined` if no matching document is found.
+             * @param selector A query describing the documents to find
+             */
+            findOne(selector?: Selector<T> | ObjectID | string): T | undefined;
+            /**
+             * Finds the first document that matches the selector, as ordered by sort and skip options. Returns `undefined` if no matching document is found.
+             * @param selector A query describing the documents to find
+             */
+            findOne<O extends Omit<Options<T>, 'limit'>>(
+                selector?: Selector<T> | ObjectID | string,
+                options?: O,
+            ): T | undefined;
+            /**
+             * Finds the first document that matches the selector, as ordered by sort and skip options. Returns `undefined` if no matching document is found.
+             * @param selector A query describing the documents to find
+             */
+            findOneAsync(selector?: Selector<T> | ObjectID | string): Promise<T | undefined>;
+            /**
+             * Finds the first document that matches the selector, as ordered by sort and skip options. Returns `undefined` if no matching document is found.
+             * @param selector A query describing the documents to find
+             */
+            findOneAsync<O extends Omit<Options<T>, 'limit'>>(
+                selector?: Selector<T> | ObjectID | string,
+                options?: O,
+            ): Promise<T | undefined>;
+            /**
+             * Insert a document in the collection.  Returns its unique _id.
+             * @param doc The document to insert. May not yet have an _id attribute, in which case Meteor will generate one for you.
+             * @param callback If present, called with an error object as the first argument and, if no error, the _id as the second.
+             */
+            insert(doc: OptionalId<T>, callback?: Function): string;
+            /**
+             * Insert a document in the collection.  Returns its unique _id.
+             * @param doc The document to insert. May not yet have an _id attribute, in which case Meteor will generate one for you.
+             * @param callback If present, called with an error object as the first argument and, if no error, the _id as the second.
+             */
+            insertAsync(doc: OptionalId<T>, callback?: Function): Promise<string>;
+            /**
+             * Returns the [`Collection`](http://mongodb.github.io/node-mongodb-native/3.0/api/Collection.html) object corresponding to this collection from the
+             * [npm `mongodb` driver module](https://www.npmjs.com/package/mongodb) which is wrapped by `Mongo.Collection`.
+             */
+            rawCollection(): MongoCollection<T>;
+            /**
+             * Returns the [`Db`](http://mongodb.github.io/node-mongodb-native/3.0/api/Db.html) object corresponding to this collection's database connection from the
+             * [npm `mongodb` driver module](https://www.npmjs.com/package/mongodb) which is wrapped by `Mongo.Collection`.
+             */
+            rawDatabase(): MongoDb;
+            /**
+             * Remove documents from the collection
+             * @param selector Specifies which documents to remove
+             * @param callback If present, called with an error object as its argument.
+             */
+            remove(selector: Selector<T> | ObjectID | string, callback?: Function): number;
+            /**
+             * Remove documents from the collection
+             * @param selector Specifies which documents to remove
+             * @param callback If present, called with an error object as its argument.
+             */
+            removeAsync(selector: Selector<T> | ObjectID | string, callback?: Function): Promise<number>;
+            /**
+             * Modify one or more documents in the collection. Returns the number of matched documents.
+             * @param selector Specifies which documents to modify
+             * @param modifier Specifies how to modify the documents
+             * @param callback If present, called with an error object as the first argument and, if no error, the number of affected documents as the second.
+             */
+            update(
+                selector: Selector<T> | ObjectID | string,
+                modifier: Modifier<T>,
+                options?: {
+                    /** True to modify all matching documents; false to only modify one of the matching documents (the default). */
+                    multi?: boolean | undefined;
+                    /** True to insert a document if no matching documents are found. */
+                    upsert?: boolean | undefined;
+                    /**
+                     * Used in combination with MongoDB [filtered positional operator](https://docs.mongodb.com/manual/reference/operator/update/positional-filtered/) to specify which elements to
+                     * modify in an array field.
+                     */
+                    arrayFilters?: { [identifier: string]: any }[] | undefined;
+                },
+                callback?: Function,
+            ): number;
+            /**
+             * Modify one or more documents in the collection. Returns the number of matched documents.
+             * @param selector Specifies which documents to modify
+             * @param modifier Specifies how to modify the documents
+             * @param callback If present, called with an error object as the first argument and, if no error, the number of affected documents as the second.
+             */
+            updateAsync(
+                selector: Selector<T> | ObjectID | string,
+                modifier: Modifier<T>,
+                options?: {
+                    /** True to modify all matching documents; false to only modify one of the matching documents (the default). */
+                    multi?: boolean | undefined;
+                    /** True to insert a document if no matching documents are found. */
+                    upsert?: boolean | undefined;
+                    /**
+                     * Used in combination with MongoDB [filtered positional operator](https://docs.mongodb.com/manual/reference/operator/update/positional-filtered/) to specify which elements to
+                     * modify in an array field.
+                     */
+                    arrayFilters?: { [identifier: string]: any }[] | undefined;
+                },
+                callback?: Function,
+            ): Promise<number>;
+            /**
+             * Modify one or more documents in the collection, or insert one if no matching documents were found. Returns an object with keys `numberAffected` (the number of documents modified) and
+             * `insertedId` (the unique _id of the document that was inserted, if any).
+             * @param selector Specifies which documents to modify
+             * @param modifier Specifies how to modify the documents
+             * @param callback If present, called with an error object as the first argument and, if no error, the number of affected documents as the second.
+             */
+            upsert(
+                selector: Selector<T> | ObjectID | string,
+                modifier: Modifier<T>,
+                options?: {
+                    /** True to modify all matching documents; false to only modify one of the matching documents (the default). */
+                    multi?: boolean | undefined;
+                },
+                callback?: Function,
+            ): {
+                numberAffected?: number | undefined;
+                insertedId?: string | undefined;
+            };
+            /**
+             * Modify one or more documents in the collection, or insert one if no matching documents were found. Returns an object with keys `numberAffected` (the number of documents modified) and
+             * `insertedId` (the unique _id of the document that was inserted, if any).
+             * @param selector Specifies which documents to modify
+             * @param modifier Specifies how to modify the documents
+             * @param callback If present, called with an error object as the first argument and, if no error, the number of affected documents as the second.
+             */
+            upsertAsync(
+                selector: Selector<T> | ObjectID | string,
+                modifier: Modifier<T>,
+                options?: {
+                    /** True to modify all matching documents; false to only modify one of the matching documents (the default). */
+                    multi?: boolean | undefined;
+                },
+                callback?: Function,
+            ): Promise<{
+                numberAffected?: number | undefined;
+                insertedId?: string | undefined;
+            }>;
+            _createCappedCollection(byteSize?: number, maxDocuments?: number): void;
+            /** @deprecated */
+            _ensureIndex(indexSpec: IndexSpecification, options?: CreateIndexesOptions): void;
+            _dropCollection(): Promise<void>;
+            _dropIndex(indexName: string): void;
+        }
+
+        var Cursor: CursorStatic;
+        interface CursorStatic {
+            /**
+             * To create a cursor, use find. To access the documents in a cursor, use forEach, map, or fetch.
+             */
+            new <T>(): Cursor<T>;
+        }
+        interface ObserveCallbacks<T> {
+            added?(document: T): void;
+            addedAt?(document: T, atIndex: number, before: T | null): void;
+            changed?(newDocument: T, oldDocument: T): void;
+            changedAt?(newDocument: T, oldDocument: T, indexAt: number): void;
+            removed?(oldDocument: T): void;
+            removedAt?(oldDocument: T, atIndex: number): void;
+            movedTo?(document: T, fromIndex: number, toIndex: number, before: T | null): void;
+        }
+        interface ObserveChangesCallbacks<T> {
+            added?(id: string, fields: Partial<T>): void;
+            addedBefore?(id: string, fields: Partial<T>, before: T | null): void;
+            changed?(id: string, fields: Partial<T>): void;
+            movedBefore?(id: string, before: T | null): void;
+            removed?(id: string): void;
+        }
+        interface Cursor<T> {
+            /**
+             * Returns the number of documents that match a query.
+             * @param applySkipLimit If set to `false`, the value returned will reflect the total number of matching documents, ignoring any value supplied for limit. (Default: true)
+             */
+            count(applySkipLimit?: boolean): number;
+            /**
+             * Returns the number of documents that match a query.
+             * @param applySkipLimit If set to `false`, the value returned will reflect the total number of matching documents, ignoring any value supplied for limit. (Default: true)
+             */
+            countAsync(applySkipLimit?: boolean): Promise<number>;
+            /**
+             * Return all matching documents as an Array.
+             */
+            fetch(): Array<T>;
+            /**
+             * Return all matching documents as an Array.
+             */
+            fetchAsync(): Promise<Array<T>>;
+            /**
+             * Call `callback` once for each matching document, sequentially and
+             *          synchronously.
+             * @param callback Function to call. It will be called with three arguments: the document, a 0-based index, and <em>cursor</em> itself.
+             * @param thisArg An object which will be the value of `this` inside `callback`.
+             */
+            forEach(callback: (doc: T, index: number, cursor: Cursor<T>) => void, thisArg?: any): void;
+            /**
+             * Call `callback` once for each matching document, sequentially and
+             *          synchronously.
+             * @param callback Function to call. It will be called with three arguments: the document, a 0-based index, and <em>cursor</em> itself.
+             * @param thisArg An object which will be the value of `this` inside `callback`.
+             */
+            forEachAsync(callback: (doc: T, index: number, cursor: Cursor<T>) => void, thisArg?: any): Promise<void>;
+            /**
+             * Map callback over all matching documents. Returns an Array.
+             * @param callback Function to call. It will be called with three arguments: the document, a 0-based index, and <em>cursor</em> itself.
+             * @param thisArg An object which will be the value of `this` inside `callback`.
+             */
+            map<M>(callback: (doc: T, index: number, cursor: Cursor<T>) => M, thisArg?: any): Array<M>;
+            /**
+             * Map callback over all matching documents. Returns an Array.
+             * @param callback Function to call. It will be called with three arguments: the document, a 0-based index, and <em>cursor</em> itself.
+             * @param thisArg An object which will be the value of `this` inside `callback`.
+             */
+            mapAsync<M>(callback: (doc: T, index: number, cursor: Cursor<T>) => M, thisArg?: any): Promise<Array<M>>;
+            /**
+             * Watch a query. Receive callbacks as the result set changes.
+             * @param callbacks Functions to call to deliver the result set as it changes
+             */
+            observe(callbacks: ObserveCallbacks<T>): Meteor.LiveQueryHandle;
+            /**
+             * Watch a query. Receive callbacks as the result set changes. Only the differences between the old and new documents are passed to the callbacks.
+             * @param callbacks Functions to call to deliver the result set as it changes
+             */
+            observeChanges(
+                callbacks: ObserveChangesCallbacks<T>,
+                options?: { nonMutatingCallbacks?: boolean | undefined },
+            ): Meteor.LiveQueryHandle;
+            [Symbol.iterator](): Iterator<T, never, never>;
+            [Symbol.asyncIterator](): AsyncIterator<T, never, never>;
+        }
+
+        var ObjectID: ObjectIDStatic;
+        interface ObjectIDStatic {
+            /**
+             * Create a Mongo-style `ObjectID`.  If you don't specify a `hexString`, the `ObjectID` will generated randomly (not using MongoDB's ID construction rules).
+
+             * @param hexString The 24-character hexadecimal contents of the ObjectID to create
+             */
+            new (hexString?: string): ObjectID;
+        }
+        interface ObjectID {
+            toHexString(): string;
+            equals(otherID: ObjectID): boolean;
+        }
+
+        function setConnectionOptions(options: any): void;
+    
+    }
+
+
+// declare module MongoInternals {
+//     interface MongoConnection {
+//         db: MongoDb;
+//         client: MongoClient;
+//     }
+
+//     function defaultRemoteCollectionDriver(): {
+//         mongo: MongoConnection;
+//     };
+
+//     var NpmModules: {
+//         mongodb: {
+//             version: string,
+//             module: typeof MongoNpmModule
+//         }
+//     };
+// }
diff --git a/packages/webui/src/meteor/mongo/index.js b/packages/webui/src/meteor/mongo/index.js
new file mode 100644
index 0000000000..9e7a08c3e3
--- /dev/null
+++ b/packages/webui/src/meteor/mongo/index.js
@@ -0,0 +1,717 @@
+// options.connection, if given, is a LivedataClient or LivedataServer
+// XXX presently there is no way to destroy/clean up a Collection
+
+import { normalizeProjection } from "./mongo_utils";
+import { Meteor } from '../meteor'
+import { LocalCollection } from "../minimongo";
+import { MongoID } from '../mongo-id'
+import EJSON from 'ejson'
+import { DDP } from '../ddp'
+import { LocalCollectionDriver } from './local_collection_driver.js'
+import { getRandomString } from '@sofie-automation/corelib/dist/lib'
+
+/**
+ * @summary Namespace for MongoDB-related items
+ * @namespace
+ */
+const Mongo = {};
+
+LocalCollection.Mongo = Mongo;
+
+/**
+ * @summary Constructor for a Collection
+ * @locus Anywhere
+ * @instancename collection
+ * @class
+ * @param {String} name The name of the collection.  If null, creates an unmanaged (unsynchronized) local collection.
+ * @param {Object} [options]
+ * @param {Object} options.connection The server connection that will manage this collection. Uses the default connection if not specified.  Pass the return value of calling [`DDP.connect`](#ddp_connect) to specify a different server. Pass `null` to specify no connection. Unmanaged (`name` is null) collections cannot specify a connection.
+ */
+Mongo.Collection = function Collection(name, options) {
+  if (!name && name !== null) {
+    Meteor._debug(
+      'Warning: creating anonymous collection. It will not be ' +
+        'saved or synchronized over the network. (Pass null for ' +
+        'the collection name to turn off this warning.)'
+    );
+    name = null;
+  }
+
+  if (name !== null && typeof name !== 'string') {
+    throw new Error(
+      'First argument to new Mongo.Collection must be a string or null'
+    );
+  }
+
+  if (options && options.methods) {
+    // Backwards compatibility hack with original signature (which passed
+    // "connection" directly instead of in options. (Connections must have a "methods"
+    // method.)
+    // XXX remove before 1.0
+    options = { connection: options };
+  }
+  // Backwards compatibility: "connection" used to be called "manager".
+  if (options && options.manager && !options.connection) {
+    options.connection = options.manager;
+  }
+
+  options = {
+    connection: undefined,
+    _driver: undefined,
+    _preventAutopublish: false,
+    ...options,
+  };
+
+  this._makeNewID = function() {
+    return getRandomString();
+  };
+
+  if (!name || options.connection === null)
+    // note: nameless collections never have a connection
+    this._connection = null;
+  else if (options.connection) this._connection = options.connection;
+  else this._connection = Meteor.connection;
+
+  if (!options._driver) {
+    options._driver = LocalCollectionDriver;
+  }
+
+  this._collection = options._driver.open(name, this._connection);
+  this._name = name;
+  this._driver = options._driver;
+
+  this._maybeSetUpReplication(name, options);
+};
+
+Object.assign(Mongo.Collection.prototype, {
+  _maybeSetUpReplication(name, { _suppressSameNameError = false }) {
+    const self = this;
+    if (!(self._connection && self._connection.registerStore)) {
+      return;
+    }
+
+    // OK, we're going to be a slave, replicating some remote
+    // database, except possibly with some temporary divergence while
+    // we have unacknowledged RPC's.
+    const ok = self._connection.registerStore(name, {
+      // Called at the beginning of a batch of updates. batchSize is the number
+      // of update calls to expect.
+      //
+      // XXX This interface is pretty janky. reset probably ought to go back to
+      // being its own function, and callers shouldn't have to calculate
+      // batchSize. The optimization of not calling pause/remove should be
+      // delayed until later: the first call to update() should buffer its
+      // message, and then we can either directly apply it at endUpdate time if
+      // it was the only update, or do pauseObservers/apply/apply at the next
+      // update() if there's another one.
+      beginUpdate(batchSize, reset) {
+        // pause observers so users don't see flicker when updating several
+        // objects at once (including the post-reconnect reset-and-reapply
+        // stage), and so that a re-sorting of a query can take advantage of the
+        // full _diffQuery moved calculation instead of applying change one at a
+        // time.
+        if (batchSize > 1 || reset) self._collection.pauseObservers();
+
+        if (reset) self._collection.remove({});
+      },
+
+      // Apply an update.
+      // XXX better specify this interface (not in terms of a wire message)?
+      update(msg) {
+        var mongoId = MongoID.idParse(msg.id);
+        var doc = self._collection._docs.get(mongoId);
+
+        //When the server's mergebox is disabled for a collection, the client must gracefully handle it when:
+        // *We receive an added message for a document that is already there. Instead, it will be changed
+        // *We reeive a change message for a document that is not there. Instead, it will be added
+        // *We receive a removed messsage for a document that is not there. Instead, noting wil happen.
+
+        //Code is derived from client-side code originally in peerlibrary:control-mergebox
+        //https://github.com/peerlibrary/meteor-control-mergebox/blob/master/client.coffee
+
+        //For more information, refer to discussion "Initial support for publication strategies in livedata server":
+        //https://github.com/meteor/meteor/pull/11151
+        if (msg.msg === 'added' && doc) {
+          msg.msg = 'changed';
+        } else if (msg.msg === 'removed' && !doc) {
+          return;
+        } else if (msg.msg === 'changed' && !doc) {
+          msg.msg = 'added';
+          let _ref = msg.fields;
+          for (let field in _ref) {
+            let value = _ref[field];
+            if (value === void 0) {
+              delete msg.fields[field];
+            }
+          }
+        }
+
+        // Is this a "replace the whole doc" message coming from the quiescence
+        // of method writes to an object? (Note that 'undefined' is a valid
+        // value meaning "remove it".)
+        if (msg.msg === 'replace') {
+          var replace = msg.replace;
+          if (!replace) {
+            if (doc) self._collection.remove(mongoId);
+          } else if (!doc) {
+            self._collection.insert(replace);
+          } else {
+            // XXX check that replace has no $ ops
+            self._collection.update(mongoId, replace);
+          }
+          return;
+        } else if (msg.msg === 'added') {
+          if (doc) {
+            throw new Error(
+              'Expected not to find a document already present for an add'
+            );
+          }
+          self._collection.insert({ _id: mongoId, ...msg.fields });
+        } else if (msg.msg === 'removed') {
+          if (!doc)
+            throw new Error(
+              'Expected to find a document already present for removed'
+            );
+          self._collection.remove(mongoId);
+        } else if (msg.msg === 'changed') {
+          if (!doc) throw new Error('Expected to find a document to change');
+          const keys = Object.keys(msg.fields);
+          if (keys.length > 0) {
+            var modifier = {};
+            keys.forEach(key => {
+              const value = msg.fields[key];
+              if (EJSON.equals(doc[key], value)) {
+                return;
+              }
+              if (typeof value === 'undefined') {
+                if (!modifier.$unset) {
+                  modifier.$unset = {};
+                }
+                modifier.$unset[key] = 1;
+              } else {
+                if (!modifier.$set) {
+                  modifier.$set = {};
+                }
+                modifier.$set[key] = value;
+              }
+            });
+            if (Object.keys(modifier).length > 0) {
+              self._collection.update(mongoId, modifier);
+            }
+          }
+        } else {
+          throw new Error("I don't know how to deal with this message");
+        }
+      },
+
+      // Called at the end of a batch of updates.
+      endUpdate() {
+        self._collection.resumeObservers();
+      },
+
+      // Called around method stub invocations to capture the original versions
+      // of modified documents.
+      saveOriginals() {
+        self._collection.saveOriginals();
+      },
+      retrieveOriginals() {
+        return self._collection.retrieveOriginals();
+      },
+
+      // Used to preserve current versions of documents across a store reset.
+      getDoc(id) {
+        return self.findOne(id);
+      },
+
+      // To be able to get back to the collection from the store.
+      _getCollection() {
+        return self;
+      },
+    });
+
+    if (!ok) {
+      const message = `There is already a collection named "${name}"`;
+      if (_suppressSameNameError === true) {
+        // XXX In theory we do not have to throw when `ok` is falsy. The
+        // store is already defined for this collection name, but this
+        // will simply be another reference to it and everything should
+        // work. However, we have historically thrown an error here, so
+        // for now we will skip the error only when _suppressSameNameError
+        // is `true`, allowing people to opt in and give this some real
+        // world testing.
+        console.warn ? console.warn(message) : console.log(message);
+      } else {
+        throw new Error(message);
+      }
+    }
+  },
+
+  ///
+  /// Main collection API
+  ///
+
+  _getFindSelector(args) {
+    if (args.length == 0) return {};
+    else return args[0];
+  },
+
+  _getFindOptions(args) {
+    const [, options] = args || [];
+    const newOptions = normalizeProjection(options);
+
+    var self = this;
+    if (args.length < 2) {
+      return { };
+    } else {
+      // check(
+      //   newOptions,
+      //   Match.Optional(
+      //     Match.ObjectIncluding({
+      //       projection: Match.Optional(Match.OneOf(Object, undefined)),
+      //       sort: Match.Optional(
+      //         Match.OneOf(Object, Array, Function, undefined)
+      //       ),
+      //       limit: Match.Optional(Match.OneOf(Number, undefined)),
+      //       skip: Match.Optional(Match.OneOf(Number, undefined)),
+      //     })
+      //   )
+      // );
+
+
+      return {
+        ...newOptions,
+      };
+    }
+  },
+
+  /**
+   * @summary Find the documents in a collection that match the selector.
+   * @locus Anywhere
+   * @method find
+   * @memberof Mongo.Collection
+   * @instance
+   * @param {MongoSelector} [selector] A query describing the documents to find
+   * @param {Object} [options]
+   * @param {MongoSortSpecifier} options.sort Sort order (default: natural order)
+   * @param {Number} options.skip Number of results to skip at the beginning
+   * @param {Number} options.limit Maximum number of results to return
+   * @param {MongoFieldSpecifier} options.fields Dictionary of fields to return or exclude.
+   * @param {Boolean} options.reactive (Client only) Default `true`; pass `false` to disable reactivity
+   * @param {Boolean} options.disableOplog (Server only) Pass true to disable oplog-tailing on this query. This affects the way server processes calls to `observe` on this query. Disabling the oplog can be useful when working with data that updates in large batches.
+   * @param {Number} options.pollingIntervalMs (Server only) When oplog is disabled (through the use of `disableOplog` or when otherwise not available), the frequency (in milliseconds) of how often to poll this query when observing on the server. Defaults to 10000ms (10 seconds).
+   * @param {Number} options.pollingThrottleMs (Server only) When oplog is disabled (through the use of `disableOplog` or when otherwise not available), the minimum time (in milliseconds) to allow between re-polling when observing on the server. Increasing this will save CPU and mongo load at the expense of slower updates to users. Decreasing this is not recommended. Defaults to 50ms.
+   * @param {Number} options.maxTimeMs (Server only) If set, instructs MongoDB to set a time limit for this cursor's operations. If the operation reaches the specified time limit (in milliseconds) without the having been completed, an exception will be thrown. Useful to prevent an (accidental or malicious) unoptimized query from causing a full collection scan that would disrupt other database users, at the expense of needing to handle the resulting error.
+   * @param {String|Object} options.hint (Server only) Overrides MongoDB's default index selection and query optimization process. Specify an index to force its use, either by its name or index specification. You can also specify `{ $natural : 1 }` to force a forwards collection scan, or `{ $natural : -1 }` for a reverse collection scan. Setting this is only recommended for advanced users.
+   * @param {String} options.readPreference (Server only) Specifies a custom MongoDB [`readPreference`](https://docs.mongodb.com/manual/core/read-preference) for this particular cursor. Possible values are `primary`, `primaryPreferred`, `secondary`, `secondaryPreferred` and `nearest`.
+   * @returns {Mongo.Cursor}
+   */
+  find(...args) {
+    // Collection.find() (return all docs) behaves differently
+    // from Collection.find(undefined) (return 0 docs).  so be
+    // careful about the length of arguments.
+    return this._collection.find(
+      this._getFindSelector(args),
+      this._getFindOptions(args)
+    );
+  },
+
+  /**
+   * @summary Finds the first document that matches the selector, as ordered by sort and skip options. Returns `undefined` if no matching document is found.
+   * @locus Anywhere
+   * @method findOne
+   * @memberof Mongo.Collection
+   * @instance
+   * @param {MongoSelector} [selector] A query describing the documents to find
+   * @param {Object} [options]
+   * @param {MongoSortSpecifier} options.sort Sort order (default: natural order)
+   * @param {Number} options.skip Number of results to skip at the beginning
+   * @param {MongoFieldSpecifier} options.fields Dictionary of fields to return or exclude.
+   * @param {Boolean} options.reactive (Client only) Default true; pass false to disable reactivity
+   * @param {String} options.readPreference (Server only) Specifies a custom MongoDB [`readPreference`](https://docs.mongodb.com/manual/core/read-preference) for fetching the document. Possible values are `primary`, `primaryPreferred`, `secondary`, `secondaryPreferred` and `nearest`.
+   * @returns {Object}
+   */
+  findOne(...args) {
+    return this._collection.findOne(
+      this._getFindSelector(args),
+      this._getFindOptions(args)
+    );
+  },
+});
+
+Object.assign(Mongo.Collection, {
+  // protect against dangerous selectors.  falsey and {_id: falsey} are both
+  // likely programmer error, and not what you want, particularly for destructive
+  // operations. If a falsey _id is sent in, a new string _id will be
+  // generated and returned; if a fallbackId is provided, it will be returned
+  // instead.
+  _rewriteSelector(selector, { fallbackId } = {}) {
+    // shorthand -- scalars match _id
+    if (LocalCollection._selectorIsId(selector)) selector = { _id: selector };
+
+    if (Array.isArray(selector)) {
+      // This is consistent with the Mongo console itself; if we don't do this
+      // check passing an empty array ends up selecting all items
+      throw new Error("Mongo selector can't be an array.");
+    }
+
+    if (!selector || ('_id' in selector && !selector._id)) {
+      // can't match anything
+      return { _id: fallbackId || getRandomString() };
+    }
+
+    return selector;
+  },
+});
+
+Object.assign(Mongo.Collection.prototype, {
+  // 'insert' immediately returns the inserted document's new _id.
+  // The others return values immediately if you are in a stub, an in-memory
+  // unmanaged collection, or a mongo-backed collection and you don't pass a
+  // callback. 'update' and 'remove' return the number of affected
+  // documents. 'upsert' returns an object with keys 'numberAffected' and, if an
+  // insert happened, 'insertedId'.
+  //
+  // Otherwise, the semantics are exactly like other methods: they take
+  // a callback as an optional last argument; if no callback is
+  // provided, they block until the operation is complete, and throw an
+  // exception if it fails; if a callback is provided, then they don't
+  // necessarily block, and they call the callback when they finish with error and
+  // result arguments.  (The insert method provides the document ID as its result;
+  // update and remove provide the number of affected docs as the result; upsert
+  // provides an object with numberAffected and maybe insertedId.)
+  //
+  // On the client, blocking is impossible, so if a callback
+  // isn't provided, they just return immediately and any error
+  // information is lost.
+  //
+  // There's one more tweak. On the client, if you don't provide a
+  // callback, then if there is an error, a message will be logged with
+  // Meteor._debug.
+  //
+  // The intent (though this is actually determined by the underlying
+  // drivers) is that the operations should be done synchronously, not
+  // generating their result until the database has acknowledged
+  // them. In the future maybe we should provide a flag to turn this
+  // off.
+
+  /**
+   * @summary Insert a document in the collection.  Returns its unique _id.
+   * @locus Anywhere
+   * @method  insert
+   * @memberof Mongo.Collection
+   * @instance
+   * @param {Object} doc The document to insert. May not yet have an _id attribute, in which case Meteor will generate one for you.
+   * @param {Function} [callback] Optional.  If present, called with an error object as the first argument and, if no error, the _id as the second.
+   */
+  insert(doc, callback) {
+    // Make sure we were passed a document to insert
+    if (!doc) {
+      throw new Error('insert requires an argument');
+    }
+
+    // Make a shallow clone of the document, preserving its prototype.
+    doc = Object.create(
+      Object.getPrototypeOf(doc),
+      Object.getOwnPropertyDescriptors(doc)
+    );
+
+    if ('_id' in doc) {
+      if (
+        !doc._id ||
+        !(typeof doc._id === 'string')
+      ) {
+        throw new Error(
+          'Meteor requires document _id fields to be non-empty strings or ObjectIDs'
+        );
+      }
+    } else {
+      let generateId = true;
+
+      // Don't generate the id if we're the client and the 'outermost' call
+      // This optimization saves us passing both the randomSeed and the id
+      // Passing both is redundant.
+      if (this._isRemoteCollection()) {
+        const enclosing = DDP._CurrentMethodInvocation.get();
+        if (!enclosing) {
+          generateId = false;
+        }
+      }
+
+      if (generateId) {
+        doc._id = this._makeNewID();
+      }
+    }
+
+    // On inserts, always return the id that we generated; on all other
+    // operations, just return the result from the collection.
+    var chooseReturnValueFromCollectionResult = function(result) {
+      if (doc._id) {
+        return doc._id;
+      }
+
+      // XXX what is this for??
+      // It's some iteraction between the callback to _callMutatorMethod and
+      // the return value conversion
+      doc._id = result;
+
+      return result;
+    };
+
+    const wrappedCallback = wrapCallback(
+      callback,
+      chooseReturnValueFromCollectionResult
+    );
+
+    if (this._isRemoteCollection()) {
+      const result = this._callMutatorMethod('insert', [doc], wrappedCallback);
+      return chooseReturnValueFromCollectionResult(result);
+    }
+
+    // it's my collection.  descend into the collection object
+    // and propagate any exception.
+    try {
+      // If the user provided a callback and the collection implements this
+      // operation asynchronously, then queryRet will be undefined, and the
+      // result will be returned through the callback instead.
+      const result = this._collection.insert(doc, wrappedCallback);
+      return chooseReturnValueFromCollectionResult(result);
+    } catch (e) {
+      if (callback) {
+        callback(e);
+        return null;
+      }
+      throw e;
+    }
+  },
+
+  /**
+   * @summary Modify one or more documents in the collection. Returns the number of matched documents.
+   * @locus Anywhere
+   * @method update
+   * @memberof Mongo.Collection
+   * @instance
+   * @param {MongoSelector} selector Specifies which documents to modify
+   * @param {MongoModifier} modifier Specifies how to modify the documents
+   * @param {Object} [options]
+   * @param {Boolean} options.multi True to modify all matching documents; false to only modify one of the matching documents (the default).
+   * @param {Boolean} options.upsert True to insert a document if no matching documents are found.
+   * @param {Array} options.arrayFilters Optional. Used in combination with MongoDB [filtered positional operator](https://docs.mongodb.com/manual/reference/operator/update/positional-filtered/) to specify which elements to modify in an array field.
+   * @param {Function} [callback] Optional.  If present, called with an error object as the first argument and, if no error, the number of affected documents as the second.
+   */
+  update(selector, modifier, ...optionsAndCallback) {
+    const callback = popCallbackFromArgs(optionsAndCallback);
+
+    // We've already popped off the callback, so we are left with an array
+    // of one or zero items
+    const options = { ...(optionsAndCallback[0] || null) };
+    let insertedId;
+    if (options && options.upsert) {
+      // set `insertedId` if absent.  `insertedId` is a Meteor extension.
+      if (options.insertedId) {
+        if (
+          !(
+            typeof options.insertedId === 'string'
+          )
+        )
+          throw new Error('insertedId must be string or ObjectID');
+        insertedId = options.insertedId;
+      } else if (!selector || !selector._id) {
+        insertedId = this._makeNewID();
+        options.generatedId = true;
+        options.insertedId = insertedId;
+      }
+    }
+
+    selector = Mongo.Collection._rewriteSelector(selector, {
+      fallbackId: insertedId,
+    });
+
+    const wrappedCallback = wrapCallback(callback);
+
+    if (this._isRemoteCollection()) {
+      const args = [selector, modifier, options];
+
+      return this._callMutatorMethod('update', args, wrappedCallback);
+    }
+
+    // it's my collection.  descend into the collection object
+    // and propagate any exception.
+    try {
+      // If the user provided a callback and the collection implements this
+      // operation asynchronously, then queryRet will be undefined, and the
+      // result will be returned through the callback instead.
+      return this._collection.update(
+        selector,
+        modifier,
+        options,
+        wrappedCallback
+      );
+    } catch (e) {
+      if (callback) {
+        callback(e);
+        return null;
+      }
+      throw e;
+    }
+  },
+
+  /**
+   * @summary Remove documents from the collection
+   * @locus Anywhere
+   * @method remove
+   * @memberof Mongo.Collection
+   * @instance
+   * @param {MongoSelector} selector Specifies which documents to remove
+   * @param {Function} [callback] Optional.  If present, called with an error object as its argument.
+   */
+  remove(selector, callback) {
+    selector = Mongo.Collection._rewriteSelector(selector);
+
+    const wrappedCallback = wrapCallback(callback);
+
+    if (this._isRemoteCollection()) {
+      return this._callMutatorMethod('remove', [selector], wrappedCallback);
+    }
+
+    // it's my collection.  descend into the collection object
+    // and propagate any exception.
+    try {
+      // If the user provided a callback and the collection implements this
+      // operation asynchronously, then queryRet will be undefined, and the
+      // result will be returned through the callback instead.
+      return this._collection.remove(selector, wrappedCallback);
+    } catch (e) {
+      if (callback) {
+        callback(e);
+        return null;
+      }
+      throw e;
+    }
+  },
+
+  // Determine if this collection is simply a minimongo representation of a real
+  // database on another server
+  _isRemoteCollection() {
+    // XXX see #MeteorServerNull
+    return !!this._connection;
+  },
+
+  /**
+   * @summary Modify one or more documents in the collection, or insert one if no matching documents were found. Returns an object with keys `numberAffected` (the number of documents modified)  and `insertedId` (the unique _id of the document that was inserted, if any).
+   * @locus Anywhere
+   * @method upsert
+   * @memberof Mongo.Collection
+   * @instance
+   * @param {MongoSelector} selector Specifies which documents to modify
+   * @param {MongoModifier} modifier Specifies how to modify the documents
+   * @param {Object} [options]
+   * @param {Boolean} options.multi True to modify all matching documents; false to only modify one of the matching documents (the default).
+   * @param {Function} [callback] Optional.  If present, called with an error object as the first argument and, if no error, the number of affected documents as the second.
+   */
+  upsert(selector, modifier, options, callback) {
+    if (!callback && typeof options === 'function') {
+      callback = options;
+      options = {};
+    }
+
+    return this.update(
+      selector,
+      modifier,
+      {
+        ...options,
+        _returnObject: true,
+        upsert: true,
+      },
+      callback
+    );
+  },
+
+ 
+});
+
+// Convert the callback to not return a result if there is an error
+function wrapCallback(callback, convertResult) {
+  return (
+    callback &&
+    function(error, result) {
+      if (error) {
+        callback(error);
+      } else if (typeof convertResult === 'function') {
+        callback(error, convertResult(result));
+      } else {
+        callback(error, result);
+      }
+    }
+  );
+}
+
+/**
+ * @summary To create a cursor, use find. To access the documents in a cursor, use forEach, map, or fetch.
+ * @class
+ * @instanceName cursor
+ */
+Mongo.Cursor = LocalCollection.Cursor;
+
+/**
+ * @deprecated in 0.9.1
+ */
+Mongo.Collection.Cursor = Mongo.Cursor;
+
+
+/**
+ * @deprecated in 0.9.1
+ */
+Meteor.Collection = Mongo.Collection;
+
+function popCallbackFromArgs(args) {
+  // Pull off any callback (or perhaps a 'callback' variable that was passed
+  // in undefined, like how 'upsert' does it).
+  if (
+    args.length &&
+    (args[args.length - 1] === undefined ||
+      args[args.length - 1] instanceof Function)
+  ) {
+    return args.pop();
+  }
+}
+
+export { Mongo }
+
+
+Mongo.Collection.prototype._callMutatorMethod = function _callMutatorMethod(name, args, callback) {
+  if (!callback) {
+    // Client can't block, so it can't report errors by exception,
+    // only by callback. If they forget the callback, give them a
+    // default one that logs the error, so they aren't totally
+    // baffled if their writes don't work because their database is
+    // down.
+    // Don't give a default callback in simulation, because inside stubs we
+    // want to return the results from the local collection immediately and
+    // not force a callback.
+    callback = function (err) {
+      if (err)
+        Meteor._debug(name + " failed", err);
+    };
+  }
+
+  // For two out of three mutator methods, the first argument is a selector
+  const firstArgIsSelector = name === "update" || name === "remove";
+  if (firstArgIsSelector) {
+    // If we're about to actually send an RPC, we should throw an error if
+    // this is a non-ID selector, because the mutation methods only allow
+    // single-ID selectors. (If we don't throw here, we'll see flicker.)
+    throwIfSelectorIsNotId(args[0], name);
+  }
+
+  const mutatorMethodName = '/' + this._name + '/'+ name;
+  return this._connection.apply(
+    mutatorMethodName, args, { }, callback);
+}
+
+function throwIfSelectorIsNotId(selector, methodName) {
+  if (!LocalCollection._selectorIsIdPerhapsAsObject(selector)) {
+    throw new Meteor.Error(
+      403, "Not permitted. Untrusted code may only " + methodName +
+        " documents by ID.");
+  }
+};
diff --git a/packages/webui/src/meteor/mongo/local_collection_driver.js b/packages/webui/src/meteor/mongo/local_collection_driver.js
new file mode 100644
index 0000000000..497d54bfe1
--- /dev/null
+++ b/packages/webui/src/meteor/mongo/local_collection_driver.js
@@ -0,0 +1,33 @@
+import { LocalCollection } from '../minimongo';
+
+
+// singleton
+export const LocalCollectionDriver = new (class LocalCollectionDriver {
+    constructor() {
+      this.noConnCollections = Object.create(null);
+    }
+  
+    open(name, conn) {
+      if (! name) {
+        return new LocalCollection;
+      }
+  
+      if (! conn) {
+        return ensureCollection(name, this.noConnCollections);
+      }
+  
+      if (! conn._mongo_livedata_collections) {
+        conn._mongo_livedata_collections = Object.create(null);
+      }
+  
+      // XXX is there a way to keep track of a connection's collections without
+      // dangling it off the connection object?
+      return ensureCollection(name, conn._mongo_livedata_collections);
+    }
+  });
+  
+  function ensureCollection(name, collections) {
+    return (name in collections)
+      ? collections[name]
+      : collections[name] = new LocalCollection(name);
+  }
\ No newline at end of file
diff --git a/packages/webui/src/meteor/mongo/mongo_utils.js b/packages/webui/src/meteor/mongo/mongo_utils.js
new file mode 100644
index 0000000000..d7b43c4053
--- /dev/null
+++ b/packages/webui/src/meteor/mongo/mongo_utils.js
@@ -0,0 +1,11 @@
+export const normalizeProjection = options => {
+    // transform fields key in projection
+    const { fields, projection, ...otherOptions } = options || {};
+    // TODO: enable this comment when deprecating the fields option
+    // Log.debug(`fields option has been deprecated, please use the new 'projection' instead`)
+  
+    return {
+      ...otherOptions,
+      ...(projection || fields ? { projection: fields || projection } : {}),
+    };
+  };
\ No newline at end of file
diff --git a/packages/webui/src/meteor/reactive-var.d.ts b/packages/webui/src/meteor/reactive-var.d.ts
new file mode 100644
index 0000000000..122ea35c0d
--- /dev/null
+++ b/packages/webui/src/meteor/reactive-var.d.ts
@@ -0,0 +1,22 @@
+    var ReactiveVar: ReactiveVarStatic;
+    interface ReactiveVarStatic {
+        /**
+         * Constructor for a ReactiveVar, which represents a single reactive variable.
+         * @param initialValue The initial value to set. `equalsFunc` is ignored when setting the initial value.
+         * @param equalsFunc A function of two arguments, called on the old value and the new value whenever the ReactiveVar is set. If it returns true, no set is performed. If omitted, the default
+         * `equalsFunc` returns true if its arguments are `===` and are of type number, boolean, string, undefined, or null.
+         */
+        new <T>(initialValue: T, equalsFunc?: (oldValue: T, newValue: T) => boolean): ReactiveVar<T>;
+    }
+    interface ReactiveVar<T> {
+        /**
+         * Returns the current value of the ReactiveVar, establishing a reactive dependency.
+         */
+        get(): T;
+        /**
+         * Sets the current value of the ReactiveVar, invalidating the Computations that called `get` if `newValue` is different from the old value.
+         */
+        set(newValue: T): void;
+    }
+
+    export { ReactiveVar }
\ No newline at end of file
diff --git a/packages/webui/src/meteor/reactive-var.js b/packages/webui/src/meteor/reactive-var.js
new file mode 100644
index 0000000000..0817f62e55
--- /dev/null
+++ b/packages/webui/src/meteor/reactive-var.js
@@ -0,0 +1,98 @@
+/*
+ * ## [new] ReactiveVar(initialValue, [equalsFunc])
+ *
+ * A ReactiveVar holds a single value that can be get and set,
+ * such that calling `set` will invalidate any Computations that
+ * called `get`, according to the usual contract for reactive
+ * data sources.
+ *
+ * A ReactiveVar is much like a Session variable -- compare `foo.get()`
+ * to `Session.get("foo")` -- but it doesn't have a global name and isn't
+ * automatically migrated across hot code pushes.  Also, while Session
+ * variables can only hold JSON or EJSON, ReactiveVars can hold any value.
+ *
+ * An important property of ReactiveVars, which is sometimes the reason
+ * to use one, is that setting the value to the same value as before has
+ * no effect, meaning ReactiveVars can be used to absorb extra
+ * invalidations that wouldn't serve a purpose.  However, by default,
+ * ReactiveVars are extremely conservative about what changes they
+ * absorb.  Calling `set` with an object argument will *always* trigger
+ * invalidations, because even if the new value is `===` the old value,
+ * the object may have been mutated.  You can change the default behavior
+ * by passing a function of two arguments, `oldValue` and `newValue`,
+ * to the constructor as `equalsFunc`.
+ *
+ * This class is extremely basic right now, but the idea is to evolve
+ * it into the ReactiveVar of Geoff's Lickable Forms proposal.
+ */
+
+import { Tracker } from './tracker'
+
+/**
+ * @class 
+ * @instanceName reactiveVar
+ * @summary Constructor for a ReactiveVar, which represents a single reactive variable.
+ * @locus Client
+ * @param {Any} initialValue The initial value to set.  `equalsFunc` is ignored when setting the initial value.
+ * @param {Function} [equalsFunc] Optional.  A function of two arguments, called on the old value and the new value whenever the ReactiveVar is set.  If it returns true, no set is performed.  If omitted, the default `equalsFunc` returns true if its arguments are `===` and are of type number, boolean, string, undefined, or null.
+ */
+export const ReactiveVar = function (initialValue, equalsFunc) {
+    if (! (this instanceof ReactiveVar))
+      // called without `new`
+      return new ReactiveVar(initialValue, equalsFunc);
+  
+    this.curValue = initialValue;
+    this.equalsFunc = equalsFunc;
+    this.dep = new Tracker.Dependency;
+  };
+  
+  ReactiveVar._isEqual = function (oldValue, newValue) {
+    var a = oldValue, b = newValue;
+    // Two values are "equal" here if they are `===` and are
+    // number, boolean, string, undefined, or null.
+    if (a !== b)
+      return false;
+    else
+      return ((!a) || (typeof a === 'number') || (typeof a === 'boolean') ||
+              (typeof a === 'string'));
+  };
+  
+  /**
+   * @summary Returns the current value of the ReactiveVar, establishing a reactive dependency.
+   * @locus Client
+   */
+  ReactiveVar.prototype.get = function () {
+    if (Tracker.active)
+      this.dep.depend();
+  
+    return this.curValue;
+  };
+  
+  /**
+   * @summary Sets the current value of the ReactiveVar, invalidating the Computations that called `get` if `newValue` is different from the old value.
+   * @locus Client
+   * @param {Any} newValue
+   */
+  ReactiveVar.prototype.set = function (newValue) {
+    var oldValue = this.curValue;
+  
+    if ((this.equalsFunc || ReactiveVar._isEqual)(oldValue, newValue))
+      // value is same as last time
+      return;
+  
+    this.curValue = newValue;
+    this.dep.changed();
+  };
+  
+  ReactiveVar.prototype.toString = function () {
+    return 'ReactiveVar{' + this.get() + '}';
+  };
+  
+  ReactiveVar.prototype._numListeners = function() {
+    // Tests want to know.
+    // Accesses a private field of Tracker.Dependency.
+    var count = 0;
+    for (var id in this.dep._dependentsById)
+      count++;
+    return count;
+  };
\ No newline at end of file
diff --git a/packages/webui/src/meteor/socket-stream-client/common.js b/packages/webui/src/meteor/socket-stream-client/common.js
new file mode 100644
index 0000000000..e82b24d24a
--- /dev/null
+++ b/packages/webui/src/meteor/socket-stream-client/common.js
@@ -0,0 +1,178 @@
+import { Retry } from './lib/retry';
+import { Tracker } from '../tracker';
+
+const forcedReconnectError = new Error("forced reconnect");
+
+export class StreamClientCommon {
+  constructor(options) {
+    this.options = {
+      retry: true,
+      ...(options || null),
+    };
+
+    this.ConnectionError =
+      options && options.ConnectionError || Error;
+  }
+
+  // Register for callbacks.
+  on(name, callback) {
+    if (name !== 'message' && name !== 'reset' && name !== 'disconnect')
+      throw new Error('unknown event type: ' + name);
+
+    if (!this.eventCallbacks[name]) this.eventCallbacks[name] = [];
+    this.eventCallbacks[name].push(callback);
+  }
+
+  forEachCallback(name, cb) {
+    if (!this.eventCallbacks[name] || !this.eventCallbacks[name].length) {
+      return;
+    }
+
+    this.eventCallbacks[name].forEach(cb);
+  }
+
+  _initCommon(options) {
+    options = options || Object.create(null);
+
+    //// Constants
+
+    // how long to wait until we declare the connection attempt
+    // failed.
+    this.CONNECT_TIMEOUT = options.connectTimeoutMs || 10000;
+
+    this.eventCallbacks = Object.create(null); // name -> [callback]
+
+    this._forcedToDisconnect = false;
+
+    //// Reactive status
+    this.currentStatus = {
+      status: 'connecting',
+      connected: false,
+      retryCount: 0
+    };
+
+    this.statusListeners = new Tracker.Dependency();
+
+    this.statusChanged = () => {
+      if (this.statusListeners) {
+        this.statusListeners.changed();
+      }
+    };
+
+    //// Retry logic
+    this._retry = new Retry();
+    this.connectionTimer = null;
+  }
+
+  // Trigger a reconnect.
+  reconnect(options) {
+    options = options || Object.create(null);
+
+    if (options.url) {
+      this._changeUrl(options.url);
+    }
+
+    if (options._sockjsOptions) {
+      this.options._sockjsOptions = options._sockjsOptions;
+    }
+
+    if (this.currentStatus.connected) {
+      if (options._force || options.url) {
+        this._lostConnection(forcedReconnectError);
+      }
+      return;
+    }
+
+    // if we're mid-connection, stop it.
+    if (this.currentStatus.status === 'connecting') {
+      // Pretend it's a clean close.
+      this._lostConnection();
+    }
+
+    this._retry.clear();
+    this.currentStatus.retryCount -= 1; // don't count manual retries
+    this._retryNow();
+  }
+
+  disconnect(options) {
+    options = options || Object.create(null);
+
+    // Failed is permanent. If we're failed, don't let people go back
+    // online by calling 'disconnect' then 'reconnect'.
+    if (this._forcedToDisconnect) return;
+
+    // If _permanent is set, permanently disconnect a stream. Once a stream
+    // is forced to disconnect, it can never reconnect. This is for
+    // error cases such as ddp version mismatch, where trying again
+    // won't fix the problem.
+    if (options._permanent) {
+      this._forcedToDisconnect = true;
+    }
+
+    this._cleanup();
+    this._retry.clear();
+
+    this.currentStatus = {
+      status: options._permanent ? 'failed' : 'offline',
+      connected: false,
+      retryCount: 0
+    };
+
+    if (options._permanent && options._error)
+      this.currentStatus.reason = options._error;
+
+    this.statusChanged();
+  }
+
+  // maybeError is set unless it's a clean protocol-level close.
+  _lostConnection(maybeError) {
+    this._cleanup(maybeError);
+    this._retryLater(maybeError); // sets status. no need to do it here.
+  }
+
+  // fired when we detect that we've gone online. try to reconnect
+  // immediately.
+  _online() {
+    // if we've requested to be offline by disconnecting, don't reconnect.
+    if (this.currentStatus.status != 'offline') this.reconnect();
+  }
+
+  _retryLater(maybeError) {
+    var timeout = 0;
+    if (this.options.retry ||
+        maybeError === forcedReconnectError) {
+      timeout = this._retry.retryLater(
+        this.currentStatus.retryCount,
+        this._retryNow.bind(this)
+      );
+      this.currentStatus.status = 'waiting';
+      this.currentStatus.retryTime = new Date().getTime() + timeout;
+    } else {
+      this.currentStatus.status = 'failed';
+      delete this.currentStatus.retryTime;
+    }
+
+    this.currentStatus.connected = false;
+    this.statusChanged();
+  }
+
+  _retryNow() {
+    if (this._forcedToDisconnect) return;
+
+    this.currentStatus.retryCount += 1;
+    this.currentStatus.status = 'connecting';
+    this.currentStatus.connected = false;
+    delete this.currentStatus.retryTime;
+    this.statusChanged();
+
+    this._launchConnection();
+  }
+
+  // Get current status. Reactive.
+  status() {
+    if (this.statusListeners) {
+      this.statusListeners.depend();
+    }
+    return this.currentStatus;
+  }
+}
\ No newline at end of file
diff --git a/packages/webui/src/meteor/socket-stream-client/index.js b/packages/webui/src/meteor/socket-stream-client/index.js
new file mode 100644
index 0000000000..865def6c88
--- /dev/null
+++ b/packages/webui/src/meteor/socket-stream-client/index.js
@@ -0,0 +1,171 @@
+import {
+    toWebsocketUrl,
+  } from "./urls.js";
+  
+  import { StreamClientCommon } from "./common.js";
+    
+  export class ClientStream extends StreamClientCommon {
+    // @param url {String} URL to Meteor app
+    //   "http://subdomain.meteor.com/" or "/" or
+    //   "ddp+sockjs://foo-**.meteor.com/sockjs"
+    constructor(url, options) {
+      super(options);
+  
+      this._initCommon(this.options);
+  
+      //// Constants
+  
+      // how long between hearing heartbeat from the server until we declare
+      // the connection dead. heartbeats come every 45s (stream_server.js)
+      //
+      // NOTE: this is a older timeout mechanism. We now send heartbeats at
+      // the DDP level (https://github.com/meteor/meteor/pull/1865), and
+      // expect those timeouts to kill a non-responsive connection before
+      // this timeout fires. This is kept around for compatibility (when
+      // talking to a server that doesn't support DDP heartbeats) and can be
+      // removed later.
+      this.HEARTBEAT_TIMEOUT = 100 * 1000;
+  
+      this.rawUrl = url;
+      this.socket = null;
+      this.lastError = null;
+  
+      this.heartbeatTimer = null;
+  
+      // Listen to global 'online' event if we are running in a browser.
+      window.addEventListener(
+        'online',
+        this._online.bind(this),
+        false /* useCapture */
+      );
+  
+      //// Kickoff!
+      this._launchConnection();
+    }
+  
+    // data is a utf8 string. Data sent while not connected is dropped on
+    // the floor, and it is up the user of this API to retransmit lost
+    // messages on 'reset'
+    send(data) {
+      if (this.currentStatus.connected) {
+        this.socket.send(data);
+      }
+    }
+  
+    // Changes where this connection points
+    _changeUrl(url) {
+      this.rawUrl = url;
+    }
+  
+    _connected() {
+      if (this.connectionTimer) {
+        clearTimeout(this.connectionTimer);
+        this.connectionTimer = null;
+      }
+  
+      if (this.currentStatus.connected) {
+        // already connected. do nothing. this probably shouldn't happen.
+        return;
+      }
+  
+      // update status
+      this.currentStatus.status = 'connected';
+      this.currentStatus.connected = true;
+      this.currentStatus.retryCount = 0;
+      this.statusChanged();
+  
+      // fire resets. This must come after status change so that clients
+      // can call send from within a reset callback.
+      this.forEachCallback('reset', callback => {
+        callback();
+      });
+    }
+  
+    _cleanup(maybeError) {
+      this._clearConnectionAndHeartbeatTimers();
+      if (this.socket) {
+        this.socket.onmessage = this.socket.onclose = this.socket.onerror = this.socket.onheartbeat = () => {};
+        this.socket.close();
+        this.socket = null;
+      }
+  
+      this.forEachCallback('disconnect', callback => {
+        callback(maybeError);
+      });
+    }
+  
+    _clearConnectionAndHeartbeatTimers() {
+      if (this.connectionTimer) {
+        clearTimeout(this.connectionTimer);
+        this.connectionTimer = null;
+      }
+      if (this.heartbeatTimer) {
+        clearTimeout(this.heartbeatTimer);
+        this.heartbeatTimer = null;
+      }
+    }
+  
+    _heartbeat_timeout() {
+      console.log('Connection timeout. No sockjs heartbeat received.');
+      this._lostConnection(new this.ConnectionError("Heartbeat timed out"));
+    }
+  
+    _heartbeat_received() {
+      // If we've already permanently shut down this stream, the timeout is
+      // already cleared, and we don't need to set it again.
+      if (this._forcedToDisconnect) return;
+      if (this.heartbeatTimer) clearTimeout(this.heartbeatTimer);
+      this.heartbeatTimer = setTimeout(
+        this._heartbeat_timeout.bind(this),
+        this.HEARTBEAT_TIMEOUT
+      );
+    }
+  
+    _launchConnection() {
+      this._cleanup(); // cleanup the old socket, if there was one.
+  
+      this.socket = new WebSocket(toWebsocketUrl(this.rawUrl));
+  
+      this.socket.onopen = data => {
+        this.lastError = null;
+        this._connected();
+      };
+  
+      this.socket.onmessage = data => {
+        this.lastError = null;
+        this._heartbeat_received();
+        if (this.currentStatus.connected) {
+          this.forEachCallback('message', callback => {
+            callback(data.data);
+          });
+        }
+      };
+  
+      this.socket.onclose = () => {
+        this._lostConnection();
+      };
+  
+      this.socket.onerror = error => {
+        const { lastError } = this;
+        this.lastError = error;
+        if (lastError) return;
+        console.error(
+          'stream error',
+          error,
+          new Date().toDateString()
+        );
+      };
+  
+      this.socket.onheartbeat = () => {
+        this.lastError = null;
+        this._heartbeat_received();
+      };
+  
+      if (this.connectionTimer) clearTimeout(this.connectionTimer);
+      this.connectionTimer = setTimeout(() => {
+        this._lostConnection(
+          new this.ConnectionError("DDP connection timed out")
+        );
+      }, this.CONNECT_TIMEOUT);
+    }
+  }
\ No newline at end of file
diff --git a/packages/webui/src/meteor/socket-stream-client/lib/retry.js b/packages/webui/src/meteor/socket-stream-client/lib/retry.js
new file mode 100644
index 0000000000..74c50a33c8
--- /dev/null
+++ b/packages/webui/src/meteor/socket-stream-client/lib/retry.js
@@ -0,0 +1,68 @@
+import { Meteor } from "../../meteor";
+
+// Retry logic with an exponential backoff.
+//
+// options:
+//  baseTimeout: time for initial reconnect attempt (ms).
+//  exponent: exponential factor to increase timeout each attempt.
+//  maxTimeout: maximum time between retries (ms).
+//  minCount: how many times to reconnect "instantly".
+//  minTimeout: time to wait for the first `minCount` retries (ms).
+//  fuzz: factor to randomize retry times by (to avoid retry storms).
+
+export class Retry {
+    constructor({
+      baseTimeout = 1000,
+      exponent = 2.2,
+      // The default is high-ish to ensure a server can recover from a
+      // failure caused by load.
+      maxTimeout = 5 * 60 * 1000,
+      minTimeout = 10,
+      minCount = 2,
+      fuzz = 0.5,
+    } = {}) {
+      this.baseTimeout = baseTimeout;
+      this.exponent = exponent;
+      this.maxTimeout = maxTimeout;
+      this.minTimeout = minTimeout;
+      this.minCount = minCount;
+      this.fuzz = fuzz;
+      this.retryTimer = null;
+    }
+  
+    // Reset a pending retry, if any.
+    clear() {
+      if (this.retryTimer) {
+        clearTimeout(this.retryTimer);
+      }
+      this.retryTimer = null;
+    }
+  
+    // Calculate how long to wait in milliseconds to retry, based on the
+    // `count` of which retry this is.
+    _timeout(count) {
+      if (count < this.minCount) {
+        return this.minTimeout;
+      }
+  
+      // fuzz the timeout randomly, to avoid reconnect storms when a
+      // server goes down.
+      var timeout = Math.min(
+        this.maxTimeout,
+        this.baseTimeout * Math.pow(this.exponent, count)
+      ) * (
+        Math.random() * this.fuzz + (1 - this.fuzz / 2)
+      );
+  
+      return timeout;
+    }
+  
+    // Call `fn` after a delay, based on the `count` of which retry this is.
+    retryLater(count, fn) {
+      var timeout = this._timeout(count);
+      if (this.retryTimer)
+        clearTimeout(this.retryTimer);
+      this.retryTimer = Meteor.setTimeout(fn, timeout);
+      return timeout;
+    }
+  }
\ No newline at end of file
diff --git a/packages/webui/src/meteor/socket-stream-client/urls.js b/packages/webui/src/meteor/socket-stream-client/urls.js
new file mode 100644
index 0000000000..232c9bc247
--- /dev/null
+++ b/packages/webui/src/meteor/socket-stream-client/urls.js
@@ -0,0 +1,65 @@
+import { Meteor } from "../meteor";
+
+// @param url {String} URL to Meteor app, eg:
+//   "/" or "madewith.meteor.com" or "https://foo.meteor.com"
+//   or "ddp+sockjs://ddp--****-foo.meteor.com/sockjs"
+// @returns {String} URL to the endpoint with the specific scheme and subPath, e.g.
+// for scheme "http" and subPath "sockjs"
+//   "http://subdomain.meteor.com/sockjs" or "/sockjs"
+//   or "https://ddp--1234-foo.meteor.com/sockjs"
+function translateUrl(url, newSchemeBase, subPath) {
+  if (!newSchemeBase) {
+    newSchemeBase = 'http';
+  }
+
+  if (subPath !== "sockjs" && url.startsWith("/")) {
+    url = Meteor.absoluteUrl(url.substr(1));
+  }
+
+  var ddpUrlMatch = url.match(/^ddp(i?)\+sockjs:\/\//);
+  var httpUrlMatch = url.match(/^http(s?):\/\//);
+  var newScheme;
+  if (ddpUrlMatch) {
+    // Remove scheme and split off the host.
+    var urlAfterDDP = url.substr(ddpUrlMatch[0].length);
+    newScheme = ddpUrlMatch[1] === 'i' ? newSchemeBase : newSchemeBase + 's';
+    var slashPos = urlAfterDDP.indexOf('/');
+    var host = slashPos === -1 ? urlAfterDDP : urlAfterDDP.substr(0, slashPos);
+    var rest = slashPos === -1 ? '' : urlAfterDDP.substr(slashPos);
+
+    // In the host (ONLY!), change '*' characters into random digits. This
+    // allows different stream connections to connect to different hostnames
+    // and avoid browser per-hostname connection limits.
+    host = host.replace(/\*/g, () => Math.floor(Math.random() * 10));
+
+    return newScheme + '://' + host + rest;
+  } else if (httpUrlMatch) {
+    newScheme = !httpUrlMatch[1] ? newSchemeBase : newSchemeBase + 's';
+    var urlAfterHttp = url.substr(httpUrlMatch[0].length);
+    url = newScheme + '://' + urlAfterHttp;
+  }
+
+  // Prefix FQDNs but not relative URLs
+  if (url.indexOf('://') === -1 && !url.startsWith('/')) {
+    url = newSchemeBase + '://' + url;
+  }
+
+  // XXX This is not what we should be doing: if I have a site
+  // deployed at "/foo", then DDP.connect("/") should actually connect
+  // to "/", not to "/foo". "/" is an absolute path. (Contrast: if
+  // deployed at "/foo", it would be reasonable for DDP.connect("bar")
+  // to connect to "/foo/bar").
+  //
+  // We should make this properly honor absolute paths rather than
+  // forcing the path to be relative to the site root. Simultaneously,
+  // we should set DDP_DEFAULT_CONNECTION_URL to include the site
+  // root. See also client_convenience.js #RationalizingRelativeDDPURLs
+  url = Meteor._relativeToSiteRootUrl(url);
+
+  if (url.endsWith('/')) return url + subPath;
+  else return url + '/' + subPath;
+}
+
+export function toWebsocketUrl(url) {
+  return translateUrl(url, 'ws', 'websocket');
+}
\ No newline at end of file
diff --git a/packages/webui/src/meteor/tracker.d.ts b/packages/webui/src/meteor/tracker.d.ts
new file mode 100644
index 0000000000..d210c0e408
--- /dev/null
+++ b/packages/webui/src/meteor/tracker.d.ts
@@ -0,0 +1,129 @@
+    /**
+     * The namespace for Tracker-related methods.
+     */
+    export namespace Tracker {
+        function Computation(): void;
+        /**
+         * A Computation object represents code that is repeatedly rerun
+         * in response to
+         * reactive data changes. Computations don't have return values; they just
+         * perform actions, such as rerendering a template on the screen. Computations
+         * are created using Tracker.autorun. Use stop to prevent further rerunning of a
+         * computation.
+         */
+        interface Computation {
+            /**
+             * True during the initial run of the computation at the time `Tracker.autorun` is called, and false on subsequent reruns and at other times.
+             */
+            firstRun: boolean;
+            /**
+             * Invalidates this computation so that it will be rerun.
+             */
+            invalidate(): void;
+            /**
+             * True if this computation has been invalidated (and not yet rerun), or if it has been stopped.
+             */
+            invalidated: boolean;
+            /**
+             * Registers `callback` to run when this computation is next invalidated, or runs it immediately if the computation is already invalidated.  The callback is run exactly once and not upon
+             * future invalidations unless `onInvalidate` is called again after the computation becomes valid again.
+             * @param callback Function to be called on invalidation. Receives one argument, the computation that was invalidated.
+             */
+            onInvalidate(callback: Function): void;
+            /**
+             * Registers `callback` to run when this computation is stopped, or runs it immediately if the computation is already stopped.  The callback is run after any `onInvalidate` callbacks.
+             * @param callback Function to be called on stop. Receives one argument, the computation that was stopped.
+             */
+            onStop(callback: Function): void;
+            /**
+             * Prevents this computation from rerunning.
+             */
+            stop(): void;
+            /**
+             * True if this computation has been stopped.
+             */
+            stopped: boolean;
+        }
+        /**
+         * The current computation, or `null` if there isn't one.  The current computation is the `Tracker.Computation` object created by the innermost active call to
+         * `Tracker.autorun`, and it's the computation that gains dependencies when reactive data sources are accessed.
+         */
+        var currentComputation: Computation;
+
+        var Dependency: DependencyStatic;
+        /**
+         * A Dependency represents an atomic unit of reactive data that a
+         * computation might depend on. Reactive data sources such as Session or
+         * Minimongo internally create different Dependency objects for different
+         * pieces of data, each of which may be depended on by multiple computations.
+         * When the data changes, the computations are invalidated.
+         */
+        interface DependencyStatic {
+            new (): Dependency;
+        }
+        interface Dependency {
+            /**
+             * Invalidate all dependent computations immediately and remove them as dependents.
+             */
+            changed(): void;
+            /**
+             * Declares that the current computation (or `fromComputation` if given) depends on `dependency`.  The computation will be invalidated the next time `dependency` changes.
+             * If there is no current computation and `depend()` is called with no arguments, it does nothing and returns false.
+             * Returns true if the computation is a new dependent of `dependency` rather than an existing one.
+             * @param fromComputation An optional computation declared to depend on `dependency` instead of the current computation.
+             */
+            depend(fromComputation?: Computation): boolean;
+            /**
+             * True if this Dependency has one or more dependent Computations, which would be invalidated if this Dependency were to change.
+             */
+            hasDependents(): boolean;
+        }
+
+        /**
+         * True if there is a current computation, meaning that dependencies on reactive data sources will be tracked and potentially cause the current computation to be rerun.
+         */
+        var active: boolean;
+
+        /**
+         * Schedules a function to be called during the next flush, or later in the current flush if one is in progress, after all invalidated computations have been rerun.  The function will be run
+         * once and not on subsequent flushes unless `afterFlush` is called again.
+         * @param callback A function to call at flush time.
+         */
+        function afterFlush(callback: Function): void;
+
+        /**
+         * Run a function now and rerun it later whenever its dependencies
+         * change. Returns a Computation object that can be used to stop or observe the
+         * rerunning.
+         * @param runFunc The function to run. It receives one argument: the Computation object that will be returned.
+         */
+        function autorun(
+            runFunc: (computation: Computation) => void,
+            options?: {
+                /**
+                 * The function to run when an error
+                 * happens in the Computation. The only argument it receives is the Error
+                 * thrown. Defaults to the error being logged to the console.
+                 */
+                onError?: Function | undefined;
+            },
+        ): Computation;
+
+        /**
+         * Process all reactive updates immediately and ensure that all invalidated computations are rerun.
+         */
+        function flush(): void;
+
+        /**
+         * Run a function without tracking dependencies.
+         * @param func A function to call immediately.
+         */
+        function nonreactive<T>(func: () => T): T;
+
+        /**
+         * Registers a new `onInvalidate` callback on the current computation (which must exist), to be called immediately when the current computation is invalidated or stopped.
+         * @param callback A callback function that will be invoked as `func(c)`, where `c` is the computation on which the callback is registered.
+         */
+        function onInvalidate(callback: Function): void;
+    }
+
diff --git a/packages/webui/src/meteor/tracker.js b/packages/webui/src/meteor/tracker.js
new file mode 100644
index 0000000000..d860e19087
--- /dev/null
+++ b/packages/webui/src/meteor/tracker.js
@@ -0,0 +1,611 @@
+// https://github.com/meteor/meteor/blob/73fd519de6eef8e116d813fb457c8442db9d1cdd/packages/tracker/tracker.js
+
+/////////////////////////////////////////////////////
+// Package docs at http://docs.meteor.com/#tracker //
+/////////////////////////////////////////////////////
+
+import { Meteor } from './meteor'
+
+export const a = 'a'
+
+/**
+ * @namespace Tracker
+ * @summary The namespace for Tracker-related methods.
+ */
+let Tracker = {}
+
+/**
+ * @namespace Deps
+ * @deprecated
+ */
+let Deps = Tracker
+
+// http://docs.meteor.com/#tracker_active
+
+/**
+ * @summary True if there is a current computation, meaning that dependencies on reactive data sources will be tracked and potentially cause the current computation to be rerun.
+ * @locus Client
+ * @type {Boolean}
+ */
+Tracker.active = false
+
+// http://docs.meteor.com/#tracker_currentcomputation
+
+/**
+ * @summary The current computation, or `null` if there isn't one.  The current computation is the [`Tracker.Computation`](#tracker_computation) object created by the innermost active call to `Tracker.autorun`, and it's the computation that gains dependencies when reactive data sources are accessed.
+ * @locus Client
+ * @type {Tracker.Computation}
+ */
+Tracker.currentComputation = null
+
+function setCurrentComputation(c) {
+	Tracker.currentComputation = c
+	Tracker.active = !!c
+}
+
+function _debugFunc() {
+	// We want this code to work without Meteor, and also without
+	// "console" (which is technically non-standard and may be missing
+	// on some browser we come across, like it was on IE 7).
+	//
+	// Lazy evaluation because `Meteor` does not exist right away.(??)
+	return typeof Meteor !== 'undefined'
+		? Meteor._debug
+		: typeof console !== 'undefined' && console.error
+		? function () {
+				console.error.apply(console, arguments)
+		  }
+		: function () {}
+}
+
+function _maybeSuppressMoreLogs(messagesLength) {
+	// Sometimes when running tests, we intentionally suppress logs on expected
+	// printed errors. Since the current implementation of _throwOrLog can log
+	// multiple separate log messages, suppress all of them if at least one suppress
+	// is expected as we still want them to count as one.
+	if (typeof Meteor !== 'undefined') {
+		if (Meteor._suppressed_log_expected()) {
+			Meteor._suppress_log(messagesLength - 1)
+		}
+	}
+}
+
+function _throwOrLog(from, e) {
+	if (throwFirstError) {
+		throw e
+	} else {
+		var printArgs = ['Exception from Tracker ' + from + ' function:']
+		if (e.stack && e.message && e.name) {
+			var idx = e.stack.indexOf(e.message)
+			if (idx < 0 || idx > e.name.length + 2) {
+				// check for "Error: "
+				// message is not part of the stack
+				var message = e.name + ': ' + e.message
+				printArgs.push(message)
+			}
+		}
+		printArgs.push(e.stack)
+		_maybeSuppressMoreLogs(printArgs.length)
+
+		for (var i = 0; i < printArgs.length; i++) {
+			_debugFunc()(printArgs[i])
+		}
+	}
+}
+
+var nextId = 1
+// computations whose callbacks we should call at flush time
+var pendingComputations = []
+// `true` if a Tracker.flush is scheduled, or if we are in Tracker.flush now
+var willFlush = false
+// `true` if we are in Tracker.flush now
+var inFlush = false
+// `true` if we are computing a computation now, either first time
+// or recompute.  This matches Tracker.active unless we are inside
+// Tracker.nonreactive, which nullfies currentComputation even though
+// an enclosing computation may still be running.
+var inCompute = false
+// `true` if the `_throwFirstError` option was passed in to the call
+// to Tracker.flush that we are in. When set, throw rather than log the
+// first error encountered while flushing. Before throwing the error,
+// finish flushing (from a finally block), logging any subsequent
+// errors.
+var throwFirstError = false
+
+var afterFlushCallbacks = []
+
+function requireFlush() {
+	if (!willFlush) {
+		// We want this code to work without Meteor, see debugFunc above
+		if (typeof Meteor !== 'undefined') Meteor._setImmediate(Tracker._runFlush)
+		else setTimeout(Tracker._runFlush, 0)
+		willFlush = true
+	}
+}
+
+// Tracker.Computation constructor is visible but private
+// (throws an error if you try to call it)
+var constructingComputation = false
+
+//
+// http://docs.meteor.com/#tracker_computation
+
+/**
+ * @summary A Computation object represents code that is repeatedly rerun
+ * in response to
+ * reactive data changes. Computations don't have return values; they just
+ * perform actions, such as rerendering a template on the screen. Computations
+ * are created using Tracker.autorun. Use stop to prevent further rerunning of a
+ * computation.
+ * @instancename computation
+ */
+Tracker.Computation = class Computation {
+	constructor(f, parent, onError) {
+		if (!constructingComputation) throw new Error('Tracker.Computation constructor is private; use Tracker.autorun')
+		constructingComputation = false
+
+		// http://docs.meteor.com/#computation_stopped
+
+		/**
+		 * @summary True if this computation has been stopped.
+		 * @locus Client
+		 * @memberOf Tracker.Computation
+		 * @instance
+		 * @name  stopped
+		 */
+		this.stopped = false
+
+		// http://docs.meteor.com/#computation_invalidated
+
+		/**
+		 * @summary True if this computation has been invalidated (and not yet rerun), or if it has been stopped.
+		 * @locus Client
+		 * @memberOf Tracker.Computation
+		 * @instance
+		 * @name  invalidated
+		 * @type {Boolean}
+		 */
+		this.invalidated = false
+
+		// http://docs.meteor.com/#computation_firstrun
+
+		/**
+		 * @summary True during the initial run of the computation at the time `Tracker.autorun` is called, and false on subsequent reruns and at other times.
+		 * @locus Client
+		 * @memberOf Tracker.Computation
+		 * @instance
+		 * @name  firstRun
+		 * @type {Boolean}
+		 */
+		this.firstRun = true
+
+		this._id = nextId++
+		this._onInvalidateCallbacks = []
+		this._onStopCallbacks = []
+		// the plan is at some point to use the parent relation
+		// to constrain the order that computations are processed
+		this._parent = parent
+		this._func = f
+		this._onError = onError
+		this._recomputing = false
+
+		var errored = true
+		try {
+			this._compute()
+			errored = false
+		} finally {
+			this.firstRun = false
+			if (errored) this.stop()
+		}
+	}
+
+	// http://docs.meteor.com/#computation_oninvalidate
+
+	/**
+	 * @summary Registers `callback` to run when this computation is next invalidated, or runs it immediately if the computation is already invalidated.  The callback is run exactly once and not upon future invalidations unless `onInvalidate` is called again after the computation becomes valid again.
+	 * @locus Client
+	 * @param {Function} callback Function to be called on invalidation. Receives one argument, the computation that was invalidated.
+	 */
+	onInvalidate(f) {
+		if (typeof f !== 'function') throw new Error('onInvalidate requires a function')
+
+		if (this.invalidated) {
+			Tracker.nonreactive(() => {
+				f(this)
+			})
+		} else {
+			this._onInvalidateCallbacks.push(f)
+		}
+	}
+
+	/**
+	 * @summary Registers `callback` to run when this computation is stopped, or runs it immediately if the computation is already stopped.  The callback is run after any `onInvalidate` callbacks.
+	 * @locus Client
+	 * @param {Function} callback Function to be called on stop. Receives one argument, the computation that was stopped.
+	 */
+	onStop(f) {
+		if (typeof f !== 'function') throw new Error('onStop requires a function')
+
+		if (this.stopped) {
+			Tracker.nonreactive(() => {
+				f(this)
+			})
+		} else {
+			this._onStopCallbacks.push(f)
+		}
+	}
+
+	// http://docs.meteor.com/#computation_invalidate
+
+	/**
+	 * @summary Invalidates this computation so that it will be rerun.
+	 * @locus Client
+	 */
+	invalidate() {
+		if (!this.invalidated) {
+			// if we're currently in _recompute(), don't enqueue
+			// ourselves, since we'll rerun immediately anyway.
+			if (!this._recomputing && !this.stopped) {
+				requireFlush()
+				pendingComputations.push(this)
+			}
+
+			this.invalidated = true
+
+			// callbacks can't add callbacks, because
+			// this.invalidated === true.
+			for (var i = 0, f; (f = this._onInvalidateCallbacks[i]); i++) {
+				Tracker.nonreactive(() => {
+					f(this)
+				})
+			}
+			this._onInvalidateCallbacks = []
+		}
+	}
+
+	// http://docs.meteor.com/#computation_stop
+
+	/**
+	 * @summary Prevents this computation from rerunning.
+	 * @locus Client
+	 */
+	stop() {
+		if (!this.stopped) {
+			this.stopped = true
+			this.invalidate()
+			for (var i = 0, f; (f = this._onStopCallbacks[i]); i++) {
+				Tracker.nonreactive(() => {
+					f(this)
+				})
+			}
+			this._onStopCallbacks = []
+		}
+	}
+
+	_compute() {
+		this.invalidated = false
+
+		var previous = Tracker.currentComputation
+		setCurrentComputation(this)
+		var previousInCompute = inCompute
+		inCompute = true
+		try {
+			this._func(this)
+		} finally {
+			setCurrentComputation(previous)
+			inCompute = previousInCompute
+		}
+	}
+
+	_needsRecompute() {
+		return this.invalidated && !this.stopped
+	}
+
+	_recompute() {
+		this._recomputing = true
+		try {
+			if (this._needsRecompute()) {
+				try {
+					this._compute()
+				} catch (e) {
+					if (this._onError) {
+						this._onError(e)
+					} else {
+						_throwOrLog('recompute', e)
+					}
+				}
+			}
+		} finally {
+			this._recomputing = false
+		}
+	}
+
+	/**
+	 * @summary Process the reactive updates for this computation immediately
+	 * and ensure that the computation is rerun. The computation is rerun only
+	 * if it is invalidated.
+	 * @locus Client
+	 */
+	flush() {
+		if (this._recomputing) return
+
+		this._recompute()
+	}
+
+	/**
+	 * @summary Causes the function inside this computation to run and
+	 * synchronously process all reactive updtes.
+	 * @locus Client
+	 */
+	run() {
+		this.invalidate()
+		this.flush()
+	}
+}
+
+//
+// http://docs.meteor.com/#tracker_dependency
+
+/**
+ * @summary A Dependency represents an atomic unit of reactive data that a
+ * computation might depend on. Reactive data sources such as Session or
+ * Minimongo internally create different Dependency objects for different
+ * pieces of data, each of which may be depended on by multiple computations.
+ * When the data changes, the computations are invalidated.
+ * @class
+ * @instanceName dependency
+ */
+Tracker.Dependency = class Dependency {
+	constructor() {
+		this._dependentsById = Object.create(null)
+	}
+
+	// http://docs.meteor.com/#dependency_depend
+	//
+	// Adds `computation` to this set if it is not already
+	// present.  Returns true if `computation` is a new member of the set.
+	// If no argument, defaults to currentComputation, or does nothing
+	// if there is no currentComputation.
+
+	/**
+    * @summary Declares that the current computation (or `fromComputation` if given) depends on `dependency`.  The computation will be invalidated the next time `dependency` changes.
+ 
+    If there is no current computation and `depend()` is called with no arguments, it does nothing and returns false.
+ 
+    Returns true if the computation is a new dependent of `dependency` rather than an existing one.
+    * @locus Client
+    * @param {Tracker.Computation} [fromComputation] An optional computation declared to depend on `dependency` instead of the current computation.
+    * @returns {Boolean}
+    */
+	depend(computation) {
+		if (!computation) {
+			if (!Tracker.active) return false
+
+			computation = Tracker.currentComputation
+		}
+		var id = computation._id
+		if (!(id in this._dependentsById)) {
+			this._dependentsById[id] = computation
+			computation.onInvalidate(() => {
+				delete this._dependentsById[id]
+			})
+			return true
+		}
+		return false
+	}
+
+	// http://docs.meteor.com/#dependency_changed
+
+	/**
+	 * @summary Invalidate all dependent computations immediately and remove them as dependents.
+	 * @locus Client
+	 */
+	changed() {
+		for (var id in this._dependentsById) this._dependentsById[id].invalidate()
+	}
+
+	// http://docs.meteor.com/#dependency_hasdependents
+
+	/**
+	 * @summary True if this Dependency has one or more dependent Computations, which would be invalidated if this Dependency were to change.
+	 * @locus Client
+	 * @returns {Boolean}
+	 */
+	hasDependents() {
+		for (var id in this._dependentsById) return true
+		return false
+	}
+}
+
+// http://docs.meteor.com/#tracker_flush
+
+/**
+ * @summary Process all reactive updates immediately and ensure that all invalidated computations are rerun.
+ * @locus Client
+ */
+Tracker.flush = function (options) {
+	Tracker._runFlush({ finishSynchronously: true, throwFirstError: options && options._throwFirstError })
+}
+
+/**
+ * @summary True if we are computing a computation now, either first time or recompute.  This matches Tracker.active unless we are inside Tracker.nonreactive, which nullfies currentComputation even though an enclosing computation may still be running.
+ * @locus Client
+ * @returns {Boolean}
+ */
+Tracker.inFlush = function () {
+	return inFlush
+}
+
+// Run all pending computations and afterFlush callbacks.  If we were not called
+// directly via Tracker.flush, this may return before they're all done to allow
+// the event loop to run a little before continuing.
+Tracker._runFlush = function (options) {
+	// XXX What part of the comment below is still true? (We no longer
+	// have Spark)
+	//
+	// Nested flush could plausibly happen if, say, a flush causes
+	// DOM mutation, which causes a "blur" event, which runs an
+	// app event handler that calls Tracker.flush.  At the moment
+	// Spark blocks event handlers during DOM mutation anyway,
+	// because the LiveRange tree isn't valid.  And we don't have
+	// any useful notion of a nested flush.
+	//
+	// https://app.asana.com/0/159908330244/385138233856
+	if (Tracker.inFlush()) throw new Error("Can't call Tracker.flush while flushing")
+
+	if (inCompute) throw new Error("Can't flush inside Tracker.autorun")
+
+	options = options || {}
+
+	inFlush = true
+	willFlush = true
+	throwFirstError = !!options.throwFirstError
+
+	var recomputedCount = 0
+	var finishedTry = false
+	try {
+		while (pendingComputations.length || afterFlushCallbacks.length) {
+			// recompute all pending computations
+			while (pendingComputations.length) {
+				var comp = pendingComputations.shift()
+				comp._recompute()
+				if (comp._needsRecompute()) {
+					pendingComputations.unshift(comp)
+				}
+
+				if (!options.finishSynchronously && ++recomputedCount > 1000) {
+					finishedTry = true
+					return
+				}
+			}
+
+			if (afterFlushCallbacks.length) {
+				// call one afterFlush callback, which may
+				// invalidate more computations
+				var func = afterFlushCallbacks.shift()
+				try {
+					func()
+				} catch (e) {
+					_throwOrLog('afterFlush', e)
+				}
+			}
+		}
+		finishedTry = true
+	} finally {
+		if (!finishedTry) {
+			// we're erroring due to throwFirstError being true.
+			inFlush = false // needed before calling `Tracker.flush()` again
+			// finish flushing
+			Tracker._runFlush({
+				finishSynchronously: options.finishSynchronously,
+				throwFirstError: false,
+			})
+		}
+		willFlush = false
+		inFlush = false
+		if (pendingComputations.length || afterFlushCallbacks.length) {
+			// We're yielding because we ran a bunch of computations and we aren't
+			// required to finish synchronously, so we'd like to give the event loop a
+			// chance. We should flush again soon.
+			if (options.finishSynchronously) {
+				throw new Error('still have more to do?') // shouldn't happen
+			}
+			setTimeout(requireFlush, 10)
+		}
+	}
+}
+
+// http://docs.meteor.com/#tracker_autorun
+//
+// Run f(). Record its dependencies. Rerun it whenever the
+// dependencies change.
+//
+// Returns a new Computation, which is also passed to f.
+//
+// Links the computation to the current computation
+// so that it is stopped if the current computation is invalidated.
+
+/**
+ * @callback Tracker.ComputationFunction
+ * @param {Tracker.Computation}
+ */
+/**
+ * @summary Run a function now and rerun it later whenever its dependencies
+ * change. Returns a Computation object that can be used to stop or observe the
+ * rerunning.
+ * @locus Client
+ * @param {Tracker.ComputationFunction} runFunc The function to run. It receives
+ * one argument: the Computation object that will be returned.
+ * @param {Object} [options]
+ * @param {Function} options.onError Optional. The function to run when an error
+ * happens in the Computation. The only argument it receives is the Error
+ * thrown. Defaults to the error being logged to the console.
+ * @returns {Tracker.Computation}
+ */
+Tracker.autorun = function (f, options) {
+	if (typeof f !== 'function') throw new Error('Tracker.autorun requires a function argument')
+
+	options = options || {}
+
+	constructingComputation = true
+	var c = new Tracker.Computation(f, Tracker.currentComputation, options.onError)
+
+	if (Tracker.active)
+		Tracker.onInvalidate(function () {
+			c.stop()
+		})
+
+	return c
+}
+
+// http://docs.meteor.com/#tracker_nonreactive
+//
+// Run `f` with no current computation, returning the return value
+// of `f`.  Used to turn off reactivity for the duration of `f`,
+// so that reactive data sources accessed by `f` will not result in any
+// computations being invalidated.
+
+/**
+ * @summary Run a function without tracking dependencies.
+ * @locus Client
+ * @param {Function} func A function to call immediately.
+ */
+Tracker.nonreactive = function (f) {
+	var previous = Tracker.currentComputation
+	setCurrentComputation(null)
+	try {
+		return f()
+	} finally {
+		setCurrentComputation(previous)
+	}
+}
+
+// http://docs.meteor.com/#tracker_oninvalidate
+
+/**
+ * @summary Registers a new [`onInvalidate`](#computation_oninvalidate) callback on the current computation (which must exist), to be called immediately when the current computation is invalidated or stopped.
+ * @locus Client
+ * @param {Function} callback A callback function that will be invoked as `func(c)`, where `c` is the computation on which the callback is registered.
+ */
+Tracker.onInvalidate = function (f) {
+	if (!Tracker.active) throw new Error('Tracker.onInvalidate requires a currentComputation')
+
+	Tracker.currentComputation.onInvalidate(f)
+}
+
+// http://docs.meteor.com/#tracker_afterflush
+
+/**
+ * @summary Schedules a function to be called during the next flush, or later in the current flush if one is in progress, after all invalidated computations have been rerun.  The function will be run once and not on subsequent flushes unless `afterFlush` is called again.
+ * @locus Client
+ * @param {Function} callback A function to call at flush time.
+ */
+Tracker.afterFlush = function (f) {
+	afterFlushCallbacks.push(f)
+	requireFlush()
+}
+
+window.Tracker = Tracker
+window.Deps = Deps
+
+export { Tracker }
diff --git a/meteor/lib/typings/cubic-spline.d.ts b/packages/webui/src/typings/cubic-spline.d.ts
similarity index 100%
rename from meteor/lib/typings/cubic-spline.d.ts
rename to packages/webui/src/typings/cubic-spline.d.ts
diff --git a/meteor/lib/typings/react-time-hoc.d.ts b/packages/webui/src/typings/react-time-hoc.d.ts
similarity index 100%
rename from meteor/lib/typings/react-time-hoc.d.ts
rename to packages/webui/src/typings/react-time-hoc.d.ts
diff --git a/packages/webui/src/typings/velocity.d.ts b/packages/webui/src/typings/velocity.d.ts
new file mode 100644
index 0000000000..2b3b7e0e86
--- /dev/null
+++ b/packages/webui/src/typings/velocity.d.ts
@@ -0,0 +1,7 @@
+declare module 'velocity-animate' {
+	function Velocity(target: HTMLElement, command: string, commandProps?: Record<string, any>): void
+	function Velocity(target: HTMLElement, command: string, stopAll?: boolean): void
+	function Velocity(target: HTMLElement, props: Record<string, any>, animationProps: Record<string, any>): void
+
+	export default Velocity
+}
diff --git a/packages/webui/src/vite-env.d.ts b/packages/webui/src/vite-env.d.ts
new file mode 100644
index 0000000000..54eaa07222
--- /dev/null
+++ b/packages/webui/src/vite-env.d.ts
@@ -0,0 +1,3 @@
+/// <reference types="vite/client" />
+
+declare const __APP_VERSION__: string
diff --git a/packages/webui/tsconfig.app.json b/packages/webui/tsconfig.app.json
new file mode 100644
index 0000000000..f5b437428c
--- /dev/null
+++ b/packages/webui/tsconfig.app.json
@@ -0,0 +1,31 @@
+{
+	"compilerOptions": {
+		"composite": true,
+		"tsBuildInfoFile": "./node_modules/.tmp/tsconfig.app.tsbuildinfo",
+		"target": "ES2020",
+		"useDefineForClassFields": true,
+		"lib": ["ES2020", "DOM", "DOM.Iterable"],
+		"module": "ESNext",
+		"skipLibCheck": true,
+
+		/* Bundler mode */
+		"moduleResolution": "bundler",
+		"allowImportingTsExtensions": true,
+		"resolveJsonModule": true,
+		"isolatedModules": true,
+		"moduleDetection": "force",
+		"noEmit": true,
+		"jsx": "react-jsx",
+
+		/* Linting */
+		"strict": true,
+		"noUnusedLocals": true,
+		"noUnusedParameters": true,
+		"noFallthroughCasesInSwitch": true,
+
+		"paths": {
+			"meteor/*": ["./src/meteor/*"]
+		}
+	},
+	"include": ["src"]
+}
diff --git a/packages/webui/tsconfig.eslint.json b/packages/webui/tsconfig.eslint.json
new file mode 100644
index 0000000000..1f9e801004
--- /dev/null
+++ b/packages/webui/tsconfig.eslint.json
@@ -0,0 +1,7 @@
+{
+	"extends": "./tsconfig.app.json",
+	"compilerOptions": {
+		"esModuleInterop": true,
+		"moduleResolution": "node"
+	}
+}
diff --git a/packages/webui/tsconfig.jest.json b/packages/webui/tsconfig.jest.json
new file mode 100644
index 0000000000..f5366185fc
--- /dev/null
+++ b/packages/webui/tsconfig.jest.json
@@ -0,0 +1,6 @@
+{
+	"extends": "./tsconfig.app.json",
+	"compilerOptions": {
+		"esModuleInterop": true
+	}
+}
diff --git a/packages/webui/tsconfig.json b/packages/webui/tsconfig.json
new file mode 100644
index 0000000000..ea9d0cd825
--- /dev/null
+++ b/packages/webui/tsconfig.json
@@ -0,0 +1,11 @@
+{
+  "files": [],
+  "references": [
+    {
+      "path": "./tsconfig.app.json"
+    },
+    {
+      "path": "./tsconfig.node.json"
+    }
+  ]
+}
diff --git a/packages/webui/tsconfig.node.json b/packages/webui/tsconfig.node.json
new file mode 100644
index 0000000000..8bd15b7dc1
--- /dev/null
+++ b/packages/webui/tsconfig.node.json
@@ -0,0 +1,14 @@
+{
+	"compilerOptions": {
+		"composite": true,
+		"tsBuildInfoFile": "./node_modules/.tmp/tsconfig.node.tsbuildinfo",
+		"skipLibCheck": true,
+		"module": "ESNext",
+		"target": "ES2022",
+		"moduleResolution": "bundler",
+		"allowSyntheticDefaultImports": true,
+		"strict": true,
+		"noEmit": true
+	},
+	"include": ["vite.config.mts"]
+}
diff --git a/packages/webui/vite.config.mts b/packages/webui/vite.config.mts
new file mode 100644
index 0000000000..86666f92e3
--- /dev/null
+++ b/packages/webui/vite.config.mts
@@ -0,0 +1,74 @@
+import { defineConfig } from 'vite'
+import react from '@vitejs/plugin-react'
+import tsconfigPaths from 'vite-tsconfig-paths'
+import { nodePolyfills } from 'vite-plugin-node-polyfills'
+import path from 'path'
+import fs from 'fs/promises'
+
+const commonJsPaths: string[] = []
+
+async function findCommonJsPathsForLibrary(prefix: string, rootPath: string) {
+	const filenames = await fs.readdir(rootPath)
+	for (const name of filenames) {
+		const stat = await fs.stat(path.join(rootPath, name))
+		if (stat.isDirectory()) {
+			await findCommonJsPathsForLibrary(path.join(prefix, name), path.join(rootPath, name))
+		} else if (name.endsWith('.js')) {
+			commonJsPaths.push(path.join(prefix, name.slice(0, -3)))
+		}
+	}
+}
+
+// Hack: vite doesn't like commonjs dependencies unless the import paths are named explicitly
+await Promise.all([
+	findCommonJsPathsForLibrary('@sofie-automation/corelib/dist', '../corelib/dist'),
+	findCommonJsPathsForLibrary('@sofie-automation/shared-lib/dist', '../shared-lib/dist'),
+	findCommonJsPathsForLibrary('@sofie-automation/meteor-lib/dist', '../meteor-lib/dist'),
+])
+
+// https://vitejs.dev/config/
+export default defineConfig({
+	plugins: [react(), tsconfigPaths(), nodePolyfills()],
+
+	optimizeDeps: {
+		include: [
+			// Add all sofie paths, ensuring they use unix path syntax
+			...commonJsPaths.map((p) => p.replaceAll('\\', '/')),
+
+			// Commonjs monorepo dependencies
+			'@sofie-automation/blueprints-integration',
+		],
+	},
+	build: {
+		commonjsOptions: {
+			include: [/shared-lib/, /meteor-lib/, /corelib/, /blueprints-integration/, /node_modules/],
+		},
+		chunkSizeWarningLimit: 10000,
+	},
+
+	resolve: {
+		mainFields: [], // the presence of this is a weird fix for react-moment
+	},
+
+	define: {
+		__APP_VERSION__: JSON.stringify(process.env.npm_package_version),
+	},
+
+	server: {
+		proxy: {
+			'/api': 'http://127.0.0.1:3000',
+			'/site.webmanifest': 'http://127.0.0.1:3000',
+			'/meteor-runtime-config.js': 'http://127.0.0.1:3000',
+		},
+	},
+
+	// TODO: old meteor recompile instructions?
+	// "nodeModules": {
+	// 	"recompile": {
+	// 		"@mos-connection/helper": "legacy",
+	// 		"@mos-connection/model": "legacy",
+	// 		"@sofie-automation/corelib": "legacy",
+	// 		"@sofie-automation/shared-lib": "legacy"
+	// 	}
+	// }
+})
diff --git a/packages/yarn.lock b/packages/yarn.lock
index 274d7fb2f3..ac3dffc9e2 100644
--- a/packages/yarn.lock
+++ b/packages/yarn.lock
@@ -277,27 +277,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@asyncapi/generator-react-sdk@npm:1.0.20":
-  version: 1.0.20
-  resolution: "@asyncapi/generator-react-sdk@npm:1.0.20"
-  dependencies:
-    "@asyncapi/parser": ^3.1.0
-    "@babel/core": 7.12.9
-    "@babel/preset-env": ^7.12.7
-    "@babel/preset-react": ^7.12.7
-    "@rollup/plugin-babel": ^5.2.1
-    babel-plugin-source-map-support: ^2.1.3
-    prop-types: ^15.7.2
-    react: ^17.0.1
-    rollup: ^2.60.1
-    source-map-support: ^0.5.19
-  checksum: 59473d68935b939027c09da821fac794034020880dc3451c1486c63a6c486e7807abc604d97271dfcf15d4d0f060f8f119e5877c6b81b143661af77f8ad3f545
-  languageName: node
-  linkType: hard
-
-"@asyncapi/generator-react-sdk@patch:@asyncapi/generator-react-sdk@npm%3A1.0.20#./.yarn/patches/@asyncapi-generator-react-sdk-npm-1.0.20-af18b2f42b.patch::locator=packages%40workspace%3A.":
-  version: 1.0.20
-  resolution: "@asyncapi/generator-react-sdk@patch:@asyncapi/generator-react-sdk@npm%3A1.0.20#./.yarn/patches/@asyncapi-generator-react-sdk-npm-1.0.20-af18b2f42b.patch::version=1.0.20&hash=4ff360&locator=packages%40workspace%3A."
+"@asyncapi/generator-react-sdk@npm:^1.0.18, @asyncapi/generator-react-sdk@npm:^1.1.1":
+  version: 1.1.2
+  resolution: "@asyncapi/generator-react-sdk@npm:1.1.2"
   dependencies:
     "@asyncapi/parser": ^3.1.0
     "@babel/core": 7.12.9
@@ -309,7 +291,7 @@ __metadata:
     react: ^17.0.1
     rollup: ^2.60.1
     source-map-support: ^0.5.19
-  checksum: dc34d29fd0e043ed225adf920f0899b4885425504a9aae507317cc4d9d4edff98adbadb3618fb813a52e147b4084eca1ac40618427fb6c4c71c5943e1f053c0e
+  checksum: 431ff8bfc7e131797af3d4377130742be49ec50ac4095458faf3851fdcfd75e0622e5cd8be3d8a2029c0bf0a8f134b2765873d78d9fda278475cea191bcf2cd0
   languageName: node
   linkType: hard
 
@@ -349,18 +331,18 @@ __metadata:
   linkType: hard
 
 "@asyncapi/html-template@npm:^2.3.9":
-  version: 2.3.9
-  resolution: "@asyncapi/html-template@npm:2.3.9"
+  version: 2.3.12
+  resolution: "@asyncapi/html-template@npm:2.3.12"
   dependencies:
-    "@asyncapi/generator-react-sdk": ^1.0.20
+    "@asyncapi/generator-react-sdk": ^1.1.1
     "@asyncapi/parser": ^3.1.0
     "@asyncapi/react-component": ^1.2.13
     highlight.js: 10.7.3
-    puppeteer: ^14.1.0
+    puppeteer: ^23.2.0
     react-dom: ^17.0.2
     rimraf: ^3.0.2
     sync-fetch: ^0.5.2
-  checksum: b48a51027decb9e1ebbeaafebbc2539f7b91c2fca0b241201d7cbd7bb10cd44206ecaa756001a252599e631ae80ef7e64f4617a7fba057684db0a0547e0033f2
+  checksum: c78f6475deffbb76dee58815f11b47809152420dc2a8cdc499f93cb8c6b53397992cda4695f7c47a43f3f6b5335db1a88fac2ab7d0b6cb09cc6e1a3738b07db8
   languageName: node
   linkType: hard
 
@@ -426,14 +408,14 @@ __metadata:
   linkType: hard
 
 "@asyncapi/raml-dt-schema-parser@npm:^4.0.4":
-  version: 4.0.15
-  resolution: "@asyncapi/raml-dt-schema-parser@npm:4.0.15"
+  version: 4.0.24
+  resolution: "@asyncapi/raml-dt-schema-parser@npm:4.0.24"
   dependencies:
-    "@asyncapi/parser": ^3.0.7
+    "@asyncapi/parser": ^3.1.0
     js-yaml: ^4.1.0
     ramldt2jsonschema: ^1.2.3
     webapi-parser: ^0.5.0
-  checksum: c5cea6c723465cf0a4d41c203571636dc279e9a40eac0fba0798854bb489489f5c37e7c94b2118f768e4f69ab866937ebc3923ebc4402cfb75417e6c69ad9c0a
+  checksum: fc86d3ece552a0e33848d97ed9d32ec369e3ca954728704a43e80363d9c45d3f16fcb841a72471c6efbcabb82837a8e3789907bdd9b23a99368af568b62347f0
   languageName: node
   linkType: hard
 
@@ -475,20 +457,20 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/code-frame@npm:^7.0.0, @babel/code-frame@npm:^7.10.4, @babel/code-frame@npm:^7.12.13, @babel/code-frame@npm:^7.16.0, @babel/code-frame@npm:^7.23.5, @babel/code-frame@npm:^7.24.1, @babel/code-frame@npm:^7.24.2, @babel/code-frame@npm:^7.8.3":
-  version: 7.24.2
-  resolution: "@babel/code-frame@npm:7.24.2"
+"@babel/code-frame@npm:^7.0.0, @babel/code-frame@npm:^7.10.4, @babel/code-frame@npm:^7.12.13, @babel/code-frame@npm:^7.16.0, @babel/code-frame@npm:^7.24.7, @babel/code-frame@npm:^7.8.3":
+  version: 7.24.7
+  resolution: "@babel/code-frame@npm:7.24.7"
   dependencies:
-    "@babel/highlight": ^7.24.2
+    "@babel/highlight": ^7.24.7
     picocolors: ^1.0.0
-  checksum: 70e867340cfe09ca5488b2f36372c45cabf43c79a5b6426e6df5ef0611ff5dfa75a57dda841895693de6008f32c21a7c97027a8c7bcabd63a7d17416cbead6f8
+  checksum: 830e62cd38775fdf84d612544251ce773d544a8e63df667728cc9e0126eeef14c6ebda79be0f0bc307e8318316b7f58c27ce86702e0a1f5c321d842eb38ffda4
   languageName: node
   linkType: hard
 
-"@babel/compat-data@npm:^7.22.6, @babel/compat-data@npm:^7.23.5, @babel/compat-data@npm:^7.24.4":
-  version: 7.24.4
-  resolution: "@babel/compat-data@npm:7.24.4"
-  checksum: 52ce371658dc7796c9447c9cb3b9c0659370d141b76997f21c5e0028cca4d026ca546b84bc8d157ce7ca30bd353d89f9238504eb8b7aefa9b1f178b4c100c2d4
+"@babel/compat-data@npm:^7.22.6, @babel/compat-data@npm:^7.24.8":
+  version: 7.24.9
+  resolution: "@babel/compat-data@npm:7.24.9"
+  checksum: 3590be0f7028bca0565a83f66752c0f0283b818e9e1bb7fc12912822768e379a6ff84c59d77dc64ba62c140b8500a3828d95c0ce013cd62d254a179bae38709b
   languageName: node
   linkType: hard
 
@@ -516,101 +498,102 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/core@npm:^7.11.6, @babel/core@npm:^7.12.3, @babel/core@npm:^7.19.6, @babel/core@npm:^7.23.3, @babel/core@npm:^7.23.9":
-  version: 7.24.4
-  resolution: "@babel/core@npm:7.24.4"
+"@babel/core@npm:^7.11.6, @babel/core@npm:^7.12.3, @babel/core@npm:^7.19.6, @babel/core@npm:^7.23.3, @babel/core@npm:^7.23.9, @babel/core@npm:^7.24.5":
+  version: 7.24.9
+  resolution: "@babel/core@npm:7.24.9"
   dependencies:
     "@ampproject/remapping": ^2.2.0
-    "@babel/code-frame": ^7.24.2
-    "@babel/generator": ^7.24.4
-    "@babel/helper-compilation-targets": ^7.23.6
-    "@babel/helper-module-transforms": ^7.23.3
-    "@babel/helpers": ^7.24.4
-    "@babel/parser": ^7.24.4
-    "@babel/template": ^7.24.0
-    "@babel/traverse": ^7.24.1
-    "@babel/types": ^7.24.0
+    "@babel/code-frame": ^7.24.7
+    "@babel/generator": ^7.24.9
+    "@babel/helper-compilation-targets": ^7.24.8
+    "@babel/helper-module-transforms": ^7.24.9
+    "@babel/helpers": ^7.24.8
+    "@babel/parser": ^7.24.8
+    "@babel/template": ^7.24.7
+    "@babel/traverse": ^7.24.8
+    "@babel/types": ^7.24.9
     convert-source-map: ^2.0.0
     debug: ^4.1.0
     gensync: ^1.0.0-beta.2
     json5: ^2.2.3
     semver: ^6.3.1
-  checksum: 15ecad7581f3329995956ba461961b1af7bed48901f14fe962ccd3217edca60049e9e6ad4ce48134618397e6c90230168c842e2c28e47ef1f16c97dbbf663c61
+  checksum: eae273bee154d6a059e742a2bb7a58b03438a1f70d7909887a28258b29556dc99bcd5cbd41f13cd4755a20b0baf5e82731acb1d3690e02b7a9300fb6d1950e2c
   languageName: node
   linkType: hard
 
-"@babel/generator@npm:^7.12.5, @babel/generator@npm:^7.23.3, @babel/generator@npm:^7.24.1, @babel/generator@npm:^7.24.4, @babel/generator@npm:^7.7.2":
-  version: 7.24.4
-  resolution: "@babel/generator@npm:7.24.4"
+"@babel/generator@npm:^7.12.5, @babel/generator@npm:^7.23.3, @babel/generator@npm:^7.24.9, @babel/generator@npm:^7.25.0, @babel/generator@npm:^7.7.2":
+  version: 7.25.0
+  resolution: "@babel/generator@npm:7.25.0"
   dependencies:
-    "@babel/types": ^7.24.0
+    "@babel/types": ^7.25.0
     "@jridgewell/gen-mapping": ^0.3.5
     "@jridgewell/trace-mapping": ^0.3.25
     jsesc: ^2.5.1
-  checksum: 1b6146c31386c9df3eb594a2c36b5c98da4f67f7c06edb3d68a442b92516b21bb5ba3ad7dbe0058fe76625ed24d66923e15c95b0df75ef1907d4068921a699b8
+  checksum: bf25649dde4068bff8e387319bf820f2cb3b1af7b8c0cfba0bd90880656427c8bad96cd5cb6db7058d20cffe93149ee59da16567018ceaa21ecaefbf780a785c
   languageName: node
   linkType: hard
 
-"@babel/helper-annotate-as-pure@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/helper-annotate-as-pure@npm:7.22.5"
+"@babel/helper-annotate-as-pure@npm:^7.22.5, @babel/helper-annotate-as-pure@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/helper-annotate-as-pure@npm:7.24.7"
   dependencies:
-    "@babel/types": ^7.22.5
-  checksum: 53da330f1835c46f26b7bf4da31f7a496dee9fd8696cca12366b94ba19d97421ce519a74a837f687749318f94d1a37f8d1abcbf35e8ed22c32d16373b2f6198d
+    "@babel/types": ^7.24.7
+  checksum: 6178566099a6a0657db7a7fa601a54fb4731ca0b8614fbdccfd8e523c210c13963649bc8fdfd53ce7dd14d05e3dda2fb22dea5b30113c488b9eb1a906d60212e
   languageName: node
   linkType: hard
 
-"@babel/helper-builder-binary-assignment-operator-visitor@npm:^7.22.15":
-  version: 7.22.15
-  resolution: "@babel/helper-builder-binary-assignment-operator-visitor@npm:7.22.15"
+"@babel/helper-builder-binary-assignment-operator-visitor@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/helper-builder-binary-assignment-operator-visitor@npm:7.24.7"
   dependencies:
-    "@babel/types": ^7.22.15
-  checksum: 639c697a1c729f9fafa2dd4c9af2e18568190299b5907bd4c2d0bc818fcbd1e83ffeecc2af24327a7faa7ac4c34edd9d7940510a5e66296c19bad17001cf5c7a
+    "@babel/traverse": ^7.24.7
+    "@babel/types": ^7.24.7
+  checksum: 71a6158a9fdebffb82fdc400d5555ba8f2e370cea81a0d578155877bdc4db7d5252b75c43b2fdf3f72b3f68348891f99bd35ae315542daad1b7ace8322b1abcb
   languageName: node
   linkType: hard
 
-"@babel/helper-compilation-targets@npm:^7.22.6, @babel/helper-compilation-targets@npm:^7.23.6":
-  version: 7.23.6
-  resolution: "@babel/helper-compilation-targets@npm:7.23.6"
+"@babel/helper-compilation-targets@npm:^7.22.6, @babel/helper-compilation-targets@npm:^7.24.7, @babel/helper-compilation-targets@npm:^7.24.8":
+  version: 7.24.8
+  resolution: "@babel/helper-compilation-targets@npm:7.24.8"
   dependencies:
-    "@babel/compat-data": ^7.23.5
-    "@babel/helper-validator-option": ^7.23.5
-    browserslist: ^4.22.2
+    "@babel/compat-data": ^7.24.8
+    "@babel/helper-validator-option": ^7.24.8
+    browserslist: ^4.23.1
     lru-cache: ^5.1.1
     semver: ^6.3.1
-  checksum: c630b98d4527ac8fe2c58d9a06e785dfb2b73ec71b7c4f2ddf90f814b5f75b547f3c015f110a010fd31f76e3864daaf09f3adcd2f6acdbfb18a8de3a48717590
+  checksum: 40c9e87212fffccca387504b259a629615d7df10fc9080c113da6c51095d3e8b622a1409d9ed09faf2191628449ea28d582179c5148e2e993a3140234076b8da
   languageName: node
   linkType: hard
 
-"@babel/helper-create-class-features-plugin@npm:^7.24.1, @babel/helper-create-class-features-plugin@npm:^7.24.4":
-  version: 7.24.4
-  resolution: "@babel/helper-create-class-features-plugin@npm:7.24.4"
+"@babel/helper-create-class-features-plugin@npm:^7.24.4, @babel/helper-create-class-features-plugin@npm:^7.24.7":
+  version: 7.24.8
+  resolution: "@babel/helper-create-class-features-plugin@npm:7.24.8"
   dependencies:
-    "@babel/helper-annotate-as-pure": ^7.22.5
-    "@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.24.1
-    "@babel/helper-skip-transparent-expression-wrappers": ^7.22.5
-    "@babel/helper-split-export-declaration": ^7.22.6
+    "@babel/helper-annotate-as-pure": ^7.24.7
+    "@babel/helper-environment-visitor": ^7.24.7
+    "@babel/helper-function-name": ^7.24.7
+    "@babel/helper-member-expression-to-functions": ^7.24.8
+    "@babel/helper-optimise-call-expression": ^7.24.7
+    "@babel/helper-replace-supers": ^7.24.7
+    "@babel/helper-skip-transparent-expression-wrappers": ^7.24.7
+    "@babel/helper-split-export-declaration": ^7.24.7
     semver: ^6.3.1
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: 75b0a51ae1f7232932559779b78711c271404d02d069156d1bd9a7982c165c5134058d2ec2d8b5f2e42026ee4f52ba2a30c86a7aa3bce6b5fd0991eb721abc8c
+  checksum: b4707e2c4a2cb504d7656168d887bf653db6fbe8ece4502e28e5798f2ec624dc606f2d6bc4820d31b4dc1b80f7d83d98db83516dda321a76c075e5f531abed0b
   languageName: node
   linkType: hard
 
-"@babel/helper-create-regexp-features-plugin@npm:^7.18.6, @babel/helper-create-regexp-features-plugin@npm:^7.22.15, @babel/helper-create-regexp-features-plugin@npm:^7.22.5":
-  version: 7.22.15
-  resolution: "@babel/helper-create-regexp-features-plugin@npm:7.22.15"
+"@babel/helper-create-regexp-features-plugin@npm:^7.18.6, @babel/helper-create-regexp-features-plugin@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/helper-create-regexp-features-plugin@npm:7.24.7"
   dependencies:
-    "@babel/helper-annotate-as-pure": ^7.22.5
+    "@babel/helper-annotate-as-pure": ^7.24.7
     regexpu-core: ^5.3.1
     semver: ^6.3.1
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: 0243b8d4854f1dc8861b1029a46d3f6393ad72f366a5a08e36a4648aa682044f06da4c6e87a456260e1e1b33c999f898ba591a0760842c1387bcc93fbf2151a6
+  checksum: 17c59fa222af50f643946eca940ce1d474ff2da1f4afed2312687ab9d708ebbb8c9372754ddbdf44b6e21ead88b8fc144644f3a7b63ccb886de002458cef3974
   languageName: node
   linkType: hard
 
@@ -629,243 +612,249 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-environment-visitor@npm:^7.22.20":
-  version: 7.22.20
-  resolution: "@babel/helper-environment-visitor@npm:7.22.20"
-  checksum: d80ee98ff66f41e233f36ca1921774c37e88a803b2f7dca3db7c057a5fea0473804db9fb6729e5dbfd07f4bed722d60f7852035c2c739382e84c335661590b69
+"@babel/helper-environment-visitor@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/helper-environment-visitor@npm:7.24.7"
+  dependencies:
+    "@babel/types": ^7.24.7
+  checksum: 079d86e65701b29ebc10baf6ed548d17c19b808a07aa6885cc141b690a78581b180ee92b580d755361dc3b16adf975b2d2058b8ce6c86675fcaf43cf22f2f7c6
   languageName: node
   linkType: hard
 
-"@babel/helper-function-name@npm:^7.22.5, @babel/helper-function-name@npm:^7.23.0":
-  version: 7.23.0
-  resolution: "@babel/helper-function-name@npm:7.23.0"
+"@babel/helper-function-name@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/helper-function-name@npm:7.24.7"
   dependencies:
-    "@babel/template": ^7.22.15
-    "@babel/types": ^7.23.0
-  checksum: e44542257b2d4634a1f979244eb2a4ad8e6d75eb6761b4cfceb56b562f7db150d134bc538c8e6adca3783e3bc31be949071527aa8e3aab7867d1ad2d84a26e10
+    "@babel/template": ^7.24.7
+    "@babel/types": ^7.24.7
+  checksum: 142ee08922074dfdc0ff358e09ef9f07adf3671ab6eef4fca74dcf7a551f1a43717e7efa358c9e28d7eea84c28d7f177b7a58c70452fc312ae3b1893c5dab2a4
   languageName: node
   linkType: hard
 
-"@babel/helper-hoist-variables@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/helper-hoist-variables@npm:7.22.5"
+"@babel/helper-hoist-variables@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/helper-hoist-variables@npm:7.24.7"
   dependencies:
-    "@babel/types": ^7.22.5
-  checksum: 394ca191b4ac908a76e7c50ab52102669efe3a1c277033e49467913c7ed6f7c64d7eacbeabf3bed39ea1f41731e22993f763b1edce0f74ff8563fd1f380d92cc
+    "@babel/types": ^7.24.7
+  checksum: 6cfdcf2289cd12185dcdbdf2435fa8d3447b797ac75851166de9fc8503e2fd0021db6baf8dfbecad3753e582c08e6a3f805c8d00cbed756060a877d705bd8d8d
   languageName: node
   linkType: hard
 
-"@babel/helper-member-expression-to-functions@npm:^7.23.0":
-  version: 7.23.0
-  resolution: "@babel/helper-member-expression-to-functions@npm:7.23.0"
+"@babel/helper-member-expression-to-functions@npm:^7.24.8":
+  version: 7.24.8
+  resolution: "@babel/helper-member-expression-to-functions@npm:7.24.8"
   dependencies:
-    "@babel/types": ^7.23.0
-  checksum: 494659361370c979ada711ca685e2efe9460683c36db1b283b446122596602c901e291e09f2f980ecedfe6e0f2bd5386cb59768285446530df10c14df1024e75
+    "@babel/traverse": ^7.24.8
+    "@babel/types": ^7.24.8
+  checksum: bf923d05d81b06857f4ca4fe9c528c9c447a58db5ea39595bb559eae2fce01a8266173db0fd6a2ec129d7bbbb9bb22f4e90008252f7c66b422c76630a878a4bc
   languageName: node
   linkType: hard
 
-"@babel/helper-module-imports@npm:^7.10.4, @babel/helper-module-imports@npm:^7.16.7, @babel/helper-module-imports@npm:^7.22.15, @babel/helper-module-imports@npm:^7.24.1, @babel/helper-module-imports@npm:^7.24.3":
-  version: 7.24.3
-  resolution: "@babel/helper-module-imports@npm:7.24.3"
+"@babel/helper-module-imports@npm:^7.10.4, @babel/helper-module-imports@npm:^7.16.7, @babel/helper-module-imports@npm:^7.22.15, @babel/helper-module-imports@npm:^7.24.3, @babel/helper-module-imports@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/helper-module-imports@npm:7.24.7"
   dependencies:
-    "@babel/types": ^7.24.0
-  checksum: c23492189ba97a1ec7d37012336a5661174e8b88194836b6bbf90d13c3b72c1db4626263c654454986f924c6da8be7ba7f9447876d709cd00bd6ffde6ec00796
+    "@babel/traverse": ^7.24.7
+    "@babel/types": ^7.24.7
+  checksum: 8ac15d96d262b8940bc469052a048e06430bba1296369be695fabdf6799f201dd0b00151762b56012a218464e706bc033f27c07f6cec20c6f8f5fd6543c67054
   languageName: node
   linkType: hard
 
-"@babel/helper-module-transforms@npm:^7.12.1, @babel/helper-module-transforms@npm:^7.23.3":
-  version: 7.23.3
-  resolution: "@babel/helper-module-transforms@npm:7.23.3"
+"@babel/helper-module-transforms@npm:^7.12.1, @babel/helper-module-transforms@npm:^7.24.7, @babel/helper-module-transforms@npm:^7.24.8, @babel/helper-module-transforms@npm:^7.24.9":
+  version: 7.24.9
+  resolution: "@babel/helper-module-transforms@npm:7.24.9"
   dependencies:
-    "@babel/helper-environment-visitor": ^7.22.20
-    "@babel/helper-module-imports": ^7.22.15
-    "@babel/helper-simple-access": ^7.22.5
-    "@babel/helper-split-export-declaration": ^7.22.6
-    "@babel/helper-validator-identifier": ^7.22.20
+    "@babel/helper-environment-visitor": ^7.24.7
+    "@babel/helper-module-imports": ^7.24.7
+    "@babel/helper-simple-access": ^7.24.7
+    "@babel/helper-split-export-declaration": ^7.24.7
+    "@babel/helper-validator-identifier": ^7.24.7
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: 5d0895cfba0e16ae16f3aa92fee108517023ad89a855289c4eb1d46f7aef4519adf8e6f971e1d55ac20c5461610e17213f1144097a8f932e768a9132e2278d71
+  checksum: ffcf11b678a8d3e6a243285cb5262c37f4d47d507653420c1f7f0bd27076e88177f2b7158850d1a470fcfe923426a2e6571c554c455a90c9755ff488ac36ac40
   languageName: node
   linkType: hard
 
-"@babel/helper-optimise-call-expression@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/helper-optimise-call-expression@npm:7.22.5"
+"@babel/helper-optimise-call-expression@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/helper-optimise-call-expression@npm:7.24.7"
   dependencies:
-    "@babel/types": ^7.22.5
-  checksum: c70ef6cc6b6ed32eeeec4482127e8be5451d0e5282d5495d5d569d39eb04d7f1d66ec99b327f45d1d5842a9ad8c22d48567e93fc502003a47de78d122e355f7c
+    "@babel/types": ^7.24.7
+  checksum: 280654eaf90e92bf383d7eed49019573fb35a98c9e992668f701ad099957246721044be2068cf6840cb2299e0ad393705a1981c88c23a1048096a8d59e5f79a3
   languageName: node
   linkType: hard
 
-"@babel/helper-plugin-utils@npm:^7.0.0, @babel/helper-plugin-utils@npm:^7.10.4, @babel/helper-plugin-utils@npm:^7.12.13, @babel/helper-plugin-utils@npm:^7.14.5, @babel/helper-plugin-utils@npm:^7.18.6, @babel/helper-plugin-utils@npm:^7.22.5, @babel/helper-plugin-utils@npm:^7.24.0, @babel/helper-plugin-utils@npm:^7.8.0, @babel/helper-plugin-utils@npm:^7.8.3":
-  version: 7.24.0
-  resolution: "@babel/helper-plugin-utils@npm:7.24.0"
-  checksum: e2baa0eede34d2fa2265947042aa84d444aa48dc51e9feedea55b67fc1bc3ab051387e18b33ca7748285a6061390831ab82f8a2c767d08470b93500ec727e9b9
+"@babel/helper-plugin-utils@npm:^7.0.0, @babel/helper-plugin-utils@npm:^7.10.4, @babel/helper-plugin-utils@npm:^7.12.13, @babel/helper-plugin-utils@npm:^7.14.5, @babel/helper-plugin-utils@npm:^7.18.6, @babel/helper-plugin-utils@npm:^7.22.5, @babel/helper-plugin-utils@npm:^7.24.0, @babel/helper-plugin-utils@npm:^7.24.7, @babel/helper-plugin-utils@npm:^7.24.8, @babel/helper-plugin-utils@npm:^7.8.0, @babel/helper-plugin-utils@npm:^7.8.3":
+  version: 7.24.8
+  resolution: "@babel/helper-plugin-utils@npm:7.24.8"
+  checksum: 73b1a83ba8bcee21dc94de2eb7323207391715e4369fd55844bb15cf13e3df6f3d13a40786d990e6370bf0f571d94fc31f70dec96c1d1002058258c35ca3767a
   languageName: node
   linkType: hard
 
-"@babel/helper-remap-async-to-generator@npm:^7.22.20":
-  version: 7.22.20
-  resolution: "@babel/helper-remap-async-to-generator@npm:7.22.20"
+"@babel/helper-remap-async-to-generator@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/helper-remap-async-to-generator@npm:7.24.7"
   dependencies:
-    "@babel/helper-annotate-as-pure": ^7.22.5
-    "@babel/helper-environment-visitor": ^7.22.20
-    "@babel/helper-wrap-function": ^7.22.20
+    "@babel/helper-annotate-as-pure": ^7.24.7
+    "@babel/helper-environment-visitor": ^7.24.7
+    "@babel/helper-wrap-function": ^7.24.7
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: 2fe6300a6f1b58211dffa0aed1b45d4958506d096543663dba83bd9251fe8d670fa909143a65b45e72acb49e7e20fbdb73eae315d9ddaced467948c3329986e7
+  checksum: bab7be178f875350f22a2cb9248f67fe3a8a8128db77a25607096ca7599fd972bc7049fb11ed9e95b45a3f1dd1fac3846a3279f9cbac16f337ecb0e6ca76e1fc
   languageName: node
   linkType: hard
 
-"@babel/helper-replace-supers@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/helper-replace-supers@npm:7.24.1"
+"@babel/helper-replace-supers@npm:^7.24.7":
+  version: 7.25.0
+  resolution: "@babel/helper-replace-supers@npm:7.25.0"
   dependencies:
-    "@babel/helper-environment-visitor": ^7.22.20
-    "@babel/helper-member-expression-to-functions": ^7.23.0
-    "@babel/helper-optimise-call-expression": ^7.22.5
+    "@babel/helper-member-expression-to-functions": ^7.24.8
+    "@babel/helper-optimise-call-expression": ^7.24.7
+    "@babel/traverse": ^7.25.0
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: c04182c34a3195c6396de2f2945f86cb60daa94ca7392db09bd8b0d4e7a15b02fbe1947c70f6062c87eadaea6d7135207129efa35cf458ea0987bab8c0f02d5a
+  checksum: f669fc2487c22d40b808f94b9c3ee41129484d5ef0ba689bdd70f216ff91e10b6b021d2f8cd37e7bdd700235a2a6ae6622526344f064528190383bf661ac65f8
   languageName: node
   linkType: hard
 
-"@babel/helper-simple-access@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/helper-simple-access@npm:7.22.5"
+"@babel/helper-simple-access@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/helper-simple-access@npm:7.24.7"
   dependencies:
-    "@babel/types": ^7.22.5
-  checksum: fe9686714caf7d70aedb46c3cce090f8b915b206e09225f1e4dbc416786c2fdbbee40b38b23c268b7ccef749dd2db35f255338fb4f2444429874d900dede5ad2
+    "@babel/traverse": ^7.24.7
+    "@babel/types": ^7.24.7
+  checksum: ddbf55f9dea1900213f2a1a8500fabfd21c5a20f44dcfa957e4b0d8638c730f88751c77f678644f754f1a1dc73f4eb8b766c300deb45a9daad000e4247957819
   languageName: node
   linkType: hard
 
-"@babel/helper-skip-transparent-expression-wrappers@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/helper-skip-transparent-expression-wrappers@npm:7.22.5"
+"@babel/helper-skip-transparent-expression-wrappers@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/helper-skip-transparent-expression-wrappers@npm:7.24.7"
   dependencies:
-    "@babel/types": ^7.22.5
-  checksum: 1012ef2295eb12dc073f2b9edf3425661e9b8432a3387e62a8bc27c42963f1f216ab3124228015c748770b2257b4f1fda882ca8fa34c0bf485e929ae5bc45244
+    "@babel/traverse": ^7.24.7
+    "@babel/types": ^7.24.7
+  checksum: 11b28fe534ce2b1a67c4d8e51a7b5711a2a0a0cae802f74614eee54cca58c744d9a62f6f60103c41759e81c537d270bfd665bf368a6bea214c6052f2094f8407
   languageName: node
   linkType: hard
 
-"@babel/helper-split-export-declaration@npm:^7.22.6":
-  version: 7.22.6
-  resolution: "@babel/helper-split-export-declaration@npm:7.22.6"
+"@babel/helper-split-export-declaration@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/helper-split-export-declaration@npm:7.24.7"
   dependencies:
-    "@babel/types": ^7.22.5
-  checksum: e141cace583b19d9195f9c2b8e17a3ae913b7ee9b8120246d0f9ca349ca6f03cb2c001fd5ec57488c544347c0bb584afec66c936511e447fd20a360e591ac921
+    "@babel/types": ^7.24.7
+  checksum: e3ddc91273e5da67c6953f4aa34154d005a00791dc7afa6f41894e768748540f6ebcac5d16e72541aea0c89bee4b89b4da6a3d65972a0ea8bfd2352eda5b7e22
   languageName: node
   linkType: hard
 
-"@babel/helper-string-parser@npm:^7.23.4":
-  version: 7.23.4
-  resolution: "@babel/helper-string-parser@npm:7.23.4"
-  checksum: c0641144cf1a7e7dc93f3d5f16d5327465b6cf5d036b48be61ecba41e1eece161b48f46b7f960951b67f8c3533ce506b16dece576baef4d8b3b49f8c65410f90
+"@babel/helper-string-parser@npm:^7.24.8":
+  version: 7.24.8
+  resolution: "@babel/helper-string-parser@npm:7.24.8"
+  checksum: 39b03c5119216883878655b149148dc4d2e284791e969b19467a9411fccaa33f7a713add98f4db5ed519535f70ad273cdadfd2eb54d47ebbdeac5083351328ce
   languageName: node
   linkType: hard
 
-"@babel/helper-validator-identifier@npm:^7.22.20":
-  version: 7.22.20
-  resolution: "@babel/helper-validator-identifier@npm:7.22.20"
-  checksum: 136412784d9428266bcdd4d91c32bcf9ff0e8d25534a9d94b044f77fe76bc50f941a90319b05aafd1ec04f7d127cd57a179a3716009ff7f3412ef835ada95bdc
+"@babel/helper-validator-identifier@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/helper-validator-identifier@npm:7.24.7"
+  checksum: 6799ab117cefc0ecd35cd0b40ead320c621a298ecac88686a14cffceaac89d80cdb3c178f969861bf5fa5e4f766648f9161ea0752ecfe080d8e89e3147270257
   languageName: node
   linkType: hard
 
-"@babel/helper-validator-option@npm:^7.23.5":
-  version: 7.23.5
-  resolution: "@babel/helper-validator-option@npm:7.23.5"
-  checksum: 537cde2330a8aede223552510e8a13e9c1c8798afee3757995a7d4acae564124fe2bf7e7c3d90d62d3657434a74340a274b3b3b1c6f17e9a2be1f48af29cb09e
+"@babel/helper-validator-option@npm:^7.23.5, @babel/helper-validator-option@npm:^7.24.8":
+  version: 7.24.8
+  resolution: "@babel/helper-validator-option@npm:7.24.8"
+  checksum: a52442dfa74be6719c0608fee3225bd0493c4057459f3014681ea1a4643cd38b68ff477fe867c4b356da7330d085f247f0724d300582fa4ab9a02efaf34d107c
   languageName: node
   linkType: hard
 
-"@babel/helper-wrap-function@npm:^7.22.20":
-  version: 7.22.20
-  resolution: "@babel/helper-wrap-function@npm:7.22.20"
+"@babel/helper-wrap-function@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/helper-wrap-function@npm:7.24.7"
   dependencies:
-    "@babel/helper-function-name": ^7.22.5
-    "@babel/template": ^7.22.15
-    "@babel/types": ^7.22.19
-  checksum: 221ed9b5572612aeb571e4ce6a256f2dee85b3c9536f1dd5e611b0255e5f59a3d0ec392d8d46d4152149156a8109f92f20379b1d6d36abb613176e0e33f05fca
+    "@babel/helper-function-name": ^7.24.7
+    "@babel/template": ^7.24.7
+    "@babel/traverse": ^7.24.7
+    "@babel/types": ^7.24.7
+  checksum: 085bf130ed08670336e3976f5841ae44e3e10001131632e22ef234659341978d2fd37e65785f59b6cb1745481347fc3bce84b33a685cacb0a297afbe1d2b03af
   languageName: node
   linkType: hard
 
-"@babel/helpers@npm:^7.12.5, @babel/helpers@npm:^7.24.4":
-  version: 7.24.4
-  resolution: "@babel/helpers@npm:7.24.4"
+"@babel/helpers@npm:^7.12.5, @babel/helpers@npm:^7.24.8":
+  version: 7.24.8
+  resolution: "@babel/helpers@npm:7.24.8"
   dependencies:
-    "@babel/template": ^7.24.0
-    "@babel/traverse": ^7.24.1
-    "@babel/types": ^7.24.0
-  checksum: ecd2dc0b3b32e24b97fa3bcda432dd3235b77c2be1e16eafc35b8ef8f6c461faa99796a8bc2431a408c98b4aabfd572c160e2b67ecea4c5c9dd3a8314a97994a
+    "@babel/template": ^7.24.7
+    "@babel/types": ^7.24.8
+  checksum: 2d7301b1b9c91e518c4766bae171230e243d98461c15eabbd44f8f9c83c297fad5c4a64ad80cfec9ca8e90412fc2b41ee86d7eb35dc8a7611c268bcf1317fe46
   languageName: node
   linkType: hard
 
-"@babel/highlight@npm:^7.24.2":
-  version: 7.24.2
-  resolution: "@babel/highlight@npm:7.24.2"
+"@babel/highlight@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/highlight@npm:7.24.7"
   dependencies:
-    "@babel/helper-validator-identifier": ^7.22.20
+    "@babel/helper-validator-identifier": ^7.24.7
     chalk: ^2.4.2
     js-tokens: ^4.0.0
     picocolors: ^1.0.0
-  checksum: 5f17b131cc3ebf3ab285a62cf98a404aef1bd71a6be045e748f8d5bf66d6a6e1aefd62f5972c84369472e8d9f22a614c58a89cd331eb60b7ba965b31b1bbeaf5
+  checksum: 5cd3a89f143671c4ac129960024ba678b669e6fc673ce078030f5175002d1d3d52bc10b22c5b916a6faf644b5028e9a4bd2bb264d053d9b05b6a98690f1d46f1
   languageName: node
   linkType: hard
 
-"@babel/parser@npm:^7.1.0, @babel/parser@npm:^7.12.7, @babel/parser@npm:^7.14.7, @babel/parser@npm:^7.20.7, @babel/parser@npm:^7.24.0, @babel/parser@npm:^7.24.1, @babel/parser@npm:^7.24.4":
-  version: 7.24.4
-  resolution: "@babel/parser@npm:7.24.4"
+"@babel/parser@npm:^7.1.0, @babel/parser@npm:^7.12.7, @babel/parser@npm:^7.14.7, @babel/parser@npm:^7.20.7, @babel/parser@npm:^7.24.8, @babel/parser@npm:^7.25.0":
+  version: 7.25.0
+  resolution: "@babel/parser@npm:7.25.0"
   bin:
     parser: ./bin/babel-parser.js
-  checksum: 94c9e3e592894cd6fc57c519f4e06b65463df9be5f01739bb0d0bfce7ffcf99b3c2fdadd44dc59cc858ba2739ce6e469813a941c2f2dfacf333a3b2c9c5c8465
+  checksum: e0f0f5a0d323c8ebaa7caa5a982ce82a87d1f7176939642020beed021024af523e69e30b8918be82d02666742dfe0aad562c65edfd1a696785d76a2882e7904c
   languageName: node
   linkType: hard
 
-"@babel/plugin-bugfix-firefox-class-in-computed-class-key@npm:^7.24.4":
-  version: 7.24.4
-  resolution: "@babel/plugin-bugfix-firefox-class-in-computed-class-key@npm:7.24.4"
+"@babel/plugin-bugfix-firefox-class-in-computed-class-key@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-bugfix-firefox-class-in-computed-class-key@npm:7.24.7"
   dependencies:
-    "@babel/helper-environment-visitor": ^7.22.20
-    "@babel/helper-plugin-utils": ^7.24.0
+    "@babel/helper-environment-visitor": ^7.24.7
+    "@babel/helper-plugin-utils": ^7.24.7
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: 0be3f41b1b865d7a4ed1a432337be48de67989d0b4e47def34a05097a804b6fc193115f97c954fd757339e0b80030ecf1d0a3d3fd6e7e91718644de0a5aae3d3
+  checksum: 68d315642b53af143aa17a71eb976cf431b51339aee584e29514a462b81c998636dd54219c2713b5f13e1df89eaf130dfab59683f9116825608708c81696b96c
   languageName: node
   linkType: hard
 
-"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@npm:7.24.1"
+"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@npm:7.24.7"
   dependencies:
-    "@babel/helper-plugin-utils": ^7.24.0
+    "@babel/helper-plugin-utils": ^7.24.7
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: ec5fddc8db6de0e0082a883f21141d6f4f9f9f0bc190d662a732b5e9a506aae5d7d2337049a1bf055d7cb7add6f128036db6d4f47de5e9ac1be29e043c8b7ca8
+  checksum: 7eb4e7ce5e3d6db4b0fdbdfaaa301c2e58f38a7ee39d5a4259a1fda61a612e83d3e4bc90fc36fb0345baf57e1e1a071e0caffeb80218623ad163f2fdc2e53a54
   languageName: node
   linkType: hard
 
-"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@npm:7.24.1"
+"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@npm:7.24.7"
   dependencies:
-    "@babel/helper-plugin-utils": ^7.24.0
-    "@babel/helper-skip-transparent-expression-wrappers": ^7.22.5
-    "@babel/plugin-transform-optional-chaining": ^7.24.1
+    "@babel/helper-plugin-utils": ^7.24.7
+    "@babel/helper-skip-transparent-expression-wrappers": ^7.24.7
+    "@babel/plugin-transform-optional-chaining": ^7.24.7
   peerDependencies:
     "@babel/core": ^7.13.0
-  checksum: e18235463e716ac2443938aaec3c18b40c417a1746fba0fa4c26cf4d71326b76ef26c002081ab1b445abfae98e063d561519aa55672dddc1ef80b3940211ffbb
+  checksum: 07b92878ac58a98ea1fdf6a8b4ec3413ba4fa66924e28b694d63ec5b84463123fbf4d7153b56cf3cedfef4a3482c082fe3243c04f8fb2c041b32b0e29b4a9e21
   languageName: node
   linkType: hard
 
-"@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@npm:7.24.1"
+"@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@npm:7.24.7"
   dependencies:
-    "@babel/helper-environment-visitor": ^7.22.20
-    "@babel/helper-plugin-utils": ^7.24.0
+    "@babel/helper-environment-visitor": ^7.24.7
+    "@babel/helper-plugin-utils": ^7.24.7
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: b5e5889ce5ef51e813e3063cd548f55eb3c88e925c3c08913f334e15d62496861e538ae52a3974e0c56a3044ed8fd5033faea67a64814324af56edc9865b7359
+  checksum: 8324d458db57060590942c7c2e9603880d07718ccb6450ec935105b8bd3c4393c4b8ada88e178c232258d91f33ffdcf2b1043d54e07a86989e50667ee100a32e
   languageName: node
   linkType: hard
 
@@ -944,25 +933,25 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-syntax-import-assertions@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-syntax-import-assertions@npm:7.24.1"
+"@babel/plugin-syntax-import-assertions@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-syntax-import-assertions@npm:7.24.7"
   dependencies:
-    "@babel/helper-plugin-utils": ^7.24.0
+    "@babel/helper-plugin-utils": ^7.24.7
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 2a463928a63b62052e9fb8f8b0018aa11a926e94f32c168260ae012afe864875c6176c6eb361e13f300542c31316dad791b08a5b8ed92436a3095c7a0e4fce65
+  checksum: c4d67be4eb1d4637e361477dbe01f5b392b037d17c1f861cfa0faa120030e137aab90a9237931b8040fd31d1e5d159e11866fa1165f78beef7a3be876a391a17
   languageName: node
   linkType: hard
 
-"@babel/plugin-syntax-import-attributes@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-syntax-import-attributes@npm:7.24.1"
+"@babel/plugin-syntax-import-attributes@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-syntax-import-attributes@npm:7.24.7"
   dependencies:
-    "@babel/helper-plugin-utils": ^7.24.0
+    "@babel/helper-plugin-utils": ^7.24.7
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 87c8aa4a5ef931313f956871b27f2c051556f627b97ed21e9a5890ca4906b222d89062a956cde459816f5e0dec185ff128d7243d3fdc389504522acb88f0464e
+  checksum: 590dbb5d1a15264f74670b427b8d18527672c3d6c91d7bae7e65f80fd810edbc83d90e68065088644cbad3f2457ed265a54a9956fb789fcb9a5b521822b3a275
   languageName: node
   linkType: hard
 
@@ -1110,456 +1099,456 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-arrow-functions@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-transform-arrow-functions@npm:7.24.1"
+"@babel/plugin-transform-arrow-functions@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-arrow-functions@npm:7.24.7"
   dependencies:
-    "@babel/helper-plugin-utils": ^7.24.0
+    "@babel/helper-plugin-utils": ^7.24.7
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 58f9aa9b0de8382f8cfa3f1f1d40b69d98cd2f52340e2391733d0af745fdddda650ba392e509bc056157c880a2f52834a38ab2c5aa5569af8c61bb6ecbf45f34
+  checksum: 707c209b5331c7dc79bd326128c6a6640dbd62a78da1653c844db20c4f36bf7b68454f1bc4d2d051b3fde9136fa291f276ec03a071bb00ee653069ff82f91010
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-async-generator-functions@npm:^7.24.3":
-  version: 7.24.3
-  resolution: "@babel/plugin-transform-async-generator-functions@npm:7.24.3"
+"@babel/plugin-transform-async-generator-functions@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-async-generator-functions@npm:7.24.7"
   dependencies:
-    "@babel/helper-environment-visitor": ^7.22.20
-    "@babel/helper-plugin-utils": ^7.24.0
-    "@babel/helper-remap-async-to-generator": ^7.22.20
+    "@babel/helper-environment-visitor": ^7.24.7
+    "@babel/helper-plugin-utils": ^7.24.7
+    "@babel/helper-remap-async-to-generator": ^7.24.7
     "@babel/plugin-syntax-async-generators": ^7.8.4
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 309af02610be65d937664435adb432a32d9b6eb42bb3d3232c377d27fbc57014774d931665a5bfdaff3d1841b72659e0ad7adcef84b709f251cb0b8444f19214
+  checksum: 112e3b18f9c496ebc01209fc27f0b41a3669c479c7bc44f7249383172b432ebaae1e523caa7c6ecbd2d0d7adcb7e5769fe2798f8cb01c08cd57232d1bb6d8ad4
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-async-to-generator@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-transform-async-to-generator@npm:7.24.1"
+"@babel/plugin-transform-async-to-generator@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-async-to-generator@npm:7.24.7"
   dependencies:
-    "@babel/helper-module-imports": ^7.24.1
-    "@babel/helper-plugin-utils": ^7.24.0
-    "@babel/helper-remap-async-to-generator": ^7.22.20
+    "@babel/helper-module-imports": ^7.24.7
+    "@babel/helper-plugin-utils": ^7.24.7
+    "@babel/helper-remap-async-to-generator": ^7.24.7
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 429004a6596aa5c9e707b604156f49a146f8d029e31a3152b1649c0b56425264fda5fd38e5db1ddaeb33c3fe45c97dc8078d7abfafe3542a979b49f229801135
+  checksum: 13704fb3b83effc868db2b71bfb2c77b895c56cb891954fc362e95e200afd523313b0e7cf04ce02f45b05e76017c5b5fa8070c92613727a35131bb542c253a36
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-block-scoped-functions@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-transform-block-scoped-functions@npm:7.24.1"
+"@babel/plugin-transform-block-scoped-functions@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-block-scoped-functions@npm:7.24.7"
   dependencies:
-    "@babel/helper-plugin-utils": ^7.24.0
+    "@babel/helper-plugin-utils": ^7.24.7
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: d8e18bd57b156da1cd4d3c1780ab9ea03afed56c6824ca8e6e74f67959d7989a0e953ec370fe9b417759314f2eef30c8c437395ce63ada2e26c2f469e4704f82
+  checksum: 249cdcbff4e778b177245f9652b014ea4f3cd245d83297f10a7bf6d97790074089aa62bcde8c08eb299c5e68f2faed346b587d3ebac44d625ba9a83a4ee27028
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-block-scoping@npm:^7.24.4":
-  version: 7.24.4
-  resolution: "@babel/plugin-transform-block-scoping@npm:7.24.4"
+"@babel/plugin-transform-block-scoping@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-block-scoping@npm:7.24.7"
   dependencies:
-    "@babel/helper-plugin-utils": ^7.24.0
+    "@babel/helper-plugin-utils": ^7.24.7
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 5229ffe1c55744b96f791521e2876b01ed05c81df67488a7453ce66c2faceb9d1d653089ce6f0abf512752e15e9acac0e75a797a860f24e05b4d36497c7c3183
+  checksum: 039206155533600f079f3a455f85888dd7d4970ff7ffa85ef44760f4f5acb9f19c9d848cc1fec1b9bdbc0dfec9e8a080b90d0ab66ad2bdc7138b5ca4ba96e61c
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-class-properties@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-transform-class-properties@npm:7.24.1"
+"@babel/plugin-transform-class-properties@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-class-properties@npm:7.24.7"
   dependencies:
-    "@babel/helper-create-class-features-plugin": ^7.24.1
-    "@babel/helper-plugin-utils": ^7.24.0
+    "@babel/helper-create-class-features-plugin": ^7.24.7
+    "@babel/helper-plugin-utils": ^7.24.7
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 95779e9eef0c0638b9631c297d48aee53ffdbb2b1b5221bf40d7eccd566a8e34f859ff3571f8f20b9159b67f1bff7d7dc81da191c15d69fbae5a645197eae7e0
+  checksum: 1348d7ce74da38ba52ea85b3b4289a6a86913748569ef92ef0cff30702a9eb849e5eaf59f1c6f3517059aa68115fb3067e389735dccacca39add4e2b0c67e291
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-class-static-block@npm:^7.24.4":
-  version: 7.24.4
-  resolution: "@babel/plugin-transform-class-static-block@npm:7.24.4"
+"@babel/plugin-transform-class-static-block@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-class-static-block@npm:7.24.7"
   dependencies:
-    "@babel/helper-create-class-features-plugin": ^7.24.4
-    "@babel/helper-plugin-utils": ^7.24.0
+    "@babel/helper-create-class-features-plugin": ^7.24.7
+    "@babel/helper-plugin-utils": ^7.24.7
     "@babel/plugin-syntax-class-static-block": ^7.14.5
   peerDependencies:
     "@babel/core": ^7.12.0
-  checksum: 3b1db3308b57ba21d47772a9f183804234c23fd64c9ca40915d2d65c5dc7a48b49a6de16b8b90b7a354eacbb51232a862f0fca3dbd23e27d34641f511decddab
+  checksum: 324049263504f18416f1c3e24033baebfafd05480fdd885c8ebe6f2b415b0fc8e0b98d719360f9e30743cc78ac387fabc0b3c6606d2b54135756ffb92963b382
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-classes@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-transform-classes@npm:7.24.1"
+"@babel/plugin-transform-classes@npm:^7.24.8":
+  version: 7.24.8
+  resolution: "@babel/plugin-transform-classes@npm:7.24.8"
   dependencies:
-    "@babel/helper-annotate-as-pure": ^7.22.5
-    "@babel/helper-compilation-targets": ^7.23.6
-    "@babel/helper-environment-visitor": ^7.22.20
-    "@babel/helper-function-name": ^7.23.0
-    "@babel/helper-plugin-utils": ^7.24.0
-    "@babel/helper-replace-supers": ^7.24.1
-    "@babel/helper-split-export-declaration": ^7.22.6
+    "@babel/helper-annotate-as-pure": ^7.24.7
+    "@babel/helper-compilation-targets": ^7.24.8
+    "@babel/helper-environment-visitor": ^7.24.7
+    "@babel/helper-function-name": ^7.24.7
+    "@babel/helper-plugin-utils": ^7.24.8
+    "@babel/helper-replace-supers": ^7.24.7
+    "@babel/helper-split-export-declaration": ^7.24.7
     globals: ^11.1.0
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: e5337e707d731c9f4dcc107d09c9a99b90786bc0da6a250165919587ed818818f6cae2bbcceea880abef975c0411715c0c7f3f361ecd1526bf2eaca5ad26bb00
+  checksum: 9c0f547d67e255b37055461df9c1a578c29bf59c7055bd5b40b07b92e5448af3ca8d853d50056125b7dae9bfe3a4cf1559d61b9ccbc3d2578dd43f15386f12fe
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-computed-properties@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-transform-computed-properties@npm:7.24.1"
+"@babel/plugin-transform-computed-properties@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-computed-properties@npm:7.24.7"
   dependencies:
-    "@babel/helper-plugin-utils": ^7.24.0
-    "@babel/template": ^7.24.0
+    "@babel/helper-plugin-utils": ^7.24.7
+    "@babel/template": ^7.24.7
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: f2832bcf100a70f348facbb395873318ef5b9ee4b0fb4104a420d9daaeb6003cc2ecc12fd8083dd2e4a7c2da873272ad73ff94de4497125a0cf473294ef9664e
+  checksum: 0cf8c1b1e4ea57dec8d4612460d84fd4cdbf71a7499bb61ee34632cf89018a59eee818ffca88a8d99ee7057c20a4257044d7d463fda6daef9bf1db9fa81563cb
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-destructuring@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-transform-destructuring@npm:7.24.1"
+"@babel/plugin-transform-destructuring@npm:^7.24.8":
+  version: 7.24.8
+  resolution: "@babel/plugin-transform-destructuring@npm:7.24.8"
   dependencies:
-    "@babel/helper-plugin-utils": ^7.24.0
+    "@babel/helper-plugin-utils": ^7.24.8
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 994fd3c513e40b8f1bdfdd7104ebdcef7c6a11a4e380086074496f586db3ac04cba0ae70babb820df6363b6700747b0556f6860783e046ace7c741a22f49ec5b
+  checksum: 0b4bd3d608979a1e5bd97d9d42acd5ad405c7fffa61efac4c7afd8e86ea6c2d91ab2d94b6a98d63919571363fe76e0b03c4ff161f0f60241b895842596e4a999
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-dotall-regex@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-transform-dotall-regex@npm:7.24.1"
+"@babel/plugin-transform-dotall-regex@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-dotall-regex@npm:7.24.7"
   dependencies:
-    "@babel/helper-create-regexp-features-plugin": ^7.22.15
-    "@babel/helper-plugin-utils": ^7.24.0
+    "@babel/helper-create-regexp-features-plugin": ^7.24.7
+    "@babel/helper-plugin-utils": ^7.24.7
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 7f623d25b6f213b94ebc1754e9e31c1077c8e288626d8b7bfa76a97b067ce80ddcd0ede402a546706c65002c0ccf45cd5ec621511c2668eed31ebcabe8391d35
+  checksum: 67b10fc6abb1f61f0e765288eb4c6d63d1d0f9fc0660e69f6f2170c56fa16bc74e49857afc644beda112b41771cd90cf52df0940d11e97e52617c77c7dcff171
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-duplicate-keys@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-transform-duplicate-keys@npm:7.24.1"
+"@babel/plugin-transform-duplicate-keys@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-duplicate-keys@npm:7.24.7"
   dependencies:
-    "@babel/helper-plugin-utils": ^7.24.0
+    "@babel/helper-plugin-utils": ^7.24.7
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: a3b07c07cee441e185858a9bb9739bb72643173c18bf5f9f949dd2d4784ca124e56b01d0a270790fb1ff0cf75d436075db0a2b643fb4285ff9a21df9e8dc6284
+  checksum: d1da2ff85ecb56a63f4ccfd9dc9ae69400d85f0dadf44ecddd9e71c6e5c7a9178e74e3a9637555f415a2bb14551e563f09f98534ab54f53d25e8439fdde6ba2d
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-dynamic-import@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-transform-dynamic-import@npm:7.24.1"
+"@babel/plugin-transform-dynamic-import@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-dynamic-import@npm:7.24.7"
   dependencies:
-    "@babel/helper-plugin-utils": ^7.24.0
+    "@babel/helper-plugin-utils": ^7.24.7
     "@babel/plugin-syntax-dynamic-import": ^7.8.3
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 59fc561ee40b1a69f969c12c6c5fac206226d6642213985a569dd0f99f8e41c0f4eaedebd36936c255444a8335079842274c42a975a433beadb436d4c5abb79b
+  checksum: 776509ff62ab40c12be814a342fc56a5cc09b91fb63032b2633414b635875fd7da03734657be0f6db2891fe6e3033b75d5ddb6f2baabd1a02e4443754a785002
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-exponentiation-operator@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-transform-exponentiation-operator@npm:7.24.1"
+"@babel/plugin-transform-exponentiation-operator@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-exponentiation-operator@npm:7.24.7"
   dependencies:
-    "@babel/helper-builder-binary-assignment-operator-visitor": ^7.22.15
-    "@babel/helper-plugin-utils": ^7.24.0
+    "@babel/helper-builder-binary-assignment-operator-visitor": ^7.24.7
+    "@babel/helper-plugin-utils": ^7.24.7
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: f90841fe1a1e9f680b4209121d3e2992f923e85efcd322b26e5901c180ef44ff727fb89790803a23fac49af34c1ce2e480018027c22b4573b615512ac5b6fc50
+  checksum: 23c84a23eb56589fdd35a3540f9a1190615be069110a2270865223c03aee3ba4e0fc68fe14850800cf36f0712b26e4964d3026235261f58f0405a29fe8dac9b1
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-export-namespace-from@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-transform-export-namespace-from@npm:7.24.1"
+"@babel/plugin-transform-export-namespace-from@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-export-namespace-from@npm:7.24.7"
   dependencies:
-    "@babel/helper-plugin-utils": ^7.24.0
+    "@babel/helper-plugin-utils": ^7.24.7
     "@babel/plugin-syntax-export-namespace-from": ^7.8.3
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: bc710ac231919df9555331885748385c11c5e695d7271824fe56fba51dd637d48d3e5cd52e1c69f2b1a384fbbb41552572bc1ca3a2285ee29571f002e9bb2421
+  checksum: 3bd3a10038f10ae0dea1ee42137f3edcf7036b5e9e570a0d1cbd0865f03658990c6c2d84fa2475f87a754e7dc5b46766c16f7ce5c9b32c3040150b6a21233a80
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-for-of@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-transform-for-of@npm:7.24.1"
+"@babel/plugin-transform-for-of@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-for-of@npm:7.24.7"
   dependencies:
-    "@babel/helper-plugin-utils": ^7.24.0
-    "@babel/helper-skip-transparent-expression-wrappers": ^7.22.5
+    "@babel/helper-plugin-utils": ^7.24.7
+    "@babel/helper-skip-transparent-expression-wrappers": ^7.24.7
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 990adde96ea1766ed6008c006c7040127bef59066533bb2977b246ea4a596fe450a528d1881a0db5f894deaf1b81654dfb494b19ad405b369be942738aa9c364
+  checksum: a53b42dc93ab4b7d1ebd3c695b52be22b3d592f6a3dbdb3dc2fea2c8e0a7e1508fe919864c455cde552aec44ce7518625fccbb70c7063373ca228d884f4f49ea
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-function-name@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-transform-function-name@npm:7.24.1"
+"@babel/plugin-transform-function-name@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-function-name@npm:7.24.7"
   dependencies:
-    "@babel/helper-compilation-targets": ^7.23.6
-    "@babel/helper-function-name": ^7.23.0
-    "@babel/helper-plugin-utils": ^7.24.0
+    "@babel/helper-compilation-targets": ^7.24.7
+    "@babel/helper-function-name": ^7.24.7
+    "@babel/helper-plugin-utils": ^7.24.7
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 31eb3c75297dda7265f78eba627c446f2324e30ec0124a645ccc3e9f341254aaa40d6787bd62b2280d77c0a5c9fbfce1da2c200ef7c7f8e0a1b16a8eb3644c6f
+  checksum: 8eb1a67894a124910b5a67630bed4307757504381f39f0fb5cf82afc7ae8647dbc03b256d13865b73a749b9071b68e9fb8a28cef2369917b4299ebb93fd66146
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-json-strings@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-transform-json-strings@npm:7.24.1"
+"@babel/plugin-transform-json-strings@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-json-strings@npm:7.24.7"
   dependencies:
-    "@babel/helper-plugin-utils": ^7.24.0
+    "@babel/helper-plugin-utils": ^7.24.7
     "@babel/plugin-syntax-json-strings": ^7.8.3
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: f42302d42fc81ac00d14e9e5d80405eb80477d7f9039d7208e712d6bcd486a4e3b32fdfa07b5f027d6c773723d8168193ee880f93b0e430c828e45f104fb82a4
+  checksum: 88874d0b7a1ddea66c097fc0abb68801ffae194468aa44b828dde9a0e20ac5d8647943793de86092eabaa2911c96f67a6b373793d4bb9c932ef81b2711c06c2e
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-literals@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-transform-literals@npm:7.24.1"
+"@babel/plugin-transform-literals@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-literals@npm:7.24.7"
   dependencies:
-    "@babel/helper-plugin-utils": ^7.24.0
+    "@babel/helper-plugin-utils": ^7.24.7
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 2df94e9478571852483aca7588419e574d76bde97583e78551c286f498e01321e7dbb1d0ef67bee16e8f950688f79688809cfde370c5c4b84c14d841a3ef217a
+  checksum: 3c075cc093a3dd9e294b8b7d6656e65f889e7ca2179ca27978dcd65b4dc4885ebbfb327408d7d8f483c55547deed00ba840956196f3ac8a3c3d2308a330a8c23
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-logical-assignment-operators@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-transform-logical-assignment-operators@npm:7.24.1"
+"@babel/plugin-transform-logical-assignment-operators@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-logical-assignment-operators@npm:7.24.7"
   dependencies:
-    "@babel/helper-plugin-utils": ^7.24.0
+    "@babel/helper-plugin-utils": ^7.24.7
     "@babel/plugin-syntax-logical-assignment-operators": ^7.10.4
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 895f2290adf457cbf327428bdb4fb90882a38a22f729bcf0629e8ad66b9b616d2721fbef488ac00411b647489d1dda1d20171bb3772d0796bb7ef5ecf057808a
+  checksum: 3367ce0be243704dc6fce23e86a592c4380f01998ee5dd9f94c54b1ef7b971ac6f8a002901eb51599ac6cbdc0d067af8d1a720224fca1c40fde8bb8aab804aac
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-member-expression-literals@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-transform-member-expression-literals@npm:7.24.1"
+"@babel/plugin-transform-member-expression-literals@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-member-expression-literals@npm:7.24.7"
   dependencies:
-    "@babel/helper-plugin-utils": ^7.24.0
+    "@babel/helper-plugin-utils": ^7.24.7
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 4ea641cc14a615f9084e45ad2319f95e2fee01c77ec9789685e7e11a6c286238a426a98f9c1ed91568a047d8ac834393e06e8c82d1ff01764b7aa61bee8e9023
+  checksum: 2720c57aa3bf70576146ba7d6ea03227f4611852122d76d237924f7b008dafc952e6ae61a19e5024f26c665f44384bbd378466f01b6bd1305b3564a3b7fb1a5d
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-modules-amd@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-transform-modules-amd@npm:7.24.1"
+"@babel/plugin-transform-modules-amd@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-modules-amd@npm:7.24.7"
   dependencies:
-    "@babel/helper-module-transforms": ^7.23.3
-    "@babel/helper-plugin-utils": ^7.24.0
+    "@babel/helper-module-transforms": ^7.24.7
+    "@babel/helper-plugin-utils": ^7.24.7
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 3d777c262f257e93f0405b13e178f9c4a0f31855b409f0191a76bb562a28c541326a027bfe6467fcb74752f3488c0333b5ff2de64feec1b3c4c6ace1747afa03
+  checksum: f1dd0fb2f46c0f8f21076b8c7ccd5b33a85ce6dcb31518ea4c648d9a5bb2474cd4bd87c9b1b752e68591e24b022e334ba0d07631fef2b6b4d8a4b85cf3d581f5
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-modules-commonjs@npm:^7.23.3, @babel/plugin-transform-modules-commonjs@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-transform-modules-commonjs@npm:7.24.1"
+"@babel/plugin-transform-modules-commonjs@npm:^7.23.3, @babel/plugin-transform-modules-commonjs@npm:^7.24.1, @babel/plugin-transform-modules-commonjs@npm:^7.24.8":
+  version: 7.24.8
+  resolution: "@babel/plugin-transform-modules-commonjs@npm:7.24.8"
   dependencies:
-    "@babel/helper-module-transforms": ^7.23.3
-    "@babel/helper-plugin-utils": ^7.24.0
-    "@babel/helper-simple-access": ^7.22.5
+    "@babel/helper-module-transforms": ^7.24.8
+    "@babel/helper-plugin-utils": ^7.24.8
+    "@babel/helper-simple-access": ^7.24.7
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 11402b34c49f76aa921b43c2d76f3f129a32544a1dc4f0d1e48b310f9036ab75269a6d8684ed0198b7a0b07bd7898b12f0cacceb26fbb167999fd2a819aa0802
+  checksum: a4cf95b1639c33382064b44558f73ee5fac023f2a94d16e549d2bb55ceebd5cbc10fcddd505d08cd5bc97f5a64af9fd155512358b7dcf7b1a0082e8945cf21c5
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-modules-systemjs@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-transform-modules-systemjs@npm:7.24.1"
+"@babel/plugin-transform-modules-systemjs@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-modules-systemjs@npm:7.24.7"
   dependencies:
-    "@babel/helper-hoist-variables": ^7.22.5
-    "@babel/helper-module-transforms": ^7.23.3
-    "@babel/helper-plugin-utils": ^7.24.0
-    "@babel/helper-validator-identifier": ^7.22.20
+    "@babel/helper-hoist-variables": ^7.24.7
+    "@babel/helper-module-transforms": ^7.24.7
+    "@babel/helper-plugin-utils": ^7.24.7
+    "@babel/helper-validator-identifier": ^7.24.7
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 903766f6808f04278e887e4adec9b1efa741726279652dad255eaad0f5701df8f8ff0af25eb8541a00eb3c9eae2dccf337b085cfa011426ca33ed1f95d70bf75
+  checksum: 8af7a9db2929991d82cfdf41fb175dee344274d39b39122f8c35f24b5d682f98368e3d8f5130401298bd21412df21d416a7d8b33b59c334fae3d3c762118b1d8
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-modules-umd@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-transform-modules-umd@npm:7.24.1"
+"@babel/plugin-transform-modules-umd@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-modules-umd@npm:7.24.7"
   dependencies:
-    "@babel/helper-module-transforms": ^7.23.3
-    "@babel/helper-plugin-utils": ^7.24.0
+    "@babel/helper-module-transforms": ^7.24.7
+    "@babel/helper-plugin-utils": ^7.24.7
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 4922f5056d34de6fd59a1ab1c85bc3472afa706c776aceeb886289c9ac9117e6eb8e22d06c537eb5bc0ede6c30f6bd85210bdcc150dc0ae2d2373f8252df9364
+  checksum: 9ff1c464892efe042952ba778468bda6131b196a2729615bdcc3f24cdc94014f016a4616ee5643c5845bade6ba698f386833e61056d7201314b13a7fd69fac88
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-named-capturing-groups-regex@npm:^7.22.5":
-  version: 7.22.5
-  resolution: "@babel/plugin-transform-named-capturing-groups-regex@npm:7.22.5"
+"@babel/plugin-transform-named-capturing-groups-regex@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-named-capturing-groups-regex@npm:7.24.7"
   dependencies:
-    "@babel/helper-create-regexp-features-plugin": ^7.22.5
-    "@babel/helper-plugin-utils": ^7.22.5
+    "@babel/helper-create-regexp-features-plugin": ^7.24.7
+    "@babel/helper-plugin-utils": ^7.24.7
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: 3ee564ddee620c035b928fdc942c5d17e9c4b98329b76f9cefac65c111135d925eb94ed324064cd7556d4f5123beec79abea1d4b97d1c8a2a5c748887a2eb623
+  checksum: f1c6c7b5d60a86b6d7e4dd098798e1d393d55e993a0b57a73b53640c7a94985b601a96bdacee063f809a9a700bcea3a2ff18e98fa561554484ac56b761d774bd
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-new-target@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-transform-new-target@npm:7.24.1"
+"@babel/plugin-transform-new-target@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-new-target@npm:7.24.7"
   dependencies:
-    "@babel/helper-plugin-utils": ^7.24.0
+    "@babel/helper-plugin-utils": ^7.24.7
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: f56159ba56e8824840b8073f65073434e4bc4ef20e366bc03aa6cae9a4389365574fa72390e48aed76049edbc6eba1181eb810e58fae22c25946c62f9da13db4
+  checksum: 3cb94cd1076b270f768f91fdcf9dd2f6d487f8dbfff3df7ca8d07b915900b86d02769a35ba1407d16fe49499012c8f055e1741299e2c880798b953d942a8fa1b
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-nullish-coalescing-operator@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-transform-nullish-coalescing-operator@npm:7.24.1"
+"@babel/plugin-transform-nullish-coalescing-operator@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-nullish-coalescing-operator@npm:7.24.7"
   dependencies:
-    "@babel/helper-plugin-utils": ^7.24.0
+    "@babel/helper-plugin-utils": ^7.24.7
     "@babel/plugin-syntax-nullish-coalescing-operator": ^7.8.3
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 74025e191ceb7cefc619c15d33753aab81300a03d81b96ae249d9b599bc65878f962d608f452462d3aad5d6e334b7ab2b09a6bdcfe8d101fe77ac7aacca4261e
+  checksum: 4a9221356401d87762afbc37a9e8e764afc2daf09c421117537820f8cfbed6876888372ad3a7bcfae2d45c95f026651f050ab4020b777be31d3ffb00908dbdd3
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-numeric-separator@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-transform-numeric-separator@npm:7.24.1"
+"@babel/plugin-transform-numeric-separator@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-numeric-separator@npm:7.24.7"
   dependencies:
-    "@babel/helper-plugin-utils": ^7.24.0
+    "@babel/helper-plugin-utils": ^7.24.7
     "@babel/plugin-syntax-numeric-separator": ^7.10.4
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 3247bd7d409574fc06c59e0eb573ae7470d6d61ecf780df40b550102bb4406747d8f39dcbec57eb59406df6c565a86edd3b429e396ad02e4ce201ad92050832e
+  checksum: 561b5f1d08b2c3f92ce849f092751558b5e6cfeb7eb55c79e7375c34dd9c3066dce5e630bb439affef6adcf202b6cbcaaa23870070276fa5bb429c8f5b8c7514
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-object-rest-spread@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-transform-object-rest-spread@npm:7.24.1"
+"@babel/plugin-transform-object-rest-spread@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-object-rest-spread@npm:7.24.7"
   dependencies:
-    "@babel/helper-compilation-targets": ^7.23.6
-    "@babel/helper-plugin-utils": ^7.24.0
+    "@babel/helper-compilation-targets": ^7.24.7
+    "@babel/helper-plugin-utils": ^7.24.7
     "@babel/plugin-syntax-object-rest-spread": ^7.8.3
-    "@babel/plugin-transform-parameters": ^7.24.1
+    "@babel/plugin-transform-parameters": ^7.24.7
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: d5d28b1f33c279a38299d34011421a4915e24b3846aa23a1aba947f1366ce673ddf8df09dd915e0f2c90c5327f798bf126dca013f8adff1fc8f09e18878b675a
+  checksum: 169d257b9800c13e1feb4c37fb05dae84f702e58b342bb76e19e82e6692b7b5337c9923ee89e3916a97c0dd04a3375bdeca14f5e126f110bbacbeb46d1886ca2
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-object-super@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-transform-object-super@npm:7.24.1"
+"@babel/plugin-transform-object-super@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-object-super@npm:7.24.7"
   dependencies:
-    "@babel/helper-plugin-utils": ^7.24.0
-    "@babel/helper-replace-supers": ^7.24.1
+    "@babel/helper-plugin-utils": ^7.24.7
+    "@babel/helper-replace-supers": ^7.24.7
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: d34d437456a54e2a5dcb26e9cf09ed4c55528f2a327c5edca92c93e9483c37176e228d00d6e0cf767f3d6fdbef45ae3a5d034a7c59337a009e20ae541c8220fa
+  checksum: f71e607a830ee50a22fa1a2686524d3339440cf9dea63032f6efbd865cfe4e35000e1e3f3492459e5c986f7c0c07dc36938bf3ce61fc9ba5f8ab732d0b64ab37
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-optional-catch-binding@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-transform-optional-catch-binding@npm:7.24.1"
+"@babel/plugin-transform-optional-catch-binding@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-optional-catch-binding@npm:7.24.7"
   dependencies:
-    "@babel/helper-plugin-utils": ^7.24.0
+    "@babel/helper-plugin-utils": ^7.24.7
     "@babel/plugin-syntax-optional-catch-binding": ^7.8.3
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: ff7c02449d32a6de41e003abb38537b4a1ad90b1eaa4c0b578cb1b55548201a677588a8c47f3e161c72738400ae811a6673ea7b8a734344755016ca0ac445dac
+  checksum: 7229f3a5a4facaab40f4fdfc7faabc157dc38a67d66bed7936599f4bc509e0bff636f847ac2aa45294881fce9cf8a0a460b85d2a465b7b977de9739fce9b18f6
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-optional-chaining@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-transform-optional-chaining@npm:7.24.1"
+"@babel/plugin-transform-optional-chaining@npm:^7.24.7, @babel/plugin-transform-optional-chaining@npm:^7.24.8":
+  version: 7.24.8
+  resolution: "@babel/plugin-transform-optional-chaining@npm:7.24.8"
   dependencies:
-    "@babel/helper-plugin-utils": ^7.24.0
-    "@babel/helper-skip-transparent-expression-wrappers": ^7.22.5
+    "@babel/helper-plugin-utils": ^7.24.8
+    "@babel/helper-skip-transparent-expression-wrappers": ^7.24.7
     "@babel/plugin-syntax-optional-chaining": ^7.8.3
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 0eb5f4abdeb1a101c0f67ef25eba4cce0978a74d8722f6222cdb179a28e60d21ab545eda231855f50169cd63d604ec8268cff44ae9370fd3a499a507c56c2bbd
+  checksum: 45e55e3a2fffb89002d3f89aef59c141610f23b60eee41e047380bffc40290b59f64fc649aa7ec5281f73d41b2065410d788acc6afaad2a9f44cad6e8af04442
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-parameters@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-transform-parameters@npm:7.24.1"
+"@babel/plugin-transform-parameters@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-parameters@npm:7.24.7"
   dependencies:
-    "@babel/helper-plugin-utils": ^7.24.0
+    "@babel/helper-plugin-utils": ^7.24.7
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: d183008e67b1a13b86c92fb64327a75cd8e13c13eb80d0b6952e15806f1b0c4c456d18360e451c6af73485b2c8f543608b0a29e5126c64eb625a31e970b65f80
+  checksum: ab534b03ac2eff94bc79342b8f39a4584666f5305a6c63c1964afda0b1b004e6b861e49d1683548030defe248e3590d3ff6338ee0552cb90c064f7e1479968c3
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-private-methods@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-transform-private-methods@npm:7.24.1"
+"@babel/plugin-transform-private-methods@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-private-methods@npm:7.24.7"
   dependencies:
-    "@babel/helper-create-class-features-plugin": ^7.24.1
-    "@babel/helper-plugin-utils": ^7.24.0
+    "@babel/helper-create-class-features-plugin": ^7.24.7
+    "@babel/helper-plugin-utils": ^7.24.7
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 7208c30bb3f3fbc73fb3a88bdcb78cd5cddaf6d523eb9d67c0c04e78f6fc6319ece89f4a5abc41777ceab16df55b3a13a4120e0efc9275ca6d2d89beaba80aa0
+  checksum: c151548e34909be2adcceb224d8fdd70bafa393bc1559a600906f3f647317575bf40db670470934a360e90ee8084ef36dffa34ec25d387d414afd841e74cf3fe
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-private-property-in-object@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-transform-private-property-in-object@npm:7.24.1"
+"@babel/plugin-transform-private-property-in-object@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-private-property-in-object@npm:7.24.7"
   dependencies:
-    "@babel/helper-annotate-as-pure": ^7.22.5
-    "@babel/helper-create-class-features-plugin": ^7.24.1
-    "@babel/helper-plugin-utils": ^7.24.0
+    "@babel/helper-annotate-as-pure": ^7.24.7
+    "@babel/helper-create-class-features-plugin": ^7.24.7
+    "@babel/helper-plugin-utils": ^7.24.7
     "@babel/plugin-syntax-private-property-in-object": ^7.14.5
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 47c123ca9975f7f6b20e6fe8fe89f621cd04b622539faf5ec037e2be7c3d53ce2506f7c785b1930dcdea11994eff79094a02715795218c7d6a0bdc11f2fb3ac2
+  checksum: 8cee9473095305cc787bb653fd681719b49363281feabf677db8a552e8e41c94441408055d7e5fd5c7d41b315e634fa70b145ad0c7c54456216049df4ed57350
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-property-literals@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-transform-property-literals@npm:7.24.1"
+"@babel/plugin-transform-property-literals@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-property-literals@npm:7.24.7"
   dependencies:
-    "@babel/helper-plugin-utils": ^7.24.0
+    "@babel/helper-plugin-utils": ^7.24.7
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: a73646d7ecd95b3931a3ead82c7d5efeb46e68ba362de63eb437d33531f294ec18bd31b6d24238cd3b6a3b919a6310c4a0ba4a2629927721d4d10b0518eb7715
+  checksum: 9aeefc3aab6c6bf9d1fae1cf3a2d38c7d886fd3c6c81b7c608c477f5758aee2e7abf52f32724310fe861da61af934ee2508b78a5b5f234b9740c9134e1c14437
   languageName: node
   linkType: hard
 
@@ -1596,6 +1585,28 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/plugin-transform-react-jsx-self@npm:^7.24.5":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-react-jsx-self@npm:7.24.7"
+  dependencies:
+    "@babel/helper-plugin-utils": ^7.24.7
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: 2d72c33664e614031b8a03fc2d4cfd185e99efb1d681cbde4b0b4ab379864b31d83ee923509892f6d94b2c5893c309f0217d33bcda3e470ed42297f958138381
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-transform-react-jsx-source@npm:^7.24.1":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-react-jsx-source@npm:7.24.7"
+  dependencies:
+    "@babel/helper-plugin-utils": ^7.24.7
+  peerDependencies:
+    "@babel/core": ^7.0.0-0
+  checksum: c9afcb2259dd124a2de76f8a578589c18bd2f24dbcf78fe02b53c5cbc20c493c4618369604720e4e699b52be10ba0751b97140e1ef8bc8f0de0a935280e9d5b7
+  languageName: node
+  linkType: hard
+
 "@babel/plugin-transform-react-jsx@npm:^7.22.5, @babel/plugin-transform-react-jsx@npm:^7.23.4":
   version: 7.23.4
   resolution: "@babel/plugin-transform-react-jsx@npm:7.23.4"
@@ -1623,26 +1634,26 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-regenerator@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-transform-regenerator@npm:7.24.1"
+"@babel/plugin-transform-regenerator@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-regenerator@npm:7.24.7"
   dependencies:
-    "@babel/helper-plugin-utils": ^7.24.0
+    "@babel/helper-plugin-utils": ^7.24.7
     regenerator-transform: ^0.15.2
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: a04319388a0a7931c3f8e15715d01444c32519692178b70deccc86d53304e74c0f589a4268f6c68578d86f75e934dd1fe6e6ed9071f54ee8379f356f88ef6e42
+  checksum: 20c6c3fb6fc9f407829087316653388d311e8c1816b007609bb09aeef254092a7157adace8b3aaa8f34be752503717cb85c88a5fe482180a9b11bcbd676063be
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-reserved-words@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-transform-reserved-words@npm:7.24.1"
+"@babel/plugin-transform-reserved-words@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-reserved-words@npm:7.24.7"
   dependencies:
-    "@babel/helper-plugin-utils": ^7.24.0
+    "@babel/helper-plugin-utils": ^7.24.7
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 132c6040c65aabae2d98a39289efb5c51a8632546dc50d2ad032c8660aec307fbed74ef499856ea4f881fc8505905f49b48e0270585da2ea3d50b75e962afd89
+  checksum: 3d5876954d5914d7270819479504f30c4bf5452a65c677f44e2dab2db50b3c9d4b47793c45dfad7abf4f377035dd79e4b3f554ae350df9f422201d370ce9f8dd
   languageName: node
   linkType: hard
 
@@ -1662,59 +1673,59 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-shorthand-properties@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-transform-shorthand-properties@npm:7.24.1"
+"@babel/plugin-transform-shorthand-properties@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-shorthand-properties@npm:7.24.7"
   dependencies:
-    "@babel/helper-plugin-utils": ^7.24.0
+    "@babel/helper-plugin-utils": ^7.24.7
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 006a2032d1c57dca76579ce6598c679c2f20525afef0a36e9d42affe3c8cf33c1427581ad696b519cc75dfee46c5e8ecdf0c6a29ffb14250caa3e16dd68cb424
+  checksum: 7b524245814607188212b8eb86d8c850e5974203328455a30881b4a92c364b93353fae14bc2af5b614ef16300b75b8c1d3b8f3a08355985b4794a7feb240adc3
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-spread@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-transform-spread@npm:7.24.1"
+"@babel/plugin-transform-spread@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-spread@npm:7.24.7"
   dependencies:
-    "@babel/helper-plugin-utils": ^7.24.0
-    "@babel/helper-skip-transparent-expression-wrappers": ^7.22.5
+    "@babel/helper-plugin-utils": ^7.24.7
+    "@babel/helper-skip-transparent-expression-wrappers": ^7.24.7
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 622ef507e2b5120a9010b25d3df5186c06102ecad8751724a38ec924df8d3527688198fa490c47064eabba14ef2f961b3069855bd22a8c0a1e51a23eed348d02
+  checksum: 4c4254c8b9cceb1a8f975fa9b92257ddb08380a35c0a3721b8f4b9e13a3d82e403af2e0fba577b9f2452dd8f06bc3dea71cc53b1e2c6af595af5db52a13429d6
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-sticky-regex@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-transform-sticky-regex@npm:7.24.1"
+"@babel/plugin-transform-sticky-regex@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-sticky-regex@npm:7.24.7"
   dependencies:
-    "@babel/helper-plugin-utils": ^7.24.0
+    "@babel/helper-plugin-utils": ^7.24.7
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: e326e96a9eeb6bb01dbc4d3362f989411490671b97f62edf378b8fb102c463a018b777f28da65344d41b22aa6efcdfa01ed43d2b11fdcf202046d3174be137c5
+  checksum: 118fc7a7ebf7c20411b670c8a030535fdfe4a88bc5643bb625a584dbc4c8a468da46430a20e6bf78914246962b0f18f1b9d6a62561a7762c4f34a038a5a77179
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-template-literals@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-transform-template-literals@npm:7.24.1"
+"@babel/plugin-transform-template-literals@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-template-literals@npm:7.24.7"
   dependencies:
-    "@babel/helper-plugin-utils": ^7.24.0
+    "@babel/helper-plugin-utils": ^7.24.7
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 4c9009c72321caf20e3b6328bbe9d7057006c5ae57b794cf247a37ca34d87dfec5e27284169a16df5a6235a083bf0f3ab9e1bfcb005d1c8b75b04aed75652621
+  checksum: ad44e5826f5a98c1575832dbdbd033adfe683cdff195e178528ead62507564bf02f479b282976cfd3caebad8b06d5fd7349c1cdb880dec3c56daea4f1f179619
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-typeof-symbol@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-transform-typeof-symbol@npm:7.24.1"
+"@babel/plugin-transform-typeof-symbol@npm:^7.24.8":
+  version: 7.24.8
+  resolution: "@babel/plugin-transform-typeof-symbol@npm:7.24.8"
   dependencies:
-    "@babel/helper-plugin-utils": ^7.24.0
+    "@babel/helper-plugin-utils": ^7.24.8
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 90251c02986aebe50937522a6e404cb83db1b1feda17c0244e97d6429ded1634340c8411536487d14c54495607e1b7c9dc4db4aed969d519f1ff1e363f9c2229
+  checksum: 8663a8e7347cedf181001d99c88cf794b6598c3d82f324098510fe8fb8bd22113995526a77aa35a3cc5d70ffd0617a59dd0d10311a9bf0e1a3a7d3e59b900c00
   languageName: node
   linkType: hard
 
@@ -1732,73 +1743,73 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-unicode-escapes@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-transform-unicode-escapes@npm:7.24.1"
+"@babel/plugin-transform-unicode-escapes@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-unicode-escapes@npm:7.24.7"
   dependencies:
-    "@babel/helper-plugin-utils": ^7.24.0
+    "@babel/helper-plugin-utils": ^7.24.7
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: d4d7cfea91af7be2768fb6bed902e00d6e3190bda738b5149c3a788d570e6cf48b974ec9548442850308ecd8fc9a67681f4ea8403129e7867bcb85adaf6ec238
+  checksum: 4af0a193e1ddea6ff82b2b15cc2501b872728050bd625740b813c8062fec917d32d530ff6b41de56c15e7296becdf3336a58db81f5ca8e7c445c1306c52f3e01
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-unicode-property-regex@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-transform-unicode-property-regex@npm:7.24.1"
+"@babel/plugin-transform-unicode-property-regex@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-unicode-property-regex@npm:7.24.7"
   dependencies:
-    "@babel/helper-create-regexp-features-plugin": ^7.22.15
-    "@babel/helper-plugin-utils": ^7.24.0
+    "@babel/helper-create-regexp-features-plugin": ^7.24.7
+    "@babel/helper-plugin-utils": ^7.24.7
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 276099b4483e707f80b054e2d29bc519158bfe52461ef5ff76f70727d592df17e30b1597ef4d8a0f04d810f6cb5a8dd887bdc1d0540af3744751710ef280090f
+  checksum: aae13350c50973f5802ca7906d022a6a0cc0e3aebac9122d0450bbd51e78252d4c2032ad69385e2759fcbdd3aac5d571bd7e26258907f51f8e1a51b53be626c2
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-unicode-regex@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-transform-unicode-regex@npm:7.24.1"
+"@babel/plugin-transform-unicode-regex@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-unicode-regex@npm:7.24.7"
   dependencies:
-    "@babel/helper-create-regexp-features-plugin": ^7.22.15
-    "@babel/helper-plugin-utils": ^7.24.0
+    "@babel/helper-create-regexp-features-plugin": ^7.24.7
+    "@babel/helper-plugin-utils": ^7.24.7
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 400a0927bdb1425b4c0dc68a61b5b2d7d17c7d9f0e07317a1a6a373c080ef94be1dd65fdc4ac9a78fcdb58f89fd128450c7bc0d5b8ca0ae7eca3fbd98e50acba
+  checksum: 1cb4e70678906e431da0a05ac3f8350025fee290304ad7482d9cfaa1ca67b2e898654de537c9268efbdad5b80d3ebadf42b4a88ea84609bd8a4cce7b11b48afd
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-unicode-sets-regex@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/plugin-transform-unicode-sets-regex@npm:7.24.1"
+"@babel/plugin-transform-unicode-sets-regex@npm:^7.24.7":
+  version: 7.24.7
+  resolution: "@babel/plugin-transform-unicode-sets-regex@npm:7.24.7"
   dependencies:
-    "@babel/helper-create-regexp-features-plugin": ^7.22.15
-    "@babel/helper-plugin-utils": ^7.24.0
+    "@babel/helper-create-regexp-features-plugin": ^7.24.7
+    "@babel/helper-plugin-utils": ^7.24.7
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: 364342fb8e382dfaa23628b88e6484dc1097e53fb7199f4d338f1e2cd71d839bb0a35a9b1380074f6a10adb2e98b79d53ca3ec78c0b8c557ca895ffff42180df
+  checksum: 08a2844914f33dacd2ce1ab021ce8c1cc35dc6568521a746d8bf29c21571ee5be78787b454231c4bb3526cbbe280f1893223c82726cec5df2be5dae0a3b51837
   languageName: node
   linkType: hard
 
-"@babel/preset-env@npm:^7.12.1, @babel/preset-env@npm:^7.12.7, @babel/preset-env@npm:^7.19.4, @babel/preset-env@npm:^7.22.9":
-  version: 7.24.4
-  resolution: "@babel/preset-env@npm:7.24.4"
+"@babel/preset-env@npm:^7.12.1, @babel/preset-env@npm:^7.12.7, @babel/preset-env@npm:^7.19.4, @babel/preset-env@npm:^7.22.9, @babel/preset-env@npm:^7.24.8":
+  version: 7.24.8
+  resolution: "@babel/preset-env@npm:7.24.8"
   dependencies:
-    "@babel/compat-data": ^7.24.4
-    "@babel/helper-compilation-targets": ^7.23.6
-    "@babel/helper-plugin-utils": ^7.24.0
-    "@babel/helper-validator-option": ^7.23.5
-    "@babel/plugin-bugfix-firefox-class-in-computed-class-key": ^7.24.4
-    "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": ^7.24.1
-    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": ^7.24.1
-    "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": ^7.24.1
+    "@babel/compat-data": ^7.24.8
+    "@babel/helper-compilation-targets": ^7.24.8
+    "@babel/helper-plugin-utils": ^7.24.8
+    "@babel/helper-validator-option": ^7.24.8
+    "@babel/plugin-bugfix-firefox-class-in-computed-class-key": ^7.24.7
+    "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": ^7.24.7
+    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": ^7.24.7
+    "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": ^7.24.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.24.1
-    "@babel/plugin-syntax-import-attributes": ^7.24.1
+    "@babel/plugin-syntax-import-assertions": ^7.24.7
+    "@babel/plugin-syntax-import-attributes": ^7.24.7
     "@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
@@ -1810,63 +1821,63 @@ __metadata:
     "@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.24.1
-    "@babel/plugin-transform-async-generator-functions": ^7.24.3
-    "@babel/plugin-transform-async-to-generator": ^7.24.1
-    "@babel/plugin-transform-block-scoped-functions": ^7.24.1
-    "@babel/plugin-transform-block-scoping": ^7.24.4
-    "@babel/plugin-transform-class-properties": ^7.24.1
-    "@babel/plugin-transform-class-static-block": ^7.24.4
-    "@babel/plugin-transform-classes": ^7.24.1
-    "@babel/plugin-transform-computed-properties": ^7.24.1
-    "@babel/plugin-transform-destructuring": ^7.24.1
-    "@babel/plugin-transform-dotall-regex": ^7.24.1
-    "@babel/plugin-transform-duplicate-keys": ^7.24.1
-    "@babel/plugin-transform-dynamic-import": ^7.24.1
-    "@babel/plugin-transform-exponentiation-operator": ^7.24.1
-    "@babel/plugin-transform-export-namespace-from": ^7.24.1
-    "@babel/plugin-transform-for-of": ^7.24.1
-    "@babel/plugin-transform-function-name": ^7.24.1
-    "@babel/plugin-transform-json-strings": ^7.24.1
-    "@babel/plugin-transform-literals": ^7.24.1
-    "@babel/plugin-transform-logical-assignment-operators": ^7.24.1
-    "@babel/plugin-transform-member-expression-literals": ^7.24.1
-    "@babel/plugin-transform-modules-amd": ^7.24.1
-    "@babel/plugin-transform-modules-commonjs": ^7.24.1
-    "@babel/plugin-transform-modules-systemjs": ^7.24.1
-    "@babel/plugin-transform-modules-umd": ^7.24.1
-    "@babel/plugin-transform-named-capturing-groups-regex": ^7.22.5
-    "@babel/plugin-transform-new-target": ^7.24.1
-    "@babel/plugin-transform-nullish-coalescing-operator": ^7.24.1
-    "@babel/plugin-transform-numeric-separator": ^7.24.1
-    "@babel/plugin-transform-object-rest-spread": ^7.24.1
-    "@babel/plugin-transform-object-super": ^7.24.1
-    "@babel/plugin-transform-optional-catch-binding": ^7.24.1
-    "@babel/plugin-transform-optional-chaining": ^7.24.1
-    "@babel/plugin-transform-parameters": ^7.24.1
-    "@babel/plugin-transform-private-methods": ^7.24.1
-    "@babel/plugin-transform-private-property-in-object": ^7.24.1
-    "@babel/plugin-transform-property-literals": ^7.24.1
-    "@babel/plugin-transform-regenerator": ^7.24.1
-    "@babel/plugin-transform-reserved-words": ^7.24.1
-    "@babel/plugin-transform-shorthand-properties": ^7.24.1
-    "@babel/plugin-transform-spread": ^7.24.1
-    "@babel/plugin-transform-sticky-regex": ^7.24.1
-    "@babel/plugin-transform-template-literals": ^7.24.1
-    "@babel/plugin-transform-typeof-symbol": ^7.24.1
-    "@babel/plugin-transform-unicode-escapes": ^7.24.1
-    "@babel/plugin-transform-unicode-property-regex": ^7.24.1
-    "@babel/plugin-transform-unicode-regex": ^7.24.1
-    "@babel/plugin-transform-unicode-sets-regex": ^7.24.1
+    "@babel/plugin-transform-arrow-functions": ^7.24.7
+    "@babel/plugin-transform-async-generator-functions": ^7.24.7
+    "@babel/plugin-transform-async-to-generator": ^7.24.7
+    "@babel/plugin-transform-block-scoped-functions": ^7.24.7
+    "@babel/plugin-transform-block-scoping": ^7.24.7
+    "@babel/plugin-transform-class-properties": ^7.24.7
+    "@babel/plugin-transform-class-static-block": ^7.24.7
+    "@babel/plugin-transform-classes": ^7.24.8
+    "@babel/plugin-transform-computed-properties": ^7.24.7
+    "@babel/plugin-transform-destructuring": ^7.24.8
+    "@babel/plugin-transform-dotall-regex": ^7.24.7
+    "@babel/plugin-transform-duplicate-keys": ^7.24.7
+    "@babel/plugin-transform-dynamic-import": ^7.24.7
+    "@babel/plugin-transform-exponentiation-operator": ^7.24.7
+    "@babel/plugin-transform-export-namespace-from": ^7.24.7
+    "@babel/plugin-transform-for-of": ^7.24.7
+    "@babel/plugin-transform-function-name": ^7.24.7
+    "@babel/plugin-transform-json-strings": ^7.24.7
+    "@babel/plugin-transform-literals": ^7.24.7
+    "@babel/plugin-transform-logical-assignment-operators": ^7.24.7
+    "@babel/plugin-transform-member-expression-literals": ^7.24.7
+    "@babel/plugin-transform-modules-amd": ^7.24.7
+    "@babel/plugin-transform-modules-commonjs": ^7.24.8
+    "@babel/plugin-transform-modules-systemjs": ^7.24.7
+    "@babel/plugin-transform-modules-umd": ^7.24.7
+    "@babel/plugin-transform-named-capturing-groups-regex": ^7.24.7
+    "@babel/plugin-transform-new-target": ^7.24.7
+    "@babel/plugin-transform-nullish-coalescing-operator": ^7.24.7
+    "@babel/plugin-transform-numeric-separator": ^7.24.7
+    "@babel/plugin-transform-object-rest-spread": ^7.24.7
+    "@babel/plugin-transform-object-super": ^7.24.7
+    "@babel/plugin-transform-optional-catch-binding": ^7.24.7
+    "@babel/plugin-transform-optional-chaining": ^7.24.8
+    "@babel/plugin-transform-parameters": ^7.24.7
+    "@babel/plugin-transform-private-methods": ^7.24.7
+    "@babel/plugin-transform-private-property-in-object": ^7.24.7
+    "@babel/plugin-transform-property-literals": ^7.24.7
+    "@babel/plugin-transform-regenerator": ^7.24.7
+    "@babel/plugin-transform-reserved-words": ^7.24.7
+    "@babel/plugin-transform-shorthand-properties": ^7.24.7
+    "@babel/plugin-transform-spread": ^7.24.7
+    "@babel/plugin-transform-sticky-regex": ^7.24.7
+    "@babel/plugin-transform-template-literals": ^7.24.7
+    "@babel/plugin-transform-typeof-symbol": ^7.24.8
+    "@babel/plugin-transform-unicode-escapes": ^7.24.7
+    "@babel/plugin-transform-unicode-property-regex": ^7.24.7
+    "@babel/plugin-transform-unicode-regex": ^7.24.7
+    "@babel/plugin-transform-unicode-sets-regex": ^7.24.7
     "@babel/preset-modules": 0.1.6-no-external-plugins
     babel-plugin-polyfill-corejs2: ^0.4.10
     babel-plugin-polyfill-corejs3: ^0.10.4
     babel-plugin-polyfill-regenerator: ^0.6.1
-    core-js-compat: ^3.31.0
+    core-js-compat: ^3.37.1
     semver: ^6.3.1
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 5a057a6463f92b02bfe66257d3f2c76878815bc7847f2a716b0539d9f547eae2a9d1f0fc62a5c0eff6ab0504bb52e815829ef893e4586b641f8dd6a609d114f3
+  checksum: efea0039dbb089c9cc0b792b9ac0eef949699584b4c622e2abea062b44b1a0fbcda6ad25e2263ae36a69586889b4a22439a1096aa8152b366e3fedd921ae66ac
   languageName: node
   linkType: hard
 
@@ -1931,52 +1942,49 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/runtime@npm:^7.1.2, @babel/runtime@npm:^7.10.3, @babel/runtime@npm:^7.12.13, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.17.2, @babel/runtime@npm:^7.21.0, @babel/runtime@npm:^7.22.6, @babel/runtime@npm:^7.8.4":
-  version: 7.24.4
-  resolution: "@babel/runtime@npm:7.24.4"
+"@babel/runtime@npm:^7.1.2, @babel/runtime@npm:^7.10.3, @babel/runtime@npm:^7.11.1, @babel/runtime@npm:^7.11.2, @babel/runtime@npm:^7.12.13, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.14.5, @babel/runtime@npm:^7.17.2, @babel/runtime@npm:^7.18.0, @babel/runtime@npm:^7.18.3, @babel/runtime@npm:^7.19.0, @babel/runtime@npm:^7.20.7, @babel/runtime@npm:^7.21.0, @babel/runtime@npm:^7.22.6, @babel/runtime@npm:^7.23.2, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.9.2":
+  version: 7.24.8
+  resolution: "@babel/runtime@npm:7.24.8"
   dependencies:
     regenerator-runtime: ^0.14.0
-  checksum: 2f27d4c0ffac7ae7999ac0385e1106f2a06992a8bdcbf3da06adcac7413863cd08c198c2e4e970041bbea849e17f02e1df18875539b6afba76c781b6b59a07c3
+  checksum: 6b1e4230580f67a807ad054720812bbefbb024cc2adc1159d050acbb764c4c81c7ac5f7a042c48f578987c5edc2453c71039268df059058e9501fa6023d764b0
   languageName: node
   linkType: hard
 
-"@babel/template@npm:^7.12.7, @babel/template@npm:^7.22.15, @babel/template@npm:^7.24.0, @babel/template@npm:^7.3.3":
-  version: 7.24.0
-  resolution: "@babel/template@npm:7.24.0"
+"@babel/template@npm:^7.12.7, @babel/template@npm:^7.24.7, @babel/template@npm:^7.25.0, @babel/template@npm:^7.3.3":
+  version: 7.25.0
+  resolution: "@babel/template@npm:7.25.0"
   dependencies:
-    "@babel/code-frame": ^7.23.5
-    "@babel/parser": ^7.24.0
-    "@babel/types": ^7.24.0
-  checksum: f257b003c071a0cecdbfceca74185f18fe62c055469ab5c1d481aab12abeebed328e67e0a19fd978a2a8de97b28953fa4bc3da6d038a7345fdf37923b9fcdec8
+    "@babel/code-frame": ^7.24.7
+    "@babel/parser": ^7.25.0
+    "@babel/types": ^7.25.0
+  checksum: 3f2db568718756d0daf2a16927b78f00c425046b654cd30b450006f2e84bdccaf0cbe6dc04994aa1f5f6a4398da2f11f3640a4d3ee31722e43539c4c919c817b
   languageName: node
   linkType: hard
 
-"@babel/traverse@npm:^7.12.9, @babel/traverse@npm:^7.22.8, @babel/traverse@npm:^7.24.1":
-  version: 7.24.1
-  resolution: "@babel/traverse@npm:7.24.1"
-  dependencies:
-    "@babel/code-frame": ^7.24.1
-    "@babel/generator": ^7.24.1
-    "@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.24.1
-    "@babel/types": ^7.24.0
+"@babel/traverse@npm:^7.12.9, @babel/traverse@npm:^7.22.8, @babel/traverse@npm:^7.24.7, @babel/traverse@npm:^7.24.8, @babel/traverse@npm:^7.25.0":
+  version: 7.25.2
+  resolution: "@babel/traverse@npm:7.25.2"
+  dependencies:
+    "@babel/code-frame": ^7.24.7
+    "@babel/generator": ^7.25.0
+    "@babel/parser": ^7.25.0
+    "@babel/template": ^7.25.0
+    "@babel/types": ^7.25.2
     debug: ^4.3.1
     globals: ^11.1.0
-  checksum: 92a5ca906abfba9df17666d2001ab23f18600035f706a687055a0e392a690ae48d6fec67c8bd4ef19ba18699a77a5b7f85727e36b83f7d110141608fe0c24fe9
+  checksum: 281bb367d78735d3a84b342b6021d57ef21827fb5049dc298c509bd3880470e9979bc2a87ec8d6da27856c08a0fc94d7feb29e8e03f8f0efa5d3f2904ac65779
   languageName: node
   linkType: hard
 
-"@babel/types@npm:^7.0.0, @babel/types@npm:^7.12.6, @babel/types@npm:^7.12.7, @babel/types@npm:^7.20.0, @babel/types@npm:^7.20.7, @babel/types@npm:^7.22.15, @babel/types@npm:^7.22.19, @babel/types@npm:^7.22.5, @babel/types@npm:^7.23.0, @babel/types@npm:^7.23.4, @babel/types@npm:^7.24.0, @babel/types@npm:^7.3.3, @babel/types@npm:^7.4.4, @babel/types@npm:^7.8.3":
-  version: 7.24.0
-  resolution: "@babel/types@npm:7.24.0"
+"@babel/types@npm:^7.0.0, @babel/types@npm:^7.12.6, @babel/types@npm:^7.12.7, @babel/types@npm:^7.20.0, @babel/types@npm:^7.20.7, @babel/types@npm:^7.23.4, @babel/types@npm:^7.24.7, @babel/types@npm:^7.24.8, @babel/types@npm:^7.24.9, @babel/types@npm:^7.25.0, @babel/types@npm:^7.25.2, @babel/types@npm:^7.3.3, @babel/types@npm:^7.4.4, @babel/types@npm:^7.8.3":
+  version: 7.25.2
+  resolution: "@babel/types@npm:7.25.2"
   dependencies:
-    "@babel/helper-string-parser": ^7.23.4
-    "@babel/helper-validator-identifier": ^7.22.20
+    "@babel/helper-string-parser": ^7.24.8
+    "@babel/helper-validator-identifier": ^7.24.7
     to-fast-properties: ^2.0.0
-  checksum: 4b574a37d490f621470ff36a5afaac6deca5546edcb9b5e316d39acbb20998e9c2be42f3fc0bf2b55906fc49ff2a5a6a097e8f5a726ee3f708a0b0ca93aed807
+  checksum: f73f66ba903c6f7e38f519a33d53a67d49c07e208e59ea65250362691dc546c6da7ab90ec66ee79651ef697329872f6f97eb19a6dfcacc026fd05e76a563c5d2
   languageName: node
   linkType: hard
 
@@ -2008,6 +2016,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@crello/react-lottie@npm:0.0.9":
+  version: 0.0.9
+  resolution: "@crello/react-lottie@npm:0.0.9"
+  dependencies:
+    lottie-web: 5.5.9
+  peerDependencies:
+    react: ~16.9.0
+    react-dom: ~16.9.0
+  checksum: 3b0a6b3f53efd140a2b72c8b7b225c1933f492edb1d045ca6a3ed8ecf7d0114d237fc47abaee01d336445d05d9ea13d0f03e68e77b235ab5a5407d57468bdbae
+  languageName: node
+  linkType: hard
+
 "@cspotcode/source-map-support@npm:^0.8.0":
   version: 0.8.1
   resolution: "@cspotcode/source-map-support@npm:0.8.1"
@@ -2635,6 +2655,167 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@esbuild/aix-ppc64@npm:0.21.5":
+  version: 0.21.5
+  resolution: "@esbuild/aix-ppc64@npm:0.21.5"
+  conditions: os=aix & cpu=ppc64
+  languageName: node
+  linkType: hard
+
+"@esbuild/android-arm64@npm:0.21.5":
+  version: 0.21.5
+  resolution: "@esbuild/android-arm64@npm:0.21.5"
+  conditions: os=android & cpu=arm64
+  languageName: node
+  linkType: hard
+
+"@esbuild/android-arm@npm:0.21.5":
+  version: 0.21.5
+  resolution: "@esbuild/android-arm@npm:0.21.5"
+  conditions: os=android & cpu=arm
+  languageName: node
+  linkType: hard
+
+"@esbuild/android-x64@npm:0.21.5":
+  version: 0.21.5
+  resolution: "@esbuild/android-x64@npm:0.21.5"
+  conditions: os=android & cpu=x64
+  languageName: node
+  linkType: hard
+
+"@esbuild/darwin-arm64@npm:0.21.5":
+  version: 0.21.5
+  resolution: "@esbuild/darwin-arm64@npm:0.21.5"
+  conditions: os=darwin & cpu=arm64
+  languageName: node
+  linkType: hard
+
+"@esbuild/darwin-x64@npm:0.21.5":
+  version: 0.21.5
+  resolution: "@esbuild/darwin-x64@npm:0.21.5"
+  conditions: os=darwin & cpu=x64
+  languageName: node
+  linkType: hard
+
+"@esbuild/freebsd-arm64@npm:0.21.5":
+  version: 0.21.5
+  resolution: "@esbuild/freebsd-arm64@npm:0.21.5"
+  conditions: os=freebsd & cpu=arm64
+  languageName: node
+  linkType: hard
+
+"@esbuild/freebsd-x64@npm:0.21.5":
+  version: 0.21.5
+  resolution: "@esbuild/freebsd-x64@npm:0.21.5"
+  conditions: os=freebsd & cpu=x64
+  languageName: node
+  linkType: hard
+
+"@esbuild/linux-arm64@npm:0.21.5":
+  version: 0.21.5
+  resolution: "@esbuild/linux-arm64@npm:0.21.5"
+  conditions: os=linux & cpu=arm64
+  languageName: node
+  linkType: hard
+
+"@esbuild/linux-arm@npm:0.21.5":
+  version: 0.21.5
+  resolution: "@esbuild/linux-arm@npm:0.21.5"
+  conditions: os=linux & cpu=arm
+  languageName: node
+  linkType: hard
+
+"@esbuild/linux-ia32@npm:0.21.5":
+  version: 0.21.5
+  resolution: "@esbuild/linux-ia32@npm:0.21.5"
+  conditions: os=linux & cpu=ia32
+  languageName: node
+  linkType: hard
+
+"@esbuild/linux-loong64@npm:0.21.5":
+  version: 0.21.5
+  resolution: "@esbuild/linux-loong64@npm:0.21.5"
+  conditions: os=linux & cpu=loong64
+  languageName: node
+  linkType: hard
+
+"@esbuild/linux-mips64el@npm:0.21.5":
+  version: 0.21.5
+  resolution: "@esbuild/linux-mips64el@npm:0.21.5"
+  conditions: os=linux & cpu=mips64el
+  languageName: node
+  linkType: hard
+
+"@esbuild/linux-ppc64@npm:0.21.5":
+  version: 0.21.5
+  resolution: "@esbuild/linux-ppc64@npm:0.21.5"
+  conditions: os=linux & cpu=ppc64
+  languageName: node
+  linkType: hard
+
+"@esbuild/linux-riscv64@npm:0.21.5":
+  version: 0.21.5
+  resolution: "@esbuild/linux-riscv64@npm:0.21.5"
+  conditions: os=linux & cpu=riscv64
+  languageName: node
+  linkType: hard
+
+"@esbuild/linux-s390x@npm:0.21.5":
+  version: 0.21.5
+  resolution: "@esbuild/linux-s390x@npm:0.21.5"
+  conditions: os=linux & cpu=s390x
+  languageName: node
+  linkType: hard
+
+"@esbuild/linux-x64@npm:0.21.5":
+  version: 0.21.5
+  resolution: "@esbuild/linux-x64@npm:0.21.5"
+  conditions: os=linux & cpu=x64
+  languageName: node
+  linkType: hard
+
+"@esbuild/netbsd-x64@npm:0.21.5":
+  version: 0.21.5
+  resolution: "@esbuild/netbsd-x64@npm:0.21.5"
+  conditions: os=netbsd & cpu=x64
+  languageName: node
+  linkType: hard
+
+"@esbuild/openbsd-x64@npm:0.21.5":
+  version: 0.21.5
+  resolution: "@esbuild/openbsd-x64@npm:0.21.5"
+  conditions: os=openbsd & cpu=x64
+  languageName: node
+  linkType: hard
+
+"@esbuild/sunos-x64@npm:0.21.5":
+  version: 0.21.5
+  resolution: "@esbuild/sunos-x64@npm:0.21.5"
+  conditions: os=sunos & cpu=x64
+  languageName: node
+  linkType: hard
+
+"@esbuild/win32-arm64@npm:0.21.5":
+  version: 0.21.5
+  resolution: "@esbuild/win32-arm64@npm:0.21.5"
+  conditions: os=win32 & cpu=arm64
+  languageName: node
+  linkType: hard
+
+"@esbuild/win32-ia32@npm:0.21.5":
+  version: 0.21.5
+  resolution: "@esbuild/win32-ia32@npm:0.21.5"
+  conditions: os=win32 & cpu=ia32
+  languageName: node
+  linkType: hard
+
+"@esbuild/win32-x64@npm:0.21.5":
+  version: 0.21.5
+  resolution: "@esbuild/win32-x64@npm:0.21.5"
+  conditions: os=win32 & cpu=x64
+  languageName: node
+  linkType: hard
+
 "@eslint-community/eslint-utils@npm:^4.2.0":
   version: 4.4.0
   resolution: "@eslint-community/eslint-utils@npm:4.4.0"
@@ -2670,10 +2851,54 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@eslint/js@npm:8.49.0":
-  version: 8.49.0
-  resolution: "@eslint/js@npm:8.49.0"
-  checksum: a6601807c8aeeefe866926ad92ed98007c034a735af20ff709009e39ad1337474243d47908500a3bde04e37bfba16bcf1d3452417f962e1345bc8756edd6b830
+"@eslint/js@npm:8.49.0":
+  version: 8.49.0
+  resolution: "@eslint/js@npm:8.49.0"
+  checksum: a6601807c8aeeefe866926ad92ed98007c034a735af20ff709009e39ad1337474243d47908500a3bde04e37bfba16bcf1d3452417f962e1345bc8756edd6b830
+  languageName: node
+  linkType: hard
+
+"@fortawesome/fontawesome-common-types@npm:6.6.0":
+  version: 6.6.0
+  resolution: "@fortawesome/fontawesome-common-types@npm:6.6.0"
+  checksum: f8753e3ea603224df1b975059f6cea6168aac3c16d3e73d1a1a95c9a6d7550e3d843162f87946f746b6d8a7be7f8602c399c7e35356c9033d628ce23e83a819f
+  languageName: node
+  linkType: hard
+
+"@fortawesome/fontawesome-free@npm:^6.4.2":
+  version: 6.6.0
+  resolution: "@fortawesome/fontawesome-free@npm:6.6.0"
+  checksum: 44ad86efbf3835c9d54aedb9e39065853bff7d81309e3c7ea7848227ec3d017f9c3db4844dc6abbbb21b3e96384b038cff2b86e8caf7d925ac2d8239915aa043
+  languageName: node
+  linkType: hard
+
+"@fortawesome/fontawesome-svg-core@npm:^6.4.2":
+  version: 6.6.0
+  resolution: "@fortawesome/fontawesome-svg-core@npm:6.6.0"
+  dependencies:
+    "@fortawesome/fontawesome-common-types": 6.6.0
+  checksum: 3eaf5d3a2f9d6b362a2d01889eadecb7fe3d86a5ba7c29b5d9653a00206d329aae78e18160d46009955fa80e40ab523a3b35032d45a52014ced15b9510c264c9
+  languageName: node
+  linkType: hard
+
+"@fortawesome/free-solid-svg-icons@npm:^6.4.2":
+  version: 6.6.0
+  resolution: "@fortawesome/free-solid-svg-icons@npm:6.6.0"
+  dependencies:
+    "@fortawesome/fontawesome-common-types": 6.6.0
+  checksum: 145ae70fe0df253ed5e3330f88fde7236518700311d55019584f1633da67eef65e83838b948e5f4709d70beac3ba3c6b0b5ed58932127e69651b15e8d2e7ee7f
+  languageName: node
+  linkType: hard
+
+"@fortawesome/react-fontawesome@npm:^0.2.0":
+  version: 0.2.2
+  resolution: "@fortawesome/react-fontawesome@npm:0.2.2"
+  dependencies:
+    prop-types: ^15.8.1
+  peerDependencies:
+    "@fortawesome/fontawesome-svg-core": ~1 || ~6
+    react: ">=16.3"
+  checksum: e4bed35bfb7fc88b5bcf2305d08ee1835b82fa7705945c4d310df33bb747b05ef07a33ac9db643c8870ca4f835228978290d84d82f2c6c6a70b9ab4c886731a6
   languageName: node
   linkType: hard
 
@@ -2684,6 +2909,29 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@hapi/boom@npm:^10.0.1":
+  version: 10.0.1
+  resolution: "@hapi/boom@npm:10.0.1"
+  dependencies:
+    "@hapi/hoek": ^11.0.2
+  checksum: c80f76e86386c65fb5e3f2aae489e82c318615b52c1462af913b1db3d05ebf1564336e2cd88f1ee79d66a8b6f48fa075089c617bfe93ad88e6e1a695d0cde499
+  languageName: node
+  linkType: hard
+
+"@hapi/bourne@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "@hapi/bourne@npm:3.0.0"
+  checksum: 7174cab6c33191918fcdb1953fe3169a1106e6ac79a67ef5fd08b351f0813f8f608170f2239786cbe5519e03cdfe5ab748ea1635caa06dcd5802410295514ef8
+  languageName: node
+  linkType: hard
+
+"@hapi/hoek@npm:^11.0.2, @hapi/hoek@npm:^11.0.4":
+  version: 11.0.4
+  resolution: "@hapi/hoek@npm:11.0.4"
+  checksum: 67dc9782a8235e066e3885352e40faa3c239621d7de29bfc88a72aba60eeb8df76b5c05d77962c734c8b0ef3fc7f818cc692689003d270a1b73ea98ba1508c5b
+  languageName: node
+  linkType: hard
+
 "@hapi/hoek@npm:^9.0.0, @hapi/hoek@npm:^9.3.0":
   version: 9.3.0
   resolution: "@hapi/hoek@npm:9.3.0"
@@ -2700,6 +2948,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@hapi/wreck@npm:^18.0.0":
+  version: 18.1.0
+  resolution: "@hapi/wreck@npm:18.1.0"
+  dependencies:
+    "@hapi/boom": ^10.0.1
+    "@hapi/bourne": ^3.0.0
+    "@hapi/hoek": ^11.0.2
+  checksum: 08e20e829a46fcdd1595b7181d3c0f94bc1cd2966aaf272138a6b80fa5266852295189295169903be20ef53bb35ba7b9a9080ce7e1147116ffce4db492b99bec
+  languageName: node
+  linkType: hard
+
 "@humanwhocodes/config-array@npm:^0.11.11":
   version: 0.11.11
   resolution: "@humanwhocodes/config-array@npm:0.11.11"
@@ -2732,6 +2991,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@hypnosphi/create-react-context@npm:^0.3.1":
+  version: 0.3.1
+  resolution: "@hypnosphi/create-react-context@npm:0.3.1"
+  dependencies:
+    gud: ^1.0.0
+    warning: ^4.0.3
+  peerDependencies:
+    prop-types: ^15.0.0
+    react: ">=0.14.0"
+  checksum: d2f069a562e138057aa067e1483e28cea3193bbacd33ca9528131f31e656939cfeb552af760b3be437d3a8074315a8854fc6d5d89878e2746618ad930c817122
+  languageName: node
+  linkType: hard
+
 "@isaacs/cliui@npm:^8.0.2":
   version: 8.0.2
   resolution: "@isaacs/cliui@npm:8.0.2"
@@ -3038,10 +3310,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@jridgewell/sourcemap-codec@npm:^1.4.10, @jridgewell/sourcemap-codec@npm:^1.4.14":
-  version: 1.4.15
-  resolution: "@jridgewell/sourcemap-codec@npm:1.4.15"
-  checksum: b881c7e503db3fc7f3c1f35a1dd2655a188cc51a3612d76efc8a6eb74728bef5606e6758ee77423e564092b4a518aba569bbb21c9bac5ab7a35b0c6ae7e344c8
+"@jridgewell/sourcemap-codec@npm:^1.4.10, @jridgewell/sourcemap-codec@npm:^1.4.14, @jridgewell/sourcemap-codec@npm:^1.4.15":
+  version: 1.5.0
+  resolution: "@jridgewell/sourcemap-codec@npm:1.5.0"
+  checksum: 05df4f2538b3b0f998ea4c1cd34574d0feba216fa5d4ccaef0187d12abf82eafe6021cec8b49f9bb4d90f2ba4582ccc581e72986a5fcf4176ae0cfeb04cf52ec
   languageName: node
   linkType: hard
 
@@ -3090,6 +3362,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@jstarpl/react-contextmenu@npm:^2.15.0":
+  version: 2.15.0
+  resolution: "@jstarpl/react-contextmenu@npm:2.15.0"
+  dependencies:
+    classnames: ^2.2.5
+    object-assign: ^4.1.0
+  peerDependencies:
+    prop-types: ^15.0.0
+    react: ^0.14.0 || ^15.0.0 || ^16.0.1 || ^17 || ^18
+    react-dom: ^0.14.0 || ^15.0.0 || ^16.0.1 || ^17 || ^18
+  checksum: a3b219ac32537db7c5f00a97816260988bf351c3623746d4659a68dff7bd02a1b221dc1b5ddcc2a8743aa40fd82d24e9bb0d80d2c8224e2a3f4ff4e45192d85f
+  languageName: node
+  linkType: hard
+
 "@juggle/resize-observer@npm:^3.3.1":
   version: 3.4.0
   resolution: "@juggle/resize-observer@npm:3.4.0"
@@ -3292,37 +3578,38 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@mos-connection/connector@npm:4.1.1-nightly-master-20240430-072032-ffb8bf6.0":
-  version: 4.1.1-nightly-master-20240430-072032-ffb8bf6.0
-  resolution: "@mos-connection/connector@npm:4.1.1-nightly-master-20240430-072032-ffb8bf6.0"
+"@mos-connection/connector@npm:v4.2.0-alpha.1":
+  version: 4.2.0-alpha.1
+  resolution: "@mos-connection/connector@npm:4.2.0-alpha.1"
   dependencies:
-    "@mos-connection/helper": 4.1.1-nightly-master-20240430-072032-ffb8bf6.0
-    "@mos-connection/model": 4.1.1-nightly-master-20240430-072032-ffb8bf6.0
+    "@mos-connection/helper": 4.2.0-alpha.1
+    "@mos-connection/model": 4.2.0-alpha.1
+    eventemitter3: ^5.0.1
     iconv-lite: ^0.6.3
     tslib: ^2.5.3
     xml-js: ^1.6.11
     xmlbuilder: ^15.1.1
-  checksum: 5a1879e940867380a7fea443c71cb220ad4e932c8acfa34ae1cb0a2ade471d16f44b72293d604a8aa4b227e356b7f3dfb520f822f6e330ab5bc9e48fbfefcab3
+  checksum: 9cecd2b0f631b1b9894a84db3fd6659d8afe11aa03acaac9798263568e35202d4f7da9694be8028c721c695e7365b2a56aa7243281b4834353e0e413d128df7a
   languageName: node
   linkType: hard
 
-"@mos-connection/helper@npm:4.1.1-nightly-master-20240430-072032-ffb8bf6.0":
-  version: 4.1.1-nightly-master-20240430-072032-ffb8bf6.0
-  resolution: "@mos-connection/helper@npm:4.1.1-nightly-master-20240430-072032-ffb8bf6.0"
+"@mos-connection/helper@npm:4.2.0-alpha.1, @mos-connection/helper@npm:v4.2.0-alpha.1":
+  version: 4.2.0-alpha.1
+  resolution: "@mos-connection/helper@npm:4.2.0-alpha.1"
   dependencies:
-    "@mos-connection/model": 4.1.1-nightly-master-20240430-072032-ffb8bf6.0
+    "@mos-connection/model": 4.2.0-alpha.1
     iconv-lite: ^0.6.3
     tslib: ^2.5.3
     xml-js: ^1.6.11
     xmlbuilder: ^15.1.1
-  checksum: dcf7d5e800d08c007a4026b37ddcc6ebe77d020a311809bc379a5c7d15657c2d447b4149682aec17161d17217e2c6d5167c7ef81e954a4ed5a6283a7c75a7e0a
+  checksum: ad809b542065b921e2d16e30f9ce04fba03d39c18a2944af2a440bfa33e05820954e0448cc6f38a3ed3d043b9b6c9b052cb24af0e6504d4c6723e5864c3df780
   languageName: node
   linkType: hard
 
-"@mos-connection/model@npm:4.1.1-nightly-master-20240430-072032-ffb8bf6.0, @mos-connection/model@npm:^4.1.1-nightly-master-20240430-072032-ffb8bf6.0":
-  version: 4.1.1-nightly-master-20240430-072032-ffb8bf6.0
-  resolution: "@mos-connection/model@npm:4.1.1-nightly-master-20240430-072032-ffb8bf6.0"
-  checksum: 07bd3ffc94a8c140d994de445c34158bb9f5f8950f6cea34d59657fe4da1f0f6b5d0c2c7ef1b2ad902b43c846485ab10cb9f19d707233b875fe739d731151bdc
+"@mos-connection/model@npm:4.2.0-alpha.1, @mos-connection/model@npm:v4.2.0-alpha.1":
+  version: 4.2.0-alpha.1
+  resolution: "@mos-connection/model@npm:4.2.0-alpha.1"
+  checksum: d0bbbbe86254cf7d17f52a71d4a6b7241749ee784faf4c1d7079852bdce758562a7b2a7d1d92637dafd5d3de433bff6b04e8a969d426be65b384118028b0f6f8
   languageName: node
   linkType: hard
 
@@ -3773,6 +4060,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@nrk/core-icons@npm:^9.6.0":
+  version: 9.6.0
+  resolution: "@nrk/core-icons@npm:9.6.0"
+  checksum: b8e5737155607f0b6efc4b961a9b545b03f3a780172a8455396a6230f6aca85e3153dce535b46cab735c1c1d078c088a826c5626579f909490ad89f83b38da10
+  languageName: node
+  linkType: hard
+
 "@nrwl/cli@npm:15.9.7":
   version: 15.9.7
   resolution: "@nrwl/cli@npm:15.9.7"
@@ -4190,6 +4484,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@popperjs/core@npm:^2.11.8":
+  version: 2.11.8
+  resolution: "@popperjs/core@npm:2.11.8"
+  checksum: e5c69fdebf52a4012f6a1f14817ca8e9599cb1be73dd1387e1785e2ed5e5f0862ff817f420a87c7fc532add1f88a12e25aeb010ffcbdc98eace3d55ce2139cf0
+  languageName: node
+  linkType: hard
+
 "@protobufjs/aspromise@npm:^1.1.1, @protobufjs/aspromise@npm:^1.1.2":
   version: 1.1.2
   resolution: "@protobufjs/aspromise@npm:1.1.2"
@@ -4263,6 +4564,76 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@puppeteer/browsers@npm:2.3.1":
+  version: 2.3.1
+  resolution: "@puppeteer/browsers@npm:2.3.1"
+  dependencies:
+    debug: ^4.3.6
+    extract-zip: ^2.0.1
+    progress: ^2.0.3
+    proxy-agent: ^6.4.0
+    semver: ^7.6.3
+    tar-fs: ^3.0.6
+    unbzip2-stream: ^1.4.3
+    yargs: ^17.7.2
+  bin:
+    browsers: lib/cjs/main-cli.js
+  checksum: 06381d9566f4f5fcb15244afdc7ca5b96c4187a2738d22d2aa0b18e14e3dacf25665768e511390f461d875314c2af0dec51f71aeca5b78c84801485a15c8c3c3
+  languageName: node
+  linkType: hard
+
+"@rc-component/portal@npm:^1.1.0":
+  version: 1.1.2
+  resolution: "@rc-component/portal@npm:1.1.2"
+  dependencies:
+    "@babel/runtime": ^7.18.0
+    classnames: ^2.3.2
+    rc-util: ^5.24.4
+  peerDependencies:
+    react: ">=16.9.0"
+    react-dom: ">=16.9.0"
+  checksum: bdb14f48d3d0d7391347a4da37e8de1b539ae7b0bc71005beb964036a1fd7874a242ce42d3e06a4979a26d22a12f965357d571c40966cd457736d3c430a5421f
+  languageName: node
+  linkType: hard
+
+"@rc-component/trigger@npm:^2.0.0":
+  version: 2.2.0
+  resolution: "@rc-component/trigger@npm:2.2.0"
+  dependencies:
+    "@babel/runtime": ^7.23.2
+    "@rc-component/portal": ^1.1.0
+    classnames: ^2.3.2
+    rc-motion: ^2.0.0
+    rc-resize-observer: ^1.3.1
+    rc-util: ^5.38.0
+  peerDependencies:
+    react: ">=16.9.0"
+    react-dom: ">=16.9.0"
+  checksum: 55cb5b8b9456507a41977999b84db9247f3b0e50bc3fadc1d234187df630d208779c5c9c45d0c152f29b968740d6fa043e9496255b7aa7cc3e18347a325420e4
+  languageName: node
+  linkType: hard
+
+"@react-dnd/asap@npm:^4.0.0":
+  version: 4.0.1
+  resolution: "@react-dnd/asap@npm:4.0.1"
+  checksum: 757db3b5c436a95383b74f187f503321092909401ce9665d9cc1999308a44de22809bf8dbe82c9126bd73b72dd6665bbc4a788e864fc3c243c59f65057a4f87f
+  languageName: node
+  linkType: hard
+
+"@react-dnd/invariant@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "@react-dnd/invariant@npm:2.0.0"
+  checksum: ef1e989920d70b15c80dccb01af9b598081d76993311aa22d2e9a3ec41d10a88540eeec4b4de7a8b2a2ea52dfc3495ab45e39192c2d27795a9258bd6b79d000e
+  languageName: node
+  linkType: hard
+
+"@react-dnd/shallowequal@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "@react-dnd/shallowequal@npm:2.0.0"
+  checksum: b5bbdc795d65945bb7ba2322bed5cf8d4c6fe91dced98c3b10e3d16822c438f558751135ff296f8d1aa1eaa9d0037dacab2b522ca5eb812175123b9996966dcb
+  languageName: node
+  linkType: hard
+
 "@rollup/plugin-babel@npm:^5.2.1":
   version: 5.3.1
   resolution: "@rollup/plugin-babel@npm:5.3.1"
@@ -4280,6 +4651,22 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@rollup/plugin-inject@npm:^5.0.5":
+  version: 5.0.5
+  resolution: "@rollup/plugin-inject@npm:5.0.5"
+  dependencies:
+    "@rollup/pluginutils": ^5.0.1
+    estree-walker: ^2.0.2
+    magic-string: ^0.30.3
+  peerDependencies:
+    rollup: ^1.20.0||^2.0.0||^3.0.0||^4.0.0
+  peerDependenciesMeta:
+    rollup:
+      optional: true
+  checksum: 22cb772fd6f7178308b2ece95cdde5f8615f6257197832166294552a7e4c0d3976dc996cbfa6470af3151d8b86c00091aa93da5f4db6ec563f11b6db29fd1b63
+  languageName: node
+  linkType: hard
+
 "@rollup/pluginutils@npm:^3.1.0":
   version: 3.1.0
   resolution: "@rollup/pluginutils@npm:3.1.0"
@@ -4293,6 +4680,134 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@rollup/pluginutils@npm:^5.0.1":
+  version: 5.1.0
+  resolution: "@rollup/pluginutils@npm:5.1.0"
+  dependencies:
+    "@types/estree": ^1.0.0
+    estree-walker: ^2.0.2
+    picomatch: ^2.3.1
+  peerDependencies:
+    rollup: ^1.20.0||^2.0.0||^3.0.0||^4.0.0
+  peerDependenciesMeta:
+    rollup:
+      optional: true
+  checksum: 3cc5a6d91452a6eabbfd1ae79b4dd1f1e809d2eecda6e175deb784e75b0911f47e9ecce73f8dd315d6a8b3f362582c91d3c0f66908b6ced69345b3cbe28f8ce8
+  languageName: node
+  linkType: hard
+
+"@rollup/rollup-android-arm-eabi@npm:4.19.0":
+  version: 4.19.0
+  resolution: "@rollup/rollup-android-arm-eabi@npm:4.19.0"
+  conditions: os=android & cpu=arm
+  languageName: node
+  linkType: hard
+
+"@rollup/rollup-android-arm64@npm:4.19.0":
+  version: 4.19.0
+  resolution: "@rollup/rollup-android-arm64@npm:4.19.0"
+  conditions: os=android & cpu=arm64
+  languageName: node
+  linkType: hard
+
+"@rollup/rollup-darwin-arm64@npm:4.19.0":
+  version: 4.19.0
+  resolution: "@rollup/rollup-darwin-arm64@npm:4.19.0"
+  conditions: os=darwin & cpu=arm64
+  languageName: node
+  linkType: hard
+
+"@rollup/rollup-darwin-x64@npm:4.19.0":
+  version: 4.19.0
+  resolution: "@rollup/rollup-darwin-x64@npm:4.19.0"
+  conditions: os=darwin & cpu=x64
+  languageName: node
+  linkType: hard
+
+"@rollup/rollup-linux-arm-gnueabihf@npm:4.19.0":
+  version: 4.19.0
+  resolution: "@rollup/rollup-linux-arm-gnueabihf@npm:4.19.0"
+  conditions: os=linux & cpu=arm & libc=glibc
+  languageName: node
+  linkType: hard
+
+"@rollup/rollup-linux-arm-musleabihf@npm:4.19.0":
+  version: 4.19.0
+  resolution: "@rollup/rollup-linux-arm-musleabihf@npm:4.19.0"
+  conditions: os=linux & cpu=arm & libc=musl
+  languageName: node
+  linkType: hard
+
+"@rollup/rollup-linux-arm64-gnu@npm:4.19.0":
+  version: 4.19.0
+  resolution: "@rollup/rollup-linux-arm64-gnu@npm:4.19.0"
+  conditions: os=linux & cpu=arm64 & libc=glibc
+  languageName: node
+  linkType: hard
+
+"@rollup/rollup-linux-arm64-musl@npm:4.19.0":
+  version: 4.19.0
+  resolution: "@rollup/rollup-linux-arm64-musl@npm:4.19.0"
+  conditions: os=linux & cpu=arm64 & libc=musl
+  languageName: node
+  linkType: hard
+
+"@rollup/rollup-linux-powerpc64le-gnu@npm:4.19.0":
+  version: 4.19.0
+  resolution: "@rollup/rollup-linux-powerpc64le-gnu@npm:4.19.0"
+  conditions: os=linux & cpu=ppc64 & libc=glibc
+  languageName: node
+  linkType: hard
+
+"@rollup/rollup-linux-riscv64-gnu@npm:4.19.0":
+  version: 4.19.0
+  resolution: "@rollup/rollup-linux-riscv64-gnu@npm:4.19.0"
+  conditions: os=linux & cpu=riscv64 & libc=glibc
+  languageName: node
+  linkType: hard
+
+"@rollup/rollup-linux-s390x-gnu@npm:4.19.0":
+  version: 4.19.0
+  resolution: "@rollup/rollup-linux-s390x-gnu@npm:4.19.0"
+  conditions: os=linux & cpu=s390x & libc=glibc
+  languageName: node
+  linkType: hard
+
+"@rollup/rollup-linux-x64-gnu@npm:4.19.0":
+  version: 4.19.0
+  resolution: "@rollup/rollup-linux-x64-gnu@npm:4.19.0"
+  conditions: os=linux & cpu=x64 & libc=glibc
+  languageName: node
+  linkType: hard
+
+"@rollup/rollup-linux-x64-musl@npm:4.19.0":
+  version: 4.19.0
+  resolution: "@rollup/rollup-linux-x64-musl@npm:4.19.0"
+  conditions: os=linux & cpu=x64 & libc=musl
+  languageName: node
+  linkType: hard
+
+"@rollup/rollup-win32-arm64-msvc@npm:4.19.0":
+  version: 4.19.0
+  resolution: "@rollup/rollup-win32-arm64-msvc@npm:4.19.0"
+  conditions: os=win32 & cpu=arm64
+  languageName: node
+  linkType: hard
+
+"@rollup/rollup-win32-ia32-msvc@npm:4.19.0":
+  version: 4.19.0
+  resolution: "@rollup/rollup-win32-ia32-msvc@npm:4.19.0"
+  conditions: os=win32 & cpu=ia32
+  languageName: node
+  linkType: hard
+
+"@rollup/rollup-win32-x64-msvc@npm:4.19.0":
+  version: 4.19.0
+  resolution: "@rollup/rollup-win32-x64-msvc@npm:4.19.0"
+  conditions: os=win32 & cpu=x64
+  languageName: node
+  linkType: hard
+
 "@serialport/binding-mock@npm:10.2.2":
   version: 10.2.2
   resolution: "@serialport/binding-mock@npm:10.2.2"
@@ -4303,17 +4818,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@serialport/bindings-cpp@npm:10.8.0":
-  version: 10.8.0
-  resolution: "@serialport/bindings-cpp@npm:10.8.0"
+"@serialport/bindings-cpp@npm:12.0.1":
+  version: 12.0.1
+  resolution: "@serialport/bindings-cpp@npm:12.0.1"
   dependencies:
     "@serialport/bindings-interface": 1.2.2
-    "@serialport/parser-readline": ^10.2.1
-    debug: ^4.3.2
-    node-addon-api: ^5.0.0
+    "@serialport/parser-readline": 11.0.0
+    debug: 4.3.4
+    node-addon-api: 7.0.0
     node-gyp: latest
-    node-gyp-build: ^4.3.0
-  checksum: 8b12bfc70775b11b641f29e0d31dcbec0ff05fab23eedf10e636fe11f58d53a5dfb655b78b190770b1f20c305ca662d14e1b958977a443a43602fdcbefebdbd7
+    node-gyp-build: 4.6.0
+  checksum: 139b199b6d05c3bebf79e699c78054cfc3c587c19cb73fc1805381c426bc0fddaf4b35c271b91b8cd7fa684a1ab53e5c51aafeb54d9ce7fa5ffec03e6718b62d
   languageName: node
   linkType: hard
 
@@ -4324,85 +4839,101 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@serialport/parser-byte-length@npm:10.5.0":
-  version: 10.5.0
-  resolution: "@serialport/parser-byte-length@npm:10.5.0"
-  checksum: 41ce4cf9f25cca3dde4b4d7b5cf13f3f663a2a5eb26b903efd72f96ab6ab64e05b381dff3d8c071012117298bd8f09ff6bf0621abe3e560acdb71f11447e21e7
+"@serialport/parser-byte-length@npm:12.0.0":
+  version: 12.0.0
+  resolution: "@serialport/parser-byte-length@npm:12.0.0"
+  checksum: 531860294f74ecd33f5db22688a11325b367832e0b57b292f9b7d6deab11ab22723094022855b8966e9149a7449bde4456fac43fc347a1f7cc4efc271f855909
+  languageName: node
+  linkType: hard
+
+"@serialport/parser-cctalk@npm:12.0.0":
+  version: 12.0.0
+  resolution: "@serialport/parser-cctalk@npm:12.0.0"
+  checksum: c124a650889956728cbdbb4a5ecac128fe61a8f1c89e803a76f59fe41c41dbd10ecf906645cb0c644a9e5ed04e092853efd5ad277ba170ba43d091f105d1bfeb
+  languageName: node
+  linkType: hard
+
+"@serialport/parser-delimiter@npm:11.0.0":
+  version: 11.0.0
+  resolution: "@serialport/parser-delimiter@npm:11.0.0"
+  checksum: 4506fe22cb5c73cc3fc9a1543d230691bcf275f173f9689eb1024d56ebc19ab3aa4bb530ee668e85803cfaa0af9bb376fc9cbb0056fa36bf4bc299f83959015e
   languageName: node
   linkType: hard
 
-"@serialport/parser-cctalk@npm:10.5.0":
-  version: 10.5.0
-  resolution: "@serialport/parser-cctalk@npm:10.5.0"
-  checksum: a0c4eac183f1d88f6edcda5e14d9e4105d63ebfa2a2f765d2e298433ca7c1be34cc334b14b08e941a5394e2b628361bf2abb2fb1735331d4988f01d4784409e9
+"@serialport/parser-delimiter@npm:12.0.0":
+  version: 12.0.0
+  resolution: "@serialport/parser-delimiter@npm:12.0.0"
+  checksum: dcfdc3e5f4419d0aa5444bc0042674c46c63c82daee0c5e673c36c54539e846c4b6de233b7ba1f7df0ad72cd369fc117673c5cbec4833d2018e9fb584d916316
   languageName: node
   linkType: hard
 
-"@serialport/parser-delimiter@npm:10.5.0":
-  version: 10.5.0
-  resolution: "@serialport/parser-delimiter@npm:10.5.0"
-  checksum: 7a5d24fa577bddde428979a641081604116f98ff9b0a59ec4fe1021d4d2f1ec4177546e40580e4bb04714b85365a19de3f16f183d6f8cf46ca37bca13b4fb567
+"@serialport/parser-inter-byte-timeout@npm:12.0.0":
+  version: 12.0.0
+  resolution: "@serialport/parser-inter-byte-timeout@npm:12.0.0"
+  checksum: cd0b7cc2a353d2e1168fb3e8b05c6561c3f5a905c98b74081388518d23db0678c903eb2b9cbd0043a6b8b24b89bdae99af465c3b248e0c5438a9eac8cb4d1504
   languageName: node
   linkType: hard
 
-"@serialport/parser-inter-byte-timeout@npm:10.5.0":
-  version: 10.5.0
-  resolution: "@serialport/parser-inter-byte-timeout@npm:10.5.0"
-  checksum: dc3bbbed2bc6acab29ea763106b60fefcc6ba0913570ee6a32e975053c97daaf0547b821d4c20715ce3c6bbfa0afb23bbcc8f8b7dd585ae0b1998779656a7451
+"@serialport/parser-packet-length@npm:12.0.0":
+  version: 12.0.0
+  resolution: "@serialport/parser-packet-length@npm:12.0.0"
+  checksum: dd816315b2402c649e28160f15f843a94651d430936d23380c8cdf135c0f2dfab402dd6360ae89353a820d846e7c8ee2671ec6884c622b9698f6e13a1d37ff54
   languageName: node
   linkType: hard
 
-"@serialport/parser-packet-length@npm:10.5.0":
-  version: 10.5.0
-  resolution: "@serialport/parser-packet-length@npm:10.5.0"
-  checksum: d502a13c2ef45074548837e9f4c0bfbae93a4bd56da40b6dcd7c40888ecca72e2da46a0ddba677dc9580b4c1c07a9f9c1380706b5256535da24a835da184c9ba
+"@serialport/parser-readline@npm:11.0.0":
+  version: 11.0.0
+  resolution: "@serialport/parser-readline@npm:11.0.0"
+  dependencies:
+    "@serialport/parser-delimiter": 11.0.0
+  checksum: 22534cfe51f2af14ac8ebd8ce4af03c47b8966951f80b0d889857bc8e26f6d1adf208b420412c4c3cefe432dbeb4ac68e4a4afc7df613159b81c3017181a929b
   languageName: node
   linkType: hard
 
-"@serialport/parser-readline@npm:10.5.0, @serialport/parser-readline@npm:^10.2.1":
-  version: 10.5.0
-  resolution: "@serialport/parser-readline@npm:10.5.0"
+"@serialport/parser-readline@npm:12.0.0":
+  version: 12.0.0
+  resolution: "@serialport/parser-readline@npm:12.0.0"
   dependencies:
-    "@serialport/parser-delimiter": 10.5.0
-  checksum: 2c62c450f4b704cecdeefa69f8857e2c6ed0bc6268fd1c6128c2a06adbaee39134a5e55f58e4bfdd0142d6ec91ba068a97d5caef6ca074324cab8025d376b562
+    "@serialport/parser-delimiter": 12.0.0
+  checksum: 816830c724ce209cf89bca5b95cc2ee537232eff8d26dc15b3ba5eacbb05947e96689d254fb9d7250d97297e80a73240795fcbd11a64873d4b1dfa6ee80825f6
   languageName: node
   linkType: hard
 
-"@serialport/parser-ready@npm:10.5.0":
-  version: 10.5.0
-  resolution: "@serialport/parser-ready@npm:10.5.0"
-  checksum: aa6043bf517ba786be18b777bc8f780dcfb923070bfa93b0df268b6106a57574f02b62fcb552234693d59f3bfb35e7493c44ca98b18b086fdc092641637f9673
+"@serialport/parser-ready@npm:12.0.0":
+  version: 12.0.0
+  resolution: "@serialport/parser-ready@npm:12.0.0"
+  checksum: 9b4971a39e69ec69ff3e2245291d53030a4de8eadf102e1b3e97f050ec764aeb50fab2b459fec46454eb114edf6004330d7385cc2b9b09d68789b062d1ee9c45
   languageName: node
   linkType: hard
 
-"@serialport/parser-regex@npm:10.5.0":
-  version: 10.5.0
-  resolution: "@serialport/parser-regex@npm:10.5.0"
-  checksum: 8abdc1ac75acd11a31b77e26f7826590bdb801b1e65f7d2fe5939c3da4a08ee41d07132498955377bf4d3fe006626e2d1944c9fd188eef2084984e3b001e355a
+"@serialport/parser-regex@npm:12.0.0":
+  version: 12.0.0
+  resolution: "@serialport/parser-regex@npm:12.0.0"
+  checksum: 308d0422d6765feaa3ce60273deb09866741b91b981c4043350316c35a97c58510986d9bcea4149b59f027a73badb86206da8e2e92683802596d721cf10ea097
   languageName: node
   linkType: hard
 
-"@serialport/parser-slip-encoder@npm:10.5.0":
-  version: 10.5.0
-  resolution: "@serialport/parser-slip-encoder@npm:10.5.0"
-  checksum: 7d9a7356d82350b0675a65803939b3eaf8ae4a7afaa133cb31747bc45ca04d4cbd2fa3be117e62d9b9fb2aaa4e29200f02b43c18308bc76a6479cb80c0cc8d04
+"@serialport/parser-slip-encoder@npm:12.0.0":
+  version: 12.0.0
+  resolution: "@serialport/parser-slip-encoder@npm:12.0.0"
+  checksum: cb7d34bcced9431c97247416307ac42019c1202771f35df9af813b2019f44d5f98af0ec5203491be652641094094510d764951778a41d5ebd65f9a5c9c7c379e
   languageName: node
   linkType: hard
 
-"@serialport/parser-spacepacket@npm:10.5.0":
-  version: 10.5.0
-  resolution: "@serialport/parser-spacepacket@npm:10.5.0"
-  checksum: c9676c28a5ea213d9b8e26f060f6081bb514b9f39d12adf1473af511ca788c46a09b353545305fcef9e9939f42f0e00c7ef6a65dfc45b01a36ede06314eacece
+"@serialport/parser-spacepacket@npm:12.0.0":
+  version: 12.0.0
+  resolution: "@serialport/parser-spacepacket@npm:12.0.0"
+  checksum: a474d8c1eada02418247c3abe099b97091c814f16b4a1509f589991da3c681fc50baeef1c640d7ca8517125c7b3983470d758a6a2565a25a80cc46386ec0c4ea
   languageName: node
   linkType: hard
 
-"@serialport/stream@npm:10.5.0":
-  version: 10.5.0
-  resolution: "@serialport/stream@npm:10.5.0"
+"@serialport/stream@npm:12.0.0":
+  version: 12.0.0
+  resolution: "@serialport/stream@npm:12.0.0"
   dependencies:
     "@serialport/bindings-interface": 1.2.2
-    debug: ^4.3.2
-  checksum: d286977d62b5e993c63dc8652fc0114bc5a56d41f2a7b109f9d822f517e695d757408f19021a90f27d9b06b1a74843073fd48f7cce487aaf72a7e231409610ef
+    debug: 4.3.4
+  checksum: fcfd153f62a7935caf349d38a495eb90d0c5793d97cdbfa839af5c39c688ae297a0258dd9eaee5b255c13f9213fe593caced313a2e44be4d70de613bc0a74985
   languageName: node
   linkType: hard
 
@@ -4487,6 +5018,24 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@sinonjs/commons@npm:^1.7.0":
+  version: 1.8.6
+  resolution: "@sinonjs/commons@npm:1.8.6"
+  dependencies:
+    type-detect: 4.0.8
+  checksum: 7d3f8c1e85f30cd4e83594fc19b7a657f14d49eb8d95a30095631ce15e906c869e0eff96c5b93dffea7490c00418b07f54582ba49c6560feb2a8c34c0b16832d
+  languageName: node
+  linkType: hard
+
+"@sinonjs/commons@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "@sinonjs/commons@npm:2.0.0"
+  dependencies:
+    type-detect: 4.0.8
+  checksum: 5023ba17edf2b85ed58262313b8e9b59e23c6860681a9af0200f239fe939e2b79736d04a260e8270ddd57196851dde3ba754d7230be5c5234e777ae2ca8af137
+  languageName: node
+  linkType: hard
+
 "@sinonjs/commons@npm:^3.0.0":
   version: 3.0.0
   resolution: "@sinonjs/commons@npm:3.0.0"
@@ -4505,6 +5054,42 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@sinonjs/fake-timers@npm:^11.2.2":
+  version: 11.2.2
+  resolution: "@sinonjs/fake-timers@npm:11.2.2"
+  dependencies:
+    "@sinonjs/commons": ^3.0.0
+  checksum: 68c29b0e1856fdc280df03ddbf57c726420b78e9f943a241b471edc018fb14ff36fdc1daafd6026cba08c3c7f50c976fb7ae11b88ff44cd7f609692ca7d25158
+  languageName: node
+  linkType: hard
+
+"@sinonjs/fake-timers@npm:^9.1.2":
+  version: 9.1.2
+  resolution: "@sinonjs/fake-timers@npm:9.1.2"
+  dependencies:
+    "@sinonjs/commons": ^1.7.0
+  checksum: 7d3aef54e17c1073101cb64d953157c19d62a40e261a30923fa1ee337b049c5f29cc47b1f0c477880f42b5659848ba9ab897607ac8ea4acd5c30ddcfac57fca6
+  languageName: node
+  linkType: hard
+
+"@sinonjs/samsam@npm:^7.0.1":
+  version: 7.0.1
+  resolution: "@sinonjs/samsam@npm:7.0.1"
+  dependencies:
+    "@sinonjs/commons": ^2.0.0
+    lodash.get: ^4.4.2
+    type-detect: ^4.0.8
+  checksum: 291efb158d54c67dee23ddabcb28873d22063449b692aaa3b2a4f1826d2f79d38695574063c92e9c17573cc805cd6acbf0ab0c66c9f3aed7afd0f12a2b905615
+  languageName: node
+  linkType: hard
+
+"@sinonjs/text-encoding@npm:^0.7.2":
+  version: 0.7.2
+  resolution: "@sinonjs/text-encoding@npm:0.7.2"
+  checksum: fe690002a32ba06906cf87e2e8fe84d1590294586f2a7fd180a65355b53660c155c3273d8011a5f2b77209b819aa7306678ae6e4aea0df014bd7ffd4bbbcf1ab
+  languageName: node
+  linkType: hard
+
 "@slack/types@npm:^1.2.1":
   version: 1.10.0
   resolution: "@slack/types@npm:1.10.0"
@@ -4549,11 +5134,11 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@sofie-automation/blueprints-integration@1.51.0-in-development, @sofie-automation/blueprints-integration@workspace:blueprints-integration":
+"@sofie-automation/blueprints-integration@1.52.0-in-development, @sofie-automation/blueprints-integration@workspace:blueprints-integration":
   version: 0.0.0-use.local
   resolution: "@sofie-automation/blueprints-integration@workspace:blueprints-integration"
   dependencies:
-    "@sofie-automation/shared-lib": 1.51.0-in-development
+    "@sofie-automation/shared-lib": 1.52.0-in-development
     tslib: ^2.6.2
     type-fest: ^3.13.1
   languageName: unknown
@@ -4590,12 +5175,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@sofie-automation/corelib@1.51.0-in-development, @sofie-automation/corelib@workspace:corelib":
+"@sofie-automation/corelib@1.52.0-in-development, @sofie-automation/corelib@workspace:corelib":
   version: 0.0.0-use.local
   resolution: "@sofie-automation/corelib@workspace:corelib"
   dependencies:
-    "@sofie-automation/blueprints-integration": 1.51.0-in-development
-    "@sofie-automation/shared-lib": 1.51.0-in-development
+    "@sofie-automation/blueprints-integration": 1.52.0-in-development
+    "@sofie-automation/shared-lib": 1.52.0-in-development
     fast-clone: ^1.5.13
     i18next: ^21.10.0
     influx: ^5.9.3
@@ -4626,9 +5211,9 @@ __metadata:
   resolution: "@sofie-automation/job-worker@workspace:job-worker"
   dependencies:
     "@slack/webhook": ^6.1.0
-    "@sofie-automation/blueprints-integration": 1.51.0-in-development
-    "@sofie-automation/corelib": 1.51.0-in-development
-    "@sofie-automation/shared-lib": 1.51.0-in-development
+    "@sofie-automation/blueprints-integration": 1.52.0-in-development
+    "@sofie-automation/corelib": 1.52.0-in-development
+    "@sofie-automation/shared-lib": 1.52.0-in-development
     amqplib: ^0.10.3
     deepmerge: ^4.3.1
     elastic-apm-node: ^3.51.0
@@ -4638,7 +5223,7 @@ __metadata:
     node-fetch: ^2.7.0
     p-lazy: ^3.1.0
     p-timeout: ^4.1.0
-    superfly-timeline: 9.0.0
+    superfly-timeline: 9.0.2
     threadedclass: ^1.2.2
     tslib: ^2.6.2
     type-fest: ^3.13.1
@@ -4646,6 +5231,27 @@ __metadata:
   languageName: unknown
   linkType: soft
 
+"@sofie-automation/meteor-lib@1.52.0-in-development, @sofie-automation/meteor-lib@workspace:meteor-lib":
+  version: 0.0.0-use.local
+  resolution: "@sofie-automation/meteor-lib@workspace:meteor-lib"
+  dependencies:
+    "@mos-connection/helper": v4.2.0-alpha.1
+    "@sofie-automation/blueprints-integration": 1.52.0-in-development
+    "@sofie-automation/corelib": 1.52.0-in-development
+    "@sofie-automation/shared-lib": 1.52.0-in-development
+    "@types/deep-extend": ^0.6.2
+    "@types/semver": ^7.5.6
+    "@types/underscore": ^1.11.15
+    deep-extend: 0.6.0
+    semver: ^7.5.4
+    type-fest: ^3.13.1
+    underscore: ^1.13.6
+  peerDependencies:
+    i18next: ^21.10.0
+    mongodb: ^5.5.0
+  languageName: unknown
+  linkType: soft
+
 "@sofie-automation/openapi@workspace:openapi":
   version: 0.0.0-use.local
   resolution: "@sofie-automation/openapi@workspace:openapi"
@@ -4658,11 +5264,11 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@sofie-automation/server-core-integration@1.51.0-in-development, @sofie-automation/server-core-integration@workspace:server-core-integration":
+"@sofie-automation/server-core-integration@1.52.0-in-development, @sofie-automation/server-core-integration@workspace:server-core-integration":
   version: 0.0.0-use.local
   resolution: "@sofie-automation/server-core-integration@workspace:server-core-integration"
   dependencies:
-    "@sofie-automation/shared-lib": 1.51.0-in-development
+    "@sofie-automation/shared-lib": 1.52.0-in-development
     ejson: ^2.2.3
     eventemitter3: ^4.0.7
     faye-websocket: ^0.11.4
@@ -4672,17 +5278,103 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@sofie-automation/shared-lib@1.51.0-in-development, @sofie-automation/shared-lib@workspace:shared-lib":
+"@sofie-automation/shared-lib@1.52.0-in-development, @sofie-automation/shared-lib@workspace:shared-lib":
   version: 0.0.0-use.local
   resolution: "@sofie-automation/shared-lib@workspace:shared-lib"
   dependencies:
-    "@mos-connection/model": ^4.1.1-nightly-master-20240430-072032-ffb8bf6.0
-    timeline-state-resolver-types: 9.1.0-nightly-release51-20240228-132329-b7ceb6950.0
+    "@mos-connection/model": v4.2.0-alpha.1
+    timeline-state-resolver-types: 9.2.0-nightly-release52-20240923-122840-58cfbb259.0
     tslib: ^2.6.2
     type-fest: ^3.13.1
   languageName: unknown
   linkType: soft
 
+"@sofie-automation/sorensen@npm:^1.4.3":
+  version: 1.4.3
+  resolution: "@sofie-automation/sorensen@npm:1.4.3"
+  checksum: 2ec7bd38fd6cf91456303cef103265c0dfb031074f601278d4fa55a355d0a1c043763a5f323bb12147385426dcb1f91869f01f788994bd3c51fa3cd8aaf431a8
+  languageName: node
+  linkType: hard
+
+"@sofie-automation/webui@workspace:webui":
+  version: 0.0.0-use.local
+  resolution: "@sofie-automation/webui@workspace:webui"
+  dependencies:
+    "@babel/preset-env": ^7.24.8
+    "@crello/react-lottie": 0.0.9
+    "@fortawesome/fontawesome-free": ^6.4.2
+    "@fortawesome/fontawesome-svg-core": ^6.4.2
+    "@fortawesome/free-solid-svg-icons": ^6.4.2
+    "@fortawesome/react-fontawesome": ^0.2.0
+    "@jstarpl/react-contextmenu": ^2.15.0
+    "@nrk/core-icons": ^9.6.0
+    "@popperjs/core": ^2.11.8
+    "@sofie-automation/blueprints-integration": 1.52.0-in-development
+    "@sofie-automation/corelib": 1.52.0-in-development
+    "@sofie-automation/meteor-lib": 1.52.0-in-development
+    "@sofie-automation/shared-lib": 1.52.0-in-development
+    "@sofie-automation/sorensen": ^1.4.3
+    "@types/classnames": ^2.3.1
+    "@types/deep-extend": ^0.6.2
+    "@types/react": ^18.3.3
+    "@types/react-circular-progressbar": ^1.1.0
+    "@types/react-datepicker": ^3.1.8
+    "@types/react-dom": ^18.3.0
+    "@types/react-router": ^5.1.20
+    "@types/react-router-dom": ^5.3.3
+    "@types/sha.js": ^2.4.4
+    "@types/sinon": ^10.0.20
+    "@types/xml2js": ^0.4.14
+    "@typescript-eslint/parser": ^7.17.0
+    "@vitejs/plugin-react": ^4.3.1
+    "@welldone-software/why-did-you-render": ^4.3.2
+    "@xmldom/xmldom": ^0.8.10
+    babel-jest: ^29.7.0
+    classnames: ^2.5.1
+    cubic-spline: ^3.0.3
+    deep-extend: 0.6.0
+    ejson: ^2.2.3
+    i18next: ^21.10.0
+    i18next-browser-languagedetector: ^6.1.8
+    i18next-http-backend: ^1.4.5
+    immutability-helper: ^3.1.1
+    lottie-web: ^5.12.2
+    moment: ^2.30.1
+    promise.allsettled: ^1.0.7
+    query-string: ^6.14.1
+    rc-tooltip: ^6.1.3
+    react: ^18.3.1
+    react-circular-progressbar: ^2.1.0
+    react-datepicker: ^3.8.0
+    react-dnd: ^14.0.5
+    react-dnd-html5-backend: ^14.1.0
+    react-dom: ^18.3.1
+    react-focus-bounder: ^1.1.6
+    react-hotkeys: ^2.0.0
+    react-i18next: ^11.18.6
+    react-intersection-observer: ^9.10.3
+    react-moment: ^0.9.7
+    react-popper: ^2.3.0
+    react-router-dom: ^5.3.4
+    react-timer-hoc: ^2.3.0
+    sass: ^1.77.8
+    semver: ^7.6.3
+    sha.js: ^2.4.11
+    sinon: ^14.0.2
+    type-fest: ^3.13.1
+    typescript: ^5.2.2
+    underscore: ^1.13.7
+    velocity-animate: ^1.5.2
+    velocity-react: ^1.4.3
+    vite: ^5.3.4
+    vite-plugin-node-polyfills: ^0.22.0
+    vite-tsconfig-paths: ^4.3.2
+    webmidi: ^2.5.3
+    xml2js: ^0.6.2
+    xmlbuilder: ^15.1.1
+  languageName: unknown
+  linkType: soft
+
 "@stoplight/better-ajv-errors@npm:1.0.3":
   version: 1.0.3
   resolution: "@stoplight/better-ajv-errors@npm:1.0.3"
@@ -5226,6 +5918,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@tootallnate/quickjs-emscripten@npm:^0.23.0":
+  version: 0.23.0
+  resolution: "@tootallnate/quickjs-emscripten@npm:0.23.0"
+  checksum: c350a2947ffb80b22e14ff35099fd582d1340d65723384a0fd0515e905e2534459ad2f301a43279a37308a27c99273c932e64649abd57d0bb3ca8c557150eccc
+  languageName: node
+  linkType: hard
+
 "@trysound/sax@npm:0.2.0":
   version: 0.2.0
   resolution: "@trysound/sax@npm:0.2.0"
@@ -5278,15 +5977,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@tv2media/v-connection@npm:^7.3.2":
-  version: 7.3.2
-  resolution: "@tv2media/v-connection@npm:7.3.2"
+"@tv2media/v-connection@npm:^7.3.4":
+  version: 7.3.4
+  resolution: "@tv2media/v-connection@npm:7.3.4"
   dependencies:
     got: 11.8.6
     uuid: ^8.3.2
-    ws: ^7.4.6
+    ws: ^7.5.10
     xml2js: ^0.6.2
-  checksum: 07786e4616f2225c0b98627f0828b4416b46fb8d34caf37f6e46b3530a992090d045e37a4a38522754dd31f7063e9703c18dccab7e44a1ba643d0f935d62804c
+  checksum: b19cec820fbfdea2def2324ad2b2c68ccd43443985335b050f67ba192c82562bfd4b800eda82cd6fc1152186800d436123e736012c5a6ef57a6bcb44756b6c65
   languageName: node
   linkType: hard
 
@@ -5308,16 +6007,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/babel__core@npm:^7.1.14":
-  version: 7.20.2
-  resolution: "@types/babel__core@npm:7.20.2"
+"@types/babel__core@npm:^7.1.14, @types/babel__core@npm:^7.20.5":
+  version: 7.20.5
+  resolution: "@types/babel__core@npm:7.20.5"
   dependencies:
     "@babel/parser": ^7.20.7
     "@babel/types": ^7.20.7
     "@types/babel__generator": "*"
     "@types/babel__template": "*"
     "@types/babel__traverse": "*"
-  checksum: 564fbaa8ff1305d50807ada0ec227c3e7528bebb2f8fe6b2ed88db0735a31511a74ad18729679c43eeed8025ed29d408f53059289719e95ab1352ed559a100bd
+  checksum: a3226f7930b635ee7a5e72c8d51a357e799d19cbf9d445710fa39ab13804f79ab1a54b72ea7d8e504659c7dfc50675db974b526142c754398d7413aa4bc30845
   languageName: node
   linkType: hard
 
@@ -5380,6 +6079,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/classnames@npm:^2.3.1":
+  version: 2.3.1
+  resolution: "@types/classnames@npm:2.3.1"
+  dependencies:
+    classnames: "*"
+  checksum: 09a17ea08fcb83380921efdfdac94cfa162f87025cae0bf6f4ba508c2fa5f436459ce7612905a3f968fdddb68c03b8e6ff08e762ed2d0c110c5c4fceb244dc55
+  languageName: node
+  linkType: hard
+
 "@types/connect-history-api-fallback@npm:^1.3.5":
   version: 1.5.1
   resolution: "@types/connect-history-api-fallback@npm:1.5.1"
@@ -5431,6 +6139,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/deep-extend@npm:^0.6.2":
+  version: 0.6.2
+  resolution: "@types/deep-extend@npm:0.6.2"
+  checksum: 16da22923b4b1375f23888c4c28d1fa962a489ea40457a2135833831dbe4870a75894d29b632680dd2bcdb72a0a5c214f5286483f3f70ba10d52f3c816b5abd7
+  languageName: node
+  linkType: hard
+
 "@types/dompurify@npm:^2.1.0":
   version: 2.4.0
   resolution: "@types/dompurify@npm:2.4.0"
@@ -5485,7 +6200,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/estree@npm:*, @types/estree@npm:^1.0.0, @types/estree@npm:^1.0.5":
+"@types/estree@npm:*, @types/estree@npm:1.0.5, @types/estree@npm:^1.0.0, @types/estree@npm:^1.0.5":
   version: 1.0.5
   resolution: "@types/estree@npm:1.0.5"
   checksum: dd8b5bed28e6213b7acd0fb665a84e693554d850b0df423ac8076cc3ad5823a6bc26b0251d080bdc545af83179ede51dd3f6fa78cad2c46ed1f29624ddf3e41a
@@ -5641,6 +6356,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/jsdom@npm:^20.0.0":
+  version: 20.0.1
+  resolution: "@types/jsdom@npm:20.0.1"
+  dependencies:
+    "@types/node": "*"
+    "@types/tough-cookie": "*"
+    parse5: ^7.0.0
+  checksum: d55402c5256ef451f93a6e3d3881f98339fe73a5ac2030588df056d6835df8367b5a857b48d27528289057e26dcdd3f502edc00cb877c79174cb3a4c7f2198c1
+  languageName: node
+  linkType: hard
+
 "@types/json-schema@npm:*, @types/json-schema@npm:^7.0.11, @types/json-schema@npm:^7.0.4, @types/json-schema@npm:^7.0.5, @types/json-schema@npm:^7.0.6, @types/json-schema@npm:^7.0.7, @types/json-schema@npm:^7.0.8, @types/json-schema@npm:^7.0.9":
   version: 7.0.13
   resolution: "@types/json-schema@npm:7.0.13"
@@ -5843,6 +6569,35 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/react-circular-progressbar@npm:^1.1.0":
+  version: 1.1.0
+  resolution: "@types/react-circular-progressbar@npm:1.1.0"
+  dependencies:
+    react-circular-progressbar: "*"
+  checksum: 8cfdad2feb1a5e8315474ec3ae4096e803431e394eddc7be4e91dbd4632e3840171efbe2ea55aeba2fbcd3302a488e4514732465f9702211ac81174a5e8b2d58
+  languageName: node
+  linkType: hard
+
+"@types/react-datepicker@npm:^3.1.8":
+  version: 3.1.8
+  resolution: "@types/react-datepicker@npm:3.1.8"
+  dependencies:
+    "@types/react": "*"
+    date-fns: ^2.0.1
+    popper.js: ^1.14.1
+  checksum: dc15817fadcd970c4c4c7368e8b2c498ac7d068fd67505e6960b3b7f0e8859483c9c71278bdacd876fb5d25a81806cc47fa52841a73384d730a24cfdb2df7d8e
+  languageName: node
+  linkType: hard
+
+"@types/react-dom@npm:^18.3.0":
+  version: 18.3.0
+  resolution: "@types/react-dom@npm:18.3.0"
+  dependencies:
+    "@types/react": "*"
+  checksum: a0cd9b1b815a6abd2a367a9eabdd8df8dd8f13f95897b2f9e1359ea3ac6619f957c1432ece004af7d95e2a7caddbba19faa045f831f32d6263483fc5404a7596
+  languageName: node
+  linkType: hard
+
 "@types/react-router-config@npm:*, @types/react-router-config@npm:^5.0.7":
   version: 5.0.11
   resolution: "@types/react-router-config@npm:5.0.11"
@@ -5854,7 +6609,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/react-router-dom@npm:*":
+"@types/react-router-dom@npm:*, @types/react-router-dom@npm:^5.3.3":
   version: 5.3.3
   resolution: "@types/react-router-dom@npm:5.3.3"
   dependencies:
@@ -5865,7 +6620,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/react-router@npm:*, @types/react-router@npm:^5.1.0":
+"@types/react-router@npm:*, @types/react-router@npm:^5.1.0, @types/react-router@npm:^5.1.20":
   version: 5.1.20
   resolution: "@types/react-router@npm:5.1.20"
   dependencies:
@@ -5875,14 +6630,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/react@npm:*":
-  version: 18.2.22
-  resolution: "@types/react@npm:18.2.22"
+"@types/react@npm:*, @types/react@npm:^18.3.3":
+  version: 18.3.3
+  resolution: "@types/react@npm:18.3.3"
   dependencies:
     "@types/prop-types": "*"
-    "@types/scheduler": "*"
     csstype: ^3.0.2
-  checksum: 44289523dabaadcd3fd85689abb98f9ebcc8492d7e978348d1c986138acef4801030b279e89a19e38a6319e294bcea77559e37e0c803e4bacf2b8ae3a56ba587
+  checksum: c63d6a78163244e2022b01ef79b0baec4fe4da3475dc4a90bb8accefad35ef0c43560fd0312e5974f92a0f1108aa4d669ac72d73d66396aa060ea03b5d2e3873
   languageName: node
   linkType: hard
 
@@ -5920,17 +6674,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/scheduler@npm:*":
-  version: 0.16.3
-  resolution: "@types/scheduler@npm:0.16.3"
-  checksum: 2b0aec39c24268e3ce938c5db2f2e77f5c3dd280e05c262d9c2fe7d890929e4632a6b8e94334017b66b45e4f92a5aa42ba3356640c2a1175fa37bef2f5200767
-  languageName: node
-  linkType: hard
-
-"@types/semver@npm:^7.3.12":
-  version: 7.5.2
-  resolution: "@types/semver@npm:7.5.2"
-  checksum: 743aa8a2b58e20b329c19bd2459152cb049d12fafab7279b90ac11e0f268c97efbcb606ea0c681cca03f79015381b40d9b1244349b354270bec3f939ed49f6e9
+"@types/semver@npm:^7.3.12, @types/semver@npm:^7.5.6":
+  version: 7.5.8
+  resolution: "@types/semver@npm:7.5.8"
+  checksum: ea6f5276f5b84c55921785a3a27a3cd37afee0111dfe2bcb3e03c31819c197c782598f17f0b150a69d453c9584cd14c4c4d7b9a55d2c5e6cacd4d66fdb3b3663
   languageName: node
   linkType: hard
 
@@ -5964,6 +6711,31 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/sha.js@npm:^2.4.4":
+  version: 2.4.4
+  resolution: "@types/sha.js@npm:2.4.4"
+  dependencies:
+    "@types/node": "*"
+  checksum: e5917afe3116971c882b475298c7ca99aae69715057948526f805ca75dd67675eeaad7014f525c80e1243022923c496f52546164b90231285364f72aba874989
+  languageName: node
+  linkType: hard
+
+"@types/sinon@npm:^10.0.20":
+  version: 10.0.20
+  resolution: "@types/sinon@npm:10.0.20"
+  dependencies:
+    "@types/sinonjs__fake-timers": "*"
+  checksum: 7322771345c202b90057f8112e0d34b7339e5ae1827fb1bfe385fc9e38ed6a2f18b4c66e88d27d98c775f7f74fb1167c0c14f61ca64155786534541e6c6eb05f
+  languageName: node
+  linkType: hard
+
+"@types/sinonjs__fake-timers@npm:*":
+  version: 8.1.5
+  resolution: "@types/sinonjs__fake-timers@npm:8.1.5"
+  checksum: 7e3c08f6c13df44f3ea7d9a5155ddf77e3f7314c156fa1c5a829a4f3763bafe2f75b1283b887f06e6b4296996a2f299b70f64ff82625f9af5885436e2524d10c
+  languageName: node
+  linkType: hard
+
 "@types/sockjs@npm:^0.3.33":
   version: 0.3.33
   resolution: "@types/sockjs@npm:0.3.33"
@@ -6055,6 +6827,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/xml2js@npm:^0.4.14":
+  version: 0.4.14
+  resolution: "@types/xml2js@npm:0.4.14"
+  dependencies:
+    "@types/node": "*"
+  checksum: df9f106b9953dcdec7ba3304ebc56d6c2f61d49bf556d600bed439f94a1733f73ca0bf2d0f64330b402191622862d9d6058bab9d7e3dcb5b0fe51ebdc4372aac
+  languageName: node
+  linkType: hard
+
 "@types/yargs-parser@npm:*":
   version: 21.0.0
   resolution: "@types/yargs-parser@npm:21.0.0"
@@ -6121,6 +6902,24 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@typescript-eslint/parser@npm:^7.17.0":
+  version: 7.17.0
+  resolution: "@typescript-eslint/parser@npm:7.17.0"
+  dependencies:
+    "@typescript-eslint/scope-manager": 7.17.0
+    "@typescript-eslint/types": 7.17.0
+    "@typescript-eslint/typescript-estree": 7.17.0
+    "@typescript-eslint/visitor-keys": 7.17.0
+    debug: ^4.3.4
+  peerDependencies:
+    eslint: ^8.56.0
+  peerDependenciesMeta:
+    typescript:
+      optional: true
+  checksum: f0525317af174b5547d0a7ed8eadbbb7bbc1da9e9ab86882ed616b0ffb053170818a48cab2aaa627001ee991ee559630fbe5ad632b3df7cdf4a2b1b07a571907
+  languageName: node
+  linkType: hard
+
 "@typescript-eslint/scope-manager@npm:5.62.0":
   version: 5.62.0
   resolution: "@typescript-eslint/scope-manager@npm:5.62.0"
@@ -6131,6 +6930,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@typescript-eslint/scope-manager@npm:7.17.0":
+  version: 7.17.0
+  resolution: "@typescript-eslint/scope-manager@npm:7.17.0"
+  dependencies:
+    "@typescript-eslint/types": 7.17.0
+    "@typescript-eslint/visitor-keys": 7.17.0
+  checksum: 0cb77db6243455b47947df693d9b16f8e2b07e14994d755918dcc98693dba97036806d8f80a12bbd5c82f61883d134dd42d25880f20448c1e2376a9d873f9ef8
+  languageName: node
+  linkType: hard
+
 "@typescript-eslint/type-utils@npm:5.62.0":
   version: 5.62.0
   resolution: "@typescript-eslint/type-utils@npm:5.62.0"
@@ -6155,6 +6964,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@typescript-eslint/types@npm:7.17.0":
+  version: 7.17.0
+  resolution: "@typescript-eslint/types@npm:7.17.0"
+  checksum: efd4fadf8f3f2496d813338f873564b903fbaaff53f3ce496159c76d49e01f6e2dbbf037f5e7318d0292cca7b6191c8f8462fa31cba1b5c50a11676bbb5df9ba
+  languageName: node
+  linkType: hard
+
 "@typescript-eslint/typescript-estree@npm:5.62.0":
   version: 5.62.0
   resolution: "@typescript-eslint/typescript-estree@npm:5.62.0"
@@ -6173,6 +6989,25 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@typescript-eslint/typescript-estree@npm:7.17.0":
+  version: 7.17.0
+  resolution: "@typescript-eslint/typescript-estree@npm:7.17.0"
+  dependencies:
+    "@typescript-eslint/types": 7.17.0
+    "@typescript-eslint/visitor-keys": 7.17.0
+    debug: ^4.3.4
+    globby: ^11.1.0
+    is-glob: ^4.0.3
+    minimatch: ^9.0.4
+    semver: ^7.6.0
+    ts-api-utils: ^1.3.0
+  peerDependenciesMeta:
+    typescript:
+      optional: true
+  checksum: 0f7a7618431c94603c742d1bcb1cb3a5aa646a6ebb3adff89b35db1fe014f9a060d550e6ca5f0ab152615ae129e8a0f84020dda56cd2d2c73386f657dccf7e34
+  languageName: node
+  linkType: hard
+
 "@typescript-eslint/utils@npm:5.62.0, @typescript-eslint/utils@npm:^5.10.0, @typescript-eslint/utils@npm:^5.59.1":
   version: 5.62.0
   resolution: "@typescript-eslint/utils@npm:5.62.0"
@@ -6201,6 +7036,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@typescript-eslint/visitor-keys@npm:7.17.0":
+  version: 7.17.0
+  resolution: "@typescript-eslint/visitor-keys@npm:7.17.0"
+  dependencies:
+    "@typescript-eslint/types": 7.17.0
+    eslint-visitor-keys: ^3.4.3
+  checksum: fae45049d06c15473784fc442271a9ebab1d1139246d47f185645a64407669c85c7519ef083886d74c921e34fcc68889f35caa858b345469d8bb26eb9f26728e
+  languageName: node
+  linkType: hard
+
 "@ungap/structured-clone@npm:^1.0.0":
   version: 1.2.0
   resolution: "@ungap/structured-clone@npm:1.2.0"
@@ -6208,6 +7053,21 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@vitejs/plugin-react@npm:^4.3.1":
+  version: 4.3.1
+  resolution: "@vitejs/plugin-react@npm:4.3.1"
+  dependencies:
+    "@babel/core": ^7.24.5
+    "@babel/plugin-transform-react-jsx-self": ^7.24.5
+    "@babel/plugin-transform-react-jsx-source": ^7.24.1
+    "@types/babel__core": ^7.20.5
+    react-refresh: ^0.14.2
+  peerDependencies:
+    vite: ^4.2.0 || ^5.0.0
+  checksum: 57872e0193c7e545c5ef4852cbe1adf17a6b35406a2aba4b3acce06c173a9dabbf6ff4c72701abc11bb3cbe24a056f5054f39018f7034c9aa57133a3a7770237
+  languageName: node
+  linkType: hard
+
 "@webassemblyjs/ast@npm:1.12.1, @webassemblyjs/ast@npm:^1.12.1":
   version: 1.12.1
   resolution: "@webassemblyjs/ast@npm:1.12.1"
@@ -6359,6 +7219,24 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@welldone-software/why-did-you-render@npm:^4.3.2":
+  version: 4.3.2
+  resolution: "@welldone-software/why-did-you-render@npm:4.3.2"
+  dependencies:
+    lodash: ^4
+  peerDependencies:
+    react: ">=16.13"
+  checksum: 6ec05b8d79cd6f31be75510feda83f3446fac8712717ff1ab3f40b10f57ada4f891ad576fd58035c86b3cd3fc9e79de1b3237844148616b99af82a95a1ecc753
+  languageName: node
+  linkType: hard
+
+"@xmldom/xmldom@npm:^0.8.10":
+  version: 0.8.10
+  resolution: "@xmldom/xmldom@npm:0.8.10"
+  checksum: 4c136aec31fb3b49aaa53b6fcbfe524d02a1dc0d8e17ee35bd3bf35e9ce1344560481cd1efd086ad1a4821541482528672306d5e37cdbd187f33d7fadd3e2cf0
+  languageName: node
+  linkType: hard
+
 "@xtuc/ieee754@npm:^1.2.0":
   version: 1.2.0
   resolution: "@xtuc/ieee754@npm:1.2.0"
@@ -6420,7 +7298,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"abab@npm:^2.0.3, abab@npm:^2.0.5":
+"abab@npm:^2.0.3, abab@npm:^2.0.5, abab@npm:^2.0.6":
   version: 2.0.6
   resolution: "abab@npm:2.0.6"
   checksum: 6ffc1af4ff315066c62600123990d87551ceb0aafa01e6539da77b0f5987ac7019466780bf480f1787576d4385e3690c81ccc37cfda12819bf510b8ab47e5a3e
@@ -6470,6 +7348,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"acorn-globals@npm:^7.0.0":
+  version: 7.0.1
+  resolution: "acorn-globals@npm:7.0.1"
+  dependencies:
+    acorn: ^8.1.0
+    acorn-walk: ^8.0.2
+  checksum: 2a2998a547af6d0db5f0cdb90acaa7c3cbca6709010e02121fb8b8617c0fbd8bab0b869579903fde358ac78454356a14fadcc1a672ecb97b04b1c2ccba955ce8
+  languageName: node
+  linkType: hard
+
 "acorn-import-assertions@npm:^1.9.0":
   version: 1.9.0
   resolution: "acorn-import-assertions@npm:1.9.0"
@@ -6495,10 +7383,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"acorn-walk@npm:^8.0.0, acorn-walk@npm:^8.1.1":
-  version: 8.2.0
-  resolution: "acorn-walk@npm:8.2.0"
-  checksum: 1715e76c01dd7b2d4ca472f9c58968516a4899378a63ad5b6c2d668bba8da21a71976c14ec5f5b75f887b6317c4ae0b897ab141c831d741dc76024d8745f1ad1
+"acorn-walk@npm:^8.0.0, acorn-walk@npm:^8.0.2, acorn-walk@npm:^8.1.1":
+  version: 8.3.3
+  resolution: "acorn-walk@npm:8.3.3"
+  dependencies:
+    acorn: ^8.11.0
+  checksum: 0f09d351fc30b69b2b9982bf33dc30f3d35a34e030e5f1ed3c49fc4e3814a192bf3101e4c30912a0595410f5e91bb70ddba011ea73398b3ecbfe41c7334c6dd0
   languageName: node
   linkType: hard
 
@@ -6511,12 +7401,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"acorn@npm:^8.0.0, acorn@npm:^8.0.4, acorn@npm:^8.2.4, acorn@npm:^8.4.1, acorn@npm:^8.7.1, acorn@npm:^8.8.2, acorn@npm:^8.9.0":
-  version: 8.11.3
-  resolution: "acorn@npm:8.11.3"
+"acorn@npm:^8.0.0, acorn@npm:^8.0.4, acorn@npm:^8.1.0, acorn@npm:^8.11.0, acorn@npm:^8.2.4, acorn@npm:^8.4.1, acorn@npm:^8.7.1, acorn@npm:^8.8.1, acorn@npm:^8.8.2, acorn@npm:^8.9.0":
+  version: 8.12.1
+  resolution: "acorn@npm:8.12.1"
   bin:
     acorn: bin/acorn
-  checksum: 76d8e7d559512566b43ab4aadc374f11f563f0a9e21626dd59cb2888444e9445923ae9f3699972767f18af61df89cd89f5eaaf772d1327b055b45cb829b4a88c
+  checksum: 677880034aee5bdf7434cc2d25b641d7bedb0b5ef47868a78dadabedccf58e1c5457526d9d8249cd253f2df087e081c3fe7d903b448d8e19e5131a3065b83c07
   languageName: node
   linkType: hard
 
@@ -6550,6 +7440,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"agent-base@npm:^7.0.2, agent-base@npm:^7.1.0, agent-base@npm:^7.1.1":
+  version: 7.1.1
+  resolution: "agent-base@npm:7.1.1"
+  dependencies:
+    debug: ^4.3.4
+  checksum: 51c158769c5c051482f9ca2e6e1ec085ac72b5a418a9b31b4e82fe6c0a6699adb94c1c42d246699a587b3335215037091c79e0de512c516f73b6ea844202f037
+  languageName: node
+  linkType: hard
+
 "agentkeepalive@npm:^4.2.1":
   version: 4.5.0
   resolution: "agentkeepalive@npm:4.5.0"
@@ -6895,13 +7794,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"array-buffer-byte-length@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "array-buffer-byte-length@npm:1.0.0"
+"array-buffer-byte-length@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "array-buffer-byte-length@npm:1.0.1"
   dependencies:
-    call-bind: ^1.0.2
-    is-array-buffer: ^3.0.1
-  checksum: 044e101ce150f4804ad19c51d6c4d4cfa505c5b2577bd179256e4aa3f3f6a0a5e9874c78cd428ee566ac574c8a04d7ce21af9fe52e844abfdccb82b33035a7c3
+    call-bind: ^1.0.5
+    is-array-buffer: ^3.0.4
+  checksum: 53524e08f40867f6a9f35318fafe467c32e45e9c682ba67b11943e167344d2febc0f6977a17e699b05699e805c3e8f073d876f8bbf1b559ed494ad2cd0fae09e
   languageName: node
   linkType: hard
 
@@ -6940,6 +7839,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"array-includes@npm:^3.1.6, array-includes@npm:^3.1.8":
+  version: 3.1.8
+  resolution: "array-includes@npm:3.1.8"
+  dependencies:
+    call-bind: ^1.0.7
+    define-properties: ^1.2.1
+    es-abstract: ^1.23.2
+    es-object-atoms: ^1.0.0
+    get-intrinsic: ^1.2.4
+    is-string: ^1.0.7
+  checksum: eb39ba5530f64e4d8acab39297c11c1c5be2a4ea188ab2b34aba5fb7224d918f77717a9d57a3e2900caaa8440e59431bdaf5c974d5212ef65d97f132e38e2d91
+  languageName: node
+  linkType: hard
+
 "array-union@npm:^2.1.0":
   version: 2.1.0
   resolution: "array-union@npm:2.1.0"
@@ -6947,6 +7860,58 @@ __metadata:
   languageName: node
   linkType: hard
 
+"array.prototype.findlast@npm:^1.2.5":
+  version: 1.2.5
+  resolution: "array.prototype.findlast@npm:1.2.5"
+  dependencies:
+    call-bind: ^1.0.7
+    define-properties: ^1.2.1
+    es-abstract: ^1.23.2
+    es-errors: ^1.3.0
+    es-object-atoms: ^1.0.0
+    es-shim-unscopables: ^1.0.2
+  checksum: 83ce4ad95bae07f136d316f5a7c3a5b911ac3296c3476abe60225bc4a17938bf37541972fcc37dd5adbc99cbb9c928c70bbbfc1c1ce549d41a415144030bb446
+  languageName: node
+  linkType: hard
+
+"array.prototype.flat@npm:^1.3.1":
+  version: 1.3.2
+  resolution: "array.prototype.flat@npm:1.3.2"
+  dependencies:
+    call-bind: ^1.0.2
+    define-properties: ^1.2.0
+    es-abstract: ^1.22.1
+    es-shim-unscopables: ^1.0.0
+  checksum: 5d6b4bf102065fb3f43764bfff6feb3295d372ce89591e6005df3d0ce388527a9f03c909af6f2a973969a4d178ab232ffc9236654149173e0e187ec3a1a6b87b
+  languageName: node
+  linkType: hard
+
+"array.prototype.flatmap@npm:^1.3.2":
+  version: 1.3.2
+  resolution: "array.prototype.flatmap@npm:1.3.2"
+  dependencies:
+    call-bind: ^1.0.2
+    define-properties: ^1.2.0
+    es-abstract: ^1.22.1
+    es-shim-unscopables: ^1.0.0
+  checksum: ce09fe21dc0bcd4f30271f8144083aa8c13d4639074d6c8dc82054b847c7fc9a0c97f857491f4da19d4003e507172a78f4bcd12903098adac8b9cd374f734be3
+  languageName: node
+  linkType: hard
+
+"array.prototype.map@npm:^1.0.5":
+  version: 1.0.7
+  resolution: "array.prototype.map@npm:1.0.7"
+  dependencies:
+    call-bind: ^1.0.7
+    define-properties: ^1.2.1
+    es-abstract: ^1.23.2
+    es-array-method-boxes-properly: ^1.0.0
+    es-object-atoms: ^1.0.0
+    is-string: ^1.0.7
+  checksum: a6c174b3c31c3f58f2e6a526744f5071099d4b87a391881aaee9ad5edee3ab619858abdf1fe4b43257693e6875afe26ac7c542c5213455c9de0092d3b622f924
+  languageName: node
+  linkType: hard
+
 "array.prototype.reduce@npm:^1.0.6":
   version: 1.0.6
   resolution: "array.prototype.reduce@npm:1.0.6"
@@ -6960,18 +7925,32 @@ __metadata:
   languageName: node
   linkType: hard
 
-"arraybuffer.prototype.slice@npm:^1.0.2":
-  version: 1.0.2
-  resolution: "arraybuffer.prototype.slice@npm:1.0.2"
+"array.prototype.tosorted@npm:^1.1.4":
+  version: 1.1.4
+  resolution: "array.prototype.tosorted@npm:1.1.4"
   dependencies:
-    array-buffer-byte-length: ^1.0.0
-    call-bind: ^1.0.2
-    define-properties: ^1.2.0
-    es-abstract: ^1.22.1
-    get-intrinsic: ^1.2.1
-    is-array-buffer: ^3.0.2
+    call-bind: ^1.0.7
+    define-properties: ^1.2.1
+    es-abstract: ^1.23.3
+    es-errors: ^1.3.0
+    es-shim-unscopables: ^1.0.2
+  checksum: e4142d6f556bcbb4f393c02e7dbaea9af8f620c040450c2be137c9cbbd1a17f216b9c688c5f2c08fbb038ab83f55993fa6efdd9a05881d84693c7bcb5422127a
+  languageName: node
+  linkType: hard
+
+"arraybuffer.prototype.slice@npm:^1.0.3":
+  version: 1.0.3
+  resolution: "arraybuffer.prototype.slice@npm:1.0.3"
+  dependencies:
+    array-buffer-byte-length: ^1.0.1
+    call-bind: ^1.0.5
+    define-properties: ^1.2.1
+    es-abstract: ^1.22.3
+    es-errors: ^1.2.1
+    get-intrinsic: ^1.2.3
+    is-array-buffer: ^3.0.4
     is-shared-array-buffer: ^1.0.2
-  checksum: c200faf437786f5b2c80d4564ff5481c886a16dee642ef02abdc7306c7edd523d1f01d1dd12b769c7eb42ac9bc53874510db19a92a2c035c0f6696172aafa5d3
+  checksum: 352259cba534dcdd969c92ab002efd2ba5025b2e3b9bead3973150edbdf0696c629d7f4b3f061c5931511e8207bdc2306da614703c820b45dabce39e3daf7e3e
   languageName: node
   linkType: hard
 
@@ -6996,6 +7975,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"asn1.js@npm:^4.10.1":
+  version: 4.10.1
+  resolution: "asn1.js@npm:4.10.1"
+  dependencies:
+    bn.js: ^4.0.0
+    inherits: ^2.0.1
+    minimalistic-assert: ^1.0.0
+  checksum: 9289a1a55401238755e3142511d7b8f6fc32f08c86ff68bd7100da8b6c186179dd6b14234fba2f7f6099afcd6758a816708485efe44bc5b2a6ec87d9ceeddbb5
+  languageName: node
+  linkType: hard
+
 asn1@evs-broadcast/node-asn1:
   version: 0.5.4
   resolution: "asn1@https://github.com/evs-broadcast/node-asn1.git#commit=0146823069e479e90595480dc90c72cafa161ba1"
@@ -7006,6 +7996,28 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
+"assert@npm:^2.0.0":
+  version: 2.1.0
+  resolution: "assert@npm:2.1.0"
+  dependencies:
+    call-bind: ^1.0.2
+    is-nan: ^1.3.2
+    object-is: ^1.1.5
+    object.assign: ^4.1.4
+    util: ^0.12.5
+  checksum: 1ed1cabba9abe55f4109b3f7292b4e4f3cf2953aad8dc148c0b3c3bd676675c31b1abb32ef563b7d5a19d1715bf90d1e5f09fad2a4ee655199468902da80f7c2
+  languageName: node
+  linkType: hard
+
+"ast-types@npm:^0.13.4":
+  version: 0.13.4
+  resolution: "ast-types@npm:0.13.4"
+  dependencies:
+    tslib: ^2.0.1
+  checksum: 5a51f7b70588ecced3601845a0e203279ca2f5fdc184416a0a1640c93ec0a267241d6090a328e78eebb8de81f8754754e0a4f1558ba2a3d638f8ccbd0b1f0eff
+  languageName: node
+  linkType: hard
+
 "astring@npm:^1.8.0, astring@npm:^1.8.1":
   version: 1.8.6
   resolution: "astring@npm:1.8.6"
@@ -7079,16 +8091,16 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
-"atem-state@npm:1.2.0-nightly-master-20240202-124617-5b52568.0":
-  version: 1.2.0-nightly-master-20240202-124617-5b52568.0
-  resolution: "atem-state@npm:1.2.0-nightly-master-20240202-124617-5b52568.0"
+"atem-state@npm:1.2.0":
+  version: 1.2.0
+  resolution: "atem-state@npm:1.2.0"
   dependencies:
     deepmerge: ^4.3.1
     tslib: ^2.6.2
     type-fest: ^3.13.1
   peerDependencies:
     atem-connection: 3.4
-  checksum: 473c305838b6e5540beba5433dd8c1bd9212734b578e130b6eca6aee274f70ef3d469412bb34ea069e89921f15bf7fa320adfb26658698fc99d82040c34d7a84
+  checksum: 7dd676d29091d0c769e3f40cce18c54e1e773e1ff3237803275147a4e3abfca0751af29349fdf8df2508b13e6834249690f6546258a25314d07986d33b9e3ab8
   languageName: node
   linkType: hard
 
@@ -7117,10 +8129,12 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
-"available-typed-arrays@npm:^1.0.5":
-  version: 1.0.5
-  resolution: "available-typed-arrays@npm:1.0.5"
-  checksum: 20eb47b3cefd7db027b9bbb993c658abd36d4edd3fe1060e83699a03ee275b0c9b216cc076ff3f2db29073225fb70e7613987af14269ac1fe2a19803ccc97f1a
+"available-typed-arrays@npm:^1.0.7":
+  version: 1.0.7
+  resolution: "available-typed-arrays@npm:1.0.7"
+  dependencies:
+    possible-typed-array-names: ^1.0.0
+  checksum: 1aa3ffbfe6578276996de660848b6e95669d9a95ad149e3dd0c0cda77db6ee1dbd9d1dd723b65b6d277b882dd0c4b91a654ae9d3cf9e1254b7e93e4908d78fd3
   languageName: node
   linkType: hard
 
@@ -7151,6 +8165,13 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
+"b4a@npm:^1.6.4":
+  version: 1.6.6
+  resolution: "b4a@npm:1.6.6"
+  checksum: c46a27e3ac9c84426ae728f0fc46a6ae7703a7bc03e771fa0bef4827fd7cf3bb976d1a3d5afff54606248372ab8fdf595bd0114406690edf37f14d120630cf7f
+  languageName: node
+  linkType: hard
+
 "babel-jest@npm:^29.7.0":
   version: 29.7.0
   resolution: "babel-jest@npm:29.7.0"
@@ -7308,6 +8329,49 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
+"bare-events@npm:^2.0.0, bare-events@npm:^2.2.0":
+  version: 2.4.2
+  resolution: "bare-events@npm:2.4.2"
+  checksum: 6cd2b10dd32a3410787e120c091b6082fbc2df0c45ed723a7ae51d0e2f55d2a4037e1daff21dae90b671d36582f9f8d50df337875c281d10adb60df81b8cd861
+  languageName: node
+  linkType: hard
+
+"bare-fs@npm:^2.1.1":
+  version: 2.3.2
+  resolution: "bare-fs@npm:2.3.2"
+  dependencies:
+    bare-events: ^2.0.0
+    bare-path: ^2.0.0
+    bare-stream: ^2.0.0
+  checksum: 3c2450b947313cbeead0d643de925237a27f29f8d38bf4dbe73266ff7eaf629f11f55d1fa2fcdf47beced2364300277cd5f8c7b38eefb9f60e05614f49b9ae8c
+  languageName: node
+  linkType: hard
+
+"bare-os@npm:^2.1.0":
+  version: 2.4.1
+  resolution: "bare-os@npm:2.4.1"
+  checksum: b23343b526ed73918a560b10906626321bbbd92a1059581b9fb4b11ce8489aab2ae2a3720c8ce8fe62e3c6fca62bff177d1e36c2d01025142ce6fc5812721c7a
+  languageName: node
+  linkType: hard
+
+"bare-path@npm:^2.0.0, bare-path@npm:^2.1.0":
+  version: 2.1.3
+  resolution: "bare-path@npm:2.1.3"
+  dependencies:
+    bare-os: ^2.1.0
+  checksum: 20301aeb05b735852a396515464908e51e896922c3bb353ef2a09ff54e81ced94e6ad857bb0a36d2ce659c42bd43dd5c3d5643edd8faaf910ee9950c4e137b88
+  languageName: node
+  linkType: hard
+
+"bare-stream@npm:^2.0.0":
+  version: 2.2.0
+  resolution: "bare-stream@npm:2.2.0"
+  dependencies:
+    streamx: ^2.18.0
+  checksum: 8600ce2f24c0dae2e1aa7992fb69531f1baaf7ea50f60c416561b4c6f1417636355ddbf4e22286f4d8111aa6f47fb7cb3d5be592d025077d80948d08578fa20b
+  languageName: node
+  linkType: hard
+
 "base64-arraybuffer-es6@npm:^0.3.1":
   version: 0.3.1
   resolution: "base64-arraybuffer-es6@npm:0.3.1"
@@ -7331,6 +8395,13 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
+"basic-ftp@npm:^5.0.2":
+  version: 5.0.5
+  resolution: "basic-ftp@npm:5.0.5"
+  checksum: bc82d1c1c61cd838eaca96d68ece888bacf07546642fb6b9b8328ed410756f5935f8cf43a42cb44bb343e0565e28e908adc54c298bd2f1a6e0976871fb11fec6
+  languageName: node
+  linkType: hard
+
 "batch@npm:0.6.1":
   version: 0.6.1
   resolution: "batch@npm:0.6.1"
@@ -7424,6 +8495,20 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
+"bn.js@npm:^4.0.0, bn.js@npm:^4.1.0, bn.js@npm:^4.11.9":
+  version: 4.12.0
+  resolution: "bn.js@npm:4.12.0"
+  checksum: 39afb4f15f4ea537b55eaf1446c896af28ac948fdcf47171961475724d1bb65118cca49fa6e3d67706e4790955ec0e74de584e45c8f1ef89f46c812bee5b5a12
+  languageName: node
+  linkType: hard
+
+"bn.js@npm:^5.0.0, bn.js@npm:^5.2.1":
+  version: 5.2.1
+  resolution: "bn.js@npm:5.2.1"
+  checksum: 3dd8c8d38055fedfa95c1d5fc3c99f8dd547b36287b37768db0abab3c239711f88ff58d18d155dd8ad902b0b0cee973747b7ae20ea12a09473272b0201c9edd3
+  languageName: node
+  linkType: hard
+
 "body-parser@npm:1.20.1":
   version: 1.20.1
   resolution: "body-parser@npm:1.20.1"
@@ -7524,11 +8609,11 @@ asn1@evs-broadcast/node-asn1:
   linkType: hard
 
 "braces@npm:^3.0.2, braces@npm:~3.0.2":
-  version: 3.0.2
-  resolution: "braces@npm:3.0.2"
+  version: 3.0.3
+  resolution: "braces@npm:3.0.3"
   dependencies:
-    fill-range: ^7.0.1
-  checksum: e2a8e769a863f3d4ee887b5fe21f63193a891c68b612ddb4b68d82d1b5f3ff9073af066c343e9867a393fe4c2555dcb33e89b937195feb9c1613d259edfcd459
+    fill-range: ^7.1.1
+  checksum: b95aa0b3bd909f6cd1720ffcf031aeaf46154dd88b4da01f9a1d3f7ea866a79eba76a6d01cbc3c422b2ee5cdc39a4f02491058d5df0d7bf6e6a162a832df1f69
   languageName: node
   linkType: hard
 
@@ -7541,6 +8626,13 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
+"brorand@npm:^1.0.1, brorand@npm:^1.1.0":
+  version: 1.1.0
+  resolution: "brorand@npm:1.1.0"
+  checksum: 8a05c9f3c4b46572dec6ef71012b1946db6cae8c7bb60ccd4b7dd5a84655db49fe043ecc6272e7ef1f69dc53d6730b9e2a3a03a8310509a3d797a618cbee52be
+  languageName: node
+  linkType: hard
+
 "browser-process-hrtime@npm:^1.0.0":
   version: 1.0.0
   resolution: "browser-process-hrtime@npm:1.0.0"
@@ -7548,17 +8640,100 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
-"browserslist@npm:^4.0.0, browserslist@npm:^4.18.1, browserslist@npm:^4.21.10, browserslist@npm:^4.21.4, browserslist@npm:^4.22.2, browserslist@npm:^4.23.0":
-  version: 4.23.0
-  resolution: "browserslist@npm:4.23.0"
+"browser-resolve@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "browser-resolve@npm:2.0.0"
+  dependencies:
+    resolve: ^1.17.0
+  checksum: 69225e73b555bd6d2a08fb93c7342cfcf3b5058b975099c52649cd5c3cec84c2066c5385084d190faedfb849684d9dabe10129f0cd401d1883572f2e6650f440
+  languageName: node
+  linkType: hard
+
+"browserify-aes@npm:^1.0.4, browserify-aes@npm:^1.2.0":
+  version: 1.2.0
+  resolution: "browserify-aes@npm:1.2.0"
+  dependencies:
+    buffer-xor: ^1.0.3
+    cipher-base: ^1.0.0
+    create-hash: ^1.1.0
+    evp_bytestokey: ^1.0.3
+    inherits: ^2.0.1
+    safe-buffer: ^5.0.1
+  checksum: 4a17c3eb55a2aa61c934c286f34921933086bf6d67f02d4adb09fcc6f2fc93977b47d9d884c25619144fccd47b3b3a399e1ad8b3ff5a346be47270114bcf7104
+  languageName: node
+  linkType: hard
+
+"browserify-cipher@npm:^1.0.0":
+  version: 1.0.1
+  resolution: "browserify-cipher@npm:1.0.1"
+  dependencies:
+    browserify-aes: ^1.0.4
+    browserify-des: ^1.0.0
+    evp_bytestokey: ^1.0.0
+  checksum: 2d8500acf1ee535e6bebe808f7a20e4c3a9e2ed1a6885fff1facbfd201ac013ef030422bec65ca9ece8ffe82b03ca580421463f9c45af6c8415fd629f4118c13
+  languageName: node
+  linkType: hard
+
+"browserify-des@npm:^1.0.0":
+  version: 1.0.2
+  resolution: "browserify-des@npm:1.0.2"
+  dependencies:
+    cipher-base: ^1.0.1
+    des.js: ^1.0.0
+    inherits: ^2.0.1
+    safe-buffer: ^5.1.2
+  checksum: b15a3e358a1d78a3b62ddc06c845d02afde6fc826dab23f1b9c016e643e7b1fda41de628d2110b712f6a44fb10cbc1800bc6872a03ddd363fb50768e010395b7
+  languageName: node
+  linkType: hard
+
+"browserify-rsa@npm:^4.0.0, browserify-rsa@npm:^4.1.0":
+  version: 4.1.0
+  resolution: "browserify-rsa@npm:4.1.0"
+  dependencies:
+    bn.js: ^5.0.0
+    randombytes: ^2.0.1
+  checksum: 155f0c135873efc85620571a33d884aa8810e40176125ad424ec9d85016ff105a07f6231650914a760cca66f29af0494087947b7be34880dd4599a0cd3c38e54
+  languageName: node
+  linkType: hard
+
+"browserify-sign@npm:^4.0.0":
+  version: 4.2.3
+  resolution: "browserify-sign@npm:4.2.3"
+  dependencies:
+    bn.js: ^5.2.1
+    browserify-rsa: ^4.1.0
+    create-hash: ^1.2.0
+    create-hmac: ^1.1.7
+    elliptic: ^6.5.5
+    hash-base: ~3.0
+    inherits: ^2.0.4
+    parse-asn1: ^5.1.7
+    readable-stream: ^2.3.8
+    safe-buffer: ^5.2.1
+  checksum: 403a8061d229ae31266670345b4a7c00051266761d2c9bbeb68b1a9bcb05f68143b16110cf23a171a5d6716396a1f41296282b3e73eeec0a1871c77f0ff4ee6b
+  languageName: node
+  linkType: hard
+
+"browserify-zlib@npm:^0.2.0":
+  version: 0.2.0
+  resolution: "browserify-zlib@npm:0.2.0"
+  dependencies:
+    pako: ~1.0.5
+  checksum: 5cd9d6a665190fedb4a97dfbad8dabc8698d8a507298a03f42c734e96d58ca35d3c7d4085e283440bbca1cd1938cff85031728079bedb3345310c58ab1ec92d6
+  languageName: node
+  linkType: hard
+
+"browserslist@npm:^4.0.0, browserslist@npm:^4.18.1, browserslist@npm:^4.21.10, browserslist@npm:^4.21.4, browserslist@npm:^4.23.0, browserslist@npm:^4.23.1":
+  version: 4.23.2
+  resolution: "browserslist@npm:4.23.2"
   dependencies:
-    caniuse-lite: ^1.0.30001587
-    electron-to-chromium: ^1.4.668
+    caniuse-lite: ^1.0.30001640
+    electron-to-chromium: ^1.4.820
     node-releases: ^2.0.14
-    update-browserslist-db: ^1.0.13
+    update-browserslist-db: ^1.1.0
   bin:
     browserslist: cli.js
-  checksum: 436f49e796782ca751ebab7edc010cfc9c29f68536f387666cd70ea22f7105563f04dd62c6ff89cb24cc3254d17cba385f979eeeb3484d43e012412ff7e75def
+  checksum: 8212af37f6ca6355da191cf2d4ad49bd0b82854888b9a7e103638fada70d38cbe36d28feeeaa98344cb15d9128f9f74bcc8ce1bfc9011b5fd14381c1c6fb542c
   languageName: node
   linkType: hard
 
@@ -7608,7 +8783,14 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
-"buffer@npm:^5.2.1, buffer@npm:^5.5.0":
+"buffer-xor@npm:^1.0.3":
+  version: 1.0.3
+  resolution: "buffer-xor@npm:1.0.3"
+  checksum: 10c520df29d62fa6e785e2800e586a20fc4f6dfad84bcdbd12e1e8a83856de1cb75c7ebd7abe6d036bbfab738a6cf18a3ae9c8e5a2e2eb3167ca7399ce65373a
+  languageName: node
+  linkType: hard
+
+"buffer@npm:^5.2.1, buffer@npm:^5.5.0, buffer@npm:^5.7.1":
   version: 5.7.1
   resolution: "buffer@npm:5.7.1"
   dependencies:
@@ -7628,6 +8810,13 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
+"builtin-status-codes@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "builtin-status-codes@npm:3.0.0"
+  checksum: 1119429cf4b0d57bf76b248ad6f529167d343156ebbcc4d4e4ad600484f6bc63002595cbb61b67ad03ce55cd1d3c4711c03bbf198bf24653b8392420482f3773
+  languageName: node
+  linkType: hard
+
 "builtins@npm:^1.0.3":
   version: 1.0.3
   resolution: "builtins@npm:1.0.3"
@@ -7777,13 +8966,16 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
-"call-bind@npm:^1.0.0, call-bind@npm:^1.0.2":
-  version: 1.0.2
-  resolution: "call-bind@npm:1.0.2"
+"call-bind@npm:^1.0.0, call-bind@npm:^1.0.2, call-bind@npm:^1.0.5, call-bind@npm:^1.0.6, call-bind@npm:^1.0.7":
+  version: 1.0.7
+  resolution: "call-bind@npm:1.0.7"
   dependencies:
-    function-bind: ^1.1.1
-    get-intrinsic: ^1.0.2
-  checksum: f8e31de9d19988a4b80f3e704788c4a2d6b6f3d17cfec4f57dc29ced450c53a49270dc66bf0fbd693329ee948dd33e6c90a329519aef17474a4d961e8d6426b0
+    es-define-property: ^1.0.0
+    es-errors: ^1.3.0
+    function-bind: ^1.1.2
+    get-intrinsic: ^1.2.4
+    set-function-length: ^1.2.1
+  checksum: 295c0c62b90dd6522e6db3b0ab1ce26bdf9e7404215bda13cfee25b626b5ff1a7761324d58d38b1ef1607fc65aca2d06e44d2e18d0dfc6c14b465b00d8660029
   languageName: node
   linkType: hard
 
@@ -7867,10 +9059,10 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
-"caniuse-lite@npm:^1.0.0, caniuse-lite@npm:^1.0.30001587, caniuse-lite@npm:^1.0.30001599":
-  version: 1.0.30001612
-  resolution: "caniuse-lite@npm:1.0.30001612"
-  checksum: 2b6ab6a19c72bdf8dccac824944e828a2a1fae52c6dfeb2d64ccecfd60d0466d2e5a392e996da2150d92850188a5034666dceed34a38d978177f6934e0bf106d
+"caniuse-lite@npm:^1.0.0, caniuse-lite@npm:^1.0.30001599, caniuse-lite@npm:^1.0.30001640":
+  version: 1.0.30001643
+  resolution: "caniuse-lite@npm:1.0.30001643"
+  checksum: e39991c13a0fd8f5c2aa99c9128188e4c4e9d6a203c3da6270c36285460ef152c5e9410ee4db560aa723904668946afe50541dce9636ab5e61434ba71dc22955
   languageName: node
   linkType: hard
 
@@ -7885,14 +9077,14 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
-"casparcg-connection@npm:6.2.1":
-  version: 6.2.1
-  resolution: "casparcg-connection@npm:6.2.1"
+"casparcg-connection@npm:6.3.0":
+  version: 6.3.0
+  resolution: "casparcg-connection@npm:6.3.0"
   dependencies:
     eventemitter3: ^5.0.1
     tslib: ^2.5.0
     xml2js: ^0.6.2
-  checksum: a086810faf0dbf91fc2987c1f4062696d5396fcbfeee16bc8b969a1a5edaac30657179c25164b1b62d9f79789ceee2e842822fe30dece420893e6fab50a467dd
+  checksum: 2aa7e2160078f0de08b3b0491b2dde180baaca7fb96fdf4b74522b90f053efc265b42ea48cb7ae0ede2dab697be61d09d6ee18ce72826df0091156aaceeb8e06
   languageName: node
   linkType: hard
 
@@ -8023,9 +9215,9 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
-"chokidar@npm:^3.4.0, chokidar@npm:^3.4.2, chokidar@npm:^3.5.2, chokidar@npm:^3.5.3":
-  version: 3.5.3
-  resolution: "chokidar@npm:3.5.3"
+"chokidar@npm:>=3.0.0 <4.0.0, chokidar@npm:^3.4.0, chokidar@npm:^3.4.2, chokidar@npm:^3.5.2, chokidar@npm:^3.5.3":
+  version: 3.6.0
+  resolution: "chokidar@npm:3.6.0"
   dependencies:
     anymatch: ~3.1.2
     braces: ~3.0.2
@@ -8038,14 +9230,7 @@ asn1@evs-broadcast/node-asn1:
   dependenciesMeta:
     fsevents:
       optional: true
-  checksum: b49fcde40176ba007ff361b198a2d35df60d9bb2a5aab228279eb810feae9294a6b4649ab15981304447afe1e6ffbf4788ad5db77235dc770ab777c6e771980c
-  languageName: node
-  linkType: hard
-
-"chownr@npm:^1.1.1":
-  version: 1.1.4
-  resolution: "chownr@npm:1.1.4"
-  checksum: 115648f8eb38bac5e41c3857f3e663f9c39ed6480d1349977c4d96c95a47266fcacc5a5aabf3cb6c481e22d72f41992827db47301851766c4fd77ac21a4f081d
+  checksum: d2f29f499705dcd4f6f3bbed79a9ce2388cf530460122eed3b9c48efeab7a4e28739c6551fd15bec9245c6b9eeca7a32baa64694d64d9b6faeb74ddb8c4a413d
   languageName: node
   linkType: hard
 
@@ -8063,6 +9248,19 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
+"chromium-bidi@npm:0.6.4":
+  version: 0.6.4
+  resolution: "chromium-bidi@npm:0.6.4"
+  dependencies:
+    mitt: 3.0.1
+    urlpattern-polyfill: 10.0.0
+    zod: 3.23.8
+  peerDependencies:
+    devtools-protocol: "*"
+  checksum: 7ccbdfce86dd7ac9af4184d8c225d936b6c7929140b4ba201c5193cfe46562d149374d9350f1bdc35c6c31d070adfb811fc8b64f30137c827cca564646297433
+  languageName: node
+  linkType: hard
+
 "ci-info@npm:^2.0.0":
   version: 2.0.0
   resolution: "ci-info@npm:2.0.0"
@@ -8077,6 +9275,16 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
+"cipher-base@npm:^1.0.0, cipher-base@npm:^1.0.1, cipher-base@npm:^1.0.3":
+  version: 1.0.4
+  resolution: "cipher-base@npm:1.0.4"
+  dependencies:
+    inherits: ^2.0.1
+    safe-buffer: ^5.0.1
+  checksum: 47d3568dbc17431a339bad1fe7dff83ac0891be8206911ace3d3b818fc695f376df809bea406e759cdea07fff4b454fa25f1013e648851bec790c1d75763032e
+  languageName: node
+  linkType: hard
+
 "cjs-module-lexer@npm:^1.0.0, cjs-module-lexer@npm:^1.2.2":
   version: 1.2.3
   resolution: "cjs-module-lexer@npm:1.2.3"
@@ -8084,6 +9292,13 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
+"classnames@npm:*, classnames@npm:^2.2.1, classnames@npm:^2.2.5, classnames@npm:^2.2.6, classnames@npm:^2.3.1, classnames@npm:^2.3.2, classnames@npm:^2.5.1":
+  version: 2.5.1
+  resolution: "classnames@npm:2.5.1"
+  checksum: da424a8a6f3a96a2e87d01a432ba19315503294ac7e025f9fece656db6b6a0f7b5003bb1fbb51cbb0d9624d964f1b9bb35a51c73af9b2434c7b292c42231c1e5
+  languageName: node
+  linkType: hard
+
 "clean-css@npm:^5.2.2, clean-css@npm:^5.3.2, clean-css@npm:~5.3.2":
   version: 5.3.3
   resolution: "clean-css@npm:5.3.3"
@@ -8599,6 +9814,13 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
+"console-browserify@npm:^1.1.0":
+  version: 1.2.0
+  resolution: "console-browserify@npm:1.2.0"
+  checksum: 226591eeff8ed68e451dffb924c1fb750c654d54b9059b3b261d360f369d1f8f70650adecf2c7136656236a4bfeb55c39281b5d8a55d792ebbb99efd3d848d52
+  languageName: node
+  linkType: hard
+
 "console-control-strings@npm:^1.1.0":
   version: 1.1.0
   resolution: "console-control-strings@npm:1.1.0"
@@ -8622,6 +9844,13 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
+"constants-browserify@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "constants-browserify@npm:1.0.0"
+  checksum: f7ac8c6d0b6e4e0c77340a1d47a3574e25abd580bfd99ad707b26ff7618596cf1a5e5ce9caf44715e9e01d4a5d12cb3b4edaf1176f34c19adb2874815a56e64f
+  languageName: node
+  linkType: hard
+
 "content-disposition@npm:0.5.2":
   version: 0.5.2
   resolution: "content-disposition@npm:0.5.2"
@@ -8816,12 +10045,12 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
-"core-js-compat@npm:^3.31.0, core-js-compat@npm:^3.36.1":
-  version: 3.37.0
-  resolution: "core-js-compat@npm:3.37.0"
+"core-js-compat@npm:^3.36.1, core-js-compat@npm:^3.37.1":
+  version: 3.37.1
+  resolution: "core-js-compat@npm:3.37.1"
   dependencies:
     browserslist: ^4.23.0
-  checksum: cab5078e98625f889fd9bbbb19e84cb408f31c87e68302d380db0d26ae8e35c1b38cde084358ff345d4aa461af5f3c60d8a913a5b30bff3a83b4b7859374db36
+  checksum: 5e7430329358bced08c30950512d2081aea0a5652b4c5892cbb3c4a6db05b0d3893a191a955162a07fdb5f4fe74e61b6429fdb503f54e062336d76e43c9555d9
   languageName: node
   linkType: hard
 
@@ -8911,6 +10140,60 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
+"cosmiconfig@npm:^9.0.0":
+  version: 9.0.0
+  resolution: "cosmiconfig@npm:9.0.0"
+  dependencies:
+    env-paths: ^2.2.1
+    import-fresh: ^3.3.0
+    js-yaml: ^4.1.0
+    parse-json: ^5.2.0
+  peerDependencies:
+    typescript: ">=4.9.5"
+  peerDependenciesMeta:
+    typescript:
+      optional: true
+  checksum: a30c424b53d442ea0bdd24cb1b3d0d8687c8dda4a17ab6afcdc439f8964438801619cdb66e8e79f63b9caa3e6586b60d8bab9ce203e72df6c5e80179b971fe8f
+  languageName: node
+  linkType: hard
+
+"create-ecdh@npm:^4.0.0":
+  version: 4.0.4
+  resolution: "create-ecdh@npm:4.0.4"
+  dependencies:
+    bn.js: ^4.1.0
+    elliptic: ^6.5.3
+  checksum: 0dd7fca9711d09e152375b79acf1e3f306d1a25ba87b8ff14c2fd8e68b83aafe0a7dd6c4e540c9ffbdd227a5fa1ad9b81eca1f233c38bb47770597ba247e614b
+  languageName: node
+  linkType: hard
+
+"create-hash@npm:^1.1.0, create-hash@npm:^1.1.2, create-hash@npm:^1.2.0":
+  version: 1.2.0
+  resolution: "create-hash@npm:1.2.0"
+  dependencies:
+    cipher-base: ^1.0.1
+    inherits: ^2.0.1
+    md5.js: ^1.3.4
+    ripemd160: ^2.0.1
+    sha.js: ^2.4.0
+  checksum: 02a6ae3bb9cd4afee3fabd846c1d8426a0e6b495560a977ba46120c473cb283be6aa1cace76b5f927cf4e499c6146fb798253e48e83d522feba807d6b722eaa9
+  languageName: node
+  linkType: hard
+
+"create-hmac@npm:^1.1.0, create-hmac@npm:^1.1.4, create-hmac@npm:^1.1.7":
+  version: 1.1.7
+  resolution: "create-hmac@npm:1.1.7"
+  dependencies:
+    cipher-base: ^1.0.3
+    create-hash: ^1.1.0
+    inherits: ^2.0.1
+    ripemd160: ^2.0.0
+    safe-buffer: ^5.0.1
+    sha.js: ^2.4.8
+  checksum: ba12bb2257b585a0396108c72830e85f882ab659c3320c83584b1037f8ab72415095167ced80dc4ce8e446a8ecc4b2acf36d87befe0707d73b26cf9dc77440ed
+  languageName: node
+  linkType: hard
+
 "create-jest@npm:^29.7.0":
   version: 29.7.0
   resolution: "create-jest@npm:29.7.0"
@@ -8928,7 +10211,7 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
-"create-require@npm:^1.1.0":
+"create-require@npm:^1.1.0, create-require@npm:^1.1.1":
   version: 1.1.1
   resolution: "create-require@npm:1.1.1"
   checksum: a9a1503d4390d8b59ad86f4607de7870b39cad43d929813599a23714831e81c520bddf61bcdd1f8e30f05fd3a2b71ae8538e946eb2786dc65c2bbc520f692eff
@@ -8955,6 +10238,25 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
+"crypto-browserify@npm:^3.11.0":
+  version: 3.12.0
+  resolution: "crypto-browserify@npm:3.12.0"
+  dependencies:
+    browserify-cipher: ^1.0.0
+    browserify-sign: ^4.0.0
+    create-ecdh: ^4.0.0
+    create-hash: ^1.1.0
+    create-hmac: ^1.1.0
+    diffie-hellman: ^5.0.0
+    inherits: ^2.0.1
+    pbkdf2: ^3.0.3
+    public-encrypt: ^4.0.0
+    randombytes: ^2.0.0
+    randomfill: ^1.0.3
+  checksum: c1609af82605474262f3eaa07daa0b2140026bd264ab316d4bf1170272570dbe02f0c49e29407fe0d3634f96c507c27a19a6765fb856fed854a625f9d15618e2
+  languageName: node
+  linkType: hard
+
 "crypto-js@npm:^4.1.1":
   version: 4.2.0
   resolution: "crypto-js@npm:4.2.0"
@@ -9221,6 +10523,13 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
+"cssom@npm:^0.5.0":
+  version: 0.5.0
+  resolution: "cssom@npm:0.5.0"
+  checksum: 823471aa30091c59e0a305927c30e7768939b6af70405808f8d2ce1ca778cddcb24722717392438329d1691f9a87cb0183b64b8d779b56a961546d54854fde01
+  languageName: node
+  linkType: hard
+
 "cssom@npm:~0.3.6":
   version: 0.3.8
   resolution: "cssom@npm:0.3.8"
@@ -9244,6 +10553,13 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
+"cubic-spline@npm:^3.0.3":
+  version: 3.0.3
+  resolution: "cubic-spline@npm:3.0.3"
+  checksum: 860170c5d49b05749cd9de3a5fa4e3c1c1eeee8f0e0235778d178bb48b73db10ec7793ea3e9f25d846dc9cff031b71ab1e5ccccdfea61e22ca605e01b6dde0e1
+  languageName: node
+  linkType: hard
+
 "cytoscape-cose-bilkent@npm:^4.1.0":
   version: 4.1.0
   resolution: "cytoscape-cose-bilkent@npm:4.1.0"
@@ -9642,6 +10958,13 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
+"data-uri-to-buffer@npm:^6.0.2":
+  version: 6.0.2
+  resolution: "data-uri-to-buffer@npm:6.0.2"
+  checksum: 8b6927c33f9b54037f442856be0aa20e5fd49fa6c9c8ceece408dc306445d593ad72d207d57037c529ce65f413b421da800c6827b1dbefb607b8056f17123a61
+  languageName: node
+  linkType: hard
+
 "data-urls@npm:^2.0.0":
   version: 2.0.0
   resolution: "data-urls@npm:2.0.0"
@@ -9653,7 +10976,51 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
-"date-fns@npm:^2.16.1, date-fns@npm:^2.29.3":
+"data-urls@npm:^3.0.2":
+  version: 3.0.2
+  resolution: "data-urls@npm:3.0.2"
+  dependencies:
+    abab: ^2.0.6
+    whatwg-mimetype: ^3.0.0
+    whatwg-url: ^11.0.0
+  checksum: 033fc3dd0fba6d24bc9a024ddcf9923691dd24f90a3d26f6545d6a2f71ec6956f93462f2cdf2183cc46f10dc01ed3bcb36731a8208456eb1a08147e571fe2a76
+  languageName: node
+  linkType: hard
+
+"data-view-buffer@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "data-view-buffer@npm:1.0.1"
+  dependencies:
+    call-bind: ^1.0.6
+    es-errors: ^1.3.0
+    is-data-view: ^1.0.1
+  checksum: ce24348f3c6231223b216da92e7e6a57a12b4af81a23f27eff8feabdf06acfb16c00639c8b705ca4d167f761cfc756e27e5f065d0a1f840c10b907fdaf8b988c
+  languageName: node
+  linkType: hard
+
+"data-view-byte-length@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "data-view-byte-length@npm:1.0.1"
+  dependencies:
+    call-bind: ^1.0.7
+    es-errors: ^1.3.0
+    is-data-view: ^1.0.1
+  checksum: dbb3200edcb7c1ef0d68979834f81d64fd8cab2f7691b3a4c6b97e67f22182f3ec2c8602efd7b76997b55af6ff8bce485829c1feda4fa2165a6b71fb7baa4269
+  languageName: node
+  linkType: hard
+
+"data-view-byte-offset@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "data-view-byte-offset@npm:1.0.0"
+  dependencies:
+    call-bind: ^1.0.6
+    es-errors: ^1.3.0
+    is-data-view: ^1.0.1
+  checksum: 7f0bf8720b7414ca719eedf1846aeec392f2054d7af707c5dc9a753cc77eb8625f067fa901e0b5127e831f9da9056138d894b9c2be79c27a21f6db5824f009c2
+  languageName: node
+  linkType: hard
+
+"date-fns@npm:^2.0.1, date-fns@npm:^2.16.1, date-fns@npm:^2.29.3":
   version: 2.30.0
   resolution: "date-fns@npm:2.30.0"
   dependencies:
@@ -9692,7 +11059,19 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
-"debug@npm:4, debug@npm:4.3.4, debug@npm:^4.0.0, debug@npm:^4.1.0, debug@npm:^4.1.1, debug@npm:^4.3.1, debug@npm:^4.3.2, debug@npm:^4.3.3, debug@npm:^4.3.4":
+"debug@npm:4, debug@npm:^4.0.0, debug@npm:^4.1.0, debug@npm:^4.1.1, debug@npm:^4.3.1, debug@npm:^4.3.2, debug@npm:^4.3.3, debug@npm:^4.3.4, debug@npm:^4.3.6":
+  version: 4.3.6
+  resolution: "debug@npm:4.3.6"
+  dependencies:
+    ms: 2.1.2
+  peerDependenciesMeta:
+    supports-color:
+      optional: true
+  checksum: 1630b748dea3c581295e02137a9f5cbe2c1d85fea35c1e6597a65ca2b16a6fce68cec61b299d480787ef310ba927dc8c92d3061faba0ad06c6a724672f66be7f
+  languageName: node
+  linkType: hard
+
+"debug@npm:4.3.4":
   version: 4.3.4
   resolution: "debug@npm:4.3.4"
   dependencies:
@@ -9744,7 +11123,7 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
-"decimal.js@npm:^10.2.1":
+"decimal.js@npm:^10.2.1, decimal.js@npm:^10.4.2":
   version: 10.4.3
   resolution: "decimal.js@npm:10.4.3"
   checksum: 796404dcfa9d1dbfdc48870229d57f788b48c21c603c3f6554a1c17c10195fc1024de338b0cf9e1efe0c7c167eeb18f04548979bcc5fdfabebb7cc0ae3287bae
@@ -9760,6 +11139,13 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
+"decode-uri-component@npm:^0.2.0":
+  version: 0.2.2
+  resolution: "decode-uri-component@npm:0.2.2"
+  checksum: 95476a7d28f267292ce745eac3524a9079058bbb35767b76e3ee87d42e34cd0275d2eb19d9d08c3e167f97556e8a2872747f5e65cbebcac8b0c98d83e285f139
+  languageName: node
+  linkType: hard
+
 "decompress-response@npm:^6.0.0":
   version: 6.0.0
   resolution: "decompress-response@npm:6.0.0"
@@ -9788,7 +11174,21 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
-"deep-extend@npm:^0.6.0":
+"deep-equal@npm:^1.1.1":
+  version: 1.1.2
+  resolution: "deep-equal@npm:1.1.2"
+  dependencies:
+    is-arguments: ^1.1.1
+    is-date-object: ^1.0.5
+    is-regex: ^1.1.4
+    object-is: ^1.1.5
+    object-keys: ^1.1.1
+    regexp.prototype.flags: ^1.5.1
+  checksum: 2d50f27fff785fb272cdef038ee5365ee5a30ab1aab053976e6a6add44cc60abd99b38179a46a01ac52c5e54ebb220e8f1a3a1954da20678b79c46ef4d97c9db
+  languageName: node
+  linkType: hard
+
+"deep-extend@npm:0.6.0, deep-extend@npm:^0.6.0":
   version: 0.6.0
   resolution: "deep-extend@npm:0.6.0"
   checksum: 7be7e5a8d468d6b10e6a67c3de828f55001b6eb515d014f7aeb9066ce36bd5717161eb47d6a0f7bed8a9083935b465bc163ee2581c8b128d29bf61092fdf57a7
@@ -9856,14 +11256,14 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
-"define-data-property@npm:^1.0.1, define-data-property@npm:^1.1.0":
-  version: 1.1.0
-  resolution: "define-data-property@npm:1.1.0"
+"define-data-property@npm:^1.0.1, define-data-property@npm:^1.1.0, define-data-property@npm:^1.1.4":
+  version: 1.1.4
+  resolution: "define-data-property@npm:1.1.4"
   dependencies:
-    get-intrinsic: ^1.2.1
+    es-define-property: ^1.0.0
+    es-errors: ^1.3.0
     gopd: ^1.0.1
-    has-property-descriptors: ^1.0.0
-  checksum: 7ad4ee84cca8ad427a4831f5693526804b62ce9dfd4efac77214e95a4382aed930072251d4075dc8dc9fc949a353ed51f19f5285a84a788ba9216cc51472a093
+  checksum: 8068ee6cab694d409ac25936eb861eea704b7763f7f342adbdfe337fc27c78d7ae0eff2364b2917b58c508d723c7a074326d068eef2e45c4edcd85cf94d0313b
   languageName: node
   linkType: hard
 
@@ -9881,7 +11281,7 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
-"define-properties@npm:^1.1.3, define-properties@npm:^1.1.4, define-properties@npm:^1.2.0, define-properties@npm:^1.2.1":
+"define-properties@npm:^1.1.3, define-properties@npm:^1.2.0, define-properties@npm:^1.2.1":
   version: 1.2.1
   resolution: "define-properties@npm:1.2.1"
   dependencies:
@@ -9892,6 +11292,17 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
+"degenerator@npm:^5.0.0":
+  version: 5.0.1
+  resolution: "degenerator@npm:5.0.1"
+  dependencies:
+    ast-types: ^0.13.4
+    escodegen: ^2.1.0
+    esprima: ^4.0.1
+  checksum: a64fa39cdf6c2edd75188157d32338ee9de7193d7dbb2aeb4acb1eb30fa4a15ed80ba8dae9bd4d7b085472cf174a5baf81adb761aaa8e326771392c922084152
+  languageName: node
+  linkType: hard
+
 "del@npm:^6.0.0, del@npm:^6.1.1":
   version: 6.1.1
   resolution: "del@npm:6.1.1"
@@ -9966,6 +11377,16 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
+"des.js@npm:^1.0.0":
+  version: 1.1.0
+  resolution: "des.js@npm:1.1.0"
+  dependencies:
+    inherits: ^2.0.1
+    minimalistic-assert: ^1.0.0
+  checksum: 0e9c1584b70d31e20f20a613fc9ef60fbc6a147dfec9e448a168794a4b97ac04d8dc47ea008f1fa93b0f8aaf7c1ead632a5e59ce1913a6079d2d244c9f5ebe33
+  languageName: node
+  linkType: hard
+
 "destroy@npm:1.2.0":
   version: 1.2.0
   resolution: "destroy@npm:1.2.0"
@@ -10029,10 +11450,10 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
-"devtools-protocol@npm:0.0.1001819":
-  version: 0.0.1001819
-  resolution: "devtools-protocol@npm:0.0.1001819"
-  checksum: 156e7c6703ec6c203e0bc1d68393fcd768de45bf225ca7b2d6bd106d8dc4ab0e8f38c518ce158c73d83a96db8ef32ae06dc9b4edd70e94660253dc2622619947
+"devtools-protocol@npm:0.0.1330662":
+  version: 0.0.1330662
+  resolution: "devtools-protocol@npm:0.0.1330662"
+  checksum: de34cf3330f5b81b9fab346eea4dbab37ea6fbc6f9eb5a38deba115adfc30f292b861b8b674f16b8d27d5e3d13d2c82a0950b6ba8f46ff78fe1dbc6f83162389
   languageName: node
   linkType: hard
 
@@ -10067,6 +11488,17 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
+"diffie-hellman@npm:^5.0.0":
+  version: 5.0.3
+  resolution: "diffie-hellman@npm:5.0.3"
+  dependencies:
+    bn.js: ^4.1.0
+    miller-rabin: ^4.0.0
+    randombytes: ^2.0.0
+  checksum: 0e620f322170c41076e70181dd1c24e23b08b47dbb92a22a644f3b89b6d3834b0f8ee19e37916164e5eb1ee26d2aa836d6129f92723995267250a0b541811065
+  languageName: node
+  linkType: hard
+
 "dir-glob@npm:^3.0.1":
   version: 3.0.1
   resolution: "dir-glob@npm:3.0.1"
@@ -10076,6 +11508,17 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
+"dnd-core@npm:14.0.1":
+  version: 14.0.1
+  resolution: "dnd-core@npm:14.0.1"
+  dependencies:
+    "@react-dnd/asap": ^4.0.0
+    "@react-dnd/invariant": ^2.0.0
+    redux: ^4.1.1
+  checksum: dbc50727f53baad1cb1e0430a2a1b81c5c291389322f90fdc46edeb2fd49cc206ce4fa30a95afb53d88238945228e34866d7465f7ea49285c296baf883551301
+  languageName: node
+  linkType: hard
+
 "dns-equal@npm:^1.0.0":
   version: 1.0.0
   resolution: "dns-equal@npm:1.0.0"
@@ -10092,6 +11535,15 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
+"doctrine@npm:^2.1.0":
+  version: 2.1.0
+  resolution: "doctrine@npm:2.1.0"
+  dependencies:
+    esutils: ^2.0.2
+  checksum: a45e277f7feaed309fe658ace1ff286c6e2002ac515af0aaf37145b8baa96e49899638c7cd47dccf84c3d32abfc113246625b3ac8f552d1046072adee13b0dc8
+  languageName: node
+  linkType: hard
+
 "doctrine@npm:^3.0.0":
   version: 3.0.0
   resolution: "doctrine@npm:3.0.0"
@@ -10110,6 +11562,15 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
+"dom-helpers@npm:^3.4.0":
+  version: 3.4.0
+  resolution: "dom-helpers@npm:3.4.0"
+  dependencies:
+    "@babel/runtime": ^7.1.2
+  checksum: 58d9f1c4a96daf77eddc63ae1236b826e1cddd6db66bbf39b18d7e21896d99365b376593352d52a60969d67fa4a8dbef26adc1439fa2c1b355efa37cacbaf637
+  languageName: node
+  linkType: hard
+
 "dom-serializer@npm:0":
   version: 0.2.2
   resolution: "dom-serializer@npm:0.2.2"
@@ -10142,6 +11603,13 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
+"domain-browser@npm:^4.22.0":
+  version: 4.23.0
+  resolution: "domain-browser@npm:4.23.0"
+  checksum: 95b772f5fa88300240694380e06e03868573acdf86ca392a58c78602d6536dca2097ad2469a1500bd23a1329b09992de846e0b66c364cbf5711a7fee3ee5dac9
+  languageName: node
+  linkType: hard
+
 "domelementtype@npm:1":
   version: 1.3.1
   resolution: "domelementtype@npm:1.3.1"
@@ -10165,6 +11633,15 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
+"domexception@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "domexception@npm:4.0.0"
+  dependencies:
+    webidl-conversions: ^7.0.0
+  checksum: ddbc1268edf33a8ba02ccc596735ede80375ee0cf124b30d2f05df5b464ba78ef4f49889b6391df4a04954e63d42d5631c7fcf8b1c4f12bc531252977a5f13d5
+  languageName: node
+  linkType: hard
+
 "domhandler@npm:^4.0.0, domhandler@npm:^4.2.0, domhandler@npm:^4.3.1":
   version: 4.3.1
   resolution: "domhandler@npm:4.3.1"
@@ -10298,13 +11775,13 @@ asn1@evs-broadcast/node-asn1:
   linkType: hard
 
 "ejs@npm:^3.1.7":
-  version: 3.1.9
-  resolution: "ejs@npm:3.1.9"
+  version: 3.1.10
+  resolution: "ejs@npm:3.1.10"
   dependencies:
     jake: ^10.8.5
   bin:
     ejs: bin/cli.js
-  checksum: af6f10eb815885ff8a8cfacc42c6b6cf87daf97a4884f87a30e0c3271fedd85d76a3a297d9c33a70e735b97ee632887f85e32854b9cdd3a2d97edf931519a35f
+  checksum: ce90637e9c7538663ae023b8a7a380b2ef7cc4096de70be85abf5a3b9641912dde65353211d05e24d56b1f242d71185c6d00e02cb8860701d571786d92c71f05
   languageName: node
   linkType: hard
 
@@ -10361,10 +11838,10 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
-"electron-to-chromium@npm:^1.4.668":
-  version: 1.4.745
-  resolution: "electron-to-chromium@npm:1.4.745"
-  checksum: f73b576108863cad160deb22b8e8c6754a8b16b22cda90cfce038a755f886be9c03fb8360bbd7c9d28ddd184800d0d6bd430a11f9289316145f0b28321dfe71d
+"electron-to-chromium@npm:^1.4.820":
+  version: 1.5.0
+  resolution: "electron-to-chromium@npm:1.5.0"
+  checksum: 82e362dd5851f5ad312ab6699c5d36221deb1fbd4ab2c28f43c3244dd7d28aee28c3239491564dd4bb57f3ed8291a88c4f7983c61aad6db98459e96400923b8d
   languageName: node
   linkType: hard
 
@@ -10375,6 +11852,21 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
+"elliptic@npm:^6.5.3, elliptic@npm:^6.5.5":
+  version: 6.5.6
+  resolution: "elliptic@npm:6.5.6"
+  dependencies:
+    bn.js: ^4.11.9
+    brorand: ^1.1.0
+    hash.js: ^1.0.0
+    hmac-drbg: ^1.0.1
+    inherits: ^2.0.4
+    minimalistic-assert: ^1.0.1
+    minimalistic-crypto-utils: ^1.0.1
+  checksum: 213d778ccfe99ec8f0f871b1cc96a10ac3763d9175215d0a9dc026f291e5f50fea6f635e4e47b4506f9ada25aeb703bd807d8737b880dbb24d092a3001c6d97d
+  languageName: node
+  linkType: hard
+
 "emberplus-connection@npm:^0.2.1":
   version: 0.2.1
   resolution: "emberplus-connection@npm:0.2.1"
@@ -10510,7 +12002,7 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
-"env-paths@npm:^2.2.0":
+"env-paths@npm:^2.2.0, env-paths@npm:^2.2.1":
   version: 2.2.1
   resolution: "env-paths@npm:2.2.1"
   checksum: 65b5df55a8bab92229ab2b40dad3b387fad24613263d103a97f91c9fe43ceb21965cd3392b1ccb5d77088021e525c4e0481adb309625d0cb94ade1d1fb8dc17e
@@ -10558,50 +12050,57 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
-"es-abstract@npm:^1.17.2, es-abstract@npm:^1.22.1":
-  version: 1.22.2
-  resolution: "es-abstract@npm:1.22.2"
+"es-abstract@npm:^1.17.2, es-abstract@npm:^1.17.5, es-abstract@npm:^1.22.1, es-abstract@npm:^1.22.3, es-abstract@npm:^1.23.0, es-abstract@npm:^1.23.1, es-abstract@npm:^1.23.2, es-abstract@npm:^1.23.3":
+  version: 1.23.3
+  resolution: "es-abstract@npm:1.23.3"
   dependencies:
-    array-buffer-byte-length: ^1.0.0
-    arraybuffer.prototype.slice: ^1.0.2
-    available-typed-arrays: ^1.0.5
-    call-bind: ^1.0.2
-    es-set-tostringtag: ^2.0.1
+    array-buffer-byte-length: ^1.0.1
+    arraybuffer.prototype.slice: ^1.0.3
+    available-typed-arrays: ^1.0.7
+    call-bind: ^1.0.7
+    data-view-buffer: ^1.0.1
+    data-view-byte-length: ^1.0.1
+    data-view-byte-offset: ^1.0.0
+    es-define-property: ^1.0.0
+    es-errors: ^1.3.0
+    es-object-atoms: ^1.0.0
+    es-set-tostringtag: ^2.0.3
     es-to-primitive: ^1.2.1
     function.prototype.name: ^1.1.6
-    get-intrinsic: ^1.2.1
-    get-symbol-description: ^1.0.0
+    get-intrinsic: ^1.2.4
+    get-symbol-description: ^1.0.2
     globalthis: ^1.0.3
     gopd: ^1.0.1
-    has: ^1.0.3
-    has-property-descriptors: ^1.0.0
-    has-proto: ^1.0.1
+    has-property-descriptors: ^1.0.2
+    has-proto: ^1.0.3
     has-symbols: ^1.0.3
-    internal-slot: ^1.0.5
-    is-array-buffer: ^3.0.2
+    hasown: ^2.0.2
+    internal-slot: ^1.0.7
+    is-array-buffer: ^3.0.4
     is-callable: ^1.2.7
-    is-negative-zero: ^2.0.2
+    is-data-view: ^1.0.1
+    is-negative-zero: ^2.0.3
     is-regex: ^1.1.4
-    is-shared-array-buffer: ^1.0.2
+    is-shared-array-buffer: ^1.0.3
     is-string: ^1.0.7
-    is-typed-array: ^1.1.12
+    is-typed-array: ^1.1.13
     is-weakref: ^1.0.2
-    object-inspect: ^1.12.3
+    object-inspect: ^1.13.1
     object-keys: ^1.1.1
-    object.assign: ^4.1.4
-    regexp.prototype.flags: ^1.5.1
-    safe-array-concat: ^1.0.1
-    safe-regex-test: ^1.0.0
-    string.prototype.trim: ^1.2.8
-    string.prototype.trimend: ^1.0.7
-    string.prototype.trimstart: ^1.0.7
-    typed-array-buffer: ^1.0.0
-    typed-array-byte-length: ^1.0.0
-    typed-array-byte-offset: ^1.0.0
-    typed-array-length: ^1.0.4
+    object.assign: ^4.1.5
+    regexp.prototype.flags: ^1.5.2
+    safe-array-concat: ^1.1.2
+    safe-regex-test: ^1.0.3
+    string.prototype.trim: ^1.2.9
+    string.prototype.trimend: ^1.0.8
+    string.prototype.trimstart: ^1.0.8
+    typed-array-buffer: ^1.0.2
+    typed-array-byte-length: ^1.0.1
+    typed-array-byte-offset: ^1.0.2
+    typed-array-length: ^1.0.6
     unbox-primitive: ^1.0.2
-    which-typed-array: ^1.1.11
-  checksum: cc70e592d360d7d729859013dee7a610c6b27ed8630df0547c16b0d16d9fe6505a70ee14d1af08d970fdd132b3f88c9ca7815ce72c9011608abf8ab0e55fc515
+    which-typed-array: ^1.1.15
+  checksum: f840cf161224252512f9527306b57117192696571e07920f777cb893454e32999206198b4f075516112af6459daca282826d1735c450528470356d09eff3a9ae
   languageName: node
   linkType: hard
 
@@ -10628,6 +12127,61 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
+"es-define-property@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "es-define-property@npm:1.0.0"
+  dependencies:
+    get-intrinsic: ^1.2.4
+  checksum: f66ece0a887b6dca71848fa71f70461357c0e4e7249696f81bad0a1f347eed7b31262af4a29f5d726dc026426f085483b6b90301855e647aa8e21936f07293c6
+  languageName: node
+  linkType: hard
+
+"es-errors@npm:^1.2.1, es-errors@npm:^1.3.0":
+  version: 1.3.0
+  resolution: "es-errors@npm:1.3.0"
+  checksum: ec1414527a0ccacd7f15f4a3bc66e215f04f595ba23ca75cdae0927af099b5ec865f9f4d33e9d7e86f512f252876ac77d4281a7871531a50678132429b1271b5
+  languageName: node
+  linkType: hard
+
+"es-get-iterator@npm:^1.0.2":
+  version: 1.1.3
+  resolution: "es-get-iterator@npm:1.1.3"
+  dependencies:
+    call-bind: ^1.0.2
+    get-intrinsic: ^1.1.3
+    has-symbols: ^1.0.3
+    is-arguments: ^1.1.1
+    is-map: ^2.0.2
+    is-set: ^2.0.2
+    is-string: ^1.0.7
+    isarray: ^2.0.5
+    stop-iteration-iterator: ^1.0.0
+  checksum: 8fa118da42667a01a7c7529f8a8cca514feeff243feec1ce0bb73baaa3514560bd09d2b3438873cf8a5aaec5d52da248131de153b28e2638a061b6e4df13267d
+  languageName: node
+  linkType: hard
+
+"es-iterator-helpers@npm:^1.0.19":
+  version: 1.0.19
+  resolution: "es-iterator-helpers@npm:1.0.19"
+  dependencies:
+    call-bind: ^1.0.7
+    define-properties: ^1.2.1
+    es-abstract: ^1.23.3
+    es-errors: ^1.3.0
+    es-set-tostringtag: ^2.0.3
+    function-bind: ^1.1.2
+    get-intrinsic: ^1.2.4
+    globalthis: ^1.0.3
+    has-property-descriptors: ^1.0.2
+    has-proto: ^1.0.3
+    has-symbols: ^1.0.3
+    internal-slot: ^1.0.7
+    iterator.prototype: ^1.1.2
+    safe-array-concat: ^1.1.2
+  checksum: 7ae112b88359fbaf4b9d7d1d1358ae57c5138768c57ba3a8fb930393662653b0512bfd7917c15890d1471577fb012fee8b73b4465e59b331739e6ee94f961683
+  languageName: node
+  linkType: hard
+
 "es-module-lexer@npm:^1.2.1":
   version: 1.3.1
   resolution: "es-module-lexer@npm:1.3.1"
@@ -10635,14 +12189,32 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
-"es-set-tostringtag@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "es-set-tostringtag@npm:2.0.1"
+"es-object-atoms@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "es-object-atoms@npm:1.0.0"
   dependencies:
-    get-intrinsic: ^1.1.3
-    has: ^1.0.3
-    has-tostringtag: ^1.0.0
-  checksum: ec416a12948cefb4b2a5932e62093a7cf36ddc3efd58d6c58ca7ae7064475ace556434b869b0bbeb0c365f1032a8ccd577211101234b69837ad83ad204fff884
+    es-errors: ^1.3.0
+  checksum: 26f0ff78ab93b63394e8403c353842b2272836968de4eafe97656adfb8a7c84b9099bf0fe96ed58f4a4cddc860f6e34c77f91649a58a5daa4a9c40b902744e3c
+  languageName: node
+  linkType: hard
+
+"es-set-tostringtag@npm:^2.0.3":
+  version: 2.0.3
+  resolution: "es-set-tostringtag@npm:2.0.3"
+  dependencies:
+    get-intrinsic: ^1.2.4
+    has-tostringtag: ^1.0.2
+    hasown: ^2.0.1
+  checksum: 7227fa48a41c0ce83e0377b11130d324ac797390688135b8da5c28994c0165be8b252e15cd1de41e1325e5a5412511586960213e88f9ab4a5e7d028895db5129
+  languageName: node
+  linkType: hard
+
+"es-shim-unscopables@npm:^1.0.0, es-shim-unscopables@npm:^1.0.2":
+  version: 1.0.2
+  resolution: "es-shim-unscopables@npm:1.0.2"
+  dependencies:
+    hasown: ^2.0.0
+  checksum: 432bd527c62065da09ed1d37a3f8e623c423683285e6188108286f4a1e8e164a5bcbfbc0051557c7d14633cd2a41ce24c7048e6bbb66a985413fd32f1be72626
   languageName: node
   linkType: hard
 
@@ -10657,14 +12229,15 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
-"es5-ext@npm:^0.10.35, es5-ext@npm:^0.10.46, es5-ext@npm:^0.10.50, es5-ext@npm:^0.10.53, es5-ext@npm:^0.10.61, es5-ext@npm:~0.10.14, es5-ext@npm:~0.10.2, es5-ext@npm:~0.10.46":
-  version: 0.10.62
-  resolution: "es5-ext@npm:0.10.62"
+"es5-ext@npm:^0.10.35, es5-ext@npm:^0.10.46, es5-ext@npm:^0.10.50, es5-ext@npm:^0.10.53, es5-ext@npm:^0.10.61, es5-ext@npm:^0.10.62, es5-ext@npm:~0.10.14, es5-ext@npm:~0.10.2, es5-ext@npm:~0.10.46":
+  version: 0.10.64
+  resolution: "es5-ext@npm:0.10.64"
   dependencies:
     es6-iterator: ^2.0.3
     es6-symbol: ^3.1.3
+    esniff: ^2.0.1
     next-tick: ^1.1.0
-  checksum: 25f42f6068cfc6e393cf670bc5bba249132c5f5ec2dd0ed6e200e6274aca2fed8e9aec8a31c76031744c78ca283c57f0b41c7e737804c6328c7b8d3fbcba7983
+  checksum: 01179fab0769fdbef213062222f99d0346724dbaccf04b87c0e6ee7f0c97edabf14be647ca1321f0497425ea7145de0fd278d1b3f3478864b8933e7136a5c645
   languageName: node
   linkType: hard
 
@@ -10701,10 +12274,90 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
-"escalade@npm:^3.1.1":
-  version: 3.1.1
-  resolution: "escalade@npm:3.1.1"
-  checksum: a3e2a99f07acb74b3ad4989c48ca0c3140f69f923e56d0cba0526240ee470b91010f9d39001f2a4a313841d237ede70a729e92125191ba5d21e74b106800b133
+"esbuild@npm:^0.21.3":
+  version: 0.21.5
+  resolution: "esbuild@npm:0.21.5"
+  dependencies:
+    "@esbuild/aix-ppc64": 0.21.5
+    "@esbuild/android-arm": 0.21.5
+    "@esbuild/android-arm64": 0.21.5
+    "@esbuild/android-x64": 0.21.5
+    "@esbuild/darwin-arm64": 0.21.5
+    "@esbuild/darwin-x64": 0.21.5
+    "@esbuild/freebsd-arm64": 0.21.5
+    "@esbuild/freebsd-x64": 0.21.5
+    "@esbuild/linux-arm": 0.21.5
+    "@esbuild/linux-arm64": 0.21.5
+    "@esbuild/linux-ia32": 0.21.5
+    "@esbuild/linux-loong64": 0.21.5
+    "@esbuild/linux-mips64el": 0.21.5
+    "@esbuild/linux-ppc64": 0.21.5
+    "@esbuild/linux-riscv64": 0.21.5
+    "@esbuild/linux-s390x": 0.21.5
+    "@esbuild/linux-x64": 0.21.5
+    "@esbuild/netbsd-x64": 0.21.5
+    "@esbuild/openbsd-x64": 0.21.5
+    "@esbuild/sunos-x64": 0.21.5
+    "@esbuild/win32-arm64": 0.21.5
+    "@esbuild/win32-ia32": 0.21.5
+    "@esbuild/win32-x64": 0.21.5
+  dependenciesMeta:
+    "@esbuild/aix-ppc64":
+      optional: true
+    "@esbuild/android-arm":
+      optional: true
+    "@esbuild/android-arm64":
+      optional: true
+    "@esbuild/android-x64":
+      optional: true
+    "@esbuild/darwin-arm64":
+      optional: true
+    "@esbuild/darwin-x64":
+      optional: true
+    "@esbuild/freebsd-arm64":
+      optional: true
+    "@esbuild/freebsd-x64":
+      optional: true
+    "@esbuild/linux-arm":
+      optional: true
+    "@esbuild/linux-arm64":
+      optional: true
+    "@esbuild/linux-ia32":
+      optional: true
+    "@esbuild/linux-loong64":
+      optional: true
+    "@esbuild/linux-mips64el":
+      optional: true
+    "@esbuild/linux-ppc64":
+      optional: true
+    "@esbuild/linux-riscv64":
+      optional: true
+    "@esbuild/linux-s390x":
+      optional: true
+    "@esbuild/linux-x64":
+      optional: true
+    "@esbuild/netbsd-x64":
+      optional: true
+    "@esbuild/openbsd-x64":
+      optional: true
+    "@esbuild/sunos-x64":
+      optional: true
+    "@esbuild/win32-arm64":
+      optional: true
+    "@esbuild/win32-ia32":
+      optional: true
+    "@esbuild/win32-x64":
+      optional: true
+  bin:
+    esbuild: bin/esbuild
+  checksum: 2911c7b50b23a9df59a7d6d4cdd3a4f85855787f374dce751148dbb13305e0ce7e880dde1608c2ab7a927fc6cec3587b80995f7fc87a64b455f8b70b55fd8ec1
+  languageName: node
+  linkType: hard
+
+"escalade@npm:^3.1.1, escalade@npm:^3.1.2":
+  version: 3.1.2
+  resolution: "escalade@npm:3.1.2"
+  checksum: 1ec0977aa2772075493002bdbd549d595ff6e9393b1cb0d7d6fcaf78c750da0c158f180938365486f75cb69fba20294351caddfce1b46552a7b6c3cde52eaa02
   languageName: node
   linkType: hard
 
@@ -10750,7 +12403,7 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
-"escodegen@npm:^2.0.0":
+"escodegen@npm:^2.0.0, escodegen@npm:^2.1.0":
   version: 2.1.0
   resolution: "escodegen@npm:2.1.0"
   dependencies:
@@ -10851,6 +12504,34 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
+"eslint-plugin-react@npm:latest":
+  version: 7.35.0
+  resolution: "eslint-plugin-react@npm:7.35.0"
+  dependencies:
+    array-includes: ^3.1.8
+    array.prototype.findlast: ^1.2.5
+    array.prototype.flatmap: ^1.3.2
+    array.prototype.tosorted: ^1.1.4
+    doctrine: ^2.1.0
+    es-iterator-helpers: ^1.0.19
+    estraverse: ^5.3.0
+    hasown: ^2.0.2
+    jsx-ast-utils: ^2.4.1 || ^3.0.0
+    minimatch: ^3.1.2
+    object.entries: ^1.1.8
+    object.fromentries: ^2.0.8
+    object.values: ^1.2.0
+    prop-types: ^15.8.1
+    resolve: ^2.0.0-next.5
+    semver: ^6.3.1
+    string.prototype.matchall: ^4.0.11
+    string.prototype.repeat: ^1.0.0
+  peerDependencies:
+    eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8 || ^9.7
+  checksum: cd4d3c0567e947964643dda5fc80147e058d75f06bac47c3f086ff0cd6156286c669d98e685e3834997c4043f3922b90e6374b6c3658f22abd025dbd41acc23f
+  languageName: node
+  linkType: hard
+
 "eslint-plugin-yml@npm:^1.12.2":
   version: 1.12.2
   resolution: "eslint-plugin-yml@npm:1.12.2"
@@ -10956,6 +12637,18 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
+"esniff@npm:^2.0.1":
+  version: 2.0.1
+  resolution: "esniff@npm:2.0.1"
+  dependencies:
+    d: ^1.0.1
+    es5-ext: ^0.10.62
+    event-emitter: ^0.3.5
+    type: ^2.7.2
+  checksum: d814c0e5c39bce9925b2e65b6d8767af72c9b54f35a65f9f3d6e8c606dce9aebe35a9599d30f15b0807743f88689f445163cfb577a425de4fb8c3c5bc16710cc
+  languageName: node
+  linkType: hard
+
 "espree@npm:^9.6.0, espree@npm:^9.6.1":
   version: 9.6.1
   resolution: "espree@npm:9.6.1"
@@ -11002,7 +12695,7 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
-"estraverse@npm:^5.1.0, estraverse@npm:^5.2.0":
+"estraverse@npm:^5.1.0, estraverse@npm:^5.2.0, estraverse@npm:^5.3.0":
   version: 5.3.0
   resolution: "estraverse@npm:5.3.0"
   checksum: 072780882dc8416ad144f8fe199628d2b3e7bbc9989d9ed43795d2c90309a2047e6bc5979d7e2322a341163d22cfad9e21f4110597fe487519697389497e4e2b
@@ -11075,6 +12768,13 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
+"estree-walker@npm:^2.0.2":
+  version: 2.0.2
+  resolution: "estree-walker@npm:2.0.2"
+  checksum: 6151e6f9828abe2259e57f5fd3761335bb0d2ebd76dc1a01048ccee22fabcfef3c0859300f6d83ff0d1927849368775ec5a6d265dde2f6de5a1be1721cd94efc
+  languageName: node
+  linkType: hard
+
 "estree-walker@npm:^3.0.0":
   version: 3.0.3
   resolution: "estree-walker@npm:3.0.3"
@@ -11146,13 +12846,24 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
-"events@npm:^3.2.0, events@npm:^3.3.0":
+"events@npm:^3.0.0, events@npm:^3.2.0, events@npm:^3.3.0":
   version: 3.3.0
   resolution: "events@npm:3.3.0"
   checksum: f6f487ad2198aa41d878fa31452f1a3c00958f46e9019286ff4787c84aac329332ab45c9cdc8c445928fc6d7ded294b9e005a7fce9426488518017831b272780
   languageName: node
   linkType: hard
 
+"evp_bytestokey@npm:^1.0.0, evp_bytestokey@npm:^1.0.3":
+  version: 1.0.3
+  resolution: "evp_bytestokey@npm:1.0.3"
+  dependencies:
+    md5.js: ^1.3.4
+    node-gyp: latest
+    safe-buffer: ^5.1.1
+  checksum: ad4e1577f1a6b721c7800dcc7c733fe01f6c310732bb5bf2240245c2a5b45a38518b91d8be2c610611623160b9d1c0e91f1ce96d639f8b53e8894625cf20fa45
+  languageName: node
+  linkType: hard
+
 "execa@npm:5.0.0":
   version: 5.0.0
   resolution: "execa@npm:5.0.0"
@@ -11313,7 +13024,7 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
-"extract-zip@npm:2.0.1":
+"extract-zip@npm:^2.0.1":
   version: 2.0.1
   resolution: "extract-zip@npm:2.0.1"
   dependencies:
@@ -11365,6 +13076,13 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
+"fast-fifo@npm:^1.2.0, fast-fifo@npm:^1.3.2":
+  version: 1.3.2
+  resolution: "fast-fifo@npm:1.3.2"
+  checksum: 6bfcba3e4df5af7be3332703b69a7898a8ed7020837ec4395bb341bd96cc3a6d86c3f6071dd98da289618cf2234c70d84b2a6f09a33dd6f988b1ff60d8e54275
+  languageName: node
+  linkType: hard
+
 "fast-glob@npm:3.2.7":
   version: 3.2.7
   resolution: "fast-glob@npm:3.2.7"
@@ -11599,12 +13317,19 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
-"fill-range@npm:^7.0.1":
-  version: 7.0.1
-  resolution: "fill-range@npm:7.0.1"
+"fill-range@npm:^7.1.1":
+  version: 7.1.1
+  resolution: "fill-range@npm:7.1.1"
   dependencies:
     to-regex-range: ^5.0.1
-  checksum: cc283f4e65b504259e64fd969bcf4def4eb08d85565e906b7d36516e87819db52029a76b6363d0f02d0d532f0033c9603b9e2d943d56ee3b0d4f7ad3328ff917
+  checksum: b4abfbca3839a3d55e4ae5ec62e131e2e356bf4859ce8480c64c4876100f4df292a63e5bb1618e1d7460282ca2b305653064f01654474aa35c68000980f17798
+  languageName: node
+  linkType: hard
+
+"filter-obj@npm:^1.1.0":
+  version: 1.1.0
+  resolution: "filter-obj@npm:1.1.0"
+  checksum: cf2104a7c45ff48e7f505b78a3991c8f7f30f28bd8106ef582721f321f1c6277f7751aacd5d83026cb079d9d5091082f588d14a72e7c5d720ece79118fa61e10
   languageName: node
   linkType: hard
 
@@ -11723,12 +13448,12 @@ asn1@evs-broadcast/node-asn1:
   linkType: hard
 
 "follow-redirects@npm:^1.0.0, follow-redirects@npm:^1.14.0, follow-redirects@npm:^1.15.4":
-  version: 1.15.5
-  resolution: "follow-redirects@npm:1.15.5"
+  version: 1.15.6
+  resolution: "follow-redirects@npm:1.15.6"
   peerDependenciesMeta:
     debug:
       optional: true
-  checksum: 5ca49b5ce6f44338cbfc3546823357e7a70813cecc9b7b768158a1d32c1e62e7407c944402a918ea8c38ae2e78266312d617dc68783fac502cbb55e1047b34ec
+  checksum: a62c378dfc8c00f60b9c80cab158ba54e99ba0239a5dd7c81245e5a5b39d10f0c35e249c3379eae719ff0285fff88c365dd446fab19dee771f1d76252df1bbf5
   languageName: node
   linkType: hard
 
@@ -11901,7 +13626,7 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
-"fs-extra@npm:^11.1.0, fs-extra@npm:^11.1.1":
+"fs-extra@npm:^11.1.0, fs-extra@npm:^11.1.1, fs-extra@npm:^11.2.0":
   version: 11.2.0
   resolution: "fs-extra@npm:11.2.0"
   dependencies:
@@ -11967,7 +13692,7 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
-"fsevents@npm:^2.3.2, fsevents@npm:~2.3.2":
+"fsevents@npm:^2.3.2, fsevents@npm:~2.3.2, fsevents@npm:~2.3.3":
   version: 2.3.3
   resolution: "fsevents@npm:2.3.3"
   dependencies:
@@ -11977,7 +13702,7 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
-"fsevents@patch:fsevents@^2.3.2#~builtin<compat/fsevents>, fsevents@patch:fsevents@~2.3.2#~builtin<compat/fsevents>":
+"fsevents@patch:fsevents@^2.3.2#~builtin<compat/fsevents>, fsevents@patch:fsevents@~2.3.2#~builtin<compat/fsevents>, fsevents@patch:fsevents@~2.3.3#~builtin<compat/fsevents>":
   version: 2.3.3
   resolution: "fsevents@patch:fsevents@npm%3A2.3.3#~builtin<compat/fsevents>::version=2.3.3&hash=df0bf1"
   dependencies:
@@ -11986,14 +13711,14 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
-"function-bind@npm:^1.1.1":
-  version: 1.1.1
-  resolution: "function-bind@npm:1.1.1"
-  checksum: b32fbaebb3f8ec4969f033073b43f5c8befbb58f1a79e12f1d7490358150359ebd92f49e72ff0144f65f2c48ea2a605bff2d07965f548f6474fd8efd95bf361a
+"function-bind@npm:^1.1.1, function-bind@npm:^1.1.2":
+  version: 1.1.2
+  resolution: "function-bind@npm:1.1.2"
+  checksum: 2b0ff4ce708d99715ad14a6d1f894e2a83242e4a52ccfcefaee5e40050562e5f6dafc1adbb4ce2d4ab47279a45dc736ab91ea5042d843c3c092820dfe032efb1
   languageName: node
   linkType: hard
 
-"function.prototype.name@npm:^1.1.6":
+"function.prototype.name@npm:^1.1.5, function.prototype.name@npm:^1.1.6":
   version: 1.1.6
   resolution: "function.prototype.name@npm:1.1.6"
   dependencies:
@@ -12058,15 +13783,16 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
-"get-intrinsic@npm:^1.0.2, get-intrinsic@npm:^1.1.1, get-intrinsic@npm:^1.1.3, get-intrinsic@npm:^1.2.0, get-intrinsic@npm:^1.2.1":
-  version: 1.2.1
-  resolution: "get-intrinsic@npm:1.2.1"
+"get-intrinsic@npm:^1.1.3, get-intrinsic@npm:^1.2.1, get-intrinsic@npm:^1.2.3, get-intrinsic@npm:^1.2.4":
+  version: 1.2.4
+  resolution: "get-intrinsic@npm:1.2.4"
   dependencies:
-    function-bind: ^1.1.1
-    has: ^1.0.3
+    es-errors: ^1.3.0
+    function-bind: ^1.1.2
     has-proto: ^1.0.1
     has-symbols: ^1.0.3
-  checksum: 5b61d88552c24b0cf6fa2d1b3bc5459d7306f699de060d76442cce49a4721f52b8c560a33ab392cf5575b7810277d54ded9d4d39a1ea61855619ebc005aa7e5f
+    hasown: ^2.0.0
+  checksum: 414e3cdf2c203d1b9d7d33111df746a4512a1aa622770b361dadddf8ed0b5aeb26c560f49ca077e24bfafb0acb55ca908d1f709216ccba33ffc548ec8a79a951
   languageName: node
   linkType: hard
 
@@ -12142,13 +13868,26 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
-"get-symbol-description@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "get-symbol-description@npm:1.0.0"
+"get-symbol-description@npm:^1.0.2":
+  version: 1.0.2
+  resolution: "get-symbol-description@npm:1.0.2"
   dependencies:
-    call-bind: ^1.0.2
-    get-intrinsic: ^1.1.1
-  checksum: 9ceff8fe968f9270a37a1f73bf3f1f7bda69ca80f4f80850670e0e7b9444ff99323f7ac52f96567f8b5f5fbe7ac717a0d81d3407c7313e82810c6199446a5247
+    call-bind: ^1.0.5
+    es-errors: ^1.3.0
+    get-intrinsic: ^1.2.4
+  checksum: e1cb53bc211f9dbe9691a4f97a46837a553c4e7caadd0488dc24ac694db8a390b93edd412b48dcdd0b4bbb4c595de1709effc75fc87c0839deedc6968f5bd973
+  languageName: node
+  linkType: hard
+
+"get-uri@npm:^6.0.1":
+  version: 6.0.3
+  resolution: "get-uri@npm:6.0.3"
+  dependencies:
+    basic-ftp: ^5.0.2
+    data-uri-to-buffer: ^6.0.2
+    debug: ^4.3.4
+    fs-extra: ^11.2.0
+  checksum: 3eda448a59fa1ba82ad4f252e58490fec586b644f2dc9c98ba3ab20e801ecc8a1bc1784829c474c9d188edb633d4dfd81c33894ca6117a33a16e8e013b41b40f
   languageName: node
   linkType: hard
 
@@ -12409,6 +14148,13 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
+"globrex@npm:^0.1.2":
+  version: 0.1.2
+  resolution: "globrex@npm:0.1.2"
+  checksum: adca162494a176ce9ecf4dd232f7b802956bb1966b37f60c15e49d2e7d961b66c60826366dc2649093cad5a0d69970cfa8875bd1695b5a1a2f33dcd2aa88da3c
+  languageName: node
+  linkType: hard
+
 "gopd@npm:^1.0.1":
   version: 1.0.1
   resolution: "gopd@npm:1.0.1"
@@ -12489,6 +14235,13 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
+"gud@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "gud@npm:1.0.0"
+  checksum: 3e2eb37cf794364077c18f036d6aa259c821c7fd188f2b7935cb00d589d82a41e0ebb1be809e1a93679417f62f1ad0513e745c3cf5329596e489aef8c5e5feae
+  languageName: node
+  linkType: hard
+
 "gzip-size@npm:^6.0.0":
   version: 6.0.0
   resolution: "gzip-size@npm:6.0.0"
@@ -12551,19 +14304,19 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
-"has-property-descriptors@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "has-property-descriptors@npm:1.0.0"
+"has-property-descriptors@npm:^1.0.0, has-property-descriptors@npm:^1.0.2":
+  version: 1.0.2
+  resolution: "has-property-descriptors@npm:1.0.2"
   dependencies:
-    get-intrinsic: ^1.1.1
-  checksum: a6d3f0a266d0294d972e354782e872e2fe1b6495b321e6ef678c9b7a06a40408a6891817350c62e752adced73a94ac903c54734fee05bf65b1905ee1368194bb
+    es-define-property: ^1.0.0
+  checksum: fcbb246ea2838058be39887935231c6d5788babed499d0e9d0cc5737494c48aba4fe17ba1449e0d0fbbb1e36175442faa37f9c427ae357d6ccb1d895fbcd3de3
   languageName: node
   linkType: hard
 
-"has-proto@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "has-proto@npm:1.0.1"
-  checksum: febc5b5b531de8022806ad7407935e2135f1cc9e64636c3916c6842bd7995994ca3b29871ecd7954bd35f9e2986c17b3b227880484d22259e2f8e6ce63fd383e
+"has-proto@npm:^1.0.1, has-proto@npm:^1.0.3":
+  version: 1.0.3
+  resolution: "has-proto@npm:1.0.3"
+  checksum: fe7c3d50b33f50f3933a04413ed1f69441d21d2d2944f81036276d30635cad9279f6b43bc8f32036c31ebdfcf6e731150f46c1907ad90c669ffe9b066c3ba5c4
   languageName: node
   linkType: hard
 
@@ -12574,12 +14327,12 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
-"has-tostringtag@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "has-tostringtag@npm:1.0.0"
+"has-tostringtag@npm:^1.0.0, has-tostringtag@npm:^1.0.2":
+  version: 1.0.2
+  resolution: "has-tostringtag@npm:1.0.2"
   dependencies:
-    has-symbols: ^1.0.2
-  checksum: cc12eb28cb6ae22369ebaad3a8ab0799ed61270991be88f208d508076a1e99abe4198c965935ce85ea90b60c94ddda73693b0920b58e7ead048b4a391b502c1c
+    has-symbols: ^1.0.3
+  checksum: 999d60bb753ad714356b2c6c87b7fb74f32463b8426e159397da4bde5bca7e598ab1073f4d8d4deafac297f2eb311484cd177af242776bf05f0d11565680468d
   languageName: node
   linkType: hard
 
@@ -12606,6 +14359,46 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
+"hash-base@npm:^3.0.0":
+  version: 3.1.0
+  resolution: "hash-base@npm:3.1.0"
+  dependencies:
+    inherits: ^2.0.4
+    readable-stream: ^3.6.0
+    safe-buffer: ^5.2.0
+  checksum: 26b7e97ac3de13cb23fc3145e7e3450b0530274a9562144fc2bf5c1e2983afd0e09ed7cc3b20974ba66039fad316db463da80eb452e7373e780cbee9a0d2f2dc
+  languageName: node
+  linkType: hard
+
+"hash-base@npm:~3.0":
+  version: 3.0.4
+  resolution: "hash-base@npm:3.0.4"
+  dependencies:
+    inherits: ^2.0.1
+    safe-buffer: ^5.0.1
+  checksum: 878465a0dfcc33cce195c2804135352c590d6d10980adc91a9005fd377e77f2011256c2b7cfce472e3f2e92d561d1bf3228d2da06348a9017ce9a258b3b49764
+  languageName: node
+  linkType: hard
+
+"hash.js@npm:^1.0.0, hash.js@npm:^1.0.3":
+  version: 1.1.7
+  resolution: "hash.js@npm:1.1.7"
+  dependencies:
+    inherits: ^2.0.3
+    minimalistic-assert: ^1.0.1
+  checksum: e350096e659c62422b85fa508e4b3669017311aa4c49b74f19f8e1bc7f3a54a584fdfd45326d4964d6011f2b2d882e38bea775a96046f2a61b7779a979629d8f
+  languageName: node
+  linkType: hard
+
+"hasown@npm:^2.0.0, hasown@npm:^2.0.1, hasown@npm:^2.0.2":
+  version: 2.0.2
+  resolution: "hasown@npm:2.0.2"
+  dependencies:
+    function-bind: ^1.1.2
+  checksum: e8516f776a15149ca6c6ed2ae3110c417a00b62260e222590e54aa367cbcd6ed99122020b37b7fbdf05748df57b265e70095d7bf35a47660587619b15ffb93db
+  languageName: node
+  linkType: hard
+
 "hast-util-from-parse5@npm:^8.0.0":
   version: 8.0.1
   resolution: "hast-util-from-parse5@npm:8.0.1"
@@ -12766,7 +14559,18 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
-"hoist-non-react-statics@npm:^3.1.0":
+"hmac-drbg@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "hmac-drbg@npm:1.0.1"
+  dependencies:
+    hash.js: ^1.0.3
+    minimalistic-assert: ^1.0.0
+    minimalistic-crypto-utils: ^1.0.1
+  checksum: bd30b6a68d7f22d63f10e1888aee497d7c2c5c0bb469e66bbdac99f143904d1dfe95f8131f95b3e86c86dd239963c9d972fcbe147e7cffa00e55d18585c43fe0
+  languageName: node
+  linkType: hard
+
+"hoist-non-react-statics@npm:^3.1.0, hoist-non-react-statics@npm:^3.3.2":
   version: 3.3.2
   resolution: "hoist-non-react-statics@npm:3.3.2"
   dependencies:
@@ -12846,6 +14650,15 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
+"html-encoding-sniffer@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "html-encoding-sniffer@npm:3.0.0"
+  dependencies:
+    whatwg-encoding: ^2.0.0
+  checksum: 8d806aa00487e279e5ccb573366a951a9f68f65c90298eac9c3a2b440a7ffe46615aff2995a2f61c6746c639234e6179a97e18ca5ccbbf93d3725ef2099a4502
+  languageName: node
+  linkType: hard
+
 "html-entities@npm:^2.3.2":
   version: 2.4.0
   resolution: "html-entities@npm:2.4.0"
@@ -12894,6 +14707,15 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
+"html-parse-stringify@npm:^3.0.1":
+  version: 3.0.1
+  resolution: "html-parse-stringify@npm:3.0.1"
+  dependencies:
+    void-elements: 3.1.0
+  checksum: 334fdebd4b5c355dba8e95284cead6f62bf865a2359da2759b039db58c805646350016d2017875718bc3c4b9bf81a0d11be5ee0cf4774a3a5a7b97cde21cfd67
+  languageName: node
+  linkType: hard
+
 "html-tags@npm:^3.3.1":
   version: 3.3.1
   resolution: "html-tags@npm:3.3.1"
@@ -13030,6 +14852,16 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
+"http-proxy-agent@npm:^7.0.0, http-proxy-agent@npm:^7.0.1":
+  version: 7.0.2
+  resolution: "http-proxy-agent@npm:7.0.2"
+  dependencies:
+    agent-base: ^7.1.0
+    debug: ^4.3.4
+  checksum: 670858c8f8f3146db5889e1fa117630910101db601fff7d5a8aa637da0abedf68c899f03d3451cac2f83bcc4c3d2dabf339b3aa00ff8080571cceb02c3ce02f3
+  languageName: node
+  linkType: hard
+
 "http-proxy-middleware@npm:^2.0.3":
   version: 2.0.6
   resolution: "http-proxy-middleware@npm:2.0.6"
@@ -13079,7 +14911,14 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
-"https-proxy-agent@npm:5.0.1, https-proxy-agent@npm:^5.0.0":
+"https-browserify@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "https-browserify@npm:1.0.0"
+  checksum: 09b35353e42069fde2435760d13f8a3fb7dd9105e358270e2e225b8a94f811b461edd17cb57594e5f36ec1218f121c160ddceeec6e8be2d55e01dcbbbed8cbae
+  languageName: node
+  linkType: hard
+
+"https-proxy-agent@npm:^5.0.0, https-proxy-agent@npm:^5.0.1":
   version: 5.0.1
   resolution: "https-proxy-agent@npm:5.0.1"
   dependencies:
@@ -13089,6 +14928,16 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
+"https-proxy-agent@npm:^7.0.3, https-proxy-agent@npm:^7.0.5":
+  version: 7.0.5
+  resolution: "https-proxy-agent@npm:7.0.5"
+  dependencies:
+    agent-base: ^7.0.2
+    debug: 4
+  checksum: 2e1a28960f13b041a50702ee74f240add8e75146a5c37fc98f1960f0496710f6918b3a9fe1e5aba41e50f58e6df48d107edd9c405c5f0d73ac260dabf2210857
+  languageName: node
+  linkType: hard
+
 "human-signals@npm:^2.1.0":
   version: 2.1.0
   resolution: "human-signals@npm:2.1.0"
@@ -13121,13 +14970,31 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
-"hyperdeck-connection@npm:2.0.0":
-  version: 2.0.0
-  resolution: "hyperdeck-connection@npm:2.0.0"
+"hyperdeck-connection@npm:2.0.1":
+  version: 2.0.1
+  resolution: "hyperdeck-connection@npm:2.0.1"
   dependencies:
     eventemitter3: ^4.0.7
     tslib: ^2.6.2
-  checksum: 86fd42d64771b9ce58eb4c542cd7f12ee3ab932ff97bc114840c52c09c3052a431f896b8b5900be2c2f2419182e50ab080bcb60a141285d9de2ba52fce4c8d61
+  checksum: 028f60498fa48c98a2cc0297c0f8af54e2f67c916f6796c64cb59c667a73e2bc314e1342b88ee234289e6085e10ac2886e81b0e5d2334a7e67d6c0d373fbcc88
+  languageName: node
+  linkType: hard
+
+"i18next-browser-languagedetector@npm:^6.1.8":
+  version: 6.1.8
+  resolution: "i18next-browser-languagedetector@npm:6.1.8"
+  dependencies:
+    "@babel/runtime": ^7.19.0
+  checksum: dd84d3c9cb693a70662436b06f5554898815df33b7641249a64876c74c38960f11ef17b4d7f49ee2da7262abe0f3ae73abe7f3a3b435a344d0d07e4ca7cb24c6
+  languageName: node
+  linkType: hard
+
+"i18next-http-backend@npm:^1.4.5":
+  version: 1.4.5
+  resolution: "i18next-http-backend@npm:1.4.5"
+  dependencies:
+    cross-fetch: 3.1.5
+  checksum: 1978a9d7970cc711e96133553e5f3815cf16c3e2f8db7982036f8c913c5a64eb20953e85e0ab48a88ad3c754f51184b67a778655ed65aeaae46430cdc1f673da
   languageName: node
   linkType: hard
 
@@ -13149,7 +15016,7 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
-"iconv-lite@npm:0.6, iconv-lite@npm:^0.6.2, iconv-lite@npm:^0.6.3":
+"iconv-lite@npm:0.6, iconv-lite@npm:0.6.3, iconv-lite@npm:^0.6.2, iconv-lite@npm:^0.6.3":
   version: 0.6.3
   resolution: "iconv-lite@npm:0.6.3"
   dependencies:
@@ -13238,6 +15105,20 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
+"immutability-helper@npm:^3.1.1":
+  version: 3.1.1
+  resolution: "immutability-helper@npm:3.1.1"
+  checksum: 6fdbf6d2123efa567263e904bbaff07aca0e24560d270d34967b03aab8ec20bd3e4057f394d59e50eb6c4718c9415591a6281692bb0aafd522ad72cf4887133f
+  languageName: node
+  linkType: hard
+
+"immutable@npm:^4.0.0":
+  version: 4.3.7
+  resolution: "immutable@npm:4.3.7"
+  checksum: 1c50eb053bb300796551604afff554066f041aa8e15926cf98f6d11d9736b62ad12531c06515dd96375258653878b4736f8051cd20b640f5f976d09fa640e3ec
+  languageName: node
+  linkType: hard
+
 "import-fresh@npm:^3.1.0, import-fresh@npm:^3.2.1, import-fresh@npm:^3.3.0":
   version: 3.3.0
   resolution: "import-fresh@npm:3.3.0"
@@ -13331,7 +15212,7 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
-"inherits@npm:2, inherits@npm:2.0.4, inherits@npm:^2.0.1, inherits@npm:^2.0.3, inherits@npm:^2.0.4, inherits@npm:~2.0.1, inherits@npm:~2.0.3":
+"inherits@npm:2, inherits@npm:2.0.4, inherits@npm:^2.0.1, inherits@npm:^2.0.3, inherits@npm:^2.0.4, inherits@npm:~2.0.1, inherits@npm:~2.0.3, inherits@npm:~2.0.4":
   version: 2.0.4
   resolution: "inherits@npm:2.0.4"
   checksum: 4a48a733847879d6cf6691860a6b1e3f0f4754176e4d71494c41f3475553768b10f84b5ce1d40fbd0e34e6bfbb864ee35858ad4dd2cf31e02fc4a154b724d7f1
@@ -13434,14 +15315,14 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
-"internal-slot@npm:^1.0.5":
-  version: 1.0.5
-  resolution: "internal-slot@npm:1.0.5"
+"internal-slot@npm:^1.0.4, internal-slot@npm:^1.0.7":
+  version: 1.0.7
+  resolution: "internal-slot@npm:1.0.7"
   dependencies:
-    get-intrinsic: ^1.2.0
-    has: ^1.0.3
+    es-errors: ^1.3.0
+    hasown: ^2.0.0
     side-channel: ^1.0.4
-  checksum: 97e84046bf9e7574d0956bd98d7162313ce7057883b6db6c5c7b5e5f05688864b0978ba07610c726d15d66544ffe4b1050107d93f8a39ebc59b15d8b429b497a
+  checksum: cadc5eea5d7d9bc2342e93aae9f31f04c196afebb11bde97448327049f492cd7081e18623ae71388aac9cd237b692ca3a105be9c68ac39c1dec679d7409e33eb
   languageName: node
   linkType: hard
 
@@ -13466,7 +15347,7 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
-"invariant@npm:^2.2.4":
+"invariant@npm:^2.2.4, invariant@npm:~2.2.2":
   version: 2.2.4
   resolution: "invariant@npm:2.2.4"
   dependencies:
@@ -13475,10 +15356,13 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
-"ip@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "ip@npm:2.0.0"
-  checksum: cfcfac6b873b701996d71ec82a7dd27ba92450afdb421e356f44044ed688df04567344c36cbacea7d01b1c39a4c732dc012570ebe9bebfb06f27314bca625349
+"ip-address@npm:^9.0.5":
+  version: 9.0.5
+  resolution: "ip-address@npm:9.0.5"
+  dependencies:
+    jsbn: 1.1.0
+    sprintf-js: ^1.1.3
+  checksum: aa15f12cfd0ef5e38349744e3654bae649a34c3b10c77a674a167e99925d1549486c5b14730eebce9fea26f6db9d5e42097b00aa4f9f612e68c79121c71652dc
   languageName: node
   linkType: hard
 
@@ -13513,14 +15397,23 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
-"is-array-buffer@npm:^3.0.1, is-array-buffer@npm:^3.0.2":
-  version: 3.0.2
-  resolution: "is-array-buffer@npm:3.0.2"
+"is-arguments@npm:^1.0.4, is-arguments@npm:^1.1.1":
+  version: 1.1.1
+  resolution: "is-arguments@npm:1.1.1"
+  dependencies:
+    call-bind: ^1.0.2
+    has-tostringtag: ^1.0.0
+  checksum: 7f02700ec2171b691ef3e4d0e3e6c0ba408e8434368504bb593d0d7c891c0dbfda6d19d30808b904a6cb1929bca648c061ba438c39f296c2a8ca083229c49f27
+  languageName: node
+  linkType: hard
+
+"is-array-buffer@npm:^3.0.4":
+  version: 3.0.4
+  resolution: "is-array-buffer@npm:3.0.4"
   dependencies:
     call-bind: ^1.0.2
-    get-intrinsic: ^1.2.0
-    is-typed-array: ^1.1.10
-  checksum: dcac9dda66ff17df9cabdc58214172bf41082f956eab30bb0d86bc0fab1e44b690fc8e1f855cf2481245caf4e8a5a006a982a71ddccec84032ed41f9d8da8c14
+    get-intrinsic: ^1.2.1
+  checksum: e4e3e6ef0ff2239e75371d221f74bc3c26a03564a22efb39f6bb02609b598917ddeecef4e8c877df2a25888f247a98198959842a5e73236bc7f22cabdf6351a7
   languageName: node
   linkType: hard
 
@@ -13538,6 +15431,15 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
+"is-async-function@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "is-async-function@npm:2.0.0"
+  dependencies:
+    has-tostringtag: ^1.0.0
+  checksum: e3471d95e6c014bf37cad8a93f2f4b6aac962178e0a5041e8903147166964fdc1c5c1d2ef87e86d77322c370ca18f2ea004fa7420581fa747bcaf7c223069dbd
+  languageName: node
+  linkType: hard
+
 "is-bigint@npm:^1.0.1":
   version: 1.0.4
   resolution: "is-bigint@npm:1.0.4"
@@ -13604,7 +15506,16 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
-"is-date-object@npm:^1.0.1":
+"is-data-view@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "is-data-view@npm:1.0.1"
+  dependencies:
+    is-typed-array: ^1.1.13
+  checksum: 4ba4562ac2b2ec005fefe48269d6bd0152785458cd253c746154ffb8a8ab506a29d0cfb3b74af87513843776a88e4981ae25c89457bf640a33748eab1a7216b5
+  languageName: node
+  linkType: hard
+
+"is-date-object@npm:^1.0.1, is-date-object@npm:^1.0.5":
   version: 1.0.5
   resolution: "is-date-object@npm:1.0.5"
   dependencies:
@@ -13652,6 +15563,15 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
+"is-finalizationregistry@npm:^1.0.2":
+  version: 1.0.2
+  resolution: "is-finalizationregistry@npm:1.0.2"
+  dependencies:
+    call-bind: ^1.0.2
+  checksum: 4f243a8e06228cd45bdab8608d2cb7abfc20f6f0189c8ac21ea8d603f1f196eabd531ce0bb8e08cbab047e9845ef2c191a3761c9a17ad5cabf8b35499c4ad35d
+  languageName: node
+  linkType: hard
+
 "is-finite@npm:^1.0.0":
   version: 1.1.0
   resolution: "is-finite@npm:1.1.0"
@@ -13680,6 +15600,15 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
+"is-generator-function@npm:^1.0.10, is-generator-function@npm:^1.0.7":
+  version: 1.0.10
+  resolution: "is-generator-function@npm:1.0.10"
+  dependencies:
+    has-tostringtag: ^1.0.0
+  checksum: d54644e7dbaccef15ceb1e5d91d680eb5068c9ee9f9eb0a9e04173eb5542c9b51b5ab52c5537f5703e48d5fddfd376817c1ca07a84a407b7115b769d4bdde72b
+  languageName: node
+  linkType: hard
+
 "is-glob@npm:^4.0.0, is-glob@npm:^4.0.1, is-glob@npm:^4.0.3, is-glob@npm:~4.0.1":
   version: 4.0.3
   resolution: "is-glob@npm:4.0.3"
@@ -13740,6 +15669,23 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
+"is-map@npm:^2.0.2, is-map@npm:^2.0.3":
+  version: 2.0.3
+  resolution: "is-map@npm:2.0.3"
+  checksum: e6ce5f6380f32b141b3153e6ba9074892bbbbd655e92e7ba5ff195239777e767a976dcd4e22f864accaf30e53ebf961ab1995424aef91af68788f0591b7396cc
+  languageName: node
+  linkType: hard
+
+"is-nan@npm:^1.3.2":
+  version: 1.3.2
+  resolution: "is-nan@npm:1.3.2"
+  dependencies:
+    call-bind: ^1.0.0
+    define-properties: ^1.1.3
+  checksum: 5dfadcef6ad12d3029d43643d9800adbba21cf3ce2ec849f734b0e14ee8da4070d82b15fdb35138716d02587c6578225b9a22779cab34888a139cc43e4e3610a
+  languageName: node
+  linkType: hard
+
 "is-native@npm:^1.0.1":
   version: 1.0.1
   resolution: "is-native@npm:1.0.1"
@@ -13750,10 +15696,10 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
-"is-negative-zero@npm:^2.0.2":
-  version: 2.0.2
-  resolution: "is-negative-zero@npm:2.0.2"
-  checksum: f3232194c47a549da60c3d509c9a09be442507616b69454716692e37ae9f37c4dea264fb208ad0c9f3efd15a796a46b79df07c7e53c6227c32170608b809149a
+"is-negative-zero@npm:^2.0.3":
+  version: 2.0.3
+  resolution: "is-negative-zero@npm:2.0.3"
+  checksum: c1e6b23d2070c0539d7b36022d5a94407132411d01aba39ec549af824231f3804b1aea90b5e4e58e807a65d23ceb538ed6e355ce76b267bdd86edb757ffcbdcd
   languageName: node
   linkType: hard
 
@@ -13906,12 +15852,19 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
-"is-shared-array-buffer@npm:^1.0.2":
-  version: 1.0.2
-  resolution: "is-shared-array-buffer@npm:1.0.2"
+"is-set@npm:^2.0.2, is-set@npm:^2.0.3":
+  version: 2.0.3
+  resolution: "is-set@npm:2.0.3"
+  checksum: 36e3f8c44bdbe9496c9689762cc4110f6a6a12b767c5d74c0398176aa2678d4467e3bf07595556f2dba897751bde1422480212b97d973c7b08a343100b0c0dfe
+  languageName: node
+  linkType: hard
+
+"is-shared-array-buffer@npm:^1.0.2, is-shared-array-buffer@npm:^1.0.3":
+  version: 1.0.3
+  resolution: "is-shared-array-buffer@npm:1.0.3"
   dependencies:
-    call-bind: ^1.0.2
-  checksum: 9508929cf14fdc1afc9d61d723c6e8d34f5e117f0bffda4d97e7a5d88c3a8681f633a74f8e3ad1fe92d5113f9b921dc5ca44356492079612f9a247efbce7032a
+    call-bind: ^1.0.7
+  checksum: a4fff602c309e64ccaa83b859255a43bb011145a42d3f56f67d9268b55bc7e6d98a5981a1d834186ad3105d6739d21547083fe7259c76c0468483fc538e716d8
   languageName: node
   linkType: hard
 
@@ -13972,12 +15925,12 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
-"is-typed-array@npm:^1.1.10, is-typed-array@npm:^1.1.12, is-typed-array@npm:^1.1.9":
-  version: 1.1.12
-  resolution: "is-typed-array@npm:1.1.12"
+"is-typed-array@npm:^1.1.13, is-typed-array@npm:^1.1.3":
+  version: 1.1.13
+  resolution: "is-typed-array@npm:1.1.13"
   dependencies:
-    which-typed-array: ^1.1.11
-  checksum: 4c89c4a3be07186caddadf92197b17fda663a9d259ea0d44a85f171558270d36059d1c386d34a12cba22dfade5aba497ce22778e866adc9406098c8fc4771796
+    which-typed-array: ^1.1.14
+  checksum: 150f9ada183a61554c91e1c4290086d2c100b0dff45f60b028519be72a8db964da403c48760723bf5253979b8dffe7b544246e0e5351dcd05c5fdb1dcc1dc0f0
   languageName: node
   linkType: hard
 
@@ -13995,6 +15948,13 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
+"is-weakmap@npm:^2.0.2":
+  version: 2.0.2
+  resolution: "is-weakmap@npm:2.0.2"
+  checksum: f36aef758b46990e0d3c37269619c0a08c5b29428c0bb11ecba7f75203442d6c7801239c2f31314bc79199217ef08263787f3837d9e22610ad1da62970d6616d
+  languageName: node
+  linkType: hard
+
 "is-weakref@npm:^1.0.2":
   version: 1.0.2
   resolution: "is-weakref@npm:1.0.2"
@@ -14004,6 +15964,16 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
+"is-weakset@npm:^2.0.3":
+  version: 2.0.3
+  resolution: "is-weakset@npm:2.0.3"
+  dependencies:
+    call-bind: ^1.0.7
+    get-intrinsic: ^1.2.4
+  checksum: 8b6a20ee9f844613ff8f10962cfee49d981d584525f2357fee0a04dfbcde9fd607ed60cb6dab626dbcc470018ae6392e1ff74c0c1aced2d487271411ad9d85ae
+  languageName: node
+  linkType: hard
+
 "is-wsl@npm:^2.2.0":
   version: 2.2.0
   resolution: "is-wsl@npm:2.2.0"
@@ -14066,6 +16036,13 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
+"isomorphic-timers-promises@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "isomorphic-timers-promises@npm:1.0.1"
+  checksum: 16ef59f0fbcceba1a037c74b5f7195d252ae058724ccd3e53b37ad034e8498f5532084e8ab18e7940ba3fa8fca2f21403d00eed15802ab1f7cab7c099cba62a8
+  languageName: node
+  linkType: hard
+
 "isomorphic-ws@npm:^5.0.0":
   version: 5.0.0
   resolution: "isomorphic-ws@npm:5.0.0"
@@ -14147,6 +16124,36 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
+"iterate-iterator@npm:^1.0.1":
+  version: 1.0.2
+  resolution: "iterate-iterator@npm:1.0.2"
+  checksum: 97b3ed4f2bebe038be57d03277879e406b2c537ceeeab7f82d4167f9a3cff872cc2cc5da3dc9920ff544ca247329d2a4d44121bb8ef8d0807a72176bdbc17c84
+  languageName: node
+  linkType: hard
+
+"iterate-value@npm:^1.0.2":
+  version: 1.0.2
+  resolution: "iterate-value@npm:1.0.2"
+  dependencies:
+    es-get-iterator: ^1.0.2
+    iterate-iterator: ^1.0.1
+  checksum: 446a4181657df1872e5020713206806757157db6ab375dee05eb4565b66e1244d7a99cd36ce06862261ad4bd059e66ba8192f62b5d1ff41d788c3b61953af6c3
+  languageName: node
+  linkType: hard
+
+"iterator.prototype@npm:^1.1.2":
+  version: 1.1.2
+  resolution: "iterator.prototype@npm:1.1.2"
+  dependencies:
+    define-properties: ^1.2.1
+    get-intrinsic: ^1.2.1
+    has-symbols: ^1.0.3
+    reflect.getprototypeof: ^1.0.4
+    set-function-name: ^2.0.1
+  checksum: d8a507e2ccdc2ce762e8a1d3f4438c5669160ac72b88b648e59a688eec6bc4e64b22338e74000518418d9e693faf2a092d2af21b9ec7dbf7763b037a54701168
+  languageName: node
+  linkType: hard
+
 "jackspeak@npm:^2.0.3":
   version: 2.3.3
   resolution: "jackspeak@npm:2.3.3"
@@ -14311,6 +16318,27 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
+"jest-environment-jsdom@npm:^29.7.0":
+  version: 29.7.0
+  resolution: "jest-environment-jsdom@npm:29.7.0"
+  dependencies:
+    "@jest/environment": ^29.7.0
+    "@jest/fake-timers": ^29.7.0
+    "@jest/types": ^29.6.3
+    "@types/jsdom": ^20.0.0
+    "@types/node": "*"
+    jest-mock: ^29.7.0
+    jest-util: ^29.7.0
+    jsdom: ^20.0.0
+  peerDependencies:
+    canvas: ^2.5.0
+  peerDependenciesMeta:
+    canvas:
+      optional: true
+  checksum: 559aac134c196fccc1dfc794d8fc87377e9f78e894bb13012b0831d88dec0abd7ece99abec69da564b8073803be4f04a9eb4f4d1bb80e29eec0cb252c254deb8
+  languageName: node
+  linkType: hard
+
 "jest-environment-node@npm:^29.7.0":
   version: 29.7.0
   resolution: "jest-environment-node@npm:29.7.0"
@@ -14652,16 +16680,16 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
-"joi@npm:^17.9.2":
-  version: 17.12.3
-  resolution: "joi@npm:17.12.3"
+"joi@npm:^17.6.4, joi@npm:^17.9.2":
+  version: 17.13.3
+  resolution: "joi@npm:17.13.3"
   dependencies:
     "@hapi/hoek": ^9.3.0
     "@hapi/topo": ^5.1.0
     "@sideway/address": ^4.1.5
     "@sideway/formula": ^3.0.1
     "@sideway/pinpoint": ^2.0.0
-  checksum: 6fc74ad7561261a3500fecfcb2cab30928526286a4ee737cad4d41e8556263326561e4146f6c2c9429d0eef27a7d1ba93b919795ade1e766d6dbb797fb4f1b77
+  checksum: 66ed454fee3d8e8da1ce21657fd2c7d565d98f3e539d2c5c028767e5f38cbd6297ce54df8312d1d094e62eb38f9452ebb43da4ce87321df66cf5e3f128cbc400
   languageName: node
   linkType: hard
 
@@ -14695,6 +16723,13 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
+"jsbn@npm:1.1.0":
+  version: 1.1.0
+  resolution: "jsbn@npm:1.1.0"
+  checksum: 944f924f2bd67ad533b3850eee47603eed0f6ae425fd1ee8c760f477e8c34a05f144c1bd4f5a5dd1963141dc79a2c55f89ccc5ab77d039e7077f3ad196b64965
+  languageName: node
+  linkType: hard
+
 "jsdom@npm:^16.5.2":
   version: 16.7.0
   resolution: "jsdom@npm:16.7.0"
@@ -14731,7 +16766,46 @@ asn1@evs-broadcast/node-asn1:
   peerDependenciesMeta:
     canvas:
       optional: true
-  checksum: 454b83371857000763ed31130a049acd1b113e3b927e6dcd75c67ddc30cdd242d7ebcac5c2294b7a1a6428155cb1398709c573b3c6d809218692ea68edd93370
+  checksum: 454b83371857000763ed31130a049acd1b113e3b927e6dcd75c67ddc30cdd242d7ebcac5c2294b7a1a6428155cb1398709c573b3c6d809218692ea68edd93370
+  languageName: node
+  linkType: hard
+
+"jsdom@npm:^20.0.0":
+  version: 20.0.3
+  resolution: "jsdom@npm:20.0.3"
+  dependencies:
+    abab: ^2.0.6
+    acorn: ^8.8.1
+    acorn-globals: ^7.0.0
+    cssom: ^0.5.0
+    cssstyle: ^2.3.0
+    data-urls: ^3.0.2
+    decimal.js: ^10.4.2
+    domexception: ^4.0.0
+    escodegen: ^2.0.0
+    form-data: ^4.0.0
+    html-encoding-sniffer: ^3.0.0
+    http-proxy-agent: ^5.0.0
+    https-proxy-agent: ^5.0.1
+    is-potential-custom-element-name: ^1.0.1
+    nwsapi: ^2.2.2
+    parse5: ^7.1.1
+    saxes: ^6.0.0
+    symbol-tree: ^3.2.4
+    tough-cookie: ^4.1.2
+    w3c-xmlserializer: ^4.0.0
+    webidl-conversions: ^7.0.0
+    whatwg-encoding: ^2.0.0
+    whatwg-mimetype: ^3.0.0
+    whatwg-url: ^11.0.0
+    ws: ^8.11.0
+    xml-name-validator: ^4.0.0
+  peerDependencies:
+    canvas: ^2.5.0
+  peerDependenciesMeta:
+    canvas:
+      optional: true
+  checksum: 6e2ae21db397133a061b270c26d2dbc0b9051733ea3b896a7ece78d79f475ff0974f766a413c1198a79c793159119169f2335ddb23150348fbfdcfa6f3105536
   languageName: node
   linkType: hard
 
@@ -14960,6 +17034,18 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
+"jsx-ast-utils@npm:^2.4.1 || ^3.0.0":
+  version: 3.3.5
+  resolution: "jsx-ast-utils@npm:3.3.5"
+  dependencies:
+    array-includes: ^3.1.6
+    array.prototype.flat: ^1.3.1
+    object.assign: ^4.1.4
+    object.values: ^1.1.6
+  checksum: f4b05fa4d7b5234230c905cfa88d36dc8a58a6666975a3891429b1a8cdc8a140bca76c297225cb7a499fad25a2c052ac93934449a2c31a44fc9edd06c773780a
+  languageName: node
+  linkType: hard
+
 "just-diff-apply@npm:^5.2.0":
   version: 5.5.0
   resolution: "just-diff-apply@npm:5.5.0"
@@ -14981,6 +17067,13 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
+"just-extend@npm:^6.2.0":
+  version: 6.2.0
+  resolution: "just-extend@npm:6.2.0"
+  checksum: 022024d6f687c807963b97a24728a378799f7e4af7357d1c1f90dedb402943d5c12be99a5136654bed8362c37a358b1793feaad3366896f239a44e17c5032d86
+  languageName: node
+  linkType: hard
+
 "katex@npm:^0.16.9":
   version: 0.16.10
   resolution: "katex@npm:0.16.10"
@@ -15305,10 +17398,10 @@ asn1@evs-broadcast/node-asn1:
     "@asyncapi/generator": ^1.17.25
     "@asyncapi/html-template": ^2.3.9
     "@asyncapi/nodejs-ws-template": ^0.9.36
-    "@sofie-automation/blueprints-integration": 1.51.0-in-development
-    "@sofie-automation/corelib": 1.51.0-in-development
-    "@sofie-automation/server-core-integration": 1.51.0-in-development
-    "@sofie-automation/shared-lib": 1.51.0-in-development
+    "@sofie-automation/blueprints-integration": 1.52.0-in-development
+    "@sofie-automation/corelib": 1.52.0-in-development
+    "@sofie-automation/server-core-integration": 1.52.0-in-development
+    "@sofie-automation/shared-lib": 1.52.0-in-development
     debug: ^4.3.4
     fast-clone: ^1.5.13
     influx: ^5.9.3
@@ -15430,6 +17523,13 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
+"lodash.get@npm:^4.4.2":
+  version: 4.4.2
+  resolution: "lodash.get@npm:4.4.2"
+  checksum: e403047ddb03181c9d0e92df9556570e2b67e0f0a930fcbbbd779370972368f5568e914f913e93f3b08f6d492abc71e14d4e9b7a18916c31fa04bd2306efe545
+  languageName: node
+  linkType: hard
+
 "lodash.ismatch@npm:^4.4.0":
   version: 4.4.0
   resolution: "lodash.ismatch@npm:4.4.0"
@@ -15472,7 +17572,7 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
-"lodash@npm:4.17.21, lodash@npm:^4.17.15, lodash@npm:^4.17.19, lodash@npm:^4.17.20, lodash@npm:^4.17.21, lodash@npm:^4.7.0, lodash@npm:~4.17.21":
+"lodash@npm:4.17.21, lodash@npm:^4, lodash@npm:^4.17.15, lodash@npm:^4.17.19, lodash@npm:^4.17.20, lodash@npm:^4.17.21, lodash@npm:^4.17.5, lodash@npm:^4.7.0, lodash@npm:~4.17.21":
   version: 4.17.21
   resolution: "lodash@npm:4.17.21"
   checksum: eb835a2e51d381e561e508ce932ea50a8e5a68f4ebdd771ea240d3048244a8d13658acbd502cd4829768c56f2e16bdd4340b9ea141297d472517b83868e677f7
@@ -15562,6 +17662,20 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
+"lottie-web@npm:5.5.9":
+  version: 5.5.9
+  resolution: "lottie-web@npm:5.5.9"
+  checksum: 9f59197f7a970d0a141fc86602eb3e6de89ba94286a77427b8b262cdb68e10d614757e0b8e8b806eb1e1e050a759a689dc8c1b0aa18d33da6550b556cfeb3376
+  languageName: node
+  linkType: hard
+
+"lottie-web@npm:^5.12.2":
+  version: 5.12.2
+  resolution: "lottie-web@npm:5.12.2"
+  checksum: af5bc3bc405fd760de8b17a36158d5a8c3e8c586c711d0c63681ddf056b65bc6b54ea36b1fcad782fb02dbe12e696a40e0ba72daf41b8f10ab5b5d1113793636
+  languageName: node
+  linkType: hard
+
 "lower-case@npm:^2.0.2":
   version: 2.0.2
   resolution: "lower-case@npm:2.0.2"
@@ -15613,7 +17727,7 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
-"lru-cache@npm:^7.4.4, lru-cache@npm:^7.5.1, lru-cache@npm:^7.7.1":
+"lru-cache@npm:^7.14.1, lru-cache@npm:^7.4.4, lru-cache@npm:^7.5.1, lru-cache@npm:^7.7.1":
   version: 7.18.3
   resolution: "lru-cache@npm:7.18.3"
   checksum: e550d772384709deea3f141af34b6d4fa392e2e418c1498c078de0ee63670f1f46f5eee746e8ef7e69e1c895af0d4224e62ee33e66a543a14763b0f2e74c1356
@@ -15643,6 +17757,15 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
+"magic-string@npm:^0.30.3":
+  version: 0.30.10
+  resolution: "magic-string@npm:0.30.10"
+  dependencies:
+    "@jridgewell/sourcemap-codec": ^1.4.15
+  checksum: 456fd47c39b296c47dff967e1965121ace35417eab7f45a99e681e725b8661b48e1573c366ee67a27715025b3740773c46b088f115421c7365ea4ea6fa10d399
+  languageName: node
+  linkType: hard
+
 "make-dir@npm:3.1.0":
   version: 3.1.0
   resolution: "make-dir@npm:3.1.0"
@@ -15793,6 +17916,17 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
+"md5.js@npm:^1.3.4":
+  version: 1.3.5
+  resolution: "md5.js@npm:1.3.5"
+  dependencies:
+    hash-base: ^3.0.0
+    inherits: ^2.0.1
+    safe-buffer: ^5.1.2
+  checksum: 098494d885684bcc4f92294b18ba61b7bd353c23147fbc4688c75b45cb8590f5a95fd4584d742415dcc52487f7a1ef6ea611cfa1543b0dc4492fe026357f3f0c
+  languageName: node
+  linkType: hard
+
 "mdast-util-directive@npm:^3.0.0":
   version: 3.0.0
   resolution: "mdast-util-directive@npm:3.0.0"
@@ -16962,6 +19096,18 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
+"miller-rabin@npm:^4.0.0":
+  version: 4.0.1
+  resolution: "miller-rabin@npm:4.0.1"
+  dependencies:
+    bn.js: ^4.0.0
+    brorand: ^1.0.1
+  bin:
+    miller-rabin: bin/miller-rabin
+  checksum: 00cd1ab838ac49b03f236cc32a14d29d7d28637a53096bf5c6246a032a37749c9bd9ce7360cbf55b41b89b7d649824949ff12bc8eee29ac77c6b38eada619ece
+  languageName: node
+  linkType: hard
+
 "mime-db@npm:1.52.0, mime-db@npm:>= 1.43.0 < 2":
   version: 1.52.0
   resolution: "mime-db@npm:1.52.0"
@@ -17057,13 +19203,20 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
-"minimalistic-assert@npm:^1.0.0":
+"minimalistic-assert@npm:^1.0.0, minimalistic-assert@npm:^1.0.1":
   version: 1.0.1
   resolution: "minimalistic-assert@npm:1.0.1"
   checksum: cc7974a9268fbf130fb055aff76700d7e2d8be5f761fb5c60318d0ed010d839ab3661a533ad29a5d37653133385204c503bfac995aaa4236f4e847461ea32ba7
   languageName: node
   linkType: hard
 
+"minimalistic-crypto-utils@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "minimalistic-crypto-utils@npm:1.0.1"
+  checksum: 6e8a0422b30039406efd4c440829ea8f988845db02a3299f372fceba56ffa94994a9c0f2fd70c17f9969eedfbd72f34b5070ead9656a34d3f71c0bd72583a0ed
+  languageName: node
+  linkType: hard
+
 "minimatch@npm:3.0.5":
   version: 3.0.5
   resolution: "minimatch@npm:3.0.5"
@@ -17118,12 +19271,12 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
-"minimatch@npm:^9.0.0, minimatch@npm:^9.0.1":
-  version: 9.0.3
-  resolution: "minimatch@npm:9.0.3"
+"minimatch@npm:^9.0.0, minimatch@npm:^9.0.1, minimatch@npm:^9.0.4":
+  version: 9.0.5
+  resolution: "minimatch@npm:9.0.5"
   dependencies:
     brace-expansion: ^2.0.1
-  checksum: 253487976bf485b612f16bf57463520a14f512662e592e95c571afdab1442a6a6864b6c88f248ce6fc4ff0b6de04ac7aa6c8bb51e868e99d1d65eb0658a708b5
+  checksum: 2c035575eda1e50623c731ec6c14f65a85296268f749b9337005210bb2b34e2705f8ef1a358b188f69892286ab99dc42c8fb98a57bde55c8d81b3023c19cea28
   languageName: node
   linkType: hard
 
@@ -17268,10 +19421,10 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
-"mkdirp-classic@npm:^0.5.2":
-  version: 0.5.3
-  resolution: "mkdirp-classic@npm:0.5.3"
-  checksum: 3f4e088208270bbcc148d53b73e9a5bd9eef05ad2cbf3b3d0ff8795278d50dd1d11a8ef1875ff5aea3fa888931f95bfcb2ad5b7c1061cfefd6284d199e6776ac
+"mitt@npm:3.0.1":
+  version: 3.0.1
+  resolution: "mitt@npm:3.0.1"
+  checksum: b55a489ac9c2949ab166b7f060601d3b6d893a852515ae9eca4e11df01c013876df777ea109317622b5c1c60e8aae252558e33c8c94e14124db38f64a39614b1
   languageName: node
   linkType: hard
 
@@ -17327,6 +19480,13 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
+"moment@npm:^2.30.1":
+  version: 2.30.1
+  resolution: "moment@npm:2.30.1"
+  checksum: 859236bab1e88c3e5802afcf797fc801acdbd0ee509d34ea3df6eea21eb6bcc2abd4ae4e4e64aa7c986aa6cba563c6e62806218e6412a765010712e5fa121ba6
+  languageName: node
+  linkType: hard
+
 "mongodb-connection-string-url@npm:^2.6.0":
   version: 2.6.0
   resolution: "mongodb-connection-string-url@npm:2.6.0"
@@ -17380,9 +19540,9 @@ asn1@evs-broadcast/node-asn1:
   version: 0.0.0-use.local
   resolution: "mos-gateway@workspace:mos-gateway"
   dependencies:
-    "@mos-connection/connector": 4.1.1-nightly-master-20240430-072032-ffb8bf6.0
-    "@sofie-automation/server-core-integration": 1.51.0-in-development
-    "@sofie-automation/shared-lib": 1.51.0-in-development
+    "@mos-connection/connector": v4.2.0-alpha.1
+    "@sofie-automation/server-core-integration": 1.52.0-in-development
+    "@sofie-automation/shared-lib": 1.52.0-in-development
     tslib: ^2.6.2
     type-fest: ^3.13.1
     underscore: ^1.13.6
@@ -17521,6 +19681,13 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
+"netmask@npm:^2.0.2":
+  version: 2.0.2
+  resolution: "netmask@npm:2.0.2"
+  checksum: c65cb8d3f7ea5669edddb3217e4c96910a60d0d9a4b52d9847ff6b28b2d0277cd8464eee0ef85133cdee32605c57940cacdd04a9a019079b091b6bba4cb0ec22
+  languageName: node
+  linkType: hard
+
 "next-line@npm:^1.1.0":
   version: 1.1.0
   resolution: "next-line@npm:1.1.0"
@@ -17554,6 +19721,19 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
+"nise@npm:^5.1.2":
+  version: 5.1.9
+  resolution: "nise@npm:5.1.9"
+  dependencies:
+    "@sinonjs/commons": ^3.0.0
+    "@sinonjs/fake-timers": ^11.2.2
+    "@sinonjs/text-encoding": ^0.7.2
+    just-extend: ^6.2.0
+    path-to-regexp: ^6.2.1
+  checksum: ab9fd6eabc98170f18aef6c9567983145c1dc62c7aef46eda0fea754083316c1f0f9b2c32e9b4bfdd25122276d670293596ed672b54dd1ffa8eb58b56a30ea95
+  languageName: node
+  linkType: hard
+
 "no-case@npm:^3.0.4":
   version: 3.0.4
   resolution: "no-case@npm:3.0.4"
@@ -17564,6 +19744,15 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
+"node-addon-api@npm:7.0.0":
+  version: 7.0.0
+  resolution: "node-addon-api@npm:7.0.0"
+  dependencies:
+    node-gyp: latest
+  checksum: 4349465d737e284b280fc0e5fd2384f9379bca6b7f2a5a1460bea676ba5b90bf563e7d02a9254c35b9ed808641c81d9b4ca9e1da17d2849cd07727660b00b332
+  languageName: node
+  linkType: hard
+
 "node-addon-api@npm:^3.2.1":
   version: 3.2.1
   resolution: "node-addon-api@npm:3.2.1"
@@ -17629,6 +19818,17 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
+"node-gyp-build@npm:4.6.0":
+  version: 4.6.0
+  resolution: "node-gyp-build@npm:4.6.0"
+  bin:
+    node-gyp-build: bin.js
+    node-gyp-build-optional: optional.js
+    node-gyp-build-test: build-test.js
+  checksum: 25d78c5ef1f8c24291f4a370c47ba52fcea14f39272041a90a7894cd50d766f7c8cb8fb06c0f42bf6f69b204b49d9be3c8fc344aac09714d5bdb95965499eb15
+  languageName: node
+  linkType: hard
+
 "node-gyp-build@npm:^4.3.0":
   version: 4.6.1
   resolution: "node-gyp-build@npm:4.6.1"
@@ -17675,6 +19875,41 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
+"node-stdlib-browser@npm:^1.2.0":
+  version: 1.2.0
+  resolution: "node-stdlib-browser@npm:1.2.0"
+  dependencies:
+    assert: ^2.0.0
+    browser-resolve: ^2.0.0
+    browserify-zlib: ^0.2.0
+    buffer: ^5.7.1
+    console-browserify: ^1.1.0
+    constants-browserify: ^1.0.0
+    create-require: ^1.1.1
+    crypto-browserify: ^3.11.0
+    domain-browser: ^4.22.0
+    events: ^3.0.0
+    https-browserify: ^1.0.0
+    isomorphic-timers-promises: ^1.0.1
+    os-browserify: ^0.3.0
+    path-browserify: ^1.0.1
+    pkg-dir: ^5.0.0
+    process: ^0.11.10
+    punycode: ^1.4.1
+    querystring-es3: ^0.2.1
+    readable-stream: ^3.6.0
+    stream-browserify: ^3.0.0
+    stream-http: ^3.2.0
+    string_decoder: ^1.0.0
+    timers-browserify: ^2.0.4
+    tty-browserify: 0.0.1
+    url: ^0.11.0
+    util: ^0.12.4
+    vm-browserify: ^1.0.1
+  checksum: fe491f0839319fd9bb95964c6f7da81fc7fde4c3ac9062aa367f19bc5a6060d0d9e423d3de4196cb51f8259d6aaf6cf380048c48a86eb3721c6223dd0dcc5bfd
+  languageName: node
+  linkType: hard
+
 "nodemon@npm:^2.0.22":
   version: 2.0.22
   resolution: "nodemon@npm:2.0.22"
@@ -18125,10 +20360,10 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
-"nwsapi@npm:^2.2.0":
-  version: 2.2.7
-  resolution: "nwsapi@npm:2.2.7"
-  checksum: cab25f7983acec7e23490fec3ef7be608041b460504229770e3bfcf9977c41d6fe58f518994d3bd9aa3a101f501089a3d4a63536f4ff8ae4b8c4ca23bdbfda4e
+"nwsapi@npm:^2.2.0, nwsapi@npm:^2.2.2":
+  version: 2.2.12
+  resolution: "nwsapi@npm:2.2.12"
+  checksum: 4dbce7ecbcf336eef1edcbb5161cbceea95863e63a16d9bcec8e81cbb260bdab3d07e6c7b58354d465dc803eef6d0ea4fb20220a80fa148ae65f18d56df81799
   languageName: node
   linkType: hard
 
@@ -18213,7 +20448,7 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
-"object-assign@npm:^4.0.1, object-assign@npm:^4.1.1":
+"object-assign@npm:^4.0.1, object-assign@npm:^4.1.0, object-assign@npm:^4.1.1":
   version: 4.1.1
   resolution: "object-assign@npm:4.1.1"
   checksum: fcc6e4ea8c7fe48abfbb552578b1c53e0d194086e2e6bbbf59e0a536381a292f39943c6e9628af05b5528aa5e3318bb30d6b2e53cadaf5b8fe9e12c4b69af23f
@@ -18236,10 +20471,20 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
-"object-inspect@npm:^1.12.3, object-inspect@npm:^1.9.0":
-  version: 1.12.3
-  resolution: "object-inspect@npm:1.12.3"
-  checksum: dabfd824d97a5f407e6d5d24810d888859f6be394d8b733a77442b277e0808860555176719c5905e765e3743a7cada6b8b0a3b85e5331c530fd418cc8ae991db
+"object-inspect@npm:^1.13.1":
+  version: 1.13.2
+  resolution: "object-inspect@npm:1.13.2"
+  checksum: 9f850b3c045db60e0e97746e809ee4090d6ce62195af17dd1e9438ac761394a7d8ec4f7906559aea5424eaf61e35d3e53feded2ccd5f62fcc7d9670d3c8eb353
+  languageName: node
+  linkType: hard
+
+"object-is@npm:^1.1.5":
+  version: 1.1.6
+  resolution: "object-is@npm:1.1.6"
+  dependencies:
+    call-bind: ^1.0.7
+    define-properties: ^1.2.1
+  checksum: 3ea22759967e6f2380a2cbbd0f737b42dc9ddb2dfefdb159a1b927fea57335e1b058b564bfa94417db8ad58cddab33621a035de6f5e5ad56d89f2dd03e66c6a1
   languageName: node
   linkType: hard
 
@@ -18257,26 +20502,38 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
-"object.assign@npm:^4.1.0, object.assign@npm:^4.1.4":
-  version: 4.1.4
-  resolution: "object.assign@npm:4.1.4"
+"object.assign@npm:^4.1.0, object.assign@npm:^4.1.4, object.assign@npm:^4.1.5":
+  version: 4.1.5
+  resolution: "object.assign@npm:4.1.5"
   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
-  checksum: 76cab513a5999acbfe0ff355f15a6a125e71805fcf53de4e9d4e082e1989bdb81d1e329291e1e4e0ae7719f0e4ef80e88fb2d367ae60500d79d25a6224ac8864
+  checksum: f9aeac0541661370a1fc86e6a8065eb1668d3e771f7dbb33ee54578201336c057b21ee61207a186dd42db0c62201d91aac703d20d12a79fc79c353eed44d4e25
   languageName: node
   linkType: hard
 
-"object.entries@npm:^1.0.4, object.entries@npm:^1.1.0":
-  version: 1.1.7
-  resolution: "object.entries@npm:1.1.7"
+"object.entries@npm:^1.0.4, object.entries@npm:^1.1.0, object.entries@npm:^1.1.8":
+  version: 1.1.8
+  resolution: "object.entries@npm:1.1.8"
   dependencies:
-    call-bind: ^1.0.2
-    define-properties: ^1.2.0
-    es-abstract: ^1.22.1
-  checksum: da287d434e7e32989586cd734382364ba826a2527f2bc82e6acbf9f9bfafa35d51018b66ec02543ffdfa2a5ba4af2b6f1ca6e588c65030cb4fd9c67d6ced594c
+    call-bind: ^1.0.7
+    define-properties: ^1.2.1
+    es-object-atoms: ^1.0.0
+  checksum: 5314877cb637ef3437a30bba61d9bacdb3ce74bf73ac101518be0633c37840c8cc67407edb341f766e8093b3d7516d5c3358f25adfee4a2c697c0ec4c8491907
+  languageName: node
+  linkType: hard
+
+"object.fromentries@npm:^2.0.8":
+  version: 2.0.8
+  resolution: "object.fromentries@npm:2.0.8"
+  dependencies:
+    call-bind: ^1.0.7
+    define-properties: ^1.2.1
+    es-abstract: ^1.23.2
+    es-object-atoms: ^1.0.0
+  checksum: 29b2207a2db2782d7ced83f93b3ff5d425f901945f3665ffda1821e30a7253cd1fd6b891a64279976098137ddfa883d748787a6fea53ecdb51f8df8b8cec0ae1
   languageName: node
   linkType: hard
 
@@ -18293,20 +20550,20 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
-"object.values@npm:^1.1.0":
-  version: 1.1.7
-  resolution: "object.values@npm:1.1.7"
+"object.values@npm:^1.1.0, object.values@npm:^1.1.6, object.values@npm:^1.2.0":
+  version: 1.2.0
+  resolution: "object.values@npm:1.2.0"
   dependencies:
-    call-bind: ^1.0.2
-    define-properties: ^1.2.0
-    es-abstract: ^1.22.1
-  checksum: f3e4ae4f21eb1cc7cebb6ce036d4c67b36e1c750428d7b7623c56a0db90edced63d08af8a316d81dfb7c41a3a5fa81b05b7cc9426e98d7da986b1682460f0777
+    call-bind: ^1.0.7
+    define-properties: ^1.2.1
+    es-object-atoms: ^1.0.0
+  checksum: 51fef456c2a544275cb1766897f34ded968b22adfc13ba13b5e4815fdaf4304a90d42a3aee114b1f1ede048a4890381d47a5594d84296f2767c6a0364b9da8fa
   languageName: node
   linkType: hard
 
-"obs-websocket-js@npm:^5.0.4":
-  version: 5.0.4
-  resolution: "obs-websocket-js@npm:5.0.4"
+"obs-websocket-js@npm:^5.0.6":
+  version: 5.0.6
+  resolution: "obs-websocket-js@npm:5.0.6"
   dependencies:
     "@msgpack/msgpack": ^2.7.1
     crypto-js: ^4.1.1
@@ -18315,7 +20572,7 @@ asn1@evs-broadcast/node-asn1:
     isomorphic-ws: ^5.0.0
     type-fest: ^3.11.0
     ws: ^8.13.0
-  checksum: 5fab50747624abebe18a186f1cacd3f2ba72fe2a642f43a05babcc4b8da6342f4bcce31e8aacd7a895debf17a88eaff2222e423c9c55d2ba6b116ebb05cc4c2e
+  checksum: be29bb201e36c7851462bc2840e0176da6268639a3eb53092d2e26e38214292c5787308ab6cae80d1f2ce0cdbb1291d5948b48852f3aa318d7bd2874ca2a7e48
   languageName: node
   linkType: hard
 
@@ -18491,6 +20748,13 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
+"os-browserify@npm:^0.3.0":
+  version: 0.3.0
+  resolution: "os-browserify@npm:0.3.0"
+  checksum: 16e37ba3c0e6a4c63443c7b55799ce4066d59104143cb637ecb9fce586d5da319cdca786ba1c867abbe3890d2cbf37953f2d51eea85e20dd6c4570d6c54bfebf
+  languageName: node
+  linkType: hard
+
 "os-homedir@npm:^1.0.0":
   version: 1.0.2
   resolution: "os-homedir@npm:1.0.2"
@@ -18505,19 +20769,19 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
-"osc@npm:^2.4.4":
-  version: 2.4.4
-  resolution: "osc@npm:2.4.4"
+"osc@npm:^2.4.5":
+  version: 2.4.5
+  resolution: "osc@npm:2.4.5"
   dependencies:
     long: 4.0.0
-    serialport: 10.5.0
+    serialport: 12.0.0
     slip: 1.0.2
     wolfy87-eventemitter: 5.2.9
-    ws: 8.13.0
+    ws: 8.18.0
   dependenciesMeta:
     serialport:
       optional: true
-  checksum: c4d3b0910a3336778eeda0a34d7f9c6e24defe1040b5aff7804068092c243d0d3e3a80520f88c00076ff2b6931b54ee383b64ad3ea62e00df5c8eda6d0d8615a
+  checksum: 8605673e6def441c37d896fe851b104ff060c4a1c29535675934e8a92290abdc563e1f1bcfa905f9ec18e907bb9eabb352904d492cf1bce74d1d8af686843499
   languageName: node
   linkType: hard
 
@@ -18738,6 +21002,32 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
+"pac-proxy-agent@npm:^7.0.1":
+  version: 7.0.2
+  resolution: "pac-proxy-agent@npm:7.0.2"
+  dependencies:
+    "@tootallnate/quickjs-emscripten": ^0.23.0
+    agent-base: ^7.0.2
+    debug: ^4.3.4
+    get-uri: ^6.0.1
+    http-proxy-agent: ^7.0.0
+    https-proxy-agent: ^7.0.5
+    pac-resolver: ^7.0.1
+    socks-proxy-agent: ^8.0.4
+  checksum: 82772aaa489a4ad6f598b75d56daf609e7ba294a05a91cfe3101b004e2df494f0a269c98452cb47aaa4a513428e248308a156e26fee67eb78a76a58e9346921e
+  languageName: node
+  linkType: hard
+
+"pac-resolver@npm:^7.0.1":
+  version: 7.0.1
+  resolution: "pac-resolver@npm:7.0.1"
+  dependencies:
+    degenerator: ^5.0.0
+    netmask: ^2.0.2
+  checksum: 839134328781b80d49f9684eae1f5c74f50a1d4482076d44c84fc2f3ca93da66fa11245a4725a057231e06b311c20c989fd0681e662a0792d17f644d8fe62a5e
+  languageName: node
+  linkType: hard
+
 "package-json@npm:^8.1.0":
   version: 8.1.1
   resolution: "package-json@npm:8.1.1"
@@ -18768,7 +21058,9 @@ asn1@evs-broadcast/node-asn1:
     "@types/underscore": ^1.11.15
     babel-jest: ^29.7.0
     copyfiles: ^2.4.1
+    eslint-plugin-react: latest
     jest: ^29.7.0
+    jest-environment-jsdom: ^29.7.0
     jest-mock-extended: ^3.0.5
     json-schema-to-typescript: ^10.1.5
     lerna: ^6.6.2
@@ -18871,6 +21163,13 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
+"pako@npm:~1.0.5":
+  version: 1.0.11
+  resolution: "pako@npm:1.0.11"
+  checksum: 1be2bfa1f807608c7538afa15d6f25baa523c30ec870a3228a89579e474a4d992f4293859524e46d5d87fd30fa17c5edf34dbef0671251d9749820b488660b16
+  languageName: node
+  linkType: hard
+
 "param-case@npm:^3.0.4":
   version: 3.0.4
   resolution: "param-case@npm:3.0.4"
@@ -18890,6 +21189,20 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
+"parse-asn1@npm:^5.0.0, parse-asn1@npm:^5.1.7":
+  version: 5.1.7
+  resolution: "parse-asn1@npm:5.1.7"
+  dependencies:
+    asn1.js: ^4.10.1
+    browserify-aes: ^1.2.0
+    evp_bytestokey: ^1.0.3
+    hash-base: ~3.0
+    pbkdf2: ^3.1.2
+    safe-buffer: ^5.2.1
+  checksum: 93c7194c1ed63a13e0b212d854b5213ad1aca0ace41c66b311e97cca0519cf9240f79435a0306a3b412c257f0ea3f1953fd0d9549419a0952c9e995ab361fd6c
+  languageName: node
+  linkType: hard
+
 "parse-conflict-json@npm:^2.0.1":
   version: 2.0.2
   resolution: "parse-conflict-json@npm:2.0.2"
@@ -18992,7 +21305,7 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
-"parse5@npm:^7.0.0":
+"parse5@npm:^7.0.0, parse5@npm:^7.1.1":
   version: 7.1.2
   resolution: "parse5@npm:7.1.2"
   dependencies:
@@ -19097,6 +21410,13 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
+"path-browserify@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "path-browserify@npm:1.0.1"
+  checksum: c6d7fa376423fe35b95b2d67990060c3ee304fc815ff0a2dc1c6c3cfaff2bd0d572ee67e18f19d0ea3bbe32e8add2a05021132ac40509416459fffee35200699
+  languageName: node
+  linkType: hard
+
 "path-exists@npm:^3.0.0":
   version: 3.0.0
   resolution: "path-exists@npm:3.0.0"
@@ -19193,6 +21513,13 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
+"path-to-regexp@npm:^6.2.1":
+  version: 6.2.2
+  resolution: "path-to-regexp@npm:6.2.2"
+  checksum: b7b0005c36f5099f9ed1fb20a820d2e4ed1297ffe683ea1d678f5e976eb9544f01debb281369dabdc26da82e6453901bf71acf2c7ed14b9243536c2a45286c33
+  languageName: node
+  linkType: hard
+
 "path-type@npm:^3.0.0":
   version: 3.0.0
   resolution: "path-type@npm:3.0.0"
@@ -19209,6 +21536,19 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
+"pbkdf2@npm:^3.0.3, pbkdf2@npm:^3.1.2":
+  version: 3.1.2
+  resolution: "pbkdf2@npm:3.1.2"
+  dependencies:
+    create-hash: ^1.1.2
+    create-hmac: ^1.1.4
+    ripemd160: ^2.0.1
+    safe-buffer: ^5.0.1
+    sha.js: ^2.4.8
+  checksum: 2c950a100b1da72123449208e231afc188d980177d021d7121e96a2de7f2abbc96ead2b87d03d8fe5c318face097f203270d7e27908af9f471c165a4e8e69c92
+  languageName: node
+  linkType: hard
+
 "peek-readable@npm:^5.0.0":
   version: 5.0.0
   resolution: "peek-readable@npm:5.0.0"
@@ -19234,10 +21574,10 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
-"picocolors@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "picocolors@npm:1.0.0"
-  checksum: a2e8092dd86c8396bdba9f2b5481032848525b3dc295ce9b57896f931e63fc16f79805144321f72976383fc249584672a75cc18d6777c6b757603f372f745981
+"picocolors@npm:^1.0.0, picocolors@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "picocolors@npm:1.0.1"
+  checksum: fa68166d1f56009fc02a34cdfd112b0dd3cf1ef57667ac57281f714065558c01828cdf4f18600ad6851cbe0093952ed0660b1e0156bddf2184b6aaf5817553a5
   languageName: node
   linkType: hard
 
@@ -19325,7 +21665,7 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
-"pkg-dir@npm:4.2.0, pkg-dir@npm:^4.2.0":
+"pkg-dir@npm:^4.2.0":
   version: 4.2.0
   resolution: "pkg-dir@npm:4.2.0"
   dependencies:
@@ -19334,6 +21674,15 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
+"pkg-dir@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "pkg-dir@npm:5.0.0"
+  dependencies:
+    find-up: ^5.0.0
+  checksum: b167bb8dac7bbf22b1d5e30ec223e6b064b84b63010c9d49384619a36734caf95ed23ad23d4f9bd975e8e8082b60a83395f43a89bb192df53a7c25a38ecb57d9
+  languageName: node
+  linkType: hard
+
 "pkg-dir@npm:^7.0.0":
   version: 7.0.0
   resolution: "pkg-dir@npm:7.0.0"
@@ -19368,11 +21717,11 @@ asn1@evs-broadcast/node-asn1:
   version: 0.0.0-use.local
   resolution: "playout-gateway@workspace:playout-gateway"
   dependencies:
-    "@sofie-automation/server-core-integration": 1.51.0-in-development
-    "@sofie-automation/shared-lib": 1.51.0-in-development
+    "@sofie-automation/server-core-integration": 1.52.0-in-development
+    "@sofie-automation/shared-lib": 1.52.0-in-development
     debug: ^4.3.4
     influx: ^5.9.3
-    timeline-state-resolver: 9.1.0-nightly-release51-20240228-132329-b7ceb6950.0
+    timeline-state-resolver: 9.2.0-nightly-release52-20240923-122840-58cfbb259.0
     tslib: ^2.6.2
     underscore: ^1.13.6
     winston: ^3.11.0
@@ -19386,6 +21735,20 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
+"popper.js@npm:^1.14.1, popper.js@npm:^1.14.4":
+  version: 1.16.1
+  resolution: "popper.js@npm:1.16.1"
+  checksum: c56ae5001ec50a77ee297a8061a0221d99d25c7348d2e6bcd3e45a0d0f32a1fd81bca29d46cb0d4bdf13efb77685bd6a0ce93f9eb3c608311a461f945fffedbe
+  languageName: node
+  linkType: hard
+
+"possible-typed-array-names@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "possible-typed-array-names@npm:1.0.0"
+  checksum: b32d403ece71e042385cc7856385cecf1cd8e144fa74d2f1de40d1e16035dba097bc189715925e79b67bdd1472796ff168d3a90d296356c9c94d272d5b95f3ae
+  languageName: node
+  linkType: hard
+
 "postcss-calc@npm:^8.2.3":
   version: 8.2.4
   resolution: "postcss-calc@npm:8.2.4"
@@ -19820,14 +22183,14 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
-"postcss@npm:^8.4.17, postcss@npm:^8.4.21, postcss@npm:^8.4.26, postcss@npm:^8.4.33":
-  version: 8.4.38
-  resolution: "postcss@npm:8.4.38"
+"postcss@npm:^8.4.17, postcss@npm:^8.4.21, postcss@npm:^8.4.26, postcss@npm:^8.4.33, postcss@npm:^8.4.39":
+  version: 8.4.39
+  resolution: "postcss@npm:8.4.39"
   dependencies:
     nanoid: ^3.3.7
-    picocolors: ^1.0.0
+    picocolors: ^1.0.1
     source-map-js: ^1.2.0
-  checksum: 649f9e60a763ca4b5a7bbec446a069edf07f057f6d780a5a0070576b841538d1ecf7dd888f2fbfd1f76200e26c969e405aeeae66332e6927dbdc8bdcb90b9451
+  checksum: 14b130c90f165961772bdaf99c67f907f3d16494adf0868e57ef68baa67e0d1f6762db9d41ab0f4d09bab6fb7888588dba3596afd1a235fd5c2d43fba7006ac6
   languageName: node
   linkType: hard
 
@@ -19949,7 +22312,7 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
-"progress@npm:2.0.3":
+"progress@npm:^2.0.3":
   version: 2.0.3
   resolution: "progress@npm:2.0.3"
   checksum: f67403fe7b34912148d9252cb7481266a354bd99ce82c835f79070643bb3c6583d10dbcfda4d41e04bbc1d8437e9af0fb1e1f2135727878f5308682a579429b7
@@ -19996,6 +22359,20 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
+"promise.allsettled@npm:^1.0.7":
+  version: 1.0.7
+  resolution: "promise.allsettled@npm:1.0.7"
+  dependencies:
+    array.prototype.map: ^1.0.5
+    call-bind: ^1.0.2
+    define-properties: ^1.2.0
+    es-abstract: ^1.22.1
+    get-intrinsic: ^1.2.1
+    iterate-value: ^1.0.2
+  checksum: 96186392286e5ab9aef1a1a725c061c8cf268b6cf141f151daa3834bb8e1680f3b159af6536ce59cf80d4a6a5ad1d8371d05759980cc6c90d58800ddb0a7c119
+  languageName: node
+  linkType: hard
+
 "prompts@npm:^2.0.1, prompts@npm:^2.4.2":
   version: 2.4.2
   resolution: "prompts@npm:2.4.2"
@@ -20015,7 +22392,7 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
-"prop-types@npm:^15.6.2, prop-types@npm:^15.7.2":
+"prop-types@npm:^15.5.8, prop-types@npm:^15.6.0, prop-types@npm:^15.6.1, prop-types@npm:^15.6.2, prop-types@npm:^15.7.2, prop-types@npm:^15.8.1":
   version: 15.8.1
   resolution: "prop-types@npm:15.8.1"
   dependencies:
@@ -20077,7 +22454,23 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
-"proxy-from-env@npm:1.1.0, proxy-from-env@npm:^1.1.0":
+"proxy-agent@npm:^6.4.0":
+  version: 6.4.0
+  resolution: "proxy-agent@npm:6.4.0"
+  dependencies:
+    agent-base: ^7.0.2
+    debug: ^4.3.4
+    http-proxy-agent: ^7.0.1
+    https-proxy-agent: ^7.0.3
+    lru-cache: ^7.14.1
+    pac-proxy-agent: ^7.0.1
+    proxy-from-env: ^1.1.0
+    socks-proxy-agent: ^8.0.2
+  checksum: 4d3794ad5e07486298902f0a7f250d0f869fa0e92d790767ca3f793a81374ce0ab6c605f8ab8e791c4d754da96656b48d1c24cb7094bfd310a15867e4a0841d7
+  languageName: node
+  linkType: hard
+
+"proxy-from-env@npm:^1.1.0":
   version: 1.1.0
   resolution: "proxy-from-env@npm:1.1.0"
   checksum: ed7fcc2ba0a33404958e34d95d18638249a68c430e30fcb6c478497d72739ba64ce9810a24f53a7d921d0c065e5b78e3822759800698167256b04659366ca4d4
@@ -20105,6 +22498,20 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
+"public-encrypt@npm:^4.0.0":
+  version: 4.0.3
+  resolution: "public-encrypt@npm:4.0.3"
+  dependencies:
+    bn.js: ^4.1.0
+    browserify-rsa: ^4.0.0
+    create-hash: ^1.1.0
+    parse-asn1: ^5.0.0
+    randombytes: ^2.0.1
+    safe-buffer: ^5.1.2
+  checksum: 215d446e43cef021a20b67c1df455e5eea134af0b1f9b8a35f9e850abf32991b0c307327bc5b9bc07162c288d5cdb3d4a783ea6c6640979ed7b5017e3e0c9935
+  languageName: node
+  linkType: hard
+
 "pump@npm:^3.0.0":
   version: 3.0.0
   resolution: "pump@npm:3.0.0"
@@ -20115,7 +22522,7 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
-"punycode@npm:^1.3.2":
+"punycode@npm:^1.3.2, punycode@npm:^1.4.1":
   version: 1.4.1
   resolution: "punycode@npm:1.4.1"
   checksum: fa6e698cb53db45e4628559e557ddaf554103d2a96a1d62892c8f4032cd3bc8871796cae9eabc1bc700e2b6677611521ce5bb1d9a27700086039965d0cf34518
@@ -20138,23 +22545,33 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
-"puppeteer@npm:^14.1.0":
-  version: 14.4.1
-  resolution: "puppeteer@npm:14.4.1"
+"puppeteer-core@npm:23.2.1":
+  version: 23.2.1
+  resolution: "puppeteer-core@npm:23.2.1"
   dependencies:
-    cross-fetch: 3.1.5
-    debug: 4.3.4
-    devtools-protocol: 0.0.1001819
-    extract-zip: 2.0.1
-    https-proxy-agent: 5.0.1
-    pkg-dir: 4.2.0
-    progress: 2.0.3
-    proxy-from-env: 1.1.0
-    rimraf: 3.0.2
-    tar-fs: 2.1.1
-    unbzip2-stream: 1.4.3
-    ws: 8.7.0
-  checksum: 21566e220dbbc8df8c59209b71de83630bf7ba8f9fa117c9f2452370430471fa3bbeb9c19bbfb95bc8078d65454d9000240441050ba6c9880de1954038af0a08
+    "@puppeteer/browsers": 2.3.1
+    chromium-bidi: 0.6.4
+    debug: ^4.3.6
+    devtools-protocol: 0.0.1330662
+    typed-query-selector: ^2.12.0
+    ws: ^8.18.0
+  checksum: 3e79598883a052da4ff2d4dae33b1fcb7b457986d675f11a02cc59aa65baa2314bfd5cfd7650e028fdd91ea510f9111c4473d28ae9c7b4c9d9dbd7d9e0a4ae4b
+  languageName: node
+  linkType: hard
+
+"puppeteer@npm:^23.2.0":
+  version: 23.2.1
+  resolution: "puppeteer@npm:23.2.1"
+  dependencies:
+    "@puppeteer/browsers": 2.3.1
+    chromium-bidi: 0.6.4
+    cosmiconfig: ^9.0.0
+    devtools-protocol: 0.0.1330662
+    puppeteer-core: 23.2.1
+    typed-query-selector: ^2.12.0
+  bin:
+    puppeteer: lib/cjs/puppeteer/node/cli.js
+  checksum: 8a95bdf555d2eb1a54c03d2564a5a584cafb907b9964937d23c67a184c05ae5f6f02801bd6ddcc90c4e0a1a9239cf4c57d5092f73ebba080f17f1fdb8e1ad0ff
   languageName: node
   linkType: hard
 
@@ -20181,6 +22598,34 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
+"qs@npm:^6.11.2":
+  version: 6.12.3
+  resolution: "qs@npm:6.12.3"
+  dependencies:
+    side-channel: ^1.0.6
+  checksum: 9a9228a623bc36d41648237667d7342fb8d64d1cfeb29e474b0c44591ba06ac507e2d726f60eca5af8dc420e5dd23370af408ef8c28e0405675c7187b736a693
+  languageName: node
+  linkType: hard
+
+"query-string@npm:^6.14.1":
+  version: 6.14.1
+  resolution: "query-string@npm:6.14.1"
+  dependencies:
+    decode-uri-component: ^0.2.0
+    filter-obj: ^1.1.0
+    split-on-first: ^1.0.0
+    strict-uri-encode: ^2.0.0
+  checksum: f2c7347578fa0f3fd4eaace506470cb4e9dc52d409a7ddbd613f614b9a594d750877e193b5d5e843c7477b3b295b857ec328903c943957adc41a3efb6c929449
+  languageName: node
+  linkType: hard
+
+"querystring-es3@npm:^0.2.1":
+  version: 0.2.1
+  resolution: "querystring-es3@npm:0.2.1"
+  checksum: 691e8d6b8b157e7cd49ae8e83fcf86de39ab3ba948c25abaa94fba84c0986c641aa2f597770848c64abce290ed17a39c9df6df737dfa7e87c3b63acc7d225d61
+  languageName: node
+  linkType: hard
+
 "querystringify@npm:^2.1.1":
   version: 2.2.0
   resolution: "querystringify@npm:2.2.0"
@@ -20195,6 +22640,13 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
+"queue-tick@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "queue-tick@npm:1.0.1"
+  checksum: 57c3292814b297f87f792fbeb99ce982813e4e54d7a8bdff65cf53d5c084113913289d4a48ec8bbc964927a74b847554f9f4579df43c969a6c8e0f026457ad01
+  languageName: node
+  linkType: hard
+
 "queue@npm:6.0.2":
   version: 6.0.2
   resolution: "queue@npm:6.0.2"
@@ -20247,7 +22699,7 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
-"randombytes@npm:^2.1.0":
+"randombytes@npm:^2.0.0, randombytes@npm:^2.0.1, randombytes@npm:^2.0.5, randombytes@npm:^2.1.0":
   version: 2.1.0
   resolution: "randombytes@npm:2.1.0"
   dependencies:
@@ -20256,6 +22708,16 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
+"randomfill@npm:^1.0.3":
+  version: 1.0.4
+  resolution: "randomfill@npm:1.0.4"
+  dependencies:
+    randombytes: ^2.0.5
+    safe-buffer: ^5.1.0
+  checksum: 33734bb578a868d29ee1b8555e21a36711db084065d94e019a6d03caa67debef8d6a1bfd06a2b597e32901ddc761ab483a85393f0d9a75838f1912461d4dbfc7
+  languageName: node
+  linkType: hard
+
 "range-parser@npm:1.2.0":
   version: 1.2.0
   resolution: "range-parser@npm:1.2.0"
@@ -20282,6 +22744,62 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
+"rc-motion@npm:^2.0.0":
+  version: 2.9.2
+  resolution: "rc-motion@npm:2.9.2"
+  dependencies:
+    "@babel/runtime": ^7.11.1
+    classnames: ^2.2.1
+    rc-util: ^5.43.0
+  peerDependencies:
+    react: ">=16.9.0"
+    react-dom: ">=16.9.0"
+  checksum: 704dceedaf7f75e884b6a6e1134e674c1351ee6c6b1bd6a18ff73594d1ba0379cab77abd7fcad7d842ca07595bfe0a7ab291210a7144f7fd2e5e68a199e1561c
+  languageName: node
+  linkType: hard
+
+"rc-resize-observer@npm:^1.3.1":
+  version: 1.4.0
+  resolution: "rc-resize-observer@npm:1.4.0"
+  dependencies:
+    "@babel/runtime": ^7.20.7
+    classnames: ^2.2.1
+    rc-util: ^5.38.0
+    resize-observer-polyfill: ^1.5.1
+  peerDependencies:
+    react: ">=16.9.0"
+    react-dom: ">=16.9.0"
+  checksum: e6ee24fd887ea440b07e0326c3fc60b240274fa43ea87cf8f86ca9e0741a2c817e47a182f336b00d7246b4fd21b3536f4d3aacd7f0db5ae673f106630cd348ba
+  languageName: node
+  linkType: hard
+
+"rc-tooltip@npm:^6.1.3":
+  version: 6.2.0
+  resolution: "rc-tooltip@npm:6.2.0"
+  dependencies:
+    "@babel/runtime": ^7.11.2
+    "@rc-component/trigger": ^2.0.0
+    classnames: ^2.3.1
+  peerDependencies:
+    react: ">=16.9.0"
+    react-dom: ">=16.9.0"
+  checksum: 950201af1743f655a867f8e2c9892784d3bb7b9a9f8b48aa0b22c5066b351f8895683e034cf2b8a8de6780641a84dab4bc6b4ecdcb81261b26462801f5cedf11
+  languageName: node
+  linkType: hard
+
+"rc-util@npm:^5.24.4, rc-util@npm:^5.38.0, rc-util@npm:^5.43.0":
+  version: 5.43.0
+  resolution: "rc-util@npm:5.43.0"
+  dependencies:
+    "@babel/runtime": ^7.18.3
+    react-is: ^18.2.0
+  peerDependencies:
+    react: ">=16.9.0"
+    react-dom: ">=16.9.0"
+  checksum: 48c10afb5886aed86d1f5241883f972b2b16235b0cc4867a05d061324f107aa113260c34eeb13ad18f4b66d1264dbcb3baf725c8ea34fbdaa504410d4e71b3ce
+  languageName: node
+  linkType: hard
+
 "rc@npm:1.2.8":
   version: 1.2.8
   resolution: "rc@npm:1.2.8"
@@ -20296,6 +22814,31 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
+"react-circular-progressbar@npm:*, react-circular-progressbar@npm:^2.1.0":
+  version: 2.1.0
+  resolution: "react-circular-progressbar@npm:2.1.0"
+  peerDependencies:
+    react: ^0.14.0 || ^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0
+  checksum: dc118010a8f94733daafac586c969f7e889ad0736d96a0fda79406ee62e9410848abfd3dee4887bb0ff46b99e1f8c86ee1afabc88dfbf4dcb95107b22de1d6d7
+  languageName: node
+  linkType: hard
+
+"react-datepicker@npm:^3.8.0":
+  version: 3.8.0
+  resolution: "react-datepicker@npm:3.8.0"
+  dependencies:
+    classnames: ^2.2.6
+    date-fns: ^2.0.1
+    prop-types: ^15.7.2
+    react-onclickoutside: ^6.10.0
+    react-popper: ^1.3.8
+  peerDependencies:
+    react: ^16.9.0 || ^17
+    react-dom: ^16.9.0 || ^17
+  checksum: a6ba6d3a920629a1c31631768100c598da3535e267e9de7205fb1ce4c9515f13eecf2a6dff549e53acc37fcc4b2b0d381a035c8f256b5642cb5f823d9f02b7d3
+  languageName: node
+  linkType: hard
+
 "react-dev-utils@npm:^12.0.1":
   version: 12.0.1
   resolution: "react-dev-utils@npm:12.0.1"
@@ -20328,6 +22871,40 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
+"react-dnd-html5-backend@npm:^14.1.0":
+  version: 14.1.0
+  resolution: "react-dnd-html5-backend@npm:14.1.0"
+  dependencies:
+    dnd-core: 14.0.1
+  checksum: 6aa8d62c6b2288893b3f216d476d2f84495b40d33578ba9e3a5051dc093a71dc59700e6927ed7ac596ff8d7aa3b3f29404f7d173f844bd6144ed633403dd8e96
+  languageName: node
+  linkType: hard
+
+"react-dnd@npm:^14.0.5":
+  version: 14.0.5
+  resolution: "react-dnd@npm:14.0.5"
+  dependencies:
+    "@react-dnd/invariant": ^2.0.0
+    "@react-dnd/shallowequal": ^2.0.0
+    dnd-core: 14.0.1
+    fast-deep-equal: ^3.1.3
+    hoist-non-react-statics: ^3.3.2
+  peerDependencies:
+    "@types/hoist-non-react-statics": ">= 3.3.1"
+    "@types/node": ">= 12"
+    "@types/react": ">= 16"
+    react: ">= 16.14"
+  peerDependenciesMeta:
+    "@types/hoist-non-react-statics":
+      optional: true
+    "@types/node":
+      optional: true
+    "@types/react":
+      optional: true
+  checksum: 464e231de8c2b79546049a1600b67b1df0b7f762f23c688d3e9aeddbf334b1e64931ef91d0129df3c8be255f0af76e89426729dbcbefe4bdc09b0f665d2da368
+  languageName: node
+  linkType: hard
+
 "react-dom@npm:^17.0.2":
   version: 17.0.2
   resolution: "react-dom@npm:17.0.2"
@@ -20341,15 +22918,15 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
-"react-dom@npm:^18.2.0":
-  version: 18.2.0
-  resolution: "react-dom@npm:18.2.0"
+"react-dom@npm:^18.2.0, react-dom@npm:^18.3.1":
+  version: 18.3.1
+  resolution: "react-dom@npm:18.3.1"
   dependencies:
     loose-envify: ^1.1.0
-    scheduler: ^0.23.0
+    scheduler: ^0.23.2
   peerDependencies:
-    react: ^18.2.0
-  checksum: 7d323310bea3a91be2965f9468d552f201b1c27891e45ddc2d6b8f717680c95a75ae0bc1e3f5cf41472446a2589a75aed4483aee8169287909fcd59ad149e8cc
+    react: ^18.3.1
+  checksum: 298954ecd8f78288dcaece05e88b570014d8f6dce5db6f66e6ee91448debeb59dcd31561dddb354eee47e6c1bb234669459060deb238ed0213497146e555a0b9
   languageName: node
   linkType: hard
 
@@ -20360,13 +22937,23 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
-"react-fast-compare@npm:^3.2.0":
+"react-fast-compare@npm:^3.0.1, react-fast-compare@npm:^3.2.0":
   version: 3.2.2
   resolution: "react-fast-compare@npm:3.2.2"
   checksum: 2071415b4f76a3e6b55c84611c4d24dcb12ffc85811a2840b5a3f1ff2d1a99be1020d9437ee7c6e024c9f4cbb84ceb35e48cf84f28fcb00265ad2dfdd3947704
   languageName: node
   linkType: hard
 
+"react-focus-bounder@npm:^1.1.6":
+  version: 1.1.6
+  resolution: "react-focus-bounder@npm:1.1.6"
+  peerDependencies:
+    react: ^16.4.0 || ^17.0.0
+    react-dom: ^16.4.0 || ^17.0.0
+  checksum: 355af7e18e5243bc323e3b6a29cdaa2d19443d514f2dd59377191d91e500b8e3570eb3eec88e9a774d391060ba1cdbd40153874081993072e1c2b2224a965a99
+  languageName: node
+  linkType: hard
+
 "react-helmet-async@npm:*, react-helmet-async@npm:^1.3.0":
   version: 1.3.0
   resolution: "react-helmet-async@npm:1.3.0"
@@ -20383,6 +22970,48 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
+"react-hotkeys@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "react-hotkeys@npm:2.0.0"
+  dependencies:
+    prop-types: ^15.6.1
+  peerDependencies:
+    react: ">= 0.14.0"
+  checksum: 1b269159cbae45d8712369a187fb708dc89d0227cd91bdaa83509587e10bd3c5409d8828c5ced7fe0636088de4d63248a6df16e92493d0d89ecaa59e661da5dd
+  languageName: node
+  linkType: hard
+
+"react-i18next@npm:^11.18.6":
+  version: 11.18.6
+  resolution: "react-i18next@npm:11.18.6"
+  dependencies:
+    "@babel/runtime": ^7.14.5
+    html-parse-stringify: ^3.0.1
+  peerDependencies:
+    i18next: ">= 19.0.0"
+    react: ">= 16.8.0"
+  peerDependenciesMeta:
+    react-dom:
+      optional: true
+    react-native:
+      optional: true
+  checksum: 624c0a0313fac4e0d18560b83c99a8bd0a83abc02e5db8d01984e0643ac409d178668aa3a4720d01f7a0d9520d38598dcbff801d6f69a970bae67461de6cd852
+  languageName: node
+  linkType: hard
+
+"react-intersection-observer@npm:^9.10.3":
+  version: 9.13.0
+  resolution: "react-intersection-observer@npm:9.13.0"
+  peerDependencies:
+    react: ^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
+    react-dom: ^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
+  peerDependenciesMeta:
+    react-dom:
+      optional: true
+  checksum: ee2a163b078923c1556814834f83d7c3ea3e8a9d3ceef974351fd52afe12163518ec57cb2eb0f6544ac255ac4b64d2e7652bc5d60c255159c0f25bda57a565b6
+  languageName: node
+  linkType: hard
+
 "react-is@npm:^16.13.1, react-is@npm:^16.6.0, react-is@npm:^16.7.0":
   version: 16.13.1
   resolution: "react-is@npm:16.13.1"
@@ -20390,10 +23019,10 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
-"react-is@npm:^18.0.0":
-  version: 18.2.0
-  resolution: "react-is@npm:18.2.0"
-  checksum: e72d0ba81b5922759e4aff17e0252bd29988f9642ed817f56b25a3e217e13eea8a7f2322af99a06edb779da12d5d636e9fda473d620df9a3da0df2a74141d53e
+"react-is@npm:^18.0.0, react-is@npm:^18.2.0":
+  version: 18.3.1
+  resolution: "react-is@npm:18.3.1"
+  checksum: e20fe84c86ff172fc8d898251b7cc2c43645d108bf96d0b8edf39b98f9a2cae97b40520ee7ed8ee0085ccc94736c4886294456033304151c3f94978cec03df21
   languageName: node
   linkType: hard
 
@@ -20406,6 +23035,13 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
+"react-lifecycles-compat@npm:^3.0.4":
+  version: 3.0.4
+  resolution: "react-lifecycles-compat@npm:3.0.4"
+  checksum: a904b0fc0a8eeb15a148c9feb7bc17cec7ef96e71188280061fc340043fd6d8ee3ff233381f0e8f95c1cf926210b2c4a31f38182c8f35ac55057e453d6df204f
+  languageName: node
+  linkType: hard
+
 "react-loadable-ssr-addon-v5-slorber@npm:^1.0.1":
   version: 1.0.1
   resolution: "react-loadable-ssr-addon-v5-slorber@npm:1.0.1"
@@ -20418,6 +23054,65 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
+"react-moment@npm:^0.9.7":
+  version: 0.9.7
+  resolution: "react-moment@npm:0.9.7"
+  peerDependencies:
+    moment: ^2.24.0
+    prop-types: ^15.7.2
+    react: ^15.6.0 || ^16.0.0
+  checksum: cc0e9c6bb1675911a9fc985c3414981fb0bdef6d29f114080644980b19328c6b6f9bbccfb2f0cfcd3e90e6d408f27a5f326549932ea92422702066541791ef56
+  languageName: node
+  linkType: hard
+
+"react-onclickoutside@npm:^6.10.0":
+  version: 6.13.1
+  resolution: "react-onclickoutside@npm:6.13.1"
+  peerDependencies:
+    react: ^15.5.x || ^16.x || ^17.x || ^18.x
+    react-dom: ^15.5.x || ^16.x || ^17.x || ^18.x
+  checksum: 6c5727bfcd6e0ecc1fd83ac865a23382b7784aa54e3d0cb67520a53f9d02a1d312b9493d150fb8fa2f912b6cf4b23b228809c2513096ef6e53c7553162c048c7
+  languageName: node
+  linkType: hard
+
+"react-popper@npm:^1.3.8":
+  version: 1.3.11
+  resolution: "react-popper@npm:1.3.11"
+  dependencies:
+    "@babel/runtime": ^7.1.2
+    "@hypnosphi/create-react-context": ^0.3.1
+    deep-equal: ^1.1.1
+    popper.js: ^1.14.4
+    prop-types: ^15.6.1
+    typed-styles: ^0.0.7
+    warning: ^4.0.2
+  peerDependencies:
+    react: 0.14.x || ^15.0.0 || ^16.0.0 || ^17.0.0
+  checksum: a0f5994f5799f1c7364498f74df123dd2561fff4ae834b10fdcca74d9a8e159b523ed1f0708db33bad606933ab4f0d5ce9c90e48cbb671bf30016c890f3c7ea4
+  languageName: node
+  linkType: hard
+
+"react-popper@npm:^2.3.0":
+  version: 2.3.0
+  resolution: "react-popper@npm:2.3.0"
+  dependencies:
+    react-fast-compare: ^3.0.1
+    warning: ^4.0.2
+  peerDependencies:
+    "@popperjs/core": ^2.0.0
+    react: ^16.8.0 || ^17 || ^18
+    react-dom: ^16.8.0 || ^17 || ^18
+  checksum: 837111c98738011c69b3069a464ea5bdcbf487105b6148e8faf90cb7337e134edb1b98b8824322941c378756cca30a15c18c25f558e53b85ed5762fa0dc8e6b2
+  languageName: node
+  linkType: hard
+
+"react-refresh@npm:^0.14.2":
+  version: 0.14.2
+  resolution: "react-refresh@npm:0.14.2"
+  checksum: d80db4bd40a36dab79010dc8aa317a5b931f960c0d83c4f3b81f0552cbcf7f29e115b84bb7908ec6a1eb67720fff7023084eff73ece8a7ddc694882478464382
+  languageName: node
+  linkType: hard
+
 "react-router-config@npm:^5.1.1":
   version: 5.1.1
   resolution: "react-router-config@npm:5.1.1"
@@ -20466,6 +23161,33 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
+"react-timer-hoc@npm:^2.3.0":
+  version: 2.3.0
+  resolution: "react-timer-hoc@npm:2.3.0"
+  dependencies:
+    invariant: ~2.2.2
+    prop-types: ^15.6.0
+  peerDependencies:
+    react: ^15.0.0 || ^16.0.0
+  checksum: 3723ef610b78c1d1b5ed87fba092656dbd77535cce65c8149b5049ff5efb12a8e2b3d5ce33341188bcaa4b0c7e3f69263899a62686540e48c612f830a7e6655d
+  languageName: node
+  linkType: hard
+
+"react-transition-group@npm:^2.0.0":
+  version: 2.9.0
+  resolution: "react-transition-group@npm:2.9.0"
+  dependencies:
+    dom-helpers: ^3.4.0
+    loose-envify: ^1.4.0
+    prop-types: ^15.6.2
+    react-lifecycles-compat: ^3.0.4
+  peerDependencies:
+    react: ">=15.0.0"
+    react-dom: ">=15.0.0"
+  checksum: d8c9e50aabdc2cfc324e5cdb0ad1c6eecb02e1c0cd007b26d5b30ccf49015e900683dd489348c71fba4055858308d9ba7019e0d37d0e8d37bd46ed098788f670
+  languageName: node
+  linkType: hard
+
 "react@npm:^17.0.1":
   version: 17.0.2
   resolution: "react@npm:17.0.2"
@@ -20476,12 +23198,12 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
-"react@npm:^18.2.0":
-  version: 18.2.0
-  resolution: "react@npm:18.2.0"
+"react@npm:^18.2.0, react@npm:^18.3.1":
+  version: 18.3.1
+  resolution: "react@npm:18.3.1"
   dependencies:
     loose-envify: ^1.1.0
-  checksum: 88e38092da8839b830cda6feef2e8505dec8ace60579e46aa5490fc3dc9bba0bd50336507dc166f43e3afc1c42939c09fe33b25fae889d6f402721dcd78fca1b
+  checksum: a27bcfa8ff7c15a1e50244ad0d0c1cb2ad4375eeffefd266a64889beea6f6b64c4966c9b37d14ee32d6c9fcd5aa6ba183b6988167ab4d127d13e7cb5b386a376
   languageName: node
   linkType: hard
 
@@ -20680,7 +23402,7 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
-"readable-stream@npm:3, readable-stream@npm:^3.0.0, readable-stream@npm:^3.0.2, readable-stream@npm:^3.0.6, readable-stream@npm:^3.1.1, readable-stream@npm:^3.4.0, readable-stream@npm:^3.6.0":
+"readable-stream@npm:3, readable-stream@npm:^3.0.0, readable-stream@npm:^3.0.2, readable-stream@npm:^3.0.6, readable-stream@npm:^3.1.1, readable-stream@npm:^3.4.0, readable-stream@npm:^3.5.0, readable-stream@npm:^3.6.0":
   version: 3.6.2
   resolution: "readable-stream@npm:3.6.2"
   dependencies:
@@ -20691,7 +23413,7 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
-"readable-stream@npm:^2.0.1, readable-stream@npm:~2.3.6":
+"readable-stream@npm:^2.0.1, readable-stream@npm:^2.3.8, readable-stream@npm:~2.3.6":
   version: 2.3.8
   resolution: "readable-stream@npm:2.3.8"
   dependencies:
@@ -20806,6 +23528,15 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
+"redux@npm:^4.1.1":
+  version: 4.2.1
+  resolution: "redux@npm:4.2.1"
+  dependencies:
+    "@babel/runtime": ^7.9.2
+  checksum: f63b9060c3a1d930ae775252bb6e579b42415aee7a23c4114e21a0b4ba7ec12f0ec76936c00f546893f06e139819f0e2855e0d55ebfce34ca9c026241a6950dd
+  languageName: node
+  linkType: hard
+
 "reflect-metadata@npm:0.1.13":
   version: 0.1.13
   resolution: "reflect-metadata@npm:0.1.13"
@@ -20813,6 +23544,21 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
+"reflect.getprototypeof@npm:^1.0.4":
+  version: 1.0.6
+  resolution: "reflect.getprototypeof@npm:1.0.6"
+  dependencies:
+    call-bind: ^1.0.7
+    define-properties: ^1.2.1
+    es-abstract: ^1.23.1
+    es-errors: ^1.3.0
+    get-intrinsic: ^1.2.4
+    globalthis: ^1.0.3
+    which-builtin-type: ^1.1.3
+  checksum: 88e9e65a7eaa0bf8e9a8bbf8ac07571363bc333ba8b6769ed5e013e0042ed7c385e97fae9049510b3b5fe4b42472d8f32de9ce8ce84902bc4297d4bbe3777dba
+  languageName: node
+  linkType: hard
+
 "regenerate-unicode-properties@npm:^10.1.0":
   version: 10.1.1
   resolution: "regenerate-unicode-properties@npm:10.1.1"
@@ -20845,14 +23591,15 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
-"regexp.prototype.flags@npm:^1.5.1":
-  version: 1.5.1
-  resolution: "regexp.prototype.flags@npm:1.5.1"
+"regexp.prototype.flags@npm:^1.5.1, regexp.prototype.flags@npm:^1.5.2":
+  version: 1.5.2
+  resolution: "regexp.prototype.flags@npm:1.5.2"
   dependencies:
-    call-bind: ^1.0.2
-    define-properties: ^1.2.0
-    set-function-name: ^2.0.0
-  checksum: 869edff00288442f8d7fa4c9327f91d85f3b3acf8cbbef9ea7a220345cf23e9241b6def9263d2c1ebcf3a316b0aa52ad26a43a84aa02baca3381717b3e307f47
+    call-bind: ^1.0.6
+    define-properties: ^1.2.1
+    es-errors: ^1.3.0
+    set-function-name: ^2.0.1
+  checksum: d7f333667d5c564e2d7a97c56c3075d64c722c9bb51b2b4df6822b2e8096d623a5e63088fb4c83df919b6951ef8113841de8b47de7224872fa6838bc5d8a7d64
   languageName: node
   linkType: hard
 
@@ -21080,6 +23827,13 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
+"resize-observer-polyfill@npm:^1.5.1":
+  version: 1.5.1
+  resolution: "resize-observer-polyfill@npm:1.5.1"
+  checksum: 57e7f79489867b00ba43c9c051524a5c8f162a61d5547e99333549afc23e15c44fd43f2f318ea0261ea98c0eb3158cca261e6f48d66e1ed1cd1f340a43977094
+  languageName: node
+  linkType: hard
+
 "resolve-alpn@npm:^1.0.0, resolve-alpn@npm:^1.2.0":
   version: 1.2.1
   resolution: "resolve-alpn@npm:1.2.1"
@@ -21133,29 +23887,55 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
-"resolve@npm:^1.1.6, resolve@npm:^1.10.0, resolve@npm:^1.10.1, resolve@npm:^1.14.2, resolve@npm:^1.20.0, resolve@npm:^1.22.1, resolve@npm:^1.3.2":
-  version: 1.22.6
-  resolution: "resolve@npm:1.22.6"
+"resolve@npm:^1.1.6, resolve@npm:^1.10.0, resolve@npm:^1.10.1, resolve@npm:^1.14.2, resolve@npm:^1.17.0, resolve@npm:^1.20.0, resolve@npm:^1.22.1, resolve@npm:^1.3.2":
+  version: 1.22.8
+  resolution: "resolve@npm:1.22.8"
+  dependencies:
+    is-core-module: ^2.13.0
+    path-parse: ^1.0.7
+    supports-preserve-symlinks-flag: ^1.0.0
+  bin:
+    resolve: bin/resolve
+  checksum: f8a26958aa572c9b064562750b52131a37c29d072478ea32e129063e2da7f83e31f7f11e7087a18225a8561cfe8d2f0df9dbea7c9d331a897571c0a2527dbb4c
+  languageName: node
+  linkType: hard
+
+"resolve@npm:^2.0.0-next.5":
+  version: 2.0.0-next.5
+  resolution: "resolve@npm:2.0.0-next.5"
+  dependencies:
+    is-core-module: ^2.13.0
+    path-parse: ^1.0.7
+    supports-preserve-symlinks-flag: ^1.0.0
+  bin:
+    resolve: bin/resolve
+  checksum: a73ac69a1c4bd34c56b213d91f5b17ce390688fdb4a1a96ed3025cc7e08e7bfb90b3a06fcce461780cb0b589c958afcb0080ab802c71c01a7ecc8c64feafc89f
+  languageName: node
+  linkType: hard
+
+"resolve@patch:resolve@^1.1.6#~builtin<compat/resolve>, resolve@patch:resolve@^1.10.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.10.1#~builtin<compat/resolve>, resolve@patch:resolve@^1.14.2#~builtin<compat/resolve>, resolve@patch:resolve@^1.17.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.20.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.22.1#~builtin<compat/resolve>, resolve@patch:resolve@^1.3.2#~builtin<compat/resolve>":
+  version: 1.22.8
+  resolution: "resolve@patch:resolve@npm%3A1.22.8#~builtin<compat/resolve>::version=1.22.8&hash=c3c19d"
   dependencies:
     is-core-module: ^2.13.0
     path-parse: ^1.0.7
     supports-preserve-symlinks-flag: ^1.0.0
   bin:
     resolve: bin/resolve
-  checksum: d13bf66d4e2ee30d291491f16f2fa44edd4e0cefb85d53249dd6f93e70b2b8c20ec62f01b18662e3cd40e50a7528f18c4087a99490048992a3bb954cf3201a5b
+  checksum: 5479b7d431cacd5185f8db64bfcb7286ae5e31eb299f4c4f404ad8aa6098b77599563ac4257cb2c37a42f59dfc06a1bec2bcf283bb448f319e37f0feb9a09847
   languageName: node
   linkType: hard
 
-"resolve@patch:resolve@^1.1.6#~builtin<compat/resolve>, resolve@patch:resolve@^1.10.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.10.1#~builtin<compat/resolve>, resolve@patch:resolve@^1.14.2#~builtin<compat/resolve>, resolve@patch:resolve@^1.20.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.22.1#~builtin<compat/resolve>, resolve@patch:resolve@^1.3.2#~builtin<compat/resolve>":
-  version: 1.22.6
-  resolution: "resolve@patch:resolve@npm%3A1.22.6#~builtin<compat/resolve>::version=1.22.6&hash=c3c19d"
+"resolve@patch:resolve@^2.0.0-next.5#~builtin<compat/resolve>":
+  version: 2.0.0-next.5
+  resolution: "resolve@patch:resolve@npm%3A2.0.0-next.5#~builtin<compat/resolve>::version=2.0.0-next.5&hash=c3c19d"
   dependencies:
     is-core-module: ^2.13.0
     path-parse: ^1.0.7
     supports-preserve-symlinks-flag: ^1.0.0
   bin:
     resolve: bin/resolve
-  checksum: 9d3b3c67aefd12cecbe5f10ca4d1f51ea190891096497c43f301b086883b426466918c3a64f1bbf1788fabb52b579d58809614006c5d0b49186702b3b8fb746a
+  checksum: 064d09c1808d0c51b3d90b5d27e198e6d0c5dad0eb57065fd40803d6a20553e5398b07f76739d69cbabc12547058bec6b32106ea66622375fb0d7e8fca6a846c
   languageName: node
   linkType: hard
 
@@ -21225,7 +24005,7 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
-"rimraf@npm:3.0.2, rimraf@npm:^3.0.0, rimraf@npm:^3.0.2":
+"rimraf@npm:^3.0.0, rimraf@npm:^3.0.2":
   version: 3.0.2
   resolution: "rimraf@npm:3.0.2"
   dependencies:
@@ -21256,6 +24036,16 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
+"ripemd160@npm:^2.0.0, ripemd160@npm:^2.0.1":
+  version: 2.0.2
+  resolution: "ripemd160@npm:2.0.2"
+  dependencies:
+    hash-base: ^3.0.0
+    inherits: ^2.0.1
+  checksum: 006accc40578ee2beae382757c4ce2908a826b27e2b079efdcd2959ee544ddf210b7b5d7d5e80467807604244e7388427330f5c6d4cd61e6edaddc5773ccc393
+  languageName: node
+  linkType: hard
+
 "robust-predicates@npm:^3.0.2":
   version: 3.0.2
   resolution: "robust-predicates@npm:3.0.2"
@@ -21277,6 +24067,69 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
+"rollup@npm:^4.13.0":
+  version: 4.19.0
+  resolution: "rollup@npm:4.19.0"
+  dependencies:
+    "@rollup/rollup-android-arm-eabi": 4.19.0
+    "@rollup/rollup-android-arm64": 4.19.0
+    "@rollup/rollup-darwin-arm64": 4.19.0
+    "@rollup/rollup-darwin-x64": 4.19.0
+    "@rollup/rollup-linux-arm-gnueabihf": 4.19.0
+    "@rollup/rollup-linux-arm-musleabihf": 4.19.0
+    "@rollup/rollup-linux-arm64-gnu": 4.19.0
+    "@rollup/rollup-linux-arm64-musl": 4.19.0
+    "@rollup/rollup-linux-powerpc64le-gnu": 4.19.0
+    "@rollup/rollup-linux-riscv64-gnu": 4.19.0
+    "@rollup/rollup-linux-s390x-gnu": 4.19.0
+    "@rollup/rollup-linux-x64-gnu": 4.19.0
+    "@rollup/rollup-linux-x64-musl": 4.19.0
+    "@rollup/rollup-win32-arm64-msvc": 4.19.0
+    "@rollup/rollup-win32-ia32-msvc": 4.19.0
+    "@rollup/rollup-win32-x64-msvc": 4.19.0
+    "@types/estree": 1.0.5
+    fsevents: ~2.3.2
+  dependenciesMeta:
+    "@rollup/rollup-android-arm-eabi":
+      optional: true
+    "@rollup/rollup-android-arm64":
+      optional: true
+    "@rollup/rollup-darwin-arm64":
+      optional: true
+    "@rollup/rollup-darwin-x64":
+      optional: true
+    "@rollup/rollup-linux-arm-gnueabihf":
+      optional: true
+    "@rollup/rollup-linux-arm-musleabihf":
+      optional: true
+    "@rollup/rollup-linux-arm64-gnu":
+      optional: true
+    "@rollup/rollup-linux-arm64-musl":
+      optional: true
+    "@rollup/rollup-linux-powerpc64le-gnu":
+      optional: true
+    "@rollup/rollup-linux-riscv64-gnu":
+      optional: true
+    "@rollup/rollup-linux-s390x-gnu":
+      optional: true
+    "@rollup/rollup-linux-x64-gnu":
+      optional: true
+    "@rollup/rollup-linux-x64-musl":
+      optional: true
+    "@rollup/rollup-win32-arm64-msvc":
+      optional: true
+    "@rollup/rollup-win32-ia32-msvc":
+      optional: true
+    "@rollup/rollup-win32-x64-msvc":
+      optional: true
+    fsevents:
+      optional: true
+  bin:
+    rollup: dist/bin/rollup
+  checksum: 9c26087d3971a166a51a8941a05bf35ab770879aca59b7d24b6fa0dabf87239fc66cc7f07a69fdc4af346877f22d63db5de848a255a685ca5011e83381a0a989
+  languageName: node
+  linkType: hard
+
 "rtl-detect@npm:^1.0.4":
   version: 1.0.4
   resolution: "rtl-detect@npm:1.0.4"
@@ -21357,15 +24210,15 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
-"safe-array-concat@npm:^1.0.0, safe-array-concat@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "safe-array-concat@npm:1.0.1"
+"safe-array-concat@npm:^1.0.0, safe-array-concat@npm:^1.1.2":
+  version: 1.1.2
+  resolution: "safe-array-concat@npm:1.1.2"
   dependencies:
-    call-bind: ^1.0.2
-    get-intrinsic: ^1.2.1
+    call-bind: ^1.0.7
+    get-intrinsic: ^1.2.4
     has-symbols: ^1.0.3
     isarray: ^2.0.5
-  checksum: 001ecf1d8af398251cbfabaf30ed66e3855127fbceee178179524b24160b49d15442f94ed6c0db0b2e796da76bb05b73bf3cc241490ec9c2b741b41d33058581
+  checksum: a3b259694754ddfb73ae0663829e396977b99ff21cbe8607f35a469655656da8e271753497e59da8a7575baa94d2e684bea3e10ddd74ba046c0c9b4418ffa0c4
   languageName: node
   linkType: hard
 
@@ -21376,21 +24229,21 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
-"safe-buffer@npm:5.2.1, safe-buffer@npm:>=5.1.0, safe-buffer@npm:^5.1.0, safe-buffer@npm:~5.2.0":
+"safe-buffer@npm:5.2.1, safe-buffer@npm:>=5.1.0, safe-buffer@npm:^5.0.1, safe-buffer@npm:^5.1.0, safe-buffer@npm:^5.1.1, safe-buffer@npm:^5.1.2, safe-buffer@npm:^5.2.0, safe-buffer@npm:^5.2.1, safe-buffer@npm:~5.2.0":
   version: 5.2.1
   resolution: "safe-buffer@npm:5.2.1"
   checksum: b99c4b41fdd67a6aaf280fcd05e9ffb0813654894223afb78a31f14a19ad220bba8aba1cb14eddce1fcfb037155fe6de4e861784eb434f7d11ed58d1e70dd491
   languageName: node
   linkType: hard
 
-"safe-regex-test@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "safe-regex-test@npm:1.0.0"
+"safe-regex-test@npm:^1.0.3":
+  version: 1.0.3
+  resolution: "safe-regex-test@npm:1.0.3"
   dependencies:
-    call-bind: ^1.0.2
-    get-intrinsic: ^1.1.3
+    call-bind: ^1.0.6
+    es-errors: ^1.3.0
     is-regex: ^1.1.4
-  checksum: bc566d8beb8b43c01b94e67de3f070fd2781685e835959bbbaaec91cc53381145ca91f69bd837ce6ec244817afa0a5e974fc4e40a2957f0aca68ac3add1ddd34
+  checksum: 6c7d392ff1ae7a3ae85273450ed02d1d131f1d2c76e177d6b03eb88e6df8fa062639070e7d311802c1615f351f18dc58f9454501c58e28d5ffd9b8f502ba6489
   languageName: node
   linkType: hard
 
@@ -21415,6 +24268,19 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
+"sass@npm:^1.77.8":
+  version: 1.77.8
+  resolution: "sass@npm:1.77.8"
+  dependencies:
+    chokidar: ">=3.0.0 <4.0.0"
+    immutable: ^4.0.0
+    source-map-js: ">=0.6.2 <2.0.0"
+  bin:
+    sass: sass.js
+  checksum: 6b5dce17faa1bd1e349b4825bf7f76559a32f3f95d789cd2847623c88ee9635e1485d3458532a05fa5b9134cfbce79a4bad3f13dc63c2433632347674db0abae
+  languageName: node
+  linkType: hard
+
 "sax@npm:>=0.6.0, sax@npm:^1.2.4, sax@npm:~1.2.4":
   version: 1.2.4
   resolution: "sax@npm:1.2.4"
@@ -21431,6 +24297,15 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
+"saxes@npm:^6.0.0":
+  version: 6.0.0
+  resolution: "saxes@npm:6.0.0"
+  dependencies:
+    xmlchars: ^2.2.0
+  checksum: d3fa3e2aaf6c65ed52ee993aff1891fc47d5e47d515164b5449cbf5da2cbdc396137e55590472e64c5c436c14ae64a8a03c29b9e7389fc6f14035cf4e982ef3b
+  languageName: node
+  linkType: hard
+
 "scheduler@npm:^0.20.2":
   version: 0.20.2
   resolution: "scheduler@npm:0.20.2"
@@ -21441,12 +24316,12 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
-"scheduler@npm:^0.23.0":
-  version: 0.23.0
-  resolution: "scheduler@npm:0.23.0"
+"scheduler@npm:^0.23.2":
+  version: 0.23.2
+  resolution: "scheduler@npm:0.23.2"
   dependencies:
     loose-envify: ^1.1.0
-  checksum: d79192eeaa12abef860c195ea45d37cbf2bbf5f66e3c4dcd16f54a7da53b17788a70d109ee3d3dde1a0fd50e6a8fc171f4300356c5aee4fc0171de526bf35f8a
+  checksum: 3e82d1f419e240ef6219d794ff29c7ee415fbdc19e038f680a10c067108e06284f1847450a210b29bbaf97b9d8a97ced5f624c31c681248ac84c80d56ad5a2c4
   languageName: node
   linkType: hard
 
@@ -21539,7 +24414,7 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
-"semver@npm:7.5.4, semver@npm:^7.0.0, semver@npm:^7.1.1, semver@npm:^7.3.2, semver@npm:^7.3.4, semver@npm:^7.3.5, semver@npm:^7.3.7, semver@npm:^7.3.8, semver@npm:^7.5.0, semver@npm:^7.5.3, semver@npm:^7.5.4":
+"semver@npm:7.5.4":
   version: 7.5.4
   resolution: "semver@npm:7.5.4"
   dependencies:
@@ -21559,6 +24434,15 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
+"semver@npm:^7.0.0, semver@npm:^7.1.1, semver@npm:^7.3.2, semver@npm:^7.3.4, semver@npm:^7.3.5, semver@npm:^7.3.7, semver@npm:^7.3.8, semver@npm:^7.5.0, semver@npm:^7.5.3, semver@npm:^7.5.4, semver@npm:^7.6.0, semver@npm:^7.6.3":
+  version: 7.6.3
+  resolution: "semver@npm:7.6.3"
+  bin:
+    semver: bin/semver.js
+  checksum: 4110ec5d015c9438f322257b1c51fe30276e5f766a3f64c09edd1d7ea7118ecbc3f379f3b69032bacf13116dc7abc4ad8ce0d7e2bd642e26b0d271b56b61a7d8
+  languageName: node
+  linkType: hard
+
 "semver@npm:~7.0.0":
   version: 7.0.0
   resolution: "semver@npm:7.0.0"
@@ -21598,25 +24482,25 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
-"serialport@npm:10.5.0":
-  version: 10.5.0
-  resolution: "serialport@npm:10.5.0"
+"serialport@npm:12.0.0":
+  version: 12.0.0
+  resolution: "serialport@npm:12.0.0"
   dependencies:
     "@serialport/binding-mock": 10.2.2
-    "@serialport/bindings-cpp": 10.8.0
-    "@serialport/parser-byte-length": 10.5.0
-    "@serialport/parser-cctalk": 10.5.0
-    "@serialport/parser-delimiter": 10.5.0
-    "@serialport/parser-inter-byte-timeout": 10.5.0
-    "@serialport/parser-packet-length": 10.5.0
-    "@serialport/parser-readline": 10.5.0
-    "@serialport/parser-ready": 10.5.0
-    "@serialport/parser-regex": 10.5.0
-    "@serialport/parser-slip-encoder": 10.5.0
-    "@serialport/parser-spacepacket": 10.5.0
-    "@serialport/stream": 10.5.0
-    debug: ^4.3.3
-  checksum: ec9198de990e4383e2606767068e6e487c0c642d7d8223aa5e8e63bdd1ce9b88ede8ebff03c1c198046b5258a23d2bbdef7b021176c07a9f78830baf4ec8cae5
+    "@serialport/bindings-cpp": 12.0.1
+    "@serialport/parser-byte-length": 12.0.0
+    "@serialport/parser-cctalk": 12.0.0
+    "@serialport/parser-delimiter": 12.0.0
+    "@serialport/parser-inter-byte-timeout": 12.0.0
+    "@serialport/parser-packet-length": 12.0.0
+    "@serialport/parser-readline": 12.0.0
+    "@serialport/parser-ready": 12.0.0
+    "@serialport/parser-regex": 12.0.0
+    "@serialport/parser-slip-encoder": 12.0.0
+    "@serialport/parser-spacepacket": 12.0.0
+    "@serialport/stream": 12.0.0
+    debug: 4.3.4
+  checksum: 4ca7ed900185b87c87701ccfed819748bb0be302f697975d744336f73e0d54e2aa69d7cd4b851b04c8b878eaec285566cc0216e1ec792d84dd206ccbb86609a9
   languageName: node
   linkType: hard
 
@@ -21670,14 +24554,36 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
-"set-function-name@npm:^2.0.0, set-function-name@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "set-function-name@npm:2.0.1"
+"set-function-length@npm:^1.2.1":
+  version: 1.2.2
+  resolution: "set-function-length@npm:1.2.2"
   dependencies:
-    define-data-property: ^1.0.1
+    define-data-property: ^1.1.4
+    es-errors: ^1.3.0
+    function-bind: ^1.1.2
+    get-intrinsic: ^1.2.4
+    gopd: ^1.0.1
+    has-property-descriptors: ^1.0.2
+  checksum: a8248bdacdf84cb0fab4637774d9fb3c7a8e6089866d04c817583ff48e14149c87044ce683d7f50759a8c50fb87c7a7e173535b06169c87ef76f5fb276dfff72
+  languageName: node
+  linkType: hard
+
+"set-function-name@npm:^2.0.1, set-function-name@npm:^2.0.2":
+  version: 2.0.2
+  resolution: "set-function-name@npm:2.0.2"
+  dependencies:
+    define-data-property: ^1.1.4
+    es-errors: ^1.3.0
     functions-have-names: ^1.2.3
-    has-property-descriptors: ^1.0.0
-  checksum: 4975d17d90c40168eee2c7c9c59d023429f0a1690a89d75656306481ece0c3c1fb1ebcc0150ea546d1913e35fbd037bace91372c69e543e51fc5d1f31a9fa126
+    has-property-descriptors: ^1.0.2
+  checksum: d6229a71527fd0404399fc6227e0ff0652800362510822a291925c9d7b48a1ca1a468b11b281471c34cd5a2da0db4f5d7ff315a61d26655e77f6e971e6d0c80f
+  languageName: node
+  linkType: hard
+
+"setimmediate@npm:^1.0.4":
+  version: 1.0.5
+  resolution: "setimmediate@npm:1.0.5"
+  checksum: c9a6f2c5b51a2dabdc0247db9c46460152ffc62ee139f3157440bd48e7c59425093f42719ac1d7931f054f153e2d26cf37dfeb8da17a794a58198a2705e527fd
   languageName: node
   linkType: hard
 
@@ -21695,6 +24601,18 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
+"sha.js@npm:^2.4.0, sha.js@npm:^2.4.11, sha.js@npm:^2.4.8":
+  version: 2.4.11
+  resolution: "sha.js@npm:2.4.11"
+  dependencies:
+    inherits: ^2.0.1
+    safe-buffer: ^5.0.1
+  bin:
+    sha.js: ./bin.js
+  checksum: ebd3f59d4b799000699097dadb831c8e3da3eb579144fd7eb7a19484cbcbb7aca3c68ba2bb362242eb09e33217de3b4ea56e4678184c334323eca24a58e3ad07
+  languageName: node
+  linkType: hard
+
 "shallow-clone-shim@npm:^2.0.0":
   version: 2.0.0
   resolution: "shallow-clone-shim@npm:2.0.0"
@@ -21766,14 +24684,15 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
-"side-channel@npm:^1.0.4":
-  version: 1.0.4
-  resolution: "side-channel@npm:1.0.4"
+"side-channel@npm:^1.0.4, side-channel@npm:^1.0.6":
+  version: 1.0.6
+  resolution: "side-channel@npm:1.0.6"
   dependencies:
-    call-bind: ^1.0.0
-    get-intrinsic: ^1.0.2
-    object-inspect: ^1.9.0
-  checksum: 351e41b947079c10bd0858364f32bb3a7379514c399edb64ab3dce683933483fc63fb5e4efe0a15a2e8a7e3c436b6a91736ddb8d8c6591b0460a24bb4a1ee245
+    call-bind: ^1.0.7
+    es-errors: ^1.3.0
+    get-intrinsic: ^1.2.4
+    object-inspect: ^1.13.1
+  checksum: bfc1afc1827d712271453e91b7cd3878ac0efd767495fd4e594c4c2afaa7963b7b510e249572bfd54b0527e66e4a12b61b80c061389e129755f34c493aad9b97
   languageName: node
   linkType: hard
 
@@ -21826,6 +24745,18 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
+"simple-oauth2@npm:^5.1.0":
+  version: 5.1.0
+  resolution: "simple-oauth2@npm:5.1.0"
+  dependencies:
+    "@hapi/hoek": ^11.0.4
+    "@hapi/wreck": ^18.0.0
+    debug: ^4.3.4
+    joi: ^17.6.4
+  checksum: 65e07a92ffdfbc38fdd7db5480349b09c4c896559b6b3786a256546fe3aa6ac80086fa4f2c30d1d68ff551668147343c0a0dcc53c33fe7e5d1a7b42b4772eedc
+  languageName: node
+  linkType: hard
+
 "simple-swizzle@npm:^0.2.2":
   version: 0.2.2
   resolution: "simple-swizzle@npm:0.2.2"
@@ -21844,6 +24775,20 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
+"sinon@npm:^14.0.2":
+  version: 14.0.2
+  resolution: "sinon@npm:14.0.2"
+  dependencies:
+    "@sinonjs/commons": ^2.0.0
+    "@sinonjs/fake-timers": ^9.1.2
+    "@sinonjs/samsam": ^7.0.1
+    diff: ^5.0.0
+    nise: ^5.1.2
+    supports-color: ^7.2.0
+  checksum: de7730cd7785a457e42f9a93e955780c870296036a13816e3c0c5648360afae82fdc748e36c854cf26fb8abd117855a7211aee49265c334fa61439aae17a1b72
+  languageName: node
+  linkType: hard
+
 "sirv@npm:^2.0.3":
   version: 2.0.3
   resolution: "sirv@npm:2.0.3"
@@ -21961,13 +24906,24 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
-"socks@npm:^2.6.2, socks@npm:^2.7.1":
-  version: 2.7.1
-  resolution: "socks@npm:2.7.1"
+"socks-proxy-agent@npm:^8.0.2, socks-proxy-agent@npm:^8.0.4":
+  version: 8.0.4
+  resolution: "socks-proxy-agent@npm:8.0.4"
+  dependencies:
+    agent-base: ^7.1.1
+    debug: ^4.3.4
+    socks: ^2.8.3
+  checksum: b2ec5051d85fe49072f9a250c427e0e9571fd09d5db133819192d078fd291276e1f0f50f6dbc04329b207738b1071314cee8bdbb4b12e27de42dbcf1d4233c67
+  languageName: node
+  linkType: hard
+
+"socks@npm:^2.6.2, socks@npm:^2.7.1, socks@npm:^2.8.3":
+  version: 2.8.3
+  resolution: "socks@npm:2.8.3"
   dependencies:
-    ip: ^2.0.0
+    ip-address: ^9.0.5
     smart-buffer: ^4.2.0
-  checksum: 259d9e3e8e1c9809a7f5c32238c3d4d2a36b39b83851d0f573bfde5f21c4b1288417ce1af06af1452569cd1eb0841169afd4998f0e04ba04656f6b7f0e46d748
+  checksum: 7a6b7f6eedf7482b9e4597d9a20e09505824208006ea8f2c49b71657427f3c137ca2ae662089baa73e1971c62322d535d9d0cf1c9235cf6f55e315c18203eadd
   languageName: node
   linkType: hard
 
@@ -22017,7 +24973,7 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
-"source-map-js@npm:^1.2.0":
+"source-map-js@npm:>=0.6.2 <2.0.0, source-map-js@npm:^1.2.0":
   version: 1.2.0
   resolution: "source-map-js@npm:1.2.0"
   checksum: 791a43306d9223792e84293b00458bf102a8946e7188f3db0e4e22d8d530b5f80a4ce468eb5ec0bf585443ad55ebbd630bf379c98db0b1f317fd902500217f97
@@ -22187,6 +25143,13 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
+"split-on-first@npm:^1.0.0":
+  version: 1.1.0
+  resolution: "split-on-first@npm:1.1.0"
+  checksum: 16ff85b54ddcf17f9147210a4022529b343edbcbea4ce977c8f30e38408b8d6e0f25f92cd35b86a524d4797f455e29ab89eb8db787f3c10708e0b47ebf528d30
+  languageName: node
+  linkType: hard
+
 "split2@npm:^3.0.0":
   version: 3.2.2
   resolution: "split2@npm:3.2.2"
@@ -22302,6 +25265,25 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
+"stop-iteration-iterator@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "stop-iteration-iterator@npm:1.0.0"
+  dependencies:
+    internal-slot: ^1.0.4
+  checksum: d04173690b2efa40e24ab70e5e51a3ff31d56d699550cfad084104ab3381390daccb36652b25755e420245f3b0737de66c1879eaa2a8d4fc0a78f9bf892fcb42
+  languageName: node
+  linkType: hard
+
+"stream-browserify@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "stream-browserify@npm:3.0.0"
+  dependencies:
+    inherits: ~2.0.4
+    readable-stream: ^3.5.0
+  checksum: 4c47ef64d6f03815a9ca3874e2319805e8e8a85f3550776c47ce523b6f4c6cd57f40e46ec6a9ab8ad260fde61863c2718f250d3bedb3fe9052444eb9abfd9921
+  languageName: node
+  linkType: hard
+
 "stream-chopper@npm:^3.0.1":
   version: 3.0.1
   resolution: "stream-chopper@npm:3.0.1"
@@ -22311,6 +25293,40 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
+"stream-http@npm:^3.2.0":
+  version: 3.2.0
+  resolution: "stream-http@npm:3.2.0"
+  dependencies:
+    builtin-status-codes: ^3.0.0
+    inherits: ^2.0.4
+    readable-stream: ^3.6.0
+    xtend: ^4.0.2
+  checksum: c9b78453aeb0c84fcc59555518ac62bacab9fa98e323e7b7666e5f9f58af8f3155e34481078509b02929bd1268427f664d186604cdccee95abc446099b339f83
+  languageName: node
+  linkType: hard
+
+"streamx@npm:^2.15.0, streamx@npm:^2.18.0":
+  version: 2.20.0
+  resolution: "streamx@npm:2.20.0"
+  dependencies:
+    bare-events: ^2.2.0
+    fast-fifo: ^1.3.2
+    queue-tick: ^1.0.1
+    text-decoder: ^1.1.0
+  dependenciesMeta:
+    bare-events:
+      optional: true
+  checksum: a6413c114eb6ee41cc7ace3b242c72e4e1feaa5c3da7b7221bd16ff2eba79f4f217a8f983336ab61f0365607e19c4ca6dea751421d246dca8adc809f86472b1c
+  languageName: node
+  linkType: hard
+
+"strict-uri-encode@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "strict-uri-encode@npm:2.0.0"
+  checksum: eaac4cf978b6fbd480f1092cab8b233c9b949bcabfc9b598dd79a758f7243c28765ef7639c876fa72940dac687181b35486ea01ff7df3e65ce3848c64822c581
+  languageName: node
+  linkType: hard
+
 "string-argv@npm:0.3.2":
   version: 0.3.2
   resolution: "string-argv@npm:0.3.2"
@@ -22346,51 +25362,82 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
-"string-width@npm:^5.0.0, string-width@npm:^5.0.1, string-width@npm:^5.1.2":
-  version: 5.1.2
-  resolution: "string-width@npm:5.1.2"
+"string-width@npm:^5.0.0, string-width@npm:^5.0.1, string-width@npm:^5.1.2":
+  version: 5.1.2
+  resolution: "string-width@npm:5.1.2"
+  dependencies:
+    eastasianwidth: ^0.2.0
+    emoji-regex: ^9.2.2
+    strip-ansi: ^7.0.1
+  checksum: 7369deaa29f21dda9a438686154b62c2c5f661f8dda60449088f9f980196f7908fc39fdd1803e3e01541970287cf5deae336798337e9319a7055af89dafa7193
+  languageName: node
+  linkType: hard
+
+"string.prototype.matchall@npm:^4.0.11":
+  version: 4.0.11
+  resolution: "string.prototype.matchall@npm:4.0.11"
+  dependencies:
+    call-bind: ^1.0.7
+    define-properties: ^1.2.1
+    es-abstract: ^1.23.2
+    es-errors: ^1.3.0
+    es-object-atoms: ^1.0.0
+    get-intrinsic: ^1.2.4
+    gopd: ^1.0.1
+    has-symbols: ^1.0.3
+    internal-slot: ^1.0.7
+    regexp.prototype.flags: ^1.5.2
+    set-function-name: ^2.0.2
+    side-channel: ^1.0.6
+  checksum: 6ac6566ed065c0c8489c91156078ca077db8ff64d683fda97ae652d00c52dfa5f39aaab0a710d8243031a857fd2c7c511e38b45524796764d25472d10d7075ae
+  languageName: node
+  linkType: hard
+
+"string.prototype.repeat@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "string.prototype.repeat@npm:1.0.0"
   dependencies:
-    eastasianwidth: ^0.2.0
-    emoji-regex: ^9.2.2
-    strip-ansi: ^7.0.1
-  checksum: 7369deaa29f21dda9a438686154b62c2c5f661f8dda60449088f9f980196f7908fc39fdd1803e3e01541970287cf5deae336798337e9319a7055af89dafa7193
+    define-properties: ^1.1.3
+    es-abstract: ^1.17.5
+  checksum: 95dfc514ed7f328d80a066dabbfbbb1615c3e51490351085409db2eb7cbfed7ea29fdadaf277647fbf9f4a1e10e6dd9e95e78c0fd2c4e6bb6723ea6e59401004
   languageName: node
   linkType: hard
 
-"string.prototype.trim@npm:^1.2.8":
-  version: 1.2.8
-  resolution: "string.prototype.trim@npm:1.2.8"
+"string.prototype.trim@npm:^1.2.9":
+  version: 1.2.9
+  resolution: "string.prototype.trim@npm:1.2.9"
   dependencies:
-    call-bind: ^1.0.2
-    define-properties: ^1.2.0
-    es-abstract: ^1.22.1
-  checksum: 49eb1a862a53aba73c3fb6c2a53f5463173cb1f4512374b623bcd6b43ad49dd559a06fb5789bdec771a40fc4d2a564411c0a75d35fb27e76bbe738c211ecff07
+    call-bind: ^1.0.7
+    define-properties: ^1.2.1
+    es-abstract: ^1.23.0
+    es-object-atoms: ^1.0.0
+  checksum: ea2df6ec1e914c9d4e2dc856fa08228e8b1be59b59e50b17578c94a66a176888f417264bb763d4aac638ad3b3dad56e7a03d9317086a178078d131aa293ba193
   languageName: node
   linkType: hard
 
-"string.prototype.trimend@npm:^1.0.7":
-  version: 1.0.7
-  resolution: "string.prototype.trimend@npm:1.0.7"
+"string.prototype.trimend@npm:^1.0.8":
+  version: 1.0.8
+  resolution: "string.prototype.trimend@npm:1.0.8"
   dependencies:
-    call-bind: ^1.0.2
-    define-properties: ^1.2.0
-    es-abstract: ^1.22.1
-  checksum: 2375516272fd1ba75992f4c4aa88a7b5f3c7a9ca308d963bcd5645adf689eba6f8a04ebab80c33e30ec0aefc6554181a3a8416015c38da0aa118e60ec896310c
+    call-bind: ^1.0.7
+    define-properties: ^1.2.1
+    es-object-atoms: ^1.0.0
+  checksum: cc3bd2de08d8968a28787deba9a3cb3f17ca5f9f770c91e7e8fa3e7d47f079bad70fadce16f05dda9f261788be2c6e84a942f618c3bed31e42abc5c1084f8dfd
   languageName: node
   linkType: hard
 
-"string.prototype.trimstart@npm:^1.0.7":
-  version: 1.0.7
-  resolution: "string.prototype.trimstart@npm:1.0.7"
+"string.prototype.trimstart@npm:^1.0.8":
+  version: 1.0.8
+  resolution: "string.prototype.trimstart@npm:1.0.8"
   dependencies:
-    call-bind: ^1.0.2
-    define-properties: ^1.2.0
-    es-abstract: ^1.22.1
-  checksum: 13d0c2cb0d5ff9e926fa0bec559158b062eed2b68cd5be777ffba782c96b2b492944e47057274e064549b94dd27cf81f48b27a31fee8af5b574cff253e7eb613
+    call-bind: ^1.0.7
+    define-properties: ^1.2.1
+    es-object-atoms: ^1.0.0
+  checksum: df1007a7f580a49d692375d996521dc14fd103acda7f3034b3c558a60b82beeed3a64fa91e494e164581793a8ab0ae2f59578a49896a7af6583c1f20472bce96
   languageName: node
   linkType: hard
 
-"string_decoder@npm:^1.1.1, string_decoder@npm:^1.3.0":
+"string_decoder@npm:^1.0.0, string_decoder@npm:^1.1.1, string_decoder@npm:^1.3.0":
   version: 1.3.0
   resolution: "string_decoder@npm:1.3.0"
   dependencies:
@@ -22590,12 +25637,12 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
-"superfly-timeline@npm:9.0.0, superfly-timeline@npm:^9.0.0":
-  version: 9.0.0
-  resolution: "superfly-timeline@npm:9.0.0"
+"superfly-timeline@npm:9.0.2, superfly-timeline@npm:^9.0.1":
+  version: 9.0.2
+  resolution: "superfly-timeline@npm:9.0.2"
   dependencies:
     tslib: ^2.6.0
-  checksum: bb56fc6d6884f2956cdc1f18edceff48bc693c2329b009170e4d399ce70b8123ef38ddada0f0479eb359690eae39e7e578a9ec4ba326d6e4704653f74cde1a6d
+  checksum: d628d467d5384f5667bc10b877478c5b8b0a91774b5d5c5e9d9d3134b8f1b760225f2fbbb0f9ccd3e55f930c9f3719f81b9347b94ea853fbc0a18bc121d97665
   languageName: node
   linkType: hard
 
@@ -22608,7 +25655,7 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
-"supports-color@npm:^7.1.0":
+"supports-color@npm:^7.1.0, supports-color@npm:^7.2.0":
   version: 7.2.0
   resolution: "supports-color@npm:7.2.0"
   dependencies:
@@ -22710,19 +25757,35 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
-"tar-fs@npm:2.1.1":
-  version: 2.1.1
-  resolution: "tar-fs@npm:2.1.1"
+"tar-fs@npm:^3.0.6":
+  version: 3.0.6
+  resolution: "tar-fs@npm:3.0.6"
   dependencies:
-    chownr: ^1.1.1
-    mkdirp-classic: ^0.5.2
+    bare-fs: ^2.1.1
+    bare-path: ^2.1.0
     pump: ^3.0.0
-    tar-stream: ^2.1.4
-  checksum: f5b9a70059f5b2969e65f037b4e4da2daf0fa762d3d232ffd96e819e3f94665dbbbe62f76f084f1acb4dbdcce16c6e4dac08d12ffc6d24b8d76720f4d9cf032d
+    tar-stream: ^3.1.5
+  dependenciesMeta:
+    bare-fs:
+      optional: true
+    bare-path:
+      optional: true
+  checksum: b4fa09c70f75caf05bf5cf87369cd2862f1ac5fb75c4ddf9d25d55999f7736a94b58ad679d384196cba837c5f5ff14086e060fafccef5474a16e2d3058ffa488
+  languageName: node
+  linkType: hard
+
+"tar-stream@npm:^3.1.5":
+  version: 3.1.7
+  resolution: "tar-stream@npm:3.1.7"
+  dependencies:
+    b4a: ^1.6.4
+    fast-fifo: ^1.2.0
+    streamx: ^2.15.0
+  checksum: 6393a6c19082b17b8dcc8e7fd349352bb29b4b8bfe1075912b91b01743ba6bb4298f5ff0b499a3bbaf82121830e96a1a59d4f21a43c0df339e54b01789cb8cc6
   languageName: node
   linkType: hard
 
-"tar-stream@npm:^2.1.4, tar-stream@npm:~2.2.0":
+"tar-stream@npm:~2.2.0":
   version: 2.2.0
   resolution: "tar-stream@npm:2.2.0"
   dependencies:
@@ -22865,6 +25928,15 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
+"text-decoder@npm:^1.1.0":
+  version: 1.1.1
+  resolution: "text-decoder@npm:1.1.1"
+  dependencies:
+    b4a: ^1.6.4
+  checksum: 6e734c0ad1de0312e7517fd58066859586540e78741454aeb658a1e2b8bad304a600479cecf443ee3f3530505556434c20c0de193f92ea09cc21551898379cee
+  languageName: node
+  linkType: hard
+
 "text-extensions@npm:^1.0.0":
   version: 1.9.0
   resolution: "text-extensions@npm:1.9.0"
@@ -22956,50 +26028,67 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
-"timeline-state-resolver-types@npm:9.1.0-nightly-release51-20240228-132329-b7ceb6950.0":
-  version: 9.1.0-nightly-release51-20240228-132329-b7ceb6950.0
-  resolution: "timeline-state-resolver-types@npm:9.1.0-nightly-release51-20240228-132329-b7ceb6950.0"
+"timecode@patch:timecode@npm%3A0.0.4#./.yarn/patches/timecode-npm-0.0.4-82bde9e6fe.patch::locator=packages%40workspace%3A.":
+  version: 0.0.4
+  resolution: "timecode@patch:timecode@npm%3A0.0.4#./.yarn/patches/timecode-npm-0.0.4-82bde9e6fe.patch::version=0.0.4&hash=4d4986&locator=packages%40workspace%3A."
+  checksum: da05fb8e2f907a5bdb538c00ccaf216447337a568d9efddcb3835c130929fef2aeb864a5eba0381847e9404dbb412012806e0e02fd881562c82ae23c61ef139c
+  languageName: node
+  linkType: hard
+
+"timeline-state-resolver-types@npm:9.2.0-nightly-release52-20240923-122840-58cfbb259.0":
+  version: 9.2.0-nightly-release52-20240923-122840-58cfbb259.0
+  resolution: "timeline-state-resolver-types@npm:9.2.0-nightly-release52-20240923-122840-58cfbb259.0"
   dependencies:
-    tslib: ^2.6.2
-  checksum: da20544cc1ce9118c318ceccec240cc2f05c7eb415da9365625bdeffafb508b358d4f51842ca7ec9f10f44f25e6c9956cda2d74c22bf138bb869bcceacbbc2f2
+    tslib: ^2.6.3
+  checksum: c041363201bcfc0daac2ebca021b09fddc1f5b12fdeb932d9c19bfadc3ee308aa81f36c74c005edad2e756ed1c6465de779bfca5ed63ffd940878bf015497231
   languageName: node
   linkType: hard
 
-"timeline-state-resolver@npm:9.1.0-nightly-release51-20240228-132329-b7ceb6950.0":
-  version: 9.1.0-nightly-release51-20240228-132329-b7ceb6950.0
-  resolution: "timeline-state-resolver@npm:9.1.0-nightly-release51-20240228-132329-b7ceb6950.0"
+"timeline-state-resolver@npm:9.2.0-nightly-release52-20240923-122840-58cfbb259.0":
+  version: 9.2.0-nightly-release52-20240923-122840-58cfbb259.0
+  resolution: "timeline-state-resolver@npm:9.2.0-nightly-release52-20240923-122840-58cfbb259.0"
   dependencies:
-    "@tv2media/v-connection": ^7.3.2
+    "@tv2media/v-connection": ^7.3.4
     atem-connection: 3.5.0
-    atem-state: 1.2.0-nightly-master-20240202-124617-5b52568.0
+    atem-state: 1.2.0
     cacheable-lookup: ^5.0.4
-    casparcg-connection: 6.2.1
+    casparcg-connection: 6.3.0
     casparcg-state: 3.0.3
-    debug: ^4.3.4
+    debug: ^4.3.6
     deepmerge: ^4.3.1
     emberplus-connection: ^0.2.1
     eventemitter3: ^4.0.7
     got: ^11.8.6
     hpagent: ^1.2.0
-    hyperdeck-connection: 2.0.0
+    hyperdeck-connection: 2.0.1
     klona: ^2.0.6
-    obs-websocket-js: ^5.0.4
-    osc: ^2.4.4
+    obs-websocket-js: ^5.0.6
+    osc: ^2.4.5
     p-all: ^3.0.0
     p-queue: ^6.6.2
     p-timeout: ^3.2.0
+    simple-oauth2: ^5.1.0
     sprintf-js: ^1.1.3
-    superfly-timeline: ^9.0.0
-    threadedclass: ^1.2.1
-    timeline-state-resolver-types: 9.1.0-nightly-release51-20240228-132329-b7ceb6950.0
-    tslib: ^2.6.2
+    superfly-timeline: ^9.0.1
+    threadedclass: ^1.2.2
+    timeline-state-resolver-types: 9.2.0-nightly-release52-20240923-122840-58cfbb259.0
+    tslib: ^2.6.3
     tv-automation-quantel-gateway-client: ^3.1.7
     type-fest: ^3.13.1
-    underscore: ^1.13.6
-    utf-8-validate: ^5.0.10
-    ws: ^7.5.9
+    underscore: ^1.13.7
+    utf-8-validate: ^6.0.4
+    ws: ^8.18.0
     xml-js: ^1.6.11
-  checksum: 56df8dbe5f0303795ebc7d8d645bd5d2eb59e1e00f01f267b33ccf66268d21412276a46cfba8631e97bde15acc9aff68a52b7378fd8f9d192890e04cfebfaee6
+  checksum: a127cd66d96f06bae3ff16291bc1be4cd1c6589c8843632c489e2432df2b34789adc62db0826d7069bb6ff1b4a8c56e0f37ffe5a17d9a92b8f3533963e0bdb71
+  languageName: node
+  linkType: hard
+
+"timers-browserify@npm:^2.0.4":
+  version: 2.0.12
+  resolution: "timers-browserify@npm:2.0.12"
+  dependencies:
+    setimmediate: ^1.0.4
+  checksum: ec37ae299066bef6c464dcac29c7adafba1999e7227a9bdc4e105a459bee0f0b27234a46bfd7ab4041da79619e06a58433472867a913d01c26f8a203f87cee70
   languageName: node
   linkType: hard
 
@@ -23119,15 +26208,15 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
-"tough-cookie@npm:^4.0.0":
-  version: 4.1.3
-  resolution: "tough-cookie@npm:4.1.3"
+"tough-cookie@npm:^4.0.0, tough-cookie@npm:^4.1.2":
+  version: 4.1.4
+  resolution: "tough-cookie@npm:4.1.4"
   dependencies:
     psl: ^1.1.33
     punycode: ^2.1.1
     universalify: ^0.2.0
     url-parse: ^1.5.3
-  checksum: c9226afff36492a52118432611af083d1d8493a53ff41ec4ea48e5b583aec744b989e4280bcf476c910ec1525a89a4a0f1cae81c08b18fb2ec3a9b3a72b91dcc
+  checksum: 5815059f014c31179a303c673f753f7899a6fce94ac93712c88ea5f3c26e0c042b5f0c7a599a00f8e0feeca4615dba75c3dffc54f3c1a489978aa8205e09307c
   languageName: node
   linkType: hard
 
@@ -23239,6 +26328,15 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
+"ts-api-utils@npm:^1.3.0":
+  version: 1.3.0
+  resolution: "ts-api-utils@npm:1.3.0"
+  peerDependencies:
+    typescript: ">=4.2.0"
+  checksum: c746ddabfdffbf16cb0b0db32bb287236a19e583057f8649ee7c49995bb776e1d3ef384685181c11a1a480369e022ca97512cb08c517b2d2bd82c83754c97012
+  languageName: node
+  linkType: hard
+
 "ts-dedent@npm:^2.2.0":
   version: 2.2.0
   resolution: "ts-dedent@npm:2.2.0"
@@ -23326,6 +26424,20 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
+"tsconfck@npm:^3.0.3":
+  version: 3.1.1
+  resolution: "tsconfck@npm:3.1.1"
+  peerDependencies:
+    typescript: ^5.0.0
+  peerDependenciesMeta:
+    typescript:
+      optional: true
+  bin:
+    tsconfck: bin/tsconfck.js
+  checksum: 92941c76f5a996a96b5d92c88d20f67c644bb04cfeb9e5d4d2fed5a8ecce207fc70334a6257e3c146a117aa88b75adabc0989ee8d80a4935745f2774bf3f50fe
+  languageName: node
+  linkType: hard
+
 "tsconfig-paths@npm:^4.1.2":
   version: 4.2.0
   resolution: "tsconfig-paths@npm:4.2.0"
@@ -23337,7 +26449,7 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
-"tslib@npm:2.6.2, tslib@npm:^2.0.3, tslib@npm:^2.1.0, tslib@npm:^2.2.0, tslib@npm:^2.3.0, tslib@npm:^2.3.1, tslib@npm:^2.4.0, tslib@npm:^2.5.0, tslib@npm:^2.5.3, tslib@npm:^2.6.0, tslib@npm:^2.6.2":
+"tslib@npm:2.6.2":
   version: 2.6.2
   resolution: "tslib@npm:2.6.2"
   checksum: 329ea56123005922f39642318e3d1f0f8265d1e7fcb92c633e0809521da75eeaca28d2cf96d7248229deb40e5c19adf408259f4b9640afd20d13aecc1430f3ad
@@ -23351,6 +26463,13 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
+"tslib@npm:^2.0.1, tslib@npm:^2.0.3, tslib@npm:^2.1.0, tslib@npm:^2.2.0, tslib@npm:^2.3.0, tslib@npm:^2.3.1, tslib@npm:^2.4.0, tslib@npm:^2.5.0, tslib@npm:^2.5.3, tslib@npm:^2.6.0, tslib@npm:^2.6.2, tslib@npm:^2.6.3":
+  version: 2.7.0
+  resolution: "tslib@npm:2.7.0"
+  checksum: 1606d5c89f88d466889def78653f3aab0f88692e80bb2066d090ca6112ae250ec1cfa9dbfaab0d17b60da15a4186e8ec4d893801c67896b277c17374e36e1d28
+  languageName: node
+  linkType: hard
+
 "tsutils@npm:^3.21.0":
   version: 3.21.0
   resolution: "tsutils@npm:3.21.0"
@@ -23362,6 +26481,13 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
+"tty-browserify@npm:0.0.1":
+  version: 0.0.1
+  resolution: "tty-browserify@npm:0.0.1"
+  checksum: 93b745d43fa5a7d2b948fa23be8d313576d1d884b48acd957c07710bac1c0d8ac34c0556ad4c57c73d36e11741763ef66b3fb4fb97b06b7e4d525315a3cd45f5
+  languageName: node
+  linkType: hard
+
 "tuf-js@npm:^1.1.7":
   version: 1.1.7
   resolution: "tuf-js@npm:1.1.7"
@@ -23407,7 +26533,7 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
-"type-detect@npm:4.0.8":
+"type-detect@npm:4.0.8, type-detect@npm:^4.0.8":
   version: 4.0.8
   resolution: "type-detect@npm:4.0.8"
   checksum: 62b5628bff67c0eb0b66afa371bd73e230399a8d2ad30d852716efcc4656a7516904570cd8631a49a3ce57c10225adf5d0cbdcb47f6b0255fe6557c453925a15
@@ -23515,50 +26641,69 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
-"typed-array-buffer@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "typed-array-buffer@npm:1.0.0"
+"typed-array-buffer@npm:^1.0.2":
+  version: 1.0.2
+  resolution: "typed-array-buffer@npm:1.0.2"
   dependencies:
-    call-bind: ^1.0.2
-    get-intrinsic: ^1.2.1
-    is-typed-array: ^1.1.10
-  checksum: 3e0281c79b2a40cd97fe715db803884301993f4e8c18e8d79d75fd18f796e8cd203310fec8c7fdb5e6c09bedf0af4f6ab8b75eb3d3a85da69328f28a80456bd3
+    call-bind: ^1.0.7
+    es-errors: ^1.3.0
+    is-typed-array: ^1.1.13
+  checksum: 02ffc185d29c6df07968272b15d5319a1610817916ec8d4cd670ded5d1efe72901541ff2202fcc622730d8a549c76e198a2f74e312eabbfb712ed907d45cbb0b
   languageName: node
   linkType: hard
 
-"typed-array-byte-length@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "typed-array-byte-length@npm:1.0.0"
+"typed-array-byte-length@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "typed-array-byte-length@npm:1.0.1"
   dependencies:
-    call-bind: ^1.0.2
+    call-bind: ^1.0.7
     for-each: ^0.3.3
-    has-proto: ^1.0.1
-    is-typed-array: ^1.1.10
-  checksum: b03db16458322b263d87a702ff25388293f1356326c8a678d7515767ef563ef80e1e67ce648b821ec13178dd628eb2afdc19f97001ceae7a31acf674c849af94
+    gopd: ^1.0.1
+    has-proto: ^1.0.3
+    is-typed-array: ^1.1.13
+  checksum: f65e5ecd1cf76b1a2d0d6f631f3ea3cdb5e08da106c6703ffe687d583e49954d570cc80434816d3746e18be889ffe53c58bf3e538081ea4077c26a41055b216d
   languageName: node
   linkType: hard
 
-"typed-array-byte-offset@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "typed-array-byte-offset@npm:1.0.0"
+"typed-array-byte-offset@npm:^1.0.2":
+  version: 1.0.2
+  resolution: "typed-array-byte-offset@npm:1.0.2"
   dependencies:
-    available-typed-arrays: ^1.0.5
-    call-bind: ^1.0.2
+    available-typed-arrays: ^1.0.7
+    call-bind: ^1.0.7
     for-each: ^0.3.3
-    has-proto: ^1.0.1
-    is-typed-array: ^1.1.10
-  checksum: 04f6f02d0e9a948a95fbfe0d5a70b002191fae0b8fe0fe3130a9b2336f043daf7a3dda56a31333c35a067a97e13f539949ab261ca0f3692c41603a46a94e960b
+    gopd: ^1.0.1
+    has-proto: ^1.0.3
+    is-typed-array: ^1.1.13
+  checksum: c8645c8794a621a0adcc142e0e2c57b1823bbfa4d590ad2c76b266aa3823895cf7afb9a893bf6685e18454ab1b0241e1a8d885a2d1340948efa4b56add4b5f67
   languageName: node
   linkType: hard
 
-"typed-array-length@npm:^1.0.4":
-  version: 1.0.4
-  resolution: "typed-array-length@npm:1.0.4"
+"typed-array-length@npm:^1.0.6":
+  version: 1.0.6
+  resolution: "typed-array-length@npm:1.0.6"
   dependencies:
-    call-bind: ^1.0.2
+    call-bind: ^1.0.7
     for-each: ^0.3.3
-    is-typed-array: ^1.1.9
-  checksum: 2228febc93c7feff142b8c96a58d4a0d7623ecde6c7a24b2b98eb3170e99f7c7eff8c114f9b283085cd59dcd2bd43aadf20e25bba4b034a53c5bb292f71f8956
+    gopd: ^1.0.1
+    has-proto: ^1.0.3
+    is-typed-array: ^1.1.13
+    possible-typed-array-names: ^1.0.0
+  checksum: f0315e5b8f0168c29d390ff410ad13e4d511c78e6006df4a104576844812ee447fcc32daab1f3a76c9ef4f64eff808e134528b5b2439de335586b392e9750e5c
+  languageName: node
+  linkType: hard
+
+"typed-query-selector@npm:^2.12.0":
+  version: 2.12.0
+  resolution: "typed-query-selector@npm:2.12.0"
+  checksum: c4652f2eec16112d69e0da30c2effab3f03d1710f9559da1e1209bbfc9a20990d5de4ba97890c11f9d17d85c8ae3310953a86c198166599d4c36abc63664f169
+  languageName: node
+  linkType: hard
+
+"typed-styles@npm:^0.0.7":
+  version: 0.0.7
+  resolution: "typed-styles@npm:0.0.7"
+  checksum: 36a6ad6bee008c15ddb8c2425eaf9aee37d2841985b4c44406ea4cf57080a9c30b6f9f3feb842ac952354733ac53299ee44f68d83f734486e8344d413f8c8c0d
   languageName: node
   linkType: hard
 
@@ -23604,6 +26749,16 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
+"typescript@npm:^5.2.2":
+  version: 5.5.4
+  resolution: "typescript@npm:5.5.4"
+  bin:
+    tsc: bin/tsc
+    tsserver: bin/tsserver
+  checksum: b309040f3a1cd91c68a5a58af6b9fdd4e849b8c42d837b2c2e73f9a4f96a98c4f1ed398a9aab576ee0a4748f5690cf594e6b99dbe61de7839da748c41e6d6ca8
+  languageName: node
+  linkType: hard
+
 "typescript@patch:typescript@^3 || ^4#~builtin<compat/typescript>, typescript@patch:typescript@^4.9.3#~builtin<compat/typescript>, typescript@patch:typescript@~4.9.5#~builtin<compat/typescript>":
   version: 4.9.5
   resolution: "typescript@patch:typescript@npm%3A4.9.5#~builtin<compat/typescript>::version=4.9.5&hash=23ec76"
@@ -23614,6 +26769,16 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
+"typescript@patch:typescript@^5.2.2#~builtin<compat/typescript>":
+  version: 5.5.4
+  resolution: "typescript@patch:typescript@npm%3A5.5.4#~builtin<compat/typescript>::version=5.5.4&hash=85af82"
+  bin:
+    tsc: bin/tsc
+    tsserver: bin/tsserver
+  checksum: fc52962f31a5bcb716d4213bef516885e4f01f30cea797a831205fc9ef12b405a40561c40eae3127ab85ba1548e7df49df2bcdee6b84a94bfbe3a0d7eff16b14
+  languageName: node
+  linkType: hard
+
 "uc.micro@npm:^1.0.1, uc.micro@npm:^1.0.5":
   version: 1.0.6
   resolution: "uc.micro@npm:1.0.6"
@@ -23658,7 +26823,7 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
-"unbzip2-stream@npm:1.4.3":
+"unbzip2-stream@npm:^1.4.3":
   version: 1.4.3
   resolution: "unbzip2-stream@npm:1.4.3"
   dependencies:
@@ -23675,10 +26840,10 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
-"underscore@npm:^1.13.6":
-  version: 1.13.6
-  resolution: "underscore@npm:1.13.6"
-  checksum: d5cedd14a9d0d91dd38c1ce6169e4455bb931f0aaf354108e47bd46d3f2da7464d49b2171a5cf786d61963204a42d01ea1332a903b7342ad428deaafaf70ec36
+"underscore@npm:^1.13.6, underscore@npm:^1.13.7":
+  version: 1.13.7
+  resolution: "underscore@npm:1.13.7"
+  checksum: 174b011af29e4fbe2c70eb2baa8bfab0d0336cf2f5654f364484967bc6264a86224d0134b9176e4235c8cceae00d11839f0fd4824268de04b11c78aca1241684
   languageName: node
   linkType: hard
 
@@ -23938,17 +27103,17 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
-"update-browserslist-db@npm:^1.0.13":
-  version: 1.0.13
-  resolution: "update-browserslist-db@npm:1.0.13"
+"update-browserslist-db@npm:^1.1.0":
+  version: 1.1.0
+  resolution: "update-browserslist-db@npm:1.1.0"
   dependencies:
-    escalade: ^3.1.1
-    picocolors: ^1.0.0
+    escalade: ^3.1.2
+    picocolors: ^1.0.1
   peerDependencies:
     browserslist: ">= 4.21.0"
   bin:
     update-browserslist-db: cli.js
-  checksum: 1e47d80182ab6e4ad35396ad8b61008ae2a1330221175d0abd37689658bdb61af9b705bfc41057fd16682474d79944fb2d86767c5ed5ae34b6276b9bed353322
+  checksum: 7b74694d96f0c360f01b702e72353dc5a49df4fe6663d3ee4e5c628f061576cddf56af35a3a886238c01dd3d8f231b7a86a8ceaa31e7a9220ae31c1c1238e562
   languageName: node
   linkType: hard
 
@@ -24017,6 +27182,23 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
+"url@npm:^0.11.0":
+  version: 0.11.3
+  resolution: "url@npm:0.11.3"
+  dependencies:
+    punycode: ^1.4.1
+    qs: ^6.11.2
+  checksum: f9e7886f46a16f96d2e42fbcc5d682c231c55ef5442c1ff66150c0f6556f6e3a97d094a84f51be15ec2432711d212eb60426659ce418f5fcadeaa3f601532c4e
+  languageName: node
+  linkType: hard
+
+"urlpattern-polyfill@npm:10.0.0":
+  version: 10.0.0
+  resolution: "urlpattern-polyfill@npm:10.0.0"
+  checksum: 61d890f151ea4ecf34a3dcab32c65ad1f3cda857c9d154af198260c6e5b2ad96d024593409baaa6d4428dd1ab206c14799bf37fe011117ac93a6a44913ac5aa4
+  languageName: node
+  linkType: hard
+
 "use-resize-observer@npm:^8.0.0":
   version: 8.0.0
   resolution: "use-resize-observer@npm:8.0.0"
@@ -24029,13 +27211,13 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
-"utf-8-validate@npm:^5.0.10":
-  version: 5.0.10
-  resolution: "utf-8-validate@npm:5.0.10"
+"utf-8-validate@npm:^6.0.4":
+  version: 6.0.4
+  resolution: "utf-8-validate@npm:6.0.4"
   dependencies:
     node-gyp: latest
     node-gyp-build: ^4.3.0
-  checksum: 5579350a023c66a2326752b6c8804cc7b39dcd251bb088241da38db994b8d78352e388dcc24ad398ab98385ba3c5ffcadb6b5b14b2637e43f767869055e46ba6
+  checksum: ccbfbceeed7cbad62282aed5420236d38006453ce583cf9021ad6225c2d15996a660a3b3bdd2b9344b4d3b5df5673fbaf9e70c3637628a2cd58824089d9d9153
   languageName: node
   linkType: hard
 
@@ -24072,6 +27254,19 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
+"util@npm:^0.12.4, util@npm:^0.12.5":
+  version: 0.12.5
+  resolution: "util@npm:0.12.5"
+  dependencies:
+    inherits: ^2.0.3
+    is-arguments: ^1.0.4
+    is-generator-function: ^1.0.7
+    is-typed-array: ^1.1.3
+    which-typed-array: ^1.1.2
+  checksum: 705e51f0de5b446f4edec10739752ac25856541e0254ea1e7e45e5b9f9b0cb105bc4bd415736a6210edc68245a7f903bf085ffb08dd7deb8a0e847f60538a38a
+  languageName: node
+  linkType: hard
+
 "utila@npm:~0.4":
   version: 0.4.0
   resolution: "utila@npm:0.4.0"
@@ -24201,6 +27396,28 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
+"velocity-animate@npm:^1.4.0, velocity-animate@npm:^1.5.2":
+  version: 1.5.2
+  resolution: "velocity-animate@npm:1.5.2"
+  checksum: 9860da93170252478a31dc8814602e28f47183a4852c3e55c27d49ceadf0f16428b1593d50e766791982735db8c3c009d4813353e5ec52b262b37bbe912d7d86
+  languageName: node
+  linkType: hard
+
+"velocity-react@npm:^1.4.3":
+  version: 1.4.3
+  resolution: "velocity-react@npm:1.4.3"
+  dependencies:
+    lodash: ^4.17.5
+    prop-types: ^15.5.8
+    react-transition-group: ^2.0.0
+    velocity-animate: ^1.4.0
+  peerDependencies:
+    react: ^15.3.0 || ^16.0.0
+    react-dom: ^15.3.0 || ^16.0.0
+  checksum: 6d0f98d188c42c5a3f9c4dac1f7ea9bf1865aa57a7f7bcdc41c5abd6dd82d42318fec47c15a4366e8ebd8f32e320292f06ef858f95b5261e4f0f6cd728c19767
+  languageName: node
+  linkType: hard
+
 "vfile-location@npm:^5.0.0":
   version: 5.0.2
   resolution: "vfile-location@npm:5.0.2"
@@ -24232,6 +27449,88 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
+"vite-plugin-node-polyfills@npm:^0.22.0":
+  version: 0.22.0
+  resolution: "vite-plugin-node-polyfills@npm:0.22.0"
+  dependencies:
+    "@rollup/plugin-inject": ^5.0.5
+    node-stdlib-browser: ^1.2.0
+  peerDependencies:
+    vite: ^2.0.0 || ^3.0.0 || ^4.0.0 || ^5.0.0
+  checksum: c08d3df0d5cc3102280483d3f7b216f92a18e0708fcb9f67f78f01ab865474254756bacee17caa90b3f46afe5834cb9d8de0dd0e58c1bbbdae1b949edc1e6b57
+  languageName: node
+  linkType: hard
+
+"vite-tsconfig-paths@npm:^4.3.2":
+  version: 4.3.2
+  resolution: "vite-tsconfig-paths@npm:4.3.2"
+  dependencies:
+    debug: ^4.1.1
+    globrex: ^0.1.2
+    tsconfck: ^3.0.3
+  peerDependencies:
+    vite: "*"
+  peerDependenciesMeta:
+    vite:
+      optional: true
+  checksum: 7105ff641379f9f7055110f33067b236c8ee71b1390c0e6482412cdcc7a98c2e139c1c2a483d14fe9045d1977c14dc931e1ff302d6257ec919c70379db9d2419
+  languageName: node
+  linkType: hard
+
+"vite@npm:^5.3.4":
+  version: 5.3.4
+  resolution: "vite@npm:5.3.4"
+  dependencies:
+    esbuild: ^0.21.3
+    fsevents: ~2.3.3
+    postcss: ^8.4.39
+    rollup: ^4.13.0
+  peerDependencies:
+    "@types/node": ^18.0.0 || >=20.0.0
+    less: "*"
+    lightningcss: ^1.21.0
+    sass: "*"
+    stylus: "*"
+    sugarss: "*"
+    terser: ^5.4.0
+  dependenciesMeta:
+    fsevents:
+      optional: true
+  peerDependenciesMeta:
+    "@types/node":
+      optional: true
+    less:
+      optional: true
+    lightningcss:
+      optional: true
+    sass:
+      optional: true
+    stylus:
+      optional: true
+    sugarss:
+      optional: true
+    terser:
+      optional: true
+  bin:
+    vite: bin/vite.js
+  checksum: 2dfbab98daf91b86b3d3e535add1d6a982f7087df62f8f4bc219f3ae91a97f38c04683a32ba2457618e804fa93380090ddda5b0c9823a94bdcb53d6044b04732
+  languageName: node
+  linkType: hard
+
+"vm-browserify@npm:^1.0.1":
+  version: 1.1.2
+  resolution: "vm-browserify@npm:1.1.2"
+  checksum: 10a1c50aab54ff8b4c9042c15fc64aefccce8d2fb90c0640403242db0ee7fb269f9b102bdb69cfb435d7ef3180d61fd4fb004a043a12709abaf9056cfd7e039d
+  languageName: node
+  linkType: hard
+
+"void-elements@npm:3.1.0":
+  version: 3.1.0
+  resolution: "void-elements@npm:3.1.0"
+  checksum: 0390f818107fa8fce55bb0a5c3f661056001c1d5a2a48c28d582d4d847347c2ab5b7f8272314cac58acf62345126b6b09bea623a185935f6b1c3bbce0dfd7f7f
+  languageName: node
+  linkType: hard
+
 "vscode-oniguruma@npm:^1.7.0":
   version: 1.7.0
   resolution: "vscode-oniguruma@npm:1.7.0"
@@ -24264,6 +27563,15 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
+"w3c-xmlserializer@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "w3c-xmlserializer@npm:4.0.0"
+  dependencies:
+    xml-name-validator: ^4.0.0
+  checksum: eba070e78deb408ae8defa4d36b429f084b2b47a4741c4a9be3f27a0a3d1845e277e3072b04391a138f7e43776842627d1334e448ff13ff90ad9fb1214ee7091
+  languageName: node
+  linkType: hard
+
 "walk-up-path@npm:^1.0.0":
   version: 1.0.0
   resolution: "walk-up-path@npm:1.0.0"
@@ -24289,6 +27597,15 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
+"warning@npm:^4.0.2, warning@npm:^4.0.3":
+  version: 4.0.3
+  resolution: "warning@npm:4.0.3"
+  dependencies:
+    loose-envify: ^1.0.0
+  checksum: 4f2cb6a9575e4faf71ddad9ad1ae7a00d0a75d24521c193fa464f30e6b04027bd97aa5d9546b0e13d3a150ab402eda216d59c1d0f2d6ca60124d96cd40dfa35c
+  languageName: node
+  linkType: hard
+
 "watchpack@npm:^2.4.1":
   version: 2.4.1
   resolution: "watchpack@npm:2.4.1"
@@ -24390,6 +27707,13 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
+"webmidi@npm:^2.5.3":
+  version: 2.5.3
+  resolution: "webmidi@npm:2.5.3"
+  checksum: efbb9906fd6eb459639267c51f7cc2950ddbe0d9834e69c65cb22abd28d9da191f6272097f7abf0837854cec5e13dcfa42eb32117c89f29debe07fdc872732cb
+  languageName: node
+  linkType: hard
+
 "webpack-bundle-analyzer@npm:^4.9.0":
   version: 4.10.2
   resolution: "webpack-bundle-analyzer@npm:4.10.2"
@@ -24582,6 +27906,15 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
+"whatwg-encoding@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "whatwg-encoding@npm:2.0.0"
+  dependencies:
+    iconv-lite: 0.6.3
+  checksum: 7087810c410aa9b689cbd6af8773341a53cdc1f3aae2a882c163bd5522ec8ca4cdfc269aef417a5792f411807d5d77d50df4c24e3abb00bb60192858a40cc675
+  languageName: node
+  linkType: hard
+
 "whatwg-mimetype@npm:^2.3.0":
   version: 2.3.0
   resolution: "whatwg-mimetype@npm:2.3.0"
@@ -24589,6 +27922,13 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
+"whatwg-mimetype@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "whatwg-mimetype@npm:3.0.0"
+  checksum: ce08bbb36b6aaf64f3a84da89707e3e6a31e5ab1c1a2379fd68df79ba712a4ab090904f0b50e6693b0dafc8e6343a6157e40bf18fdffd26e513cf95ee2a59824
+  languageName: node
+  linkType: hard
+
 "whatwg-url@npm:^11.0.0":
   version: 11.0.0
   resolution: "whatwg-url@npm:11.0.0"
@@ -24644,16 +27984,48 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
-"which-typed-array@npm:^1.1.11":
-  version: 1.1.11
-  resolution: "which-typed-array@npm:1.1.11"
+"which-builtin-type@npm:^1.1.3":
+  version: 1.1.3
+  resolution: "which-builtin-type@npm:1.1.3"
   dependencies:
-    available-typed-arrays: ^1.0.5
-    call-bind: ^1.0.2
+    function.prototype.name: ^1.1.5
+    has-tostringtag: ^1.0.0
+    is-async-function: ^2.0.0
+    is-date-object: ^1.0.5
+    is-finalizationregistry: ^1.0.2
+    is-generator-function: ^1.0.10
+    is-regex: ^1.1.4
+    is-weakref: ^1.0.2
+    isarray: ^2.0.5
+    which-boxed-primitive: ^1.0.2
+    which-collection: ^1.0.1
+    which-typed-array: ^1.1.9
+  checksum: 43730f7d8660ff9e33d1d3f9f9451c4784265ee7bf222babc35e61674a11a08e1c2925019d6c03154fcaaca4541df43abe35d2720843b9b4cbcebdcc31408f36
+  languageName: node
+  linkType: hard
+
+"which-collection@npm:^1.0.1":
+  version: 1.0.2
+  resolution: "which-collection@npm:1.0.2"
+  dependencies:
+    is-map: ^2.0.3
+    is-set: ^2.0.3
+    is-weakmap: ^2.0.2
+    is-weakset: ^2.0.3
+  checksum: c51821a331624c8197916598a738fc5aeb9a857f1e00d89f5e4c03dc7c60b4032822b8ec5696d28268bb83326456a8b8216344fb84270d18ff1d7628051879d9
+  languageName: node
+  linkType: hard
+
+"which-typed-array@npm:^1.1.14, which-typed-array@npm:^1.1.15, which-typed-array@npm:^1.1.2, which-typed-array@npm:^1.1.9":
+  version: 1.1.15
+  resolution: "which-typed-array@npm:1.1.15"
+  dependencies:
+    available-typed-arrays: ^1.0.7
+    call-bind: ^1.0.7
     for-each: ^0.3.3
     gopd: ^1.0.1
-    has-tostringtag: ^1.0.0
-  checksum: 711ffc8ef891ca6597b19539075ec3e08bb9b4c2ca1f78887e3c07a977ab91ac1421940505a197758fb5939aa9524976d0a5bbcac34d07ed6faa75cedbb17206
+    has-tostringtag: ^1.0.2
+  checksum: 65227dcbfadf5677aacc43ec84356d17b5500cb8b8753059bb4397de5cd0c2de681d24e1a7bd575633f976a95f88233abfd6549c2105ef4ebd58af8aa1807c75
   languageName: node
   linkType: hard
 
@@ -24877,9 +28249,9 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
-"ws@npm:8.13.0":
-  version: 8.13.0
-  resolution: "ws@npm:8.13.0"
+"ws@npm:8.18.0, ws@npm:^8.11.0, ws@npm:^8.13.0, ws@npm:^8.16.0, ws@npm:^8.18.0":
+  version: 8.18.0
+  resolution: "ws@npm:8.18.0"
   peerDependencies:
     bufferutil: ^4.0.1
     utf-8-validate: ">=5.0.2"
@@ -24888,28 +28260,13 @@ asn1@evs-broadcast/node-asn1:
       optional: true
     utf-8-validate:
       optional: true
-  checksum: 53e991bbf928faf5dc6efac9b8eb9ab6497c69feeb94f963d648b7a3530a720b19ec2e0ec037344257e05a4f35bd9ad04d9de6f289615ffb133282031b18c61c
-  languageName: node
-  linkType: hard
-
-"ws@npm:8.7.0":
-  version: 8.7.0
-  resolution: "ws@npm:8.7.0"
-  peerDependencies:
-    bufferutil: ^4.0.1
-    utf-8-validate: ^5.0.2
-  peerDependenciesMeta:
-    bufferutil:
-      optional: true
-    utf-8-validate:
-      optional: true
-  checksum: 078fa2dbc06b31a45e0057b19e2930d26c222622e355955afe019c9b9b25f62eb2a8eff7cceabdad04910ecd2bd6ef4fa48e6f3673f2fdddff02a6e4c2459584
+  checksum: 91d4d35bc99ff6df483bdf029b9ea4bfd7af1f16fc91231a96777a63d263e1eabf486e13a2353970efc534f9faa43bdbf9ee76525af22f4752cbc5ebda333975
   languageName: node
   linkType: hard
 
-"ws@npm:^7.3.1, ws@npm:^7.4.6, ws@npm:^7.5.9":
-  version: 7.5.9
-  resolution: "ws@npm:7.5.9"
+"ws@npm:^7.3.1, ws@npm:^7.4.6, ws@npm:^7.5.10":
+  version: 7.5.10
+  resolution: "ws@npm:7.5.10"
   peerDependencies:
     bufferutil: ^4.0.1
     utf-8-validate: ^5.0.2
@@ -24918,22 +28275,7 @@ asn1@evs-broadcast/node-asn1:
       optional: true
     utf-8-validate:
       optional: true
-  checksum: c3c100a181b731f40b7f2fddf004aa023f79d64f489706a28bc23ff88e87f6a64b3c6651fbec3a84a53960b75159574d7a7385709847a62ddb7ad6af76f49138
-  languageName: node
-  linkType: hard
-
-"ws@npm:^8.13.0, ws@npm:^8.16.0":
-  version: 8.16.0
-  resolution: "ws@npm:8.16.0"
-  peerDependencies:
-    bufferutil: ^4.0.1
-    utf-8-validate: ">=5.0.2"
-  peerDependenciesMeta:
-    bufferutil:
-      optional: true
-    utf-8-validate:
-      optional: true
-  checksum: feb3eecd2bae82fa8a8beef800290ce437d8b8063bdc69712725f21aef77c49cb2ff45c6e5e7fce622248f9c7abaee506bae0a9064067ffd6935460c7357321b
+  checksum: f9bb062abf54cc8f02d94ca86dcd349c3945d63851f5d07a3a61c2fcb755b15a88e943a63cf580cbdb5b74436d67ef6b67f745b8f7c0814e411379138e1863cb
   languageName: node
   linkType: hard
 
@@ -24962,6 +28304,13 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
+"xml-name-validator@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "xml-name-validator@npm:4.0.0"
+  checksum: af100b79c29804f05fa35aa3683e29a321db9b9685d5e5febda3fa1e40f13f85abc40f45a6b2bf7bee33f68a1dc5e8eaef4cec100a304a9db565e6061d4cb5ad
+  languageName: node
+  linkType: hard
+
 "xml2js@npm:^0.6.2":
   version: 0.6.2
   resolution: "xml2js@npm:0.6.2"
@@ -24993,7 +28342,7 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
-"xtend@npm:~4.0.1":
+"xtend@npm:^4.0.2, xtend@npm:~4.0.1":
   version: 4.0.2
   resolution: "xtend@npm:4.0.2"
   checksum: ac5dfa738b21f6e7f0dd6e65e1b3155036d68104e67e5d5d1bde74892e327d7e5636a076f625599dc394330a731861e87343ff184b0047fef1360a7ec0a5a36a
@@ -25096,7 +28445,7 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
-"yargs@npm:^17.3.1, yargs@npm:^17.5.1, yargs@npm:^17.6.2":
+"yargs@npm:^17.3.1, yargs@npm:^17.5.1, yargs@npm:^17.6.2, yargs@npm:^17.7.2":
   version: 17.7.2
   resolution: "yargs@npm:17.7.2"
   dependencies:
@@ -25142,6 +28491,13 @@ asn1@evs-broadcast/node-asn1:
   languageName: node
   linkType: hard
 
+"zod@npm:3.23.8":
+  version: 3.23.8
+  resolution: "zod@npm:3.23.8"
+  checksum: 15949ff82118f59c893dacd9d3c766d02b6fa2e71cf474d5aa888570c469dbf5446ac5ad562bb035bf7ac9650da94f290655c194f4a6de3e766f43febd432c5c
+  languageName: node
+  linkType: hard
+
 "zwitch@npm:^2.0.0":
   version: 2.0.4
   resolution: "zwitch@npm:2.0.4"
diff --git a/scripts/run.mjs b/scripts/run.mjs
index b14037f922..bc102ea829 100644
--- a/scripts/run.mjs
+++ b/scripts/run.mjs
@@ -44,6 +44,12 @@ function watchMeteor() {
 			name: "METEOR",
 			prefixColor: "cyan",
 		},
+		{
+			command: `yarn dev`,
+			cwd: "packages/webui",
+			name: "VITE",
+			prefixColor: "yellow",
+		},
 	];
 }
 
@@ -51,14 +57,12 @@ function hr() {
 	// write regular dashes if this is a "simple" output stream ()
 	if (!process.stdout.hasColors || !process.stdout.hasColors())
 		return "-".repeat(process.stdout.columns ?? 40);
-	return '─'.repeat(process.stdout.columns ?? 40)
+	return "─".repeat(process.stdout.columns ?? 40);
 }
 
 try {
 	// Note: This scricpt assumes that install-and-build.mjs has been run before
 
-	
-
 	// The main watching execution
 	console.log(hr());
 	console.log(" ⚙️  Starting up in development mode...         ");
diff --git a/yarn.lock b/yarn.lock
index f645baad53..7d8a49cfc6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -15,11 +15,11 @@ __metadata:
   linkType: hard
 
 "@babel/runtime@npm:^7.21.0":
-  version: 7.23.1
-  resolution: "@babel/runtime@npm:7.23.1"
+  version: 7.25.6
+  resolution: "@babel/runtime@npm:7.25.6"
   dependencies:
     regenerator-runtime: ^0.14.0
-  checksum: 0cd0d43e6e7dc7f9152fda8c8312b08321cda2f56ef53d6c22ebdd773abdc6f5d0a69008de90aa41908d00e2c1facb24715ff121274e689305c858355ff02c70
+  checksum: ee1a69d3ac7802803f5ee6a96e652b78b8addc28c6a38c725a4ad7d61a059d9e6cb9f6550ed2f63cce67a1bd82e0b1ef66a1079d895be6bfb536a5cfbd9ccc32
   languageName: node
   linkType: hard
 
@@ -71,6 +71,22 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@pnpm/crypto.base32-hash@npm:1.0.1":
+  version: 1.0.1
+  resolution: "@pnpm/crypto.base32-hash@npm:1.0.1"
+  dependencies:
+    rfc4648: ^1.5.1
+  checksum: 4c5d3a6399e307e830f9adebc2644520cb7e0cb2a807e1b09513164f1b1930f2375cba3c1e4cbd7914f27eaf916ebbb61e83d370c4fac33594051a3c8ba8eb7b
+  languageName: node
+  linkType: hard
+
+"@pnpm/types@npm:8.9.0":
+  version: 8.9.0
+  resolution: "@pnpm/types@npm:8.9.0"
+  checksum: 7c7d2cf698aa8c6b74853de0535c6029b049191f14dcf1d6e0e24d2a803679029121cec32db27a47a049b9058dcad8bcd7f66756d761cd1813be6404727a430a
+  languageName: node
+  linkType: hard
+
 "@sindresorhus/is@npm:^4.0.0":
   version: 4.6.0
   resolution: "@sindresorhus/is@npm:4.6.0"
@@ -79,8 +95,8 @@ __metadata:
   linkType: hard
 
 "@snyk/dep-graph@npm:^2.3.0":
-  version: 2.7.4
-  resolution: "@snyk/dep-graph@npm:2.7.4"
+  version: 2.9.0
+  resolution: "@snyk/dep-graph@npm:2.9.0"
   dependencies:
     event-loop-spinner: ^2.1.0
     lodash.clone: ^4.5.0
@@ -98,10 +114,20 @@ __metadata:
     lodash.union: ^4.6.0
     lodash.values: ^4.3.0
     object-hash: ^3.0.0
-    packageurl-js: ^1.0.0
+    packageurl-js: 1.2.0
     semver: ^7.0.0
     tslib: ^2
-  checksum: d98acd140b9b1cdc7407af10c408e23da3bd67e6d494cf9d896de3f18d1ea58b3c698be030ebd5847b4db98ba9877b09acf0b9843ad8ac44730d7dc87c71e70c
+  checksum: 3089c21990f0ce69ed8e6ecf892cf563d045f7451fdb5238f5c636294bdc34816432774033c2420a555a33e76c700446aa7b01ceff06fc1d0cc369e5285695f7
+  languageName: node
+  linkType: hard
+
+"@snyk/error-catalog-nodejs-public@npm:^5.16.0":
+  version: 5.30.0
+  resolution: "@snyk/error-catalog-nodejs-public@npm:5.30.0"
+  dependencies:
+    tslib: ^2.6.2
+    uuid: ^9.0.0
+  checksum: a33ba90284640c8b6fa5874347fffd8f78c69a24eca77aacd7fe4e750e474a799108a6545464c01c311e148ff346c862b180d4a808db2cf90263775b3147165c
   languageName: node
   linkType: hard
 
@@ -150,16 +176,16 @@ __metadata:
   linkType: hard
 
 "@types/emscripten@npm:^1.39.6":
-  version: 1.39.8
-  resolution: "@types/emscripten@npm:1.39.8"
-  checksum: adccdfcec3a9829aaeee580259d21653ef15ae638b88c2e310d1d4184cfc83809b463fabdd0050e018c7b6b966166d973d71f3d59601644947d0235e98b77e64
+  version: 1.39.13
+  resolution: "@types/emscripten@npm:1.39.13"
+  checksum: 6a50f43a90db981e088c76219578a8e9eea0add3ed99d2daed3dfe8f8b755557b89ea5aea0166db2e9399882e109971f1724636101850a46cee51dc4c9337b1f
   languageName: node
   linkType: hard
 
 "@types/http-cache-semantics@npm:*":
-  version: 4.0.2
-  resolution: "@types/http-cache-semantics@npm:4.0.2"
-  checksum: 513429786a45d8124f93cc7ea1454b692008190ef743e9fec75a6a3c998309782d216f1e67d7d497ffece9c9212310ae05a8c56e8955492ee400eacdd7620e61
+  version: 4.0.4
+  resolution: "@types/http-cache-semantics@npm:4.0.4"
+  checksum: 7f4dd832e618bc1e271be49717d7b4066d77c2d4eed5b81198eb987e532bb3e1c7e02f45d77918185bad936f884b700c10cebe06305f50400f382ab75055f9e8
   languageName: node
   linkType: hard
 
@@ -173,9 +199,11 @@ __metadata:
   linkType: hard
 
 "@types/node@npm:*":
-  version: 20.8.2
-  resolution: "@types/node@npm:20.8.2"
-  checksum: 3da73e25d821bfcdb7de98589027e08bb4848e55408671c4a83ec0341e124b5313a0b20e1e4b4eff1168ea17a86f622ad73fcb04b761abd77496b9a27cbd5de5
+  version: 22.5.1
+  resolution: "@types/node@npm:22.5.1"
+  dependencies:
+    undici-types: ~6.19.2
+  checksum: 366990347c12e08e9ffe113e493253ac454d5337828e23cb02c790d5abe1f2ab0148da37b728eb886d858c4c5f29f4341a29987e89555d482ea236691d9d2648
   languageName: node
   linkType: hard
 
@@ -187,25 +215,25 @@ __metadata:
   linkType: hard
 
 "@types/responselike@npm:^1.0.0":
-  version: 1.0.1
-  resolution: "@types/responselike@npm:1.0.1"
+  version: 1.0.3
+  resolution: "@types/responselike@npm:1.0.3"
   dependencies:
     "@types/node": "*"
-  checksum: ae8c36c9354aaedfa462dab655aa17613529d545a418acc54ba0214145fc1d0454be2ae107031a1b2c24768f19f2af7e4096a85d1e604010becd0bec2355cb0e
+  checksum: 6ac4b35723429b11b117e813c7acc42c3af8b5554caaf1fc750404c1ae59f9b7376bc69b9e9e194a5a97357a597c2228b7173d317320f0360d617b6425212f58
   languageName: node
   linkType: hard
 
 "@types/semver@npm:^7.1.0":
-  version: 7.5.3
-  resolution: "@types/semver@npm:7.5.3"
-  checksum: 349fdd1ab6c213bac5c991bac766bd07b8b12e63762462bb058740dcd2eb09c8193d068bb226f134661275f2022976214c0e727a4e5eb83ec1b131127c980d3e
+  version: 7.5.8
+  resolution: "@types/semver@npm:7.5.8"
+  checksum: ea6f5276f5b84c55921785a3a27a3cd37afee0111dfe2bcb3e03c31819c197c782598f17f0b150a69d453c9584cd14c4c4d7b9a55d2c5e6cacd4d66fdb3b3663
   languageName: node
   linkType: hard
 
 "@types/treeify@npm:^1.0.0":
-  version: 1.0.1
-  resolution: "@types/treeify@npm:1.0.1"
-  checksum: 972022f753b49b16a17cbfc0c6051c64983d333f27dbf456353c8168446fa8948ac11072687be8ba5b2144122bae461481ce7814c7a855ab477fffe45ed7a793
+  version: 1.0.3
+  resolution: "@types/treeify@npm:1.0.3"
+  checksum: 777e579b30a916a781e7cbad2b7a76bc5473ff7bfe7167dd6de47f80f4386df5bf3d0dc34170afb75d52e75f6ed61cc109abf2324e093c1f9ecd4e79fec58d0c
   languageName: node
   linkType: hard
 
@@ -249,12 +277,12 @@ __metadata:
   linkType: hard
 
 "@yarnpkg/fslib@npm:^2.4.0, @yarnpkg/fslib@npm:^2.5.0":
-  version: 2.10.3
-  resolution: "@yarnpkg/fslib@npm:2.10.3"
+  version: 2.10.4
+  resolution: "@yarnpkg/fslib@npm:2.10.4"
   dependencies:
     "@yarnpkg/libzip": ^2.3.0
     tslib: ^1.13.0
-  checksum: 0ca693f61d47bcf165411a121ed9123f512b1b5bfa5e1c6c8f280b4ffdbea9bf2a6db418f99ecfc9624587fdc695b2b64eb0fe7b4028e44095914b25ca99655e
+  checksum: 6d287d1f55b8cd62da9cd8baddb6da26469d6a77e89e96a153aea16e1d0882c375340f6adcc645cef8a861b8c3ad09da19334fd1997eb4ed7b178b2c7c127ed5
   languageName: node
   linkType: hard
 
@@ -286,12 +314,12 @@ __metadata:
   linkType: hard
 
 "@yarnpkg/parsers@npm:^2.3.0":
-  version: 2.5.1
-  resolution: "@yarnpkg/parsers@npm:2.5.1"
+  version: 2.6.0
+  resolution: "@yarnpkg/parsers@npm:2.6.0"
   dependencies:
     js-yaml: ^3.10.0
     tslib: ^1.13.0
-  checksum: 42f98b8bd635add304ce392c6f600b46e40c2c4429d7b6c38b70f50b5fd6a854dd2369e0987b70546a3c8f690d280f040a885b35acfde891f5e173fc3f974277
+  checksum: 4bad9f077c338b702342964544d426762323d9f70af3242373194eb2f3982cfd551b860d615fbdd2715aba1cefdb793f4e2f3a8c69ddffe7989682cd03102ede
   languageName: node
   linkType: hard
 
@@ -411,9 +439,9 @@ __metadata:
   linkType: hard
 
 "async@npm:^3.2.2":
-  version: 3.2.4
-  resolution: "async@npm:3.2.4"
-  checksum: 43d07459a4e1d09b84a20772414aa684ff4de085cbcaec6eea3c7a8f8150e8c62aa6cd4e699fe8ee93c3a5b324e777d34642531875a0817a35697522c1b02e89
+  version: 3.2.6
+  resolution: "async@npm:3.2.6"
+  checksum: ee6eb8cd8a0ab1b58bd2a3ed6c415e93e773573a91d31df9d5ef559baafa9dab37d3b096fa7993e84585cac3697b2af6ddb9086f45d3ac8cae821bb2aab65682
   languageName: node
   linkType: hard
 
@@ -423,9 +451,9 @@ __metadata:
   dependencies:
     concurrently: ^8.2.2
     lint-staged: ^13.3.0
-    rimraf: ^5.0.5
-    semver: ^7.5.4
-    snyk-nodejs-lockfile-parser: ^1.52.11
+    rimraf: ^5.0.10
+    semver: ^7.6.3
+    snyk-nodejs-lockfile-parser: ^1.58.11
   languageName: unknown
   linkType: soft
 
@@ -470,12 +498,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"braces@npm:^3.0.2":
-  version: 3.0.2
-  resolution: "braces@npm:3.0.2"
+"braces@npm:^3.0.2, braces@npm:^3.0.3":
+  version: 3.0.3
+  resolution: "braces@npm:3.0.3"
   dependencies:
-    fill-range: ^7.0.1
-  checksum: e2a8e769a863f3d4ee887b5fe21f63193a891c68b612ddb4b68d82d1b5f3ff9073af066c343e9867a393fe4c2555dcb33e89b937195feb9c1613d259edfcd459
+    fill-range: ^7.1.1
+  checksum: b95aa0b3bd909f6cd1720ffcf031aeaf46154dd88b4da01f9a1d3f7ea866a79eba76a6d01cbc3c422b2ee5cdc39a4f02491058d5df0d7bf6e6a162a832df1f69
   languageName: node
   linkType: hard
 
@@ -511,13 +539,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"call-bind@npm:^1.0.2":
-  version: 1.0.2
-  resolution: "call-bind@npm:1.0.2"
+"call-bind@npm:^1.0.5":
+  version: 1.0.7
+  resolution: "call-bind@npm:1.0.7"
   dependencies:
-    function-bind: ^1.1.1
-    get-intrinsic: ^1.0.2
-  checksum: f8e31de9d19988a4b80f3e704788c4a2d6b6f3d17cfec4f57dc29ced450c53a49270dc66bf0fbd693329ee948dd33e6c90a329519aef17474a4d961e8d6426b0
+    es-define-property: ^1.0.0
+    es-errors: ^1.3.0
+    function-bind: ^1.1.2
+    get-intrinsic: ^1.2.4
+    set-function-length: ^1.2.1
+  checksum: 295c0c62b90dd6522e6db3b0ab1ce26bdf9e7404215bda13cfee25b626b5ff1a7761324d58d38b1ef1607fc65aca2d06e44d2e18d0dfc6c14b465b00d8660029
   languageName: node
   linkType: hard
 
@@ -685,7 +716,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"debug@npm:4.3.4, debug@npm:^4.3.4":
+"debug@npm:4.3.4":
   version: 4.3.4
   resolution: "debug@npm:4.3.4"
   dependencies:
@@ -697,6 +728,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"debug@npm:^4.3.4":
+  version: 4.3.6
+  resolution: "debug@npm:4.3.6"
+  dependencies:
+    ms: 2.1.2
+  peerDependenciesMeta:
+    supports-color:
+      optional: true
+  checksum: 1630b748dea3c581295e02137a9f5cbe2c1d85fea35c1e6597a65ca2b16a6fce68cec61b299d480787ef310ba927dc8c92d3061faba0ad06c6a724672f66be7f
+  languageName: node
+  linkType: hard
+
 "decompress-response@npm:^6.0.0":
   version: 6.0.0
   resolution: "decompress-response@npm:6.0.0"
@@ -713,18 +756,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"define-data-property@npm:^1.0.1":
-  version: 1.1.0
-  resolution: "define-data-property@npm:1.1.0"
+"define-data-property@npm:^1.0.1, define-data-property@npm:^1.1.4":
+  version: 1.1.4
+  resolution: "define-data-property@npm:1.1.4"
   dependencies:
-    get-intrinsic: ^1.2.1
+    es-define-property: ^1.0.0
+    es-errors: ^1.3.0
     gopd: ^1.0.1
-    has-property-descriptors: ^1.0.0
-  checksum: 7ad4ee84cca8ad427a4831f5693526804b62ce9dfd4efac77214e95a4382aed930072251d4075dc8dc9fc949a353ed51f19f5285a84a788ba9216cc51472a093
+  checksum: 8068ee6cab694d409ac25936eb861eea704b7763f7f342adbdfe337fc27c78d7ae0eff2364b2917b58c508d723c7a074326d068eef2e45c4edcd85cf94d0313b
   languageName: node
   linkType: hard
 
-"define-properties@npm:^1.1.4":
+"define-properties@npm:^1.2.1":
   version: 1.2.1
   resolution: "define-properties@npm:1.2.1"
   dependencies:
@@ -735,6 +778,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"dependency-path@npm:^9.2.8":
+  version: 9.2.8
+  resolution: "dependency-path@npm:9.2.8"
+  dependencies:
+    "@pnpm/crypto.base32-hash": 1.0.1
+    "@pnpm/types": 8.9.0
+    encode-registry: ^3.0.0
+    semver: ^7.3.8
+  checksum: a317039dc57b9fc6d4613cc9b68cf0c171a3b97a8304eee7c6088f12f75911dc37bb112297148d976c9e7f3b922d68464fdbdc8ca24b0dd2d43c1b4d5a43138e
+  languageName: node
+  linkType: hard
+
 "diff@npm:^4.0.1":
   version: 4.0.2
   resolution: "diff@npm:4.0.2"
@@ -772,6 +827,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"encode-registry@npm:^3.0.0":
+  version: 3.0.1
+  resolution: "encode-registry@npm:3.0.1"
+  dependencies:
+    mem: ^8.0.0
+  checksum: 4e7cb234704782ef3e9e0c1941cb90de9b2421da8b87a21c968609e59b931c0316b15ea0e9b5280338a831dcb8e91362f8a54f712b10c70e28598f2dfb97da4a
+  languageName: node
+  linkType: hard
+
 "end-of-stream@npm:^1.1.0, end-of-stream@npm:^1.4.1":
   version: 1.4.4
   resolution: "end-of-stream@npm:1.4.4"
@@ -790,10 +854,26 @@ __metadata:
   languageName: node
   linkType: hard
 
+"es-define-property@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "es-define-property@npm:1.0.0"
+  dependencies:
+    get-intrinsic: ^1.2.4
+  checksum: f66ece0a887b6dca71848fa71f70461357c0e4e7249696f81bad0a1f347eed7b31262af4a29f5d726dc026426f085483b6b90301855e647aa8e21936f07293c6
+  languageName: node
+  linkType: hard
+
+"es-errors@npm:^1.3.0":
+  version: 1.3.0
+  resolution: "es-errors@npm:1.3.0"
+  checksum: ec1414527a0ccacd7f15f4a3bc66e215f04f595ba23ca75cdae0927af099b5ec865f9f4d33e9d7e86f512f252876ac77d4281a7871531a50678132429b1271b5
+  languageName: node
+  linkType: hard
+
 "escalade@npm:^3.1.1":
-  version: 3.1.1
-  resolution: "escalade@npm:3.1.1"
-  checksum: a3e2a99f07acb74b3ad4989c48ca0c3140f69f923e56d0cba0526240ee470b91010f9d39001f2a4a313841d237ede70a729e92125191ba5d21e74b106800b133
+  version: 3.2.0
+  resolution: "escalade@npm:3.2.0"
+  checksum: 47b029c83de01b0d17ad99ed766347b974b0d628e848de404018f3abee728e987da0d2d370ad4574aa3d5b5bfc368754fd085d69a30f8e75903486ec4b5b709e
   languageName: node
   linkType: hard
 
@@ -808,11 +888,11 @@ __metadata:
   linkType: hard
 
 "event-loop-spinner@npm:^2.0.0, event-loop-spinner@npm:^2.1.0":
-  version: 2.2.0
-  resolution: "event-loop-spinner@npm:2.2.0"
+  version: 2.3.2
+  resolution: "event-loop-spinner@npm:2.3.2"
   dependencies:
-    tslib: ^2.1.0
-  checksum: 4580e81fc1d8883f37884925971f03dc9a28728dd9e39fb57d6c180ac49bf830859bed04c3ce451a6d2cb22da248b6fb74572b1222aa8169de3f7b6ef62ea02c
+    tslib: ^2.6.3
+  checksum: 2eff8c412365262a4441fc47077dcabf169f7828a3829c20acb216600c49382bb357043bf9614e5baaefaf596803c4b265f05ac2fce31400e6249faf6c0e1295
   languageName: node
   linkType: hard
 
@@ -841,43 +921,43 @@ __metadata:
   linkType: hard
 
 "fast-glob@npm:^3.2.2, fast-glob@npm:^3.2.9":
-  version: 3.3.1
-  resolution: "fast-glob@npm:3.3.1"
+  version: 3.3.2
+  resolution: "fast-glob@npm:3.3.2"
   dependencies:
     "@nodelib/fs.stat": ^2.0.2
     "@nodelib/fs.walk": ^1.2.3
     glob-parent: ^5.1.2
     merge2: ^1.3.0
     micromatch: ^4.0.4
-  checksum: b6f3add6403e02cf3a798bfbb1183d0f6da2afd368f27456010c0bc1f9640aea308243d4cb2c0ab142f618276e65ecb8be1661d7c62a7b4e5ba774b9ce5432e5
+  checksum: 900e4979f4dbc3313840078419245621259f349950411ca2fa445a2f9a1a6d98c3b5e7e0660c5ccd563aa61abe133a21765c6c0dec8e57da1ba71d8000b05ec1
   languageName: node
   linkType: hard
 
 "fastq@npm:^1.6.0":
-  version: 1.15.0
-  resolution: "fastq@npm:1.15.0"
+  version: 1.17.1
+  resolution: "fastq@npm:1.17.1"
   dependencies:
     reusify: ^1.0.4
-  checksum: 0170e6bfcd5d57a70412440b8ef600da6de3b2a6c5966aeaf0a852d542daff506a0ee92d6de7679d1de82e644bce69d7a574a6c93f0b03964b5337eed75ada1a
+  checksum: a8c5b26788d5a1763f88bae56a8ddeee579f935a831c5fe7a8268cea5b0a91fbfe705f612209e02d639b881d7b48e461a50da4a10cfaa40da5ca7cc9da098d88
   languageName: node
   linkType: hard
 
-"fill-range@npm:^7.0.1":
-  version: 7.0.1
-  resolution: "fill-range@npm:7.0.1"
+"fill-range@npm:^7.1.1":
+  version: 7.1.1
+  resolution: "fill-range@npm:7.1.1"
   dependencies:
     to-regex-range: ^5.0.1
-  checksum: cc283f4e65b504259e64fd969bcf4def4eb08d85565e906b7d36516e87819db52029a76b6363d0f02d0d532f0033c9603b9e2d943d56ee3b0d4f7ad3328ff917
+  checksum: b4abfbca3839a3d55e4ae5ec62e131e2e356bf4859ce8480c64c4876100f4df292a63e5bb1618e1d7460282ca2b305653064f01654474aa35c68000980f17798
   languageName: node
   linkType: hard
 
 "foreground-child@npm:^3.1.0":
-  version: 3.1.1
-  resolution: "foreground-child@npm:3.1.1"
+  version: 3.3.0
+  resolution: "foreground-child@npm:3.3.0"
   dependencies:
     cross-spawn: ^7.0.0
     signal-exit: ^4.0.1
-  checksum: 139d270bc82dc9e6f8bc045fe2aae4001dc2472157044fdfad376d0a3457f77857fa883c1c8b21b491c6caade9a926a4bed3d3d2e8d3c9202b151a4cbbd0bcd5
+  checksum: 1989698488f725b05b26bc9afc8a08f08ec41807cd7b92ad85d96004ddf8243fd3e79486b8348c64a3011ae5cc2c9f0936af989e1f28339805d8bc178a75b451
   languageName: node
   linkType: hard
 
@@ -888,10 +968,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"function-bind@npm:^1.1.1":
-  version: 1.1.1
-  resolution: "function-bind@npm:1.1.1"
-  checksum: b32fbaebb3f8ec4969f033073b43f5c8befbb58f1a79e12f1d7490358150359ebd92f49e72ff0144f65f2c48ea2a605bff2d07965f548f6474fd8efd95bf361a
+"function-bind@npm:^1.1.2":
+  version: 1.1.2
+  resolution: "function-bind@npm:1.1.2"
+  checksum: 2b0ff4ce708d99715ad14a6d1f894e2a83242e4a52ccfcefaee5e40050562e5f6dafc1adbb4ce2d4ab47279a45dc736ab91ea5042d843c3c092820dfe032efb1
   languageName: node
   linkType: hard
 
@@ -902,15 +982,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"get-intrinsic@npm:^1.0.2, get-intrinsic@npm:^1.1.1, get-intrinsic@npm:^1.1.3, get-intrinsic@npm:^1.2.1":
-  version: 1.2.1
-  resolution: "get-intrinsic@npm:1.2.1"
+"get-intrinsic@npm:^1.1.3, get-intrinsic@npm:^1.2.4":
+  version: 1.2.4
+  resolution: "get-intrinsic@npm:1.2.4"
   dependencies:
-    function-bind: ^1.1.1
-    has: ^1.0.3
+    es-errors: ^1.3.0
+    function-bind: ^1.1.2
     has-proto: ^1.0.1
     has-symbols: ^1.0.3
-  checksum: 5b61d88552c24b0cf6fa2d1b3bc5459d7306f699de060d76442cce49a4721f52b8c560a33ab392cf5575b7810277d54ded9d4d39a1ea61855619ebc005aa7e5f
+    hasown: ^2.0.0
+  checksum: 414e3cdf2c203d1b9d7d33111df746a4512a1aa622770b361dadddf8ed0b5aeb26c560f49ca077e24bfafb0acb55ca908d1f709216ccba33ffc548ec8a79a951
   languageName: node
   linkType: hard
 
@@ -940,17 +1021,18 @@ __metadata:
   linkType: hard
 
 "glob@npm:^10.3.7":
-  version: 10.3.10
-  resolution: "glob@npm:10.3.10"
+  version: 10.4.5
+  resolution: "glob@npm:10.4.5"
   dependencies:
     foreground-child: ^3.1.0
-    jackspeak: ^2.3.5
-    minimatch: ^9.0.1
-    minipass: ^5.0.0 || ^6.0.2 || ^7.0.0
-    path-scurry: ^1.10.1
+    jackspeak: ^3.1.2
+    minimatch: ^9.0.4
+    minipass: ^7.1.2
+    package-json-from-dist: ^1.0.0
+    path-scurry: ^1.11.1
   bin:
     glob: dist/esm/bin.mjs
-  checksum: 4f2fe2511e157b5a3f525a54092169a5f92405f24d2aed3142f4411df328baca13059f4182f1db1bf933e2c69c0bd89e57ae87edd8950cba8c7ccbe84f721cf3
+  checksum: 0bc725de5e4862f9f387fd0f2b274baf16850dcd2714502ccf471ee401803997983e2c05590cb65f9675a3c6f2a58e7a53f9e365704108c6ad3cbf1d60934c4a
   languageName: node
   linkType: hard
 
@@ -1010,19 +1092,19 @@ __metadata:
   languageName: node
   linkType: hard
 
-"has-property-descriptors@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "has-property-descriptors@npm:1.0.0"
+"has-property-descriptors@npm:^1.0.0, has-property-descriptors@npm:^1.0.2":
+  version: 1.0.2
+  resolution: "has-property-descriptors@npm:1.0.2"
   dependencies:
-    get-intrinsic: ^1.1.1
-  checksum: a6d3f0a266d0294d972e354782e872e2fe1b6495b321e6ef678c9b7a06a40408a6891817350c62e752adced73a94ac903c54734fee05bf65b1905ee1368194bb
+    es-define-property: ^1.0.0
+  checksum: fcbb246ea2838058be39887935231c6d5788babed499d0e9d0cc5737494c48aba4fe17ba1449e0d0fbbb1e36175442faa37f9c427ae357d6ccb1d895fbcd3de3
   languageName: node
   linkType: hard
 
 "has-proto@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "has-proto@npm:1.0.1"
-  checksum: febc5b5b531de8022806ad7407935e2135f1cc9e64636c3916c6842bd7995994ca3b29871ecd7954bd35f9e2986c17b3b227880484d22259e2f8e6ce63fd383e
+  version: 1.0.3
+  resolution: "has-proto@npm:1.0.3"
+  checksum: fe7c3d50b33f50f3933a04413ed1f69441d21d2d2944f81036276d30635cad9279f6b43bc8f32036c31ebdfcf6e731150f46c1907ad90c669ffe9b066c3ba5c4
   languageName: node
   linkType: hard
 
@@ -1033,10 +1115,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"has@npm:^1.0.3":
-  version: 1.0.4
-  resolution: "has@npm:1.0.4"
-  checksum: 8a11ba062e0627c9578a1d08285401e39f1d071a9692ddf793199070edb5648b21c774dd733e2a181edd635bf6862731885f476f4ccf67c998d7a5ff7cef2550
+"hasown@npm:^2.0.0":
+  version: 2.0.2
+  resolution: "hasown@npm:2.0.2"
+  dependencies:
+    function-bind: ^1.1.2
+  checksum: e8516f776a15149ca6c6ed2ae3110c417a00b62260e222590e54aa367cbcd6ed99122020b37b7fbdf05748df57b265e70095d7bf35a47660587619b15ffb93db
   languageName: node
   linkType: hard
 
@@ -1072,9 +1156,9 @@ __metadata:
   linkType: hard
 
 "ignore@npm:^5.2.0":
-  version: 5.2.4
-  resolution: "ignore@npm:5.2.4"
-  checksum: 3d4c309c6006e2621659311783eaea7ebcd41fe4ca1d78c91c473157ad6666a57a2df790fe0d07a12300d9aac2888204d7be8d59f9aaf665b1c7fcdb432517ef
+  version: 5.3.2
+  resolution: "ignore@npm:5.3.2"
+  checksum: 2acfd32a573260ea522ea0bfeff880af426d68f6831f973129e2ba7363f422923cf53aab62f8369cbf4667c7b25b6f8a3761b34ecdb284ea18e87a5262a865be
   languageName: node
   linkType: hard
 
@@ -1143,7 +1227,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is@npm:^3.2.1":
+"is@npm:^3.2.1, is@npm:^3.3.0":
   version: 3.3.0
   resolution: "is@npm:3.3.0"
   checksum: 81fad3b40c606984c2d0699207c4c48d2a0d29cc834b274d0b74c172f3eeebdb981301fe0d690ce090a96bf021a8a1f8b1325262ad9870c525e557ac4a559c56
@@ -1157,16 +1241,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jackspeak@npm:^2.3.5":
-  version: 2.3.6
-  resolution: "jackspeak@npm:2.3.6"
+"jackspeak@npm:^3.1.2":
+  version: 3.4.3
+  resolution: "jackspeak@npm:3.4.3"
   dependencies:
     "@isaacs/cliui": ^8.0.2
     "@pkgjs/parseargs": ^0.11.0
   dependenciesMeta:
     "@pkgjs/parseargs":
       optional: true
-  checksum: 57d43ad11eadc98cdfe7496612f6bbb5255ea69fe51ea431162db302c2a11011642f50cfad57288bd0aea78384a0612b16e131944ad8ecd09d619041c8531b54
+  checksum: be31027fc72e7cc726206b9f560395604b82e0fddb46c4cbf9f97d049bcef607491a5afc0699612eaa4213ca5be8fd3e1e7cd187b3040988b65c9489838a7c00
   languageName: node
   linkType: hard
 
@@ -1214,11 +1298,11 @@ __metadata:
   linkType: hard
 
 "keyv@npm:^4.0.0":
-  version: 4.5.3
-  resolution: "keyv@npm:4.5.3"
+  version: 4.5.4
+  resolution: "keyv@npm:4.5.4"
   dependencies:
     json-buffer: 3.0.1
-  checksum: 3ffb4d5b72b6b4b4af443bbb75ca2526b23c750fccb5ac4c267c6116888b4b65681015c2833cb20d26cf3e6e32dac6b988c77f7f022e1a571b7d90f1442257da
+  checksum: 74a24395b1c34bd44ad5cb2b49140d087553e170625240b86755a6604cd65aa16efdbdeae5cdb17ba1284a0fbb25ad06263755dbc71b8d8b06f74232ce3cdd72
   languageName: node
   linkType: hard
 
@@ -1435,19 +1519,29 @@ __metadata:
   languageName: node
   linkType: hard
 
-"lru-cache@npm:^6.0.0":
-  version: 6.0.0
-  resolution: "lru-cache@npm:6.0.0"
+"lru-cache@npm:^10.2.0":
+  version: 10.4.3
+  resolution: "lru-cache@npm:10.4.3"
+  checksum: 6476138d2125387a6d20f100608c2583d415a4f64a0fecf30c9e2dda976614f09cad4baa0842447bd37dd459a7bd27f57d9d8f8ce558805abd487c583f3d774a
+  languageName: node
+  linkType: hard
+
+"map-age-cleaner@npm:^0.1.3":
+  version: 0.1.3
+  resolution: "map-age-cleaner@npm:0.1.3"
   dependencies:
-    yallist: ^4.0.0
-  checksum: f97f499f898f23e4585742138a22f22526254fdba6d75d41a1c2526b3b6cc5747ef59c5612ba7375f42aca4f8461950e925ba08c991ead0651b4918b7c978297
+    p-defer: ^1.0.0
+  checksum: cb2804a5bcb3cbdfe4b59066ea6d19f5e7c8c196cd55795ea4c28f792b192e4c442426ae52524e5e1acbccf393d3bddacefc3d41f803e66453f6c4eda3650bc1
   languageName: node
   linkType: hard
 
-"lru-cache@npm:^9.1.1 || ^10.0.0":
-  version: 10.0.1
-  resolution: "lru-cache@npm:10.0.1"
-  checksum: 06f8d0e1ceabd76bb6f644a26dbb0b4c471b79c7b514c13c6856113879b3bf369eb7b497dad4ff2b7e2636db202412394865b33c332100876d838ad1372f0181
+"mem@npm:^8.0.0":
+  version: 8.1.1
+  resolution: "mem@npm:8.1.1"
+  dependencies:
+    map-age-cleaner: ^0.1.3
+    mimic-fn: ^3.1.0
+  checksum: c41bc97f6f82b91899206058989e34bcb1543af40413c2ab59e5a8e97e4f8f2188d62e7bd95b2d575d5b0d823d5034a0f274a0676f6d11a0e0b973898b06c8b1
   languageName: node
   linkType: hard
 
@@ -1465,7 +1559,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"micromatch@npm:4.0.5, micromatch@npm:^4.0.2, micromatch@npm:^4.0.4, micromatch@npm:^4.0.5":
+"micromatch@npm:4.0.5":
   version: 4.0.5
   resolution: "micromatch@npm:4.0.5"
   dependencies:
@@ -1475,6 +1569,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"micromatch@npm:^4.0.2, micromatch@npm:^4.0.4, micromatch@npm:^4.0.7":
+  version: 4.0.8
+  resolution: "micromatch@npm:4.0.8"
+  dependencies:
+    braces: ^3.0.3
+    picomatch: ^2.3.1
+  checksum: 79920eb634e6f400b464a954fcfa589c4e7c7143209488e44baf627f9affc8b1e306f41f4f0deedde97e69cb725920879462d3e750ab3bd3c1aed675bb3a8966
+  languageName: node
+  linkType: hard
+
 "mimic-fn@npm:^2.1.0":
   version: 2.1.0
   resolution: "mimic-fn@npm:2.1.0"
@@ -1482,6 +1586,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"mimic-fn@npm:^3.1.0":
+  version: 3.1.0
+  resolution: "mimic-fn@npm:3.1.0"
+  checksum: f7b167f9115b8bbdf2c3ee55dce9149d14be9e54b237259c4bc1d8d0512ea60f25a1b323f814eb1fe8f5a541662804bcfcfff3202ca58df143edb986849d58db
+  languageName: node
+  linkType: hard
+
 "mimic-fn@npm:^4.0.0":
   version: 4.0.0
   resolution: "mimic-fn@npm:4.0.0"
@@ -1503,12 +1614,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"minimatch@npm:^9.0.1":
-  version: 9.0.3
-  resolution: "minimatch@npm:9.0.3"
+"minimatch@npm:^9.0.4":
+  version: 9.0.5
+  resolution: "minimatch@npm:9.0.5"
   dependencies:
     brace-expansion: ^2.0.1
-  checksum: 253487976bf485b612f16bf57463520a14f512662e592e95c571afdab1442a6a6864b6c88f248ce6fc4ff0b6de04ac7aa6c8bb51e868e99d1d65eb0658a708b5
+  checksum: 2c035575eda1e50623c731ec6c14f65a85296268f749b9337005210bb2b34e2705f8ef1a358b188f69892286ab99dc42c8fb98a57bde55c8d81b3023c19cea28
   languageName: node
   linkType: hard
 
@@ -1519,10 +1630,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"minipass@npm:^5.0.0 || ^6.0.2 || ^7.0.0":
-  version: 7.0.4
-  resolution: "minipass@npm:7.0.4"
-  checksum: 87585e258b9488caf2e7acea242fd7856bbe9a2c84a7807643513a338d66f368c7d518200ad7b70a508664d408aa000517647b2930c259a8b1f9f0984f344a21
+"minipass@npm:^5.0.0 || ^6.0.2 || ^7.0.0, minipass@npm:^7.1.2":
+  version: 7.1.2
+  resolution: "minipass@npm:7.1.2"
+  checksum: 2bfd325b95c555f2b4d2814d49325691c7bee937d753814861b0b49d5edcda55cbbf22b6b6a60bb91eddac8668771f03c5ff647dcd9d0f798e9548b9cdc46ee3
   languageName: node
   linkType: hard
 
@@ -1545,12 +1656,12 @@ __metadata:
   linkType: hard
 
 "node.extend@npm:^2.0.0":
-  version: 2.0.2
-  resolution: "node.extend@npm:2.0.2"
+  version: 2.0.3
+  resolution: "node.extend@npm:2.0.3"
   dependencies:
-    has: ^1.0.3
-    is: ^3.2.1
-  checksum: 1fe3a1ca7fc35392f169c8a46d889d07deb201bba3a20d17df23efab509698c9639737b0c235c9be772a34035e749bae5d477f74c9e26a1b67c78bd7d6dce8e4
+    hasown: ^2.0.0
+    is: ^3.3.0
+  checksum: fde3c527df4b814d773d06392a576a062a6322bbcf4ad2c8726c900573256164fd04d61ee9b09fca774f1dfae7035cb47d23334da50b308d83e9c525f2b83ea9
   languageName: node
   linkType: hard
 
@@ -1562,11 +1673,11 @@ __metadata:
   linkType: hard
 
 "npm-run-path@npm:^5.1.0":
-  version: 5.1.0
-  resolution: "npm-run-path@npm:5.1.0"
+  version: 5.3.0
+  resolution: "npm-run-path@npm:5.3.0"
   dependencies:
     path-key: ^4.0.0
-  checksum: dc184eb5ec239d6a2b990b43236845332ef12f4e0beaa9701de724aa797fe40b6bbd0157fb7639d24d3ab13f5d5cf22d223a19c6300846b8126f335f788bee66
+  checksum: ae8e7a89da9594fb9c308f6555c73f618152340dcaae423e5fb3620026fefbec463618a8b761920382d666fa7a2d8d240b6fe320e8a6cdd54dc3687e2b659d25
   languageName: node
   linkType: hard
 
@@ -1585,14 +1696,14 @@ __metadata:
   linkType: hard
 
 "object.assign@npm:^4.1.0":
-  version: 4.1.4
-  resolution: "object.assign@npm:4.1.4"
+  version: 4.1.5
+  resolution: "object.assign@npm:4.1.5"
   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
-  checksum: 76cab513a5999acbfe0ff355f15a6a125e71805fcf53de4e9d4e082e1989bdb81d1e329291e1e4e0ae7719f0e4ef80e88fb2d367ae60500d79d25a6224ac8864
+  checksum: f9aeac0541661370a1fc86e6a8065eb1668d3e771f7dbb33ee54578201336c057b21ee61207a186dd42db0c62201d91aac703d20d12a79fc79c353eed44d4e25
   languageName: node
   linkType: hard
 
@@ -1639,6 +1750,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"p-defer@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "p-defer@npm:1.0.0"
+  checksum: 4271b935c27987e7b6f229e5de4cdd335d808465604644cb7b4c4c95bef266735859a93b16415af8a41fd663ee9e3b97a1a2023ca9def613dba1bad2a0da0c7b
+  languageName: node
+  linkType: hard
+
 "p-limit@npm:^2.2.0":
   version: 2.3.0
   resolution: "p-limit@npm:2.3.0"
@@ -1664,10 +1782,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"packageurl-js@npm:^1.0.0":
-  version: 1.1.1
-  resolution: "packageurl-js@npm:1.1.1"
-  checksum: 0d3c19dcfded1f984dad118b0f529a2670948380dacc41e715b1809e3e2dbdaabfe50c9c3345a5bf5a98bb4bb35f8964e5fc393d9047576549afe55fb0732dcd
+"package-json-from-dist@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "package-json-from-dist@npm:1.0.0"
+  checksum: ac706ec856a5a03f5261e4e48fa974f24feb044d51f84f8332e2af0af04fbdbdd5bbbfb9cbbe354190409bc8307c83a9e38c6672c3c8855f709afb0006a009ea
+  languageName: node
+  linkType: hard
+
+"packageurl-js@npm:1.2.0":
+  version: 1.2.0
+  resolution: "packageurl-js@npm:1.2.0"
+  checksum: 379dd152d37c81f62a1892d9409f6b3a374d5e46b133ee356352f755e77328f2236d3e7af0e5a20ae71913a17cd95f6e17c531979af6cb7b459b9d0dac533e48
   languageName: node
   linkType: hard
 
@@ -1685,13 +1810,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"path-scurry@npm:^1.10.1":
-  version: 1.10.1
-  resolution: "path-scurry@npm:1.10.1"
+"path-scurry@npm:^1.11.1":
+  version: 1.11.1
+  resolution: "path-scurry@npm:1.11.1"
   dependencies:
-    lru-cache: ^9.1.1 || ^10.0.0
+    lru-cache: ^10.2.0
     minipass: ^5.0.0 || ^6.0.2 || ^7.0.0
-  checksum: e2557cff3a8fb8bc07afdd6ab163a92587884f9969b05bbbaf6fe7379348bfb09af9ed292af12ed32398b15fb443e81692047b786d1eeb6d898a51eb17ed7d90
+  checksum: 890d5abcd593a7912dcce7cf7c6bf7a0b5648e3dee6caf0712c126ca0a65c7f3d7b9d769072a4d1baf370f61ce493ab5b038d59988688e0c5f3f646ee3c69023
   languageName: node
   linkType: hard
 
@@ -1796,9 +1921,9 @@ __metadata:
   linkType: hard
 
 "regenerator-runtime@npm:^0.14.0":
-  version: 0.14.0
-  resolution: "regenerator-runtime@npm:0.14.0"
-  checksum: 1c977ad82a82a4412e4f639d65d22be376d3ebdd30da2c003eeafdaaacd03fc00c2320f18120007ee700900979284fc78a9f00da7fb593f6e6eeebc673fba9a3
+  version: 0.14.1
+  resolution: "regenerator-runtime@npm:0.14.1"
+  checksum: 9f57c93277b5585d3c83b0cf76be47b473ae8c6d9142a46ce8b0291a04bb2cf902059f0f8445dcabb3fb7378e5fe4bb4ea1e008876343d42e46d3b484534ce38
   languageName: node
   linkType: hard
 
@@ -1842,21 +1967,28 @@ __metadata:
   languageName: node
   linkType: hard
 
+"rfc4648@npm:^1.5.1":
+  version: 1.5.3
+  resolution: "rfc4648@npm:1.5.3"
+  checksum: 19c81d502582e377125b00fbd7a5cdb0e351f9a1e40182fa9f608b48e1ab852d211b75facb2f4f3fa17f7c6ebc2ef4acca61ae7eb7fbcfa4768f11d2db678116
+  languageName: node
+  linkType: hard
+
 "rfdc@npm:^1.3.0":
-  version: 1.3.0
-  resolution: "rfdc@npm:1.3.0"
-  checksum: fb2ba8512e43519983b4c61bd3fa77c0f410eff6bae68b08614437bc3f35f91362215f7b4a73cbda6f67330b5746ce07db5dd9850ad3edc91271ad6deea0df32
+  version: 1.4.1
+  resolution: "rfdc@npm:1.4.1"
+  checksum: 3b05bd55062c1d78aaabfcea43840cdf7e12099968f368e9a4c3936beb744adb41cbdb315eac6d4d8c6623005d6f87fdf16d8a10e1ff3722e84afea7281c8d13
   languageName: node
   linkType: hard
 
-"rimraf@npm:^5.0.5":
-  version: 5.0.5
-  resolution: "rimraf@npm:5.0.5"
+"rimraf@npm:^5.0.10":
+  version: 5.0.10
+  resolution: "rimraf@npm:5.0.10"
   dependencies:
     glob: ^10.3.7
   bin:
     rimraf: dist/esm/bin.mjs
-  checksum: d66eef829b2e23b16445f34e73d75c7b7cf4cbc8834b04720def1c8f298eb0753c3d76df77325fad79d0a2c60470525d95f89c2475283ad985fd7441c32732d1
+  checksum: 50e27388dd2b3fa6677385fc1e2966e9157c89c86853b96d02e6915663a96b7ff4d590e14f6f70e90f9b554093aa5dbc05ac3012876be558c06a65437337bc05
   languageName: node
   linkType: hard
 
@@ -1892,14 +2024,26 @@ __metadata:
   languageName: node
   linkType: hard
 
-"semver@npm:^7.0.0, semver@npm:^7.1.2, semver@npm:^7.3.5, semver@npm:^7.5.4":
-  version: 7.5.4
-  resolution: "semver@npm:7.5.4"
-  dependencies:
-    lru-cache: ^6.0.0
+"semver@npm:^7.0.0, semver@npm:^7.1.2, semver@npm:^7.3.8, semver@npm:^7.6.0, semver@npm:^7.6.3":
+  version: 7.6.3
+  resolution: "semver@npm:7.6.3"
   bin:
     semver: bin/semver.js
-  checksum: 12d8ad952fa353b0995bf180cdac205a4068b759a140e5d3c608317098b3575ac2f1e09182206bf2eb26120e1c0ed8fb92c48c592f6099680de56bb071423ca3
+  checksum: 4110ec5d015c9438f322257b1c51fe30276e5f766a3f64c09edd1d7ea7118ecbc3f379f3b69032bacf13116dc7abc4ad8ce0d7e2bd642e26b0d271b56b61a7d8
+  languageName: node
+  linkType: hard
+
+"set-function-length@npm:^1.2.1":
+  version: 1.2.2
+  resolution: "set-function-length@npm:1.2.2"
+  dependencies:
+    define-data-property: ^1.1.4
+    es-errors: ^1.3.0
+    function-bind: ^1.1.2
+    get-intrinsic: ^1.2.4
+    gopd: ^1.0.1
+    has-property-descriptors: ^1.0.2
+  checksum: a8248bdacdf84cb0fab4637774d9fb3c7a8e6089866d04c817583ff48e14149c87044ce683d7f50759a8c50fb87c7a7e173535b06169c87ef76f5fb276dfff72
   languageName: node
   linkType: hard
 
@@ -1958,40 +2102,42 @@ __metadata:
   linkType: hard
 
 "snyk-config@npm:^5.0.0":
-  version: 5.2.0
-  resolution: "snyk-config@npm:5.2.0"
+  version: 5.3.0
+  resolution: "snyk-config@npm:5.3.0"
   dependencies:
     async: ^3.2.2
     debug: ^4.3.4
     lodash.merge: ^4.6.2
     minimist: ^1.2.6
-  checksum: 93d250ed83ed58d88cd435d875296032bb88ccc09d52ff53f0225c309679da39a39650a7936de00ebf9c479b3f62f9477efa773e00ca7994cf5a91f6d17146d5
+  checksum: efd921f154ceace2cc0cc34cab1769503024e7f21d9be14744833f70cd958edbe367d108c0cb8dc520cb1d1423505b758c6785687e52005bd872350b47934360
   languageName: node
   linkType: hard
 
-"snyk-nodejs-lockfile-parser@npm:^1.52.11":
-  version: 1.52.11
-  resolution: "snyk-nodejs-lockfile-parser@npm:1.52.11"
+"snyk-nodejs-lockfile-parser@npm:^1.58.11":
+  version: 1.58.11
+  resolution: "snyk-nodejs-lockfile-parser@npm:1.58.11"
   dependencies:
     "@snyk/dep-graph": ^2.3.0
+    "@snyk/error-catalog-nodejs-public": ^5.16.0
     "@snyk/graphlib": 2.1.9-patch.3
     "@yarnpkg/core": ^2.4.0
     "@yarnpkg/lockfile": ^1.1.0
+    dependency-path: ^9.2.8
     event-loop-spinner: ^2.0.0
     js-yaml: ^4.1.0
     lodash.clonedeep: ^4.5.0
     lodash.flatmap: ^4.5.0
     lodash.isempty: ^4.4.0
     lodash.topairs: ^4.3.0
-    micromatch: ^4.0.5
+    micromatch: ^4.0.7
     p-map: ^4.0.0
-    semver: ^7.3.5
+    semver: ^7.6.0
     snyk-config: ^5.0.0
     tslib: ^1.9.3
     uuid: ^8.3.0
   bin:
     parse-nodejs-lockfile: bin/index.js
-  checksum: b40e456f184f627d57cf1cac81995829eaaf4597fa69b288996db43f8f177bcda302b9081c29d5ce427fb03b7c3e27943a4e386a3c23e9dd5412887b62125aeb
+  checksum: 41174b88d1a5bae3d02b9a93925b50e19bfb7eef5f5301734359f61f2d62ce378f305c754b58972e98a367a57fe3165736cfa6b046e6051ff51e0c7777aa88e6
   languageName: node
   linkType: hard
 
@@ -2010,9 +2156,9 @@ __metadata:
   linkType: hard
 
 "stream-buffers@npm:^3.0.2":
-  version: 3.0.2
-  resolution: "stream-buffers@npm:3.0.2"
-  checksum: b09fdeea606e3113ebd0e07010ed0cf038608fa396130add9e45deaff5cc3ba845dc25c31ad24f8341f85907846344cb7c85f75ea52c6572e2ac646e9b6072d0
+  version: 3.0.3
+  resolution: "stream-buffers@npm:3.0.3"
+  checksum: 3f0bdc4b1fd3ff370cef5a2103dd930b8981d42d97741eeb087a660771e27f0fc35fa8a351bb36e15bbbbce0eea00fefed60d6cdff4c6c3f527580529f183807
   languageName: node
   linkType: hard
 
@@ -2162,10 +2308,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tslib@npm:^2, tslib@npm:^2.1.0":
-  version: 2.6.2
-  resolution: "tslib@npm:2.6.2"
-  checksum: 329ea56123005922f39642318e3d1f0f8265d1e7fcb92c633e0809521da75eeaca28d2cf96d7248229deb40e5c19adf408259f4b9640afd20d13aecc1430f3ad
+"tslib@npm:^2, tslib@npm:^2.1.0, tslib@npm:^2.6.2, tslib@npm:^2.6.3":
+  version: 2.7.0
+  resolution: "tslib@npm:2.7.0"
+  checksum: 1606d5c89f88d466889def78653f3aab0f88692e80bb2066d090ca6112ae250ec1cfa9dbfaab0d17b60da15a4186e8ec4d893801c67896b277c17374e36e1d28
   languageName: node
   linkType: hard
 
@@ -2183,6 +2329,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"undici-types@npm:~6.19.2":
+  version: 6.19.8
+  resolution: "undici-types@npm:6.19.8"
+  checksum: de51f1b447d22571cf155dfe14ff6d12c5bdaec237c765085b439c38ca8518fc360e88c70f99469162bf2e14188a7b0bcb06e1ed2dc031042b984b0bb9544017
+  languageName: node
+  linkType: hard
+
 "util-deprecate@npm:^1.0.1":
   version: 1.0.2
   resolution: "util-deprecate@npm:1.0.2"
@@ -2199,6 +2352,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"uuid@npm:^9.0.0":
+  version: 9.0.1
+  resolution: "uuid@npm:9.0.1"
+  bin:
+    uuid: dist/bin/uuid
+  checksum: 39931f6da74e307f51c0fb463dc2462807531dc80760a9bff1e35af4316131b4fc3203d16da60ae33f07fdca5b56f3f1dd662da0c99fea9aaeab2004780cc5f4
+  languageName: node
+  linkType: hard
+
 "which@npm:^2.0.1":
   version: 2.0.2
   resolution: "which@npm:2.0.2"
@@ -2246,13 +2408,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"yallist@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "yallist@npm:4.0.0"
-  checksum: 343617202af32df2a15a3be36a5a8c0c8545208f3d3dfbc6bb7c3e3b7e8c6f8e7485432e4f3b88da3031a6e20afa7c711eded32ddfb122896ac5d914e75848d5
-  languageName: node
-  linkType: hard
-
 "yaml@npm:2.3.1":
   version: 2.3.1
   resolution: "yaml@npm:2.3.1"