diff --git a/.eslintignore b/.eslintignore
index a79f9e2879..8d4c64d960 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -10,4 +10,5 @@ packages/builder/.routify
 packages/sdk/sdk
 packages/account-portal/packages/server/build
 packages/account-portal/packages/ui/.routify
-packages/account-portal/packages/ui/build
\ No newline at end of file
+packages/account-portal/packages/ui/build
+**/*.ivm.bundle.js
\ No newline at end of file
diff --git a/.eslintrc.json b/.eslintrc.json
index 917443014b..3de9d13046 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -43,7 +43,8 @@
         "no-useless-escape": "off",
         "no-undef": "off",
         "no-prototype-builtins": "off",
-        "local-rules/no-budibase-imports": "error"
+        "local-rules/no-budibase-imports": "error",
+        "local-rules/no-test-com": "error"
       }
     },
     {
@@ -53,7 +54,7 @@
         "packages/frontend-core/**/*"
       ],
       "rules": {
-        "no-console": ["error", { "allow": ["warn", "error", "debug"] } ]
+        "no-console": ["error", { "allow": ["warn", "error", "debug"] }]
       }
     }
   ],
diff --git a/.prettierignore b/.prettierignore
index 2444f0e753..87f0191a94 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -11,4 +11,5 @@ packages/sdk/sdk
 packages/pro/coverage
 packages/account-portal/packages/ui/build
 packages/account-portal/packages/ui/.routify
-packages/account-portal/packages/server/build
\ No newline at end of file
+packages/account-portal/packages/server/build
+**/*.ivm.bundle.js
\ No newline at end of file
diff --git a/eslint-local-rules/index.js b/eslint-local-rules/index.js
index af02599c90..71bb5068da 100644
--- a/eslint-local-rules/index.js
+++ b/eslint-local-rules/index.js
@@ -18,4 +18,37 @@ module.exports = {
       }
     },
   },
+  "no-test-com": {
+    meta: {
+      type: "problem",
+      docs: {
+        description:
+          "disallow the use of 'test.com' in strings and replace it with 'example.com'",
+        category: "Possible Errors",
+        recommended: false,
+      },
+      schema: [], // no options
+      fixable: "code", // Indicates that this rule supports automatic fixing
+    },
+    create: function (context) {
+      return {
+        Literal(node) {
+          if (
+            typeof node.value === "string" &&
+            node.value.includes("test.com")
+          ) {
+            context.report({
+              node,
+              message:
+                "test.com is a privately owned domain and could point anywhere, use example.com instead.",
+              fix: function (fixer) {
+                const newText = node.raw.replace(/test\.com/g, "example.com")
+                return fixer.replaceText(node, newText)
+              },
+            })
+          }
+        },
+      }
+    },
+  },
 }
diff --git a/hosting/single/Dockerfile b/hosting/single/Dockerfile
index 67ac677984..f9044cd124 100644
--- a/hosting/single/Dockerfile
+++ b/hosting/single/Dockerfile
@@ -124,6 +124,8 @@ HEALTHCHECK --interval=15s --timeout=15s --start-period=45s CMD "/healthcheck.sh
 
 # must set this just before running
 ENV NODE_ENV=production
+# this is required for isolated-vm to work on Node 20+
+ENV NODE_OPTIONS="--no-node-snapshot"
 WORKDIR /
 
 CMD ["./runner.sh"]
diff --git a/lerna.json b/lerna.json
index 38dff33c7e..0e026aefc5 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.16.2",
+  "version": "2.19.3",
   "npmClient": "yarn",
   "packages": [
     "packages/*",
diff --git a/package.json b/package.json
index af4c540604..499952a441 100644
--- a/package.json
+++ b/package.json
@@ -97,7 +97,16 @@
     "@budibase/backend-core": "0.0.0",
     "@budibase/shared-core": "0.0.0",
     "@budibase/string-templates": "0.0.0",
-    "@budibase/types": "0.0.0"
+    "@budibase/types": "0.0.0",
+    "tough-cookie": "4.1.3",
+    "node-fetch": "2.6.7",
+    "semver": "7.5.3",
+    "http-cache-semantics": "4.1.1",
+    "msgpackr": "1.10.1",
+    "axios": "1.6.3",
+    "xml2js": "0.6.2",
+    "unset-value": "2.0.1",
+    "passport": "0.6.0"
   },
   "engines": {
     "node": ">=20.0.0 <21.0.0"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index 85644488f5..3f8c34f823 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -25,19 +25,19 @@
     "@budibase/pouchdb-replication-stream": "1.2.10",
     "@budibase/shared-core": "0.0.0",
     "@budibase/types": "0.0.0",
-    "@techpass/passport-openidconnect": "0.3.2",
+    "@govtechsg/passport-openidconnect": "^1.0.2",
     "aws-cloudfront-sign": "3.0.2",
     "aws-sdk": "2.1030.0",
     "bcrypt": "5.1.0",
     "bcryptjs": "2.4.3",
     "bull": "4.10.1",
     "correlation-id": "4.0.0",
-    "dd-trace": "5.0.0",
+    "dd-trace": "5.2.0",
     "dotenv": "16.0.1",
     "ioredis": "5.3.2",
     "joi": "17.6.0",
     "jsonwebtoken": "9.0.2",
-    "koa-passport": "4.1.4",
+    "koa-passport": "^6.0.0",
     "koa-pino-logger": "4.0.0",
     "lodash": "4.17.21",
     "node-fetch": "2.6.7",
@@ -52,9 +52,9 @@
     "redlock": "4.2.0",
     "rotating-file-stream": "3.1.0",
     "sanitize-s3-objectkey": "0.0.1",
-    "semver": "7.3.7",
+    "semver": "^7.5.4",
     "tar-fs": "2.1.1",
-    "uuid": "8.3.2"
+    "uuid": "^8.3.2"
   },
   "devDependencies": {
     "@shopify/jest-koa-mocks": "5.1.1",
diff --git a/packages/backend-core/src/context/types.ts b/packages/backend-core/src/context/types.ts
index f73dc9f5c7..6fb9f44fad 100644
--- a/packages/backend-core/src/context/types.ts
+++ b/packages/backend-core/src/context/types.ts
@@ -1,4 +1,4 @@
-import { IdentityContext } from "@budibase/types"
+import { IdentityContext, VM } from "@budibase/types"
 import { ExecutionTimeTracker } from "../timers"
 
 // keep this out of Budibase types, don't want to expose context info
@@ -11,4 +11,5 @@ export type ContextMap = {
   automationId?: string
   isMigrating?: boolean
   jsExecutionTracker?: ExecutionTimeTracker
+  vm?: VM
 }
diff --git a/packages/backend-core/src/objectStore/objectStore.ts b/packages/backend-core/src/objectStore/objectStore.ts
index 57ead0e809..8d18fb97fd 100644
--- a/packages/backend-core/src/objectStore/objectStore.ts
+++ b/packages/backend-core/src/objectStore/objectStore.ts
@@ -7,7 +7,7 @@ import tar from "tar-fs"
 import zlib from "zlib"
 import { promisify } from "util"
 import { join } from "path"
-import fs from "fs"
+import fs, { ReadStream } from "fs"
 import env from "../environment"
 import { budibaseTempDir } from "./utils"
 import { v4 } from "uuid"
@@ -184,7 +184,7 @@ export async function upload({
 export async function streamUpload(
   bucketName: string,
   filename: string,
-  stream: any,
+  stream: ReadStream | ReadableStream,
   extra = {}
 ) {
   const objectStore = ObjectStore(bucketName)
@@ -255,7 +255,8 @@ export async function listAllObjects(bucketName: string, path: string) {
       objects = objects.concat(response.Contents)
     }
     isTruncated = !!response.IsTruncated
-  } while (isTruncated)
+    token = response.NextContinuationToken
+  } while (isTruncated && token)
   return objects
 }
 
diff --git a/packages/backend-core/src/queue/queue.ts b/packages/backend-core/src/queue/queue.ts
index b95dace5b2..0bcb25a35f 100644
--- a/packages/backend-core/src/queue/queue.ts
+++ b/packages/backend-core/src/queue/queue.ts
@@ -2,7 +2,7 @@ import env from "../environment"
 import { getRedisOptions } from "../redis/utils"
 import { JobQueue } from "./constants"
 import InMemoryQueue from "./inMemoryQueue"
-import BullQueue, { QueueOptions } from "bull"
+import BullQueue, { QueueOptions, JobOptions } from "bull"
 import { addListeners, StalledFn } from "./listeners"
 import { Duration } from "../utils"
 import * as timers from "../timers"
@@ -24,17 +24,24 @@ async function cleanup() {
 
 export function createQueue<T>(
   jobQueue: JobQueue,
-  opts: { removeStalledCb?: StalledFn } = {}
+  opts: {
+    removeStalledCb?: StalledFn
+    maxStalledCount?: number
+    jobOptions?: JobOptions
+  } = {}
 ): BullQueue.Queue<T> {
   const redisOpts = getRedisOptions()
   const queueConfig: QueueOptions = {
     redis: redisOpts,
     settings: {
-      maxStalledCount: 0,
+      maxStalledCount: opts.maxStalledCount ? opts.maxStalledCount : 0,
       lockDuration: QUEUE_LOCK_MS,
       lockRenewTime: QUEUE_LOCK_RENEW_INTERNAL_MS,
     },
   }
+  if (opts.jobOptions) {
+    queueConfig.defaultJobOptions = opts.jobOptions
+  }
   let queue: any
   if (!env.isTest()) {
     queue = new BullQueue(jobQueue, queueConfig)
diff --git a/packages/backend-core/src/utils/tests/utils.spec.ts b/packages/backend-core/src/utils/tests/utils.spec.ts
index 7b411e801c..4dc3855c35 100644
--- a/packages/backend-core/src/utils/tests/utils.spec.ts
+++ b/packages/backend-core/src/utils/tests/utils.spec.ts
@@ -44,11 +44,11 @@ describe("utils", () => {
 
     it("gets appId from url", async () => {
       await config.doInTenant(async () => {
-        const url = "http://test.com"
+        const url = "http://example.com"
         env._set("PLATFORM_URL", url)
 
         const ctx = structures.koa.newContext()
-        ctx.host = `${config.tenantId}.test.com`
+        ctx.host = `${config.tenantId}.example.com`
 
         const expected = db.generateAppID(config.tenantId)
         const app = structures.apps.app(expected)
@@ -89,7 +89,7 @@ describe("utils", () => {
       const ctx = structures.koa.newContext()
       const expected = db.generateAppID()
       ctx.request.headers = {
-        referer: `http://test.com/builder/app/${expected}/design/screen_123/screens`,
+        referer: `http://example.com/builder/app/${expected}/design/screen_123/screens`,
       }
 
       const actual = await utils.getAppIdFromCtx(ctx)
@@ -100,7 +100,7 @@ describe("utils", () => {
       const ctx = structures.koa.newContext()
       const appId = db.generateAppID()
       ctx.request.headers = {
-        referer: `http://test.com/foo/app/${appId}/bar`,
+        referer: `http://example.com/foo/app/${appId}/bar`,
       }
 
       const actual = await utils.getAppIdFromCtx(ctx)
diff --git a/packages/backend-core/tests/core/utilities/structures/common.ts b/packages/backend-core/tests/core/utilities/structures/common.ts
index 05b879f36b..9b1b178f0b 100644
--- a/packages/backend-core/tests/core/utilities/structures/common.ts
+++ b/packages/backend-core/tests/core/utilities/structures/common.ts
@@ -3,5 +3,5 @@ import { v4 as uuid } from "uuid"
 export { v4 as uuid } from "uuid"
 
 export const email = () => {
-  return `${uuid()}@test.com`
+  return `${uuid()}@example.com`
 }
diff --git a/packages/backend-core/tests/core/utilities/structures/sso.ts b/packages/backend-core/tests/core/utilities/structures/sso.ts
index 2e3af712a9..6492283e6a 100644
--- a/packages/backend-core/tests/core/utilities/structures/sso.ts
+++ b/packages/backend-core/tests/core/utilities/structures/sso.ts
@@ -61,7 +61,7 @@ export function ssoProfile(user?: User): SSOProfile {
     },
     _json: {
       email: user.email,
-      picture: "http://test.com",
+      picture: "http://example.com",
     },
     provider: generator.string(),
   }
diff --git a/packages/backend-core/tests/core/utilities/structures/users.ts b/packages/backend-core/tests/core/utilities/structures/users.ts
index 8f4096d401..db90887af2 100644
--- a/packages/backend-core/tests/core/utilities/structures/users.ts
+++ b/packages/backend-core/tests/core/utilities/structures/users.ts
@@ -25,7 +25,7 @@ export const user = (userProps?: Partial<Omit<User, "userId">>): User => {
     roles: { app_test: "admin" },
     firstName: generator.first(),
     lastName: generator.last(),
-    pictureUrl: "http://test.com",
+    pictureUrl: "http://example.com",
     tenantId: tenant.id(),
     ...userProps,
   }
diff --git a/packages/bbui/src/Form/Core/EnvDropdown.svelte b/packages/bbui/src/Form/Core/EnvDropdown.svelte
index 2edf8a5f9d..c690ffbc6b 100644
--- a/packages/bbui/src/Form/Core/EnvDropdown.svelte
+++ b/packages/bbui/src/Form/Core/EnvDropdown.svelte
@@ -184,7 +184,7 @@
       {#if environmentVariablesEnabled}
         <div on:click={() => showModal()} class="add-variable">
           <svg
-            class="spectrum-Icon spectrum-Icon--sizeS "
+            class="spectrum-Icon spectrum-Icon--sizeS"
             focusable="false"
             aria-hidden="true"
           >
@@ -195,7 +195,7 @@
       {:else}
         <div on:click={() => handleUpgradePanel()} class="add-variable">
           <svg
-            class="spectrum-Icon spectrum-Icon--sizeS "
+            class="spectrum-Icon spectrum-Icon--sizeS"
             focusable="false"
             aria-hidden="true"
           >
diff --git a/packages/builder/package.json b/packages/builder/package.json
index 273994ed0e..52db8e11bc 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -23,7 +23,6 @@
       "\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$": "<rootDir>/internals/mocks/fileMock.js",
       "\\.(css|less|sass|scss)$": "identity-obj-proxy",
       "components(.*)$": "<rootDir>/src/components$1",
-      "builderStore(.*)$": "<rootDir>/src/builderStore$1",
       "stores(.*)$": "<rootDir>/src/stores$1",
       "analytics(.*)$": "<rootDir>/src/analytics$1",
       "constants/backend": "<rootDir>/src/constants/backend/index.js"
diff --git a/packages/builder/src/api.js b/packages/builder/src/api.js
index ac878bf82f..6441b4ff48 100644
--- a/packages/builder/src/api.js
+++ b/packages/builder/src/api.js
@@ -3,14 +3,14 @@ import {
   CookieUtils,
   Constants,
 } from "@budibase/frontend-core"
-import { store } from "./builderStore"
+import { appStore } from "stores/builder"
 import { get } from "svelte/store"
 import { auth, navigation } from "./stores/portal"
 
 export const API = createAPIClient({
   attachHeaders: headers => {
     // Attach app ID header from store
-    let appId = get(store).appId
+    let appId = get(appStore).appId
     if (appId) {
       headers["x-budibase-app-id"] = appId
     }
diff --git a/packages/builder/src/builderStore/index.js b/packages/builder/src/builderStore/index.js
deleted file mode 100644
index b58d196024..0000000000
--- a/packages/builder/src/builderStore/index.js
+++ /dev/null
@@ -1,158 +0,0 @@
-import { getFrontendStore } from "./store/frontend"
-import { getAutomationStore } from "./store/automation"
-import { getTemporalStore } from "./store/temporal"
-import { getThemeStore } from "./store/theme"
-import { getUserStore } from "./store/users"
-import { getDeploymentStore } from "./store/deployments"
-import { derived, get } from "svelte/store"
-import { findComponent, findComponentPath } from "./componentUtils"
-import { RoleUtils } from "@budibase/frontend-core"
-import { createHistoryStore } from "builderStore/store/history"
-import { cloneDeep } from "lodash/fp"
-import { getHoverStore } from "./store/hover"
-
-export const store = getFrontendStore()
-export const automationStore = getAutomationStore()
-export const themeStore = getThemeStore()
-export const temporalStore = getTemporalStore()
-export const userStore = getUserStore()
-export const deploymentStore = getDeploymentStore()
-export const hoverStore = getHoverStore()
-
-// Setup history for screens
-export const screenHistoryStore = createHistoryStore({
-  getDoc: id => get(store).screens?.find(screen => screen._id === id),
-  selectDoc: store.actions.screens.select,
-  afterAction: () => {
-    // Ensure a valid component is selected
-    if (!get(selectedComponent)) {
-      store.update(state => ({
-        ...state,
-        selectedComponentId: get(selectedScreen)?.props._id,
-      }))
-    }
-  },
-})
-store.actions.screens.save = screenHistoryStore.wrapSaveDoc(
-  store.actions.screens.save
-)
-store.actions.screens.delete = screenHistoryStore.wrapDeleteDoc(
-  store.actions.screens.delete
-)
-
-// Setup history for automations
-export const automationHistoryStore = createHistoryStore({
-  getDoc: automationStore.actions.getDefinition,
-  selectDoc: automationStore.actions.select,
-})
-automationStore.actions.save = automationHistoryStore.wrapSaveDoc(
-  automationStore.actions.save
-)
-automationStore.actions.delete = automationHistoryStore.wrapDeleteDoc(
-  automationStore.actions.delete
-)
-
-export const selectedScreen = derived(store, $store => {
-  return $store.screens.find(screen => screen._id === $store.selectedScreenId)
-})
-
-export const selectedLayout = derived(store, $store => {
-  return $store.layouts?.find(layout => layout._id === $store.selectedLayoutId)
-})
-
-export const selectedComponent = derived(
-  [store, selectedScreen],
-  ([$store, $selectedScreen]) => {
-    if (
-      $selectedScreen &&
-      $store.selectedComponentId?.startsWith(`${$selectedScreen._id}-`)
-    ) {
-      return $selectedScreen?.props
-    }
-    if (!$selectedScreen || !$store.selectedComponentId) {
-      return null
-    }
-    const selected = findComponent(
-      $selectedScreen?.props,
-      $store.selectedComponentId
-    )
-
-    const clone = selected ? cloneDeep(selected) : selected
-    store.actions.components.migrateSettings(clone)
-    return clone
-  }
-)
-
-// For legacy compatibility only, but with the new design UI this is just
-// the selected screen
-export const currentAsset = selectedScreen
-
-export const sortedScreens = derived(store, $store => {
-  return $store.screens.slice().sort((a, b) => {
-    // Sort by role first
-    const roleA = RoleUtils.getRolePriority(a.routing.roleId)
-    const roleB = RoleUtils.getRolePriority(b.routing.roleId)
-    if (roleA !== roleB) {
-      return roleA > roleB ? -1 : 1
-    }
-    // Then put home screens first
-    const homeA = !!a.routing.homeScreen
-    const homeB = !!b.routing.homeScreen
-    if (homeA !== homeB) {
-      return homeA ? -1 : 1
-    }
-    // Then sort alphabetically by each URL param
-    const aParams = a.routing.route.split("/")
-    const bParams = b.routing.route.split("/")
-    let minParams = Math.min(aParams.length, bParams.length)
-    for (let i = 0; i < minParams; i++) {
-      if (aParams[i] === bParams[i]) {
-        continue
-      }
-      return aParams[i] < bParams[i] ? -1 : 1
-    }
-    // Then sort by the fewest amount of URL params
-    return aParams.length < bParams.length ? -1 : 1
-  })
-})
-
-export const selectedComponentPath = derived(
-  [store, selectedScreen],
-  ([$store, $selectedScreen]) => {
-    return findComponentPath(
-      $selectedScreen?.props,
-      $store.selectedComponentId
-    ).map(component => component._id)
-  }
-)
-
-// Derived automation state
-export const selectedAutomation = derived(automationStore, $automationStore => {
-  if (!$automationStore.selectedAutomationId) {
-    return null
-  }
-  return $automationStore.automations?.find(
-    x => x._id === $automationStore.selectedAutomationId
-  )
-})
-
-// Derive map of resource IDs to other users.
-// We only ever care about a single user in each resource, so if multiple users
-// share the same datasource we can just overwrite them.
-export const userSelectedResourceMap = derived(userStore, $userStore => {
-  let map = {}
-  $userStore.forEach(user => {
-    const resource = user.builderMetadata?.selectedResourceId
-    if (resource) {
-      if (!map[resource]) {
-        map[resource] = []
-      }
-      map[resource].push(user)
-    }
-  })
-  return map
-})
-
-export const isOnlyUser = derived(userStore, $userStore => {
-  return $userStore.length < 2
-})
diff --git a/packages/builder/src/builderStore/store/frontend.js b/packages/builder/src/builderStore/store/frontend.js
deleted file mode 100644
index c3d55d6f33..0000000000
--- a/packages/builder/src/builderStore/store/frontend.js
+++ /dev/null
@@ -1,1512 +0,0 @@
-import { get, writable } from "svelte/store"
-import { cloneDeep } from "lodash/fp"
-import {
-  selectedScreen,
-  selectedComponent,
-  screenHistoryStore,
-  automationHistoryStore,
-} from "builderStore"
-import {
-  datasources,
-  integrations,
-  queries,
-  database,
-  tables,
-} from "stores/backend"
-import { API } from "api"
-import analytics, { Events } from "analytics"
-import {
-  findComponentParent,
-  findClosestMatchingComponent,
-  findAllMatchingComponents,
-  findComponent,
-  getComponentSettings,
-  makeComponentUnique,
-  findComponentPath,
-} from "../componentUtils"
-import { Helpers } from "@budibase/bbui"
-import { Utils } from "@budibase/frontend-core"
-import {
-  BUDIBASE_INTERNAL_DB_ID,
-  DB_TYPE_INTERNAL,
-  DB_TYPE_EXTERNAL,
-} from "constants/backend"
-import {
-  buildFormSchema,
-  getSchemaForDatasource,
-} from "builderStore/dataBinding"
-import { makePropSafe as safe } from "@budibase/string-templates"
-import { getComponentFieldOptions } from "helpers/formFields"
-import { createBuilderWebsocket } from "builderStore/websocket"
-import { BuilderSocketEvent } from "@budibase/shared-core"
-
-const INITIAL_FRONTEND_STATE = {
-  initialised: false,
-  apps: [],
-  name: "",
-  url: "",
-  description: "",
-  layouts: [],
-  screens: [],
-  components: [],
-  clientFeatures: {
-    spectrumThemes: false,
-    intelligentLoading: false,
-    deviceAwareness: false,
-    state: false,
-    rowSelection: false,
-    customThemes: false,
-    devicePreview: false,
-    messagePassing: false,
-    continueIfAction: false,
-    showNotificationAction: false,
-    sidePanel: false,
-  },
-  features: {
-    componentValidation: false,
-    disableUserMetadata: false,
-  },
-  errors: [],
-  hasAppPackage: false,
-  libraries: null,
-  appId: "",
-  routes: {},
-  clientLibPath: "",
-  theme: "",
-  customTheme: {},
-  previewDevice: "desktop",
-  highlightedSettingKey: null,
-  propertyFocus: null,
-  builderSidePanel: false,
-  hasLock: true,
-  showPreview: false,
-
-  // URL params
-  selectedScreenId: null,
-  selectedComponentId: null,
-  selectedLayoutId: null,
-
-  // Client state
-  selectedComponentContext: null,
-
-  // Onboarding
-  onboarding: false,
-  tourNodes: null,
-}
-
-export const getFrontendStore = () => {
-  const store = writable({ ...INITIAL_FRONTEND_STATE })
-  let websocket
-
-  // This is a fake implementation of a "patch" API endpoint to try and prevent
-  // 409s. All screen doc mutations (aside from creation) use this function,
-  // which queues up invocations sequentially and ensures pending mutations are
-  // always applied to the most up-to-date doc revision.
-  // This is slightly better than just a traditional "patch" endpoint and this
-  // supports deeply mutating the current doc rather than just appending data.
-  const sequentialScreenPatch = Utils.sequential(async (patchFn, screenId) => {
-    const state = get(store)
-    const screen = state.screens.find(screen => screen._id === screenId)
-    if (!screen) {
-      return
-    }
-    let clone = cloneDeep(screen)
-    const result = patchFn(clone)
-    // An explicit false result means skip this change
-    if (result === false) {
-      return
-    }
-    return await store.actions.screens.save(clone)
-  })
-
-  store.actions = {
-    reset: () => {
-      store.set({ ...INITIAL_FRONTEND_STATE })
-      websocket?.disconnect()
-      websocket = null
-    },
-    initialise: async pkg => {
-      const { layouts, screens, application, clientLibPath, hasLock } = pkg
-      if (!websocket) {
-        websocket = createBuilderWebsocket(application.appId)
-      }
-      await store.actions.components.refreshDefinitions(application.appId)
-
-      // Reset store state
-      store.update(state => ({
-        ...state,
-        libraries: application.componentLibraries,
-        name: application.name,
-        description: application.description,
-        appId: application.appId,
-        url: application.url,
-        layouts: layouts || [],
-        screens: screens || [],
-        theme: application.theme || "spectrum--light",
-        customTheme: application.customTheme,
-        hasAppPackage: true,
-        appInstance: application.instance,
-        clientLibPath,
-        previousTopNavPath: {},
-        version: application.version,
-        revertableVersion: application.revertableVersion,
-        upgradableVersion: application.upgradableVersion,
-        navigation: application.navigation || {},
-        usedPlugins: application.usedPlugins || [],
-        hasLock,
-        features: {
-          ...INITIAL_FRONTEND_STATE.features,
-          ...application.features,
-        },
-        icon: application.icon || {},
-        initialised: true,
-      }))
-      screenHistoryStore.reset()
-      automationHistoryStore.reset()
-
-      // Initialise backend stores
-      database.set(application.instance)
-      await datasources.init()
-      await integrations.init()
-      await queries.init()
-      await tables.init()
-    },
-    theme: {
-      save: async theme => {
-        const appId = get(store).appId
-        const app = await API.saveAppMetadata({
-          appId,
-          metadata: { theme },
-        })
-        store.update(state => {
-          state.theme = app.theme
-          return state
-        })
-      },
-    },
-    customTheme: {
-      save: async customTheme => {
-        const appId = get(store).appId
-        const app = await API.saveAppMetadata({
-          appId,
-          metadata: { customTheme },
-        })
-        store.update(state => {
-          state.customTheme = app.customTheme
-          return state
-        })
-      },
-    },
-    navigation: {
-      save: async navigation => {
-        const appId = get(store).appId
-        const app = await API.saveAppMetadata({
-          appId,
-          metadata: { navigation },
-        })
-        store.update(state => {
-          state.navigation = app.navigation
-          return state
-        })
-      },
-    },
-    screens: {
-      select: screenId => {
-        // Check this screen exists
-        const state = get(store)
-        const screen = state.screens.find(screen => screen._id === screenId)
-        if (!screen) {
-          return
-        }
-
-        // Check screen isn't already selected
-        if (state.selectedScreenId === screen._id) {
-          return
-        }
-
-        // Select new screen
-        store.update(state => {
-          state.selectedScreenId = screen._id
-          return state
-        })
-      },
-      validate: screen => {
-        // Recursive function to find any illegal children in component trees
-        const findIllegalChild = (
-          component,
-          illegalChildren = [],
-          legalDirectChildren = []
-        ) => {
-          const type = component._component
-
-          if (illegalChildren.includes(type)) {
-            return type
-          }
-          if (
-            legalDirectChildren.length &&
-            !legalDirectChildren.includes(type)
-          ) {
-            return type
-          }
-          if (!component?._children?.length) {
-            return
-          }
-
-          if (type === "@budibase/standard-components/sidepanel") {
-            illegalChildren = []
-          }
-
-          const definition = store.actions.components.getDefinition(
-            component._component
-          )
-          // Reset whitelist for direct children
-          legalDirectChildren = []
-          if (definition?.legalDirectChildren?.length) {
-            legalDirectChildren = definition.legalDirectChildren.map(x => {
-              return `@budibase/standard-components/${x}`
-            })
-          }
-
-          // Append blacklisted components and remove duplicates
-          if (definition?.illegalChildren?.length) {
-            const blacklist = definition.illegalChildren.map(x => {
-              return `@budibase/standard-components/${x}`
-            })
-            illegalChildren = [...new Set([...illegalChildren, ...blacklist])]
-          }
-
-          // Recurse on all children
-          for (let child of component._children) {
-            const illegalChild = findIllegalChild(
-              child,
-              illegalChildren,
-              legalDirectChildren
-            )
-            if (illegalChild) {
-              return illegalChild
-            }
-          }
-        }
-
-        // Validate the entire tree and throw an error if an illegal child is
-        // found anywhere
-        const illegalChild = findIllegalChild(screen.props)
-        if (illegalChild) {
-          const def = store.actions.components.getDefinition(illegalChild)
-          throw `You can't place a ${def.name} here`
-        }
-      },
-      save: async screen => {
-        const state = get(store)
-
-        // Validate screen structure if the app supports it
-        if (state.features?.componentValidation) {
-          store.actions.screens.validate(screen)
-        }
-
-        // Check screen definition for any component settings which need updated
-        store.actions.screens.enrichEmptySettings(screen)
-
-        // Save screen
-        const creatingNewScreen = screen._id === undefined
-        const savedScreen = await API.saveScreen(screen)
-        const routesResponse = await API.fetchAppRoutes()
-
-        // If plugins changed we need to fetch the latest app metadata
-        let usedPlugins = state.usedPlugins
-        if (savedScreen.pluginAdded) {
-          const { application } = await API.fetchAppPackage(state.appId)
-          usedPlugins = application.usedPlugins || []
-        }
-
-        // Update state
-        store.update(state => {
-          // Update screen object
-          const idx = state.screens.findIndex(x => x._id === savedScreen._id)
-          if (idx !== -1) {
-            state.screens.splice(idx, 1, savedScreen)
-          } else {
-            state.screens.push(savedScreen)
-          }
-
-          // Select the new screen if creating a new one
-          if (creatingNewScreen) {
-            state.selectedScreenId = savedScreen._id
-            state.selectedComponentId = savedScreen.props._id
-          }
-
-          // Update routes
-          state.routes = routesResponse.routes
-
-          // Update used plugins
-          state.usedPlugins = usedPlugins
-          return state
-        })
-        return savedScreen
-      },
-      patch: async (patchFn, screenId) => {
-        // Default to the currently selected screen
-        if (!screenId) {
-          const state = get(store)
-          screenId = state.selectedScreenId
-        }
-        if (!screenId || !patchFn) {
-          return
-        }
-        return await sequentialScreenPatch(patchFn, screenId)
-      },
-      replace: async (screenId, screen) => {
-        if (!screenId) {
-          return
-        }
-        if (!screen) {
-          // Screen deletion
-          store.update(state => ({
-            ...state,
-            screens: state.screens.filter(x => x._id !== screenId),
-          }))
-        } else {
-          const index = get(store).screens.findIndex(x => x._id === screen._id)
-          if (index === -1) {
-            // Screen addition
-            store.update(state => ({
-              ...state,
-              screens: [...state.screens, screen],
-            }))
-          } else {
-            // Screen update
-            store.update(state => {
-              state.screens[index] = screen
-              return state
-            })
-          }
-        }
-      },
-      delete: async screens => {
-        const screensToDelete = Array.isArray(screens) ? screens : [screens]
-
-        // Build array of promises to speed up bulk deletions
-        let promises = []
-        let deleteUrls = []
-        screensToDelete.forEach(screen => {
-          // Delete the screen
-          promises.push(
-            API.deleteScreen({
-              screenId: screen._id,
-              screenRev: screen._rev,
-            })
-          )
-          // Remove links to this screen
-          deleteUrls.push(screen.routing.route)
-        })
-
-        await Promise.all(promises)
-        await store.actions.links.delete(deleteUrls)
-        const deletedIds = screensToDelete.map(screen => screen._id)
-        const routesResponse = await API.fetchAppRoutes()
-        store.update(state => {
-          // Remove deleted screens from state
-          state.screens = state.screens.filter(screen => {
-            return !deletedIds.includes(screen._id)
-          })
-
-          // Deselect the current screen if it was deleted
-          if (deletedIds.includes(state.selectedScreenId)) {
-            state.selectedScreenId = null
-            state.selectedComponentId = null
-          }
-
-          // Update routing
-          state.routes = routesResponse.routes
-
-          return state
-        })
-        return null
-      },
-      updateSetting: async (screen, name, value) => {
-        if (!screen || !name) {
-          return
-        }
-
-        // Apply setting update
-        const patch = screen => {
-          if (!screen) {
-            return false
-          }
-          // Skip update if the value is the same
-          if (Helpers.deepGet(screen, name) === value) {
-            return false
-          }
-          Helpers.deepSet(screen, name, value)
-        }
-        await store.actions.screens.patch(patch, screen._id)
-
-        // Ensure we don't have more than one home screen for this new role.
-        // This could happen after updating multiple different settings.
-        const state = get(store)
-        const updatedScreen = state.screens.find(s => s._id === screen._id)
-        if (!updatedScreen) {
-          return
-        }
-        const otherHomeScreens = state.screens.filter(s => {
-          return (
-            s.routing.roleId === updatedScreen.routing.roleId &&
-            s.routing.homeScreen &&
-            s._id !== screen._id
-          )
-        })
-        if (otherHomeScreens.length && updatedScreen.routing.homeScreen) {
-          const patch = screen => {
-            screen.routing.homeScreen = false
-          }
-          for (let otherHomeScreen of otherHomeScreens) {
-            await store.actions.screens.patch(patch, otherHomeScreen._id)
-          }
-        }
-      },
-      removeCustomLayout: async screen => {
-        // Pull relevant settings from old layout, if required
-        const layout = get(store).layouts.find(x => x._id === screen.layoutId)
-        const patch = screen => {
-          screen.layoutId = null
-          screen.showNavigation = layout?.props.navigation !== "None"
-          screen.width = layout?.props.width || "Large"
-        }
-        await store.actions.screens.patch(patch, screen._id)
-      },
-      enrichEmptySettings: screen => {
-        // Flatten the recursive component tree
-        const components = findAllMatchingComponents(screen.props, x => x)
-
-        // Iterate over all components and run checks
-        components.forEach(component => {
-          store.actions.components.enrichEmptySettings(component, {
-            screen,
-          })
-        })
-      },
-    },
-    preview: {
-      setDevice: device => {
-        store.update(state => {
-          state.previewDevice = device
-          return state
-        })
-      },
-      sendEvent: (name, payload) => {
-        const { previewEventHandler } = get(store)
-        previewEventHandler?.(name, payload)
-      },
-      registerEventHandler: handler => {
-        store.update(state => {
-          state.previewEventHandler = handler
-          return state
-        })
-      },
-      setSelectedComponentContext: context => {
-        store.update(state => {
-          state.selectedComponentContext = context
-          return state
-        })
-      },
-    },
-    layouts: {
-      select: layoutId => {
-        // Check this layout exists
-        const state = get(store)
-        const layout = state.layouts.find(layout => layout._id === layoutId)
-        if (!layout) {
-          return
-        }
-
-        // Check layout isn't already selected
-        if (
-          state.selectedLayoutId === layout._id &&
-          state.selectedComponentId === layout.props?._id
-        ) {
-          return
-        }
-
-        // Select new layout
-        store.update(state => {
-          state.selectedLayoutId = layout._id
-          state.selectedComponentId = layout.props?._id
-          return state
-        })
-      },
-      delete: async layout => {
-        if (!layout?._id) {
-          return
-        }
-        await API.deleteLayout({
-          layoutId: layout._id,
-          layoutRev: layout._rev,
-        })
-        store.update(state => {
-          state.layouts = state.layouts.filter(x => x._id !== layout._id)
-          return state
-        })
-      },
-    },
-    components: {
-      refreshDefinitions: async appId => {
-        if (!appId) {
-          appId = get(store).appId
-        }
-
-        // Fetch definitions and filter out custom component definitions so we
-        // can flag them
-        const components = await API.fetchComponentLibDefinitions(appId)
-        const customComponents = Object.keys(components).filter(name =>
-          name.startsWith("plugin/")
-        )
-
-        // Update store
-        store.update(state => ({
-          ...state,
-          components,
-          customComponents,
-          clientFeatures: {
-            ...INITIAL_FRONTEND_STATE.clientFeatures,
-            ...components.features,
-          },
-        }))
-      },
-      getDefinition: componentName => {
-        if (!componentName) {
-          return null
-        }
-        return get(store).components[componentName]
-      },
-      getDefaultDatasource: () => {
-        // Ignore users table
-        const validTables = get(tables).list.filter(x => x._id !== "ta_users")
-
-        // Try to use their own internal table first
-        let table = validTables.find(table => {
-          return (
-            table.sourceId !== BUDIBASE_INTERNAL_DB_ID &&
-            table.sourceType === DB_TYPE_INTERNAL
-          )
-        })
-        if (table) {
-          return table
-        }
-
-        // Then try sample data
-        table = validTables.find(table => {
-          return (
-            table.sourceId === BUDIBASE_INTERNAL_DB_ID &&
-            table.sourceType === DB_TYPE_INTERNAL
-          )
-        })
-        if (table) {
-          return table
-        }
-
-        // Finally try an external table
-        return validTables.find(table => table.sourceType === DB_TYPE_EXTERNAL)
-      },
-      migrateSettings: enrichedComponent => {
-        const componentPrefix = "@budibase/standard-components"
-        let migrated = false
-
-        if (enrichedComponent?._component == `${componentPrefix}/formblock`) {
-          // Use default config if the 'buttons' prop has never been initialised
-          if (!("buttons" in enrichedComponent)) {
-            enrichedComponent["buttons"] =
-              Utils.buildFormBlockButtonConfig(enrichedComponent)
-            migrated = true
-          } else if (enrichedComponent["buttons"] == null) {
-            // Ignore legacy config if 'buttons' has been reset by 'resetOn'
-            const { _id, actionType, dataSource } = enrichedComponent
-            enrichedComponent["buttons"] = Utils.buildFormBlockButtonConfig({
-              _id,
-              actionType,
-              dataSource,
-            })
-            migrated = true
-          }
-
-          // Ensure existing Formblocks position their buttons at the top.
-          if (!("buttonPosition" in enrichedComponent)) {
-            enrichedComponent["buttonPosition"] = "top"
-            migrated = true
-          }
-        }
-
-        return migrated
-      },
-      enrichEmptySettings: (component, opts) => {
-        if (!component?._component) {
-          return
-        }
-        const defaultDS = store.actions.components.getDefaultDatasource()
-        const settings = getComponentSettings(component._component)
-        const { parent, screen, useDefaultValues } = opts || {}
-        const treeId = parent?._id || component._id
-        if (!screen) {
-          return
-        }
-        settings.forEach(setting => {
-          const value = component[setting.key]
-
-          // Fill empty settings
-          if (value == null || value === "") {
-            if (setting.type === "multifield" && setting.selectAllFields) {
-              // Select all schema fields where required
-              component[setting.key] = Object.keys(defaultDS?.schema || {})
-            } else if (
-              (setting.type === "dataSource" || setting.type === "table") &&
-              defaultDS
-            ) {
-              // Select default datasource where required
-              component[setting.key] = {
-                label: defaultDS.name,
-                tableId: defaultDS._id,
-                resourceId: defaultDS._id,
-                type: "table",
-              }
-            } else if (setting.type === "dataProvider") {
-              // Pick closest data provider where required
-              const path = findComponentPath(screen.props, treeId)
-              const providers = path.filter(component =>
-                component._component?.endsWith("/dataprovider")
-              )
-              if (providers.length) {
-                const id = providers[providers.length - 1]?._id
-                component[setting.key] = `{{ literal ${safe(id)} }}`
-              }
-            } else if (setting.type.startsWith("field/")) {
-              // Autofill form field names
-              // Get all available field names in this form schema
-              let fieldOptions = getComponentFieldOptions(
-                screen.props,
-                treeId,
-                setting.type,
-                false
-              )
-
-              // Get all currently used fields
-              const form = findClosestMatchingComponent(
-                screen.props,
-                treeId,
-                x => x._component === "@budibase/standard-components/form"
-              )
-              const usedFields = Object.keys(buildFormSchema(form) || {})
-
-              // Filter out already used fields
-              fieldOptions = fieldOptions.filter(x => !usedFields.includes(x))
-
-              // Set field name and also assume we have a label setting
-              if (fieldOptions[0]) {
-                component[setting.key] = fieldOptions[0]
-                component.label = fieldOptions[0]
-              }
-            } else if (useDefaultValues && setting.defaultValue !== undefined) {
-              // Use default value where required
-              component[setting.key] = setting.defaultValue
-            }
-          }
-          // Validate non-empty settings
-          else {
-            if (setting.type === "dataProvider") {
-              // Validate data provider exists, or else clear it
-              const providers = findAllMatchingComponents(
-                screen?.props,
-                component => component._component?.endsWith("/dataprovider")
-              )
-              // Validate non-empty values
-              const valid = providers?.some(dp => value.includes?.(dp._id))
-              if (!valid) {
-                if (providers.length) {
-                  const id = providers[providers.length - 1]?._id
-                  component[setting.key] = `{{ literal ${safe(id)} }}`
-                } else {
-                  delete component[setting.key]
-                }
-              }
-            }
-          }
-        })
-      },
-      createInstance: (componentName, presetProps, parent) => {
-        const definition = store.actions.components.getDefinition(componentName)
-        if (!definition) {
-          return null
-        }
-
-        // Find all existing components of this type so that we can give this
-        // component a unique name
-        const screen = get(selectedScreen).props
-        const otherComponents = findAllMatchingComponents(
-          screen,
-          x => x._component === definition.component && x._id !== screen._id
-        )
-        let name = definition.friendlyName || definition.name
-        name = `${name} ${otherComponents.length + 1}`
-
-        // Generate basic component structure
-        let instance = {
-          _id: Helpers.uuid(),
-          _component: definition.component,
-          _styles: {
-            normal: {},
-            hover: {},
-            active: {},
-          },
-          _instanceName: name,
-          ...presetProps,
-        }
-
-        // Enrich empty settings
-        store.actions.components.enrichEmptySettings(instance, {
-          parent,
-          screen: get(selectedScreen),
-          useDefaultValues: true,
-        })
-
-        // Migrate nested component settings
-        store.actions.components.migrateSettings(instance)
-
-        // Add any extra properties the component needs
-        let extras = {}
-        if (definition.hasChildren) {
-          extras._children = []
-        }
-        if (componentName.endsWith("/formstep")) {
-          const parentForm = findClosestMatchingComponent(
-            get(selectedScreen).props,
-            get(selectedComponent)._id,
-            component => component._component.endsWith("/form")
-          )
-          const formSteps = findAllMatchingComponents(parentForm, component =>
-            component._component.endsWith("/formstep")
-          )
-          extras.step = formSteps.length + 1
-          extras._instanceName = `Step ${formSteps.length + 1}`
-        }
-        return {
-          ...cloneDeep(instance),
-          ...extras,
-        }
-      },
-      create: async (componentName, presetProps, parent, index) => {
-        const state = get(store)
-        const componentInstance = store.actions.components.createInstance(
-          componentName,
-          presetProps,
-          parent
-        )
-        if (!componentInstance) {
-          return
-        }
-
-        // Insert in position if specified
-        if (parent && index != null) {
-          await store.actions.screens.patch(screen => {
-            let parentComponent = findComponent(screen.props, parent)
-            if (!parentComponent._children?.length) {
-              parentComponent._children = [componentInstance]
-            } else {
-              parentComponent._children.splice(index, 0, componentInstance)
-            }
-          })
-        }
-
-        // Otherwise we work out where this component should be inserted
-        else {
-          await store.actions.screens.patch(screen => {
-            // Find the selected component
-            let selectedComponentId = state.selectedComponentId
-            if (selectedComponentId.startsWith(`${screen._id}-`)) {
-              selectedComponentId = screen?.props._id
-            }
-            const currentComponent = findComponent(
-              screen.props,
-              selectedComponentId
-            )
-            if (!currentComponent) {
-              return false
-            }
-
-            // Find parent node to attach this component to
-            let parentComponent
-            if (currentComponent) {
-              // Use selected component as parent if one is selected
-              const definition = store.actions.components.getDefinition(
-                currentComponent._component
-              )
-              if (definition?.hasChildren) {
-                // Use selected component if it allows children
-                parentComponent = currentComponent
-              } else {
-                // Otherwise we need to use the parent of this component
-                parentComponent = findComponentParent(
-                  screen.props,
-                  currentComponent._id
-                )
-              }
-            } else {
-              // Use screen or layout if no component is selected
-              parentComponent = screen.props
-            }
-
-            // Attach new component
-            if (!parentComponent) {
-              return false
-            }
-            if (!parentComponent._children) {
-              parentComponent._children = []
-            }
-            parentComponent._children.push(componentInstance)
-          })
-        }
-
-        // Select new component
-        store.update(state => {
-          state.selectedComponentId = componentInstance._id
-          return state
-        })
-
-        // Log event
-        analytics.captureEvent(Events.COMPONENT_CREATED, {
-          name: componentInstance._component,
-        })
-
-        return componentInstance
-      },
-      patch: async (patchFn, componentId, screenId) => {
-        // Use selected component by default
-        if (!componentId || !screenId) {
-          const state = get(store)
-          componentId = componentId || state.selectedComponentId
-          screenId = screenId || state.selectedScreenId
-        }
-        if (!componentId || !screenId || !patchFn) {
-          return
-        }
-        const patchScreen = screen => {
-          // findComponent looks in the tree not comp.settings[0]
-          let component = findComponent(screen.props, componentId)
-          if (!component) {
-            return false
-          }
-
-          // Mutates the fetched component with updates
-          const patchResult = patchFn(component, screen)
-
-          // Mutates the component with any required settings updates
-          const migrated = store.actions.components.migrateSettings(component)
-
-          // Returning an explicit false signifies that we should skip this
-          // update. If we migrated something, ensure we never skip.
-          return migrated ? null : patchResult
-        }
-        await store.actions.screens.patch(patchScreen, screenId)
-      },
-      delete: async component => {
-        if (!component) {
-          return
-        }
-
-        // Determine the next component to select after deletion
-        const state = get(store)
-        let nextSelectedComponentId
-        if (state.selectedComponentId === component._id) {
-          nextSelectedComponentId = store.actions.components.getNext()
-          if (!nextSelectedComponentId) {
-            nextSelectedComponentId = store.actions.components.getPrevious()
-          }
-        }
-
-        // Patch screen
-        await store.actions.screens.patch(screen => {
-          // Check component exists
-          component = findComponent(screen.props, component._id)
-          if (!component) {
-            return false
-          }
-
-          // Check component has a valid parent
-          const parent = findComponentParent(screen.props, component._id)
-          if (!parent) {
-            return false
-          }
-          parent._children = parent._children.filter(
-            child => child._id !== component._id
-          )
-        })
-
-        // Update selected component if required
-        if (nextSelectedComponentId) {
-          store.update(state => {
-            state.selectedComponentId = nextSelectedComponentId
-            return state
-          })
-        }
-      },
-      copy: (component, cut = false, selectParent = true) => {
-        // Update store with copied component
-        store.update(state => {
-          state.componentToPaste = cloneDeep(component)
-          state.componentToPaste.isCut = cut
-          return state
-        })
-
-        // Select the parent if cutting
-        if (cut && selectParent) {
-          const screen = get(selectedScreen)
-          const parent = findComponentParent(screen?.props, component._id)
-          if (parent) {
-            store.update(state => {
-              state.selectedComponentId = parent._id
-              return state
-            })
-          }
-        }
-      },
-      paste: async (targetComponent, mode, targetScreen) => {
-        const state = get(store)
-        if (!state.componentToPaste) {
-          return
-        }
-        let newComponentId
-
-        // Remove copied component if cutting, regardless if pasting works
-        let componentToPaste = cloneDeep(state.componentToPaste)
-        if (componentToPaste.isCut) {
-          store.update(state => {
-            delete state.componentToPaste
-            return state
-          })
-        }
-
-        // Patch screen
-        const patch = screen => {
-          // Get up to date ref to target
-          targetComponent = findComponent(screen.props, targetComponent._id)
-          if (!targetComponent) {
-            return false
-          }
-          const cut = componentToPaste.isCut
-          const originalId = componentToPaste._id
-          delete componentToPaste.isCut
-
-          // Make new component unique if copying
-          if (!cut) {
-            componentToPaste = makeComponentUnique(componentToPaste)
-          }
-          newComponentId = componentToPaste._id
-
-          // Delete old component if cutting
-          if (cut) {
-            const parent = findComponentParent(screen.props, originalId)
-            if (parent?._children) {
-              parent._children = parent._children.filter(
-                component => component._id !== originalId
-              )
-            }
-          }
-
-          // Check inside is valid
-          if (mode === "inside") {
-            const definition = store.actions.components.getDefinition(
-              targetComponent._component
-            )
-            if (!definition.hasChildren) {
-              mode = "below"
-            }
-          }
-
-          // Paste new component
-          if (mode === "inside") {
-            // Paste inside target component if chosen
-            if (!targetComponent._children) {
-              targetComponent._children = []
-            }
-            targetComponent._children.push(componentToPaste)
-          } else {
-            // Otherwise paste in the correct order in the parent's children
-            const parent = findComponentParent(
-              screen.props,
-              targetComponent._id
-            )
-            if (!parent?._children) {
-              return false
-            }
-            const targetIndex = parent._children.findIndex(component => {
-              return component._id === targetComponent._id
-            })
-            const index = mode === "above" ? targetIndex : targetIndex + 1
-            parent._children.splice(index, 0, componentToPaste)
-          }
-        }
-        const targetScreenId = targetScreen?._id || state.selectedScreenId
-        await store.actions.screens.patch(patch, targetScreenId)
-
-        // Select the new component
-        store.update(state => {
-          state.selectedScreenId = targetScreenId
-          state.selectedComponentId = newComponentId
-          return state
-        })
-      },
-      getPrevious: () => {
-        const state = get(store)
-        const componentId = state.selectedComponentId
-        const screen = get(selectedScreen)
-        const parent = findComponentParent(screen.props, componentId)
-        const index = parent?._children.findIndex(x => x._id === componentId)
-
-        // Check for screen and navigation component edge cases
-        const screenComponentId = `${screen._id}-screen`
-        const navComponentId = `${screen._id}-navigation`
-        if (componentId === screenComponentId) {
-          return null
-        }
-        if (componentId === navComponentId) {
-          return screenComponentId
-        }
-        if (parent._id === screen.props._id && index === 0) {
-          return navComponentId
-        }
-
-        // If we have siblings above us, choose the sibling or a descendant
-        if (index > 0) {
-          // If sibling before us accepts children, select a descendant
-          const previousSibling = parent._children[index - 1]
-          if (previousSibling._children?.length) {
-            let target = previousSibling
-            while (target._children?.length) {
-              target = target._children[target._children.length - 1]
-            }
-            return target._id
-          }
-
-          // Otherwise just select sibling
-          return previousSibling._id
-        }
-
-        // If no siblings above us, select the parent
-        return parent._id
-      },
-      getNext: () => {
-        const state = get(store)
-        const component = get(selectedComponent)
-        const componentId = component?._id
-        const screen = get(selectedScreen)
-        const parent = findComponentParent(screen.props, componentId)
-        const index = parent?._children.findIndex(x => x._id === componentId)
-
-        // Check for screen and navigation component edge cases
-        const screenComponentId = `${screen._id}-screen`
-        const navComponentId = `${screen._id}-navigation`
-        if (state.selectedComponentId === screenComponentId) {
-          return navComponentId
-        }
-
-        // If we have children, select first child
-        if (component._children?.length) {
-          return component._children[0]._id
-        } else if (!parent) {
-          return null
-        }
-
-        // Otherwise select the next sibling if we have one
-        if (index < parent._children.length - 1) {
-          const nextSibling = parent._children[index + 1]
-          return nextSibling._id
-        }
-
-        // Last child, select our parents next sibling
-        let target = parent
-        let targetParent = findComponentParent(screen.props, target._id)
-        let targetIndex = targetParent?._children.findIndex(
-          child => child._id === target._id
-        )
-        while (
-          targetParent != null &&
-          targetIndex === targetParent._children?.length - 1
-        ) {
-          target = targetParent
-          targetParent = findComponentParent(screen.props, target._id)
-          targetIndex = targetParent?._children.findIndex(
-            child => child._id === target._id
-          )
-        }
-        if (targetParent) {
-          return targetParent._children[targetIndex + 1]._id
-        } else {
-          return null
-        }
-      },
-      selectPrevious: () => {
-        const previousId = store.actions.components.getPrevious()
-        if (previousId) {
-          store.update(state => {
-            state.selectedComponentId = previousId
-            return state
-          })
-        }
-      },
-      selectNext: () => {
-        const nextId = store.actions.components.getNext()
-        if (nextId) {
-          store.update(state => {
-            state.selectedComponentId = nextId
-            return state
-          })
-        }
-      },
-      moveUp: async component => {
-        await store.actions.screens.patch(screen => {
-          const componentId = component?._id
-          const parent = findComponentParent(screen.props, componentId)
-
-          // Check we aren't right at the top of the tree
-          const index = parent?._children.findIndex(x => x._id === componentId)
-          if (!parent || (index === 0 && parent._id === screen.props._id)) {
-            return
-          }
-
-          // Copy original component and remove it from the parent
-          const originalComponent = cloneDeep(parent._children[index])
-          parent._children = parent._children.filter(
-            component => component._id !== componentId
-          )
-
-          // If we have siblings above us, move up
-          if (index > 0) {
-            // If sibling before us accepts children, move to last child of
-            // sibling
-            const previousSibling = parent._children[index - 1]
-            const definition = store.actions.components.getDefinition(
-              previousSibling._component
-            )
-            if (definition.hasChildren) {
-              previousSibling._children.push(originalComponent)
-            }
-
-            // Otherwise just move component above sibling
-            else {
-              parent._children.splice(index - 1, 0, originalComponent)
-            }
-          }
-
-          // If no siblings above us, go above the parent as long as it isn't
-          // the screen
-          else if (parent._id !== screen.props._id) {
-            const grandParent = findComponentParent(screen.props, parent._id)
-            const parentIndex = grandParent._children.findIndex(
-              child => child._id === parent._id
-            )
-            grandParent._children.splice(parentIndex, 0, originalComponent)
-          }
-        })
-      },
-      moveDown: async component => {
-        await store.actions.screens.patch(screen => {
-          const componentId = component?._id
-          const parent = findComponentParent(screen.props, componentId)
-
-          // Sanity check parent is found
-          if (!parent?._children?.length) {
-            return false
-          }
-
-          // Check we aren't right at the bottom of the tree
-          const index = parent._children.findIndex(x => x._id === componentId)
-          if (
-            index === parent._children.length - 1 &&
-            parent._id === screen.props._id
-          ) {
-            return
-          }
-
-          // Copy the original component and remove from parent
-          const originalComponent = cloneDeep(parent._children[index])
-          parent._children = parent._children.filter(
-            component => component._id !== componentId
-          )
-
-          // Move below the next sibling if we are not the last sibling
-          if (index < parent._children.length) {
-            // If the next sibling has children, become the first child
-            const nextSibling = parent._children[index]
-            const definition = store.actions.components.getDefinition(
-              nextSibling._component
-            )
-            if (definition.hasChildren) {
-              nextSibling._children.splice(0, 0, originalComponent)
-            }
-
-            // Otherwise move below next sibling
-            else {
-              parent._children.splice(index + 1, 0, originalComponent)
-            }
-          }
-
-          // Last child, so move below our parent
-          else {
-            const grandParent = findComponentParent(screen.props, parent._id)
-            const parentIndex = grandParent._children.findIndex(
-              child => child._id === parent._id
-            )
-            grandParent._children.splice(parentIndex + 1, 0, originalComponent)
-          }
-        })
-      },
-      updateStyle: async (name, value) => {
-        await store.actions.components.patch(component => {
-          if (value == null || value === "") {
-            delete component._styles.normal[name]
-          } else {
-            component._styles.normal[name] = value
-          }
-        })
-      },
-      updateStyles: async (styles, id) => {
-        const patchFn = component => {
-          component._styles.normal = {
-            ...component._styles.normal,
-            ...styles,
-          }
-        }
-        await store.actions.components.patch(patchFn, id)
-      },
-      updateCustomStyle: async style => {
-        await store.actions.components.patch(component => {
-          component._styles.custom = style
-        })
-      },
-      updateConditions: async conditions => {
-        await store.actions.components.patch(component => {
-          component._conditions = conditions
-        })
-      },
-      updateSetting: async (name, value) => {
-        await store.actions.components.patch(
-          store.actions.components.updateComponentSetting(name, value)
-        )
-      },
-      updateComponentSetting: (name, value) => {
-        return component => {
-          if (!name || !component) {
-            return false
-          }
-          // Skip update if the value is the same
-          if (component[name] === value) {
-            return false
-          }
-
-          const settings = getComponentSettings(component._component)
-          const updatedSetting = settings.find(setting => setting.key === name)
-
-          // Reset dependent fields
-          settings.forEach(setting => {
-            const needsReset =
-              name === setting.resetOn ||
-              (Array.isArray(setting.resetOn) && setting.resetOn.includes(name))
-            if (needsReset) {
-              component[setting.key] = setting.defaultValue || null
-            }
-          })
-
-          if (
-            updatedSetting?.type === "dataSource" ||
-            updatedSetting?.type === "table"
-          ) {
-            const { schema } = getSchemaForDatasource(null, value)
-            const columnNames = Object.keys(schema || {})
-            const multifieldKeysToSelectAll = settings
-              .filter(setting => {
-                return setting.type === "multifield" && setting.selectAllFields
-              })
-              .map(setting => setting.key)
-
-            multifieldKeysToSelectAll.forEach(key => {
-              component[key] = columnNames
-            })
-          }
-          component[name] = value
-          return true
-        }
-      },
-      requestEjectBlock: componentId => {
-        store.actions.preview.sendEvent("eject-block", componentId)
-      },
-      handleEjectBlock: async (componentId, ejectedDefinition) => {
-        let nextSelectedComponentId
-        await store.actions.screens.patch(screen => {
-          const block = findComponent(screen.props, componentId)
-          const parent = findComponentParent(screen.props, componentId)
-
-          // Sanity check
-          if (!block || !parent?._children?.length) {
-            return false
-          }
-
-          // Log event
-          analytics.captureEvent(Events.BLOCK_EJECTED, {
-            block: block._component,
-          })
-
-          // Attach block children back into ejected definition, using the
-          // _containsSlot flag to know where to insert them
-          const slotContainer = findAllMatchingComponents(
-            ejectedDefinition,
-            x => x._containsSlot
-          )[0]
-          if (slotContainer) {
-            delete slotContainer._containsSlot
-            slotContainer._children = [
-              ...(slotContainer._children || []),
-              ...(block._children || []),
-            ]
-          }
-
-          // Replace block with ejected definition
-          ejectedDefinition = makeComponentUnique(ejectedDefinition)
-          const index = parent._children.findIndex(x => x._id === componentId)
-          parent._children[index] = ejectedDefinition
-          nextSelectedComponentId = ejectedDefinition._id
-        })
-
-        // Select new root component
-        if (nextSelectedComponentId) {
-          store.update(state => {
-            state.selectedComponentId = nextSelectedComponentId
-            return state
-          })
-        }
-      },
-      addParent: async (componentId, parentType) => {
-        if (!componentId || !parentType) {
-          return
-        }
-
-        // Create new parent instance
-        const newParentDefinition = store.actions.components.createInstance(
-          parentType,
-          null,
-          parent
-        )
-        if (!newParentDefinition) {
-          return
-        }
-
-        // Replace component with a version wrapped in a new parent
-        await store.actions.screens.patch(screen => {
-          // Get this component definition and parent definition
-          let definition = findComponent(screen.props, componentId)
-          let oldParentDefinition = findComponentParent(
-            screen.props,
-            componentId
-          )
-          if (!definition || !oldParentDefinition) {
-            return false
-          }
-
-          // Replace component with parent
-          const index = oldParentDefinition._children.findIndex(
-            component => component._id === componentId
-          )
-          if (index === -1) {
-            return false
-          }
-          oldParentDefinition._children[index] = {
-            ...newParentDefinition,
-            _children: [definition],
-          }
-        })
-
-        // Select the new parent
-        store.update(state => {
-          state.selectedComponentId = newParentDefinition._id
-          return state
-        })
-      },
-    },
-    links: {
-      save: async (url, title) => {
-        const navigation = get(store).navigation
-        let links = [...(navigation?.links ?? [])]
-
-        // Skip if we have an identical link
-        if (links.find(link => link.url === url && link.text === title)) {
-          return
-        }
-
-        links.push({
-          text: title,
-          url,
-        })
-        await store.actions.navigation.save({
-          ...navigation,
-          links: [...links],
-        })
-      },
-      delete: async urls => {
-        const navigation = get(store).navigation
-        let links = navigation?.links
-        if (!links?.length) {
-          return
-        }
-
-        // Filter out the URLs to delete
-        urls = Array.isArray(urls) ? urls : [urls]
-        links = links.filter(link => !urls.includes(link.url))
-
-        await store.actions.navigation.save({
-          ...navigation,
-          links,
-        })
-      },
-    },
-    settings: {
-      highlight: key => {
-        store.update(state => ({
-          ...state,
-          highlightedSettingKey: key,
-        }))
-      },
-      propertyFocus: key => {
-        store.update(state => ({
-          ...state,
-          propertyFocus: key,
-        }))
-      },
-    },
-    dnd: {
-      start: component => {
-        store.actions.preview.sendEvent("dragging-new-component", {
-          dragging: true,
-          component,
-        })
-      },
-      stop: () => {
-        store.actions.preview.sendEvent("dragging-new-component", {
-          dragging: false,
-        })
-      },
-    },
-    websocket: {
-      selectResource: id => {
-        websocket.emit(BuilderSocketEvent.SelectResource, {
-          resourceId: id,
-        })
-      },
-    },
-    metadata: {
-      replace: metadata => {
-        store.update(state => ({
-          ...state,
-          ...metadata,
-        }))
-      },
-    },
-  }
-
-  return store
-}
diff --git a/packages/builder/src/builderStore/store/hover.js b/packages/builder/src/builderStore/store/hover.js
deleted file mode 100644
index 5db9272975..0000000000
--- a/packages/builder/src/builderStore/store/hover.js
+++ /dev/null
@@ -1,27 +0,0 @@
-import { get, writable } from "svelte/store"
-import { store as builder } from "builderStore"
-
-export const getHoverStore = () => {
-  const initialValue = {
-    componentId: null,
-  }
-
-  const store = writable(initialValue)
-
-  const update = (componentId, notifyClient = true) => {
-    if (componentId === get(store).componentId) {
-      return
-    }
-    store.update(state => {
-      state.componentId = componentId
-      return state
-    })
-    if (notifyClient) {
-      builder.actions.preview.sendEvent("hover-component", componentId)
-    }
-  }
-  return {
-    subscribe: store.subscribe,
-    actions: { update },
-  }
-}
diff --git a/packages/builder/src/builderStore/tests/dataBinding.test.js b/packages/builder/src/builderStore/tests/dataBinding.test.js
deleted file mode 100644
index 039e33a94d..0000000000
--- a/packages/builder/src/builderStore/tests/dataBinding.test.js
+++ /dev/null
@@ -1,545 +0,0 @@
-import { expect, describe, it, vi } from "vitest"
-import {
-  runtimeToReadableBinding,
-  readableToRuntimeBinding,
-  updateReferencesInObject,
-} from "../dataBinding"
-
-vi.mock("@budibase/frontend-core")
-vi.mock("builderStore/componentUtils")
-vi.mock("builderStore/store")
-vi.mock("builderStore/store/theme")
-vi.mock("builderStore/store/temporal")
-
-describe("runtimeToReadableBinding", () => {
-  const bindableProperties = [
-    {
-      category: "Current User",
-      icon: "User",
-      providerId: "user",
-      readableBinding: "Current User.firstName",
-      runtimeBinding: "[user].[firstName]",
-      type: "context",
-    },
-    {
-      category: "Bindings",
-      icon: "Brackets",
-      readableBinding: "Binding.count",
-      runtimeBinding: "count",
-      type: "context",
-    },
-  ]
-  it("should convert a runtime binding to a readable one", () => {
-    const textWithBindings = `Hello {{ [user].[firstName] }}! The count is {{ count }}.`
-    expect(
-      runtimeToReadableBinding(
-        bindableProperties,
-        textWithBindings,
-        "readableBinding"
-      )
-    ).toEqual(
-      `Hello {{ Current User.firstName }}! The count is {{ Binding.count }}.`
-    )
-  })
-
-  it("should not convert to readable binding if it is already readable", () => {
-    const textWithBindings = `Hello {{ [user].[firstName] }}! The count is {{ Binding.count }}.`
-    expect(
-      runtimeToReadableBinding(
-        bindableProperties,
-        textWithBindings,
-        "readableBinding"
-      )
-    ).toEqual(
-      `Hello {{ Current User.firstName }}! The count is {{ Binding.count }}.`
-    )
-  })
-})
-
-describe("readableToRuntimeBinding", () => {
-  const bindableProperties = [
-    {
-      category: "Current User",
-      icon: "User",
-      providerId: "user",
-      readableBinding: "Current User.firstName",
-      runtimeBinding: "[user].[firstName]",
-      type: "context",
-    },
-    {
-      category: "Bindings",
-      icon: "Brackets",
-      readableBinding: "Binding.count",
-      runtimeBinding: "count",
-      type: "context",
-    },
-  ]
-  it("should convert a readable binding to a runtime one", () => {
-    const textWithBindings = `Hello {{ Current User.firstName }}! The count is {{ Binding.count }}.`
-    expect(
-      readableToRuntimeBinding(
-        bindableProperties,
-        textWithBindings,
-        "runtimeBinding"
-      )
-    ).toEqual(`Hello {{ [user].[firstName] }}! The count is {{ count }}.`)
-  })
-})
-
-describe("updateReferencesInObject", () => {
-  it("should increment steps in sequence on 'add'", () => {
-    let obj = [
-      {
-        id: "a0",
-        parameters: {
-          text: "Alpha",
-        },
-      },
-      {
-        id: "a1",
-        parameters: {
-          text: "Apple",
-        },
-      },
-      {
-        id: "b2",
-        parameters: {
-          text: "Banana {{ actions.1.row }}",
-        },
-      },
-      {
-        id: "c3",
-        parameters: {
-          text: "Carrot {{ actions.1.row }}",
-        },
-      },
-      {
-        id: "d4",
-        parameters: {
-          text: "Dog {{ actions.3.row }}",
-        },
-      },
-      {
-        id: "e5",
-        parameters: {
-          text: "Eagle {{ actions.4.row }}",
-        },
-      },
-    ]
-    updateReferencesInObject({
-      obj,
-      modifiedIndex: 0,
-      action: "add",
-      label: "actions",
-    })
-
-    expect(obj).toEqual([
-      {
-        id: "a0",
-        parameters: {
-          text: "Alpha",
-        },
-      },
-      {
-        id: "a1",
-        parameters: {
-          text: "Apple",
-        },
-      },
-      {
-        id: "b2",
-        parameters: {
-          text: "Banana {{ actions.2.row }}",
-        },
-      },
-      {
-        id: "c3",
-        parameters: {
-          text: "Carrot {{ actions.2.row }}",
-        },
-      },
-      {
-        id: "d4",
-        parameters: {
-          text: "Dog {{ actions.4.row }}",
-        },
-      },
-      {
-        id: "e5",
-        parameters: {
-          text: "Eagle {{ actions.5.row }}",
-        },
-      },
-    ])
-  })
-
-  it("should decrement steps in sequence on 'delete'", () => {
-    let obj = [
-      {
-        id: "a1",
-        parameters: {
-          text: "Apple",
-        },
-      },
-      {
-        id: "b2",
-        parameters: {
-          text: "Banana {{ actions.1.row }}",
-        },
-      },
-      {
-        id: "d4",
-        parameters: {
-          text: "Dog {{ actions.3.row }}",
-        },
-      },
-      {
-        id: "e5",
-        parameters: {
-          text: "Eagle {{ actions.4.row }}",
-        },
-      },
-    ]
-    updateReferencesInObject({
-      obj,
-      modifiedIndex: 2,
-      action: "delete",
-      label: "actions",
-    })
-
-    expect(obj).toEqual([
-      {
-        id: "a1",
-        parameters: {
-          text: "Apple",
-        },
-      },
-      {
-        id: "b2",
-        parameters: {
-          text: "Banana {{ actions.1.row }}",
-        },
-      },
-      {
-        id: "d4",
-        parameters: {
-          text: "Dog {{ actions.2.row }}",
-        },
-      },
-      {
-        id: "e5",
-        parameters: {
-          text: "Eagle {{ actions.3.row }}",
-        },
-      },
-    ])
-  })
-
-  it("should handle on 'move' to a lower index", () => {
-    let obj = [
-      {
-        id: "a1",
-        parameters: {
-          text: "Apple",
-        },
-      },
-      {
-        id: "b2",
-        parameters: {
-          text: "Banana {{ actions.0.row }}",
-        },
-      },
-      {
-        id: "e5",
-        parameters: {
-          text: "Eagle {{ actions.3.row }}",
-        },
-      },
-      {
-        id: "c3",
-        parameters: {
-          text: "Carrot {{ actions.0.row }}",
-        },
-      },
-      {
-        id: "d4",
-        parameters: {
-          text: "Dog {{ actions.2.row }}",
-        },
-      },
-    ]
-    updateReferencesInObject({
-      obj,
-      modifiedIndex: 2,
-      action: "move",
-      label: "actions",
-      originalIndex: 4,
-    })
-
-    expect(obj).toEqual([
-      {
-        id: "a1",
-        parameters: {
-          text: "Apple",
-        },
-      },
-      {
-        id: "b2",
-        parameters: {
-          text: "Banana {{ actions.0.row }}",
-        },
-      },
-      {
-        id: "e5",
-        parameters: {
-          text: "Eagle {{ actions.4.row }}",
-        },
-      },
-      {
-        id: "c3",
-        parameters: {
-          text: "Carrot {{ actions.0.row }}",
-        },
-      },
-      {
-        id: "d4",
-        parameters: {
-          text: "Dog {{ actions.3.row }}",
-        },
-      },
-    ])
-  })
-
-  it("should handle on 'move' to a higher index", () => {
-    let obj = [
-      {
-        id: "b2",
-        parameters: {
-          text: "Banana {{ actions.0.row }}",
-        },
-      },
-      {
-        id: "c3",
-        parameters: {
-          text: "Carrot {{ actions.0.row }}",
-        },
-      },
-      {
-        id: "a1",
-        parameters: {
-          text: "Apple",
-        },
-      },
-      {
-        id: "d4",
-        parameters: {
-          text: "Dog {{ actions.2.row }}",
-        },
-      },
-      {
-        id: "e5",
-        parameters: {
-          text: "Eagle {{ actions.3.row }}",
-        },
-      },
-    ]
-    updateReferencesInObject({
-      obj,
-      modifiedIndex: 2,
-      action: "move",
-      label: "actions",
-      originalIndex: 0,
-    })
-
-    expect(obj).toEqual([
-      {
-        id: "b2",
-        parameters: {
-          text: "Banana {{ actions.2.row }}",
-        },
-      },
-      {
-        id: "c3",
-        parameters: {
-          text: "Carrot {{ actions.2.row }}",
-        },
-      },
-      {
-        id: "a1",
-        parameters: {
-          text: "Apple",
-        },
-      },
-      {
-        id: "d4",
-        parameters: {
-          text: "Dog {{ actions.1.row }}",
-        },
-      },
-      {
-        id: "e5",
-        parameters: {
-          text: "Eagle {{ actions.3.row }}",
-        },
-      },
-    ])
-  })
-
-  it("should handle on 'move' of action being referenced, dragged to a higher index", () => {
-    let obj = [
-      {
-        "##eventHandlerType": "Validate Form",
-        id: "cCD0Dwcnq",
-      },
-      {
-        "##eventHandlerType": "Close Screen Modal",
-        id: "3fbbIOfN0H",
-      },
-      {
-        "##eventHandlerType": "Save Row",
-        parameters: {
-          tableId: "ta_bb_employee",
-        },
-        id: "aehg5cTmhR",
-      },
-      {
-        "##eventHandlerType": "Close Side Panel",
-        id: "mzkpf86cxo",
-      },
-      {
-        "##eventHandlerType": "Navigate To",
-        id: "h0uDFeJa8A",
-      },
-      {
-        parameters: {
-          autoDismiss: true,
-          type: "success",
-          message: "{{ actions.1.row }}",
-        },
-        "##eventHandlerType": "Show Notification",
-        id: "JEI5lAyJZ",
-      },
-    ]
-    updateReferencesInObject({
-      obj,
-      modifiedIndex: 2,
-      action: "move",
-      label: "actions",
-      originalIndex: 1,
-    })
-
-    expect(obj).toEqual([
-      {
-        "##eventHandlerType": "Validate Form",
-        id: "cCD0Dwcnq",
-      },
-      {
-        "##eventHandlerType": "Close Screen Modal",
-        id: "3fbbIOfN0H",
-      },
-      {
-        "##eventHandlerType": "Save Row",
-        parameters: {
-          tableId: "ta_bb_employee",
-        },
-        id: "aehg5cTmhR",
-      },
-      {
-        "##eventHandlerType": "Close Side Panel",
-        id: "mzkpf86cxo",
-      },
-      {
-        "##eventHandlerType": "Navigate To",
-        id: "h0uDFeJa8A",
-      },
-      {
-        parameters: {
-          autoDismiss: true,
-          type: "success",
-          message: "{{ actions.2.row }}",
-        },
-        "##eventHandlerType": "Show Notification",
-        id: "JEI5lAyJZ",
-      },
-    ])
-  })
-
-  it("should handle on 'move' of action being referenced, dragged to a lower index", () => {
-    let obj = [
-      {
-        "##eventHandlerType": "Save Row",
-        parameters: {
-          tableId: "ta_bb_employee",
-        },
-        id: "aehg5cTmhR",
-      },
-      {
-        "##eventHandlerType": "Validate Form",
-        id: "cCD0Dwcnq",
-      },
-      {
-        "##eventHandlerType": "Close Screen Modal",
-        id: "3fbbIOfN0H",
-      },
-      {
-        "##eventHandlerType": "Close Side Panel",
-        id: "mzkpf86cxo",
-      },
-      {
-        "##eventHandlerType": "Navigate To",
-        id: "h0uDFeJa8A",
-      },
-      {
-        parameters: {
-          autoDismiss: true,
-          type: "success",
-          message: "{{ actions.4.row }}",
-        },
-        "##eventHandlerType": "Show Notification",
-        id: "JEI5lAyJZ",
-      },
-    ]
-    updateReferencesInObject({
-      obj,
-      modifiedIndex: 0,
-      action: "move",
-      label: "actions",
-      originalIndex: 4,
-    })
-
-    expect(obj).toEqual([
-      {
-        "##eventHandlerType": "Save Row",
-        parameters: {
-          tableId: "ta_bb_employee",
-        },
-        id: "aehg5cTmhR",
-      },
-      {
-        "##eventHandlerType": "Validate Form",
-        id: "cCD0Dwcnq",
-      },
-      {
-        "##eventHandlerType": "Close Screen Modal",
-        id: "3fbbIOfN0H",
-      },
-      {
-        "##eventHandlerType": "Close Side Panel",
-        id: "mzkpf86cxo",
-      },
-      {
-        "##eventHandlerType": "Navigate To",
-        id: "h0uDFeJa8A",
-      },
-      {
-        parameters: {
-          autoDismiss: true,
-          type: "success",
-          message: "{{ actions.0.row }}",
-        },
-        "##eventHandlerType": "Show Notification",
-        id: "JEI5lAyJZ",
-      },
-    ])
-  })
-})
diff --git a/packages/builder/src/components/automation/AutomationBuilder/AutomationBuilder.svelte b/packages/builder/src/components/automation/AutomationBuilder/AutomationBuilder.svelte
index b80ba45086..caeb33cb14 100644
--- a/packages/builder/src/components/automation/AutomationBuilder/AutomationBuilder.svelte
+++ b/packages/builder/src/components/automation/AutomationBuilder/AutomationBuilder.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { selectedAutomation } from "builderStore"
+  import { selectedAutomation } from "stores/builder"
   import Flowchart from "./FlowChart/FlowChart.svelte"
 </script>
 
diff --git a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/ActionModal.svelte b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/ActionModal.svelte
index fbc79b967c..a8711d220b 100644
--- a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/ActionModal.svelte
+++ b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/ActionModal.svelte
@@ -9,11 +9,11 @@
     Tags,
     Tag,
   } from "@budibase/bbui"
-  import { automationStore, selectedAutomation } from "builderStore"
+  import { automationStore, selectedAutomation } from "stores/builder"
   import { admin, licensing } from "stores/portal"
   import { externalActions } from "./ExternalActions"
   import { TriggerStepID, ActionStepID } from "constants/backend/automations"
-  import { checkForCollectStep } from "builderStore/utils"
+  import { checkForCollectStep } from "helpers/utils"
 
   export let blockIdx
   export let lastStep
diff --git a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/AutomationBlockTagline.svelte b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/AutomationBlockTagline.svelte
index c18368b1b1..8732623dcf 100644
--- a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/AutomationBlockTagline.svelte
+++ b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/AutomationBlockTagline.svelte
@@ -1,7 +1,7 @@
 <script>
   import { processStringSync } from "@budibase/string-templates"
   import { get } from "lodash/fp"
-  import { tables } from "stores/backend"
+  import { tables } from "stores/builder"
 
   export let block
 
diff --git a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowChart.svelte b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowChart.svelte
index ffe769d024..4c458a5627 100644
--- a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowChart.svelte
+++ b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowChart.svelte
@@ -3,7 +3,7 @@
     automationStore,
     selectedAutomation,
     automationHistoryStore,
-  } from "builderStore"
+  } from "stores/builder"
   import ConfirmDialog from "components/common/ConfirmDialog.svelte"
   import FlowItem from "./FlowItem.svelte"
   import TestDataModal from "./TestDataModal.svelte"
diff --git a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItem.svelte b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItem.svelte
index c6d38a4d2e..8f232718b2 100644
--- a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItem.svelte
+++ b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItem.svelte
@@ -1,5 +1,9 @@
 <script>
-  import { automationStore, selectedAutomation } from "builderStore"
+  import {
+    automationStore,
+    selectedAutomation,
+    permissions,
+  } from "stores/builder"
   import {
     Icon,
     Divider,
@@ -17,7 +21,6 @@
   import FlowItemHeader from "./FlowItemHeader.svelte"
   import RoleSelect from "components/design/settings/controls/RoleSelect.svelte"
   import { ActionStepID, TriggerStepID } from "constants/backend/automations"
-  import { permissions } from "stores/backend"
 
   export let block
   export let testDataModal
diff --git a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItemHeader.svelte b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItemHeader.svelte
index 5ddba31bb8..0cb47478b8 100644
--- a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItemHeader.svelte
+++ b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItemHeader.svelte
@@ -1,6 +1,6 @@
 <script>
-  import { automationStore, selectedAutomation } from "builderStore"
-  import { Icon, Body, StatusLight, AbsTooltip } from "@budibase/bbui"
+  import { automationStore, selectedAutomation } from "stores/builder"
+  import { Icon, Body, AbsTooltip, StatusLight } from "@budibase/bbui"
   import { externalActions } from "./ExternalActions"
   import { createEventDispatcher } from "svelte"
   import { Features } from "constants/backend/automations"
diff --git a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/TestDataModal.svelte b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/TestDataModal.svelte
index 76def72bf6..d212300cdf 100644
--- a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/TestDataModal.svelte
+++ b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/TestDataModal.svelte
@@ -5,7 +5,7 @@
     notifications,
     ActionButton,
   } from "@budibase/bbui"
-  import { automationStore, selectedAutomation } from "builderStore"
+  import { automationStore, selectedAutomation } from "stores/builder"
   import AutomationBlockSetup from "../../SetupPanel/AutomationBlockSetup.svelte"
   import { cloneDeep } from "lodash/fp"
 
diff --git a/packages/builder/src/components/automation/AutomationBuilder/TestPanel.svelte b/packages/builder/src/components/automation/AutomationBuilder/TestPanel.svelte
index 88bbef6bd7..3eae3e7e51 100644
--- a/packages/builder/src/components/automation/AutomationBuilder/TestPanel.svelte
+++ b/packages/builder/src/components/automation/AutomationBuilder/TestPanel.svelte
@@ -1,7 +1,7 @@
 <script>
   import { Icon, Divider } from "@budibase/bbui"
   import TestDisplay from "./TestDisplay.svelte"
-  import { automationStore } from "builderStore"
+  import { automationStore } from "stores/builder"
 
   export let automation
 </script>
diff --git a/packages/builder/src/components/automation/AutomationPanel/AutomationList.svelte b/packages/builder/src/components/automation/AutomationPanel/AutomationList.svelte
index cce0f4eeab..9d946fe55d 100644
--- a/packages/builder/src/components/automation/AutomationPanel/AutomationList.svelte
+++ b/packages/builder/src/components/automation/AutomationPanel/AutomationList.svelte
@@ -4,7 +4,7 @@
     automationStore,
     selectedAutomation,
     userSelectedResourceMap,
-  } from "builderStore"
+  } from "stores/builder"
   import NavItem from "components/common/NavItem.svelte"
   import EditAutomationPopover from "./EditAutomationPopover.svelte"
   import { notifications } from "@budibase/bbui"
diff --git a/packages/builder/src/components/automation/AutomationPanel/AutomationPanel.svelte b/packages/builder/src/components/automation/AutomationPanel/AutomationPanel.svelte
index d8651f238a..582db950fe 100644
--- a/packages/builder/src/components/automation/AutomationPanel/AutomationPanel.svelte
+++ b/packages/builder/src/components/automation/AutomationPanel/AutomationPanel.svelte
@@ -7,7 +7,7 @@
     automationStore,
     selectedAutomation,
     userSelectedResourceMap,
-  } from "builderStore"
+  } from "stores/builder"
   import NavItem from "components/common/NavItem.svelte"
   import EditAutomationPopover from "./EditAutomationPopover.svelte"
 
diff --git a/packages/builder/src/components/automation/AutomationPanel/CreateAutomationModal.svelte b/packages/builder/src/components/automation/AutomationPanel/CreateAutomationModal.svelte
index 9f279427d9..41bffba19e 100644
--- a/packages/builder/src/components/automation/AutomationPanel/CreateAutomationModal.svelte
+++ b/packages/builder/src/components/automation/AutomationPanel/CreateAutomationModal.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { automationStore } from "builderStore"
+  import { automationStore } from "stores/builder"
   import {
     notifications,
     Input,
diff --git a/packages/builder/src/components/automation/AutomationPanel/EditAutomationPopover.svelte b/packages/builder/src/components/automation/AutomationPanel/EditAutomationPopover.svelte
index 09b9cf07db..1bc4b0f18e 100644
--- a/packages/builder/src/components/automation/AutomationPanel/EditAutomationPopover.svelte
+++ b/packages/builder/src/components/automation/AutomationPanel/EditAutomationPopover.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { automationStore } from "builderStore"
+  import { automationStore } from "stores/builder"
   import { ActionMenu, MenuItem, notifications, Icon } from "@budibase/bbui"
   import ConfirmDialog from "components/common/ConfirmDialog.svelte"
   import UpdateAutomationModal from "components/automation/AutomationPanel/UpdateAutomationModal.svelte"
diff --git a/packages/builder/src/components/automation/AutomationPanel/UpdateAutomationModal.svelte b/packages/builder/src/components/automation/AutomationPanel/UpdateAutomationModal.svelte
index c32f9c84ca..6ac7f84556 100644
--- a/packages/builder/src/components/automation/AutomationPanel/UpdateAutomationModal.svelte
+++ b/packages/builder/src/components/automation/AutomationPanel/UpdateAutomationModal.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { automationStore } from "builderStore"
+  import { automationStore } from "stores/builder"
   import {
     notifications,
     Icon,
diff --git a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte
index af54e4d2da..7ba1c8a4b1 100644
--- a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte
+++ b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte
@@ -15,11 +15,9 @@
     Icon,
     Checkbox,
     DatePicker,
-    Detail,
   } from "@budibase/bbui"
   import CreateWebhookModal from "components/automation/Shared/CreateWebhookModal.svelte"
-  import { automationStore, selectedAutomation } from "builderStore"
-  import { tables } from "stores/backend"
+  import { automationStore, selectedAutomation, tables } from "stores/builder"
   import { environment, licensing } from "stores/portal"
   import WebhookDisplay from "../Shared/WebhookDisplay.svelte"
   import DrawerBindableInput from "../../common/bindings/DrawerBindableInput.svelte"
@@ -33,6 +31,8 @@
   import Editor from "components/integration/QueryEditor.svelte"
   import ModalBindableInput from "components/common/bindings/ModalBindableInput.svelte"
   import CodeEditor from "components/common/CodeEditor/CodeEditor.svelte"
+  import BindingPicker from "components/common/bindings/BindingPicker.svelte"
+  import { BindingHelpers } from "components/common/bindings/utils"
   import {
     bindingsToCompletions,
     hbAutocomplete,
@@ -43,7 +43,7 @@
   import {
     getSchemaForDatasourcePlus,
     getEnvironmentBindings,
-  } from "builderStore/dataBinding"
+  } from "dataBinding"
   import { TriggerStepID, ActionStepID } from "constants/backend/automations"
   import { onMount } from "svelte"
   import { cloneDeep } from "lodash/fp"
@@ -56,7 +56,7 @@
   let drawer
   let fillWidth = true
   let inputData
-  let codeBindingOpen = false
+  let insertAtPos, getCaretPosition
   $: filters = lookForFilters(schemaProperties) || []
   $: tempFilters = filters
   $: stepId = block.stepId
@@ -75,6 +75,10 @@
   $: isUpdateRow = stepId === ActionStepID.UPDATE_ROW
   $: codeMode =
     stepId === "EXECUTE_BASH" ? EditorModes.Handlebars : EditorModes.JS
+  $: bindingsHelpers = new BindingHelpers(getCaretPosition, insertAtPos, {
+    disableWrapping: true,
+  })
+  $: editingJs = codeMode === EditorModes.JS
 
   $: stepCompletions =
     codeMode === EditorModes.Handlebars
@@ -157,6 +161,7 @@
     let bindings = []
     let loopBlockCount = 0
     const addBinding = (name, value, icon, idx, isLoopBlock, bindingName) => {
+      if (!name) return
       const runtimeBinding = determineRuntimeBinding(name, idx, isLoopBlock)
       const categoryName = determineCategoryName(idx, isLoopBlock, bindingName)
 
@@ -291,7 +296,6 @@
         loopBlockCount++
         continue
       }
-
       Object.entries(schema).forEach(([name, value]) =>
         addBinding(name, value, icon, idx, isLoopBlock, bindingName)
       )
@@ -539,39 +543,51 @@
             />
           {:else if value.customType === "code"}
             <CodeEditorModal>
-              {#if codeMode == EditorModes.JS}
-                <ActionButton
-                  on:click={() => (codeBindingOpen = !codeBindingOpen)}
-                  quiet
-                  icon={codeBindingOpen ? "ChevronDown" : "ChevronRight"}
-                >
-                  <Detail size="S">Bindings</Detail>
-                </ActionButton>
-                {#if codeBindingOpen}
-                  <pre>{JSON.stringify(bindings, null, 2)}</pre>
-                {/if}
-              {/if}
-              <CodeEditor
-                value={inputData[key]}
-                on:change={e => {
-                  // need to pass without the value inside
-                  onChange({ detail: e.detail }, key)
-                  inputData[key] = e.detail
-                }}
-                completions={stepCompletions}
-                mode={codeMode}
-                autocompleteEnabled={codeMode != EditorModes.JS}
-                height={500}
-              />
-              <div class="messaging">
-                {#if codeMode == EditorModes.Handlebars}
-                  <Icon name="FlashOn" />
-                  <div class="messaging-wrap">
-                    <div>
-                      Add available bindings by typing <strong>
-                        &#125;&#125;
-                      </strong>
-                    </div>
+              <div class:js-editor={editingJs}>
+                <div class:js-code={editingJs} style="width: 100%">
+                  <CodeEditor
+                    value={inputData[key]}
+                    on:change={e => {
+                      // need to pass without the value inside
+                      onChange({ detail: e.detail }, key)
+                      inputData[key] = e.detail
+                    }}
+                    completions={stepCompletions}
+                    mode={codeMode}
+                    autocompleteEnabled={codeMode !== EditorModes.JS}
+                    bind:getCaretPosition
+                    bind:insertAtPos
+                    height={500}
+                  />
+                  <div class="messaging">
+                    {#if codeMode === EditorModes.Handlebars}
+                      <Icon name="FlashOn" />
+                      <div class="messaging-wrap">
+                        <div>
+                          Add available bindings by typing <strong>
+                            &#125;&#125;
+                          </strong>
+                        </div>
+                      </div>
+                    {/if}
+                  </div>
+                </div>
+                {#if editingJs}
+                  <div class="js-binding-picker">
+                    <BindingPicker
+                      {bindings}
+                      allowHelpers={false}
+                      addBinding={binding =>
+                        bindingsHelpers.onSelectBinding(
+                          inputData[key],
+                          binding,
+                          {
+                            js: true,
+                            dontDecode: true,
+                          }
+                        )}
+                      mode="javascript"
+                    />
                   </div>
                 {/if}
               </div>
@@ -658,4 +674,20 @@
   .test :global(.drawer) {
     width: 10000px !important;
   }
+
+  .js-editor {
+    display: flex;
+    flex-direction: row;
+    flex-grow: 1;
+    width: 100%;
+  }
+
+  .js-code {
+    flex: 7;
+  }
+
+  .js-binding-picker {
+    flex: 3;
+    margin-top: calc((var(--spacing-xl) * -1) + 1px);
+  }
 </style>
diff --git a/packages/builder/src/components/automation/SetupPanel/AutomationSelector.svelte b/packages/builder/src/components/automation/SetupPanel/AutomationSelector.svelte
index 7e3ba92420..4372122119 100644
--- a/packages/builder/src/components/automation/SetupPanel/AutomationSelector.svelte
+++ b/packages/builder/src/components/automation/SetupPanel/AutomationSelector.svelte
@@ -1,7 +1,7 @@
 <script>
   import { Select, Label } from "@budibase/bbui"
   import { createEventDispatcher } from "svelte"
-  import { automationStore, selectedAutomation } from "builderStore"
+  import { automationStore, selectedAutomation } from "stores/builder"
   import { TriggerStepID } from "constants/backend/automations"
   import DrawerBindableInput from "../../common/bindings/DrawerBindableInput.svelte"
   import AutomationBindingPanel from "../../common/bindings/ServerBindingPanel.svelte"
diff --git a/packages/builder/src/components/automation/SetupPanel/CronBuilder.svelte b/packages/builder/src/components/automation/SetupPanel/CronBuilder.svelte
index ee9eed51e9..52801491ba 100644
--- a/packages/builder/src/components/automation/SetupPanel/CronBuilder.svelte
+++ b/packages/builder/src/components/automation/SetupPanel/CronBuilder.svelte
@@ -1,16 +1,35 @@
 <script>
   import { Button, Select, Input, Label } from "@budibase/bbui"
   import { onMount, createEventDispatcher } from "svelte"
-  import { flags } from "stores/backend"
+  import { flags } from "stores/builder"
+  import { helpers, REBOOT_CRON } from "@budibase/shared-core"
 
   const dispatch = createEventDispatcher()
 
   export let value
+  let error
+
+  $: {
+    const exists = CRON_EXPRESSIONS.some(cron => cron.value === value)
+    const customIndex = CRON_EXPRESSIONS.findIndex(
+      cron => cron.label === "Custom"
+    )
+
+    if (!exists && customIndex === -1) {
+      CRON_EXPRESSIONS[0] = { label: "Custom", value: value }
+    } else if (exists && customIndex !== -1) {
+      CRON_EXPRESSIONS.splice(customIndex, 1)
+    }
+  }
 
   const onChange = e => {
-    if (e.detail === value) {
+    if (value !== REBOOT_CRON) {
+      error = helpers.cron.validate(e.detail).err
+    }
+    if (e.detail === value || error) {
       return
     }
+
     value = e.detail
     dispatch("change", e.detail)
   }
@@ -41,7 +60,7 @@
     if (!$flags.cloud) {
       CRON_EXPRESSIONS.push({
         label: "Every Budibase Reboot",
-        value: "@reboot",
+        value: REBOOT_CRON,
       })
     }
   })
@@ -49,6 +68,7 @@
 
 <div class="block-field">
   <Input
+    {error}
     on:change={onChange}
     {value}
     on:blur={() => (touched = true)}
@@ -64,7 +84,7 @@
     {#if presets}
       <Select
         on:change={onChange}
-        {value}
+        value={value || "Custom"}
         secondary
         extraThin
         label="Presets"
diff --git a/packages/builder/src/components/automation/SetupPanel/QueryParamSelector.svelte b/packages/builder/src/components/automation/SetupPanel/QueryParamSelector.svelte
index fcf8e7fddb..4674002d61 100644
--- a/packages/builder/src/components/automation/SetupPanel/QueryParamSelector.svelte
+++ b/packages/builder/src/components/automation/SetupPanel/QueryParamSelector.svelte
@@ -1,6 +1,6 @@
 <script>
   import { createEventDispatcher } from "svelte"
-  import { queries } from "stores/backend"
+  import { queries } from "stores/builder"
   import { Select, Label } from "@budibase/bbui"
   import DrawerBindableInput from "../../common/bindings/DrawerBindableInput.svelte"
   import AutomationBindingPanel from "../../common/bindings/ServerBindingPanel.svelte"
diff --git a/packages/builder/src/components/automation/SetupPanel/QuerySelector.svelte b/packages/builder/src/components/automation/SetupPanel/QuerySelector.svelte
index 5d4dcf857a..384067e3f2 100644
--- a/packages/builder/src/components/automation/SetupPanel/QuerySelector.svelte
+++ b/packages/builder/src/components/automation/SetupPanel/QuerySelector.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { queries } from "stores/backend"
+  import { queries } from "stores/builder"
   import { Select } from "@budibase/bbui"
 
   export let value
diff --git a/packages/builder/src/components/automation/SetupPanel/RowSelector.svelte b/packages/builder/src/components/automation/SetupPanel/RowSelector.svelte
index c4a67ab025..6cc96d8c68 100644
--- a/packages/builder/src/components/automation/SetupPanel/RowSelector.svelte
+++ b/packages/builder/src/components/automation/SetupPanel/RowSelector.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { tables } from "stores/backend"
+  import { tables } from "stores/builder"
   import { Select, Checkbox, Label } from "@budibase/bbui"
   import { createEventDispatcher } from "svelte"
   import RowSelectorTypes from "./RowSelectorTypes.svelte"
diff --git a/packages/builder/src/components/automation/SetupPanel/TableSelector.svelte b/packages/builder/src/components/automation/SetupPanel/TableSelector.svelte
index 1645ded66b..c278c7d0e3 100644
--- a/packages/builder/src/components/automation/SetupPanel/TableSelector.svelte
+++ b/packages/builder/src/components/automation/SetupPanel/TableSelector.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { tables } from "stores/backend"
+  import { tables } from "stores/builder"
   import { Select } from "@budibase/bbui"
   import { createEventDispatcher } from "svelte"
   import { TableNames } from "constants"
diff --git a/packages/builder/src/components/automation/Shared/CreateWebhookModal.svelte b/packages/builder/src/components/automation/Shared/CreateWebhookModal.svelte
index 3ad308ac80..f60e1b1f94 100644
--- a/packages/builder/src/components/automation/Shared/CreateWebhookModal.svelte
+++ b/packages/builder/src/components/automation/Shared/CreateWebhookModal.svelte
@@ -1,6 +1,6 @@
 <script>
   import { Icon, notifications, ModalContent } from "@budibase/bbui"
-  import { automationStore, selectedAutomation } from "builderStore"
+  import { automationStore, selectedAutomation } from "stores/builder"
   import WebhookDisplay from "./WebhookDisplay.svelte"
   import { onMount, onDestroy } from "svelte"
 
diff --git a/packages/builder/src/components/backend/DataTable/RelationshipDataTable.svelte b/packages/builder/src/components/backend/DataTable/RelationshipDataTable.svelte
index 4e67a92443..f107acc315 100644
--- a/packages/builder/src/components/backend/DataTable/RelationshipDataTable.svelte
+++ b/packages/builder/src/components/backend/DataTable/RelationshipDataTable.svelte
@@ -1,7 +1,7 @@
 <script>
   import { API } from "api"
   import Table from "./Table.svelte"
-  import { tables } from "stores/backend"
+  import { tables } from "stores/builder"
   import { notifications } from "@budibase/bbui"
 
   export let tableId
diff --git a/packages/builder/src/components/backend/DataTable/TableDataTable.svelte b/packages/builder/src/components/backend/DataTable/TableDataTable.svelte
index 8dd685e766..6a5cd2f282 100644
--- a/packages/builder/src/components/backend/DataTable/TableDataTable.svelte
+++ b/packages/builder/src/components/backend/DataTable/TableDataTable.svelte
@@ -1,10 +1,9 @@
 <script>
-  import { datasources, tables, integrations } from "stores/backend"
+  import { datasources, tables, integrations, appStore } from "stores/builder"
   import EditRolesButton from "./buttons/EditRolesButton.svelte"
   import { TableNames } from "constants"
   import { Grid } from "@budibase/frontend-core"
   import { API } from "api"
-  import { store } from "builderStore"
   import GridAddColumnModal from "components/backend/DataTable/modals/grid/GridCreateColumnModal.svelte"
   import GridCreateEditRowModal from "components/backend/DataTable/modals/grid/GridCreateEditRowModal.svelte"
   import GridEditUserModal from "components/backend/DataTable/modals/grid/GridEditUserModal.svelte"
@@ -59,14 +58,14 @@
     datasource={gridDatasource}
     canAddRows={!isUsersTable}
     canDeleteRows={!isUsersTable}
-    canEditRows={!isUsersTable || !$store.features.disableUserMetadata}
-    canEditColumns={!isUsersTable || !$store.features.disableUserMetadata}
+    canEditRows={!isUsersTable || !$appStore.features.disableUserMetadata}
+    canEditColumns={!isUsersTable || !$appStore.features.disableUserMetadata}
     schemaOverrides={isUsersTable ? userSchemaOverrides : null}
     showAvatars={false}
     on:updatedatasource={handleGridTableUpdate}
   >
     <svelte:fragment slot="filter">
-      {#if isUsersTable && $store.features.disableUserMetadata}
+      {#if isUsersTable && $appStore.features.disableUserMetadata}
         <GridUsersTableButton />
       {/if}
       <GridFilterButton />
diff --git a/packages/builder/src/components/backend/DataTable/ViewDataTable.svelte b/packages/builder/src/components/backend/DataTable/ViewDataTable.svelte
index 6fcba8d418..684cbd6cf4 100644
--- a/packages/builder/src/components/backend/DataTable/ViewDataTable.svelte
+++ b/packages/builder/src/components/backend/DataTable/ViewDataTable.svelte
@@ -1,6 +1,6 @@
 <script>
   import { API } from "api"
-  import { tables } from "stores/backend"
+  import { tables } from "stores/builder"
 
   import Table from "./Table.svelte"
   import CalculateButton from "./buttons/CalculateButton.svelte"
diff --git a/packages/builder/src/components/backend/DataTable/ViewV2DataTable.svelte b/packages/builder/src/components/backend/DataTable/ViewV2DataTable.svelte
index 0c6a0cca9a..90046b2c02 100644
--- a/packages/builder/src/components/backend/DataTable/ViewV2DataTable.svelte
+++ b/packages/builder/src/components/backend/DataTable/ViewV2DataTable.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { viewsV2 } from "stores/backend"
+  import { viewsV2 } from "stores/builder"
   import { Grid } from "@budibase/frontend-core"
   import { API } from "api"
   import GridCreateEditRowModal from "components/backend/DataTable/modals/grid/GridCreateEditRowModal.svelte"
diff --git a/packages/builder/src/components/backend/DataTable/buttons/ExistingRelationshipButton.svelte b/packages/builder/src/components/backend/DataTable/buttons/ExistingRelationshipButton.svelte
index 03f210e528..e2d611a523 100644
--- a/packages/builder/src/components/backend/DataTable/buttons/ExistingRelationshipButton.svelte
+++ b/packages/builder/src/components/backend/DataTable/buttons/ExistingRelationshipButton.svelte
@@ -1,10 +1,8 @@
 <script>
   import { ActionButton, notifications } from "@budibase/bbui"
   import CreateEditRelationshipModal from "../../Datasources/CreateEditRelationshipModal.svelte"
-  import {
-    datasources,
-    tables as tablesStore,
-  } from "../../../../stores/backend"
+
+  import { datasources, tables as tablesStore } from "stores/builder"
   import { createEventDispatcher } from "svelte"
 
   export let table
diff --git a/packages/builder/src/components/backend/DataTable/buttons/ManageAccessButton.svelte b/packages/builder/src/components/backend/DataTable/buttons/ManageAccessButton.svelte
index 5c0b7df742..aa8eefe89c 100644
--- a/packages/builder/src/components/backend/DataTable/buttons/ManageAccessButton.svelte
+++ b/packages/builder/src/components/backend/DataTable/buttons/ManageAccessButton.svelte
@@ -1,6 +1,6 @@
 <script>
   import { ActionButton, Modal } from "@budibase/bbui"
-  import { permissions } from "stores/backend"
+  import { permissions } from "stores/builder"
   import ManageAccessModal from "../modals/ManageAccessModal.svelte"
 
   export let resourceId
diff --git a/packages/builder/src/components/backend/DataTable/cells/RoleCell.svelte b/packages/builder/src/components/backend/DataTable/cells/RoleCell.svelte
index 4b4ce1622b..8c9b4e306b 100644
--- a/packages/builder/src/components/backend/DataTable/cells/RoleCell.svelte
+++ b/packages/builder/src/components/backend/DataTable/cells/RoleCell.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { roles } from "stores/backend"
+  import { roles } from "stores/builder"
 
   export let value
 
diff --git a/packages/builder/src/components/backend/DataTable/formula.js b/packages/builder/src/components/backend/DataTable/formula.js
index 43e8dc721e..f5ff3caec4 100644
--- a/packages/builder/src/components/backend/DataTable/formula.js
+++ b/packages/builder/src/components/backend/DataTable/formula.js
@@ -1,5 +1,5 @@
 import { FIELDS } from "constants/backend"
-import { tables } from "stores/backend"
+import { tables } from "stores/builder"
 import { get as svelteGet } from "svelte/store"
 
 // currently supported level of relationship depth (server side)
diff --git a/packages/builder/src/components/backend/DataTable/modals/CalculateModal.svelte b/packages/builder/src/components/backend/DataTable/modals/CalculateModal.svelte
index 5487551137..1acf5e3efd 100644
--- a/packages/builder/src/components/backend/DataTable/modals/CalculateModal.svelte
+++ b/packages/builder/src/components/backend/DataTable/modals/CalculateModal.svelte
@@ -1,6 +1,6 @@
 <script>
   import { Select, Label, notifications, ModalContent } from "@budibase/bbui"
-  import { tables, views } from "stores/backend"
+  import { tables, views } from "stores/builder"
   import { FIELDS } from "constants/backend"
 
   const CALCULATIONS = [
diff --git a/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte b/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte
index 0328759908..09245b06c5 100644
--- a/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte
+++ b/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte
@@ -15,7 +15,7 @@
   } from "@budibase/bbui"
   import { createEventDispatcher, getContext, onMount } from "svelte"
   import { cloneDeep } from "lodash/fp"
-  import { tables, datasources } from "stores/backend"
+  import { tables, datasources } from "stores/builder"
   import { TableNames, UNEDITABLE_USER_FIELDS } from "constants"
   import {
     FIELDS,
@@ -28,7 +28,7 @@
     PrettyRelationshipDefinitions,
     DB_TYPE_EXTERNAL,
   } from "constants/backend"
-  import { getAutoColumnInformation, buildAutoColumn } from "builderStore/utils"
+  import { getAutoColumnInformation, buildAutoColumn } from "helpers/utils"
   import ConfirmDialog from "components/common/ConfirmDialog.svelte"
   import ModalBindableInput from "components/common/bindings/ModalBindableInput.svelte"
   import { getBindings } from "components/backend/DataTable/formula"
diff --git a/packages/builder/src/components/backend/DataTable/modals/CreateEditRow.svelte b/packages/builder/src/components/backend/DataTable/modals/CreateEditRow.svelte
index 3643602e22..277fe63d6a 100644
--- a/packages/builder/src/components/backend/DataTable/modals/CreateEditRow.svelte
+++ b/packages/builder/src/components/backend/DataTable/modals/CreateEditRow.svelte
@@ -1,6 +1,6 @@
 <script>
   import { createEventDispatcher } from "svelte"
-  import { tables } from "stores/backend"
+  import { tables } from "stores/builder"
   import { ModalContent, keepOpen, notifications } from "@budibase/bbui"
   import RowFieldControl from "../RowFieldControl.svelte"
   import { API } from "api"
diff --git a/packages/builder/src/components/backend/DataTable/modals/CreateEditUser.svelte b/packages/builder/src/components/backend/DataTable/modals/CreateEditUser.svelte
index 010c320de9..a9990d0c2b 100644
--- a/packages/builder/src/components/backend/DataTable/modals/CreateEditUser.svelte
+++ b/packages/builder/src/components/backend/DataTable/modals/CreateEditUser.svelte
@@ -1,6 +1,6 @@
 <script>
   import { createEventDispatcher } from "svelte"
-  import { tables, roles } from "stores/backend"
+  import { tables, roles } from "stores/builder"
   import {
     notifications,
     keepOpen,
diff --git a/packages/builder/src/components/backend/DataTable/modals/EditRoles.svelte b/packages/builder/src/components/backend/DataTable/modals/EditRoles.svelte
index dd41f16af7..6cec28de1d 100644
--- a/packages/builder/src/components/backend/DataTable/modals/EditRoles.svelte
+++ b/packages/builder/src/components/backend/DataTable/modals/EditRoles.svelte
@@ -10,7 +10,7 @@
   import { onMount } from "svelte"
   import { API } from "api"
   import ErrorsBox from "components/common/ErrorsBox.svelte"
-  import { roles } from "stores/backend"
+  import { roles } from "stores/builder"
 
   const BASE_ROLE = { _id: "", inherits: "BASIC", permissionId: "write" }
 
diff --git a/packages/builder/src/components/backend/DataTable/modals/FilterModal.svelte b/packages/builder/src/components/backend/DataTable/modals/FilterModal.svelte
index b125e18b31..1c67da1ab8 100644
--- a/packages/builder/src/components/backend/DataTable/modals/FilterModal.svelte
+++ b/packages/builder/src/components/backend/DataTable/modals/FilterModal.svelte
@@ -10,7 +10,7 @@
     notifications,
     Icon,
   } from "@budibase/bbui"
-  import { tables, views } from "stores/backend"
+  import { tables, views } from "stores/builder"
 
   const CONDITIONS = [
     {
diff --git a/packages/builder/src/components/backend/DataTable/modals/GroupByModal.svelte b/packages/builder/src/components/backend/DataTable/modals/GroupByModal.svelte
index 59fc4a2c5d..d122013428 100644
--- a/packages/builder/src/components/backend/DataTable/modals/GroupByModal.svelte
+++ b/packages/builder/src/components/backend/DataTable/modals/GroupByModal.svelte
@@ -1,6 +1,6 @@
 <script>
   import { Select, ModalContent, notifications } from "@budibase/bbui"
-  import { tables, views } from "stores/backend"
+  import { tables, views } from "stores/builder"
   import { FIELDS } from "constants/backend"
 
   export let view = {}
diff --git a/packages/builder/src/components/backend/DataTable/modals/JSONSchemaModal.svelte b/packages/builder/src/components/backend/DataTable/modals/JSONSchemaModal.svelte
index 1d0266100b..0b2eb58748 100644
--- a/packages/builder/src/components/backend/DataTable/modals/JSONSchemaModal.svelte
+++ b/packages/builder/src/components/backend/DataTable/modals/JSONSchemaModal.svelte
@@ -13,7 +13,7 @@
   } from "@budibase/bbui"
   import { onMount, createEventDispatcher } from "svelte"
   import { FIELDS } from "constants/backend"
-  import { generate } from "builderStore/schemaGenerator"
+  import { generate } from "helpers/schemaGenerator"
 
   export let schema = {}
   export let json
diff --git a/packages/builder/src/components/backend/DataTable/modals/ManageAccessModal.svelte b/packages/builder/src/components/backend/DataTable/modals/ManageAccessModal.svelte
index 09553c1bcd..48b584690e 100644
--- a/packages/builder/src/components/backend/DataTable/modals/ManageAccessModal.svelte
+++ b/packages/builder/src/components/backend/DataTable/modals/ManageAccessModal.svelte
@@ -1,6 +1,6 @@
 <script>
   import { PermissionSource } from "@budibase/types"
-  import { roles, permissions as permissionsStore } from "stores/backend"
+  import { roles, permissions as permissionsStore } from "stores/builder"
   import {
     Label,
     Input,
diff --git a/packages/builder/src/components/backend/DataTable/modals/grid/GridCreateViewModal.svelte b/packages/builder/src/components/backend/DataTable/modals/grid/GridCreateViewModal.svelte
index 2f96a3d82a..eea64a4d9e 100644
--- a/packages/builder/src/components/backend/DataTable/modals/grid/GridCreateViewModal.svelte
+++ b/packages/builder/src/components/backend/DataTable/modals/grid/GridCreateViewModal.svelte
@@ -2,7 +2,7 @@
   import { getContext } from "svelte"
   import { Input, notifications, ModalContent } from "@budibase/bbui"
   import { goto } from "@roxi/routify"
-  import { viewsV2 } from "stores/backend"
+  import { viewsV2 } from "stores/builder"
 
   const { filter, sort, definition } = getContext("grid")
 
diff --git a/packages/builder/src/components/backend/DataTable/modals/grid/GridUsersTableButton.svelte b/packages/builder/src/components/backend/DataTable/modals/grid/GridUsersTableButton.svelte
index 2c353943de..55eb2475cf 100644
--- a/packages/builder/src/components/backend/DataTable/modals/grid/GridUsersTableButton.svelte
+++ b/packages/builder/src/components/backend/DataTable/modals/grid/GridUsersTableButton.svelte
@@ -1,15 +1,12 @@
 <script>
   import { ActionButton, Popover, Heading, Body, Button } from "@budibase/bbui"
-  import { store } from "builderStore"
+  import { builderStore } from "stores/builder"
 
   let anchor
   let open = false
 
   const openSidePanel = () => {
-    store.update(state => ({
-      ...state,
-      builderSidePanel: true,
-    }))
+    builderStore.showBuilderSidePanel()
     open = false
   }
 </script>
diff --git a/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte b/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte
index 23697bf2c7..23081c92c4 100644
--- a/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte
+++ b/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte
@@ -3,13 +3,13 @@
   import { Layout } from "@budibase/bbui"
   import { BUDIBASE_INTERNAL_DB_ID } from "constants/backend"
   import {
-    database,
     datasources,
     queries,
     tables,
     views,
     viewsV2,
-  } from "stores/backend"
+    userSelectedResourceMap,
+  } from "stores/builder"
   import EditDatasourcePopover from "./popovers/EditDatasourcePopover.svelte"
   import EditQueryPopover from "./popovers/EditQueryPopover.svelte"
   import NavItem from "components/common/NavItem.svelte"
@@ -21,7 +21,6 @@
   } from "helpers/data/utils"
   import IntegrationIcon from "./IntegrationIcon.svelte"
   import { TableNames } from "constants"
-  import { userSelectedResourceMap } from "builderStore"
   import { enrichDatasources } from "./datasourceUtils"
   import { onMount } from "svelte"
 
@@ -75,69 +74,67 @@
     searchTerm && !showAppUsersTable && !enrichedDataSources.find(ds => ds.show)
 </script>
 
-{#if $database?._id}
-  <div class="hierarchy-items-container">
-    {#if showAppUsersTable}
-      <NavItem
-        icon="UserGroup"
-        text={appUsersTableName}
-        selected={$isActive("./table/:tableId") &&
-          $tables.selected?._id === TableNames.USERS}
-        on:click={() => selectTable(TableNames.USERS)}
-        selectedBy={$userSelectedResourceMap[TableNames.USERS]}
-      />
-    {/if}
-    {#each enrichedDataSources.filter(ds => ds.show) as datasource}
-      <NavItem
-        border
-        text={datasource.name}
-        opened={datasource.open}
-        selected={$isActive("./datasource") && datasource.selected}
-        withArrow={true}
-        on:click={() => selectDatasource(datasource)}
-        on:iconClick={() => toggleNode(datasource)}
-        selectedBy={$userSelectedResourceMap[datasource._id]}
-      >
-        <div class="datasource-icon" slot="icon">
-          <IntegrationIcon
-            integrationType={datasource.source}
-            schema={datasource.schema}
-            size="18"
-          />
-        </div>
-        {#if datasource._id !== BUDIBASE_INTERNAL_DB_ID}
-          <EditDatasourcePopover {datasource} />
-        {/if}
-      </NavItem>
-
-      {#if datasource.open}
-        <TableNavigator tables={datasource.tables} {selectTable} />
-        {#each datasource.queries as query}
-          <NavItem
-            indentLevel={1}
-            icon="SQLQuery"
-            iconText={customQueryIconText(datasource, query)}
-            iconColor={customQueryIconColor(datasource, query)}
-            text={customQueryText(datasource, query)}
-            selected={$isActive("./query/:queryId") &&
-              $queries.selectedQueryId === query._id}
-            on:click={() => $goto(`./query/${query._id}`)}
-            selectedBy={$userSelectedResourceMap[query._id]}
-          >
-            <EditQueryPopover {query} />
-          </NavItem>
-        {/each}
+<div class="hierarchy-items-container">
+  {#if showAppUsersTable}
+    <NavItem
+      icon="UserGroup"
+      text={appUsersTableName}
+      selected={$isActive("./table/:tableId") &&
+        $tables.selected?._id === TableNames.USERS}
+      on:click={() => selectTable(TableNames.USERS)}
+      selectedBy={$userSelectedResourceMap[TableNames.USERS]}
+    />
+  {/if}
+  {#each enrichedDataSources.filter(ds => ds.show) as datasource}
+    <NavItem
+      border
+      text={datasource.name}
+      opened={datasource.open}
+      selected={$isActive("./datasource") && datasource.selected}
+      withArrow={true}
+      on:click={() => selectDatasource(datasource)}
+      on:iconClick={() => toggleNode(datasource)}
+      selectedBy={$userSelectedResourceMap[datasource._id]}
+    >
+      <div class="datasource-icon" slot="icon">
+        <IntegrationIcon
+          integrationType={datasource.source}
+          schema={datasource.schema}
+          size="18"
+        />
+      </div>
+      {#if datasource._id !== BUDIBASE_INTERNAL_DB_ID}
+        <EditDatasourcePopover {datasource} />
       {/if}
-    {/each}
-    {#if showNoResults}
-      <Layout paddingY="none" paddingX="L">
-        <div class="no-results">
-          There aren't any datasources matching that name
-        </div>
-      </Layout>
+    </NavItem>
+
+    {#if datasource.open}
+      <TableNavigator tables={datasource.tables} {selectTable} />
+      {#each datasource.queries as query}
+        <NavItem
+          indentLevel={1}
+          icon="SQLQuery"
+          iconText={customQueryIconText(datasource, query)}
+          iconColor={customQueryIconColor(datasource, query)}
+          text={customQueryText(datasource, query)}
+          selected={$isActive("./query/:queryId") &&
+            $queries.selectedQueryId === query._id}
+          on:click={() => $goto(`./query/${query._id}`)}
+          selectedBy={$userSelectedResourceMap[query._id]}
+        >
+          <EditQueryPopover {query} />
+        </NavItem>
+      {/each}
     {/if}
-  </div>
-{/if}
+  {/each}
+  {#if showNoResults}
+    <Layout paddingY="none" paddingX="L">
+      <div class="no-results">
+        There aren't any datasources matching that name
+      </div>
+    </Layout>
+  {/if}
+</div>
 
 <style>
   .hierarchy-items-container {
diff --git a/packages/builder/src/components/backend/DatasourceNavigator/icons/index.js b/packages/builder/src/components/backend/DatasourceNavigator/icons/index.js
index 2486942dea..88359c2782 100644
--- a/packages/builder/src/components/backend/DatasourceNavigator/icons/index.js
+++ b/packages/builder/src/components/backend/DatasourceNavigator/icons/index.js
@@ -16,7 +16,7 @@ import Firebase from "./Firebase.svelte"
 import Redis from "./Redis.svelte"
 import Snowflake from "./Snowflake.svelte"
 import Custom from "./Custom.svelte"
-import { integrations } from "stores/backend"
+import { integrations } from "stores/builder"
 import { get } from "svelte/store"
 
 const ICONS = {
diff --git a/packages/builder/src/components/backend/DatasourceNavigator/modals/ImportRestQueriesModal.svelte b/packages/builder/src/components/backend/DatasourceNavigator/modals/ImportRestQueriesModal.svelte
index 9b1f76ba30..1de322c203 100644
--- a/packages/builder/src/components/backend/DatasourceNavigator/modals/ImportRestQueriesModal.svelte
+++ b/packages/builder/src/components/backend/DatasourceNavigator/modals/ImportRestQueriesModal.svelte
@@ -12,7 +12,7 @@
     TextArea,
     Dropzone,
   } from "@budibase/bbui"
-  import { datasources, queries } from "stores/backend"
+  import { datasources, queries } from "stores/builder"
   import { writable } from "svelte/store"
 
   export let navigateDatasource = false
diff --git a/packages/builder/src/components/backend/DatasourceNavigator/modals/UpdateDatasourceModal.svelte b/packages/builder/src/components/backend/DatasourceNavigator/modals/UpdateDatasourceModal.svelte
index 2bc374056d..e6d6026f7c 100644
--- a/packages/builder/src/components/backend/DatasourceNavigator/modals/UpdateDatasourceModal.svelte
+++ b/packages/builder/src/components/backend/DatasourceNavigator/modals/UpdateDatasourceModal.svelte
@@ -1,6 +1,6 @@
 <script>
   import { get } from "svelte/store"
-  import { datasources, integrations } from "stores/backend"
+  import { datasources, integrations } from "stores/builder"
   import { notifications, Input, ModalContent, Modal } from "@budibase/bbui"
   import { integrationForDatasource } from "stores/selectors"
 
diff --git a/packages/builder/src/components/backend/DatasourceNavigator/popovers/EditDatasourcePopover.svelte b/packages/builder/src/components/backend/DatasourceNavigator/popovers/EditDatasourcePopover.svelte
index 11fdd219dc..79efd276f8 100644
--- a/packages/builder/src/components/backend/DatasourceNavigator/popovers/EditDatasourcePopover.svelte
+++ b/packages/builder/src/components/backend/DatasourceNavigator/popovers/EditDatasourcePopover.svelte
@@ -1,6 +1,6 @@
 <script>
   import { goto } from "@roxi/routify"
-  import { datasources } from "stores/backend"
+  import { datasources } from "stores/builder"
   import { notifications, ActionMenu, MenuItem, Icon } from "@budibase/bbui"
   import ConfirmDialog from "components/common/ConfirmDialog.svelte"
   import UpdateDatasourceModal from "components/backend/DatasourceNavigator/modals/UpdateDatasourceModal.svelte"
diff --git a/packages/builder/src/components/backend/DatasourceNavigator/popovers/EditQueryPopover.svelte b/packages/builder/src/components/backend/DatasourceNavigator/popovers/EditQueryPopover.svelte
index 64915d347f..d77c5cc8c0 100644
--- a/packages/builder/src/components/backend/DatasourceNavigator/popovers/EditQueryPopover.svelte
+++ b/packages/builder/src/components/backend/DatasourceNavigator/popovers/EditQueryPopover.svelte
@@ -2,7 +2,7 @@
   import { goto } from "@roxi/routify"
   import { ActionMenu, MenuItem, Icon, notifications } from "@budibase/bbui"
   import ConfirmDialog from "components/common/ConfirmDialog.svelte"
-  import { datasources, queries } from "stores/backend"
+  import { datasources, queries } from "stores/builder"
 
   export let query
 
diff --git a/packages/builder/src/components/backend/Datasources/CreateEditRelationship.svelte b/packages/builder/src/components/backend/Datasources/CreateEditRelationship.svelte
index 91329525c3..6b9524776c 100644
--- a/packages/builder/src/components/backend/Datasources/CreateEditRelationship.svelte
+++ b/packages/builder/src/components/backend/Datasources/CreateEditRelationship.svelte
@@ -13,7 +13,7 @@
     Body,
     Helpers,
   } from "@budibase/bbui"
-  import { tables } from "stores/backend"
+  import { tables } from "stores/builder"
   import { RelationshipErrorChecker } from "./relationshipErrors"
   import { onMount } from "svelte"
   import RelationshipSelector from "components/common/RelationshipSelector.svelte"
diff --git a/packages/builder/src/components/backend/Datasources/CreateEditRelationshipModal.svelte b/packages/builder/src/components/backend/Datasources/CreateEditRelationshipModal.svelte
index 0dfb4ca796..d2682597d4 100644
--- a/packages/builder/src/components/backend/Datasources/CreateEditRelationshipModal.svelte
+++ b/packages/builder/src/components/backend/Datasources/CreateEditRelationshipModal.svelte
@@ -2,7 +2,7 @@
   import { Modal } from "@budibase/bbui"
   import { get } from "svelte/store"
   import CreateEditRelationship from "./CreateEditRelationship.svelte"
-  import { integrations, datasources } from "stores/backend"
+  import { integrations, datasources } from "stores/builder"
   import { integrationForDatasource } from "stores/selectors"
 
   export let datasource
diff --git a/packages/builder/src/components/backend/Datasources/TableImportSelection/tableSelectionStore.js b/packages/builder/src/components/backend/Datasources/TableImportSelection/tableSelectionStore.js
index 5c2ea9767c..e9bd06d69b 100644
--- a/packages/builder/src/components/backend/Datasources/TableImportSelection/tableSelectionStore.js
+++ b/packages/builder/src/components/backend/Datasources/TableImportSelection/tableSelectionStore.js
@@ -1,6 +1,6 @@
 import { derived, writable, get } from "svelte/store"
 import { keepOpen, notifications } from "@budibase/bbui"
-import { datasources, tables } from "stores/backend"
+import { datasources, tables } from "stores/builder"
 
 export const createTableSelectionStore = (integration, datasource) => {
   const tableNamesStore = writable([])
diff --git a/packages/builder/src/components/backend/TableNavigator/TableNavigator.svelte b/packages/builder/src/components/backend/TableNavigator/TableNavigator.svelte
index 33bcb56c98..c739fb8882 100644
--- a/packages/builder/src/components/backend/TableNavigator/TableNavigator.svelte
+++ b/packages/builder/src/components/backend/TableNavigator/TableNavigator.svelte
@@ -3,14 +3,13 @@
     tables as tablesStore,
     views,
     viewsV2,
-    database,
-  } from "stores/backend"
+    userSelectedResourceMap,
+  } from "stores/builder"
   import { TableNames } from "constants"
   import EditTablePopover from "./popovers/EditTablePopover.svelte"
   import EditViewPopover from "./popovers/EditViewPopover.svelte"
   import NavItem from "components/common/NavItem.svelte"
   import { goto, isActive } from "@roxi/routify"
-  import { userSelectedResourceMap } from "builderStore"
 
   export let tables
   export let selectTable
@@ -29,42 +28,40 @@
   }
 </script>
 
-{#if $database?._id}
-  <div class="hierarchy-items-container">
-    {#each sortedTables as table, idx}
+<div class="hierarchy-items-container">
+  {#each sortedTables as table, idx}
+    <NavItem
+      indentLevel={1}
+      border={idx > 0}
+      icon={table._id === TableNames.USERS ? "UserGroup" : "Table"}
+      text={table.name}
+      selected={$isActive("./table/:tableId") &&
+        $tablesStore.selected?._id === table._id}
+      on:click={() => selectTable(table._id)}
+      selectedBy={$userSelectedResourceMap[table._id]}
+    >
+      {#if table._id !== TableNames.USERS}
+        <EditTablePopover {table} />
+      {/if}
+    </NavItem>
+    {#each [...Object.entries(table.views || {})].sort() as [name, view], idx (idx)}
       <NavItem
-        indentLevel={1}
-        border={idx > 0}
-        icon={table._id === TableNames.USERS ? "UserGroup" : "Table"}
-        text={table.name}
-        selected={$isActive("./table/:tableId") &&
-          $tablesStore.selected?._id === table._id}
-        on:click={() => selectTable(table._id)}
-        selectedBy={$userSelectedResourceMap[table._id]}
+        indentLevel={2}
+        icon="Remove"
+        text={name}
+        selected={isViewActive(view, $isActive, $views, $viewsV2)}
+        on:click={() => {
+          if (view.version === 2) {
+            $goto(`./view/v2/${encodeURIComponent(view.id)}`)
+          } else {
+            $goto(`./view/v1/${encodeURIComponent(name)}`)
+          }
+        }}
+        selectedBy={$userSelectedResourceMap[name] ||
+          $userSelectedResourceMap[view.id]}
       >
-        {#if table._id !== TableNames.USERS}
-          <EditTablePopover {table} />
-        {/if}
+        <EditViewPopover {view} />
       </NavItem>
-      {#each [...Object.entries(table.views || {})].sort() as [name, view], idx (idx)}
-        <NavItem
-          indentLevel={2}
-          icon="Remove"
-          text={name}
-          selected={isViewActive(view, $isActive, $views, $viewsV2)}
-          on:click={() => {
-            if (view.version === 2) {
-              $goto(`./view/v2/${encodeURIComponent(view.id)}`)
-            } else {
-              $goto(`./view/v1/${encodeURIComponent(name)}`)
-            }
-          }}
-          selectedBy={$userSelectedResourceMap[name] ||
-            $userSelectedResourceMap[view.id]}
-        >
-          <EditViewPopover {view} />
-        </NavItem>
-      {/each}
     {/each}
-  </div>
-{/if}
+  {/each}
+</div>
diff --git a/packages/builder/src/components/backend/TableNavigator/modals/CreateTableModal.svelte b/packages/builder/src/components/backend/TableNavigator/modals/CreateTableModal.svelte
index 630fa4eb06..098369d3b4 100644
--- a/packages/builder/src/components/backend/TableNavigator/modals/CreateTableModal.svelte
+++ b/packages/builder/src/components/backend/TableNavigator/modals/CreateTableModal.svelte
@@ -1,6 +1,6 @@
 <script>
   import { goto, url } from "@roxi/routify"
-  import { tables, datasources } from "stores/backend"
+  import { tables, datasources } from "stores/builder"
   import {
     notifications,
     Input,
diff --git a/packages/builder/src/components/backend/TableNavigator/popovers/EditTablePopover.svelte b/packages/builder/src/components/backend/TableNavigator/popovers/EditTablePopover.svelte
index f4b2a2fc25..c2cda1f2d8 100644
--- a/packages/builder/src/components/backend/TableNavigator/popovers/EditTablePopover.svelte
+++ b/packages/builder/src/components/backend/TableNavigator/popovers/EditTablePopover.svelte
@@ -1,8 +1,7 @@
 <script>
   import { goto, params } from "@roxi/routify"
-  import { store } from "builderStore"
   import { cloneDeep } from "lodash/fp"
-  import { tables, datasources } from "stores/backend"
+  import { tables, datasources, screenStore } from "stores/builder"
   import {
     ActionMenu,
     Icon,
@@ -32,7 +31,7 @@
   $: allowDeletion = !externalTable || table?.created
 
   function showDeleteModal() {
-    templateScreens = $store.screens.filter(
+    templateScreens = $screenStore.screens.filter(
       screen => screen.autoTableId === table._id
     )
     willBeDeleted = ["All table data"].concat(
@@ -47,7 +46,7 @@
       await tables.delete(table)
       // Screens need deleted one at a time because of undo/redo
       for (let screen of templateScreens) {
-        await store.actions.screens.delete(screen)
+        await screenStore.delete(screen)
       }
       if (table.sourceType === DB_TYPE_EXTERNAL) {
         await datasources.fetch()
diff --git a/packages/builder/src/components/backend/TableNavigator/popovers/EditViewPopover.svelte b/packages/builder/src/components/backend/TableNavigator/popovers/EditViewPopover.svelte
index 5e2b0102f8..30cc4451df 100644
--- a/packages/builder/src/components/backend/TableNavigator/popovers/EditViewPopover.svelte
+++ b/packages/builder/src/components/backend/TableNavigator/popovers/EditViewPopover.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { views, viewsV2 } from "stores/backend"
+  import { views, viewsV2 } from "stores/builder"
   import { cloneDeep } from "lodash/fp"
   import ConfirmDialog from "components/common/ConfirmDialog.svelte"
   import {
diff --git a/packages/builder/src/components/commandPalette/CommandPalette.svelte b/packages/builder/src/components/commandPalette/CommandPalette.svelte
index b9a4c0a412..2d9f269e24 100644
--- a/packages/builder/src/components/commandPalette/CommandPalette.svelte
+++ b/packages/builder/src/components/commandPalette/CommandPalette.svelte
@@ -10,12 +10,17 @@
   import { API } from "api"
   import { goto } from "@roxi/routify"
   import {
-    store,
-    sortedScreens,
     automationStore,
-    themeStore,
-  } from "builderStore"
-  import { datasources, queries, tables, views } from "stores/backend"
+    previewStore,
+    builderStore,
+    sortedScreens,
+    appStore,
+    datasources,
+    queries,
+    tables,
+    views,
+  } from "stores/builder"
+  import { themeStore } from "stores/portal"
   import { getContext } from "svelte"
   import { Constants } from "@budibase/frontend-core"
 
@@ -26,8 +31,7 @@
       name: "Invite users and manage app access",
       description: "",
       icon: "User",
-      action: () =>
-        store.update(state => ({ ...state, builderSidePanel: true })),
+      action: () => builderStore.showBuilderSidePanel(),
     },
     {
       type: "Navigate",
@@ -69,13 +73,13 @@
       name: "App",
       description: "",
       icon: "Play",
-      action: () => store.update(state => ({ ...state, showPreview: true })),
+      action: () => previewStore.showPreview(true),
     },
     {
       type: "Preview",
       name: "Published App",
       icon: "Play",
-      action: () => window.open(`/app${$store.url}`),
+      action: () => window.open(`/app${$appStore.url}`),
     },
     {
       type: "Support",
@@ -216,7 +220,7 @@
 
   async function deployApp() {
     try {
-      await API.publishAppChanges($store.appId)
+      await API.publishAppChanges($appStore.appId)
       notifications.success("App published successfully")
     } catch (error) {
       notifications.error("Error publishing app")
diff --git a/packages/builder/src/components/common/CodeEditor/CodeEditor.svelte b/packages/builder/src/components/common/CodeEditor/CodeEditor.svelte
index a39634f9a3..f4fa762bce 100644
--- a/packages/builder/src/components/common/CodeEditor/CodeEditor.svelte
+++ b/packages/builder/src/components/common/CodeEditor/CodeEditor.svelte
@@ -43,7 +43,7 @@
   import { Compartment } from "@codemirror/state"
   import { javascript } from "@codemirror/lang-javascript"
   import { EditorModes, getDefaultTheme } from "./"
-  import { themeStore } from "builderStore"
+  import { themeStore } from "stores/portal"
 
   export let label
   export let completions = []
@@ -54,6 +54,7 @@
   export let placeholder = null
   export let autocompleteEnabled = true
   export let autofocus = false
+  export let jsBindingWrapping = true
 
   // Export a function to expose caret position
   export const getCaretPosition = () => {
@@ -187,7 +188,7 @@
       )
       complete.push(
         EditorView.inputHandler.of((view, from, to, insert) => {
-          if (insert === "$") {
+          if (jsBindingWrapping && insert === "$") {
             let { text } = view.state.doc.lineAt(from)
 
             const left = from ? text.substring(0, from) : ""
diff --git a/packages/builder/src/components/common/CodeEditor/index.js b/packages/builder/src/components/common/CodeEditor/index.js
index da0e727e4e..0d71a475f0 100644
--- a/packages/builder/src/components/common/CodeEditor/index.js
+++ b/packages/builder/src/components/common/CodeEditor/index.js
@@ -286,13 +286,20 @@ export const hbInsert = (value, from, to, text) => {
   return parsedInsert
 }
 
-export function jsInsert(value, from, to, text, { helper } = {}) {
+export function jsInsert(
+  value,
+  from,
+  to,
+  text,
+  { helper, disableWrapping } = {}
+) {
   let parsedInsert = ""
 
   const left = from ? value.substring(0, from) : ""
   const right = to ? value.substring(to) : ""
-
-  if (helper) {
+  if (disableWrapping) {
+    parsedInsert = text
+  } else if (helper) {
     parsedInsert = `helpers.${text}()`
   } else if (!left.includes('$("') || !right.includes('")')) {
     parsedInsert = `$("${text}")`
diff --git a/packages/builder/src/components/common/CodeMirrorEditor.svelte b/packages/builder/src/components/common/CodeMirrorEditor.svelte
index 9537028ac1..48177ff870 100644
--- a/packages/builder/src/components/common/CodeMirrorEditor.svelte
+++ b/packages/builder/src/components/common/CodeMirrorEditor.svelte
@@ -27,7 +27,7 @@
 <script>
   import { Label } from "@budibase/bbui"
   import CodeMirror from "components/integration/codemirror"
-  import { themeStore } from "builderStore"
+  import { themeStore } from "stores/portal"
   import { createEventDispatcher, onMount } from "svelte"
 
   export let mode = EditorModes.JS
diff --git a/packages/builder/src/components/common/LinkedRowSelector.svelte b/packages/builder/src/components/common/LinkedRowSelector.svelte
index 56156190be..b042d3a9ae 100644
--- a/packages/builder/src/components/common/LinkedRowSelector.svelte
+++ b/packages/builder/src/components/common/LinkedRowSelector.svelte
@@ -1,8 +1,8 @@
 <script>
-  import { tables } from "stores/backend"
+  import { tables } from "stores/builder"
   import { API } from "api"
   import { Select, Label, Multiselect } from "@budibase/bbui"
-  import { capitalise } from "../../helpers"
+  import { capitalise } from "helpers"
   import { createEventDispatcher } from "svelte"
 
   export let schema
diff --git a/packages/builder/src/components/common/RoleSelect.svelte b/packages/builder/src/components/common/RoleSelect.svelte
index 1158107fd6..4605b0c182 100644
--- a/packages/builder/src/components/common/RoleSelect.svelte
+++ b/packages/builder/src/components/common/RoleSelect.svelte
@@ -1,6 +1,6 @@
 <script>
   import { Select, FancySelect } from "@budibase/bbui"
-  import { roles } from "stores/backend"
+  import { roles } from "stores/builder"
   import { licensing } from "stores/portal"
 
   import { Constants, RoleUtils } from "@budibase/frontend-core"
diff --git a/packages/builder/src/components/common/bindings/BindableCombobox.svelte b/packages/builder/src/components/common/bindings/BindableCombobox.svelte
index 1e44a55736..3754abd341 100644
--- a/packages/builder/src/components/common/bindings/BindableCombobox.svelte
+++ b/packages/builder/src/components/common/bindings/BindableCombobox.svelte
@@ -3,7 +3,7 @@
   import {
     readableToRuntimeBinding,
     runtimeToReadableBinding,
-  } from "builderStore/dataBinding"
+  } from "dataBinding"
   import { createEventDispatcher } from "svelte"
   import { isJSBinding } from "@budibase/string-templates"
 
diff --git a/packages/builder/src/components/common/bindings/BindingPanel.svelte b/packages/builder/src/components/common/bindings/BindingPanel.svelte
index 3b64c918d0..cb564593a0 100644
--- a/packages/builder/src/components/common/bindings/BindingPanel.svelte
+++ b/packages/builder/src/components/common/bindings/BindingPanel.svelte
@@ -20,7 +20,7 @@
   import {
     readableToRuntimeBinding,
     runtimeToReadableBinding,
-  } from "builderStore/dataBinding"
+  } from "dataBinding"
 
   import { admin } from "stores/portal"
   import CodeEditor from "../CodeEditor/CodeEditor.svelte"
@@ -30,10 +30,9 @@
     hbAutocomplete,
     EditorModes,
     bindingsToCompletions,
-    hbInsert,
-    jsInsert,
   } from "../CodeEditor"
   import BindingPicker from "./BindingPicker.svelte"
+  import { BindingHelpers } from "./utils"
 
   const dispatch = createEventDispatcher()
 
@@ -68,6 +67,7 @@
   $: bindingCompletions = bindingsToCompletions(bindings, editorMode)
   $: runtimeExpression = readableToRuntimeBinding(bindings, value)
   $: expressionResult = processStringSync(runtimeExpression || "", context)
+  $: bindingHelpers = new BindingHelpers(getCaretPosition, insertAtPos)
 
   const updateValue = val => {
     const runtimeExpression = readableToRuntimeBinding(bindings, val)
@@ -78,31 +78,13 @@
     }
   }
 
-  // Adds a JS/HBS helper to the expression
   const onSelectHelper = (helper, js) => {
-    const pos = getCaretPosition()
-    const { start, end } = pos
-    if (js) {
-      let js = decodeJSBinding(jsValue)
-      const insertVal = jsInsert(js, start, end, helper.text, { helper: true })
-      insertAtPos({ start, end, value: insertVal })
-    } else {
-      const insertVal = hbInsert(hbsValue, start, end, helper.text)
-      insertAtPos({ start, end, value: insertVal })
-    }
+    bindingHelpers.onSelectHelper(js ? jsValue : hbsValue, helper, { js })
   }
 
-  // Adds a data binding to the expression
   const onSelectBinding = (binding, { forceJS } = {}) => {
-    const { start, end } = getCaretPosition()
-    if (usingJS || forceJS) {
-      let js = decodeJSBinding(jsValue)
-      const insertVal = jsInsert(js, start, end, binding.readableBinding)
-      insertAtPos({ start, end, value: insertVal })
-    } else {
-      const insertVal = hbInsert(hbsValue, start, end, binding.readableBinding)
-      insertAtPos({ start, end, value: insertVal })
-    }
+    const js = usingJS || forceJS
+    bindingHelpers.onSelectBinding(js ? jsValue : hbsValue, binding, { js })
   }
 
   const onChangeMode = e => {
diff --git a/packages/builder/src/components/common/bindings/BindingPicker.svelte b/packages/builder/src/components/common/bindings/BindingPicker.svelte
index 23728c4b83..8ae236a7ab 100644
--- a/packages/builder/src/components/common/bindings/BindingPicker.svelte
+++ b/packages/builder/src/components/common/bindings/BindingPicker.svelte
@@ -10,6 +10,7 @@
   export let mode
   export let allowHelpers
   export let context = null
+  export let noPaddingTop = false
 
   let search = ""
   let popover
diff --git a/packages/builder/src/components/common/bindings/DrawerBindableCombobox.svelte b/packages/builder/src/components/common/bindings/DrawerBindableCombobox.svelte
index edf65797c2..37800d899d 100644
--- a/packages/builder/src/components/common/bindings/DrawerBindableCombobox.svelte
+++ b/packages/builder/src/components/common/bindings/DrawerBindableCombobox.svelte
@@ -3,7 +3,7 @@
   import {
     readableToRuntimeBinding,
     runtimeToReadableBinding,
-  } from "builderStore/dataBinding"
+  } from "dataBinding"
   import ClientBindingPanel from "components/common/bindings/ClientBindingPanel.svelte"
   import { createEventDispatcher, setContext } from "svelte"
   import { isJSBinding } from "@budibase/string-templates"
diff --git a/packages/builder/src/components/common/bindings/DrawerBindableInput.svelte b/packages/builder/src/components/common/bindings/DrawerBindableInput.svelte
index 2ce9977bbe..e0c1942cb4 100644
--- a/packages/builder/src/components/common/bindings/DrawerBindableInput.svelte
+++ b/packages/builder/src/components/common/bindings/DrawerBindableInput.svelte
@@ -3,10 +3,12 @@
   import {
     readableToRuntimeBinding,
     runtimeToReadableBinding,
-  } from "builderStore/dataBinding"
+  } from "dataBinding"
+
   import ClientBindingPanel from "components/common/bindings/ClientBindingPanel.svelte"
   import { createEventDispatcher, setContext } from "svelte"
   import { isJSBinding } from "@budibase/string-templates"
+  import { builderStore } from "stores/builder"
 
   export let panel = ClientBindingPanel
   export let value = ""
@@ -20,6 +22,7 @@
   export let allowHelpers = true
   export let updateOnChange = true
   export let drawerLeft
+  export let key
   export let disableBindings = false
   export let context = null
 
@@ -36,6 +39,7 @@
   const saveBinding = () => {
     onChange(tempValue)
     onBlur()
+    builderStore.propertyFocus()
     bindingDrawer.hide()
   }
 
@@ -51,6 +55,11 @@
   const onBlur = () => {
     dispatch("blur", currentVal)
   }
+
+  const onDrawerHide = e => {
+    builderStore.propertyFocus()
+    dispatch("drawerHide", e.detail)
+  }
 </script>
 
 <div class="control" class:disabled>
@@ -68,6 +77,7 @@
     <div
       class="icon"
       on:click={() => {
+        builderStore.propertyFocus(key)
         bindingDrawer.show()
       }}
     >
@@ -76,7 +86,7 @@
   {/if}
 </div>
 <Drawer
-  on:drawerHide
+  on:drawerHide={onDrawerHide}
   on:drawerShow
   {fillWidth}
   bind:this={bindingDrawer}
diff --git a/packages/builder/src/components/common/bindings/DrawerBindableSlot.svelte b/packages/builder/src/components/common/bindings/DrawerBindableSlot.svelte
index 771f5d7fe2..dc058ac203 100644
--- a/packages/builder/src/components/common/bindings/DrawerBindableSlot.svelte
+++ b/packages/builder/src/components/common/bindings/DrawerBindableSlot.svelte
@@ -3,7 +3,7 @@
   import {
     readableToRuntimeBinding,
     runtimeToReadableBinding,
-  } from "builderStore/dataBinding"
+  } from "dataBinding"
 
   import ClientBindingPanel from "components/common/bindings/ClientBindingPanel.svelte"
   import { createEventDispatcher, setContext } from "svelte"
diff --git a/packages/builder/src/components/common/bindings/ModalBindableInput.svelte b/packages/builder/src/components/common/bindings/ModalBindableInput.svelte
index dc851eb270..084c86f944 100644
--- a/packages/builder/src/components/common/bindings/ModalBindableInput.svelte
+++ b/packages/builder/src/components/common/bindings/ModalBindableInput.svelte
@@ -3,7 +3,7 @@
   import {
     readableToRuntimeBinding,
     runtimeToReadableBinding,
-  } from "builderStore/dataBinding"
+  } from "dataBinding"
   import ServerBindingPanel from "components/common/bindings/ServerBindingPanel.svelte"
   import { createEventDispatcher } from "svelte"
   import { isJSBinding } from "@budibase/string-templates"
diff --git a/packages/builder/src/components/common/bindings/utils.js b/packages/builder/src/components/common/bindings/utils.js
index 8d414ffed3..a086cd0394 100644
--- a/packages/builder/src/components/common/bindings/utils.js
+++ b/packages/builder/src/components/common/bindings/utils.js
@@ -1,38 +1,41 @@
-export function addHBSBinding(value, caretPos, binding) {
-  binding = typeof binding === "string" ? binding : binding.path
-  value = value == null ? "" : value
+import { decodeJSBinding } from "@budibase/string-templates"
+import { hbInsert, jsInsert } from "components/common/CodeEditor"
 
-  const left = caretPos?.start ? value.substring(0, caretPos.start) : ""
-  const right = caretPos?.end ? value.substring(caretPos.end) : ""
-  if (!left.includes("{{") || !right.includes("}}")) {
-    binding = `{{ ${binding} }}`
+export class BindingHelpers {
+  constructor(getCaretPosition, insertAtPos, { disableWrapping } = {}) {
+    this.getCaretPosition = getCaretPosition
+    this.insertAtPos = insertAtPos
+    this.disableWrapping = disableWrapping
   }
-  if (caretPos.start) {
-    value =
-      value.substring(0, caretPos.start) +
-      binding +
-      value.substring(caretPos.end, value.length)
-  } else {
-    value += binding
-  }
-  return value
-}
 
-export function addJSBinding(value, caretPos, binding, { helper } = {}) {
-  binding = typeof binding === "string" ? binding : binding.path
-  value = value == null ? "" : value
-  if (!helper) {
-    binding = `$("${binding}")`
-  } else {
-    binding = `helpers.${binding}()`
+  // Adds a JS/HBS helper to the expression
+  onSelectHelper(value, helper, { js, dontDecode }) {
+    const pos = this.getCaretPosition()
+    const { start, end } = pos
+    if (js) {
+      const jsVal = dontDecode ? value : decodeJSBinding(value)
+      const insertVal = jsInsert(jsVal, start, end, helper.text, {
+        helper: true,
+      })
+      this.insertAtPos({ start, end, value: insertVal })
+    } else {
+      const insertVal = hbInsert(value, start, end, helper.text)
+      this.insertAtPos({ start, end, value: insertVal })
+    }
   }
-  if (caretPos.start) {
-    value =
-      value.substring(0, caretPos.start) +
-      binding +
-      value.substring(caretPos.end, value.length)
-  } else {
-    value += binding
+
+  // Adds a data binding to the expression
+  onSelectBinding(value, binding, { js, dontDecode }) {
+    const { start, end } = this.getCaretPosition()
+    if (js) {
+      const jsVal = dontDecode ? value : decodeJSBinding(value)
+      const insertVal = jsInsert(jsVal, start, end, binding.readableBinding, {
+        disableWrapping: this.disableWrapping,
+      })
+      this.insertAtPos({ start, end, value: insertVal })
+    } else {
+      const insertVal = hbInsert(value, start, end, binding.readableBinding)
+      this.insertAtPos({ start, end, value: insertVal })
+    }
   }
-  return value
 }
diff --git a/packages/builder/src/components/common/users/PasswordRepeatInput.svelte b/packages/builder/src/components/common/users/PasswordRepeatInput.svelte
index a66de3703b..496bee14ec 100644
--- a/packages/builder/src/components/common/users/PasswordRepeatInput.svelte
+++ b/packages/builder/src/components/common/users/PasswordRepeatInput.svelte
@@ -1,9 +1,6 @@
 <script>
   import { Layout, Input } from "@budibase/bbui"
-  import {
-    createValidationStore,
-    requiredValidator,
-  } from "../../../helpers/validation"
+  import { createValidationStore, requiredValidator } from "helpers/validation"
 
   export let password
   export let error
diff --git a/packages/builder/src/components/deploy/AppActions.svelte b/packages/builder/src/components/deploy/AppActions.svelte
index 7d14fd0e87..152508739d 100644
--- a/packages/builder/src/components/deploy/AppActions.svelte
+++ b/packages/builder/src/components/deploy/AppActions.svelte
@@ -21,11 +21,14 @@
   import { API } from "api"
   import { apps } from "stores/portal"
   import {
-    deploymentStore,
-    store,
+    previewStore,
+    builderStore,
     isOnlyUser,
+    appStore,
+    deploymentStore,
+    initialise,
     sortedScreens,
-  } from "builderStore"
+  } from "stores/builder"
   import TourWrap from "components/portal/onboarding/TourWrap.svelte"
   import { TOUR_STEP_KEYS } from "components/portal/onboarding/tours.js"
   import { goto } from "@roxi/routify"
@@ -50,15 +53,15 @@
   $: isPublished =
     selectedApp?.status === "published" && latestDeployments?.length > 0
   $: updateAvailable =
-    $store.upgradableVersion &&
-    $store.version &&
-    $store.upgradableVersion !== $store.version
+    $appStore.upgradableVersion &&
+    $appStore.version &&
+    $appStore.upgradableVersion !== $appStore.version
   $: canPublish = !publishing && loaded && $sortedScreens.length > 0
   $: lastDeployed = getLastDeployedString($deploymentStore)
 
   const initialiseApp = async () => {
-    const applicationPkg = await API.fetchAppPackage($store.devId)
-    await store.actions.initialise(applicationPkg)
+    const applicationPkg = await API.fetchAppPackage($appStore.devId)
+    await initialise(applicationPkg)
   }
 
   const getLastDeployedString = deployments => {
@@ -71,10 +74,7 @@
   }
 
   const previewApp = () => {
-    store.update(state => ({
-      ...state,
-      showPreview: true,
-    }))
+    previewStore.showPreview(true)
   }
 
   const viewApp = () => {
@@ -92,7 +92,7 @@
   async function publishApp() {
     try {
       publishing = true
-      await API.publishAppChanges($store.appId)
+      await API.publishAppChanges($appStore.appId)
       notifications.send("App published successfully", {
         type: "success",
         icon: "GlobeCheck",
@@ -101,7 +101,13 @@
     } catch (error) {
       console.error(error)
       analytics.captureException(error)
-      notifications.error("Error publishing app")
+      const baseMsg = "Error publishing app"
+      const message = error.message
+      if (message) {
+        notifications.error(`${baseMsg} - ${message}`)
+      } else {
+        notifications.error(baseMsg)
+      }
     }
     publishing = false
   }
@@ -136,7 +142,7 @@
   const completePublish = async () => {
     try {
       await apps.load()
-      await deploymentStore.actions.load()
+      await deploymentStore.load()
     } catch (err) {
       notifications.error("Error refreshing app")
     }
@@ -156,7 +162,7 @@
       </div>
     {/if}
     <TourWrap
-      tourStepKey={$store.onboarding
+      tourStepKey={$builderStore.onboarding
         ? TOUR_STEP_KEYS.BUILDER_USER_MANAGEMENT
         : TOUR_STEP_KEYS.FEATURE_USER_MANAGEMENT}
     >
@@ -166,10 +172,7 @@
             quiet
             icon="UserGroup"
             on:click={() => {
-              store.update(state => {
-                state.builderSidePanel = true
-                return state
-              })
+              builderStore.showBuilderSidePanel()
             }}
           >
             Users
@@ -242,7 +245,7 @@
                   }
                 }}
               >
-                {$store.url}
+                {$appStore.url}
                 {#if isPublished}
                   <Icon size="S" name="LinkOut" />
                 {:else}
@@ -323,10 +326,10 @@
 <Modal bind:this={updateAppModal} padding={false} width="600px">
   <UpdateAppModal
     app={{
-      name: $store.name,
-      url: $store.url,
-      icon: $store.icon,
-      appId: $store.appId,
+      name: $appStore.name,
+      url: $appStore.url,
+      icon: $appStore.icon,
+      appId: $appStore.appId,
     }}
     onUpdateComplete={async () => {
       await initialiseApp()
diff --git a/packages/builder/src/components/deploy/CreateWebhookDeploymentModal.svelte b/packages/builder/src/components/deploy/CreateWebhookDeploymentModal.svelte
index ee6b163a3e..899d1659e8 100644
--- a/packages/builder/src/components/deploy/CreateWebhookDeploymentModal.svelte
+++ b/packages/builder/src/components/deploy/CreateWebhookDeploymentModal.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { automationStore } from "builderStore"
+  import { automationStore } from "stores/builder"
   import { ModalContent } from "@budibase/bbui"
   import { onMount } from "svelte"
   import WebhookDisplay from "../automation/Shared/WebhookDisplay.svelte"
diff --git a/packages/builder/src/components/deploy/DeleteModal.svelte b/packages/builder/src/components/deploy/DeleteModal.svelte
index d2c8308971..855f6a0757 100644
--- a/packages/builder/src/components/deploy/DeleteModal.svelte
+++ b/packages/builder/src/components/deploy/DeleteModal.svelte
@@ -1,9 +1,9 @@
 <script>
   import { Input, notifications } from "@budibase/bbui"
   import { goto } from "@roxi/routify"
-  import { store } from "builderStore"
   import ConfirmDialog from "components/common/ConfirmDialog.svelte"
   import { apps } from "stores/portal"
+  import { appStore } from "stores/builder"
   import { API } from "api"
 
   export const show = () => {
@@ -19,7 +19,7 @@
 
   const deleteApp = async () => {
     try {
-      await API.deleteApp($store.appId)
+      await API.deleteApp($appStore.appId)
       apps.load()
       notifications.success("App deleted successfully")
       $goto("/builder")
@@ -35,11 +35,14 @@
   okText="Delete"
   onOk={deleteApp}
   onCancel={() => (deletionConfirmationAppName = null)}
-  disabled={deletionConfirmationAppName !== $store.name}
+  disabled={deletionConfirmationAppName !== $appStore.name}
 >
-  Are you sure you want to delete <b>{$store.name}</b>?
+  Are you sure you want to delete <b>{$appStore.name}</b>?
   <br />
   Please enter the app name below to confirm.
   <br /><br />
-  <Input bind:value={deletionConfirmationAppName} placeholder={$store.name} />
+  <Input
+    bind:value={deletionConfirmationAppName}
+    placeholder={$appStore.name}
+  />
 </ConfirmDialog>
diff --git a/packages/builder/src/components/deploy/RevertModal.svelte b/packages/builder/src/components/deploy/RevertModal.svelte
index 79b1f5300f..dc97c81c22 100644
--- a/packages/builder/src/components/deploy/RevertModal.svelte
+++ b/packages/builder/src/components/deploy/RevertModal.svelte
@@ -1,6 +1,6 @@
 <script>
   import { Input, Modal, notifications, ModalContent } from "@budibase/bbui"
-  import { store } from "builderStore"
+  import { appStore, initialise } from "stores/builder"
   import { API } from "api"
 
   export let onComplete = () => {}
@@ -8,7 +8,7 @@
   let revertModal
   let appName
 
-  $: appId = $store.appId
+  $: appId = $appStore.appId
 
   const revert = async () => {
     try {
@@ -16,7 +16,7 @@
 
       // Reset frontend state after revert
       const applicationPkg = await API.fetchAppPackage(appId)
-      await store.actions.initialise(applicationPkg)
+      await initialise(applicationPkg)
       notifications.info("Changes reverted successfully")
       onComplete()
     } catch (error) {
@@ -38,7 +38,7 @@
     title="Revert Changes"
     confirmText="Revert"
     onConfirm={revert}
-    disabled={appName !== $store.name}
+    disabled={appName !== $appStore.name}
   >
     <span
       >The changes you have made will be deleted and the application reverted
diff --git a/packages/builder/src/components/deploy/VersionModal.svelte b/packages/builder/src/components/deploy/VersionModal.svelte
index f56f0e863b..0944512fe8 100644
--- a/packages/builder/src/components/deploy/VersionModal.svelte
+++ b/packages/builder/src/components/deploy/VersionModal.svelte
@@ -7,7 +7,7 @@
     Button,
     StatusLight,
   } from "@budibase/bbui"
-  import { store } from "builderStore"
+  import { appStore, initialise } from "stores/builder"
   import { API } from "api"
 
   export function show() {
@@ -23,17 +23,17 @@
 
   let updateModal
 
-  $: appId = $store.appId
+  $: appId = $appStore.appId
   $: updateAvailable =
-    $store.upgradableVersion &&
-    $store.version &&
-    $store.upgradableVersion !== $store.version
-  $: revertAvailable = $store.revertableVersion != null
+    $appStore.upgradableVersion &&
+    $appStore.version &&
+    $appStore.upgradableVersion !== $appStore.version
+  $: revertAvailable = $appStore.revertableVersion != null
 
   const refreshAppPackage = async () => {
     try {
       const pkg = await API.fetchAppPackage(appId)
-      await store.actions.initialise(pkg)
+      await initialise(pkg)
     } catch (error) {
       notifications.error("Error fetching app package")
     }
@@ -46,7 +46,7 @@
       // Don't wait for the async refresh, since this causes modal flashing
       refreshAppPackage()
       notifications.success(
-        `App updated successfully to version ${$store.upgradableVersion}`
+        `App updated successfully to version ${$appStore.upgradableVersion}`
       )
       onComplete()
     } catch (err) {
@@ -62,7 +62,7 @@
       // Don't wait for the async refresh, since this causes modal flashing
       refreshAppPackage()
       notifications.success(
-        `App reverted successfully to version ${$store.revertableVersion}`
+        `App reverted successfully to version ${$appStore.revertableVersion}`
       )
     } catch (err) {
       notifications.error(`Error reverting app: ${err}`)
@@ -89,20 +89,21 @@
     </div>
     {#if updateAvailable}
       <Body size="S">
-        This app is currently using version <b>{$store.version}</b>, but version
-        <b>{$store.upgradableVersion}</b> is available. Updates can contain new features,
-        performance improvements and bug fixes.
+        This app is currently using version <b>{$appStore.version}</b>, but
+        version
+        <b>{$appStore.upgradableVersion}</b> is available. Updates can contain new
+        features, performance improvements and bug fixes.
       </Body>
     {:else}
       <Body size="S">
-        This app is currently using version <b>{$store.version}</b> which is the
+        This app is currently using version <b>{$appStore.version}</b> which is the
         latest version available.
       </Body>
     {/if}
     {#if revertAvailable}
       <Body size="S">
         You can revert this app to version
-        <b>{$store.revertableVersion}</b>
+        <b>{$appStore.revertableVersion}</b>
         if you're experiencing issues with the current version.
       </Body>
     {/if}
diff --git a/packages/builder/src/components/design/ScreenDetailsModal.svelte b/packages/builder/src/components/design/ScreenDetailsModal.svelte
index f31cc8a99c..295f03c518 100644
--- a/packages/builder/src/components/design/ScreenDetailsModal.svelte
+++ b/packages/builder/src/components/design/ScreenDetailsModal.svelte
@@ -1,8 +1,8 @@
 <script>
   import { ModalContent, Input } from "@budibase/bbui"
-  import sanitizeUrl from "builderStore/store/screenTemplates/utils/sanitizeUrl"
+  import sanitizeUrl from "helpers/sanitizeUrl"
   import { get } from "svelte/store"
-  import { store } from "builderStore"
+  import { screenStore } from "stores/builder"
 
   export let onConfirm
   export let onCancel
@@ -36,7 +36,7 @@
     if (!screenRole) {
       return false
     }
-    return get(store).screens.some(
+    return get(screenStore).screens.some(
       screen =>
         screen.routing.route.toLowerCase() === url.toLowerCase() &&
         screen.routing.roleId === screenRole
diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/ButtonActionDrawer.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/ButtonActionDrawer.svelte
index 236bba58dc..b7aa6add5d 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/ButtonActionDrawer.svelte
+++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/ButtonActionDrawer.svelte
@@ -16,7 +16,7 @@
     getActionBindings,
     makeStateBinding,
     updateReferencesInObject,
-  } from "builderStore/dataBinding"
+  } from "dataBinding"
   import { cloneDeep } from "lodash/fp"
 
   const flipDurationMs = 150
diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ChangeFormStep.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ChangeFormStep.svelte
index 5905d240dc..6e7c5874fc 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ChangeFormStep.svelte
+++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ChangeFormStep.svelte
@@ -1,7 +1,7 @@
 <script>
   import { Select, Label } from "@budibase/bbui"
-  import { currentAsset, store } from "builderStore"
-  import { getActionProviders } from "builderStore/dataBinding"
+  import { selectedScreen, componentStore } from "stores/builder"
+  import { getActionProviders } from "dataBinding"
   import { onMount } from "svelte"
   import DrawerBindableInput from "components/common/bindings/DrawerBindableInput.svelte"
 
@@ -10,8 +10,8 @@
   export let nested
 
   $: actionProviders = getActionProviders(
-    $currentAsset,
-    $store.selectedComponentId,
+    $selectedScreen,
+    $componentStore.selectedComponentId,
     "ChangeFormStep",
     { includeSelf: nested }
   )
diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ClearForm.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ClearForm.svelte
index 28343d6523..0b0fe0cfb7 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ClearForm.svelte
+++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ClearForm.svelte
@@ -1,14 +1,14 @@
 <script>
   import { Select, Label } from "@budibase/bbui"
-  import { currentAsset, store } from "builderStore"
-  import { getActionProviders } from "builderStore/dataBinding"
+  import { selectedScreen, componentStore } from "stores/builder"
+  import { getActionProviders } from "dataBinding"
 
   export let parameters
   export let nested
 
   $: actionProviders = getActionProviders(
-    $currentAsset,
-    $store.selectedComponentId,
+    $selectedScreen,
+    $componentStore.selectedComponentId,
     "ClearForm",
     { includeSelf: nested }
   )
diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ClearRowSelection.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ClearRowSelection.svelte
new file mode 100644
index 0000000000..ad44ae0f2a
--- /dev/null
+++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ClearRowSelection.svelte
@@ -0,0 +1,55 @@
+<script>
+  import { Label, Select, Body } from "@budibase/bbui"
+  import { findAllMatchingComponents } from "helpers/components"
+  import { selectedScreen } from "stores/builder"
+
+  export let parameters
+
+  $: tables = findAllMatchingComponents($selectedScreen?.props, component =>
+    component._component.endsWith("table")
+  ).map(table => ({
+    label: table._instanceName,
+    value: table._id,
+  }))
+  $: tableBlocks = findAllMatchingComponents(
+    $selectedScreen?.props,
+    component => component._component.endsWith("tableblock")
+  ).map(block => ({
+    label: block._instanceName,
+    value: `${block._id}-table`,
+  }))
+  $: componentOptions = tables.concat(tableBlocks)
+</script>
+
+<div class="root">
+  <Body size="S">Clear the row selection from the selected table.</Body>
+  <div class="params">
+    <Label small>Table</Label>
+    <Select bind:value={parameters.componentId} options={componentOptions} />
+  </div>
+</div>
+
+<style>
+  .root {
+    width: 100%;
+    max-width: 500px;
+    margin: 0 auto;
+    display: flex;
+    flex-direction: column;
+    justify-content: flex-start;
+    align-items: stretch;
+    gap: var(--spacing-xl);
+  }
+
+  .root :global(p) {
+    line-height: 1.5;
+  }
+
+  .params {
+    display: grid;
+    column-gap: var(--spacing-xs);
+    row-gap: var(--spacing-s);
+    grid-template-columns: 90px 1fr;
+    align-items: center;
+  }
+</style>
diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/DeleteRow.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/DeleteRow.svelte
index 1e79c51051..b8459ac0eb 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/DeleteRow.svelte
+++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/DeleteRow.svelte
@@ -1,6 +1,6 @@
 <script>
   import { Select, Label, Checkbox, Input, Body } from "@budibase/bbui"
-  import { tables, viewsV2 } from "stores/backend"
+  import { tables, viewsV2 } from "stores/builder"
   import DrawerBindableInput from "components/common/bindings/DrawerBindableInput.svelte"
 
   export let parameters
diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/DuplicateRow.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/DuplicateRow.svelte
index 94364367a8..5a6c79da85 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/DuplicateRow.svelte
+++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/DuplicateRow.svelte
@@ -1,8 +1,12 @@
 <script>
   import { Select, Label, Body, Checkbox, Input } from "@budibase/bbui"
-  import { store, currentAsset } from "builderStore"
-  import { tables, viewsV2 } from "stores/backend"
-  import { getSchemaForDatasourcePlus } from "builderStore/dataBinding"
+  import {
+    selectedScreen,
+    componentStore,
+    tables,
+    viewsV2,
+  } from "stores/builder"
+  import { getSchemaForDatasourcePlus } from "dataBinding"
   import SaveFields from "./SaveFields.svelte"
   import { getDatasourceLikeProviders } from "components/design/settings/controls/ButtonActionEditor/actions/utils"
 
@@ -11,8 +15,8 @@
   export let nested
 
   $: providerOptions = getDatasourceLikeProviders({
-    asset: $currentAsset,
-    componentId: $store.selectedComponentId,
+    asset: $selectedScreen,
+    componentId: $componentStore.selectedComponentId,
     nested,
   })
   $: schemaFields = getSchemaFields(parameters?.tableId)
diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ExecuteQuery.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ExecuteQuery.svelte
index a085d86507..263a1193da 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ExecuteQuery.svelte
+++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ExecuteQuery.svelte
@@ -1,6 +1,6 @@
 <script>
   import { Select, Layout, Input, Checkbox } from "@budibase/bbui"
-  import { datasources, integrations, queries } from "stores/backend"
+  import { datasources, integrations, queries } from "stores/builder"
   import BindingBuilder from "components/integration/QueryBindingBuilder.svelte"
   import IntegrationQueryEditor from "components/integration/index.svelte"
   import {
diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ExportData.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ExportData.svelte
index aa3bf2a36b..f6c8479b4e 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ExportData.svelte
+++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ExportData.svelte
@@ -1,15 +1,9 @@
 <script>
   import { Label, Select, Body, Multiselect } from "@budibase/bbui"
-  import {
-    findAllMatchingComponents,
-    findComponent,
-  } from "builderStore/componentUtils"
-  import { currentAsset } from "builderStore"
+  import { findAllMatchingComponents, findComponent } from "helpers/components"
+  import { selectedScreen } from "stores/builder"
   import { onMount } from "svelte"
-  import {
-    getDatasourceForProvider,
-    getSchemaForDatasource,
-  } from "builderStore/dataBinding"
+  import { getDatasourceForProvider, getSchemaForDatasource } from "dataBinding"
 
   export let parameters
 
@@ -24,14 +18,15 @@
     },
   ]
 
-  $: tables = findAllMatchingComponents($currentAsset?.props, component =>
+  $: tables = findAllMatchingComponents($selectedScreen?.props, component =>
     component._component.endsWith("table")
   ).map(table => ({
     label: table._instanceName,
     value: table._id,
   }))
-  $: tableBlocks = findAllMatchingComponents($currentAsset?.props, component =>
-    component._component.endsWith("tableblock")
+  $: tableBlocks = findAllMatchingComponents(
+    $selectedScreen?.props,
+    component => component._component.endsWith("tableblock")
   ).map(block => ({
     label: block._instanceName,
     value: `${block._id}-table`,
@@ -44,9 +39,9 @@
     if (tableId?.includes("-")) {
       tableId = tableId.split("-")[0]
     }
-    const selectedTable = findComponent($currentAsset?.props, tableId)
-    const datasource = getDatasourceForProvider($currentAsset, selectedTable)
-    const { schema } = getSchemaForDatasource($currentAsset, datasource)
+    const selectedTable = findComponent($selectedScreen?.props, tableId)
+    const datasource = getDatasourceForProvider($selectedScreen, selectedTable)
+    const { schema } = getSchemaForDatasource($selectedScreen, datasource)
     return Object.keys(schema || {})
   }
 
diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/FetchRow.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/FetchRow.svelte
index e01fcab4f3..4478f1bb16 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/FetchRow.svelte
+++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/FetchRow.svelte
@@ -1,6 +1,6 @@
 <script>
   import { Select, Label } from "@budibase/bbui"
-  import { tables, viewsV2 } from "stores/backend"
+  import { tables, viewsV2 } from "stores/builder"
   import DrawerBindableInput from "components/common/bindings/DrawerBindableInput.svelte"
 
   export let parameters
diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/NavigateTo.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/NavigateTo.svelte
index edbdc53083..86f454d6bc 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/NavigateTo.svelte
+++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/NavigateTo.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { store } from "builderStore"
+  import { screenStore } from "stores/builder"
   import { onMount } from "svelte"
   import { Label, Checkbox, Select } from "@budibase/bbui"
   import DrawerBindableInput from "components/common/bindings/DrawerBindableInput.svelte"
@@ -8,7 +8,7 @@
   export let parameters
   export let bindings = []
 
-  $: urlOptions = $store.screens
+  $: urlOptions = $screenStore.screens
     .map(screen => screen.routing?.route)
     .filter(x => x != null)
 
diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/OpenSidePanel.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/OpenSidePanel.svelte
index eb0c7b4db6..1eb1c1116b 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/OpenSidePanel.svelte
+++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/OpenSidePanel.svelte
@@ -1,7 +1,7 @@
 <script>
   import { Select, Label } from "@budibase/bbui"
-  import { selectedScreen } from "builderStore"
-  import { findAllMatchingComponents } from "builderStore/componentUtils"
+  import { selectedScreen } from "stores/builder"
+  import { findAllMatchingComponents } from "helpers/components"
 
   export let parameters
 
diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/RefreshDataProvider.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/RefreshDataProvider.svelte
index 06d1160993..3a56689f82 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/RefreshDataProvider.svelte
+++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/RefreshDataProvider.svelte
@@ -1,14 +1,14 @@
 <script>
   import { Select, Label } from "@budibase/bbui"
-  import { currentAsset, store } from "builderStore"
-  import { getActionProviders } from "builderStore/dataBinding"
+  import { selectedScreen, componentStore } from "stores/builder"
+  import { getActionProviders } from "dataBinding"
 
   export let parameters
   export let nested
 
   $: actionProviders = getActionProviders(
-    $currentAsset,
-    $store.selectedComponentId,
+    $selectedScreen,
+    $componentStore.selectedComponentId,
     "RefreshDatasource",
     { includeSelf: nested }
   )
diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/S3Upload.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/S3Upload.svelte
index 2e374f165f..11bd58a860 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/S3Upload.svelte
+++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/S3Upload.svelte
@@ -1,11 +1,11 @@
 <script>
   import { Select, Label } from "@budibase/bbui"
-  import { currentAsset } from "builderStore"
-  import { findAllMatchingComponents } from "builderStore/componentUtils"
+  import { selectedScreen } from "stores/builder"
+  import { findAllMatchingComponents } from "helpers/components"
 
   export let parameters
 
-  $: components = findAllMatchingComponents($currentAsset?.props, component =>
+  $: components = findAllMatchingComponents($selectedScreen?.props, component =>
     component._component.endsWith("s3upload")
   )
 </script>
diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/SaveRow.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/SaveRow.svelte
index 9f70272d78..a1fe773455 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/SaveRow.svelte
+++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/SaveRow.svelte
@@ -1,8 +1,12 @@
 <script>
   import { Select, Label, Body, Checkbox, Input } from "@budibase/bbui"
-  import { store, currentAsset } from "builderStore"
-  import { tables, viewsV2 } from "stores/backend"
-  import { getSchemaForDatasourcePlus } from "builderStore/dataBinding"
+  import {
+    selectedScreen,
+    componentStore,
+    tables,
+    viewsV2,
+  } from "stores/builder"
+  import { getSchemaForDatasourcePlus } from "dataBinding"
   import SaveFields from "./SaveFields.svelte"
   import { getDatasourceLikeProviders } from "components/design/settings/controls/ButtonActionEditor/actions/utils"
 
@@ -11,8 +15,8 @@
   export let nested
 
   $: providerOptions = getDatasourceLikeProviders({
-    asset: $currentAsset,
-    componentId: $store.selectedComponentId,
+    asset: $selectedScreen,
+    componentId: $componentStore.selectedComponentId,
     nested,
   })
   $: schemaFields = getSchemaFields(parameters?.tableId)
diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ScrollTo.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ScrollTo.svelte
index e73884495d..af16c4d197 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ScrollTo.svelte
+++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ScrollTo.svelte
@@ -1,21 +1,21 @@
 <script>
-  import { currentAsset, store } from "builderStore"
+  import { selectedScreen, componentStore } from "stores/builder"
   import { Label, Combobox, Select } from "@budibase/bbui"
-  import { getActionProviders, buildFormSchema } from "builderStore/dataBinding"
-  import { findComponent } from "builderStore/componentUtils"
+  import { getActionProviders, buildFormSchema } from "dataBinding"
+  import { findComponent } from "helpers/components"
 
   export let parameters
   export let nested
 
   $: formComponent = getFormComponent(
-    $currentAsset.props,
+    $selectedScreen.props,
     parameters.componentId
   )
   $: formSchema = buildFormSchema(formComponent)
   $: fieldOptions = Object.keys(formSchema || {})
   $: actionProviders = getActionProviders(
-    $currentAsset,
-    $store.selectedComponentId,
+    $selectedScreen,
+    $componentStore.selectedComponentId,
     "ScrollTo",
     { includeSelf: nested }
   )
diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/TriggerAutomation.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/TriggerAutomation.svelte
index 971a5ede44..0a52a693c3 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/TriggerAutomation.svelte
+++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/TriggerAutomation.svelte
@@ -1,6 +1,6 @@
 <script>
   import { Select, Label, Input, Checkbox, Icon, Body } from "@budibase/bbui"
-  import { automationStore } from "builderStore"
+  import { automationStore } from "stores/builder"
   import DrawerBindableInput from "components/common/bindings/DrawerBindableInput.svelte"
   import { TriggerStepID, ActionStepID } from "constants/backend/automations"
 
diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/UpdateFieldValue.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/UpdateFieldValue.svelte
index f1e21daf56..51aa6e8cfd 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/UpdateFieldValue.svelte
+++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/UpdateFieldValue.svelte
@@ -2,9 +2,9 @@
   import { Select, Label, Combobox } from "@budibase/bbui"
   import { onMount } from "svelte"
   import DrawerBindableInput from "components/common/bindings/DrawerBindableInput.svelte"
-  import { currentAsset, store } from "builderStore"
-  import { getActionProviders, buildFormSchema } from "builderStore/dataBinding"
-  import { findComponent } from "builderStore/componentUtils"
+  import { selectedScreen, componentStore } from "stores/builder"
+  import { getActionProviders, buildFormSchema } from "dataBinding"
+  import { findComponent } from "helpers/components"
 
   export let parameters
   export let bindings = []
@@ -22,14 +22,14 @@
   ]
 
   $: formComponent = getFormComponent(
-    $currentAsset.props,
+    $selectedScreen.props,
     parameters.componentId
   )
   $: formSchema = buildFormSchema(formComponent)
   $: fieldOptions = Object.keys(formSchema || {})
   $: actionProviders = getActionProviders(
-    $currentAsset,
-    $store.selectedComponentId,
+    $selectedScreen,
+    $componentStore.selectedComponentId,
     "ValidateForm",
     { includeSelf: nested }
   )
diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/UpdateState.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/UpdateState.svelte
index 6c2867d4bf..16a77692ae 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/UpdateState.svelte
+++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/UpdateState.svelte
@@ -2,7 +2,7 @@
   import { Select, Label, Combobox, Checkbox, Body } from "@budibase/bbui"
   import { onMount } from "svelte"
   import DrawerBindableInput from "components/common/bindings/DrawerBindableInput.svelte"
-  import { getAllStateVariables } from "builderStore/dataBinding"
+  import { getAllStateVariables } from "dataBinding"
 
   export let parameters
   export let bindings = []
diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ValidateForm.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ValidateForm.svelte
index 9b27550561..f44b68d4c6 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ValidateForm.svelte
+++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ValidateForm.svelte
@@ -1,14 +1,14 @@
 <script>
   import { Select, Label } from "@budibase/bbui"
-  import { currentAsset, store } from "builderStore"
-  import { getActionProviders } from "builderStore/dataBinding"
+  import { selectedScreen, componentStore } from "stores/builder"
+  import { getActionProviders } from "dataBinding"
 
   export let parameters
   export let nested
 
   $: actionProviders = getActionProviders(
-    $currentAsset,
-    $store.selectedComponentId,
+    $selectedScreen,
+    $componentStore.selectedComponentId,
     "ValidateForm",
     { includeSelf: nested }
   )
diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/index.js b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/index.js
index 3b3ee6fd00..eb354d6557 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/index.js
+++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/index.js
@@ -21,3 +21,4 @@ export { default as ShowNotification } from "./ShowNotification.svelte"
 export { default as PromptUser } from "./PromptUser.svelte"
 export { default as OpenSidePanel } from "./OpenSidePanel.svelte"
 export { default as CloseSidePanel } from "./CloseSidePanel.svelte"
+export { default as ClearRowSelection } from "./ClearRowSelection.svelte"
diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/utils.js b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/utils.js
index bdcd3a7838..0bc90e39c1 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/utils.js
+++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/utils.js
@@ -1,4 +1,4 @@
-import { getComponentContexts } from "builderStore/dataBinding"
+import { getComponentContexts } from "dataBinding"
 import { capitalise } from "helpers"
 
 // Generates bindings for all components that provider "datasource like"
diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/index.js b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/index.js
index ea6cc4ed37..e8da0f74df 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/index.js
+++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/index.js
@@ -1,6 +1,6 @@
 import * as ActionComponents from "./actions"
 import { get } from "svelte/store"
-import { store } from "builderStore"
+import { appStore } from "stores/builder"
 // @ts-ignore
 import ActionDefinitions from "./manifest.json"
 
@@ -18,7 +18,7 @@ export const getAvailableActions = (getAllActions = false) => {
       if (getAllActions || !action.dependsOnFeature) {
         return true
       }
-      return get(store).clientFeatures?.[action.dependsOnFeature] === true
+      return get(appStore).clientFeatures?.[action.dependsOnFeature] === true
     })
     .map(action => {
       // Then enrich the actions with real components
diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/manifest.json b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/manifest.json
index 6ed545f541..9391baf3dc 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/manifest.json
+++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/manifest.json
@@ -156,6 +156,11 @@
       "type": "application",
       "component": "CloseSidePanel",
       "dependsOnFeature": "sidePanel"
+    },
+    {
+      "name": "Clear Row Selection",
+      "type": "data",
+      "component": "ClearRowSelection"
     }
   ]
 }
diff --git a/packages/builder/src/components/design/settings/controls/ButtonConfiguration/ButtonConfiguration.svelte b/packages/builder/src/components/design/settings/controls/ButtonConfiguration/ButtonConfiguration.svelte
index fade2db761..186392bd90 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonConfiguration/ButtonConfiguration.svelte
+++ b/packages/builder/src/components/design/settings/controls/ButtonConfiguration/ButtonConfiguration.svelte
@@ -2,9 +2,9 @@
   import DraggableList from "../DraggableList/DraggableList.svelte"
   import ButtonSetting from "./ButtonSetting.svelte"
   import { createEventDispatcher } from "svelte"
-  import { store } from "builderStore"
   import { Helpers } from "@budibase/bbui"
-  import { getEventContextBindings } from "builderStore/dataBinding"
+  import { componentStore } from "stores/builder"
+  import { getEventContextBindings } from "dataBinding"
   import { cloneDeep, isEqual } from "lodash/fp"
 
   export let componentInstance
@@ -67,7 +67,7 @@
   }
 
   const buildPseudoInstance = cfg => {
-    return store.actions.components.createInstance(
+    return componentStore.createInstance(
       `@budibase/standard-components/button`,
       {
         _instanceName: Helpers.uuid(),
diff --git a/packages/builder/src/components/design/settings/controls/ButtonConfiguration/ButtonSetting.svelte b/packages/builder/src/components/design/settings/controls/ButtonConfiguration/ButtonSetting.svelte
index 77c4458d01..2387fda683 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonConfiguration/ButtonSetting.svelte
+++ b/packages/builder/src/components/design/settings/controls/ButtonConfiguration/ButtonSetting.svelte
@@ -1,7 +1,7 @@
 <script>
   import EditComponentPopover from "../EditComponentPopover.svelte"
   import { Icon } from "@budibase/bbui"
-  import { runtimeToReadableBinding } from "builderStore/dataBinding"
+  import { runtimeToReadableBinding } from "dataBinding"
   import { isJSBinding } from "@budibase/string-templates"
 
   export let item
diff --git a/packages/builder/src/components/design/settings/controls/ColorPicker.svelte b/packages/builder/src/components/design/settings/controls/ColorPicker.svelte
index 5f9fcaf21a..e4e27a2fe5 100644
--- a/packages/builder/src/components/design/settings/controls/ColorPicker.svelte
+++ b/packages/builder/src/components/design/settings/controls/ColorPicker.svelte
@@ -1,8 +1,8 @@
 <script>
   import { ColorPicker } from "@budibase/bbui"
-  import { store } from "builderStore"
+  import { themeStore } from "stores/builder"
 
   export let value
 </script>
 
-<ColorPicker {value} on:change spectrumTheme={$store.theme} />
+<ColorPicker {value} on:change spectrumTheme={$themeStore.theme} />
diff --git a/packages/builder/src/components/design/settings/controls/ColumnEditor/CellDrawer.svelte b/packages/builder/src/components/design/settings/controls/ColumnEditor/CellDrawer.svelte
index 9e53f7f1cf..f5167e3657 100644
--- a/packages/builder/src/components/design/settings/controls/ColumnEditor/CellDrawer.svelte
+++ b/packages/builder/src/components/design/settings/controls/ColumnEditor/CellDrawer.svelte
@@ -7,7 +7,7 @@
     Layout,
     Label,
   } from "@budibase/bbui"
-  import { store } from "builderStore"
+  import { themeStore } from "stores/builder"
   import DrawerBindableInput from "components/common/bindings/DrawerBindableInput.svelte"
 
   export let column
@@ -46,7 +46,7 @@
         <ColorPicker
           value={column.background}
           on:change={e => (column.background = e.detail)}
-          spectrumTheme={$store.theme}
+          spectrumTheme={$themeStore.theme}
         />
       </Layout>
       <Layout noPadding gap="XS">
@@ -54,7 +54,7 @@
         <ColorPicker
           value={column.color}
           on:change={e => (column.color = e.detail)}
-          spectrumTheme={$store.theme}
+          spectrumTheme={$themeStore.theme}
         />
       </Layout>
     </Layout>
diff --git a/packages/builder/src/components/design/settings/controls/ColumnEditor/ColumnEditor.svelte b/packages/builder/src/components/design/settings/controls/ColumnEditor/ColumnEditor.svelte
index cebb429ac4..2b9fa573c2 100644
--- a/packages/builder/src/components/design/settings/controls/ColumnEditor/ColumnEditor.svelte
+++ b/packages/builder/src/components/design/settings/controls/ColumnEditor/ColumnEditor.svelte
@@ -3,11 +3,8 @@
   import { createEventDispatcher } from "svelte"
   import ColumnDrawer from "./ColumnDrawer.svelte"
   import { cloneDeep } from "lodash/fp"
-  import {
-    getDatasourceForProvider,
-    getSchemaForDatasource,
-  } from "builderStore/dataBinding"
-  import { currentAsset } from "builderStore"
+  import { getDatasourceForProvider, getSchemaForDatasource } from "dataBinding"
+  import { selectedScreen } from "stores/builder"
   import { getFields } from "helpers/searchFields"
 
   export let componentInstance
@@ -21,8 +18,8 @@
   let boundValue
 
   $: text = getText(value)
-  $: datasource = getDatasourceForProvider($currentAsset, componentInstance)
-  $: schema = getSchema($currentAsset, datasource)
+  $: datasource = getDatasourceForProvider($selectedScreen, componentInstance)
+  $: schema = getSchema($selectedScreen, datasource)
   $: options = allowCellEditing
     ? Object.keys(schema || {})
     : enrichedSchemaFields?.map(field => field.name)
diff --git a/packages/builder/src/components/design/settings/controls/DataProviderSelect.svelte b/packages/builder/src/components/design/settings/controls/DataProviderSelect.svelte
index 9fd220e798..2e74cac0f4 100644
--- a/packages/builder/src/components/design/settings/controls/DataProviderSelect.svelte
+++ b/packages/builder/src/components/design/settings/controls/DataProviderSelect.svelte
@@ -1,14 +1,14 @@
 <script>
   import { Select } from "@budibase/bbui"
   import { makePropSafe } from "@budibase/string-templates"
-  import { currentAsset } from "builderStore"
-  import { findAllMatchingComponents } from "builderStore/componentUtils"
+  import { selectedScreen } from "stores/builder"
+  import { findAllMatchingComponents } from "helpers/components"
 
   export let value
 
   const getValue = component => `{{ literal ${makePropSafe(component._id)} }}`
 
-  $: providers = findAllMatchingComponents($currentAsset?.props, c =>
+  $: providers = findAllMatchingComponents($selectedScreen?.props, c =>
     c._component?.endsWith("/dataprovider")
   )
 </script>
diff --git a/packages/builder/src/components/design/settings/controls/DataSourceSelect/DataSourceSelect.svelte b/packages/builder/src/components/design/settings/controls/DataSourceSelect/DataSourceSelect.svelte
index 3eb69e9a3b..14cbc973a1 100644
--- a/packages/builder/src/components/design/settings/controls/DataSourceSelect/DataSourceSelect.svelte
+++ b/packages/builder/src/components/design/settings/controls/DataSourceSelect/DataSourceSelect.svelte
@@ -2,7 +2,7 @@
   import {
     readableToRuntimeBinding,
     runtimeToReadableBinding,
-  } from "builderStore/dataBinding"
+  } from "dataBinding"
   import {
     Button,
     Popover,
@@ -17,19 +17,20 @@
     notifications,
   } from "@budibase/bbui"
   import { createEventDispatcher } from "svelte"
-  import { store, currentAsset } from "builderStore"
   import {
     tables as tablesStore,
     queries as queriesStore,
     viewsV2 as viewsV2Store,
     views as viewsStore,
+    selectedScreen,
+    componentStore,
     datasources,
     integrations,
-  } from "stores/backend"
+  } from "stores/builder"
   import BindingBuilder from "components/integration/QueryBindingBuilder.svelte"
   import IntegrationQueryEditor from "components/integration/index.svelte"
   import { makePropSafe as safe } from "@budibase/string-templates"
-  import { findAllComponents } from "builderStore/componentUtils"
+  import { findAllComponents } from "helpers/components"
   import ClientBindingPanel from "components/common/bindings/ClientBindingPanel.svelte"
   import DataSourceCategory from "components/design/settings/controls/DataSourceSelect/DataSourceCategory.svelte"
   import { API } from "api"
@@ -75,11 +76,11 @@
       ...query,
       type: "query",
     }))
-  $: dataProviders = findAllComponents($currentAsset.props)
+  $: dataProviders = findAllComponents($selectedScreen.props)
     .filter(component => {
       return (
         component._component?.endsWith("/dataprovider") &&
-        component._id !== $store.selectedComponentId
+        component._id !== $componentStore.selectedComponentId
       )
     })
     .map(provider => ({
diff --git a/packages/builder/src/components/design/settings/controls/EditComponentPopover.svelte b/packages/builder/src/components/design/settings/controls/EditComponentPopover.svelte
index 04bb925873..4e645fe343 100644
--- a/packages/builder/src/components/design/settings/controls/EditComponentPopover.svelte
+++ b/packages/builder/src/components/design/settings/controls/EditComponentPopover.svelte
@@ -1,9 +1,9 @@
 <script>
   import { Icon, Popover, Layout } from "@budibase/bbui"
-  import { store } from "builderStore"
+  import { componentStore } from "stores/builder"
   import { cloneDeep } from "lodash/fp"
   import { createEventDispatcher, getContext } from "svelte"
-  import ComponentSettingsSection from "../../../../pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/ComponentSettingsSection.svelte"
+  import ComponentSettingsSection from "pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/ComponentSettingsSection.svelte"
 
   export let anchor
   export let componentInstance
@@ -30,9 +30,7 @@
     open = true
   }
 
-  $: componentDef = store.actions.components.getDefinition(
-    componentInstance._component
-  )
+  $: componentDef = componentStore.getDefinition(componentInstance._component)
   $: parsedComponentDef = processComponentDefinitionSettings(componentDef)
 
   const processComponentDefinitionSettings = componentDef => {
@@ -51,10 +49,7 @@
   const updateSetting = async (setting, value) => {
     const nestedComponentInstance = cloneDeep(componentInstance)
 
-    const patchFn = store.actions.components.updateComponentSetting(
-      setting.key,
-      value
-    )
+    const patchFn = componentStore.updateComponentSetting(setting.key, value)
     patchFn(nestedComponentInstance)
 
     dispatch("change", nestedComponentInstance)
diff --git a/packages/builder/src/components/design/settings/controls/FieldConfiguration/FieldConfiguration.svelte b/packages/builder/src/components/design/settings/controls/FieldConfiguration/FieldConfiguration.svelte
index e864a4c2aa..4d1a4a2f69 100644
--- a/packages/builder/src/components/design/settings/controls/FieldConfiguration/FieldConfiguration.svelte
+++ b/packages/builder/src/components/design/settings/controls/FieldConfiguration/FieldConfiguration.svelte
@@ -6,8 +6,8 @@
     getSchemaForDatasource,
     getBindableProperties,
     getComponentBindableProperties,
-  } from "builderStore/dataBinding"
-  import { currentAsset, store, selectedScreen } from "builderStore"
+  } from "dataBinding"
+  import { selectedScreen, componentStore } from "stores/builder"
   import DraggableList from "../DraggableList/DraggableList.svelte"
   import { createEventDispatcher } from "svelte"
   import FieldSetting from "./FieldSetting.svelte"
@@ -44,7 +44,7 @@
 
   $: datasource =
     componentInstance.dataSource ||
-    getDatasourceForProvider($currentAsset, componentInstance)
+    getDatasourceForProvider($selectedScreen, componentInstance)
 
   $: resourceId = datasource?.resourceId || datasource?.tableId
 
@@ -53,7 +53,7 @@
   }
 
   const updateState = value => {
-    schema = getSchema($currentAsset, datasource)
+    schema = getSchema($selectedScreen, datasource)
     options = Object.keys(schema || {})
     sanitisedValue = getValidColumns(convertOldFieldFormat(value), options)
     updateSanitsedFields(sanitisedValue)
@@ -123,7 +123,7 @@
     }
     instance._component = `@budibase/standard-components/${type}`
 
-    const pseudoComponentInstance = store.actions.components.createInstance(
+    const pseudoComponentInstance = componentStore.createInstance(
       instance._component,
       {
         _instanceName: instance.field,
diff --git a/packages/builder/src/components/design/settings/controls/FieldConfiguration/FieldSetting.svelte b/packages/builder/src/components/design/settings/controls/FieldConfiguration/FieldSetting.svelte
index 8c40c455c8..27590a9858 100644
--- a/packages/builder/src/components/design/settings/controls/FieldConfiguration/FieldSetting.svelte
+++ b/packages/builder/src/components/design/settings/controls/FieldConfiguration/FieldSetting.svelte
@@ -3,9 +3,9 @@
   import { Toggle, Icon } from "@budibase/bbui"
   import { createEventDispatcher } from "svelte"
   import { cloneDeep } from "lodash/fp"
-  import { store } from "builderStore"
-  import { runtimeToReadableBinding } from "builderStore/dataBinding"
+  import { runtimeToReadableBinding } from "dataBinding"
   import { isJSBinding } from "@budibase/string-templates"
+  import { componentStore } from "stores/builder"
 
   export let item
   export let componentBindings
@@ -37,7 +37,7 @@
   }
 
   $: readableText = getReadableText(item)
-  $: componentDef = store.actions.components.getDefinition(item._component)
+  $: componentDef = componentStore.getDefinition(item._component)
 </script>
 
 <div class="list-item-body">
diff --git a/packages/builder/src/components/design/settings/controls/FieldSelect.svelte b/packages/builder/src/components/design/settings/controls/FieldSelect.svelte
index 7d1741df17..e50a0e8030 100644
--- a/packages/builder/src/components/design/settings/controls/FieldSelect.svelte
+++ b/packages/builder/src/components/design/settings/controls/FieldSelect.svelte
@@ -1,10 +1,7 @@
 <script>
   import { Select } from "@budibase/bbui"
-  import {
-    getDatasourceForProvider,
-    getSchemaForDatasource,
-  } from "builderStore/dataBinding"
-  import { currentAsset } from "builderStore"
+  import { getDatasourceForProvider, getSchemaForDatasource } from "dataBinding"
+  import { selectedScreen } from "stores/builder"
   import { createEventDispatcher } from "svelte"
 
   export let componentInstance = {}
@@ -12,8 +9,8 @@
   export let placeholder
 
   const dispatch = createEventDispatcher()
-  $: datasource = getDatasourceForProvider($currentAsset, componentInstance)
-  $: schema = getSchemaForDatasource($currentAsset, datasource).schema
+  $: datasource = getDatasourceForProvider($selectedScreen, componentInstance)
+  $: schema = getSchemaForDatasource($selectedScreen, datasource).schema
   $: options = Object.keys(schema || {})
   $: boundValue = getValidValue(value, options)
 
diff --git a/packages/builder/src/components/design/settings/controls/FilterEditor/FilterEditor.svelte b/packages/builder/src/components/design/settings/controls/FilterEditor/FilterEditor.svelte
index 454fe0e6cf..0f1f08d823 100644
--- a/packages/builder/src/components/design/settings/controls/FilterEditor/FilterEditor.svelte
+++ b/packages/builder/src/components/design/settings/controls/FilterEditor/FilterEditor.svelte
@@ -1,12 +1,9 @@
 <script>
   import { notifications, ActionButton, Button, Drawer } from "@budibase/bbui"
   import { createEventDispatcher } from "svelte"
-  import {
-    getDatasourceForProvider,
-    getSchemaForDatasource,
-  } from "builderStore/dataBinding"
+  import { getDatasourceForProvider, getSchemaForDatasource } from "dataBinding"
   import FilterDrawer from "./FilterDrawer.svelte"
-  import { currentAsset } from "builderStore"
+  import { selectedScreen } from "stores/builder"
 
   const dispatch = createEventDispatcher()
 
@@ -18,8 +15,8 @@
   let drawer
 
   $: tempValue = value
-  $: datasource = getDatasourceForProvider($currentAsset, componentInstance)
-  $: dsSchema = getSchemaForDatasource($currentAsset, datasource)?.schema
+  $: datasource = getDatasourceForProvider($selectedScreen, componentInstance)
+  $: dsSchema = getSchemaForDatasource($selectedScreen, datasource)?.schema
   $: schemaFields = Object.values(schema || dsSchema || {})
   $: text = getText(value?.filter(filter => filter.field))
 
diff --git a/packages/builder/src/components/design/settings/controls/FormFieldSelect.svelte b/packages/builder/src/components/design/settings/controls/FormFieldSelect.svelte
index 7ed81cf3f2..b418cb3111 100644
--- a/packages/builder/src/components/design/settings/controls/FormFieldSelect.svelte
+++ b/packages/builder/src/components/design/settings/controls/FormFieldSelect.svelte
@@ -1,6 +1,6 @@
 <script>
   import { Combobox } from "@budibase/bbui"
-  import { currentAsset } from "builderStore"
+  import { selectedScreen } from "stores/builder"
   import { getComponentFieldOptions } from "helpers/formFields"
 
   export let componentInstance
@@ -8,7 +8,7 @@
   export let type
 
   $: options = getComponentFieldOptions(
-    $currentAsset?.props,
+    $selectedScreen?.props,
     componentInstance?._id,
     type
   )
diff --git a/packages/builder/src/components/design/settings/controls/FormStepConfiguration.svelte b/packages/builder/src/components/design/settings/controls/FormStepConfiguration.svelte
index 2941821dec..14b758716a 100644
--- a/packages/builder/src/components/design/settings/controls/FormStepConfiguration.svelte
+++ b/packages/builder/src/components/design/settings/controls/FormStepConfiguration.svelte
@@ -1,8 +1,8 @@
 <script>
   import { createEventDispatcher, setContext } from "svelte"
-  import ComponentSettingsSection from "../../../../pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/ComponentSettingsSection.svelte"
-  import { getDatasourceForProvider } from "builderStore/dataBinding"
-  import { currentAsset, store } from "builderStore"
+  import ComponentSettingsSection from "pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/ComponentSettingsSection.svelte"
+  import { getDatasourceForProvider } from "dataBinding"
+  import { selectedScreen, componentStore, previewStore } from "stores/builder"
   import { Helpers } from "@budibase/bbui"
   import { derived, writable } from "svelte/store"
   import { Utils } from "@budibase/frontend-core"
@@ -36,7 +36,7 @@
 
   $: stepCount = cachedValue?.length || 0
   $: updateStore(stepCount)
-  $: dataSource = getDatasourceForProvider($currentAsset, cachedInstance)
+  $: dataSource = getDatasourceForProvider($selectedScreen, cachedInstance)
   $: emitCurrentStep($currentStep)
   $: stepLabel = getStepLabel($multiStepStore)
   $: stepDef = getDefinition(stepLabel)
@@ -62,7 +62,7 @@
   }
 
   const getDefinition = stepLabel => {
-    let def = cloneDeep(store.actions.components.getDefinition(componentType))
+    let def = cloneDeep(componentStore.getDefinition(componentType))
     def.settings.find(x => x.key === "steps").label = stepLabel
     return def
   }
@@ -85,7 +85,7 @@
   }
 
   const emitCurrentStep = step => {
-    store.actions.preview.sendEvent("builder-meta", {
+    previewStore.sendEvent("builder-meta", {
       componentId: componentInstance._id,
       step: step,
     })
diff --git a/packages/builder/src/components/design/settings/controls/GridColumnConfiguration/FieldSetting.svelte b/packages/builder/src/components/design/settings/controls/GridColumnConfiguration/FieldSetting.svelte
index e6007b4dc4..3f2afbfe8d 100644
--- a/packages/builder/src/components/design/settings/controls/GridColumnConfiguration/FieldSetting.svelte
+++ b/packages/builder/src/components/design/settings/controls/GridColumnConfiguration/FieldSetting.svelte
@@ -4,7 +4,7 @@
   import { Toggle, Icon } from "@budibase/bbui"
   import { createEventDispatcher } from "svelte"
   import { cloneDeep } from "lodash/fp"
-  import { store } from "builderStore"
+  import { componentStore } from "stores/builder"
 
   export let item
   export let anchor
@@ -29,7 +29,7 @@
     const component = `@budibase/standard-components/${
       FieldTypeToComponentMap[item.columnType]
     }`
-    return store.actions.components.getDefinition(component).icon
+    return componentStore.getDefinition(component).icon
   }
 </script>
 
diff --git a/packages/builder/src/components/design/settings/controls/GridColumnConfiguration/GridColumnConfiguration.svelte b/packages/builder/src/components/design/settings/controls/GridColumnConfiguration/GridColumnConfiguration.svelte
index 4286328367..439bf5e261 100644
--- a/packages/builder/src/components/design/settings/controls/GridColumnConfiguration/GridColumnConfiguration.svelte
+++ b/packages/builder/src/components/design/settings/controls/GridColumnConfiguration/GridColumnConfiguration.svelte
@@ -1,9 +1,6 @@
 <script>
-  import {
-    getDatasourceForProvider,
-    getSchemaForDatasource,
-  } from "builderStore/dataBinding"
-  import { currentAsset, store } from "builderStore"
+  import { getDatasourceForProvider, getSchemaForDatasource } from "dataBinding"
+  import { selectedScreen, componentStore } from "stores/builder"
   import DraggableList from "../DraggableList/DraggableList.svelte"
   import { createEventDispatcher } from "svelte"
   import FieldSetting from "./FieldSetting.svelte"
@@ -32,18 +29,18 @@
     return schema
   }
 
-  $: datasource = getDatasourceForProvider($currentAsset, componentInstance)
+  $: datasource = getDatasourceForProvider($selectedScreen, componentInstance)
   $: primaryDisplayColumnName = getSchemaForDatasource(
-    $currentAsset,
+    $selectedScreen,
     datasource
   )?.table?.primaryDisplay
-  $: schema = getSchema(currentAsset, datasource)
+  $: schema = getSchema(selectedScreen, datasource)
   $: columns = getColumns({
     columns: value,
     schema,
     primaryDisplayColumnName,
     onChange: handleChange,
-    createComponent: store.actions.components.createInstance,
+    createComponent: componentStore.createInstance,
   })
 </script>
 
diff --git a/packages/builder/src/components/design/settings/controls/GridColumnConfiguration/PrimaryColumnFieldSetting.svelte b/packages/builder/src/components/design/settings/controls/GridColumnConfiguration/PrimaryColumnFieldSetting.svelte
index 1cb29ac6e7..57423e8667 100644
--- a/packages/builder/src/components/design/settings/controls/GridColumnConfiguration/PrimaryColumnFieldSetting.svelte
+++ b/packages/builder/src/components/design/settings/controls/GridColumnConfiguration/PrimaryColumnFieldSetting.svelte
@@ -4,7 +4,7 @@
   import { setContext } from "svelte"
   import { writable } from "svelte/store"
   import { FieldTypeToComponentMap } from "../FieldConfiguration/utils"
-  import { store } from "builderStore"
+  import { componentStore } from "stores/builder"
 
   export let item
   export let anchor
@@ -35,7 +35,7 @@
     const component = `@budibase/standard-components/${
       FieldTypeToComponentMap[item.columnType]
     }`
-    return store.actions.components.getDefinition(component)?.icon
+    return componentStore.getDefinition(component)?.icon
   }
 
   $: icon = getIcon(item)
diff --git a/packages/builder/src/components/design/settings/controls/LayoutSelect.svelte b/packages/builder/src/components/design/settings/controls/LayoutSelect.svelte
index eed01c0d94..a7966eb671 100644
--- a/packages/builder/src/components/design/settings/controls/LayoutSelect.svelte
+++ b/packages/builder/src/components/design/settings/controls/LayoutSelect.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { store } from "builderStore"
+  import { layoutStore } from "stores/builder"
   import { Select } from "@budibase/bbui"
 
   export let value
@@ -8,7 +8,7 @@
 <Select
   bind:value
   on:change
-  options={$store.layouts}
+  options={$layoutStore.layouts}
   getOptionLabel={layout => layout.name}
   getOptionValue={layout => layout._id}
 />
diff --git a/packages/builder/src/components/design/settings/controls/MultiFieldSelect.svelte b/packages/builder/src/components/design/settings/controls/MultiFieldSelect.svelte
index 485fde64fa..d0224fb1db 100644
--- a/packages/builder/src/components/design/settings/controls/MultiFieldSelect.svelte
+++ b/packages/builder/src/components/design/settings/controls/MultiFieldSelect.svelte
@@ -1,10 +1,7 @@
 <script>
   import { Multiselect } from "@budibase/bbui"
-  import {
-    getDatasourceForProvider,
-    getSchemaForDatasource,
-  } from "builderStore/dataBinding"
-  import { currentAsset } from "builderStore"
+  import { getDatasourceForProvider, getSchemaForDatasource } from "dataBinding"
+  import { selectedScreen } from "stores/builder"
   import { createEventDispatcher } from "svelte"
 
   export let componentInstance = {}
@@ -12,8 +9,8 @@
   export let placeholder
 
   const dispatch = createEventDispatcher()
-  $: datasource = getDatasourceForProvider($currentAsset, componentInstance)
-  $: schema = getSchemaForDatasource($currentAsset, datasource).schema
+  $: datasource = getDatasourceForProvider($selectedScreen, componentInstance)
+  $: schema = getSchemaForDatasource($selectedScreen, datasource).schema
   $: options = Object.keys(schema || {})
   $: boundValue = getValidOptions(value, options)
 
diff --git a/packages/builder/src/components/design/settings/controls/PropertyControl.svelte b/packages/builder/src/components/design/settings/controls/PropertyControl.svelte
index 0a95fbd422..2ecf3b6f96 100644
--- a/packages/builder/src/components/design/settings/controls/PropertyControl.svelte
+++ b/packages/builder/src/components/design/settings/controls/PropertyControl.svelte
@@ -3,8 +3,8 @@
   import {
     readableToRuntimeBinding,
     runtimeToReadableBinding,
-  } from "builderStore/dataBinding"
-  import { store } from "builderStore"
+  } from "dataBinding"
+  import { builderStore } from "stores/builder"
   import { onDestroy } from "svelte"
 
   export let label = ""
@@ -73,7 +73,7 @@
 
   onDestroy(() => {
     if (highlighted) {
-      store.actions.settings.highlight(null)
+      builderStore.highlightSetting(null)
     }
   })
 </script>
diff --git a/packages/builder/src/components/design/settings/controls/RelationshipFilterEditor.svelte b/packages/builder/src/components/design/settings/controls/RelationshipFilterEditor.svelte
index 0eb93732c3..43f158bef3 100644
--- a/packages/builder/src/components/design/settings/controls/RelationshipFilterEditor.svelte
+++ b/packages/builder/src/components/design/settings/controls/RelationshipFilterEditor.svelte
@@ -1,14 +1,10 @@
 <script>
-  import { currentAsset, store } from "builderStore"
   import {
     findClosestMatchingComponent,
     findComponent,
-  } from "builderStore/componentUtils"
-  import {
-    getDatasourceForProvider,
-    getSchemaForDatasource,
-  } from "builderStore/dataBinding"
-  import { tables } from "stores/backend"
+  } from "helpers/components"
+  import { getDatasourceForProvider, getSchemaForDatasource } from "dataBinding"
+  import { tables, selectedScreen, componentStore } from "stores/builder"
   import FilterEditor from "./FilterEditor/FilterEditor.svelte"
 
   export let componentInstance
@@ -18,29 +14,29 @@
 
   // Find the closest parent form
   $: form = findClosestMatchingComponent(
-    $currentAsset.props,
+    $selectedScreen.props,
     componentInstance._id,
     component => component._component.endsWith("/form")
   )
 
-  const resolveDatasource = (currentAsset, componentInstance, form) => {
-    if (!form && componentInstance._id != $store.selectedComponentId) {
+  const resolveDatasource = (selectedScreen, componentInstance, form) => {
+    if (!form && componentInstance._id != $componentStore.selectedComponentId) {
       const block = findComponent(
-        currentAsset.props,
-        $store.selectedComponentId
+        selectedScreen.props,
+        $componentStore.selectedComponentId
       )
-      const def = store.actions.components.getDefinition(block._component)
+      const def = componentStore.getDefinition(block._component)
       return def?.block === true
-        ? getDatasourceForProvider(currentAsset, block)
+        ? getDatasourceForProvider(selectedScreen, block)
         : {}
     } else {
-      return getDatasourceForProvider(currentAsset, form)
+      return getDatasourceForProvider(selectedScreen, form)
     }
   }
 
   // Get that form's schema
-  $: datasource = resolveDatasource($currentAsset, componentInstance, form)
-  $: formSchema = getSchemaForDatasource($currentAsset, datasource)?.schema
+  $: datasource = resolveDatasource($selectedScreen, componentInstance, form)
+  $: formSchema = getSchemaForDatasource($selectedScreen, datasource)?.schema
 
   // Get the schema for the relationship field that this picker is using
   $: columnSchema = formSchema?.[column]
diff --git a/packages/builder/src/components/design/settings/controls/ResetFieldsButton.svelte b/packages/builder/src/components/design/settings/controls/ResetFieldsButton.svelte
index 16aaf91ce2..b716c04619 100644
--- a/packages/builder/src/components/design/settings/controls/ResetFieldsButton.svelte
+++ b/packages/builder/src/components/design/settings/controls/ResetFieldsButton.svelte
@@ -1,8 +1,8 @@
 <script>
   import { ActionButton, notifications } from "@budibase/bbui"
-  import { currentAsset, store } from "builderStore"
-  import { findClosestMatchingComponent } from "builderStore/componentUtils"
-  import { makeDatasourceFormComponents } from "builderStore/store/screenTemplates/utils/commonComponents"
+  import { selectedScreen, componentStore } from "stores/builder"
+  import { findClosestMatchingComponent } from "helpers/components"
+  import { makeDatasourceFormComponents } from "templates/commonComponents"
   import ConfirmDialog from "components/common/ConfirmDialog.svelte"
 
   export let componentInstance
@@ -11,14 +11,14 @@
 
   const resetFormFields = async () => {
     const form = findClosestMatchingComponent(
-      $currentAsset?.props,
+      $selectedScreen?.props,
       componentInstance._id,
       component => component._component.endsWith("/form")
     )
     const dataSource = form?.dataSource
     const fields = makeDatasourceFormComponents(dataSource)
     try {
-      await store.actions.components.updateSetting(
+      await componentStore.updateSetting(
         "_children",
         fields.map(field => field.json())
       )
diff --git a/packages/builder/src/components/design/settings/controls/RoleSelect.svelte b/packages/builder/src/components/design/settings/controls/RoleSelect.svelte
index d1e326219b..5b5daac183 100644
--- a/packages/builder/src/components/design/settings/controls/RoleSelect.svelte
+++ b/packages/builder/src/components/design/settings/controls/RoleSelect.svelte
@@ -1,6 +1,6 @@
 <script>
   import { Select } from "@budibase/bbui"
-  import { roles } from "stores/backend"
+  import { roles } from "stores/builder"
   import { RoleUtils } from "@budibase/frontend-core"
 
   export let value
diff --git a/packages/builder/src/components/design/settings/controls/S3DataSourceSelect.svelte b/packages/builder/src/components/design/settings/controls/S3DataSourceSelect.svelte
index 05b4058aa3..d5d42f1514 100644
--- a/packages/builder/src/components/design/settings/controls/S3DataSourceSelect.svelte
+++ b/packages/builder/src/components/design/settings/controls/S3DataSourceSelect.svelte
@@ -1,6 +1,6 @@
 <script>
   import { Select } from "@budibase/bbui"
-  import { datasources } from "stores/backend"
+  import { datasources } from "stores/builder"
 
   export let value = null
 
diff --git a/packages/builder/src/components/design/settings/controls/SearchFieldSelect.svelte b/packages/builder/src/components/design/settings/controls/SearchFieldSelect.svelte
index 41906d3ba1..7c19e5992e 100644
--- a/packages/builder/src/components/design/settings/controls/SearchFieldSelect.svelte
+++ b/packages/builder/src/components/design/settings/controls/SearchFieldSelect.svelte
@@ -1,11 +1,7 @@
 <script>
   import { Multiselect } from "@budibase/bbui"
-  import {
-    getDatasourceForProvider,
-    getSchemaForDatasource,
-  } from "builderStore/dataBinding"
-  import { currentAsset } from "builderStore"
-  import { tables } from "stores/backend"
+  import { getDatasourceForProvider, getSchemaForDatasource } from "dataBinding"
+  import { selectedScreen, tables } from "stores/builder"
   import { createEventDispatcher } from "svelte"
   import { getFields } from "helpers/searchFields"
 
@@ -14,8 +10,8 @@
   export let placeholder
 
   const dispatch = createEventDispatcher()
-  $: datasource = getDatasourceForProvider($currentAsset, componentInstance)
-  $: schema = getSchemaForDatasource($currentAsset, datasource).schema
+  $: datasource = getDatasourceForProvider($selectedScreen, componentInstance)
+  $: schema = getSchemaForDatasource($selectedScreen, datasource).schema
   $: options = getOptions(datasource, schema || {})
   $: boundValue = getSelectedOption(value, options)
 
diff --git a/packages/builder/src/components/design/settings/controls/SortableFieldSelect.svelte b/packages/builder/src/components/design/settings/controls/SortableFieldSelect.svelte
index 350f59f456..d51493616e 100644
--- a/packages/builder/src/components/design/settings/controls/SortableFieldSelect.svelte
+++ b/packages/builder/src/components/design/settings/controls/SortableFieldSelect.svelte
@@ -1,10 +1,7 @@
 <script>
   import { Select } from "@budibase/bbui"
-  import {
-    getDatasourceForProvider,
-    getSchemaForDatasource,
-  } from "builderStore/dataBinding"
-  import { currentAsset } from "builderStore"
+  import { getDatasourceForProvider, getSchemaForDatasource } from "dataBinding"
+  import { selectedScreen } from "stores/builder"
   import { createEventDispatcher } from "svelte"
   import { canBeSortColumn } from "@budibase/shared-core"
 
@@ -13,8 +10,8 @@
   export let placeholder
 
   const dispatch = createEventDispatcher()
-  $: datasource = getDatasourceForProvider($currentAsset, componentInstance)
-  $: schema = getSchemaForDatasource($currentAsset, datasource).schema
+  $: datasource = getDatasourceForProvider($selectedScreen, componentInstance)
+  $: schema = getSchemaForDatasource($selectedScreen, datasource).schema
   $: options = getSortableFields(schema)
   $: boundValue = getValidValue(value, options)
 
diff --git a/packages/builder/src/components/design/settings/controls/TableSelect.svelte b/packages/builder/src/components/design/settings/controls/TableSelect.svelte
index da50ad8c2a..7b73d0a7cf 100644
--- a/packages/builder/src/components/design/settings/controls/TableSelect.svelte
+++ b/packages/builder/src/components/design/settings/controls/TableSelect.svelte
@@ -1,7 +1,7 @@
 <script>
   import { Select } from "@budibase/bbui"
   import { createEventDispatcher, onMount } from "svelte"
-  import { tables as tablesStore, viewsV2 } from "stores/backend"
+  import { tables as tablesStore, viewsV2 } from "stores/builder"
 
   export let value
 
diff --git a/packages/builder/src/components/design/settings/controls/URLSelect.svelte b/packages/builder/src/components/design/settings/controls/URLSelect.svelte
index a07c2190da..d087af95b0 100644
--- a/packages/builder/src/components/design/settings/controls/URLSelect.svelte
+++ b/packages/builder/src/components/design/settings/controls/URLSelect.svelte
@@ -1,12 +1,12 @@
 <script>
-  import { store } from "builderStore"
+  import { screenStore } from "stores/builder"
   import DrawerBindableCombobox from "components/common/bindings/DrawerBindableCombobox.svelte"
 
   export let value
   export let bindings
   export let placeholder
 
-  $: urlOptions = $store.screens
+  $: urlOptions = $screenStore.screens
     .map(screen => screen.routing?.route)
     .filter(x => x != null)
 </script>
diff --git a/packages/builder/src/components/design/settings/controls/ValidationEditor/ValidationDrawer.svelte b/packages/builder/src/components/design/settings/controls/ValidationEditor/ValidationDrawer.svelte
index 25c7651d35..3a98de94cd 100644
--- a/packages/builder/src/components/design/settings/controls/ValidationEditor/ValidationDrawer.svelte
+++ b/packages/builder/src/components/design/settings/controls/ValidationEditor/ValidationDrawer.svelte
@@ -10,12 +10,9 @@
     Input,
     DatePicker,
   } from "@budibase/bbui"
-  import { currentAsset, selectedComponent } from "builderStore"
-  import { findClosestMatchingComponent } from "builderStore/componentUtils"
-  import {
-    getSchemaForDatasource,
-    getDatasourceForProvider,
-  } from "builderStore/dataBinding"
+  import { selectedScreen, selectedComponent } from "stores/builder"
+  import { findClosestMatchingComponent } from "helpers/components"
+  import { getSchemaForDatasource, getDatasourceForProvider } from "dataBinding"
   import DrawerBindableInput from "components/common/bindings/DrawerBindableInput.svelte"
   import { generate } from "shortid"
 
@@ -127,13 +124,14 @@
     ],
   }
 
-  const resolveDatasource = (currentAsset, componentInstance, parent) => {
+  const resolveDatasource = (selectedScreen, componentInstance, parent) => {
     return (
-      getDatasourceForProvider(currentAsset, parent || componentInstance) || {}
+      getDatasourceForProvider(selectedScreen, parent || componentInstance) ||
+      {}
     )
   }
 
-  $: dataSourceSchema = getDataSourceSchema($currentAsset, $selectedComponent)
+  $: dataSourceSchema = getDataSourceSchema($selectedScreen, $selectedComponent)
   $: field = fieldName || $selectedComponent?.field
   $: schemaRules = parseRulesFromSchema(field, dataSourceSchema || {})
   $: fieldType = type?.split("/")[1] || "string"
diff --git a/packages/builder/src/components/integration/AccessLevelSelect.svelte b/packages/builder/src/components/integration/AccessLevelSelect.svelte
index 3dc24983d3..05b336c3b3 100644
--- a/packages/builder/src/components/integration/AccessLevelSelect.svelte
+++ b/packages/builder/src/components/integration/AccessLevelSelect.svelte
@@ -1,6 +1,6 @@
 <script>
   import { Label, notifications, Select } from "@budibase/bbui"
-  import { permissions, roles } from "stores/backend"
+  import { permissions, roles } from "stores/builder"
   import { Constants } from "@budibase/frontend-core"
 
   export let query
diff --git a/packages/builder/src/components/integration/QueryBindingBuilder.svelte b/packages/builder/src/components/integration/QueryBindingBuilder.svelte
index af890302b0..88d46de0a0 100644
--- a/packages/builder/src/components/integration/QueryBindingBuilder.svelte
+++ b/packages/builder/src/components/integration/QueryBindingBuilder.svelte
@@ -3,7 +3,7 @@
   import {
     readableToRuntimeBinding,
     runtimeToReadableBinding,
-  } from "builderStore/dataBinding"
+  } from "dataBinding"
   import DrawerBindableInput from "components/common/bindings/DrawerBindableInput.svelte"
   import { createEventDispatcher } from "svelte"
 
diff --git a/packages/builder/src/components/integration/QueryEditor.svelte b/packages/builder/src/components/integration/QueryEditor.svelte
index 51fdb4879e..97998c3d22 100644
--- a/packages/builder/src/components/integration/QueryEditor.svelte
+++ b/packages/builder/src/components/integration/QueryEditor.svelte
@@ -2,7 +2,7 @@
   import CodeMirror from "./codemirror"
   import { Label } from "@budibase/bbui"
   import { onMount, createEventDispatcher } from "svelte"
-  import { themeStore } from "builderStore"
+  import { themeStore } from "stores/portal"
 
   const dispatch = createEventDispatcher()
 
diff --git a/packages/builder/src/components/integration/QueryViewer.svelte b/packages/builder/src/components/integration/QueryViewer.svelte
index 59a3289731..44a3dd33be 100644
--- a/packages/builder/src/components/integration/QueryViewer.svelte
+++ b/packages/builder/src/components/integration/QueryViewer.svelte
@@ -1,6 +1,6 @@
 <script>
   import { goto } from "@roxi/routify"
-  import { datasources, integrations, queries } from "stores/backend"
+  import { datasources, integrations, queries } from "stores/builder"
   import {
     Icon,
     Select,
@@ -41,6 +41,7 @@
 
   let autoSchema = {}
   let rows = []
+  let keys = {}
 
   const parseQuery = query => {
     modified = false
@@ -93,7 +94,13 @@
 
       notifications.success("Query executed successfully")
     } catch (error) {
-      notifications.error(`Query Error: ${error.message}`)
+      if (typeof error.message === "string") {
+        notifications.error(`Query Error: ${error.message}`)
+      } else if (typeof error.message?.code === "string") {
+        notifications.error(`Query Error: ${error.message.code}`)
+      } else {
+        notifications.error(`Query Error: ${JSON.stringify(error.message)}`)
+      }
 
       if (!suppressErrors) {
         throw error
@@ -137,8 +144,20 @@
   const handleScroll = e => {
     scrolling = e.target.scrollTop !== 0
   }
+
+  async function handleKeyDown(evt) {
+    keys[evt.key] = true
+    if ((keys["Meta"] || keys["Control"]) && keys["Enter"]) {
+      await runQuery({ suppressErrors: false })
+    }
+  }
+
+  function handleKeyUp(evt) {
+    delete keys[evt.key]
+  }
 </script>
 
+<svelte:window on:keydown={handleKeyDown} on:keyup={handleKeyUp} />
 <QueryViewerSavePromptModal
   checkIsModified={() => checkIsModified(newQuery)}
   attemptSave={() => runQuery({ suppressErrors: false }).then(saveQuery)}
diff --git a/packages/builder/src/components/integration/QueryViewerBindingBuilder.svelte b/packages/builder/src/components/integration/QueryViewerBindingBuilder.svelte
index f8a14a6dd1..7e79209d8b 100644
--- a/packages/builder/src/components/integration/QueryViewerBindingBuilder.svelte
+++ b/packages/builder/src/components/integration/QueryViewerBindingBuilder.svelte
@@ -1,10 +1,8 @@
 <script>
   import KeyValueBuilder from "components/integration/KeyValueBuilder.svelte"
-  import { getUserBindings } from "builderStore/dataBinding"
+  import { getUserBindings } from "dataBinding"
 
-  export let bindable = true
   export let queryBindings = []
-  export let hideHeading = false
 
   const userBindings = getUserBindings()
 
diff --git a/packages/builder/src/components/integration/QueryViewerSidePanel/JSONPanel.svelte b/packages/builder/src/components/integration/QueryViewerSidePanel/JSONPanel.svelte
index 433b8d41ab..a26565f109 100644
--- a/packages/builder/src/components/integration/QueryViewerSidePanel/JSONPanel.svelte
+++ b/packages/builder/src/components/integration/QueryViewerSidePanel/JSONPanel.svelte
@@ -1,7 +1,20 @@
 <script>
   export let data
+  export let maxRowsToDisplay = 5
 
-  $: string = JSON.stringify(data || {}, null, 2)
+  let string
+  $: {
+    string = JSON.stringify(data || {}, null, 2)
+    if (Array.isArray(data) && data.length > maxRowsToDisplay) {
+      string = JSON.stringify(data.slice(0, maxRowsToDisplay) || {}, null, 2)
+
+      // Display '...' at the end of the array
+      string = string.replace(
+        /(}\n])/,
+        `},\n  ...${data.length - maxRowsToDisplay} further items\n]`
+      )
+    }
+  }
 </script>
 
 <textarea class="json" disabled value={string} />
diff --git a/packages/builder/src/components/integration/QueryViewerSidePanel/PreviewPanel.svelte b/packages/builder/src/components/integration/QueryViewerSidePanel/PreviewPanel.svelte
index 3873669b63..29f15bca40 100644
--- a/packages/builder/src/components/integration/QueryViewerSidePanel/PreviewPanel.svelte
+++ b/packages/builder/src/components/integration/QueryViewerSidePanel/PreviewPanel.svelte
@@ -4,13 +4,17 @@
 
   export let schema = {}
   export let rows = []
+  export let maxRowsToDisplay = 5
 
-  $: rowsCopy = cloneDeep(rows)
+  let rowsToDisplay
+  $: rowsToDisplay = [...cloneDeep(rows).slice(0, maxRowsToDisplay)]
+
+  $: additionalRows = rows.length - maxRowsToDisplay
 
   // Cast field in query preview response to number if specified by schema
   $: {
-    for (let i = 0; i < rowsCopy.length; i++) {
-      let row = rowsCopy[i]
+    for (let i = 0; i < rowsToDisplay.length; i++) {
+      let row = rowsToDisplay[i]
       for (let fieldName of Object.keys(schema)) {
         if (schema[fieldName] === "number" && !isNaN(Number(row[fieldName]))) {
           row[fieldName] = Number(row[fieldName])
@@ -23,11 +27,27 @@
 </script>
 
 <div class="table">
-  <Table {schema} data={rowsCopy} allowEditing={false} />
+  <Table {schema} data={rowsToDisplay} allowEditing={false} />
+  {#if additionalRows > 0}
+    <div class="show-more">
+      ...{additionalRows} further items
+    </div>
+  {/if}
 </div>
 
 <style>
-  .table :global(.spectrum-Table-cell) {
+  .table :global(.spectrum-Table-cell),
+  .show-more {
     min-width: 100px;
   }
+
+  .show-more {
+    display: flex;
+    padding: 16px;
+    justify-content: center;
+
+    background-color: var(--spectrum-global-color-gray-50);
+    border: 1px solid var(--spectrum-alias-border-color-mid);
+    border-top: 0;
+  }
 </style>
diff --git a/packages/builder/src/components/integration/QueryViewerSidePanel/index.svelte b/packages/builder/src/components/integration/QueryViewerSidePanel/index.svelte
index 995d98e5ac..c08dc5801c 100644
--- a/packages/builder/src/components/integration/QueryViewerSidePanel/index.svelte
+++ b/packages/builder/src/components/integration/QueryViewerSidePanel/index.svelte
@@ -41,7 +41,7 @@
   </div>
   <div class="content">
     {#if activeTab === "JSON"}
-      <JSONPanel data={rows[0] || {}} />
+      <JSONPanel data={rows?.length === 1 ? rows[0] : rows || {}} />
     {:else if activeTab === "Schema"}
       <SchemaPanel {onSchemaChange} {schema} />
     {:else}
diff --git a/packages/builder/src/components/integration/RestQueryViewer.svelte b/packages/builder/src/components/integration/RestQueryViewer.svelte
index d6a8fe6fc3..7ff0bb7f4c 100644
--- a/packages/builder/src/components/integration/RestQueryViewer.svelte
+++ b/packages/builder/src/components/integration/RestQueryViewer.svelte
@@ -1,6 +1,6 @@
 <script>
   import { goto, params } from "@roxi/routify"
-  import { datasources, flags, integrations, queries } from "stores/backend"
+  import { datasources, flags, integrations, queries } from "stores/builder"
   import { environment } from "stores/portal"
   import {
     Banner,
@@ -48,7 +48,7 @@
     runtimeToReadableBinding,
     runtimeToReadableMap,
     toBindingsArray,
-  } from "builderStore/dataBinding"
+  } from "dataBinding"
 
   export let queryId
 
diff --git a/packages/builder/src/components/portal/licensing/LicensingOverlays.svelte b/packages/builder/src/components/portal/licensing/LicensingOverlays.svelte
index eedecb0412..cde7865638 100644
--- a/packages/builder/src/components/portal/licensing/LicensingOverlays.svelte
+++ b/packages/builder/src/components/portal/licensing/LicensingOverlays.svelte
@@ -1,6 +1,5 @@
 <script>
-  import { licensing, auth } from "stores/portal"
-  import { temporalStore } from "builderStore"
+  import { licensing, auth, temporalStore } from "stores/portal"
   import { onMount } from "svelte"
   import DayPassWarningModal from "./DayPassWarningModal.svelte"
   import PaymentFailedModal from "./PaymentFailedModal.svelte"
diff --git a/packages/builder/src/components/portal/licensing/licensingBanners.js b/packages/builder/src/components/portal/licensing/licensingBanners.js
index ea4a1bb946..34558e98e2 100644
--- a/packages/builder/src/components/portal/licensing/licensingBanners.js
+++ b/packages/builder/src/components/portal/licensing/licensingBanners.js
@@ -1,6 +1,5 @@
 import { ExpiringKeys } from "./constants"
-import { temporalStore } from "builderStore"
-import { admin, auth, licensing } from "stores/portal"
+import { admin, auth, licensing, temporalStore } from "stores/portal"
 import { get } from "svelte/store"
 import { BANNER_TYPES } from "@budibase/bbui"
 
diff --git a/packages/builder/src/components/portal/onboarding/TourPopover.svelte b/packages/builder/src/components/portal/onboarding/TourPopover.svelte
index cc56715284..23821d73a3 100644
--- a/packages/builder/src/components/portal/onboarding/TourPopover.svelte
+++ b/packages/builder/src/components/portal/onboarding/TourPopover.svelte
@@ -1,8 +1,8 @@
 <script>
   import { Popover, Layout, Heading, Body, Button, Link } from "@budibase/bbui"
-  import { store } from "builderStore"
   import { TOURS } from "./tours.js"
   import { goto, layout, isActive } from "@roxi/routify"
+  import { builderStore } from "stores/builder"
 
   let popoverAnchor
   let popover
@@ -12,9 +12,9 @@
   let lastStep
   let skipping = false
 
-  $: tourNodes = { ...$store.tourNodes }
-  $: tourKey = $store.tourKey
-  $: tourStepKey = $store.tourStepKey
+  $: tourNodes = { ...$builderStore.tourNodes }
+  $: tourKey = $builderStore.tourKey
+  $: tourStepKey = $builderStore.tourStepKey
   $: tour = TOURS[tourKey]
   $: tourOnSkip = tour?.onSkip
 
@@ -47,12 +47,11 @@
     if (step.route) {
       const activeNav = $layout.children.find(c => $isActive(c.path))
       if (activeNav) {
-        store.update(state => {
-          if (!state.previousTopNavPath) state.previousTopNavPath = {}
-          state.previousTopNavPath[activeNav.path] = window.location.pathname
-          $goto(state.previousTopNavPath[step.route] || step.route)
-          return state
-        })
+        builderStore.setPreviousTopNavPath(
+          activeNav.path,
+          window.location.pathname
+        )
+        $goto($builderStore.previousTopNavPath[step.route] || step.route)
       }
     }
   }
@@ -61,7 +60,7 @@
     if (!lastStep === true) {
       let target = tourSteps[tourStepIdx + 1]
       if (target) {
-        store.update(state => ({
+        builderStore.update(state => ({
           ...state,
           tourStepKey: target.id,
         }))
diff --git a/packages/builder/src/components/portal/onboarding/TourWrap.svelte b/packages/builder/src/components/portal/onboarding/TourWrap.svelte
index dd667057ca..53553db1c8 100644
--- a/packages/builder/src/components/portal/onboarding/TourWrap.svelte
+++ b/packages/builder/src/components/portal/onboarding/TourWrap.svelte
@@ -2,7 +2,7 @@
   import { tourHandler } from "./tourHandler"
   import { TOURS } from "./tours"
   import { onMount, onDestroy } from "svelte"
-  import { store } from "builderStore"
+  import { builderStore } from "stores/builder"
 
   export let tourStepKey
 
@@ -23,7 +23,7 @@
     }
   }
 
-  $: tourKeyWatch = $store.tourKey
+  $: tourKeyWatch = $builderStore.tourKey
   $: registerTourNode(tourKeyWatch, tourStepKey, ready)
 
   onMount(() => {
diff --git a/packages/builder/src/components/portal/onboarding/tourHandler.js b/packages/builder/src/components/portal/onboarding/tourHandler.js
index 5b44bdc96f..6268e980db 100644
--- a/packages/builder/src/components/portal/onboarding/tourHandler.js
+++ b/packages/builder/src/components/portal/onboarding/tourHandler.js
@@ -1,4 +1,4 @@
-import { store } from "builderStore/index"
+import { builderStore } from "stores/builder"
 import { get } from "svelte/store"
 
 const registerNode = async (node, tourStepKey) => {
@@ -6,21 +6,12 @@ const registerNode = async (node, tourStepKey) => {
     console.warn("Tour Handler - an anchor node is required")
   }
 
-  if (!get(store).tourKey) {
-    console.error("Tour Handler - No active tour ", tourStepKey, node)
+  if (!get(builderStore).tourKey) {
+    console.warn("Tour Handler - No active tour ", tourStepKey, node)
     return
   }
 
-  store.update(state => {
-    const update = {
-      ...state,
-      tourNodes: {
-        ...state.tourNodes,
-        [tourStepKey]: node,
-      },
-    }
-    return update
-  })
+  builderStore.registerTourNode(tourStepKey, node)
 }
 
 export function tourHandler(node, tourStepKey) {
@@ -29,19 +20,7 @@ export function tourHandler(node, tourStepKey) {
   }
   return {
     destroy: () => {
-      const updatedTourNodes = get(store).tourNodes
-      if (updatedTourNodes && updatedTourNodes[tourStepKey]) {
-        delete updatedTourNodes[tourStepKey]
-        store.update(state => {
-          const update = {
-            ...state,
-            tourNodes: {
-              ...updatedTourNodes,
-            },
-          }
-          return update
-        })
-      }
+      builderStore.destroyTourNode(tourStepKey)
     },
   }
 }
diff --git a/packages/builder/src/components/portal/onboarding/tours.js b/packages/builder/src/components/portal/onboarding/tours.js
index 55fd4c4a9b..623a00fcc2 100644
--- a/packages/builder/src/components/portal/onboarding/tours.js
+++ b/packages/builder/src/components/portal/onboarding/tours.js
@@ -1,5 +1,5 @@
 import { get } from "svelte/store"
-import { store } from "builderStore"
+import { builderStore } from "stores/builder"
 import { auth } from "stores/portal"
 import analytics from "analytics"
 import { OnboardingData, OnboardingDesign, OnboardingPublish } from "./steps"
@@ -37,11 +37,11 @@ const endUserOnboarding = async ({ skipped = false } = {}) => {
       // Update the cached user
       await auth.getSelf()
 
-      store.update(state => ({
+      builderStore.update(state => ({
         ...state,
-        tourNodes: undefined,
-        tourKey: undefined,
-        tourKeyStep: undefined,
+        tourNodes: null,
+        tourKey: null,
+        tourStepKey: null,
         onboarding: false,
       }))
     } catch (e) {
diff --git a/packages/builder/src/components/settings/ThemeModal.svelte b/packages/builder/src/components/settings/ThemeModal.svelte
index fd6674b157..cd1649fcb4 100644
--- a/packages/builder/src/components/settings/ThemeModal.svelte
+++ b/packages/builder/src/components/settings/ThemeModal.svelte
@@ -1,6 +1,6 @@
 <script>
   import { ModalContent, Select } from "@budibase/bbui"
-  import { themeStore } from "builderStore"
+  import { themeStore } from "stores/portal"
   import { Constants } from "@budibase/frontend-core"
 </script>
 
diff --git a/packages/builder/src/components/start/AppRow.svelte b/packages/builder/src/components/start/AppRow.svelte
index 212ab4c6f8..c05ae4c624 100644
--- a/packages/builder/src/components/start/AppRow.svelte
+++ b/packages/builder/src/components/start/AppRow.svelte
@@ -11,6 +11,7 @@
 
   $: editing = app.sessions?.length
   $: isBuilder = sdk.users.isBuilder($auth.user, app?.devId)
+  $: unclickable = !isBuilder && !app.deployed
 
   const handleDefaultClick = () => {
     if (!isBuilder) {
@@ -31,11 +32,17 @@
   }
 
   const goToApp = () => {
-    window.open(`/app/${app.name}`, "_blank")
+    if (app.deployed && app.url) {
+      window.open(`/app${app.url}`, "_blank")
+    }
   }
 </script>
 
-<div class="app-row" on:click={lockedAction || handleDefaultClick}>
+<div
+  class="app-row"
+  on:click={lockedAction || handleDefaultClick}
+  class:unclickable
+>
   <div class="title">
     <div class="app-icon">
       <Icon size="L" name={app.icon?.name || "Apps"} color={app.icon?.color} />
@@ -74,7 +81,7 @@
         Edit
       </Button>
     </div>
-  {:else}
+  {:else if app.deployed}
     <!-- this can happen if an app builder has app user access to an app -->
     <div class="app-row-actions">
       <Button size="S" secondary>View</Button>
@@ -94,7 +101,7 @@
     transition: border 130ms ease-out;
     border: 1px solid transparent;
   }
-  .app-row:hover {
+  .app-row:not(.unclickable):hover {
     cursor: pointer;
     border-color: var(--spectrum-global-color-gray-300);
   }
diff --git a/packages/builder/src/components/start/CreateAppModal.svelte b/packages/builder/src/components/start/CreateAppModal.svelte
index 9e831f5bd9..b582232207 100644
--- a/packages/builder/src/components/start/CreateAppModal.svelte
+++ b/packages/builder/src/components/start/CreateAppModal.svelte
@@ -7,7 +7,7 @@
     ModalContent,
     Dropzone,
   } from "@budibase/bbui"
-  import { store, automationStore } from "builderStore"
+  import { initialise } from "stores/builder"
   import { API } from "api"
   import { apps, admin, auth } from "stores/portal"
   import { onMount } from "svelte"
@@ -132,8 +132,9 @@
 
       // Select Correct Application/DB in prep for creating user
       const pkg = await API.fetchAppPackage(createdApp.instance._id)
-      await store.actions.initialise(pkg)
-      await automationStore.actions.fetch()
+
+      await initialise(pkg)
+
       // Update checklist - in case first app
       await admin.init()
 
diff --git a/packages/builder/src/components/start/ImportAppModal.svelte b/packages/builder/src/components/start/ImportAppModal.svelte
index 1bc32dc7a4..4c88593514 100644
--- a/packages/builder/src/components/start/ImportAppModal.svelte
+++ b/packages/builder/src/components/start/ImportAppModal.svelte
@@ -9,7 +9,7 @@
     Body,
   } from "@budibase/bbui"
   import { API } from "api"
-  import { automationStore, store } from "../../builderStore"
+  import { initialise } from "stores/builder"
 
   export let app
 
@@ -28,8 +28,8 @@
       const appId = app.devId
       await API.updateAppFromExport(appId, data)
       const pkg = await API.fetchAppPackage(appId)
-      await store.actions.initialise(pkg)
-      await automationStore.actions.fetch()
+      await initialise(pkg)
+
       notifications.success("App updated successfully")
     } catch (err) {
       notifications.error(`Failed to update app - ${err.message || err}`)
diff --git a/packages/builder/src/components/usage/Usage.svelte b/packages/builder/src/components/usage/Usage.svelte
index 897a7da3dd..da1bb4489a 100644
--- a/packages/builder/src/components/usage/Usage.svelte
+++ b/packages/builder/src/components/usage/Usage.svelte
@@ -1,6 +1,6 @@
 <script>
   import { Body, ProgressBar, Heading, Icon, Link } from "@budibase/bbui"
-  import { admin, auth } from "../../stores/portal"
+  import { admin, auth } from "stores/portal"
   import { onMount } from "svelte"
 
   export let usage
diff --git a/packages/builder/src/builderStore/dataBinding.js b/packages/builder/src/dataBinding.js
similarity index 93%
rename from packages/builder/src/builderStore/dataBinding.js
rename to packages/builder/src/dataBinding.js
index 86aecd466f..8c71631b09 100644
--- a/packages/builder/src/builderStore/dataBinding.js
+++ b/packages/builder/src/dataBinding.js
@@ -1,30 +1,36 @@
 import { cloneDeep } from "lodash/fp"
 import { get } from "svelte/store"
 import {
+  buildContextTreeLookupMap,
   findAllComponents,
   findAllMatchingComponents,
   findComponent,
   findComponentPath,
-  getComponentSettings,
-} from "./componentUtils"
-import { store, currentAsset } from "builderStore"
+} from "helpers/components"
 import {
+  componentStore,
+  screenStore,
+  appStore,
+  layoutStore,
   queries as queriesStores,
   tables as tablesStore,
   roles as rolesStore,
-} from "stores/backend"
+  selectedScreen,
+} from "stores/builder"
 import {
   makePropSafe,
   isJSBinding,
   decodeJSBinding,
   encodeJSBinding,
 } from "@budibase/string-templates"
-import { TableNames } from "../constants"
-import { JSONUtils } from "@budibase/frontend-core"
+import { TableNames } from "./constants"
+import { JSONUtils, Constants } from "@budibase/frontend-core"
 import ActionDefinitions from "components/design/settings/controls/ButtonActionEditor/manifest.json"
 import { environment, licensing } from "stores/portal"
 import { convertOldFieldFormat } from "components/design/settings/controls/FieldConfiguration/utils"
 
+const { ContextScopes } = Constants
+
 // Regex to match all instances of template strings
 const CAPTURE_VAR_INSIDE_TEMPLATE = /{{([^}]+)}}/g
 const CAPTURE_VAR_INSIDE_JS = /\$\("([^")]+)"\)/g
@@ -184,7 +190,7 @@ export const getComponentBindableProperties = (asset, componentId) => {
 
   // Ensure that the component exists and exposes context
   const component = findComponent(asset.props, componentId)
-  const def = store.actions.components.getDefinition(component?._component)
+  const def = componentStore.getDefinition(component?._component)
   if (!def?.context) {
     return []
   }
@@ -214,20 +220,26 @@ export const getComponentContexts = (
     return []
   }
   let map = {}
+  const componentPath = findComponentPath(asset.props, componentId)
+  const componentPathIds = componentPath.map(component => component._id)
+  const contextTreeLookupMap = buildContextTreeLookupMap(asset.props)
 
   // Processes all contexts exposed by a component
   const processContexts = scope => component => {
-    const def = store.actions.components.getDefinition(component._component)
+    const def = componentStore.getDefinition(component._component)
     if (!def?.context) {
       return
     }
-    if (!map[component._id]) {
-      map[component._id] = {
-        component,
-        definition: def,
-        contexts: [],
-      }
+
+    // Filter out global contexts not in the same branch.
+    // Global contexts are only valid if their branch root is an ancestor of
+    // this component.
+    const branch = contextTreeLookupMap[component._id]
+    if (branch !== "root" && !componentPathIds.includes(branch)) {
+      return
     }
+
+    // Process all contexts provided by this component
     const contexts = Array.isArray(def.context) ? def.context : [def.context]
     contexts.forEach(context => {
       // Ensure type matches
@@ -235,7 +247,7 @@ export const getComponentContexts = (
         return
       }
       // Ensure scope matches
-      let contextScope = context.scope || "global"
+      let contextScope = context.scope || ContextScopes.Global
       if (contextScope !== scope) {
         return
       }
@@ -243,17 +255,23 @@ export const getComponentContexts = (
       if (!isContextCompatibleWithComponent(context, component)) {
         return
       }
+      if (!map[component._id]) {
+        map[component._id] = {
+          component,
+          definition: def,
+          contexts: [],
+        }
+      }
       map[component._id].contexts.push(context)
     })
   }
 
   // Process all global contexts
   const allComponents = findAllComponents(asset.props)
-  allComponents.forEach(processContexts("global"))
+  allComponents.forEach(processContexts(ContextScopes.Global))
 
-  // Process all local contexts
-  const localComponents = findComponentPath(asset.props, componentId)
-  localComponents.forEach(processContexts("local"))
+  // Process all local contexts in the immediate tree
+  componentPath.forEach(processContexts(ContextScopes.Local))
 
   // Exclude self if required
   if (!options?.includeSelf) {
@@ -286,7 +304,7 @@ export const getActionProviders = (
     if (!options?.includeSelf && component._id === componentId) {
       return
     }
-    const def = store.actions.components.getDefinition(component._component)
+    const def = componentStore.getDefinition(component._component)
     const actions = (def?.actions || []).map(action => {
       return typeof action === "string" ? { type: action } : action
     })
@@ -309,7 +327,7 @@ export const getActionProviders = (
  * Gets a datasource object for a certain data provider component
  */
 export const getDatasourceForProvider = (asset, component) => {
-  const settings = getComponentSettings(component?._component)
+  const settings = componentStore.getComponentSettings(component?._component)
 
   // If this component has a dataProvider setting, go up the stack and use it
   const dataProviderSetting = settings.find(setting => {
@@ -565,7 +583,7 @@ export const getUserBindings = () => {
  */
 const getDeviceBindings = () => {
   let bindings = []
-  if (get(store).clientFeatures?.deviceAwareness) {
+  if (get(appStore).clientFeatures?.deviceAwareness) {
     const safeDevice = makePropSafe("device")
 
     bindings = [
@@ -601,10 +619,11 @@ const getDeviceBindings = () => {
 /**
  * Gets all selected rows bindings for tables in the current asset.
  * TODO: remove in future because we don't need a separate store for this
+ * DEPRECATED
  */
 const getSelectedRowsBindings = asset => {
   let bindings = []
-  if (get(store).clientFeatures?.rowSelection) {
+  if (get(appStore).clientFeatures?.rowSelection) {
     // Add bindings for table components
     let tables = findAllMatchingComponents(asset?.props, component =>
       component._component.endsWith("table")
@@ -616,8 +635,8 @@ const getSelectedRowsBindings = asset => {
         runtimeBinding: `${safeState}.${makePropSafe(table._id)}.${makePropSafe(
           "selectedRows"
         )}`,
-        readableBinding: `${table._instanceName}.Selected rows`,
-        category: "Selected rows",
+        readableBinding: `${table._instanceName}.Selected Row IDs (deprecated)`,
+        category: "Selected Row IDs (deprecated)",
         icon: "ViewRow",
         display: { name: table._instanceName },
       }))
@@ -633,8 +652,8 @@ const getSelectedRowsBindings = asset => {
         runtimeBinding: `${safeState}.${makePropSafe(
           block._id + "-table"
         )}.${makePropSafe("selectedRows")}`,
-        readableBinding: `${block._instanceName}.Selected rows`,
-        category: "Selected rows",
+        readableBinding: `${block._instanceName}.Selected Row IDs (deprecated)`,
+        category: "Selected Row IDs (deprecated)",
         icon: "ViewRow",
         display: { name: block._instanceName },
       }))
@@ -662,7 +681,7 @@ export const makeStateBinding = key => {
  */
 const getStateBindings = () => {
   let bindings = []
-  if (get(store).clientFeatures?.state) {
+  if (get(appStore).clientFeatures?.state) {
     bindings = getAllStateVariables().map(makeStateBinding)
   }
   return bindings
@@ -728,23 +747,20 @@ export const getEventContextBindings = ({
   asset,
 }) => {
   let bindings = []
-
-  const selectedAsset = asset ?? get(currentAsset)
+  asset = asset ?? get(selectedScreen)
 
   // Check if any context bindings are provided by the component for this
   // setting
-  const component =
-    componentInstance ?? findComponent(selectedAsset.props, componentId)
+  const component = componentInstance ?? findComponent(asset.props, componentId)
 
   if (!component) {
     return bindings
   }
 
   const definition =
-    componentDefinition ??
-    store.actions.components.getDefinition(component?._component)
+    componentDefinition ?? componentStore.getDefinition(component?._component)
 
-  const settings = getComponentSettings(component?._component)
+  const settings = componentStore.getComponentSettings(component?._component)
   const eventSetting = settings.find(setting => setting.key === settingKey)
 
   if (eventSetting?.context?.length) {
@@ -1049,7 +1065,7 @@ export const buildFormSchema = (component, asset) => {
   }
 
   // Otherwise find all field component children
-  const settings = getComponentSettings(component._component)
+  const settings = componentStore.getComponentSettings(component._component)
   const fieldSetting = settings.find(
     setting => setting.key === "field" && setting.type.startsWith("field/")
   )
@@ -1075,7 +1091,7 @@ export const getAllStateVariables = () => {
   let eventSettings = []
   getAllAssets().forEach(asset => {
     findAllMatchingComponents(asset.props, component => {
-      const settings = getComponentSettings(component._component)
+      const settings = componentStore.getComponentSettings(component._component)
 
       const parseEventSettings = (settings, comp) => {
         settings
@@ -1094,7 +1110,9 @@ export const getAllStateVariables = () => {
 
             if (Array.isArray(buttonConfig)) {
               buttonConfig.forEach(button => {
-                const nestedSettings = getComponentSettings(button._component)
+                const nestedSettings = componentStore.getComponentSettings(
+                  button._component
+                )
                 parseEventSettings(nestedSettings, button)
               })
             }
@@ -1111,7 +1129,7 @@ export const getAllStateVariables = () => {
         setting => setting.type === "stepConfiguration"
       )
       const steps = stepSetting ? component[stepSetting.key] : []
-      const stepDefinition = getComponentSettings(
+      const stepDefinition = componentStore.getComponentSettings(
         "@budibase/standard-components/multistepformblockstep"
       )
 
@@ -1122,7 +1140,7 @@ export const getAllStateVariables = () => {
   })
 
   // Add on load settings from screens
-  get(store).screens.forEach(screen => {
+  get(screenStore).screens.forEach(screen => {
     if (screen.onLoad) {
       eventSettings.push(screen.onLoad)
     }
@@ -1151,8 +1169,8 @@ export const getAllStateVariables = () => {
 export const getAllAssets = () => {
   // Get all component containing assets
   let allAssets = []
-  allAssets = allAssets.concat(get(store).layouts || [])
-  allAssets = allAssets.concat(get(store).screens || [])
+  allAssets = allAssets.concat(get(layoutStore).layouts || [])
+  allAssets = allAssets.concat(get(screenStore).screens || [])
 
   return allAssets
 }
diff --git a/packages/builder/src/dataBinding.test.js b/packages/builder/src/dataBinding.test.js
new file mode 100644
index 0000000000..6cea9b166b
--- /dev/null
+++ b/packages/builder/src/dataBinding.test.js
@@ -0,0 +1,545 @@
+import { expect, describe, it, vi } from "vitest"
+import {
+  runtimeToReadableBinding,
+  readableToRuntimeBinding,
+  updateReferencesInObject,
+} from "dataBinding"
+
+describe("Builder dataBinding", () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+  })
+
+  describe("runtimeToReadableBinding", () => {
+    const bindableProperties = [
+      {
+        category: "Current User",
+        icon: "User",
+        providerId: "user",
+        readableBinding: "Current User.firstName",
+        runtimeBinding: "[user].[firstName]",
+        type: "context",
+      },
+      {
+        category: "Bindings",
+        icon: "Brackets",
+        readableBinding: "Binding.count",
+        runtimeBinding: "count",
+        type: "context",
+      },
+    ]
+    it("should convert a runtime binding to a readable one", () => {
+      const textWithBindings = `Hello {{ [user].[firstName] }}! The count is {{ count }}.`
+      expect(
+        runtimeToReadableBinding(
+          bindableProperties,
+          textWithBindings,
+          "readableBinding"
+        )
+      ).toEqual(
+        `Hello {{ Current User.firstName }}! The count is {{ Binding.count }}.`
+      )
+    })
+
+    it("should not convert to readable binding if it is already readable", () => {
+      const textWithBindings = `Hello {{ [user].[firstName] }}! The count is {{ Binding.count }}.`
+      expect(
+        runtimeToReadableBinding(
+          bindableProperties,
+          textWithBindings,
+          "readableBinding"
+        )
+      ).toEqual(
+        `Hello {{ Current User.firstName }}! The count is {{ Binding.count }}.`
+      )
+    })
+  })
+
+  describe("readableToRuntimeBinding", () => {
+    const bindableProperties = [
+      {
+        category: "Current User",
+        icon: "User",
+        providerId: "user",
+        readableBinding: "Current User.firstName",
+        runtimeBinding: "[user].[firstName]",
+        type: "context",
+      },
+      {
+        category: "Bindings",
+        icon: "Brackets",
+        readableBinding: "Binding.count",
+        runtimeBinding: "count",
+        type: "context",
+      },
+    ]
+    it("should convert a readable binding to a runtime one", () => {
+      const textWithBindings = `Hello {{ Current User.firstName }}! The count is {{ Binding.count }}.`
+      expect(
+        readableToRuntimeBinding(
+          bindableProperties,
+          textWithBindings,
+          "runtimeBinding"
+        )
+      ).toEqual(`Hello {{ [user].[firstName] }}! The count is {{ count }}.`)
+    })
+  })
+
+  describe("updateReferencesInObject", () => {
+    it("should increment steps in sequence on 'add'", () => {
+      let obj = [
+        {
+          id: "a0",
+          parameters: {
+            text: "Alpha",
+          },
+        },
+        {
+          id: "a1",
+          parameters: {
+            text: "Apple",
+          },
+        },
+        {
+          id: "b2",
+          parameters: {
+            text: "Banana {{ actions.1.row }}",
+          },
+        },
+        {
+          id: "c3",
+          parameters: {
+            text: "Carrot {{ actions.1.row }}",
+          },
+        },
+        {
+          id: "d4",
+          parameters: {
+            text: "Dog {{ actions.3.row }}",
+          },
+        },
+        {
+          id: "e5",
+          parameters: {
+            text: "Eagle {{ actions.4.row }}",
+          },
+        },
+      ]
+      updateReferencesInObject({
+        obj,
+        modifiedIndex: 0,
+        action: "add",
+        label: "actions",
+      })
+
+      expect(obj).toEqual([
+        {
+          id: "a0",
+          parameters: {
+            text: "Alpha",
+          },
+        },
+        {
+          id: "a1",
+          parameters: {
+            text: "Apple",
+          },
+        },
+        {
+          id: "b2",
+          parameters: {
+            text: "Banana {{ actions.2.row }}",
+          },
+        },
+        {
+          id: "c3",
+          parameters: {
+            text: "Carrot {{ actions.2.row }}",
+          },
+        },
+        {
+          id: "d4",
+          parameters: {
+            text: "Dog {{ actions.4.row }}",
+          },
+        },
+        {
+          id: "e5",
+          parameters: {
+            text: "Eagle {{ actions.5.row }}",
+          },
+        },
+      ])
+    })
+
+    it("should decrement steps in sequence on 'delete'", () => {
+      let obj = [
+        {
+          id: "a1",
+          parameters: {
+            text: "Apple",
+          },
+        },
+        {
+          id: "b2",
+          parameters: {
+            text: "Banana {{ actions.1.row }}",
+          },
+        },
+        {
+          id: "d4",
+          parameters: {
+            text: "Dog {{ actions.3.row }}",
+          },
+        },
+        {
+          id: "e5",
+          parameters: {
+            text: "Eagle {{ actions.4.row }}",
+          },
+        },
+      ]
+      updateReferencesInObject({
+        obj,
+        modifiedIndex: 2,
+        action: "delete",
+        label: "actions",
+      })
+
+      expect(obj).toEqual([
+        {
+          id: "a1",
+          parameters: {
+            text: "Apple",
+          },
+        },
+        {
+          id: "b2",
+          parameters: {
+            text: "Banana {{ actions.1.row }}",
+          },
+        },
+        {
+          id: "d4",
+          parameters: {
+            text: "Dog {{ actions.2.row }}",
+          },
+        },
+        {
+          id: "e5",
+          parameters: {
+            text: "Eagle {{ actions.3.row }}",
+          },
+        },
+      ])
+    })
+
+    it("should handle on 'move' to a lower index", () => {
+      let obj = [
+        {
+          id: "a1",
+          parameters: {
+            text: "Apple",
+          },
+        },
+        {
+          id: "b2",
+          parameters: {
+            text: "Banana {{ actions.0.row }}",
+          },
+        },
+        {
+          id: "e5",
+          parameters: {
+            text: "Eagle {{ actions.3.row }}",
+          },
+        },
+        {
+          id: "c3",
+          parameters: {
+            text: "Carrot {{ actions.0.row }}",
+          },
+        },
+        {
+          id: "d4",
+          parameters: {
+            text: "Dog {{ actions.2.row }}",
+          },
+        },
+      ]
+      updateReferencesInObject({
+        obj,
+        modifiedIndex: 2,
+        action: "move",
+        label: "actions",
+        originalIndex: 4,
+      })
+
+      expect(obj).toEqual([
+        {
+          id: "a1",
+          parameters: {
+            text: "Apple",
+          },
+        },
+        {
+          id: "b2",
+          parameters: {
+            text: "Banana {{ actions.0.row }}",
+          },
+        },
+        {
+          id: "e5",
+          parameters: {
+            text: "Eagle {{ actions.4.row }}",
+          },
+        },
+        {
+          id: "c3",
+          parameters: {
+            text: "Carrot {{ actions.0.row }}",
+          },
+        },
+        {
+          id: "d4",
+          parameters: {
+            text: "Dog {{ actions.3.row }}",
+          },
+        },
+      ])
+    })
+
+    it("should handle on 'move' to a higher index", () => {
+      let obj = [
+        {
+          id: "b2",
+          parameters: {
+            text: "Banana {{ actions.0.row }}",
+          },
+        },
+        {
+          id: "c3",
+          parameters: {
+            text: "Carrot {{ actions.0.row }}",
+          },
+        },
+        {
+          id: "a1",
+          parameters: {
+            text: "Apple",
+          },
+        },
+        {
+          id: "d4",
+          parameters: {
+            text: "Dog {{ actions.2.row }}",
+          },
+        },
+        {
+          id: "e5",
+          parameters: {
+            text: "Eagle {{ actions.3.row }}",
+          },
+        },
+      ]
+      updateReferencesInObject({
+        obj,
+        modifiedIndex: 2,
+        action: "move",
+        label: "actions",
+        originalIndex: 0,
+      })
+
+      expect(obj).toEqual([
+        {
+          id: "b2",
+          parameters: {
+            text: "Banana {{ actions.2.row }}",
+          },
+        },
+        {
+          id: "c3",
+          parameters: {
+            text: "Carrot {{ actions.2.row }}",
+          },
+        },
+        {
+          id: "a1",
+          parameters: {
+            text: "Apple",
+          },
+        },
+        {
+          id: "d4",
+          parameters: {
+            text: "Dog {{ actions.1.row }}",
+          },
+        },
+        {
+          id: "e5",
+          parameters: {
+            text: "Eagle {{ actions.3.row }}",
+          },
+        },
+      ])
+    })
+
+    it("should handle on 'move' of action being referenced, dragged to a higher index", () => {
+      let obj = [
+        {
+          "##eventHandlerType": "Validate Form",
+          id: "cCD0Dwcnq",
+        },
+        {
+          "##eventHandlerType": "Close Screen Modal",
+          id: "3fbbIOfN0H",
+        },
+        {
+          "##eventHandlerType": "Save Row",
+          parameters: {
+            tableId: "ta_bb_employee",
+          },
+          id: "aehg5cTmhR",
+        },
+        {
+          "##eventHandlerType": "Close Side Panel",
+          id: "mzkpf86cxo",
+        },
+        {
+          "##eventHandlerType": "Navigate To",
+          id: "h0uDFeJa8A",
+        },
+        {
+          parameters: {
+            autoDismiss: true,
+            type: "success",
+            message: "{{ actions.1.row }}",
+          },
+          "##eventHandlerType": "Show Notification",
+          id: "JEI5lAyJZ",
+        },
+      ]
+      updateReferencesInObject({
+        obj,
+        modifiedIndex: 2,
+        action: "move",
+        label: "actions",
+        originalIndex: 1,
+      })
+
+      expect(obj).toEqual([
+        {
+          "##eventHandlerType": "Validate Form",
+          id: "cCD0Dwcnq",
+        },
+        {
+          "##eventHandlerType": "Close Screen Modal",
+          id: "3fbbIOfN0H",
+        },
+        {
+          "##eventHandlerType": "Save Row",
+          parameters: {
+            tableId: "ta_bb_employee",
+          },
+          id: "aehg5cTmhR",
+        },
+        {
+          "##eventHandlerType": "Close Side Panel",
+          id: "mzkpf86cxo",
+        },
+        {
+          "##eventHandlerType": "Navigate To",
+          id: "h0uDFeJa8A",
+        },
+        {
+          parameters: {
+            autoDismiss: true,
+            type: "success",
+            message: "{{ actions.2.row }}",
+          },
+          "##eventHandlerType": "Show Notification",
+          id: "JEI5lAyJZ",
+        },
+      ])
+    })
+
+    it("should handle on 'move' of action being referenced, dragged to a lower index", () => {
+      let obj = [
+        {
+          "##eventHandlerType": "Save Row",
+          parameters: {
+            tableId: "ta_bb_employee",
+          },
+          id: "aehg5cTmhR",
+        },
+        {
+          "##eventHandlerType": "Validate Form",
+          id: "cCD0Dwcnq",
+        },
+        {
+          "##eventHandlerType": "Close Screen Modal",
+          id: "3fbbIOfN0H",
+        },
+        {
+          "##eventHandlerType": "Close Side Panel",
+          id: "mzkpf86cxo",
+        },
+        {
+          "##eventHandlerType": "Navigate To",
+          id: "h0uDFeJa8A",
+        },
+        {
+          parameters: {
+            autoDismiss: true,
+            type: "success",
+            message: "{{ actions.4.row }}",
+          },
+          "##eventHandlerType": "Show Notification",
+          id: "JEI5lAyJZ",
+        },
+      ]
+      updateReferencesInObject({
+        obj,
+        modifiedIndex: 0,
+        action: "move",
+        label: "actions",
+        originalIndex: 4,
+      })
+
+      expect(obj).toEqual([
+        {
+          "##eventHandlerType": "Save Row",
+          parameters: {
+            tableId: "ta_bb_employee",
+          },
+          id: "aehg5cTmhR",
+        },
+        {
+          "##eventHandlerType": "Validate Form",
+          id: "cCD0Dwcnq",
+        },
+        {
+          "##eventHandlerType": "Close Screen Modal",
+          id: "3fbbIOfN0H",
+        },
+        {
+          "##eventHandlerType": "Close Side Panel",
+          id: "mzkpf86cxo",
+        },
+        {
+          "##eventHandlerType": "Navigate To",
+          id: "h0uDFeJa8A",
+        },
+        {
+          parameters: {
+            autoDismiss: true,
+            type: "success",
+            message: "{{ actions.0.row }}",
+          },
+          "##eventHandlerType": "Show Notification",
+          id: "JEI5lAyJZ",
+        },
+      ])
+    })
+  })
+})
diff --git a/packages/builder/src/builderStore/componentUtils.js b/packages/builder/src/helpers/components.js
similarity index 79%
rename from packages/builder/src/builderStore/componentUtils.js
rename to packages/builder/src/helpers/components.js
index 733ce0948e..4f4f3ed380 100644
--- a/packages/builder/src/builderStore/componentUtils.js
+++ b/packages/builder/src/helpers/components.js
@@ -1,4 +1,4 @@
-import { store } from "./index"
+import { componentStore } from "stores/builder"
 import { get } from "svelte/store"
 import { Helpers } from "@budibase/bbui"
 import {
@@ -7,6 +7,9 @@ import {
   findHBSBlocks,
 } from "@budibase/string-templates"
 import { capitalise } from "helpers"
+import { Constants } from "@budibase/frontend-core"
+
+const { ContextScopes } = Constants
 
 /**
  * Recursively searches for a specific component ID
@@ -141,50 +144,6 @@ const searchComponentTree = (rootComponent, matchComponent) => {
   return null
 }
 
-/**
- * Searches a component's definition for a setting matching a certain predicate.
- * These settings are cached because they cannot change at run time.
- */
-let componentSettingCache = {}
-export const getComponentSettings = componentType => {
-  if (!componentType) {
-    return []
-  }
-
-  // Ensure whole component name is used
-  if (
-    !componentType.startsWith("plugin/") &&
-    !componentType.startsWith("@budibase")
-  ) {
-    componentType = `@budibase/standard-components/${componentType}`
-  }
-
-  // Check if we have cached this type already
-  if (componentSettingCache[componentType]) {
-    return componentSettingCache[componentType]
-  }
-
-  // Otherwise get the settings and cache them
-  const def = store.actions.components.getDefinition(componentType)
-  let settings = []
-  if (def) {
-    settings = def.settings?.filter(setting => !setting.section) ?? []
-    def.settings
-      ?.filter(setting => setting.section)
-      .forEach(section => {
-        settings = settings.concat(
-          (section.settings || []).map(setting => ({
-            ...setting,
-            section: section.name,
-          }))
-        )
-      })
-  }
-  componentSettingCache[componentType] = settings
-
-  return settings
-}
-
 /**
  * Randomises a components ID's, including all child component IDs, and also
  * updates all data bindings to still be valid.
@@ -264,10 +223,59 @@ export const getComponentName = component => {
     return ""
   }
 
-  const components = get(store)?.components || {}
+  const components = get(componentStore)?.components || {}
   const componentDefinition = components[component._component] || {}
-  const name =
-    componentDefinition.friendlyName || componentDefinition.name || ""
-
-  return name
+  return componentDefinition.friendlyName || componentDefinition.name || ""
+}
+
+/**
+ * Recurses through the component tree and builds a tree of contexts provided
+ * by components.
+ */
+export const buildContextTree = (
+  rootComponent,
+  tree = { root: [] },
+  currentBranch = "root"
+) => {
+  // Sanity check
+  if (!rootComponent) {
+    return tree
+  }
+
+  // Process this component's contexts
+  const def = componentStore.getDefinition(rootComponent._component)
+  if (def?.context) {
+    tree[currentBranch].push(rootComponent._id)
+    const contexts = Array.isArray(def.context) ? def.context : [def.context]
+
+    // If we provide local context, start a new branch for our children
+    if (contexts.some(context => context.scope === ContextScopes.Local)) {
+      currentBranch = rootComponent._id
+      tree[rootComponent._id] = []
+    }
+  }
+
+  // Process children
+  if (rootComponent._children) {
+    rootComponent._children.forEach(child => {
+      buildContextTree(child, tree, currentBranch)
+    })
+  }
+
+  return tree
+}
+
+/**
+ * Generates a lookup map of which context branch all components in a component
+ * tree are inside.
+ */
+export const buildContextTreeLookupMap = rootComponent => {
+  const tree = buildContextTree(rootComponent)
+  let map = {}
+  Object.entries(tree).forEach(([branch, ids]) => {
+    ids.forEach(id => {
+      map[id] = branch
+    })
+  })
+  return map
 }
diff --git a/packages/builder/src/helpers/formFields.js b/packages/builder/src/helpers/formFields.js
index eaf260a9b6..693fd35d4d 100644
--- a/packages/builder/src/helpers/formFields.js
+++ b/packages/builder/src/helpers/formFields.js
@@ -1,8 +1,5 @@
-import { findClosestMatchingComponent } from "builderStore/componentUtils"
-import {
-  getDatasourceForProvider,
-  getSchemaForDatasource,
-} from "builderStore/dataBinding"
+import { findClosestMatchingComponent } from "helpers/components"
+import { getDatasourceForProvider, getSchemaForDatasource } from "dataBinding"
 
 export const getComponentFieldOptions = (asset, id, type, loose = true) => {
   const form = findClosestMatchingComponent(
diff --git a/packages/builder/src/builderStore/store/screenTemplates/utils/sanitizeUrl.js b/packages/builder/src/helpers/sanitizeUrl.js
similarity index 100%
rename from packages/builder/src/builderStore/store/screenTemplates/utils/sanitizeUrl.js
rename to packages/builder/src/helpers/sanitizeUrl.js
diff --git a/packages/builder/src/builderStore/schemaGenerator.js b/packages/builder/src/helpers/schemaGenerator.js
similarity index 100%
rename from packages/builder/src/builderStore/schemaGenerator.js
rename to packages/builder/src/helpers/schemaGenerator.js
diff --git a/packages/builder/src/helpers/searchFields.js b/packages/builder/src/helpers/searchFields.js
index a9c837d570..73e4f1aaa2 100644
--- a/packages/builder/src/helpers/searchFields.js
+++ b/packages/builder/src/helpers/searchFields.js
@@ -1,4 +1,4 @@
-import { tables } from "../stores/backend"
+import { tables } from "stores/builder"
 import { BannedSearchTypes } from "../constants/backend"
 import { get } from "svelte/store"
 
diff --git a/packages/builder/src/builderStore/utils.js b/packages/builder/src/helpers/utils.js
similarity index 95%
rename from packages/builder/src/builderStore/utils.js
rename to packages/builder/src/helpers/utils.js
index 86c63f20ee..6bb333f3c4 100644
--- a/packages/builder/src/builderStore/utils.js
+++ b/packages/builder/src/helpers/utils.js
@@ -1,11 +1,11 @@
 import { ActionStepID } from "constants/backend/automations"
-import { TableNames } from "../constants"
+import { TableNames } from "constants"
 import {
   AUTO_COLUMN_DISPLAY_NAMES,
   AUTO_COLUMN_SUB_TYPES,
   FIELDS,
   isAutoColumnUserRelationship,
-} from "../constants/backend"
+} from "constants/backend"
 
 export function getAutoColumnInformation(enabled = true) {
   let info = {}
diff --git a/packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte b/packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte
index cd00b36186..77f1ed55b5 100644
--- a/packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte
@@ -14,7 +14,7 @@
     Button,
     FancySelect,
   } from "@budibase/bbui"
-  import { store } from "builderStore"
+  import { builderStore, appStore, roles } from "stores/builder"
   import { groups, licensing, apps, users, auth, admin } from "stores/portal"
   import {
     fetchData,
@@ -28,7 +28,6 @@
   import RoleSelect from "components/common/RoleSelect.svelte"
   import UpgradeModal from "components/common/users/UpgradeModal.svelte"
   import { emailValidator } from "helpers/validation"
-  import { roles } from "stores/backend"
   import { fly } from "svelte/transition"
 
   let query = null
@@ -55,7 +54,7 @@
 
   let inviteFailureResponse = ""
   $: validEmail = emailValidator(email) === true
-  $: prodAppId = apps.getProdAppID($store.appId)
+  $: prodAppId = apps.getProdAppID($appStore.appId)
   $: promptInvite = showInvite(
     filteredInvites,
     filteredUsers,
@@ -182,7 +181,7 @@
   const debouncedUpdateFetch = Utils.debounce(searchUsers, 250)
   $: debouncedUpdateFetch(
     query,
-    $store.builderSidePanel,
+    $builderStore.builderSidePanel,
     loaded,
     filterByAppAccess
   )
@@ -200,7 +199,7 @@
         [prodAppId]: role,
       },
     })
-    await searchUsers(query, $store.builderSidePanel, loaded)
+    await searchUsers(query, $builderStore.builderSidePanel, loaded)
   }
 
   const onUpdateUser = async (user, role) => {
@@ -489,7 +488,7 @@
     loaded = true
   }
 
-  $: initSidePanel($store.builderSidePanel)
+  $: initSidePanel($builderStore.builderSidePanel)
 
   function handleKeyDown(evt) {
     if (evt.key === "Enter" && validEmail && !inviting) {
@@ -543,12 +542,7 @@
 <div
   transition:fly={{ x: 400, duration: 260 }}
   id="builder-side-panel-container"
-  use:clickOutside={() => {
-    store.update(state => {
-      state.builderSidePanel = false
-      return state
-    })
-  }}
+  use:clickOutside={builderStore.hideBuilderSidePanel}
 >
   <div class="builder-side-panel-header">
     <div
@@ -571,10 +565,7 @@
         name="RailRightClose"
         hoverable
         on:click={() => {
-          store.update(state => {
-            state.builderSidePanel = false
-            return state
-          })
+          builderStore.hideBuilderSidePanel()
         }}
       />
     </div>
diff --git a/packages/builder/src/pages/builder/app/[application]/_components/PreviewOverlay.svelte b/packages/builder/src/pages/builder/app/[application]/_components/PreviewOverlay.svelte
index eedff6c2a7..84cee40064 100644
--- a/packages/builder/src/pages/builder/app/[application]/_components/PreviewOverlay.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/_components/PreviewOverlay.svelte
@@ -1,26 +1,25 @@
 <script>
   import { onMount } from "svelte"
   import { fade, fly } from "svelte/transition"
-  import { store, selectedScreen } from "builderStore"
+  import {
+    previewStore,
+    themeStore,
+    selectedScreen,
+    appStore,
+  } from "stores/builder"
   import { ProgressCircle } from "@budibase/bbui"
 
   $: route = $selectedScreen?.routing.route || "/"
-  $: src = `/${$store.appId}#${route}`
+  $: src = `/${$appStore.appId}#${route}`
 
   const close = () => {
-    store.update(state => ({
-      ...state,
-      showPreview: false,
-    }))
+    previewStore.showPreview(false)
   }
 
   onMount(() => {
     window.isBuilder = true
     window.closePreview = () => {
-      store.update(state => ({
-        ...state,
-        showPreview: false,
-      }))
+      previewStore.showPreview(false)
     }
   })
 </script>
@@ -31,7 +30,7 @@
   on:click|self={close}
 >
   <div
-    class="container spectrum {$store.theme}"
+    class="container spectrum {$themeStore.theme}"
     transition:fly={{ duration: 260, y: 130 }}
   >
     <div class="header placeholder" />
diff --git a/packages/builder/src/pages/builder/app/[application]/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/_layout.svelte
index 1df2a90250..c7f8c98e73 100644
--- a/packages/builder/src/pages/builder/app/[application]/_layout.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/_layout.svelte
@@ -1,11 +1,13 @@
 <script>
   import {
-    store,
-    automationStore,
+    initialise,
+    reset,
+    appStore,
+    builderStore,
+    previewStore,
     userStore,
     deploymentStore,
-  } from "builderStore"
-  import { roles, flags } from "stores/backend"
+  } from "stores/builder"
   import { auth, apps } from "stores/portal"
   import { TENANT_FEATURE_FLAGS, isEnabled } from "helpers/featureFlags"
   import {
@@ -45,14 +47,14 @@
 
   async function getPackage() {
     try {
-      store.actions.reset()
+      reset()
+
       const pkg = await API.fetchAppPackage(application)
-      await store.actions.initialise(pkg)
-      await automationStore.actions.fetch()
-      await roles.fetch()
-      await flags.fetch()
+      await initialise(pkg)
+
       await apps.load()
-      await deploymentStore.actions.load()
+      await deploymentStore.load()
+
       loaded = true
       return pkg
     } catch (error) {
@@ -68,12 +70,11 @@
   const topItemNavigate = path => () => {
     const activeTopNav = $layout.children.find(c => $isActive(c.path))
     if (!activeTopNav) return
-    store.update(state => {
-      if (!state.previousTopNavPath) state.previousTopNavPath = {}
-      state.previousTopNavPath[activeTopNav.path] = window.location.pathname
-      $goto(state.previousTopNavPath[path] || path)
-      return state
-    })
+    builderStore.setPreviousTopNavPath(
+      activeTopNav.path,
+      window.location.pathname
+    )
+    $goto($builderStore.previousTopNavPath[path] || path)
   }
 
   // Event handler for the command palette
@@ -88,20 +89,13 @@
     // Check if onboarding is enabled.
     if (isEnabled(TENANT_FEATURE_FLAGS.ONBOARDING_TOUR)) {
       if (!$auth.user?.onboardedAt) {
-        await store.update(state => ({
-          ...state,
-          onboarding: true,
-          tourKey: TOUR_KEYS.TOUR_BUILDER_ONBOARDING,
-        }))
+        builderStore.startBuilderOnboarding()
       } else {
         // Feature tour date
         const release_date = new Date("2023-03-01T00:00:00.000Z")
         const onboarded = new Date($auth.user?.onboardedAt)
         if (onboarded < release_date) {
-          await store.update(state => ({
-            ...state,
-            tourKey: TOUR_KEYS.FEATURE_ONBOARDING,
-          }))
+          builderStore.startTour(TOUR_KEYS.FEATURE_ONBOARDING)
         }
       }
     }
@@ -124,22 +118,20 @@
   onDestroy(() => {
     // Run async on a slight delay to let other cleanup logic run without
     // being confused by the store wiping
-    setTimeout(() => {
-      store.actions.reset()
-    }, 10)
+    setTimeout(reset, 10)
   })
 </script>
 
 <TourPopover />
 
-{#if $store.builderSidePanel}
+{#if $builderStore.builderSidePanel}
   <BuilderSidePanel />
 {/if}
 
-<div class="root" class:blur={$store.showPreview}>
+<div class="root" class:blur={$previewStore.showPreview}>
   <VerificationPromptBanner />
   <div class="top-nav">
-    {#if $store.initialised}
+    {#if $appStore.initialised}
       <div class="topleftnav">
         <span class="back-to-apps">
           <Icon
@@ -164,7 +156,7 @@
         </Tabs>
       </div>
       <div class="topcenternav">
-        <Heading size="XS">{$store.name}</Heading>
+        <Heading size="XS">{$appStore.name}</Heading>
       </div>
       <div class="toprightnav">
         <span>
@@ -190,7 +182,7 @@
   {/await}
 </div>
 
-{#if $store.showPreview}
+{#if $previewStore.showPreview}
   <PreviewOverlay />
 {/if}
 
diff --git a/packages/builder/src/pages/builder/app/[application]/automation/[automationId]/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/automation/[automationId]/_layout.svelte
index 3be71a1bbe..9d5f716e0e 100644
--- a/packages/builder/src/pages/builder/app/[application]/automation/[automationId]/_layout.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/automation/[automationId]/_layout.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { automationStore } from "builderStore"
+  import { automationStore } from "stores/builder"
   import { params } from "@roxi/routify"
 
   if ($params.automation) {
diff --git a/packages/builder/src/pages/builder/app/[application]/automation/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/automation/_layout.svelte
index 329827f70f..c4ee060149 100644
--- a/packages/builder/src/pages/builder/app/[application]/automation/_layout.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/automation/_layout.svelte
@@ -1,6 +1,5 @@
 <script>
   import { Heading, Body, Layout, Button, Modal } from "@budibase/bbui"
-  import { automationStore, selectedAutomation, store } from "builderStore"
   import AutomationPanel from "components/automation/AutomationPanel/AutomationPanel.svelte"
   import CreateAutomationModal from "components/automation/AutomationPanel/CreateAutomationModal.svelte"
   import CreateWebhookModal from "components/automation/Shared/CreateWebhookModal.svelte"
@@ -8,9 +7,14 @@
   import { onDestroy, onMount } from "svelte"
   import { syncURLToState } from "helpers/urlStateSync"
   import * as routify from "@roxi/routify"
+  import {
+    builderStore,
+    automationStore,
+    selectedAutomation,
+  } from "stores/builder"
 
   $: automationId = $selectedAutomation?._id
-  $: store.actions.websocket.selectResource(automationId)
+  $: builderStore.selectResource(automationId)
 
   // Keep URL and state in sync for selected screen ID
   const stopSyncing = syncURLToState({
@@ -19,7 +23,7 @@
     validate: id => $automationStore.automations.some(x => x._id === id),
     fallbackUrl: "./index",
     store: automationStore,
-    up: automationStore.actions.select,
+    update: automationStore.actions.select,
     routify,
   })
 
diff --git a/packages/builder/src/pages/builder/app/[application]/automation/index.svelte b/packages/builder/src/pages/builder/app/[application]/automation/index.svelte
index ea2c853139..ffd9b5d34c 100644
--- a/packages/builder/src/pages/builder/app/[application]/automation/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/automation/index.svelte
@@ -1,6 +1,6 @@
 <script>
   import { redirect } from "@roxi/routify"
-  import { automationStore } from "builderStore"
+  import { automationStore } from "stores/builder"
 
   $: {
     if ($automationStore.automations?.length) {
diff --git a/packages/builder/src/pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal/GoogleButton.svelte b/packages/builder/src/pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal/GoogleButton.svelte
index ceb8fd7f4b..3024fe1395 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal/GoogleButton.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal/GoogleButton.svelte
@@ -1,7 +1,7 @@
 <script>
   import GoogleLogo from "assets/google-logo.png"
-  import { store } from "builderStore"
   import { auth } from "stores/portal"
+  import { appStore } from "stores/builder"
 
   export let disabled
   export let samePage
@@ -13,7 +13,7 @@
   class:disabled
   {disabled}
   on:click={async () => {
-    let appId = $store.appId
+    let appId = $appStore.appId
     const url = `/api/global/auth/${tenantId}/datasource/google?appId=${appId}`
     if (samePage) {
       window.location = url
diff --git a/packages/builder/src/pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal/index.svelte b/packages/builder/src/pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal/index.svelte
index d1ddc4a39c..e24b95a0fe 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal/index.svelte
@@ -7,7 +7,7 @@
   import { get } from "svelte/store"
   import TableImportSelection from "components/backend/Datasources/TableImportSelection/index.svelte"
   import DatasourceConfigEditor from "components/backend/Datasources/ConfigEditor/index.svelte"
-  import { datasources } from "stores/backend"
+  import { datasources } from "stores/builder"
   import { createOnGoogleAuthStore } from "./stores/onGoogleAuth.js"
   import { createDatasourceCreationStore } from "./stores/datasourceCreation.js"
   import { configFromIntegration } from "stores/selectors"
diff --git a/packages/builder/src/pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal/stores/onGoogleAuth.js b/packages/builder/src/pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal/stores/onGoogleAuth.js
index 717ecf5e4e..57dd5ee419 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal/stores/onGoogleAuth.js
+++ b/packages/builder/src/pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal/stores/onGoogleAuth.js
@@ -1,6 +1,6 @@
 import { derived } from "svelte/store"
 import { params } from "@roxi/routify"
-import { integrations } from "stores/backend"
+import { integrations } from "stores/builder"
 import { IntegrationTypes } from "constants/backend"
 
 export const createOnGoogleAuthStore = () => {
diff --git a/packages/builder/src/pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal/stores/onGoogleAuth.test.js b/packages/builder/src/pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal/stores/onGoogleAuth.test.js
index 14db846c9a..f3e921c698 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal/stores/onGoogleAuth.test.js
+++ b/packages/builder/src/pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal/stores/onGoogleAuth.test.js
@@ -4,14 +4,14 @@ import { writable, get } from "svelte/store"
 // eslint-disable-next-line no-unused-vars
 import { params } from "@roxi/routify"
 // eslint-disable-next-line no-unused-vars
-import { integrations } from "stores/backend"
+import { integrations } from "stores/builder"
 import { IntegrationTypes } from "constants/backend"
 
 vi.mock("@roxi/routify", () => ({
   params: vi.fn(),
 }))
 
-vi.mock("stores/backend", () => ({
+vi.mock("stores/builder", () => ({
   integrations: vi.fn(),
 }))
 
diff --git a/packages/builder/src/pages/builder/app/[application]/data/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/data/_layout.svelte
index 7dea0078fd..869110c2f4 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/_layout.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/_layout.svelte
@@ -3,7 +3,7 @@
   import DatasourceNavigator from "components/backend/DatasourceNavigator/DatasourceNavigator.svelte"
   import Panel from "components/design/Panel.svelte"
   import { isActive, redirect, goto, params } from "@roxi/routify"
-  import { datasources } from "stores/backend"
+  import { datasources } from "stores/builder"
   import NavHeader from "components/common/NavHeader.svelte"
 
   let searchValue
diff --git a/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/EditDatasourceConfig.svelte b/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/EditDatasourceConfig.svelte
index db59efd3a9..c4f0861f45 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/EditDatasourceConfig.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/EditDatasourceConfig.svelte
@@ -1,7 +1,7 @@
 <script>
   import { keepOpen, Modal, notifications } from "@budibase/bbui"
   import { integrationForDatasource } from "stores/selectors"
-  import { datasources, integrations } from "stores/backend"
+  import { datasources, integrations } from "stores/builder"
   import DatasourceConfigEditor from "components/backend/Datasources/ConfigEditor/index.svelte"
   import EditDatasourceConfigButton from "./EditDatasourceConfigButton.svelte"
 
diff --git a/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Authentication/RestAuthenticationModal.svelte b/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Authentication/RestAuthenticationModal.svelte
index 109217a8d2..42ac1204f8 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Authentication/RestAuthenticationModal.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Authentication/RestAuthenticationModal.svelte
@@ -12,10 +12,7 @@
   } from "@budibase/bbui"
   import { AUTH_TYPE_LABELS, AUTH_TYPES } from "./authTypes"
   import BindableCombobox from "components/common/bindings/BindableCombobox.svelte"
-  import {
-    getAuthBindings,
-    getEnvironmentBindings,
-  } from "builderStore/dataBinding"
+  import { getAuthBindings, getEnvironmentBindings } from "dataBinding"
   import { environment, licensing, auth } from "stores/portal"
   import CreateEditVariableModal from "components/portal/environment/CreateEditVariableModal.svelte"
 
diff --git a/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Headers.svelte b/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Headers.svelte
index 221547309b..6e7ed89d84 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Headers.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Headers.svelte
@@ -5,7 +5,7 @@
     getRestBindings,
     readableToRuntimeBinding,
     runtimeToReadableMap,
-  } from "builderStore/dataBinding"
+  } from "dataBinding"
   import { cloneDeep } from "lodash/fp"
   import SaveDatasourceButton from "./SaveDatasourceButton.svelte"
   import Panel from "./Panel.svelte"
diff --git a/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Queries/RestImportQueriesModal.svelte b/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Queries/RestImportQueriesModal.svelte
index a72359a950..87f90551a4 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Queries/RestImportQueriesModal.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Queries/RestImportQueriesModal.svelte
@@ -12,7 +12,7 @@
     TextArea,
     Dropzone,
   } from "@budibase/bbui"
-  import { datasources, queries } from "stores/backend"
+  import { datasources, queries } from "stores/builder"
   import { writable } from "svelte/store"
 
   export let navigateDatasource = false
diff --git a/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Queries/index.svelte b/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Queries/index.svelte
index 7e28e8ec07..93f1e87672 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Queries/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Queries/index.svelte
@@ -1,7 +1,7 @@
 <script>
   import { goto } from "@roxi/routify"
   import { Button, Table } from "@budibase/bbui"
-  import { queries } from "stores/backend"
+  import { queries } from "stores/builder"
   import CapitaliseRenderer from "components/common/renderers/CapitaliseRenderer.svelte"
   import RestImportButton from "./RestImportButton.svelte"
   import Panel from "../Panel.svelte"
diff --git a/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Relationships.svelte b/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Relationships.svelte
index 19f2486298..dd35abf001 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Relationships.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Relationships.svelte
@@ -5,7 +5,7 @@
     tables as tablesStore,
     integrations as integrationsStore,
     datasources as datasourcesStore,
-  } from "stores/backend"
+  } from "stores/builder"
   import { DatasourceFeature } from "@budibase/types"
   import { API } from "api"
   import Panel from "./Panel.svelte"
diff --git a/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/SaveDatasourceButton.svelte b/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/SaveDatasourceButton.svelte
index f53215b8ce..83a8e13c9e 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/SaveDatasourceButton.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/SaveDatasourceButton.svelte
@@ -2,7 +2,7 @@
   import { get } from "svelte/store"
   import { isEqual } from "lodash"
   import { integrationForDatasource } from "stores/selectors"
-  import { integrations, datasources } from "stores/backend"
+  import { integrations, datasources } from "stores/builder"
   import { notifications, Button } from "@budibase/bbui"
 
   export let datasource
diff --git a/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Tables/Controls.svelte b/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Tables/Controls.svelte
index 881b552438..612ea5fc35 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Tables/Controls.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Tables/Controls.svelte
@@ -1,6 +1,6 @@
 <script>
   import { Button, Modal } from "@budibase/bbui"
-  import { integrations, tables } from "stores/backend"
+  import { integrations, tables } from "stores/builder"
   import CreateExternalTableModal from "./CreateExternalTableModal.svelte"
   import TableImportSelection from "components/backend/Datasources/TableImportSelection/index.svelte"
   import { integrationForDatasource } from "stores/selectors"
diff --git a/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Tables/CreateExternalTableModal.svelte b/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Tables/CreateExternalTableModal.svelte
index faa3611f5d..129b975309 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Tables/CreateExternalTableModal.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Tables/CreateExternalTableModal.svelte
@@ -1,6 +1,6 @@
 <script>
   import { ModalContent, Body, Input, notifications } from "@budibase/bbui"
-  import { tables, datasources } from "stores/backend"
+  import { tables, datasources } from "stores/builder"
   import { goto } from "@roxi/routify"
   import { DB_TYPE_EXTERNAL } from "constants/backend"
 
diff --git a/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Variables/ViewDynamicVariables.svelte b/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Variables/ViewDynamicVariables.svelte
index dd5668d603..2d37c71999 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Variables/ViewDynamicVariables.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Variables/ViewDynamicVariables.svelte
@@ -1,6 +1,6 @@
 <script>
   import { Body, Table, BoldRenderer, CodeRenderer } from "@budibase/bbui"
-  import { queries } from "stores/backend"
+  import { queries } from "stores/builder"
   import { goto } from "@roxi/routify"
 
   export let datasource
diff --git a/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Variables/index.svelte b/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Variables/index.svelte
index ce388f280e..b50d5e7611 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Variables/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Variables/index.svelte
@@ -2,9 +2,9 @@
   import { Heading, Layout } from "@budibase/bbui"
   import KeyValueBuilder from "components/integration/KeyValueBuilder.svelte"
   import ViewDynamicVariables from "./ViewDynamicVariables.svelte"
-  import { getEnvironmentBindings } from "builderStore/dataBinding"
+  import { getEnvironmentBindings } from "dataBinding"
   import { licensing } from "stores/portal"
-  import { queries } from "stores/backend"
+  import { queries } from "stores/builder"
   import { cloneDeep } from "lodash/fp"
   import SaveDatasourceButton from "../SaveDatasourceButton.svelte"
   import Panel from "../Panel.svelte"
diff --git a/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_layout.svelte
index b45fa78c40..417f750ab5 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_layout.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_layout.svelte
@@ -1,13 +1,12 @@
 <script>
   import { params } from "@roxi/routify"
-  import { datasources } from "stores/backend"
+  import { datasources, builderStore } from "stores/builder"
   import { syncURLToState } from "helpers/urlStateSync"
   import * as routify from "@roxi/routify"
   import { onDestroy } from "svelte"
-  import { store } from "builderStore"
 
   $: datasourceId = $datasources.selectedDatasourceId
-  $: store.actions.websocket.selectResource(datasourceId)
+  $: builderStore.selectResource(datasourceId)
 
   const stopSyncing = syncURLToState({
     urlParam: "datasourceId",
diff --git a/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/index.svelte b/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/index.svelte
index 090cffeb7e..b723788695 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/index.svelte
@@ -1,6 +1,6 @@
 <script>
   import { Tabs, Tab, Heading, Body, Layout } from "@budibase/bbui"
-  import { datasources, integrations } from "stores/backend"
+  import { datasources, integrations } from "stores/builder"
   import ICONS from "components/backend/DatasourceNavigator/icons"
   import EditDatasourceConfig from "./_components/EditDatasourceConfig.svelte"
   import TablesPanel from "./_components/panels/Tables/index.svelte"
@@ -12,12 +12,16 @@
   import PromptQueryModal from "./_components/PromptQueryModal.svelte"
   import SettingsPanel from "./_components/panels/Settings.svelte"
   import { helpers } from "@budibase/shared-core"
+  import { admin } from "stores/portal"
+  import { IntegrationTypes } from "constants/backend"
 
   let selectedPanel = null
   let panelOptions = []
 
   $: datasource = $datasources.selected
 
+  $: isCloud = $admin.cloud
+  $: isPostgres = datasource?.source === IntegrationTypes.POSTGRES
   $: getOptions(datasource)
 
   const getOptions = datasource => {
@@ -41,7 +45,13 @@
     }
     // always the last option for SQL
     if (helpers.isSQL(datasource)) {
-      panelOptions.push("Settings")
+      if (isCloud && isPostgres) {
+        // We don't show the settings panel for Postgres on Budicloud because
+        // it requires pg_dump to work and we don't want to enable shell injection
+        // attacks.
+      } else {
+        panelOptions.push("Settings")
+      }
     }
   }
 </script>
diff --git a/packages/builder/src/pages/builder/app/[application]/data/datasource/bb_internal/index.svelte b/packages/builder/src/pages/builder/app/[application]/data/datasource/bb_internal/index.svelte
index 21214d8840..2b059a36ed 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/datasource/bb_internal/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/datasource/bb_internal/index.svelte
@@ -2,16 +2,15 @@
   import { Button, Heading, Body, Layout, Modal, Divider } from "@budibase/bbui"
   import CreateTableModal from "components/backend/TableNavigator/modals/CreateTableModal.svelte"
   import ICONS from "components/backend/DatasourceNavigator/icons"
-  import { tables, datasources } from "stores/backend"
+  import { tables, datasources, builderStore } from "stores/builder"
   import { goto } from "@roxi/routify"
   import { onMount } from "svelte"
   import { BUDIBASE_INTERNAL_DB_ID, DB_TYPE_EXTERNAL } from "constants/backend"
   import { TableNames } from "constants"
-  import { store } from "builderStore"
 
   let modal
 
-  $: store.actions.websocket.selectResource(BUDIBASE_INTERNAL_DB_ID)
+  $: builderStore.selectResource(BUDIBASE_INTERNAL_DB_ID)
   $: internalTablesBySourceId = $tables.list.filter(
     table =>
       table.sourceType !== DB_TYPE_EXTERNAL &&
diff --git a/packages/builder/src/pages/builder/app/[application]/data/datasource/datasource_internal_bb_default/index.svelte b/packages/builder/src/pages/builder/app/[application]/data/datasource/datasource_internal_bb_default/index.svelte
index 44cb8db3b0..f49eaef1ed 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/datasource/datasource_internal_bb_default/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/datasource/datasource_internal_bb_default/index.svelte
@@ -2,15 +2,14 @@
   import { Button, Heading, Body, Layout, Modal, Divider } from "@budibase/bbui"
   import CreateTableModal from "components/backend/TableNavigator/modals/CreateTableModal.svelte"
   import ICONS from "components/backend/DatasourceNavigator/icons"
-  import { tables, datasources } from "stores/backend"
+  import { tables, datasources, builderStore } from "stores/builder"
   import { goto } from "@roxi/routify"
   import { DEFAULT_BB_DATASOURCE_ID, DB_TYPE_EXTERNAL } from "constants/backend"
   import { onMount } from "svelte"
-  import { store } from "builderStore"
 
   let modal
 
-  $: store.actions.websocket.selectResource(DEFAULT_BB_DATASOURCE_ID)
+  $: builderStore.selectResource(DEFAULT_BB_DATASOURCE_ID)
   $: internalTablesBySourceId = $tables.list.filter(
     table =>
       table.sourceType !== DB_TYPE_EXTERNAL &&
diff --git a/packages/builder/src/pages/builder/app/[application]/data/datasource/index.svelte b/packages/builder/src/pages/builder/app/[application]/data/datasource/index.svelte
index 347e1138d4..c77ff0dce9 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/datasource/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/datasource/index.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { datasources } from "stores/backend"
+  import { datasources } from "stores/builder"
   import { redirect } from "@roxi/routify"
   import { onMount } from "svelte"
 
diff --git a/packages/builder/src/pages/builder/app/[application]/data/index.svelte b/packages/builder/src/pages/builder/app/[application]/data/index.svelte
index 9ccc9bffcf..ff9a27a14b 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/index.svelte
@@ -1,7 +1,7 @@
 <script>
   import { redirect } from "@roxi/routify"
   import { TableNames } from "constants"
-  import { datasources } from "stores/backend"
+  import { datasources } from "stores/builder"
 
   $: {
     if ($datasources.hasData) {
diff --git a/packages/builder/src/pages/builder/app/[application]/data/new.svelte b/packages/builder/src/pages/builder/app/[application]/data/new.svelte
index b2aca33c6a..c07a9f563d 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/new.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/new.svelte
@@ -4,7 +4,7 @@
     tables,
     datasources,
     sortedIntegrations as integrations,
-  } from "stores/backend"
+  } from "stores/builder"
 
   import { hasData } from "stores/selectors"
   import { notifications, Body, Icon, AbsTooltip } from "@budibase/bbui"
diff --git a/packages/builder/src/pages/builder/app/[application]/data/query/[queryId]/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/data/query/[queryId]/_layout.svelte
index d3229c89a0..580c0d557a 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/query/[queryId]/_layout.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/query/[queryId]/_layout.svelte
@@ -1,12 +1,11 @@
 <script>
-  import { queries } from "stores/backend"
+  import { queries, builderStore } from "stores/builder"
   import { syncURLToState } from "helpers/urlStateSync"
   import * as routify from "@roxi/routify"
   import { onDestroy } from "svelte"
-  import { store } from "builderStore"
 
   $: queryId = $queries.selectedQueryId
-  $: store.actions.websocket.selectResource(queryId)
+  $: builderStore.selectResource(queryId)
 
   const stopSyncing = syncURLToState({
     urlParam: "queryId",
diff --git a/packages/builder/src/pages/builder/app/[application]/data/query/[queryId]/index.svelte b/packages/builder/src/pages/builder/app/[application]/data/query/[queryId]/index.svelte
index fadd32ac75..754bf9c83d 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/query/[queryId]/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/query/[queryId]/index.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { database, queries, datasources } from "stores/backend"
+  import { queries, datasources } from "stores/builder"
   import QueryViewer from "components/integration/QueryViewer.svelte"
   import RestQueryViewer from "components/integration/RestQueryViewer.svelte"
   import { IntegrationTypes } from "constants/backend"
@@ -11,7 +11,7 @@
   $: isRestQuery = datasource?.source === IntegrationTypes.REST
 </script>
 
-{#if $database._id && query}
+{#if query}
   {#if isRestQuery}
     <RestQueryViewer queryId={$queries.selectedQueryId} />
   {:else}
diff --git a/packages/builder/src/pages/builder/app/[application]/data/query/index.svelte b/packages/builder/src/pages/builder/app/[application]/data/query/index.svelte
index 6e53f69bcc..277970defa 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/query/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/query/index.svelte
@@ -1,6 +1,6 @@
 <script>
   import { onMount } from "svelte"
-  import { queries } from "stores/backend"
+  import { queries } from "stores/builder"
   import { redirect } from "@roxi/routify"
 
   onMount(async () => {
diff --git a/packages/builder/src/pages/builder/app/[application]/data/query/new/[datasourceId]/index.svelte b/packages/builder/src/pages/builder/app/[application]/data/query/new/[datasourceId]/index.svelte
index 0f0ff15a41..7d27b05d67 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/query/new/[datasourceId]/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/query/new/[datasourceId]/index.svelte
@@ -1,9 +1,9 @@
 <script>
   import { params, redirect } from "@roxi/routify"
-  import { database, datasources } from "stores/backend"
   import QueryViewer from "components/integration/QueryViewer.svelte"
   import RestQueryViewer from "components/integration/RestQueryViewer.svelte"
   import { IntegrationTypes } from "constants/backend"
+  import { datasources } from "stores/builder"
 
   $: datasource = $datasources.list.find(ds => ds._id === $params.datasourceId)
   $: {
@@ -32,7 +32,7 @@
   }
 </script>
 
-{#if $database._id && datasource && query}
+{#if datasource && query}
   {#if isRestQuery}
     <RestQueryViewer />
   {:else}
diff --git a/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/_layout.svelte
index e166a509c4..8c60dbdd69 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/_layout.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/_layout.svelte
@@ -1,12 +1,11 @@
 <script>
   import { syncURLToState } from "helpers/urlStateSync"
-  import { tables } from "stores/backend"
+  import { tables, builderStore } from "stores/builder"
   import * as routify from "@roxi/routify"
   import { onDestroy } from "svelte"
-  import { store } from "builderStore"
 
   $: tableId = $tables.selectedTableId
-  $: store.actions.websocket.selectResource(tableId)
+  $: builderStore.selectResource(tableId)
 
   const stopSyncing = syncURLToState({
     urlParam: "tableId",
diff --git a/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/index.svelte b/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/index.svelte
index a68a782bed..d79a0bc0ad 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/index.svelte
@@ -1,6 +1,6 @@
 <script>
   import TableDataTable from "components/backend/DataTable/TableDataTable.svelte"
-  import { tables, database } from "stores/backend"
+  import { tables } from "stores/builder"
   import { Banner } from "@budibase/bbui"
 
   const verifyAutocolumns = table => {
@@ -30,7 +30,7 @@
   })
 </script>
 
-{#if $database?._id && $tables?.selected?.name}
+{#if $tables?.selected?.name}
   {#if duplicates?.length}
     <div class="alert-wrap">
       <Banner type="warning" showCloseButton={false}>
diff --git a/packages/builder/src/pages/builder/app/[application]/data/table/index.svelte b/packages/builder/src/pages/builder/app/[application]/data/table/index.svelte
index f513d8ceb9..3f21e48672 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/table/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/table/index.svelte
@@ -1,6 +1,6 @@
 <script>
   import { onMount } from "svelte"
-  import { datasources, tables } from "stores/backend"
+  import { datasources, tables } from "stores/builder"
   import { redirect } from "@roxi/routify"
   import { TableNames } from "constants"
 
diff --git a/packages/builder/src/pages/builder/app/[application]/data/view/index.svelte b/packages/builder/src/pages/builder/app/[application]/data/view/index.svelte
index 0a2fc3c32d..623cd224db 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/view/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/view/index.svelte
@@ -1,6 +1,6 @@
 <script>
   import { onMount } from "svelte"
-  import { views, viewsV2 } from "stores/backend"
+  import { views, viewsV2 } from "stores/builder"
   import { redirect } from "@roxi/routify"
 
   onMount(async () => {
diff --git a/packages/builder/src/pages/builder/app/[application]/data/view/v1/[viewName]/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/data/view/v1/[viewName]/_layout.svelte
index 7f4fc9c597..df3a18c2bb 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/view/v1/[viewName]/_layout.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/view/v1/[viewName]/_layout.svelte
@@ -1,12 +1,11 @@
 <script>
-  import { views } from "stores/backend"
+  import { views, builderStore } from "stores/builder"
   import { syncURLToState } from "helpers/urlStateSync"
   import * as routify from "@roxi/routify"
   import { onDestroy } from "svelte"
-  import { store } from "builderStore"
 
   $: name = $views.selectedViewName
-  $: store.actions.websocket.selectResource(name)
+  $: builderStore.selectResource(name)
 
   const stopSyncing = syncURLToState({
     urlParam: "viewName",
diff --git a/packages/builder/src/pages/builder/app/[application]/data/view/v1/[viewName]/index.svelte b/packages/builder/src/pages/builder/app/[application]/data/view/v1/[viewName]/index.svelte
index 2d02b6bcda..51149b602d 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/view/v1/[viewName]/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/view/v1/[viewName]/index.svelte
@@ -1,11 +1,11 @@
 <script>
   import ViewDataTable from "components/backend/DataTable/ViewDataTable.svelte"
-  import { views, database } from "stores/backend"
+  import { views } from "stores/builder"
 
   $: selectedView = $views.selected
 </script>
 
-{#if $database._id && selectedView}
+{#if selectedView}
   <ViewDataTable view={selectedView} />
 {:else}<i>Create your first table to start building</i>{/if}
 
diff --git a/packages/builder/src/pages/builder/app/[application]/data/view/v2/[viewId]/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/data/view/v2/[viewId]/_layout.svelte
index 8ddd6adbd0..3d0cffc387 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/view/v2/[viewId]/_layout.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/view/v2/[viewId]/_layout.svelte
@@ -1,12 +1,11 @@
 <script>
-  import { viewsV2 } from "stores/backend"
+  import { viewsV2, builderStore } from "stores/builder"
   import { syncURLToState } from "helpers/urlStateSync"
   import * as routify from "@roxi/routify"
   import { onDestroy } from "svelte"
-  import { store } from "builderStore"
 
   $: id = $viewsV2.selectedViewId
-  $: store.actions.websocket.selectResource(id)
+  $: builderStore.selectResource(id)
 
   const stopSyncing = syncURLToState({
     urlParam: "viewId",
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/ComponentSettingsPanel.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/ComponentSettingsPanel.svelte
index 9928f19a7f..8b778a2ce7 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/ComponentSettingsPanel.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/ComponentSettingsPanel.svelte
@@ -1,39 +1,42 @@
 <script>
   import Panel from "components/design/Panel.svelte"
-  import { store, selectedComponent, selectedScreen } from "builderStore"
-  import { getComponentName } from "builderStore/componentUtils"
+  import {
+    selectedScreen,
+    componentStore,
+    selectedComponent,
+  } from "stores/builder"
   import ComponentSettingsSection from "./ComponentSettingsSection.svelte"
   import DesignSection from "./DesignSection.svelte"
   import CustomStylesSection from "./CustomStylesSection.svelte"
   import ConditionalUISection from "./ConditionalUISection.svelte"
-  import { notifications, ActionButton } from "@budibase/bbui"
-
+  import { getComponentName } from "helpers/components"
   import {
     getBindableProperties,
     getComponentBindableProperties,
-  } from "builderStore/dataBinding"
+  } from "dataBinding"
+  import { ActionButton, notifications } from "@budibase/bbui"
   import { capitalise } from "helpers"
 
   const onUpdateName = async value => {
     try {
-      await store.actions.components.updateSetting("_instanceName", value)
+      await componentStore.updateSetting("_instanceName", value)
     } catch (error) {
       notifications.error("Error updating component name")
     }
   }
 
   $: componentInstance = $selectedComponent
-  $: componentDefinition = store.actions.components.getDefinition(
+  $: componentDefinition = componentStore.getDefinition(
     $selectedComponent?._component
   )
   $: bindings = getBindableProperties(
     $selectedScreen,
-    $store.selectedComponentId
+    $componentStore.selectedComponentId
   )
 
   $: componentBindings = getComponentBindableProperties(
     $selectedScreen,
-    $store.selectedComponentId
+    $componentStore.selectedComponentId
   )
   $: isScreen = $selectedComponent?._id === $selectedScreen?.props._id
   $: title = isScreen ? "Screen" : $selectedComponent?._instanceName
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/ComponentSettingsSection.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/ComponentSettingsSection.svelte
index c096ef58ec..36ef6a7526 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/ComponentSettingsSection.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/ComponentSettingsSection.svelte
@@ -1,7 +1,7 @@
 <script>
   import { helpers } from "@budibase/shared-core"
   import { DetailSummary, notifications } from "@budibase/bbui"
-  import { store } from "builderStore"
+  import { componentStore } from "stores/builder"
   import PropertyControl from "components/design/settings/controls/PropertyControl.svelte"
   import ResetFieldsButton from "components/design/settings/controls/ResetFieldsButton.svelte"
   import EjectBlockButton from "components/design/settings/controls/EjectBlockButton.svelte"
@@ -75,7 +75,7 @@
       if (typeof onUpdateSetting === "function") {
         await onUpdateSetting(setting, value)
       } else {
-        await store.actions.components.updateSetting(setting.key, value)
+        await componentStore.updateSetting(setting.key, value)
       }
       // Send event if required
       if (setting.sendEvents) {
@@ -183,8 +183,9 @@
               defaultValue={setting.defaultValue}
               nested={setting.nested}
               onChange={val => updateSetting(setting, val)}
-              highlighted={$store.highlightedSettingKey === setting.key}
-              propertyFocus={$store.propertyFocus === setting.key}
+              highlighted={$componentStore.highlightedSettingKey ===
+                setting.key}
+              propertyFocus={$componentStore.propertyFocus === setting.key}
               info={setting.info}
               disableBindings={setting.disableBindings}
               props={{
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/ConditionalUIDrawer.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/ConditionalUIDrawer.svelte
index ddbc8b004e..e4cc4a4f99 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/ConditionalUIDrawer.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/ConditionalUIDrawer.svelte
@@ -13,10 +13,9 @@
   import { generate } from "shortid"
   import DrawerBindableInput from "components/common/bindings/DrawerBindableInput.svelte"
   import { LuceneUtils, Constants } from "@budibase/frontend-core"
-  import { selectedComponent } from "builderStore"
+  import { selectedComponent, componentStore } from "stores/builder"
   import { getComponentForSetting } from "components/design/settings/componentSettings"
   import PropertyControl from "components/design/settings/controls/PropertyControl.svelte"
-  import { getComponentSettings } from "builderStore/componentUtils"
 
   export let conditions = []
   export let bindings = []
@@ -56,11 +55,13 @@
   ]
 
   let dragDisabled = true
-  $: settings = getComponentSettings($selectedComponent?._component)?.concat({
-    label: "Custom CSS",
-    key: "_css",
-    type: "text",
-  })
+  $: settings = componentStore
+    .getComponentSettings($selectedComponent?._component)
+    ?.concat({
+      label: "Custom CSS",
+      key: "_css",
+      type: "text",
+    })
   $: settingOptions = settings
     .filter(setting => setting.supportsConditions !== false)
     .map(setting => ({
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/ConditionalUISection.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/ConditionalUISection.svelte
index c32116c8a0..bc71f8b696 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/ConditionalUISection.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/ConditionalUISection.svelte
@@ -6,7 +6,7 @@
     Button,
     notifications,
   } from "@budibase/bbui"
-  import { store } from "builderStore"
+  import { componentStore } from "stores/builder"
   import ConditionalUIDrawer from "./ConditionalUIDrawer.svelte"
 
   export let componentInstance
@@ -22,7 +22,7 @@
 
   const save = async () => {
     try {
-      await store.actions.components.updateConditions(tempValue)
+      await componentStore.updateConditions(tempValue)
     } catch (error) {
       notifications.error("Error updating conditions")
     }
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/CustomStylesSection.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/CustomStylesSection.svelte
index d8508619f3..fea5da244f 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/CustomStylesSection.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/CustomStylesSection.svelte
@@ -9,13 +9,13 @@
     Icon,
     Body,
   } from "@budibase/bbui"
-  import { selectedScreen, store } from "builderStore"
+  import { selectedScreen, componentStore } from "stores/builder"
   import ClientBindingPanel from "components/common/bindings/ClientBindingPanel.svelte"
   import {
     getBindableProperties,
     readableToRuntimeBinding,
     runtimeToReadableBinding,
-  } from "builderStore/dataBinding"
+  } from "dataBinding"
 
   export let componentInstance
   export let componentDefinition
@@ -27,7 +27,7 @@
 
   $: bindings = getBindableProperties(
     $selectedScreen,
-    $store.selectedComponentId
+    $componentStore.selectedComponentId
   )
 
   $: icon = componentDefinition?.icon
@@ -43,7 +43,7 @@
   const save = async () => {
     try {
       const value = readableToRuntimeBinding(bindings, tempValue)
-      await store.actions.components.updateCustomStyle(value)
+      await componentStore.updateCustomStyle(value)
     } catch (error) {
       notifications.error("Error updating custom style")
     }
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/StyleSection.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/StyleSection.svelte
index 4bd9ba539b..a0a0686412 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/StyleSection.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/StyleSection.svelte
@@ -1,7 +1,7 @@
 <script>
   import PropertyControl from "components/design/settings/controls/PropertyControl.svelte"
   import { DetailSummary, notifications } from "@budibase/bbui"
-  import { store } from "builderStore"
+  import { componentStore } from "stores/builder"
 
   export let name
   export let properties
@@ -25,7 +25,7 @@
 
   const updateStyle = async (key, val) => {
     try {
-      await store.actions.components.updateStyle(key, val)
+      await componentStore.updateStyle(key, val)
     } catch (error) {
       notifications.error("Error updating style")
     }
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Navigation/LinksDrawer.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Navigation/LinksDrawer.svelte
index 5ffccc5800..ac6f32ccc8 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Navigation/LinksDrawer.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Navigation/LinksDrawer.svelte
@@ -10,7 +10,7 @@
   import { flip } from "svelte/animate"
   import { dndzone } from "svelte-dnd-action"
   import { generate } from "shortid"
-  import { store } from "builderStore"
+  import { screenStore } from "stores/builder"
   import RoleSelect from "components/design/settings/controls/RoleSelect.svelte"
 
   export let links = []
@@ -23,7 +23,7 @@
       link.id = generate()
     }
   })
-  $: urlOptions = $store.screens
+  $: urlOptions = $screenStore.screens
     .map(screen => screen.routing?.route)
     .filter(x => x != null)
 
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Navigation/LinksEditor.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Navigation/LinksEditor.svelte
index b081ea6d72..c664f50f10 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Navigation/LinksEditor.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Navigation/LinksEditor.svelte
@@ -2,20 +2,20 @@
   import { Button, Drawer } from "@budibase/bbui"
   import NavigationLinksDrawer from "./LinksDrawer.svelte"
   import { cloneDeep } from "lodash/fp"
-  import { store } from "builderStore"
+  import { navigationStore } from "stores/builder"
 
   let drawer
   let links
 
   const openDrawer = () => {
-    links = cloneDeep($store.navigation.links || [])
+    links = cloneDeep($navigationStore.links || [])
     drawer.show()
   }
 
   const save = async () => {
-    let navigation = $store.navigation
+    let navigation = $navigationStore
     navigation.links = links
-    await store.actions.navigation.save(navigation)
+    await navigationStore.save(navigation)
     drawer.hide()
   }
 </script>
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Navigation/index.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Navigation/index.svelte
index 383026c4f8..50e1ad0cf8 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Navigation/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Navigation/index.svelte
@@ -15,12 +15,22 @@
     Checkbox,
     notifications,
     Select,
+    Combobox,
   } from "@budibase/bbui"
-  import { selectedScreen, store } from "builderStore"
+  import {
+    themeStore,
+    selectedScreen,
+    screenStore,
+    navigationStore,
+  } from "stores/builder"
   import { DefaultAppTheme } from "constants"
 
+  $: screenRouteOptions = $screenStore.screens
+    .map(screen => screen.routing?.route)
+    .filter(x => x != null)
+
   const updateShowNavigation = async e => {
-    await store.actions.screens.updateSetting(
+    await screenStore.updateSetting(
       get(selectedScreen),
       "showNavigation",
       e.detail
@@ -29,9 +39,9 @@
 
   const update = async (key, value) => {
     try {
-      let navigation = $store.navigation
+      let navigation = $navigationStore
       navigation[key] = value
-      await store.actions.navigation.save(navigation)
+      await navigationStore.save(navigation)
     } catch (error) {
       notifications.error("Error updating navigation settings")
     }
@@ -40,7 +50,7 @@
 
 <Panel
   title="Navigation"
-  icon={$selectedScreen.showNavigation ? "Visibility" : "VisibilityOff"}
+  icon={$selectedScreen?.showNavigation ? "Visibility" : "VisibilityOff"}
   borderLeft
   wide
 >
@@ -51,13 +61,13 @@
     <div class="toggle">
       <Toggle
         on:change={updateShowNavigation}
-        value={$selectedScreen.showNavigation}
+        value={$selectedScreen?.showNavigation}
       />
       <Body size="S">Show nav on this screen</Body>
     </div>
   </div>
 
-  {#if $selectedScreen.showNavigation}
+  {#if $selectedScreen?.showNavigation}
     <div class="divider" />
     <div class="customizeSection">
       <div class="subheading">
@@ -76,25 +86,25 @@
         </div>
         <ActionGroup quiet>
           <ActionButton
-            selected={$store.navigation.navigation === "Top"}
-            quiet={$store.navigation.navigation !== "Top"}
+            selected={$navigationStore.navigation === "Top"}
+            quiet={$navigationStore.navigation !== "Top"}
             icon="PaddingTop"
             on:click={() => update("navigation", "Top")}
           />
           <ActionButton
-            selected={$store.navigation.navigation === "Left"}
-            quiet={$store.navigation.navigation !== "Left"}
+            selected={$navigationStore.navigation === "Left"}
+            quiet={$navigationStore.navigation !== "Left"}
             icon="PaddingLeft"
             on:click={() => update("navigation", "Left")}
           />
         </ActionGroup>
 
-        {#if $store.navigation.navigation === "Top"}
+        {#if $navigationStore.navigation === "Top"}
           <div class="label">
             <Label size="M">Sticky header</Label>
           </div>
           <Checkbox
-            value={$store.navigation.sticky}
+            value={$navigationStore.sticky}
             on:change={e => update("sticky", e.detail)}
           />
           <div class="label">
@@ -103,40 +113,23 @@
           <Select
             options={["Max", "Large", "Medium", "Small"]}
             plaveholder={null}
-            value={$store.navigation.navWidth}
+            value={$navigationStore.navWidth}
             on:change={e => update("navWidth", e.detail)}
           />
         {/if}
-        <div class="label">
-          <Label size="M">Show logo</Label>
-        </div>
-        <Checkbox
-          value={!$store.navigation.hideLogo}
-          on:change={e => update("hideLogo", !e.detail)}
-        />
-        {#if !$store.navigation.hideLogo}
-          <div class="label">
-            <Label size="M">Logo URL</Label>
-          </div>
-          <Input
-            value={$store.navigation.logoUrl}
-            on:change={e => update("logoUrl", e.detail)}
-            updateOnChange={false}
-          />
-        {/if}
         <div class="label">
           <Label size="M">Show title</Label>
         </div>
         <Checkbox
-          value={!$store.navigation.hideTitle}
+          value={!$navigationStore.hideTitle}
           on:change={e => update("hideTitle", !e.detail)}
         />
-        {#if !$store.navigation.hideTitle}
+        {#if !$navigationStore.hideTitle}
           <div class="label">
             <Label size="M">Title</Label>
           </div>
           <Input
-            value={$store.navigation.title}
+            value={$navigationStore.title}
             on:change={e => update("title", e.detail)}
             updateOnChange={false}
           />
@@ -145,8 +138,8 @@
           <Label>Background</Label>
         </div>
         <ColorPicker
-          spectrumTheme={$store.theme}
-          value={$store.navigation.navBackground ||
+          spectrumTheme={$themeStore.theme}
+          value={$navigationStore.navBackground ||
             DefaultAppTheme.navBackground}
           on:change={e => update("navBackground", e.detail)}
         />
@@ -154,12 +147,53 @@
           <Label>Text</Label>
         </div>
         <ColorPicker
-          spectrumTheme={$store.theme}
-          value={$store.navigation.navTextColor || DefaultAppTheme.navTextColor}
+          spectrumTheme={$themeStore.theme}
+          value={$navigationStore.navTextColor || DefaultAppTheme.navTextColor}
           on:change={e => update("navTextColor", e.detail)}
         />
       </div>
     </div>
+
+    <div class="divider" />
+    <div class="customizeSection">
+      <div class="subheading">
+        <Detail>Logo</Detail>
+      </div>
+      <div class="controls">
+        <div class="label">
+          <Label size="M">Show logo</Label>
+        </div>
+        <Checkbox
+          value={!$navigationStore.hideLogo}
+          on:change={e => update("hideLogo", !e.detail)}
+        />
+        {#if !$navigationStore.hideLogo}
+          <div class="label">
+            <Label size="M">Logo image URL</Label>
+          </div>
+          <Input
+            value={$navigationStore.logoUrl}
+            on:change={e => update("logoUrl", e.detail)}
+            updateOnChange={false}
+          />
+          <div class="label">
+            <Label size="M">Logo link URL</Label>
+          </div>
+          <Combobox
+            value={$navigationStore.logoLinkUrl}
+            on:change={e => update("logoLinkUrl", e.detail)}
+            options={screenRouteOptions}
+          />
+          <div class="label">
+            <Label size="M">New tab</Label>
+          </div>
+          <Checkbox
+            value={!!$navigationStore.openLogoLinkInNewTab}
+            on:change={e => update("openLogoLinkInNewTab", !!e.detail)}
+          />
+        {/if}
+      </div>
+    </div>
   {/if}
 </Panel>
 
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Screen/AppThemeSelect.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Screen/AppThemeSelect.svelte
index 86a897bf60..9c63ef4d13 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Screen/AppThemeSelect.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Screen/AppThemeSelect.svelte
@@ -1,11 +1,11 @@
 <script>
   import { notifications } from "@budibase/bbui"
-  import { store } from "builderStore"
+  import { themeStore, appStore } from "stores/builder"
   import { Constants } from "@budibase/frontend-core"
 
   const onChangeTheme = async theme => {
     try {
-      await store.actions.theme.save(`spectrum--${theme}`)
+      await themeStore.save(`spectrum--${theme}`, $appStore.appId)
     } catch (error) {
       notifications.error("Error updating theme")
     }
@@ -16,7 +16,7 @@
   {#each Constants.Themes as theme}
     <div
       class="theme"
-      class:selected={`spectrum--${theme.class}` === $store.theme}
+      class:selected={`spectrum--${theme.class}` === $themeStore.theme}
       on:click={() => onChangeTheme(theme.class)}
     >
       <div
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Screen/GeneralPanel.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Screen/GeneralPanel.svelte
index b2bcd3daa4..cecfdba858 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Screen/GeneralPanel.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Screen/GeneralPanel.svelte
@@ -10,10 +10,10 @@
   } from "@budibase/bbui"
   import PropertyControl from "components/design/settings/controls/PropertyControl.svelte"
   import RoleSelect from "components/design/settings/controls/RoleSelect.svelte"
-  import { selectedScreen, store } from "builderStore"
-  import sanitizeUrl from "builderStore/store/screenTemplates/utils/sanitizeUrl"
+  import { selectedScreen, screenStore } from "stores/builder"
+  import sanitizeUrl from "helpers/sanitizeUrl"
   import ButtonActionEditor from "components/design/settings/controls/ButtonActionEditor/ButtonActionEditor.svelte"
-  import { getBindableProperties } from "builderStore/dataBinding"
+  import { getBindableProperties } from "dataBinding"
 
   $: bindings = getBindableProperties($selectedScreen, null)
 
@@ -21,7 +21,7 @@
 
   const routeTaken = url => {
     const roleId = get(selectedScreen).routing.roleId || "BASIC"
-    return get(store).screens.some(
+    return get(screenStore).screens.some(
       screen =>
         screen.routing.route.toLowerCase() === url.toLowerCase() &&
         screen.routing.roleId === roleId
@@ -30,7 +30,7 @@
 
   const roleTaken = roleId => {
     const url = get(selectedScreen).routing.route
-    return get(store).screens.some(
+    return get(screenStore).screens.some(
       screen =>
         screen.routing.route.toLowerCase() === url.toLowerCase() &&
         screen.routing.roleId === roleId
@@ -64,7 +64,7 @@
 
     // Update screen setting
     try {
-      await store.actions.screens.updateSetting(get(selectedScreen), key, value)
+      await screenStore.updateSetting(get(selectedScreen), key, value)
     } catch (error) {
       console.error(error)
       notifications.error("Error saving screen settings")
@@ -127,7 +127,7 @@
   ]
 
   const removeCustomLayout = async () => {
-    return store.actions.screens.removeCustomLayout(get(selectedScreen))
+    return screenStore.removeCustomLayout(get(selectedScreen))
   }
 </script>
 
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Screen/ThemePanel.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Screen/ThemePanel.svelte
index 13a008fae0..8b3128f852 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Screen/ThemePanel.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Screen/ThemePanel.svelte
@@ -7,21 +7,17 @@
     Icon,
     Body,
   } from "@budibase/bbui"
-  import { store } from "builderStore"
-  import { get } from "svelte/store"
+  import { themeStore, appStore } from "stores/builder"
   import { DefaultAppTheme } from "constants"
   import AppThemeSelect from "./AppThemeSelect.svelte"
   import ButtonRoundnessSelect from "./ButtonRoundnessSelect.svelte"
   import PropertyControl from "components/design/settings/controls/PropertyControl.svelte"
 
-  $: customTheme = $store.customTheme || {}
+  $: customTheme = $themeStore.customTheme || {}
 
   const update = async (property, value) => {
     try {
-      store.actions.customTheme.save({
-        ...get(store).customTheme,
-        [property]: value,
-      })
+      themeStore.saveCustom({ [property]: value }, $appStore.appId)
     } catch (error) {
       notifications.error("Error updating custom theme")
     }
@@ -49,7 +45,7 @@
     value={customTheme.primaryColor || DefaultAppTheme.primaryColor}
     onChange={val => update("primaryColor", val)}
     props={{
-      spectrumTheme: $store.theme,
+      spectrumTheme: $themeStore.theme,
     }}
   />
   <PropertyControl
@@ -58,7 +54,7 @@
     value={customTheme.primaryColorHover || DefaultAppTheme.primaryColorHover}
     onChange={val => update("primaryColorHover", val)}
     props={{
-      spectrumTheme: $store.theme,
+      spectrumTheme: $themeStore.theme,
     }}
   />
 </Layout>
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Screen/index.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Screen/index.svelte
index 778fa303cc..8a544eac86 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Screen/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Screen/index.svelte
@@ -1,7 +1,7 @@
 <script>
   import GeneralPanel from "./GeneralPanel.svelte"
   import ThemePanel from "./ThemePanel.svelte"
-  import { selectedScreen } from "builderStore"
+  import { selectedScreen } from "stores/builder"
   import Panel from "components/design/Panel.svelte"
   import { capitalise } from "helpers"
   import { ActionButton, Layout } from "@budibase/bbui"
@@ -10,36 +10,38 @@
   const tabs = ["general", "theme"]
 </script>
 
-<Panel
-  title={$selectedScreen.routing.route}
-  icon={$selectedScreen.routing.route === "/" ? "Home" : "WebPage"}
-  borderLeft
-  wide
->
-  <div slot="panel-header-content">
-    <div class="settings-tabs">
-      {#each tabs as tab}
-        <ActionButton
-          size="M"
-          quiet
-          selected={activeTab === tab}
-          on:click={() => {
-            activeTab = tab
-          }}
-        >
-          {capitalise(tab)}
-        </ActionButton>
-      {/each}
+{#if $selectedScreen}
+  <Panel
+    title={$selectedScreen.routing.route}
+    icon={$selectedScreen.routing.route === "/" ? "Home" : "WebPage"}
+    borderLeft
+    wide
+  >
+    <div slot="panel-header-content">
+      <div class="settings-tabs">
+        {#each tabs as tab}
+          <ActionButton
+            size="M"
+            quiet
+            selected={activeTab === tab}
+            on:click={() => {
+              activeTab = tab
+            }}
+          >
+            {capitalise(tab)}
+          </ActionButton>
+        {/each}
+      </div>
     </div>
-  </div>
-  <Layout gap="S" paddingX="L" paddingY="XL">
-    {#if activeTab === "theme"}
-      <ThemePanel />
-    {:else}
-      <GeneralPanel />
-    {/if}
-  </Layout>
-</Panel>
+    <Layout gap="S" paddingX="L" paddingY="XL">
+      {#if activeTab === "theme"}
+        <ThemePanel />
+      {:else}
+        <GeneralPanel />
+      {/if}
+    </Layout>
+  </Panel>
+{/if}
 
 <style>
   .settings-tabs {
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_layout.svelte
index 19cb1d8dff..15a9c773ef 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_layout.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_layout.svelte
@@ -1,15 +1,20 @@
 <script>
   import { syncURLToState } from "helpers/urlStateSync"
-  import { store, selectedScreen } from "builderStore"
+  import {
+    builderStore,
+    screenStore,
+    selectedScreen,
+    componentStore,
+  } from "stores/builder"
   import * as routify from "@roxi/routify"
   import { onDestroy } from "svelte"
-  import { findComponent } from "builderStore/componentUtils"
+  import { findComponent } from "helpers/components"
   import ComponentSettingsPanel from "./_components/Component/ComponentSettingsPanel.svelte"
   import NavigationPanel from "./_components/Navigation/index.svelte"
   import ScreenSettingsPanel from "./_components/Screen/index.svelte"
 
-  $: componentId = $store.selectedComponentId
-  $: store.actions.websocket.selectResource(componentId)
+  $: componentId = $componentStore.selectedComponentId
+  $: builderStore.selectResource(componentId)
   $: params = routify.params
   $: routeComponentId = $params.componentId
 
@@ -22,8 +27,8 @@
   }
 
   const validate = id => {
-    if (id === `${$store.selectedScreenId}-screen`) return true
-    if (id === `${$store.selectedScreenId}-navigation`) return true
+    if (id === `${$screenStore.selectedScreenId}-screen`) return true
+    if (id === `${$screenStore.selectedScreenId}-navigation`) return true
 
     return !!findComponent($selectedScreen.props, id)
   }
@@ -34,7 +39,8 @@
     stateKey: "selectedComponentId",
     validate,
     fallbackUrl: "../",
-    store,
+    store: componentStore,
+    update: componentStore.select,
     routify,
     beforeNavigate: closeNewComponentPanel,
   })
@@ -42,9 +48,9 @@
   onDestroy(stopSyncing)
 </script>
 
-{#if routeComponentId === `${$store.selectedScreenId}-screen`}
+{#if routeComponentId === `${$screenStore.selectedScreenId}-screen`}
   <ScreenSettingsPanel />
-{:else if routeComponentId === `${$store.selectedScreenId}-navigation`}
+{:else if routeComponentId === `${$screenStore.selectedScreenId}-navigation`}
   <NavigationPanel />
 {:else}
   <ComponentSettingsPanel />
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/new/_components/NewComponentPanel.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/new/_components/NewComponentPanel.svelte
index 248bbc8141..c5b4aa7b9e 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/new/_components/NewComponentPanel.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/new/_components/NewComponentPanel.svelte
@@ -3,10 +3,15 @@
   import { goto } from "@roxi/routify"
   import { Layout, Search, Icon, Body, notifications } from "@budibase/bbui"
   import structure from "./componentStructure.json"
-  import { store, selectedComponent, selectedScreen } from "builderStore"
+  import {
+    previewStore,
+    selectedScreen,
+    componentStore,
+    selectedComponent,
+  } from "stores/builder"
   import { onMount } from "svelte"
   import { fly } from "svelte/transition"
-  import { findComponentPath } from "builderStore/componentUtils"
+  import { findComponentPath } from "helpers/components"
 
   let searchString
   let searchRef
@@ -14,14 +19,14 @@
   let componentList = []
 
   $: allowedComponents = getAllowedComponents(
-    $store.components,
+    $componentStore.components,
     $selectedScreen,
     $selectedComponent
   )
   $: enrichedStructure = enrichStructure(
     structure,
-    $store.components,
-    $store.customComponents
+    $componentStore.components,
+    $componentStore.customComponents
   )
   $: filteredStructure = filterStructure(
     enrichedStructure,
@@ -42,9 +47,7 @@
 
     // Get initial set of allowed components
     let allowedComponents = []
-    const definition = store.actions.components.getDefinition(
-      component?._component
-    )
+    const definition = componentStore.getDefinition(component?._component)
     if (definition.legalDirectChildren?.length) {
       allowedComponents = definition.legalDirectChildren.map(x => {
         return `@budibase/standard-components/${x}`
@@ -59,7 +62,7 @@
       if (ancestor._component === `@budibase/standard-components/sidepanel`) {
         illegalChildren = []
       }
-      const def = store.actions.components.getDefinition(ancestor._component)
+      const def = componentStore.getDefinition(ancestor._component)
       const blacklist = def?.illegalChildren?.map(x => {
         return `@budibase/standard-components/${x}`
       })
@@ -172,7 +175,7 @@
 
   const addComponent = async component => {
     try {
-      await store.actions.components.create(component)
+      await componentStore.create(component)
     } catch (error) {
       notifications.error(error || "Error creating component")
     }
@@ -208,11 +211,11 @@
   })
 
   const onDragStart = component => {
-    store.actions.dnd.start(component)
+    previewStore.startDrag(component)
   }
 
   const onDragEnd = () => {
-    store.actions.dnd.stop()
+    previewStore.stopDrag()
   }
 </script>
 
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/AppPanel.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/AppPanel.svelte
index 46eda34c2b..5867021386 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/AppPanel.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/AppPanel.svelte
@@ -1,23 +1,23 @@
 <script>
   import DevicePreviewSelect from "./DevicePreviewSelect.svelte"
   import AppPreview from "./AppPreview.svelte"
-  import { store, screenHistoryStore } from "builderStore"
+  import { screenStore, appStore } from "stores/builder"
   import UndoRedoControl from "components/common/UndoRedoControl.svelte"
 </script>
 
 <div class="app-panel">
   <div class="header">
     <div class="header-left">
-      <UndoRedoControl store={screenHistoryStore} />
+      <UndoRedoControl store={screenStore.history} />
     </div>
     <div class="header-right">
-      {#if $store.clientFeatures.devicePreview}
+      {#if $appStore.clientFeatures.devicePreview}
         <DevicePreviewSelect />
       {/if}
     </div>
   </div>
   <div class="content">
-    {#key $store.version}
+    {#key $appStore.version}
       <AppPreview />
     {/key}
   </div>
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/AppPreview.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/AppPreview.svelte
index ad3bd4a65c..55df1b1b71 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/AppPreview.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/AppPreview.svelte
@@ -1,7 +1,16 @@
 <script>
   import { get } from "svelte/store"
   import { onMount, onDestroy } from "svelte"
-  import { store, selectedScreen, currentAsset, hoverStore } from "builderStore"
+  import {
+    previewStore,
+    builderStore,
+    themeStore,
+    componentStore,
+    appStore,
+    navigationStore,
+    selectedScreen,
+    hoverStore,
+  } from "stores/builder"
   import ConfirmDialog from "components/common/ConfirmDialog.svelte"
   import {
     ProgressCircle,
@@ -12,7 +21,7 @@
     notifications,
   } from "@budibase/bbui"
   import ErrorSVG from "@budibase/frontend-core/assets/error.svg?raw"
-  import { findComponent, findComponentPath } from "builderStore/componentUtils"
+  import { findComponent, findComponentPath } from "helpers/components"
   import { isActive, goto } from "@roxi/routify"
 
   let iframe
@@ -35,24 +44,25 @@
   $: screen = $selectedScreen
 
   // Determine selected component ID
-  $: selectedComponentId = $store.selectedComponentId
+  $: selectedComponentId = $componentStore.selectedComponentId
 
   $: previewData = {
-    appId: $store.appId,
+    appId: $appStore.appId,
     layout,
     screen,
     selectedComponentId,
-    theme: $store.theme,
-    customTheme: $store.customTheme,
-    previewDevice: $store.previewDevice,
-    messagePassing: $store.clientFeatures.messagePassing,
-    navigation: $store.navigation,
+    theme: $themeStore.theme,
+    customTheme: $themeStore.customTheme,
+    previewDevice: $previewStore.previewDevice,
+    messagePassing: $appStore.clientFeatures.messagePassing,
+    navigation: $navigationStore,
     hiddenComponentIds:
-      $store.componentToPaste?._id && $store.componentToPaste?.isCut
-        ? [$store.componentToPaste?._id]
+      $componentStore.componentToPaste?._id &&
+      $componentStore.componentToPaste?.isCut
+        ? [$componentStore.componentToPaste?._id]
         : [],
     isBudibaseEvent: true,
-    usedPlugins: $store.usedPlugins,
+    usedPlugins: $appStore.usedPlugins,
     location: {
       protocol: window.location.protocol,
       hostname: window.location.hostname,
@@ -78,7 +88,10 @@
       })
     )
   }
-  $: store.actions.preview.registerEventHandler(sendPreviewEvent)
+
+  $: previewStore.registerEventHandler((name, payload) => {
+    return sendPreviewEvent(name, payload)
+  })
 
   // Update the iframe with the builder info to render the correct preview
   const refreshContent = message => {
@@ -116,13 +129,13 @@
       loading = false
       error = event.error || "An unknown error occurred"
     } else if (type === "select-component" && data.id) {
-      $store.selectedComponentId = data.id
+      componentStore.select(data.id)
     } else if (type === "hover-component") {
-      hoverStore.actions.update(data.id, false)
+      hoverStore.hover(data.id, false)
     } else if (type === "update-prop") {
-      await store.actions.components.updateSetting(data.prop, data.value)
+      await componentStore.updateSetting(data.prop, data.value)
     } else if (type === "update-styles") {
-      await store.actions.components.updateStyles(data.styles, data.id)
+      await componentStore.updateStyles(data.styles, data.id)
     } else if (type === "delete-component" && data.id) {
       // Legacy type, can be deleted in future
       confirmDeleteComponent(data.id)
@@ -130,17 +143,17 @@
       const { key, ctrlKey } = data
       document.dispatchEvent(new KeyboardEvent("keydown", { key, ctrlKey }))
     } else if (type === "duplicate-component" && data.id) {
-      const rootComponent = get(currentAsset).props
+      const rootComponent = get(selectedScreen).props
       const component = findComponent(rootComponent, data.id)
-      store.actions.components.copy(component)
-      await store.actions.components.paste(component)
+      componentStore.copy(component)
+      await componentStore.paste(component)
     } else if (type === "preview-loaded") {
       // Wait for this event to show the client library if intelligent
       // loading is supported
       loading = false
     } else if (type === "move-component") {
       const { componentId, destinationComponentId } = data
-      const rootComponent = get(currentAsset).props
+      const rootComponent = get(selectedScreen).props
 
       // Get source and destination components
       const source = findComponent(rootComponent, componentId)
@@ -155,13 +168,13 @@
 
       // Cut and paste the component to the new destination
       if (source && destination) {
-        store.actions.components.copy(source, true, false)
-        await store.actions.components.paste(destination, data.mode)
+        componentStore.copy(source, true, false)
+        await componentStore.paste(destination, data.mode)
       }
     } else if (type === "request-add-component") {
       toggleAddComponent()
     } else if (type === "highlight-setting") {
-      store.actions.settings.highlight(data.setting)
+      builderStore.highlightSetting(data.setting)
 
       // Also scroll setting into view
       const selector = `#${data.setting}-prop-control`
@@ -174,15 +187,15 @@
       }
     } else if (type === "eject-block") {
       const { id, definition } = data
-      await store.actions.components.handleEjectBlock(id, definition)
+      await componentStore.handleEjectBlock(id, definition)
     } else if (type === "reload-plugin") {
-      await store.actions.components.refreshDefinitions()
+      await componentStore.refreshDefinitions()
     } else if (type === "drop-new-component") {
       const { component, parent, index } = data
-      await store.actions.components.create(component, null, parent, index)
+      await componentStore.create(component, null, parent, index)
     } else if (type === "add-parent-component") {
       const { componentId, parentType } = data
-      await store.actions.components.addParent(componentId, parentType)
+      await componentStore.addParent(componentId, parentType)
     } else if (type === "provide-context") {
       let context = data?.context
       if (context) {
@@ -192,7 +205,7 @@
           context = null
         }
       }
-      store.actions.preview.setSelectedComponentContext(context)
+      previewStore.setSelectedComponentContext(context)
     } else {
       console.warn(`Client sent unknown event type: ${type}`)
     }
@@ -205,7 +218,7 @@
 
   const deleteComponent = async () => {
     try {
-      await store.actions.components.delete({ _id: idToDelete })
+      await componentStore.delete({ _id: idToDelete })
     } catch (error) {
       notifications.error("Error deleting component")
     }
@@ -253,8 +266,8 @@
     bind:this={iframe}
     src="/app/preview"
     class:hidden={loading || error}
-    class:tablet={$store.previewDevice === "tablet"}
-    class:mobile={$store.previewDevice === "mobile"}
+    class:tablet={$previewStore.previewDevice === "tablet"}
+    class:mobile={$previewStore.previewDevice === "mobile"}
   />
   <div
     class="add-component"
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ComponentList/ComponentDropdownMenu.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ComponentList/ComponentDropdownMenu.svelte
index 052c06b213..4645ee0d41 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ComponentList/ComponentDropdownMenu.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ComponentList/ComponentDropdownMenu.svelte
@@ -1,11 +1,11 @@
 <script>
-  import { store } from "builderStore"
+  import { componentStore } from "stores/builder"
   import { ActionMenu, MenuItem, Icon } from "@budibase/bbui"
 
   export let component
 
-  $: definition = store.actions.components.getDefinition(component?._component)
-  $: noPaste = !$store.componentToPaste
+  $: definition = componentStore.getDefinition(component?._component)
+  $: noPaste = !$componentStore.componentToPaste
   $: isBlock = definition?.block === true
   $: canEject = !(definition?.ejectable === false)
 
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ComponentList/ComponentKeyHandler.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ComponentList/ComponentKeyHandler.svelte
index 581dc31a05..406650f715 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ComponentList/ComponentKeyHandler.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ComponentList/ComponentKeyHandler.svelte
@@ -1,7 +1,11 @@
 <script>
   import { onMount } from "svelte"
-  import { selectedComponent, selectedScreen, store } from "builderStore"
-  import { findComponent } from "builderStore/componentUtils"
+  import {
+    selectedScreen,
+    componentStore,
+    selectedComponent,
+  } from "stores/builder"
+  import { findComponent } from "helpers/components"
   import { goto, isActive } from "@roxi/routify"
   import { notifications } from "@budibase/bbui"
   import ConfirmDialog from "components/common/ConfirmDialog.svelte"
@@ -13,28 +17,26 @@
 
   const keyHandlers = {
     ["Ctrl+ArrowUp"]: async component => {
-      await store.actions.components.moveUp(component)
+      await componentStore.moveUp(component)
     },
     ["Ctrl+ArrowDown"]: async component => {
-      await store.actions.components.moveDown(component)
+      await componentStore.moveDown(component)
     },
     ["Ctrl+c"]: component => {
-      store.actions.components.copy(component, false)
+      componentStore.copy(component, false)
     },
     ["Ctrl+x"]: component => {
-      store.actions.components.copy(component, true)
+      componentStore.copy(component, true)
     },
     ["Ctrl+v"]: async component => {
-      await store.actions.components.paste(component, "inside")
+      await componentStore.paste(component, "inside")
     },
     ["Ctrl+d"]: async component => {
-      store.actions.components.copy(component)
-      await store.actions.components.paste(component, "below")
+      componentStore.copy(component)
+      await componentStore.paste(component, "below")
     },
     ["Ctrl+e"]: component => {
-      const definition = store.actions.components.getDefinition(
-        component._component
-      )
+      const definition = componentStore.getDefinition(component._component)
       const isBlock = definition?.block === true
       const canEject = !(definition?.ejectable === false)
       if (isBlock && canEject) {
@@ -54,14 +56,14 @@
       confirmDeleteDialog.show()
     },
     ["ArrowUp"]: () => {
-      store.actions.components.selectPrevious()
+      componentStore.selectPrevious()
     },
     ["ArrowDown"]: () => {
-      store.actions.components.selectNext()
+      componentStore.selectNext()
     },
     ["Escape"]: () => {
       if ($isActive(`./:componentId/new`)) {
-        $goto(`./${$store.selectedComponentId}`)
+        $goto(`./${$componentStore.selectedComponentId}`)
       }
     },
   }
@@ -157,12 +159,12 @@
   title="Confirm Deletion"
   body={`Are you sure you want to delete "${componentToDelete?._instanceName}"?`}
   okText="Delete Component"
-  onOk={() => store.actions.components.delete(componentToDelete)}
+  onOk={() => componentStore.delete(componentToDelete)}
 />
 <ConfirmDialog
   bind:this={confirmEjectDialog}
   title="Eject block"
   body={`Ejecting a block breaks it down into multiple components and cannot be undone. Are you sure you want to eject "${componentToEject?._instanceName}"?`}
-  onOk={() => store.actions.components.requestEjectBlock(componentToEject?._id)}
+  onOk={() => componentStore.requestEjectBlock(componentToEject?._id)}
   okText="Eject block"
 />
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ComponentList/ComponentTree.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ComponentList/ComponentTree.svelte
index 8a4430a3f9..bf1b7f21d7 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ComponentList/ComponentTree.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ComponentList/ComponentTree.svelte
@@ -1,20 +1,20 @@
 <script>
-  import {
-    store,
-    userSelectedResourceMap,
-    selectedComponentPath,
-    selectedComponent,
-    selectedScreen,
-    hoverStore,
-  } from "builderStore"
   import ComponentDropdownMenu from "./ComponentDropdownMenu.svelte"
   import NavItem from "components/common/NavItem.svelte"
   import { notifications } from "@budibase/bbui"
+  import {
+    selectedScreen,
+    componentStore,
+    userSelectedResourceMap,
+    selectedComponent,
+    selectedComponentPath,
+    hoverStore,
+  } from "stores/builder"
   import {
     findComponentPath,
     getComponentText,
     getComponentName,
-  } from "builderStore/componentUtils"
+  } from "helpers/components"
   import { get } from "svelte/store"
   import { dndStore } from "./dndStore"
 
@@ -25,8 +25,8 @@
 
   $: filteredComponents = components?.filter(component => {
     return (
-      !$store.componentToPaste?.isCut ||
-      component._id !== $store.componentToPaste?._id
+      !$componentStore.componentToPaste?.isCut ||
+      component._id !== $componentStore.componentToPaste?._id
     )
   })
 
@@ -41,12 +41,12 @@
   }
 
   const getComponentIcon = component => {
-    const def = store.actions.components.getDefinition(component?._component)
+    const def = componentStore.getDefinition(component?._component)
     return def?.icon
   }
 
   const componentSupportsChildren = component => {
-    const def = store.actions.components.getDefinition(component?._component)
+    const def = componentStore.getDefinition(component?._component)
     return def?.hasChildren
   }
 
@@ -91,7 +91,7 @@
     return findComponentPath($selectedComponent, component._id)?.length > 0
   }
 
-  const hover = hoverStore.actions.update
+  const hover = hoverStore.hover
 </script>
 
 <ul>
@@ -99,7 +99,7 @@
     {@const opened = isOpen(component, $selectedComponentPath, closedNodes)}
     <li
       on:click|stopPropagation={() => {
-        $store.selectedComponentId = component._id
+        componentStore.select(component._id)
       }}
       id={`component-${component._id}`}
     >
@@ -120,7 +120,7 @@
         iconTooltip={getComponentName(component)}
         withArrow={componentHasChildren(component)}
         indentLevel={level}
-        selected={$store.selectedComponentId === component._id}
+        selected={$componentStore.selectedComponentId === component._id}
         {opened}
         highlighted={isChildOfSelectedComponent(component)}
         selectedBy={$userSelectedResourceMap[component._id]}
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ComponentList/ScreenslotDropdownMenu.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ComponentList/ScreenslotDropdownMenu.svelte
index 9d4486096f..ddb1630644 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ComponentList/ScreenslotDropdownMenu.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ComponentList/ScreenslotDropdownMenu.svelte
@@ -1,11 +1,11 @@
 <script>
-  import { store } from "builderStore"
+  import { componentStore } from "stores/builder"
   import { ActionMenu, MenuItem, Icon, notifications } from "@budibase/bbui"
 
   export let component
 
-  $: definition = store.actions.components.getDefinition(component?._component)
-  $: noPaste = !$store.componentToPaste
+  $: definition = componentStore.getDefinition(component?._component)
+  $: noPaste = !$componentStore.componentToPaste
 
   // "editable" has been repurposed for inline text editing.
   // It remains here for legacy compatibility.
@@ -14,12 +14,12 @@
   $: showMenu = definition?.editable !== false && definition?.static !== true
 
   const storeComponentForCopy = (cut = false) => {
-    store.actions.components.copy(component, cut)
+    componentStore.copy(component, cut)
   }
 
   const pasteComponent = mode => {
     try {
-      store.actions.components.paste(component, mode)
+      componentStore.paste(component, mode)
     } catch (error) {
       notifications.error("Error saving component")
     }
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ComponentList/dndStore.js b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ComponentList/dndStore.js
index 8a9e7ed915..0ab78b387f 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ComponentList/dndStore.js
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ComponentList/dndStore.js
@@ -1,9 +1,6 @@
 import { writable, get } from "svelte/store"
-import { store as frontendStore, selectedScreen } from "builderStore"
-import {
-  findComponentParent,
-  findComponentPath,
-} from "builderStore/componentUtils"
+import { findComponentParent, findComponentPath } from "helpers/components"
+import { selectedScreen, componentStore } from "stores/builder"
 
 export const DropPosition = {
   ABOVE: "above",
@@ -36,9 +33,7 @@ const createDNDStore = () => {
       })
     },
     dragover: ({ component, mousePosition }) => {
-      const definition = frontendStore.actions.components.getDefinition(
-        component._component
-      )
+      const definition = componentStore.getDefinition(component._component)
       const canHaveChildren = definition?.hasChildren
       const hasChildren = component._children?.length > 0
 
@@ -112,11 +107,8 @@ const createDNDStore = () => {
       actions.reset()
 
       // Cut and paste the component
-      frontendStore.actions.components.copy(state.source, true, false)
-      await frontendStore.actions.components.paste(
-        state.target,
-        state.dropPosition
-      )
+      componentStore.copy(state.source, true, false)
+      await componentStore.paste(state.target, state.dropPosition)
     },
   }
 
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ComponentList/index.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ComponentList/index.svelte
index 13f2e73853..b188da9d87 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ComponentList/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ComponentList/index.svelte
@@ -2,11 +2,12 @@
   import { notifications, Icon, Body } from "@budibase/bbui"
   import { isActive, goto } from "@roxi/routify"
   import {
-    store,
     selectedScreen,
+    screenStore,
+    componentStore,
     userSelectedResourceMap,
     hoverStore,
-  } from "builderStore"
+  } from "stores/builder"
   import NavItem from "components/common/NavItem.svelte"
   import ComponentTree from "./ComponentTree.svelte"
   import { dndStore, DropPosition } from "./dndStore.js"
@@ -17,8 +18,8 @@
 
   let scrolling = false
 
-  $: screenComponentId = `${$store.selectedScreenId}-screen`
-  $: navComponentId = `${$store.selectedScreenId}-navigation`
+  $: screenComponentId = `${$screenStore.selectedScreenId}-screen`
+  $: navComponentId = `${$screenStore.selectedScreenId}-navigation`
 
   const toNewComponentRoute = () => {
     if ($isActive(`./:componentId/new`)) {
@@ -41,7 +42,7 @@
     scrolling = e.target.scrollTop !== 0
   }
 
-  const hover = hoverStore.actions.update
+  const hover = hoverStore.hover
 </script>
 
 <div class="components">
@@ -58,13 +59,15 @@
           <NavItem
             text="Screen"
             indentLevel={0}
-            selected={$store.selectedComponentId ===
-              `${$store.selectedScreenId}-screen`}
+            selected={$componentStore.selectedComponentId ===
+              `${$screenStore.selectedScreenId}-screen`}
             opened
             scrollable
             icon="WebPage"
             on:drop={onDrop}
-            on:click={() => ($store.selectedComponentId = screenComponentId)}
+            on:click={() => {
+              componentStore.select(`${$screenStore.selectedScreenId}-screen`)
+            }}
             hovering={$hoverStore.componentId === screenComponentId}
             on:mouseenter={() => hover(screenComponentId)}
             on:mouseleave={() => hover(null)}
@@ -76,14 +79,18 @@
           <NavItem
             text="Navigation"
             indentLevel={0}
-            selected={$store.selectedComponentId === navComponentId}
+            selected={$componentStore.selectedComponentId === navComponentId}
             opened
             scrollable
-            icon={$selectedScreen.showNavigation
+            icon={$selectedScreen?.showNavigation
               ? "Visibility"
               : "VisibilityOff"}
             on:drop={onDrop}
-            on:click={() => ($store.selectedComponentId = navComponentId)}
+            on:click={() => {
+              componentStore.select(
+                `${$screenStore.selectedScreenId}-navigation`
+              )
+            }}
             hovering={$hoverStore.componentId === navComponentId}
             on:mouseenter={() => hover(navComponentId)}
             on:mouseleave={() => hover(null)}
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/DevicePreviewSelect.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/DevicePreviewSelect.svelte
index 870f801336..9c0df03f12 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/DevicePreviewSelect.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/DevicePreviewSelect.svelte
@@ -1,25 +1,25 @@
 <script>
   import { ActionGroup, ActionButton } from "@budibase/bbui"
-  import { store } from "builderStore"
+  import { previewStore } from "stores/builder"
 </script>
 
 <ActionGroup compact quiet>
   <ActionButton
     quiet
     icon="DeviceDesktop"
-    selected={$store.previewDevice === "desktop"}
-    on:click={() => store.actions.preview.setDevice("desktop")}
+    selected={$previewStore.previewDevice === "desktop"}
+    on:click={() => previewStore.setDevice("desktop")}
   />
   <ActionButton
     quiet
     icon="DeviceTablet"
-    selected={$store.previewDevice === "tablet"}
-    on:click={() => store.actions.preview.setDevice("tablet")}
+    selected={$previewStore.previewDevice === "tablet"}
+    on:click={() => previewStore.setDevice("tablet")}
   />
   <ActionButton
     quiet
     icon="DevicePhone"
-    selected={$store.previewDevice === "mobile"}
-    on:click={() => store.actions.preview.setDevice("mobile")}
+    selected={$previewStore.previewDevice === "mobile"}
+    on:click={() => previewStore.setDevice("mobile")}
   />
 </ActionGroup>
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ScreenList/DropdownMenu.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ScreenList/DropdownMenu.svelte
index c117c7e9dd..0d96dcda93 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ScreenList/DropdownMenu.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ScreenList/DropdownMenu.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { store } from "builderStore"
+  import { screenStore, componentStore } from "stores/builder"
   import ConfirmDialog from "components/common/ConfirmDialog.svelte"
   import {
     ActionMenu,
@@ -10,20 +10,20 @@
     notifications,
   } from "@budibase/bbui"
   import ScreenDetailsModal from "components/design/ScreenDetailsModal.svelte"
-  import sanitizeUrl from "builderStore/store/screenTemplates/utils/sanitizeUrl"
-  import { makeComponentUnique } from "builderStore/componentUtils"
+  import sanitizeUrl from "helpers/sanitizeUrl"
+  import { makeComponentUnique } from "helpers/components"
 
   export let screenId
 
   let confirmDeleteDialog
   let screenDetailsModal
 
-  $: screen = $store.screens.find(screen => screen._id === screenId)
-  $: noPaste = !$store.componentToPaste
+  $: screen = $screenStore.screens.find(screen => screen._id === screenId)
+  $: noPaste = !$componentStore.componentToPaste
 
   const pasteComponent = mode => {
     try {
-      store.actions.components.paste(screen.props, mode, screen)
+      componentStore.paste(screen.props, mode, screen)
     } catch (error) {
       notifications.error("Error saving component")
     }
@@ -47,7 +47,7 @@
 
     try {
       // Create the screen
-      await store.actions.screens.save(duplicateScreen)
+      await screenStore.save(duplicateScreen)
     } catch (error) {
       notifications.error("Error duplicating screen")
     }
@@ -55,7 +55,7 @@
 
   const deleteScreen = async () => {
     try {
-      await store.actions.screens.delete(screen)
+      await screenStore.delete(screen)
       notifications.success("Deleted screen successfully")
     } catch (err) {
       notifications.error("Error deleting screen")
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ScreenList/RoleIndicator.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ScreenList/RoleIndicator.svelte
index 694abe444a..6efbe50130 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ScreenList/RoleIndicator.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ScreenList/RoleIndicator.svelte
@@ -1,7 +1,7 @@
 <script>
   import { RoleUtils } from "@budibase/frontend-core"
   import { Tooltip, StatusLight } from "@budibase/bbui"
-  import { roles } from "stores/backend"
+  import { roles } from "stores/builder"
   import { Roles } from "constants/backend"
 
   export let roleId
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ScreenList/index.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ScreenList/index.svelte
index e3e24d7b13..27df661281 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ScreenList/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ScreenList/index.svelte
@@ -1,6 +1,10 @@
 <script>
   import { Layout } from "@budibase/bbui"
-  import { store, sortedScreens, userSelectedResourceMap } from "builderStore"
+  import {
+    screenStore,
+    sortedScreens,
+    userSelectedResourceMap,
+  } from "stores/builder"
   import NavItem from "components/common/NavItem.svelte"
   import RoleIndicator from "./RoleIndicator.svelte"
   import DropdownMenu from "./DropdownMenu.svelte"
@@ -55,9 +59,9 @@
           scrollable
           icon={screen.routing.homeScreen ? "Home" : null}
           indentLevel={0}
-          selected={$store.selectedScreenId === screen._id}
+          selected={$screenStore.selectedScreenId === screen._id}
           text={screen.routing.route}
-          on:click={() => store.actions.screens.select(screen._id)}
+          on:click={() => screenStore.select(screen._id)}
           rightAlignIcon
           showTooltip
           selectedBy={$userSelectedResourceMap[screen._id]}
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_layout.svelte
index ab29f2ea0d..ac87b53db2 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_layout.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_layout.svelte
@@ -2,7 +2,7 @@
   import AppPanel from "./_components/AppPanel.svelte"
   import * as routify from "@roxi/routify"
   import { syncURLToState } from "helpers/urlStateSync"
-  import { store, selectedScreen } from "builderStore"
+  import { screenStore, selectedScreen } from "stores/builder"
   import { onDestroy } from "svelte"
   import LeftPanel from "./_components/LeftPanel.svelte"
 
@@ -10,10 +10,11 @@
   const stopSyncing = syncURLToState({
     urlParam: "screenId",
     stateKey: "selectedScreenId",
-    validate: id => $store.screens.some(screen => screen._id === id),
+    validate: id => $screenStore.screens.some(screen => screen._id === id),
     fallbackUrl: "../../design",
-    store,
     routify,
+    update: screenStore.select,
+    store: screenStore,
   })
 
   onDestroy(stopSyncing)
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/index.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/index.svelte
index c4ed7d949c..e71dba1280 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/index.svelte
@@ -1,6 +1,6 @@
 <script>
   import { redirect } from "@roxi/routify"
-  import { store } from "builderStore"
+  import { screenStore } from "stores/builder"
 
-  $redirect(`./${$store.selectedScreenId}-screen`)
+  $redirect(`./${$screenStore.selectedScreenId}-screen`)
 </script>
diff --git a/packages/builder/src/pages/builder/app/[application]/design/_components/NewScreen/CreateScreenModal.svelte b/packages/builder/src/pages/builder/app/[application]/design/_components/NewScreen/CreateScreenModal.svelte
index 5e3a7a0f37..eadd9d4257 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/_components/NewScreen/CreateScreenModal.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/_components/NewScreen/CreateScreenModal.svelte
@@ -2,12 +2,11 @@
   import ScreenDetailsModal from "components/design/ScreenDetailsModal.svelte"
   import DatasourceModal from "./DatasourceModal.svelte"
   import ScreenRoleModal from "./ScreenRoleModal.svelte"
-  import sanitizeUrl from "builderStore/store/screenTemplates/utils/sanitizeUrl"
+  import sanitizeUrl from "helpers/sanitizeUrl"
   import { Modal, notifications } from "@budibase/bbui"
-  import { store } from "builderStore"
+  import { screenStore, navigationStore, tables } from "stores/builder"
   import { get } from "svelte/store"
-  import getTemplates from "builderStore/store/screenTemplates"
-  import { tables } from "stores/backend"
+  import getTemplates from "templates"
   import { Roles } from "constants/backend"
   import { capitalise } from "helpers"
   import { goto } from "@roxi/routify"
@@ -56,12 +55,12 @@
         screen.routing.roleId = screenAccessRole
 
         // Create the screen
-        const response = await store.actions.screens.save(screen)
+        const response = await screenStore.save(screen)
         screenId = response._id
 
         // Add link in layout. We only ever actually create 1 screen now, even
         // for autoscreens, so it's always safe to do this.
-        await store.actions.links.save(
+        await navigationStore.saveLink(
           screen.routing.route,
           capitalise(screen.routing.route.split("/")[1])
         )
@@ -69,7 +68,7 @@
 
       // Go to new screen
       $goto(`./${screenId}`)
-      store.actions.screens.select(screenId)
+      screenStore.select(screenId)
     } catch (error) {
       console.error(error)
       notifications.error("Error creating screens")
@@ -80,7 +79,9 @@
   // currently selected role
   const hasExistingUrl = url => {
     const roleId = screenAccessRole
-    const screens = get(store).screens.filter(s => s.routing.roleId === roleId)
+    const screens = get(screenStore).screens.filter(
+      s => s.routing.roleId === roleId
+    )
     return !!screens.find(s => s.routing?.route === url)
   }
 
diff --git a/packages/builder/src/pages/builder/app/[application]/design/_components/NewScreen/DatasourceModal.svelte b/packages/builder/src/pages/builder/app/[application]/design/_components/NewScreen/DatasourceModal.svelte
index 731c60a406..bb6c47c4b1 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/_components/NewScreen/DatasourceModal.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/_components/NewScreen/DatasourceModal.svelte
@@ -1,10 +1,10 @@
 <script>
   import { ModalContent, Layout, notifications, Body } from "@budibase/bbui"
-  import { datasources } from "stores/backend"
+  import { datasources } from "stores/builder"
   import ICONS from "components/backend/DatasourceNavigator/icons"
   import { IntegrationNames } from "constants"
   import { onMount } from "svelte"
-  import rowListScreen from "builderStore/store/screenTemplates/rowListScreen"
+  import rowListScreen from "templates/rowListScreen"
   import DatasourceTemplateRow from "./DatasourceTemplateRow.svelte"
 
   export let mode
diff --git a/packages/builder/src/pages/builder/app/[application]/design/_components/NewScreen/ScreenRoleModal.svelte b/packages/builder/src/pages/builder/app/[application]/design/_components/NewScreen/ScreenRoleModal.svelte
index 5d73b7961c..5e34d32219 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/_components/NewScreen/ScreenRoleModal.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/_components/NewScreen/ScreenRoleModal.svelte
@@ -1,9 +1,8 @@
 <script>
   import { Select, ModalContent } from "@budibase/bbui"
   import { RoleUtils } from "@budibase/frontend-core"
-  import { roles } from "stores/backend"
+  import { roles, screenStore } from "stores/builder"
   import { get } from "svelte/store"
-  import { store } from "builderStore"
   import { onMount } from "svelte"
 
   export let onConfirm
@@ -26,7 +25,7 @@
     if (!url || !role) {
       return false
     }
-    return get(store).screens.some(
+    return get(screenStore).screens.some(
       screen =>
         screen.routing.route.toLowerCase() === url.toLowerCase() &&
         screen.routing.roleId === role
diff --git a/packages/builder/src/pages/builder/app/[application]/design/_components/NewScreen/index.svelte b/packages/builder/src/pages/builder/app/[application]/design/_components/NewScreen/index.svelte
index 6b080747b0..895720657e 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/_components/NewScreen/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/_components/NewScreen/index.svelte
@@ -5,13 +5,13 @@
   import tableImage from "./table.png"
   import gridImage from "./grid.png"
   import CreateScreenModal from "./CreateScreenModal.svelte"
-  import { store } from "builderStore"
+  import { screenStore } from "stores/builder"
 
   export let onClose = null
 
   let createScreenModal
 
-  $: hasScreens = $store.screens?.length
+  $: hasScreens = $screenStore.screens?.length
 </script>
 
 <div class="page">
diff --git a/packages/builder/src/pages/builder/app/[application]/design/index.svelte b/packages/builder/src/pages/builder/app/[application]/design/index.svelte
index e9c72a6e1f..b9fca41695 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/index.svelte
@@ -1,10 +1,10 @@
 <script>
   import { redirect } from "@roxi/routify"
-  import { store as frontendStore } from "builderStore"
+  import { screenStore } from "stores/builder"
 
   $: {
-    if ($frontendStore.screens.length > 0) {
-      $redirect(`./${$frontendStore.screens[0]._id}`)
+    if ($screenStore.screens.length > 0) {
+      $redirect(`./${$screenStore.screens[0]._id}`)
     } else {
       $redirect("./new")
     }
diff --git a/packages/builder/src/pages/builder/app/[application]/design/new.svelte b/packages/builder/src/pages/builder/app/[application]/design/new.svelte
index 6fd08447b2..a9af09a3a1 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/new.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/new.svelte
@@ -1,9 +1,9 @@
 <script>
   import NewScreen from "./_components/NewScreen/index.svelte"
-  import { store } from "builderStore"
+  import { screenStore } from "stores/builder"
   import { goto } from "@roxi/routify"
 
-  $: onClose = getOnClose($store)
+  $: onClose = getOnClose($screenStore)
 
   const getOnClose = ({ screens, selectedScreenId }) => {
     if (!screens?.length) {
diff --git a/packages/builder/src/pages/builder/app/[application]/settings/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/settings/_layout.svelte
index 65a13f0bd9..da4f743f04 100644
--- a/packages/builder/src/pages/builder/app/[application]/settings/_layout.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/settings/_layout.svelte
@@ -3,7 +3,7 @@
   import { Page, Layout, AbsTooltip, TooltipPosition } from "@budibase/bbui"
   import { url, isActive } from "@roxi/routify"
   import DeleteModal from "components/deploy/DeleteModal.svelte"
-  import { isOnlyUser } from "builderStore"
+  import { isOnlyUser } from "stores/builder"
 
   let deleteModal
 </script>
diff --git a/packages/builder/src/pages/builder/app/[application]/settings/automations/_components/HistoryDetailsPanel.svelte b/packages/builder/src/pages/builder/app/[application]/settings/automations/_components/HistoryDetailsPanel.svelte
index cde76fa1c0..ef970c99f0 100644
--- a/packages/builder/src/pages/builder/app/[application]/settings/automations/_components/HistoryDetailsPanel.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/settings/automations/_components/HistoryDetailsPanel.svelte
@@ -11,7 +11,7 @@
   import DateTimeRenderer from "components/common/renderers/DateTimeRenderer.svelte"
   import TestDisplay from "components/automation/AutomationBuilder/TestDisplay.svelte"
   import { goto } from "@roxi/routify"
-  import { automationStore } from "builderStore"
+  import { automationStore } from "stores/builder"
 
   export let history
   export let appId
diff --git a/packages/builder/src/pages/builder/app/[application]/settings/automations/index.svelte b/packages/builder/src/pages/builder/app/[application]/settings/automations/index.svelte
index fde392e31d..d421645ede 100644
--- a/packages/builder/src/pages/builder/app/[application]/settings/automations/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/settings/automations/index.svelte
@@ -14,7 +14,7 @@
   import DateTimeRenderer from "components/common/renderers/DateTimeRenderer.svelte"
   import StatusRenderer from "./_components/StatusRenderer.svelte"
   import HistoryDetailsPanel from "./_components/HistoryDetailsPanel.svelte"
-  import { automationStore, store } from "builderStore"
+  import { automationStore, appStore } from "stores/builder"
   import { createPaginationStore } from "helpers/pagination"
   import { getContext, onDestroy, onMount } from "svelte"
   import dayjs from "dayjs"
@@ -36,15 +36,12 @@
   let status = null
   let timeRange = null
   let loaded = false
-
-  $: app = $apps.find(app => app.devId === $store.appId?.includes(app.appId))
+  $: app = $apps.find(app => $appStore.appId?.includes(app.appId))
   $: licensePlan = $auth.user?.license?.plan
   $: page = $pageInfo.page
   $: fetchLogs(automationId, status, page, timeRange)
   $: isCloud = $admin.cloud
-
   $: chainAutomations = app?.automations?.chainAutomations ?? !isCloud
-
   const timeOptions = [
     { value: "90-d", label: "Past 90 days" },
     { value: "30-d", label: "Past 30 days" },
@@ -132,7 +129,7 @@
 
   async function save({ detail }) {
     try {
-      await apps.update($store.appId, {
+      await apps.update($appStore.appId, {
         automations: {
           chainAutomations: detail,
         },
@@ -266,7 +263,7 @@
 {#if selectedHistory}
   <Portal target="#side-panel">
     <HistoryDetailsPanel
-      appId={$store.appId}
+      appId={$appStore.appId}
       bind:history={selectedHistory}
       close={sidePanel.close}
     />
diff --git a/packages/builder/src/pages/builder/app/[application]/settings/backups/_components/ActionsRenderer.svelte b/packages/builder/src/pages/builder/app/[application]/settings/backups/_components/ActionsRenderer.svelte
index 93f0f518ad..3e88fb5541 100644
--- a/packages/builder/src/pages/builder/app/[application]/settings/backups/_components/ActionsRenderer.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/settings/backups/_components/ActionsRenderer.svelte
@@ -12,7 +12,8 @@
   import ConfirmDialog from "components/common/ConfirmDialog.svelte"
   import CreateRestoreModal from "./CreateRestoreModal.svelte"
   import { createEventDispatcher } from "svelte"
-  import { isOnlyUser } from "builderStore"
+  import { isOnlyUser } from "stores/builder"
+  import { BackupType } from "constants/backend/backups"
 
   export let row
 
@@ -42,12 +43,11 @@
 </script>
 
 <div class="cell">
-  <ActionMenu align="right">
-    <div slot="control">
-      <Icon size="M" hoverable name="MoreSmallList" />
-    </div>
-
-    {#if row.type !== "restore"}
+  {#if row.type !== BackupType.RESTORE}
+    <ActionMenu align="right">
+      <div slot="control">
+        <Icon size="M" hoverable name="MoreSmallList" />
+      </div>
       <AbsTooltip
         position={TooltipPosition.Left}
         text="Unavailable - another user is editing this app"
@@ -62,8 +62,8 @@
       </AbsTooltip>
       <MenuItem on:click={deleteDialog.show} icon="Delete">Delete</MenuItem>
       <MenuItem on:click={downloadExport} icon="Download">Download</MenuItem>
-    {/if}
-  </ActionMenu>
+    </ActionMenu>
+  {/if}
 </div>
 
 <Modal bind:this={restoreBackupModal}>
diff --git a/packages/builder/src/pages/builder/app/[application]/settings/backups/index.svelte b/packages/builder/src/pages/builder/app/[application]/settings/backups/index.svelte
index 1d612117e2..bbf28b2fe8 100644
--- a/packages/builder/src/pages/builder/app/[application]/settings/backups/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/settings/backups/index.svelte
@@ -14,7 +14,7 @@
     Table,
   } from "@budibase/bbui"
   import { backups, licensing, auth, admin } from "stores/portal"
-  import { store } from "builderStore"
+  import { appStore } from "stores/builder"
   import { createPaginationStore } from "helpers/pagination"
   import TimeAgoRenderer from "./_components/TimeAgoRenderer.svelte"
   import AppSizeRenderer from "./_components/AppSizeRenderer.svelte"
@@ -101,7 +101,7 @@
 
   async function fetchBackups(filters, page, startDate, endDate) {
     const response = await backups.searchBackups({
-      appId: $store.appId,
+      appId: $appStore.appId,
       ...filters,
       page,
       startDate,
@@ -117,7 +117,7 @@
     try {
       loading = true
       let response = await backups.createManualBackup({
-        appId: $store.appId,
+        appId: $appStore.appId,
       })
       await fetchBackups(filterOpt, page)
       notifications.success(response.message)
@@ -143,20 +143,20 @@
   async function handleButtonClick({ detail }) {
     if (detail.type === "backupDelete") {
       await backups.deleteBackup({
-        appId: $store.appId,
+        appId: $appStore.appId,
         backupId: detail.backupId,
       })
       await fetchBackups(filterOpt, page)
     } else if (detail.type === "backupRestore") {
       await backups.restoreBackup({
-        appId: $store.appId,
+        appId: $appStore.appId,
         backupId: detail.backupId,
         name: detail.restoreBackupName,
       })
       await fetchBackups(filterOpt, page)
     } else if (detail.type === "backupUpdate") {
       await backups.updateBackup({
-        appId: $store.appId,
+        appId: $appStore.appId,
         backupId: detail.backupId,
         name: detail.name,
       })
diff --git a/packages/builder/src/pages/builder/app/[application]/settings/embed.svelte b/packages/builder/src/pages/builder/app/[application]/settings/embed.svelte
index 40450793d7..f1d95da362 100644
--- a/packages/builder/src/pages/builder/app/[application]/settings/embed.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/settings/embed.svelte
@@ -11,9 +11,9 @@
   } from "@budibase/bbui"
   import { AppStatus } from "constants"
   import { apps } from "stores/portal"
-  import { store } from "builderStore"
+  import { appStore } from "stores/builder"
 
-  $: filteredApps = $apps.filter(app => app.devId == $store.appId)
+  $: filteredApps = $apps.filter(app => app.devId == $appStore.appId)
   $: app = filteredApps.length ? filteredApps[0] : {}
   $: appUrl = `${window.origin}/embed${app?.url}`
   $: appDeployed = app?.status === AppStatus.DEPLOYED
diff --git a/packages/builder/src/pages/builder/app/[application]/settings/exportImport.svelte b/packages/builder/src/pages/builder/app/[application]/settings/exportImport.svelte
index 64ca0e0a2c..0ac2bc0d3f 100644
--- a/packages/builder/src/pages/builder/app/[application]/settings/exportImport.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/settings/exportImport.svelte
@@ -9,11 +9,11 @@
   } from "@budibase/bbui"
   import { AppStatus } from "constants"
   import { apps } from "stores/portal"
-  import { store } from "builderStore"
+  import { appStore } from "stores/builder"
   import ExportAppModal from "components/start/ExportAppModal.svelte"
   import ImportAppModal from "components/start/ImportAppModal.svelte"
 
-  $: filteredApps = $apps.filter(app => app.devId === $store.appId)
+  $: filteredApps = $apps.filter(app => app.devId === $appStore.appId)
   $: app = filteredApps.length ? filteredApps[0] : {}
   $: appDeployed = app?.status === AppStatus.DEPLOYED
 
diff --git a/packages/builder/src/pages/builder/app/[application]/settings/name-and-url.svelte b/packages/builder/src/pages/builder/app/[application]/settings/name-and-url.svelte
index 9b0615a70e..06fe7e1456 100644
--- a/packages/builder/src/pages/builder/app/[application]/settings/name-and-url.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/settings/name-and-url.svelte
@@ -10,20 +10,20 @@
     Icon,
   } from "@budibase/bbui"
   import { AppStatus } from "constants"
-  import { store } from "builderStore"
+  import { appStore, initialise } from "stores/builder"
   import { apps } from "stores/portal"
   import UpdateAppModal from "components/start/UpdateAppModal.svelte"
   import { API } from "api"
 
   let updatingModal
 
-  $: filteredApps = $apps.filter(app => app.devId == $store.appId)
+  $: filteredApps = $apps.filter(app => app.devId == $appStore.appId)
   $: app = filteredApps.length ? filteredApps[0] : {}
   $: appDeployed = app?.status === AppStatus.DEPLOYED
 
   const initialiseApp = async () => {
-    const applicationPkg = await API.fetchAppPackage($store.appId)
-    await store.actions.initialise(applicationPkg)
+    const applicationPkg = await API.fetchAppPackage($appStore.appId)
+    await initialise(applicationPkg)
   }
 </script>
 
@@ -36,7 +36,7 @@
 
   <Layout noPadding gap="XXS">
     <Label size="L">Name</Label>
-    <Body>{$store?.name}</Body>
+    <Body>{$appStore?.name}</Body>
   </Layout>
 
   <Layout noPadding gap="XS">
@@ -44,15 +44,15 @@
     <div class="icon">
       <Icon
         size="L"
-        name={$store?.icon?.name || "Apps"}
-        color={$store?.icon?.color}
+        name={$appStore?.icon?.name || "Apps"}
+        color={$appStore?.icon?.color}
       />
     </div>
   </Layout>
 
   <Layout noPadding gap="XXS">
     <Label size="L">URL</Label>
-    <Body>{$store.url}</Body>
+    <Body>{$appStore.url}</Body>
   </Layout>
 
   <div>
@@ -74,10 +74,10 @@
 <Modal bind:this={updatingModal} padding={false} width="600px">
   <UpdateAppModal
     app={{
-      name: $store.name,
-      url: $store.url,
-      icon: $store.icon,
-      appId: $store.appId,
+      name: $appStore.name,
+      url: $appStore.url,
+      icon: $appStore.icon,
+      appId: $appStore.appId,
     }}
     onUpdateComplete={async () => {
       await initialiseApp()
diff --git a/packages/builder/src/pages/builder/app/[application]/settings/version.svelte b/packages/builder/src/pages/builder/app/[application]/settings/version.svelte
index d278b38466..bd592fa308 100644
--- a/packages/builder/src/pages/builder/app/[application]/settings/version.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/settings/version.svelte
@@ -1,11 +1,11 @@
 <script>
   import { Layout, Heading, Body, Divider, Button } from "@budibase/bbui"
-  import { store, isOnlyUser } from "builderStore"
+  import { isOnlyUser, appStore } from "stores/builder"
   import VersionModal from "components/deploy/VersionModal.svelte"
 
   let versionModal
 
-  $: updateAvailable = $store.upgradableVersion !== $store.version
+  $: updateAvailable = $appStore.upgradableVersion !== $appStore.version
 </script>
 
 <Layout noPadding>
@@ -16,8 +16,8 @@
   <Divider />
   {#if updateAvailable}
     <Body>
-      The app is currently using version <strong>{$store.version}</strong>
-      but version <strong>{$store.upgradableVersion}</strong> is available.
+      The app is currently using version <strong>{$appStore.version}</strong>
+      but version <strong>{$appStore.upgradableVersion}</strong> is available.
       <br />
       Updates can contain new features, performance improvements and bug fixes.
     </Body>
@@ -35,7 +35,7 @@
     </div>
   {:else}
     <Body>
-      The app is currently using version <strong>{$store.version}</strong>.
+      The app is currently using version <strong>{$appStore.version}</strong>.
       <br />
       You're running the latest!
     </Body>
diff --git a/packages/builder/src/pages/builder/auth/_layout.svelte b/packages/builder/src/pages/builder/auth/_layout.svelte
index a76ddfc329..f5484182e8 100644
--- a/packages/builder/src/pages/builder/auth/_layout.svelte
+++ b/packages/builder/src/pages/builder/auth/_layout.svelte
@@ -1,6 +1,7 @@
 <script>
   import { auth, admin } from "stores/portal"
   import { redirect } from "@roxi/routify"
+  import { CookieUtils } from "@budibase/frontend-core"
 
   // If already authenticated, redirect away from the auth section.
   // Check this onMount rather than a reactive statement to avoid trumping
@@ -9,6 +10,15 @@
     $redirect("../")
   }
 
+  if ($admin?.checklist?.branding) {
+    let url = new URL(window.location.href)
+    let hostname = url.hostname
+    let parts = hostname.split(".")
+    let tenantId = parts[0]
+    let domain = parts.slice(-2).join(".")
+    CookieUtils.setCookie("tenantId", tenantId, domain)
+  }
+
   if (
     !$auth.user &&
     $admin.cloud &&
diff --git a/packages/builder/src/pages/builder/portal/account/upgrade.svelte b/packages/builder/src/pages/builder/portal/account/upgrade.svelte
index aaffbb492f..dbdedb6805 100644
--- a/packages/builder/src/pages/builder/portal/account/upgrade.svelte
+++ b/packages/builder/src/pages/builder/portal/account/upgrade.svelte
@@ -16,7 +16,7 @@
   import { auth, admin } from "stores/portal"
   import { redirect } from "@roxi/routify"
   import { processStringSync } from "@budibase/string-templates"
-  import DeleteLicenseKeyModal from "../../../../components/portal/licensing/DeleteLicenseKeyModal.svelte"
+  import DeleteLicenseKeyModal from "components/portal/licensing/DeleteLicenseKeyModal.svelte"
   import { API } from "api"
   import { onMount } from "svelte"
   import { sdk } from "@budibase/shared-core"
diff --git a/packages/builder/src/pages/builder/portal/apps/index.svelte b/packages/builder/src/pages/builder/portal/apps/index.svelte
index ad0d3658ea..a1aa242a36 100644
--- a/packages/builder/src/pages/builder/portal/apps/index.svelte
+++ b/packages/builder/src/pages/builder/portal/apps/index.svelte
@@ -16,8 +16,7 @@
   import AppLimitModal from "components/portal/licensing/AppLimitModal.svelte"
   import AccountLockedModal from "components/portal/licensing/AccountLockedModal.svelte"
   import { sdk } from "@budibase/shared-core"
-
-  import { store, automationStore } from "builderStore"
+  import { automationStore, initialise } from "stores/builder"
   import { API } from "api"
   import { onMount } from "svelte"
   import { apps, auth, admin, licensing, environment } from "stores/portal"
@@ -153,8 +152,8 @@
 
       // Select Correct Application/DB in prep for creating user
       const pkg = await API.fetchAppPackage(createdApp.instance._id)
-      await store.actions.initialise(pkg)
-      await automationStore.actions.fetch()
+      await initialise(pkg)
+
       // Update checklist - in case first app
       await admin.init()
 
diff --git a/packages/builder/src/pages/builder/portal/apps/onboarding/_components/NamePanel.svelte b/packages/builder/src/pages/builder/portal/apps/onboarding/_components/NamePanel.svelte
index 86f293fb0b..d27d75a90d 100644
--- a/packages/builder/src/pages/builder/portal/apps/onboarding/_components/NamePanel.svelte
+++ b/packages/builder/src/pages/builder/portal/apps/onboarding/_components/NamePanel.svelte
@@ -72,9 +72,9 @@
   {:else}
     <p>‎</p>
   {/if}
-  <Button size="L" cta disabled={!isValid || disabled} on:click={onNext}
-    >Lets go!</Button
-  >
+  <Button size="L" cta disabled={!isValid || disabled} on:click={onNext}>
+    Lets go!
+  </Button>
 </div>
 
 <style>
diff --git a/packages/builder/src/pages/builder/portal/apps/onboarding/index.svelte b/packages/builder/src/pages/builder/portal/apps/onboarding/index.svelte
index e8d4309dd5..7426dd902e 100644
--- a/packages/builder/src/pages/builder/portal/apps/onboarding/index.svelte
+++ b/packages/builder/src/pages/builder/portal/apps/onboarding/index.svelte
@@ -5,7 +5,6 @@
   import { notifications } from "@budibase/bbui"
   import { SplitPage } from "@budibase/frontend-core"
   import { API } from "api"
-  import { store, automationStore } from "builderStore"
   import { auth, admin } from "stores/portal"
 
   let name = "My first app"
@@ -26,10 +25,6 @@
 
     const createdApp = await API.createApp(data)
 
-    // Select Correct Application/DB in prep for creating user
-    const pkg = await API.fetchAppPackage(createdApp.instance._id)
-    await store.actions.initialise(pkg)
-    await automationStore.actions.fetch()
     // Update checklist - in case first app
     await admin.init()
 
diff --git a/packages/builder/src/pages/builder/portal/users/groups/[groupId].svelte b/packages/builder/src/pages/builder/portal/users/groups/[groupId].svelte
index 4c1bb661fd..d03c62d528 100644
--- a/packages/builder/src/pages/builder/portal/users/groups/[groupId].svelte
+++ b/packages/builder/src/pages/builder/portal/users/groups/[groupId].svelte
@@ -12,7 +12,7 @@
   import { goto, url } from "@roxi/routify"
   import ConfirmDialog from "components/common/ConfirmDialog.svelte"
   import { Breadcrumb, Breadcrumbs } from "components/portal/page"
-  import { roles } from "stores/backend"
+  import { roles } from "stores/builder"
   import { apps, auth, features, groups } from "stores/portal"
   import { onMount, setContext } from "svelte"
   import AppNameTableRenderer from "../users/_components/AppNameTableRenderer.svelte"
diff --git a/packages/builder/src/pages/builder/portal/users/groups/_components/AppAddModal.svelte b/packages/builder/src/pages/builder/portal/users/groups/_components/AppAddModal.svelte
index 3eb7f5c267..f657a722a3 100644
--- a/packages/builder/src/pages/builder/portal/users/groups/_components/AppAddModal.svelte
+++ b/packages/builder/src/pages/builder/portal/users/groups/_components/AppAddModal.svelte
@@ -1,7 +1,7 @@
 <script>
   import { keepOpen, Body, ModalContent, Select } from "@budibase/bbui"
   import { apps, groups } from "stores/portal"
-  import { roles } from "stores/backend"
+  import { roles } from "stores/builder"
   import RoleSelect from "components/common/RoleSelect.svelte"
 
   export let group
diff --git a/packages/builder/src/pages/builder/portal/users/users/[userId].svelte b/packages/builder/src/pages/builder/portal/users/users/[userId].svelte
index 368e45d83c..0ea0749537 100644
--- a/packages/builder/src/pages/builder/portal/users/users/[userId].svelte
+++ b/packages/builder/src/pages/builder/portal/users/users/[userId].svelte
@@ -19,7 +19,7 @@
   } from "@budibase/bbui"
   import { onMount, setContext } from "svelte"
   import { users, auth, groups, apps, licensing, features } from "stores/portal"
-  import { roles } from "stores/backend"
+  import { roles } from "stores/builder"
   import ForceResetPasswordModal from "./_components/ForceResetPasswordModal.svelte"
   import UserGroupPicker from "components/settings/UserGroupPicker.svelte"
   import DeleteUserModal from "./_components/DeleteUserModal.svelte"
diff --git a/packages/builder/src/pages/builder/portal/users/users/_components/AppRoleTableRenderer.svelte b/packages/builder/src/pages/builder/portal/users/users/_components/AppRoleTableRenderer.svelte
index e0b743cfa2..0f19bb3e1f 100644
--- a/packages/builder/src/pages/builder/portal/users/users/_components/AppRoleTableRenderer.svelte
+++ b/packages/builder/src/pages/builder/portal/users/users/_components/AppRoleTableRenderer.svelte
@@ -1,7 +1,7 @@
 <script>
   import { StatusLight } from "@budibase/bbui"
   import { RoleUtils, Constants } from "@budibase/frontend-core"
-  import { roles } from "stores/backend"
+  import { roles } from "stores/builder"
   import { capitalise } from "helpers"
 
   export let value
diff --git a/packages/builder/src/pages/builder/portal/users/users/_components/OnboardingTypeModal.svelte b/packages/builder/src/pages/builder/portal/users/users/_components/OnboardingTypeModal.svelte
index 0048853545..a993faa0ad 100644
--- a/packages/builder/src/pages/builder/portal/users/users/_components/OnboardingTypeModal.svelte
+++ b/packages/builder/src/pages/builder/portal/users/users/_components/OnboardingTypeModal.svelte
@@ -1,6 +1,6 @@
 <script>
   import { ModalContent, Body, Layout, Icon } from "@budibase/bbui"
-  import { OnboardingType } from "../../../../../../constants"
+  import { OnboardingType } from "constants"
 
   export let chooseCreationType
 
diff --git a/packages/builder/src/pages/builder/portal/users/users/index.svelte b/packages/builder/src/pages/builder/portal/users/users/index.svelte
index 50afd0004a..18ee4f7d43 100644
--- a/packages/builder/src/pages/builder/portal/users/users/index.svelte
+++ b/packages/builder/src/pages/builder/portal/users/users/index.svelte
@@ -36,7 +36,7 @@
   import { get } from "svelte/store"
   import { Constants, Utils, fetchData } from "@budibase/frontend-core"
   import { API } from "api"
-  import { OnboardingType } from "../../../../../constants"
+  import { OnboardingType } from "constants"
   import ScimBanner from "../_components/SCIMBanner.svelte"
   import { sdk } from "@budibase/shared-core"
 
diff --git a/packages/builder/src/pages/index.svelte b/packages/builder/src/pages/index.svelte
index c6eaba8ff1..5bd8d4c3f4 100644
--- a/packages/builder/src/pages/index.svelte
+++ b/packages/builder/src/pages/index.svelte
@@ -1,6 +1,6 @@
 <script>
   import { redirect } from "@roxi/routify"
-  import { auth } from "../stores/portal"
+  import { auth } from "stores/portal"
   import { onMount } from "svelte"
   import { notifications } from "@budibase/bbui"
 
diff --git a/packages/builder/src/stores/backend/database.js b/packages/builder/src/stores/backend/database.js
deleted file mode 100644
index a2946c2488..0000000000
--- a/packages/builder/src/stores/backend/database.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import { writable } from "svelte/store"
-
-export const database = writable({})
diff --git a/packages/builder/src/stores/backend/index.js b/packages/builder/src/stores/backend/index.js
deleted file mode 100644
index 3781e2ab92..0000000000
--- a/packages/builder/src/stores/backend/index.js
+++ /dev/null
@@ -1,11 +0,0 @@
-export { database } from "./database"
-export { tables } from "./tables"
-export { views } from "./views"
-export { viewsV2 } from "./viewsV2"
-export { permissions } from "./permissions"
-export { roles } from "./roles"
-export { datasources } from "./datasources"
-export { integrations } from "./integrations"
-export { sortedIntegrations } from "./sortedIntegrations"
-export { queries } from "./queries"
-export { flags } from "./flags"
diff --git a/packages/builder/src/stores/builder/BudiStore.js b/packages/builder/src/stores/builder/BudiStore.js
new file mode 100644
index 0000000000..1acf299921
--- /dev/null
+++ b/packages/builder/src/stores/builder/BudiStore.js
@@ -0,0 +1,36 @@
+import { writable } from "svelte/store"
+
+export default class BudiStore {
+  constructor(init, opts) {
+    const store = writable({
+      ...init,
+    })
+
+    /**
+     * Internal Svelte store
+     */
+    this.store = store
+
+    /**
+     * Exposes the svelte subscribe fn to allow $ notation access
+     * @example
+     * $navigation.selectedScreenId
+     */
+    this.subscribe = this.store.subscribe
+
+    /**
+     * Exposes the svelte update fn.
+     * *Store modification should be kept to a minimum
+     */
+    this.update = this.store.update
+
+    /**
+     * Optional debug mode to output the store updates to console
+     */
+    if (opts?.debug) {
+      this.subscribe(state => {
+        console.warn(`${this.constructor.name}`, state)
+      })
+    }
+  }
+}
diff --git a/packages/builder/src/stores/builder/app.js b/packages/builder/src/stores/builder/app.js
new file mode 100644
index 0000000000..cb58f69fa8
--- /dev/null
+++ b/packages/builder/src/stores/builder/app.js
@@ -0,0 +1,100 @@
+import { API } from "api"
+import BudiStore from "./BudiStore"
+
+export const INITIAL_APP_META_STATE = {
+  appId: "",
+  name: "",
+  url: "",
+  libraries: [],
+  clientFeatures: {
+    spectrumThemes: false,
+    intelligentLoading: false,
+    deviceAwareness: false,
+    state: false,
+    rowSelection: false,
+    customThemes: false,
+    devicePreview: false,
+    messagePassing: false,
+    continueIfAction: false,
+    showNotificationAction: false,
+    sidePanel: false,
+  },
+  features: {
+    componentValidation: false,
+    disableUserMetadata: false,
+  },
+  clientLibPath: "",
+  hasLock: true,
+  appInstance: null,
+  initialised: false,
+  hasAppPackage: false,
+  usedPlugins: null,
+  routes: {},
+}
+
+export class AppMetaStore extends BudiStore {
+  constructor() {
+    super(INITIAL_APP_META_STATE)
+  }
+
+  reset() {
+    this.store.set({ ...INITIAL_APP_META_STATE })
+  }
+
+  syncAppPackage(pkg) {
+    const { application: app, clientLibPath, hasLock } = pkg
+
+    this.update(state => ({
+      ...state,
+      name: app.name,
+      appId: app.appId,
+      url: app.url,
+      hasLock,
+      clientLibPath,
+      libraries: app.componentLibraries,
+      version: app.version,
+      appInstance: app.instance,
+      revertableVersion: app.revertableVersion,
+      upgradableVersion: app.upgradableVersion,
+      usedPlugins: app.usedPlugins,
+      icon: app.icon || {},
+      features: {
+        ...INITIAL_APP_META_STATE.features,
+        ...app.features,
+      },
+      initialised: true,
+      hasAppPackage: true,
+    }))
+  }
+
+  syncClientFeatures(features) {
+    this.update(state => ({
+      ...state,
+      clientFeatures: {
+        ...INITIAL_APP_META_STATE.clientFeatures,
+        ...features,
+      },
+    }))
+  }
+
+  async syncAppRoutes() {
+    const resp = await API.fetchAppRoutes()
+    this.update(state => ({
+      ...state,
+      routes: resp.routes,
+    }))
+  }
+
+  // Returned from socket
+  syncMetadata(metadata) {
+    const { name, url, icon } = metadata
+    this.update(state => ({
+      ...state,
+      name,
+      url,
+      icon,
+    }))
+  }
+}
+
+export const appStore = new AppMetaStore()
diff --git a/packages/builder/src/builderStore/store/automation/index.js b/packages/builder/src/stores/builder/automations.js
similarity index 89%
rename from packages/builder/src/builderStore/store/automation/index.js
rename to packages/builder/src/stores/builder/automations.js
index af83f73dc6..a31b05a8d8 100644
--- a/packages/builder/src/builderStore/store/automation/index.js
+++ b/packages/builder/src/stores/builder/automations.js
@@ -1,10 +1,10 @@
-import { writable, get } from "svelte/store"
+import { writable, get, derived } from "svelte/store"
 import { API } from "api"
 import { cloneDeep } from "lodash/fp"
 import { generate } from "shortid"
-import { selectedAutomation } from "builderStore"
+import { createHistoryStore } from "stores/builder/history"
 import { notifications } from "@budibase/bbui"
-import { updateReferencesInObject } from "builderStore/dataBinding"
+import { updateReferencesInObject } from "dataBinding"
 
 const initialAutomationState = {
   automations: [],
@@ -17,10 +17,21 @@ const initialAutomationState = {
   selectedAutomationId: null,
 }
 
-export const getAutomationStore = () => {
+// If this functions, remove the actions elements
+export const createAutomationStore = () => {
   const store = writable(initialAutomationState)
+
   store.actions = automationActions(store)
-  return store
+
+  // Setup history for automations
+  const history = createHistoryStore({
+    getDoc: store.actions.getDefinition,
+    selectDoc: store.actions.select,
+  })
+
+  store.actions.save = history.wrapSaveDoc(store.actions.save)
+  store.actions.delete = history.wrapDeleteDoc(store.actions.delete)
+  return { store, history }
 }
 
 const updateStepReferences = (steps, modifiedIndex, action) => {
@@ -319,3 +330,19 @@ const automationActions = store => ({
     }
   },
 })
+
+const automations = createAutomationStore()
+
+export const automationStore = automations.store
+
+export const automationHistoryStore = automations.history
+
+// Derived automation state
+export const selectedAutomation = derived(automationStore, $automationStore => {
+  if (!$automationStore.selectedAutomationId) {
+    return null
+  }
+  return $automationStore.automations?.find(
+    x => x._id === $automationStore.selectedAutomationId
+  )
+})
diff --git a/packages/builder/src/stores/builder/builder.js b/packages/builder/src/stores/builder/builder.js
new file mode 100644
index 0000000000..94fbfafb19
--- /dev/null
+++ b/packages/builder/src/stores/builder/builder.js
@@ -0,0 +1,160 @@
+import { get } from "svelte/store"
+import { createBuilderWebsocket } from "./websocket.js"
+import { BuilderSocketEvent } from "@budibase/shared-core"
+import BudiStore from "./BudiStore"
+import { previewStore } from "./preview.js"
+import { TOUR_KEYS } from "components/portal/onboarding/tours.js"
+
+export const INITIAL_BUILDER_STATE = {
+  previousTopNavPath: {},
+  highlightedSettingKey: null,
+  propertyFocus: null,
+  builderSidePanel: false,
+  onboarding: false,
+  tourNodes: null,
+  tourKey: null,
+  tourStepKey: null,
+  hoveredComponentId: null,
+}
+
+export class BuilderStore extends BudiStore {
+  constructor() {
+    super({ ...INITIAL_BUILDER_STATE })
+
+    this.init = this.init.bind(this)
+    this.refresh = this.refresh.bind(this)
+    this.reset = this.reset.bind(this)
+    this.highlightSetting = this.highlightSetting.bind(this)
+    this.propertyFocus = this.propertyFocus.bind(this)
+    this.hover = this.hover.bind(this)
+    this.hideBuilderSidePanel = this.hideBuilderSidePanel.bind(this)
+    this.showBuilderSidePanel = this.showBuilderSidePanel.bind(this)
+    this.setPreviousTopNavPath = this.setPreviousTopNavPath.bind(this)
+    this.selectResource = this.selectResource.bind(this)
+    this.registerTourNode = this.registerTourNode.bind(this)
+    this.destroyTourNode = this.destroyTourNode.bind(this)
+    this.startBuilderOnboarding = this.startBuilderOnboarding.bind(this)
+
+    this.websocket
+  }
+
+  init(app) {
+    if (!app?.appId) {
+      console.error("BuilderStore: No appId supplied for websocket")
+      return
+    }
+    if (!this.websocket) {
+      this.websocket = createBuilderWebsocket(app.appId)
+    }
+  }
+
+  refresh() {
+    this.store.set(this.store.get())
+  }
+
+  reset() {
+    this.store.set({ ...INITIAL_BUILDER_STATE })
+    this.websocket?.disconnect()
+    this.websocket = null
+  }
+
+  highlightSetting(key) {
+    this.update(state => ({
+      ...state,
+      highlightedSettingKey: key,
+    }))
+  }
+
+  propertyFocus(key) {
+    this.update(state => ({
+      ...state,
+      propertyFocus: key,
+    }))
+  }
+
+  showBuilderSidePanel() {
+    this.update(state => ({
+      ...state,
+      builderSidePanel: true,
+    }))
+  }
+
+  hideBuilderSidePanel() {
+    this.update(state => ({
+      ...state,
+      builderSidePanel: false,
+    }))
+  }
+
+  setPreviousTopNavPath(route, url) {
+    this.update(state => ({
+      ...state,
+      previousTopNavPath: {
+        ...(state.previousTopNavPath || {}),
+        [route]: url,
+      },
+    }))
+  }
+
+  selectResource(id) {
+    this.websocket.emit(BuilderSocketEvent.SelectResource, {
+      resourceId: id,
+    })
+  }
+
+  registerTourNode(tourStepKey, node) {
+    this.update(state => {
+      const update = {
+        ...state,
+        tourNodes: {
+          ...state.tourNodes,
+          [tourStepKey]: node,
+        },
+      }
+      return update
+    })
+  }
+
+  destroyTourNode(tourStepKey) {
+    const store = get(this.store)
+    if (store.tourNodes?.[tourStepKey]) {
+      const nodes = { ...store.tourNodes }
+      delete nodes[tourStepKey]
+      this.update(state => ({
+        ...state,
+        tourNodes: nodes,
+      }))
+    }
+  }
+
+  startBuilderOnboarding() {
+    this.update(state => ({
+      ...state,
+      onboarding: true,
+      tourKey: TOUR_KEYS.TOUR_BUILDER_ONBOARDING,
+    }))
+  }
+
+  startTour(tourKey) {
+    this.update(state => ({
+      ...state,
+      tourKey: tourKey,
+    }))
+  }
+
+  hover(componentId, notifyClient = true) {
+    const store = get(this.store)
+    if (componentId === store.hoveredComponentId) {
+      return
+    }
+    this.update(state => {
+      state.hoveredComponentId = componentId
+      return state
+    })
+    if (notifyClient) {
+      previewStore.sendEvent("hover-component", componentId)
+    }
+  }
+}
+
+export const builderStore = new BuilderStore()
diff --git a/packages/builder/src/stores/builder/components.js b/packages/builder/src/stores/builder/components.js
new file mode 100644
index 0000000000..b742331343
--- /dev/null
+++ b/packages/builder/src/stores/builder/components.js
@@ -0,0 +1,1150 @@
+import { get, derived } from "svelte/store"
+import { cloneDeep } from "lodash/fp"
+import { API } from "api"
+import { Helpers } from "@budibase/bbui"
+import analytics, { Events } from "analytics"
+import { makePropSafe as safe } from "@budibase/string-templates"
+import {
+  findComponentPath,
+  findClosestMatchingComponent,
+  findComponent,
+  findComponentParent,
+  findAllMatchingComponents,
+  makeComponentUnique,
+} from "helpers/components"
+import { getComponentFieldOptions } from "helpers/formFields"
+import { selectedScreen } from "./screens"
+import {
+  screenStore,
+  appStore,
+  previewStore,
+  tables,
+} from "stores/builder/index"
+import { buildFormSchema, getSchemaForDatasource } from "dataBinding"
+import {
+  BUDIBASE_INTERNAL_DB_ID,
+  DEFAULT_BB_DATASOURCE_ID,
+  DB_TYPE_INTERNAL,
+  DB_TYPE_EXTERNAL,
+} from "constants/backend"
+import BudiStore from "./BudiStore"
+import { Utils } from "@budibase/frontend-core"
+
+export const INITIAL_COMPONENTS_STATE = {
+  components: {},
+  customComponents: [],
+  selectedComponentId: null,
+  componentToPaste: null,
+  settingsCache: {},
+}
+
+export class ComponentStore extends BudiStore {
+  constructor() {
+    super(INITIAL_COMPONENTS_STATE)
+
+    this.reset = this.reset.bind(this)
+    this.refreshDefinitions = this.refreshDefinitions.bind(this)
+    this.getDefinition = this.getDefinition.bind(this)
+    this.getDefaultDatasource = this.getDefaultDatasource.bind(this)
+    this.enrichEmptySettings = this.enrichEmptySettings.bind(this)
+    this.createInstance = this.createInstance.bind(this)
+    this.create = this.create.bind(this)
+    this.patch = this.patch.bind(this)
+    this.delete = this.delete.bind(this)
+    this.copy = this.copy.bind(this)
+    this.paste = this.paste.bind(this)
+    this.select = this.select.bind(this)
+    this.getPrevious = this.getPrevious.bind(this)
+    this.getNext = this.getNext.bind(this)
+    this.selectPrevious = this.selectPrevious.bind(this)
+    this.selectNext = this.selectNext.bind(this)
+    this.moveUp = this.moveUp.bind(this)
+    this.moveDown = this.moveDown.bind(this)
+    this.updateStyle = this.updateStyle.bind(this)
+    this.updateStyles = this.updateStyles.bind(this)
+    this.updateCustomStyle = this.updateCustomStyle.bind(this)
+    this.updateConditions = this.updateConditions.bind(this)
+    this.requestEjectBlock = this.requestEjectBlock.bind(this)
+    this.handleEjectBlock = this.handleEjectBlock.bind(this)
+    this.updateSetting = this.updateSetting.bind(this)
+    this.updateComponentSetting = this.updateComponentSetting.bind(this)
+    this.addParent = this.addParent.bind(this)
+    this.isCached = this.isCached.bind(this)
+    this.cacheSettings = this.cacheSettings.bind(this)
+    this.getComponentSettings = this.getComponentSettings.bind(this)
+  }
+
+  /**
+   * Reset the component store to default values
+   */
+  reset() {
+    this.store.set({ ...INITIAL_COMPONENTS_STATE })
+  }
+
+  /**
+   *
+   * @param {string} appId
+   * @returns
+   */
+  async refreshDefinitions(appId) {
+    if (!appId) {
+      return
+    }
+
+    // Fetch definitions and filter out custom component definitions so we
+    // can flag them
+    const components = await API.fetchComponentLibDefinitions(appId)
+    const customComponents = Object.keys(components).filter(key =>
+      key.startsWith("plugin/")
+    )
+
+    // Update store
+    this.update(state => ({
+      ...state,
+      components,
+      customComponents,
+    }))
+
+    // Sync client features to app store
+    appStore.syncClientFeatures(components.features)
+
+    return components
+  }
+
+  /**
+   * Retrieve the component definition object
+   * @param {string} componentType
+   * @example
+   * '@budibase/standard-components/container'
+   * @returns {object}
+   */
+  getDefinition(componentType) {
+    if (!componentType) {
+      return null
+    }
+    return get(this.store).components[componentType]
+  }
+
+  /**
+   *
+   * @returns {object}
+   */
+  getDefaultDatasource() {
+    // Ignore users table
+    const validTables = get(tables).list.filter(x => x._id !== "ta_users")
+
+    // Try to use their own internal table first
+    let table = validTables.find(table => {
+      return (
+        table.sourceId === BUDIBASE_INTERNAL_DB_ID &&
+        table.sourceType === DB_TYPE_INTERNAL
+      )
+    })
+    if (table) {
+      return table
+    }
+
+    // Then try sample data
+    table = validTables.find(table => {
+      return (
+        table.sourceId === DEFAULT_BB_DATASOURCE_ID &&
+        table.sourceType === DB_TYPE_INTERNAL
+      )
+    })
+    if (table) {
+      return table
+    }
+
+    // Finally try an external table
+    return validTables.find(table => table.sourceType === DB_TYPE_EXTERNAL)
+  }
+
+  /**
+   * Takes an enriched component instance and applies any required migration
+   * logic
+   * @param {object} enrichedComponent
+   * @returns {object} migrated Component
+   */
+  migrateSettings(enrichedComponent) {
+    const componentPrefix = "@budibase/standard-components"
+    let migrated = false
+
+    if (enrichedComponent?._component === `${componentPrefix}/formblock`) {
+      // Use default config if the 'buttons' prop has never been initialised
+      if (!("buttons" in enrichedComponent)) {
+        enrichedComponent["buttons"] =
+          Utils.buildFormBlockButtonConfig(enrichedComponent)
+        migrated = true
+      } else if (enrichedComponent["buttons"] == null) {
+        // Ignore legacy config if 'buttons' has been reset by 'resetOn'
+        const { _id, actionType, dataSource } = enrichedComponent
+        enrichedComponent["buttons"] = Utils.buildFormBlockButtonConfig({
+          _id,
+          actionType,
+          dataSource,
+        })
+        migrated = true
+      }
+
+      // Ensure existing Formblocks position their buttons at the top.
+      if (!("buttonPosition" in enrichedComponent)) {
+        enrichedComponent["buttonPosition"] = "top"
+        migrated = true
+      }
+    }
+
+    return migrated
+  }
+
+  /**
+   *
+   * @param {object} component
+   * @param {object} opts
+   * @returns
+   */
+  enrichEmptySettings(component, opts) {
+    if (!component?._component) {
+      return
+    }
+    const defaultDS = this.getDefaultDatasource()
+    const settings = this.getComponentSettings(component._component)
+    const { parent, screen, useDefaultValues } = opts || {}
+    const treeId = parent?._id || component._id
+    if (!screen) {
+      return
+    }
+    settings.forEach(setting => {
+      const value = component[setting.key]
+
+      // Fill empty settings
+      if (value == null || value === "") {
+        if (setting.type === "multifield" && setting.selectAllFields) {
+          // Select all schema fields where required
+          component[setting.key] = Object.keys(defaultDS?.schema || {})
+        } else if (
+          (setting.type === "dataSource" || setting.type === "table") &&
+          defaultDS
+        ) {
+          // Select default datasource where required
+          component[setting.key] = {
+            label: defaultDS.name,
+            tableId: defaultDS._id,
+            resourceId: defaultDS._id,
+            type: "table",
+          }
+        } else if (setting.type === "dataProvider") {
+          // Pick closest data provider where required
+          const path = findComponentPath(screen.props, treeId)
+          const providers = path.filter(component =>
+            component._component?.endsWith("/dataprovider")
+          )
+          if (providers.length) {
+            const id = providers[providers.length - 1]?._id
+            component[setting.key] = `{{ literal ${safe(id)} }}`
+          }
+        } else if (setting.type.startsWith("field/")) {
+          // Autofill form field names
+          // Get all available field names in this form schema
+          let fieldOptions = getComponentFieldOptions(
+            screen.props,
+            treeId,
+            setting.type,
+            false
+          )
+
+          // Get all currently used fields
+          const form = findClosestMatchingComponent(
+            screen.props,
+            treeId,
+            x => x._component === "@budibase/standard-components/form"
+          )
+          const usedFields = Object.keys(buildFormSchema(form) || {})
+
+          // Filter out already used fields
+          fieldOptions = fieldOptions.filter(x => !usedFields.includes(x))
+
+          // Set field name and also assume we have a label setting
+          if (fieldOptions[0]) {
+            component[setting.key] = fieldOptions[0]
+            component.label = fieldOptions[0]
+          }
+        } else if (useDefaultValues && setting.defaultValue !== undefined) {
+          // Use default value where required
+          component[setting.key] = setting.defaultValue
+        }
+      }
+
+      // Validate non-empty settings
+      else {
+        if (setting.type === "dataProvider") {
+          // Validate data provider exists, or else clear it
+          const treeId = parent?._id || component._id
+          const path = findComponentPath(screen?.props, treeId)
+          const providers = path.filter(component =>
+            component._component?.endsWith("/dataprovider")
+          )
+          // Validate non-empty values
+          const valid = providers?.some(dp => value.includes?.(dp._id))
+          if (!valid) {
+            if (providers.length) {
+              const id = providers[providers.length - 1]?._id
+              component[setting.key] = `{{ literal ${safe(id)} }}`
+            } else {
+              delete component[setting.key]
+            }
+          }
+        }
+      }
+    })
+  }
+
+  /**
+   *
+   * @param {string} componentName
+   * @param {object} presetProps
+   * @param {object} parent
+   * @returns
+   */
+  createInstance(componentName, presetProps, parent) {
+    const definition = this.getDefinition(componentName)
+    if (!definition) {
+      return null
+    }
+
+    // Generate basic component structure
+    let instance = {
+      _id: Helpers.uuid(),
+      _component: definition.component,
+      _styles: {
+        normal: {},
+        hover: {},
+        active: {},
+      },
+      _instanceName: `New ${definition.friendlyName || definition.name}`,
+      ...presetProps,
+    }
+
+    // Enrich empty settings
+    this.enrichEmptySettings(instance, {
+      parent,
+      screen: get(selectedScreen),
+      useDefaultValues: true,
+    })
+
+    // Migrate nested component settings
+    this.migrateSettings(instance)
+
+    // Add any extra properties the component needs
+    let extras = {}
+    if (definition.hasChildren) {
+      extras._children = []
+    }
+    if (componentName.endsWith("/formstep")) {
+      const parentForm = findClosestMatchingComponent(
+        get(selectedScreen).props,
+        get(selectedComponent)._id,
+        component => component._component.endsWith("/form")
+      )
+      const formSteps = findAllMatchingComponents(parentForm, component =>
+        component._component.endsWith("/formstep")
+      )
+      extras.step = formSteps.length + 1
+      extras._instanceName = `Step ${formSteps.length + 1}`
+    }
+    return {
+      ...cloneDeep(instance),
+      ...extras,
+    }
+  }
+
+  /**
+   *
+   * @param {string} componentName
+   * @param {object} presetProps
+   * @param {object} parent
+   * @param {number} index
+   * @returns
+   */
+  async create(componentName, presetProps, parent, index) {
+    const state = get(this.store)
+    const componentInstance = this.createInstance(
+      componentName,
+      presetProps,
+      parent
+    )
+    if (!componentInstance) {
+      return
+    }
+
+    // Insert in position if specified
+    if (parent && index != null) {
+      await screenStore.patch(screen => {
+        let parentComponent = findComponent(screen.props, parent)
+        if (!parentComponent._children?.length) {
+          parentComponent._children = [componentInstance]
+        } else {
+          parentComponent._children.splice(index, 0, componentInstance)
+        }
+      })
+    }
+
+    // Otherwise we work out where this component should be inserted
+    else {
+      await screenStore.patch(screen => {
+        // Find the selected component
+        let selectedComponentId = state.selectedComponentId
+        if (selectedComponentId.startsWith(`${screen._id}-`)) {
+          selectedComponentId = screen?.props._id
+        }
+        const currentComponent = findComponent(
+          screen.props,
+          selectedComponentId
+        )
+        if (!currentComponent) {
+          return false
+        }
+
+        // Find parent node to attach this component to
+        let parentComponent
+        if (currentComponent) {
+          // Use selected component as parent if one is selected
+          const definition = this.getDefinition(currentComponent._component)
+          if (definition?.hasChildren) {
+            // Use selected component if it allows children
+            parentComponent = currentComponent
+          } else {
+            // Otherwise we need to use the parent of this component
+            parentComponent = findComponentParent(
+              screen.props,
+              currentComponent._id
+            )
+          }
+        } else {
+          // Use screen or layout if no component is selected
+          parentComponent = screen.props
+        }
+
+        // Attach new component
+        if (!parentComponent) {
+          return false
+        }
+        if (!parentComponent._children) {
+          parentComponent._children = []
+        }
+        parentComponent._children.push(componentInstance)
+      })
+    }
+
+    // Select new component
+    this.update(state => {
+      state.selectedComponentId = componentInstance._id
+      return state
+    })
+
+    // Log event
+    analytics.captureEvent(Events.COMPONENT_CREATED, {
+      name: componentInstance._component,
+    })
+
+    return componentInstance
+  }
+
+  /**
+   *
+   * @param {function} patchFn
+   * @param {string} componentId
+   * @param {string} screenId
+   * @returns
+   */
+  async patch(patchFn, componentId, screenId) {
+    // Use selected component by default
+    if (!componentId || !screenId) {
+      const state = get(this.store)
+      componentId = componentId || state.selectedComponentId
+
+      const screenState = get(screenStore)
+      screenId = screenId || screenState.selectedScreenId
+    }
+    if (!componentId || !screenId || !patchFn) {
+      return
+    }
+    const patchScreen = screen => {
+      // findComponent looks in the tree not comp.settings[0]
+      let component = findComponent(screen.props, componentId)
+      if (!component) {
+        return false
+      }
+
+      // Mutates the fetched component with updates
+      const patchResult = patchFn(component, screen)
+
+      // Mutates the component with any required settings updates
+      const migrated = this.migrateSettings(component)
+
+      // Returning an explicit false signifies that we should skip this
+      // update. If we migrated something, ensure we never skip.
+      return migrated ? null : patchResult
+    }
+    await screenStore.patch(patchScreen, screenId)
+  }
+
+  /**
+   *
+   * @param {object} component
+   * @returns
+   */
+  async delete(component) {
+    if (!component) {
+      return
+    }
+
+    // Determine the next component to select after deletion
+    const state = get(this.store)
+    let nextSelectedComponentId
+    if (state.selectedComponentId === component._id) {
+      nextSelectedComponentId = this.getNext()
+      if (!nextSelectedComponentId) {
+        nextSelectedComponentId = this.getPrevious()
+      }
+    }
+
+    // Patch screen
+    await screenStore.patch(screen => {
+      // Check component exists
+      component = findComponent(screen.props, component._id)
+      if (!component) {
+        return false
+      }
+
+      // Check component has a valid parent
+      const parent = findComponentParent(screen.props, component._id)
+      if (!parent) {
+        return false
+      }
+      parent._children = parent._children.filter(
+        child => child._id !== component._id
+      )
+    })
+
+    // Update selected component if required
+    if (nextSelectedComponentId) {
+      this.update(state => {
+        state.selectedComponentId = nextSelectedComponentId
+        return state
+      })
+    }
+  }
+
+  copy(component, cut = false, selectParent = true) {
+    // Update store with copied component
+    this.update(state => {
+      state.componentToPaste = cloneDeep(component)
+      state.componentToPaste.isCut = cut
+      return state
+    })
+
+    // Select the parent if cutting
+    if (cut && selectParent) {
+      const screen = get(selectedScreen)
+      const parent = findComponentParent(screen?.props, component._id)
+      if (parent) {
+        this.update(state => {
+          state.selectedComponentId = parent._id
+          return state
+        })
+      }
+    }
+  }
+
+  /**
+   *
+   * @param {string} componentId
+   */
+  select(componentId) {
+    this.update(state => {
+      state.selectedComponentId = componentId
+      return state
+    })
+  }
+
+  /**
+   *
+   * @param {object} targetComponent
+   * @param {string} mode
+   * @param {object} targetScreen
+   * @returns
+   */
+  async paste(targetComponent, mode, targetScreen) {
+    const state = get(this.store)
+    if (!state.componentToPaste) {
+      return
+    }
+    let newComponentId
+
+    // Remove copied component if cutting, regardless if pasting works
+    let componentToPaste = cloneDeep(state.componentToPaste)
+    if (componentToPaste.isCut) {
+      this.update(state => {
+        delete state.componentToPaste
+        return state
+      })
+    }
+
+    // Patch screen
+    const patch = screen => {
+      // Get up to date ref to target
+      targetComponent = findComponent(screen.props, targetComponent._id)
+      if (!targetComponent) {
+        return false
+      }
+      const cut = componentToPaste.isCut
+      const originalId = componentToPaste._id
+      delete componentToPaste.isCut
+
+      // Make new component unique if copying
+      if (!cut) {
+        componentToPaste = makeComponentUnique(componentToPaste)
+      }
+      newComponentId = componentToPaste._id
+
+      // Delete old component if cutting
+      if (cut) {
+        const parent = findComponentParent(screen.props, originalId)
+        if (parent?._children) {
+          parent._children = parent._children.filter(
+            component => component._id !== originalId
+          )
+        }
+      }
+
+      // Check inside is valid
+      if (mode === "inside") {
+        const definition = this.getDefinition(targetComponent._component)
+        if (!definition.hasChildren) {
+          mode = "below"
+        }
+      }
+
+      // Paste new component
+      if (mode === "inside") {
+        // Paste inside target component if chosen
+        if (!targetComponent._children) {
+          targetComponent._children = []
+        }
+        targetComponent._children.push(componentToPaste)
+      } else {
+        // Otherwise paste in the correct order in the parent's children
+        const parent = findComponentParent(screen.props, targetComponent._id)
+        if (!parent?._children) {
+          return false
+        }
+        const targetIndex = parent._children.findIndex(component => {
+          return component._id === targetComponent._id
+        })
+        const index = mode === "above" ? targetIndex : targetIndex + 1
+        parent._children.splice(index, 0, componentToPaste)
+      }
+    }
+    const targetScreenId = targetScreen?._id || state.selectedScreenId
+    await screenStore.patch(patch, targetScreenId)
+
+    // Select the new component
+    this.update(state => {
+      state.selectedScreenId = targetScreenId
+      state.selectedComponentId = newComponentId
+      return state
+    })
+  }
+
+  getPrevious() {
+    const state = get(this.store)
+    const componentId = state.selectedComponentId
+    const screen = get(selectedScreen)
+    const parent = findComponentParent(screen.props, componentId)
+    const index = parent?._children.findIndex(x => x._id === componentId)
+
+    // Check for screen and navigation component edge cases
+    const screenComponentId = `${screen._id}-screen`
+    const navComponentId = `${screen._id}-navigation`
+    if (componentId === screenComponentId) {
+      return null
+    }
+    if (componentId === navComponentId) {
+      return screenComponentId
+    }
+    if (parent._id === screen.props._id && index === 0) {
+      return navComponentId
+    }
+
+    // If we have siblings above us, choose the sibling or a descendant
+    if (index > 0) {
+      // If sibling before us accepts children, select a descendant
+      const previousSibling = parent._children[index - 1]
+      if (previousSibling._children?.length) {
+        let target = previousSibling
+        while (target._children?.length) {
+          target = target._children[target._children.length - 1]
+        }
+        return target._id
+      }
+
+      // Otherwise just select sibling
+      return previousSibling._id
+    }
+
+    // If no siblings above us, select the parent
+    return parent._id
+  }
+
+  getNext() {
+    const state = get(this.store)
+    const component = get(selectedComponent)
+    const componentId = component?._id
+    const screen = get(selectedScreen)
+    const parent = findComponentParent(screen.props, componentId)
+    const index = parent?._children.findIndex(x => x._id === componentId)
+
+    // Check for screen and navigation component edge cases
+    const screenComponentId = `${screen._id}-screen`
+    const navComponentId = `${screen._id}-navigation`
+    if (state.selectedComponentId === screenComponentId) {
+      return navComponentId
+    }
+
+    // If we have children, select first child
+    if (component._children?.length) {
+      return component._children[0]._id
+    } else if (!parent) {
+      return null
+    }
+
+    // Otherwise select the next sibling if we have one
+    if (index < parent._children.length - 1) {
+      const nextSibling = parent._children[index + 1]
+      return nextSibling._id
+    }
+
+    // Last child, select our parents next sibling
+    let target = parent
+    let targetParent = findComponentParent(screen.props, target._id)
+    let targetIndex = targetParent?._children.findIndex(
+      child => child._id === target._id
+    )
+    while (
+      targetParent != null &&
+      targetIndex === targetParent._children?.length - 1
+    ) {
+      target = targetParent
+      targetParent = findComponentParent(screen.props, target._id)
+      targetIndex = targetParent?._children.findIndex(
+        child => child._id === target._id
+      )
+    }
+    if (targetParent) {
+      return targetParent._children[targetIndex + 1]._id
+    } else {
+      return null
+    }
+  }
+
+  selectPrevious() {
+    const previousId = this.getPrevious()
+    if (previousId) {
+      this.update(state => {
+        state.selectedComponentId = previousId
+        return state
+      })
+    }
+  }
+
+  selectNext() {
+    const nextId = this.getNext()
+    if (nextId) {
+      this.update(state => {
+        state.selectedComponentId = nextId
+        return state
+      })
+    }
+  }
+
+  async moveUp(component) {
+    await screenStore.patch(screen => {
+      const componentId = component?._id
+      const parent = findComponentParent(screen.props, componentId)
+
+      // Check we aren't right at the top of the tree
+      const index = parent?._children.findIndex(x => x._id === componentId)
+      if (!parent || (index === 0 && parent._id === screen.props._id)) {
+        return
+      }
+
+      // Copy original component and remove it from the parent
+      const originalComponent = cloneDeep(parent._children[index])
+      parent._children = parent._children.filter(
+        component => component._id !== componentId
+      )
+
+      // If we have siblings above us, move up
+      if (index > 0) {
+        // If sibling before us accepts children, move to last child of
+        // sibling
+        const previousSibling = parent._children[index - 1]
+        const definition = this.getDefinition(previousSibling._component)
+        if (definition.hasChildren) {
+          previousSibling._children.push(originalComponent)
+        }
+
+        // Otherwise just move component above sibling
+        else {
+          parent._children.splice(index - 1, 0, originalComponent)
+        }
+      }
+
+      // If no siblings above us, go above the parent as long as it isn't
+      // the screen
+      else if (parent._id !== screen.props._id) {
+        const grandParent = findComponentParent(screen.props, parent._id)
+        const parentIndex = grandParent._children.findIndex(
+          child => child._id === parent._id
+        )
+        grandParent._children.splice(parentIndex, 0, originalComponent)
+      }
+    })
+  }
+
+  async moveDown(component) {
+    await screenStore.patch(screen => {
+      const componentId = component?._id
+      const parent = findComponentParent(screen.props, componentId)
+
+      // Sanity check parent is found
+      if (!parent?._children?.length) {
+        return false
+      }
+
+      // Check we aren't right at the bottom of the tree
+      const index = parent._children.findIndex(x => x._id === componentId)
+      if (
+        index === parent._children.length - 1 &&
+        parent._id === screen.props._id
+      ) {
+        return
+      }
+
+      // Copy the original component and remove from parent
+      const originalComponent = cloneDeep(parent._children[index])
+      parent._children = parent._children.filter(
+        component => component._id !== componentId
+      )
+
+      // Move below the next sibling if we are not the last sibling
+      if (index < parent._children.length) {
+        // If the next sibling has children, become the first child
+        const nextSibling = parent._children[index]
+        const definition = this.getDefinition(nextSibling._component)
+        if (definition.hasChildren) {
+          nextSibling._children.splice(0, 0, originalComponent)
+        }
+
+        // Otherwise move below next sibling
+        else {
+          parent._children.splice(index + 1, 0, originalComponent)
+        }
+      }
+
+      // Last child, so move below our parent
+      else {
+        const grandParent = findComponentParent(screen.props, parent._id)
+        const parentIndex = grandParent._children.findIndex(
+          child => child._id === parent._id
+        )
+        grandParent._children.splice(parentIndex + 1, 0, originalComponent)
+      }
+    })
+  }
+
+  async updateStyle(name, value) {
+    await this.patch(component => {
+      if (value == null || value === "") {
+        delete component._styles.normal[name]
+      } else {
+        component._styles.normal[name] = value
+      }
+    })
+  }
+
+  async updateStyles(styles, id) {
+    const patchFn = component => {
+      component._styles.normal = {
+        ...component._styles.normal,
+        ...styles,
+      }
+    }
+    await this.patch(patchFn, id)
+  }
+
+  async updateCustomStyle(style) {
+    await this.patch(component => {
+      component._styles.custom = style
+    })
+  }
+
+  async updateConditions(conditions) {
+    await this.patch(component => {
+      component._conditions = conditions
+    })
+  }
+
+  async updateSetting(name, value) {
+    await this.patch(this.updateComponentSetting(name, value))
+  }
+
+  updateComponentSetting(name, value) {
+    return component => {
+      if (!name || !component) {
+        return false
+      }
+      // Skip update if the value is the same
+      if (component[name] === value) {
+        return false
+      }
+
+      const settings = this.getComponentSettings(component._component)
+      const updatedSetting = settings.find(setting => setting.key === name)
+
+      // Reset dependent fields
+      settings.forEach(setting => {
+        const needsReset =
+          name === setting.resetOn ||
+          (Array.isArray(setting.resetOn) && setting.resetOn.includes(name))
+        if (needsReset) {
+          component[setting.key] = setting.defaultValue || null
+        }
+      })
+
+      if (
+        updatedSetting?.type === "dataSource" ||
+        updatedSetting?.type === "table"
+      ) {
+        const { schema } = getSchemaForDatasource(null, value)
+        const columnNames = Object.keys(schema || {})
+        const multifieldKeysToSelectAll = settings
+          .filter(setting => {
+            return setting.type === "multifield" && setting.selectAllFields
+          })
+          .map(setting => setting.key)
+
+        multifieldKeysToSelectAll.forEach(key => {
+          component[key] = columnNames
+        })
+      }
+      component[name] = value
+      return true
+    }
+  }
+
+  requestEjectBlock(componentId) {
+    previewStore.sendEvent("eject-block", componentId)
+  }
+
+  async handleEjectBlock(componentId, ejectedDefinition) {
+    let nextSelectedComponentId
+
+    await screenStore.patch(screen => {
+      const block = findComponent(screen.props, componentId)
+      const parent = findComponentParent(screen.props, componentId)
+
+      // Sanity check
+      if (!block || !parent?._children?.length) {
+        return false
+      }
+
+      // Log event
+      analytics.captureEvent(Events.BLOCK_EJECTED, {
+        block: block._component,
+      })
+
+      // Attach block children back into ejected definition, using the
+      // _containsSlot flag to know where to insert them
+      const slotContainer = findAllMatchingComponents(
+        ejectedDefinition,
+        x => x._containsSlot
+      )[0]
+      if (slotContainer) {
+        delete slotContainer._containsSlot
+        slotContainer._children = [
+          ...(slotContainer._children || []),
+          ...(block._children || []),
+        ]
+      }
+
+      // Replace block with ejected definition
+      ejectedDefinition = makeComponentUnique(ejectedDefinition)
+      const index = parent._children.findIndex(x => x._id === componentId)
+      parent._children[index] = ejectedDefinition
+      nextSelectedComponentId = ejectedDefinition._id
+    })
+
+    // Select new root component
+    if (nextSelectedComponentId) {
+      this.update(state => {
+        state.selectedComponentId = nextSelectedComponentId
+        return state
+      })
+    }
+  }
+
+  async addParent(componentId, parentType) {
+    if (!componentId || !parentType) {
+      return
+    }
+
+    // Create new parent instance
+    const newParentDefinition = this.createInstance(parentType, null, parent)
+    if (!newParentDefinition) {
+      return
+    }
+
+    // Replace component with a version wrapped in a new parent
+    await screenStore.patch(screen => {
+      // Get this component definition and parent definition
+      let definition = findComponent(screen.props, componentId)
+      let oldParentDefinition = findComponentParent(screen.props, componentId)
+      if (!definition || !oldParentDefinition) {
+        return false
+      }
+
+      // Replace component with parent
+      const index = oldParentDefinition._children.findIndex(
+        component => component._id === componentId
+      )
+      if (index === -1) {
+        return false
+      }
+      oldParentDefinition._children[index] = {
+        ...newParentDefinition,
+        _children: [definition],
+      }
+    })
+
+    // Select the new parent
+    this.update(state => {
+      state.selectedComponentId = newParentDefinition._id
+      return state
+    })
+  }
+
+  /**
+   * Check if the components settings have been cached
+   * @param {string} componentType
+   * @example
+   * '@budibase/standard-components/container'
+   * @returns {boolean}
+   */
+  isCached(componentType) {
+    const settings = get(this.store).settingsCache
+    return componentType in settings
+  }
+
+  /**
+   * Cache component settings
+   * @param {string} componentType
+   * @param {object} definition
+   * @example
+   * '@budibase/standard-components/container'
+   * @returns {array} the settings
+   */
+  cacheSettings(componentType, definition) {
+    let settings = []
+    if (definition) {
+      settings = definition.settings?.filter(setting => !setting.section) ?? []
+      definition.settings
+        ?.filter(setting => setting.section)
+        .forEach(section => {
+          settings = settings.concat(
+            (section.settings || []).map(setting => ({
+              ...setting,
+              section: section.name,
+            }))
+          )
+        })
+    }
+    this.update(state => ({
+      ...state,
+      settingsCache: {
+        ...state.settingsCache,
+        [componentType]: settings,
+      },
+    }))
+    return settings
+  }
+
+  /**
+   * Retrieve an array of the component settings.
+   * These settings are cached because they cannot change at run time.
+   *
+   * Searches a component's definition for a setting matching a certain predicate.
+   * @param {string} componentType
+   * @example
+   * '@budibase/standard-components/container'
+   * @returns {Array<object>}
+   */
+  getComponentSettings(componentType) {
+    if (!componentType) {
+      return []
+    }
+
+    // Ensure whole component name is used
+    if (
+      !componentType.startsWith("plugin/") &&
+      !componentType.startsWith("@budibase")
+    ) {
+      componentType = `@budibase/standard-components/${componentType}`
+    }
+
+    // Use cached value if possible
+    const cachedValue = get(this.store).settingsCache[componentType]
+    if (cachedValue) {
+      return cachedValue
+    }
+
+    // Otherwise cache and return new value
+    const def = this.getDefinition(componentType)
+    return this.cacheSettings(componentType, def)
+  }
+}
+
+export const componentStore = new ComponentStore()
+
+export const selectedComponent = derived(
+  [componentStore, selectedScreen],
+  ([$store, $selectedScreen]) => {
+    if (
+      $selectedScreen &&
+      $store.selectedComponentId?.startsWith(`${$selectedScreen._id}-`)
+    ) {
+      return $selectedScreen?.props
+    }
+    if (!$selectedScreen || !$store.selectedComponentId) {
+      return null
+    }
+    const selected = findComponent(
+      $selectedScreen?.props,
+      $store.selectedComponentId
+    )
+
+    const clone = selected ? cloneDeep(selected) : selected
+    componentStore.migrateSettings(clone)
+    return clone
+  }
+)
+
+export const selectedComponentPath = derived(
+  [componentStore, selectedScreen],
+  ([$store, $selectedScreen]) => {
+    return findComponentPath(
+      $selectedScreen?.props,
+      $store.selectedComponentId
+    ).map(component => component._id)
+  }
+)
diff --git a/packages/builder/src/stores/backend/datasources.js b/packages/builder/src/stores/builder/datasources.js
similarity index 100%
rename from packages/builder/src/stores/backend/datasources.js
rename to packages/builder/src/stores/builder/datasources.js
diff --git a/packages/builder/src/builderStore/store/deployments.js b/packages/builder/src/stores/builder/deployments.js
similarity index 76%
rename from packages/builder/src/builderStore/store/deployments.js
rename to packages/builder/src/stores/builder/deployments.js
index 9f7a68cb46..dafdb1dabc 100644
--- a/packages/builder/src/builderStore/store/deployments.js
+++ b/packages/builder/src/stores/builder/deployments.js
@@ -2,7 +2,7 @@ import { writable } from "svelte/store"
 import { API } from "api"
 import { notifications } from "@budibase/bbui"
 
-export const getDeploymentStore = () => {
+export const createDeploymentStore = () => {
   let store = writable([])
 
   const load = async () => {
@@ -15,8 +15,8 @@ export const getDeploymentStore = () => {
 
   return {
     subscribe: store.subscribe,
-    actions: {
-      load,
-    },
+    load,
   }
 }
+
+export const deploymentStore = createDeploymentStore()
diff --git a/packages/builder/src/stores/backend/flags.js b/packages/builder/src/stores/builder/flags.js
similarity index 100%
rename from packages/builder/src/stores/backend/flags.js
rename to packages/builder/src/stores/builder/flags.js
diff --git a/packages/builder/src/builderStore/store/history.js b/packages/builder/src/stores/builder/history.js
similarity index 100%
rename from packages/builder/src/builderStore/store/history.js
rename to packages/builder/src/stores/builder/history.js
diff --git a/packages/builder/src/stores/builder/hover.js b/packages/builder/src/stores/builder/hover.js
new file mode 100644
index 0000000000..064d5c15cf
--- /dev/null
+++ b/packages/builder/src/stores/builder/hover.js
@@ -0,0 +1,29 @@
+import { get } from "svelte/store"
+import { previewStore } from "stores/builder"
+import BudiStore from "./BudiStore"
+
+export const INITIAL_HOVER_STATE = {
+  componentId: null,
+}
+
+export class HoverStore extends BudiStore {
+  constructor() {
+    super({ ...INITIAL_HOVER_STATE })
+    this.hover = this.hover.bind(this)
+  }
+
+  hover(componentId, notifyClient = true) {
+    if (componentId === get(this.store).componentId) {
+      return
+    }
+    this.update(state => {
+      state.componentId = componentId
+      return state
+    })
+    if (notifyClient) {
+      previewStore.sendEvent("hover-component", componentId)
+    }
+  }
+}
+
+export const hoverStore = new HoverStore()
diff --git a/packages/builder/src/stores/builder/index.js b/packages/builder/src/stores/builder/index.js
new file mode 100644
index 0000000000..36af7e7435
--- /dev/null
+++ b/packages/builder/src/stores/builder/index.js
@@ -0,0 +1,107 @@
+import { layoutStore } from "./layouts.js"
+import { appStore } from "./app.js"
+import {
+  componentStore,
+  selectedComponent,
+  selectedComponentPath,
+} from "./components"
+import { navigationStore } from "./navigation.js"
+import { themeStore } from "./theme.js"
+import { screenStore, selectedScreen, sortedScreens } from "./screens.js"
+import { builderStore } from "./builder.js"
+import { hoverStore } from "./hover.js"
+import { previewStore } from "./preview.js"
+import {
+  automationStore,
+  selectedAutomation,
+  automationHistoryStore,
+} from "./automations.js"
+import { userStore, userSelectedResourceMap, isOnlyUser } from "./users.js"
+import { deploymentStore } from "./deployments.js"
+
+// Backend
+import { tables } from "./tables"
+import { views } from "./views"
+import { viewsV2 } from "./viewsV2"
+import { permissions } from "./permissions"
+import { roles } from "./roles"
+import { datasources } from "./datasources"
+import { integrations } from "./integrations"
+import { sortedIntegrations } from "./sortedIntegrations"
+import { queries } from "./queries"
+import { flags } from "./flags"
+
+export {
+  layoutStore,
+  appStore,
+  componentStore,
+  navigationStore,
+  themeStore,
+  screenStore,
+  selectedScreen,
+  builderStore,
+  userSelectedResourceMap,
+  previewStore,
+  automationStore,
+  selectedAutomation,
+  automationHistoryStore,
+  sortedScreens,
+  userStore,
+  isOnlyUser,
+  deploymentStore,
+  selectedComponent,
+  selectedComponentPath,
+  tables,
+  views,
+  viewsV2,
+  permissions,
+  roles,
+  datasources,
+  integrations,
+  sortedIntegrations,
+  queries,
+  flags,
+  hoverStore,
+}
+
+export const reset = () => {
+  appStore.reset()
+  builderStore.reset()
+  screenStore.reset()
+  componentStore.reset()
+  layoutStore.reset()
+  navigationStore.reset()
+}
+
+const refreshBuilderData = async () => {
+  await Promise.all([
+    automationStore.actions.fetch(),
+    datasources.init(),
+    integrations.init(),
+    queries.init(),
+    tables.init(),
+    roles.fetch(),
+    flags.fetch(),
+  ])
+}
+
+const resetBuilderHistory = () => {
+  screenStore.history.reset()
+  automationHistoryStore.reset()
+}
+
+export const initialise = async pkg => {
+  const { application } = pkg
+  await Promise.all([
+    appStore.syncAppRoutes(),
+    componentStore.refreshDefinitions(application?.appId),
+  ])
+  builderStore.init(application)
+  appStore.syncAppPackage(pkg)
+  navigationStore.syncAppNavigation(application?.navigation)
+  themeStore.syncAppTheme(application)
+  screenStore.syncAppScreens(pkg)
+  layoutStore.syncAppLayouts(pkg)
+  resetBuilderHistory()
+  await refreshBuilderData()
+}
diff --git a/packages/builder/src/stores/backend/integrations.js b/packages/builder/src/stores/builder/integrations.js
similarity index 100%
rename from packages/builder/src/stores/backend/integrations.js
rename to packages/builder/src/stores/builder/integrations.js
diff --git a/packages/builder/src/stores/builder/layouts.js b/packages/builder/src/stores/builder/layouts.js
new file mode 100644
index 0000000000..e9a84a1d4a
--- /dev/null
+++ b/packages/builder/src/stores/builder/layouts.js
@@ -0,0 +1,77 @@
+import { derived, get } from "svelte/store"
+import { componentStore } from "stores/builder"
+import BudiStore from "./BudiStore"
+import { API } from "api"
+
+export const INITIAL_LAYOUT_STATE = {
+  layouts: [],
+  selectedLayoutId: null,
+}
+
+export class LayoutStore extends BudiStore {
+  constructor() {
+    super(INITIAL_LAYOUT_STATE)
+
+    this.reset = this.reset.bind(this)
+    this.syncAppLayouts = this.syncAppLayouts.bind(this)
+    this.select = this.select.bind(this)
+    this.deleteLayout = this.deleteLayout.bind(this)
+  }
+
+  reset() {
+    this.store.set({ ...INITIAL_LAYOUT_STATE })
+  }
+
+  syncAppLayouts(pkg) {
+    this.update(state => ({
+      ...state,
+      layouts: [...pkg.layouts],
+    }))
+  }
+
+  select(layoutId) {
+    // Check this layout exists
+    const state = get(this.store)
+    const componentState = get(componentStore)
+    const layout = state.layouts.find(layout => layout._id === layoutId)
+    if (!layout) {
+      return
+    }
+
+    // Check layout isn't already selected
+    if (
+      state.selectedLayoutId === layout._id &&
+      componentState.selectedComponentId === layout.props?._id
+    ) {
+      return
+    }
+
+    // Select new layout
+    this.update(state => {
+      state.selectedLayoutId = layout._id
+      return state
+    })
+
+    componentStore.select(layout.props?._id)
+  }
+
+  async deleteLayout(layout) {
+    if (!layout?._id) {
+      return
+    }
+    await API.deleteLayout({
+      layoutId: layout._id,
+      layoutRev: layout._rev,
+    })
+    this.update(state => {
+      state.layouts = state.layouts.filter(x => x._id !== layout._id)
+      return state
+    })
+  }
+}
+
+export const layoutStore = new LayoutStore()
+
+export const selectedLayout = derived(layoutStore, $store => {
+  return $store.layouts?.find(layout => layout._id === $store.selectedLayoutId)
+})
diff --git a/packages/builder/src/stores/builder/navigation.js b/packages/builder/src/stores/builder/navigation.js
new file mode 100644
index 0000000000..6d53a41019
--- /dev/null
+++ b/packages/builder/src/stores/builder/navigation.js
@@ -0,0 +1,86 @@
+import { get } from "svelte/store"
+import { API } from "api"
+import { appStore } from "stores/builder"
+import BudiStore from "./BudiStore"
+
+export const INITIAL_NAVIGATION_STATE = {
+  navigation: "Top",
+  links: [],
+  title: null,
+  sticky: null,
+  hideLogo: null,
+  logoUrl: null,
+  hideTitle: null,
+  navBackground: null,
+  navWidth: null,
+  navTextColor: null,
+}
+
+export class NavigationStore extends BudiStore {
+  constructor() {
+    super(INITIAL_NAVIGATION_STATE)
+  }
+
+  syncAppNavigation(nav) {
+    this.update(state => ({
+      ...state,
+      ...nav,
+    }))
+  }
+
+  reset() {
+    this.store.set({ ...INITIAL_NAVIGATION_STATE })
+  }
+
+  async save(navigation) {
+    const appId = get(appStore).appId
+    const app = await API.saveAppMetadata({
+      appId,
+      metadata: { navigation },
+    })
+    this.syncAppNavigation(app.navigation)
+  }
+
+  async saveLink(url, title) {
+    const navigation = get(this.store)
+    let links = [...(navigation?.links ?? [])]
+
+    // Skip if we have an identical link
+    if (links.find(link => link.url === url && link.text === title)) {
+      return
+    }
+
+    links.push({
+      text: title,
+      url,
+    })
+    await this.save({
+      ...navigation,
+      links: [...links],
+    })
+  }
+
+  async deleteLink(urls) {
+    const navigation = get(this.store)
+    let links = navigation?.links
+    if (!links?.length) {
+      return
+    }
+
+    // Filter out the URLs to delete
+    urls = Array.isArray(urls) ? urls : [urls]
+    links = links.filter(link => !urls.includes(link.url))
+
+    await this.save({
+      ...navigation,
+      links,
+    })
+  }
+
+  syncMetadata(metadata) {
+    const { navigation } = metadata
+    this.syncAppNavigation(navigation)
+  }
+}
+
+export const navigationStore = new NavigationStore()
diff --git a/packages/builder/src/stores/backend/permissions.js b/packages/builder/src/stores/builder/permissions.js
similarity index 100%
rename from packages/builder/src/stores/backend/permissions.js
rename to packages/builder/src/stores/builder/permissions.js
diff --git a/packages/builder/src/stores/builder/preview.js b/packages/builder/src/stores/builder/preview.js
new file mode 100644
index 0000000000..eca69d56d7
--- /dev/null
+++ b/packages/builder/src/stores/builder/preview.js
@@ -0,0 +1,75 @@
+import { writable, get } from "svelte/store"
+
+const INITIAL_PREVIEW_STATE = {
+  previewDevice: "desktop",
+  previewEventHandler: null,
+  showPreview: false,
+  selectedComponentContext: null,
+}
+
+export const createPreviewStore = () => {
+  const store = writable({
+    ...INITIAL_PREVIEW_STATE,
+  })
+
+  const setDevice = device => {
+    store.update(state => {
+      state.previewDevice = device
+      return state
+    })
+  }
+
+  // Potential evt names "eject-block", "dragging-new-component"
+  const sendEvent = (name, payload) => {
+    const { previewEventHandler } = get(store)
+    previewEventHandler?.(name, payload)
+  }
+
+  const registerEventHandler = handler => {
+    store.update(state => {
+      state.previewEventHandler = handler
+      return state
+    })
+  }
+
+  const startDrag = component => {
+    sendEvent("dragging-new-component", {
+      dragging: true,
+      component,
+    })
+  }
+
+  const stopDrag = () => {
+    sendEvent("dragging-new-component", {
+      dragging: false,
+    })
+  }
+
+  //load preview?
+  const showPreview = isVisible => {
+    store.update(state => {
+      state.showPreview = isVisible
+      return state
+    })
+  }
+
+  const setSelectedComponentContext = context => {
+    store.update(state => {
+      state.selectedComponentContext = context
+      return state
+    })
+  }
+
+  return {
+    subscribe: store.subscribe,
+    setDevice,
+    sendEvent, //may not be required
+    registerEventHandler,
+    startDrag,
+    stopDrag,
+    showPreview,
+    setSelectedComponentContext,
+  }
+}
+
+export const previewStore = createPreviewStore()
diff --git a/packages/builder/src/stores/backend/queries.js b/packages/builder/src/stores/builder/queries.js
similarity index 100%
rename from packages/builder/src/stores/backend/queries.js
rename to packages/builder/src/stores/builder/queries.js
diff --git a/packages/builder/src/stores/backend/roles.js b/packages/builder/src/stores/builder/roles.js
similarity index 100%
rename from packages/builder/src/stores/backend/roles.js
rename to packages/builder/src/stores/builder/roles.js
diff --git a/packages/builder/src/stores/builder/screens.js b/packages/builder/src/stores/builder/screens.js
new file mode 100644
index 0000000000..a646dee2f8
--- /dev/null
+++ b/packages/builder/src/stores/builder/screens.js
@@ -0,0 +1,513 @@
+import { derived, get } from "svelte/store"
+import { cloneDeep } from "lodash/fp"
+import { Helpers } from "@budibase/bbui"
+import { RoleUtils, Utils } from "@budibase/frontend-core"
+import { findAllMatchingComponents } from "helpers/components"
+import {
+  layoutStore,
+  appStore,
+  componentStore,
+  navigationStore,
+  selectedComponent,
+} from "stores/builder"
+import { createHistoryStore } from "stores/builder/history"
+import { API } from "api"
+import BudiStore from "./BudiStore"
+
+export const INITIAL_SCREENS_STATE = {
+  screens: [],
+  selectedScreenId: null,
+}
+
+export class ScreenStore extends BudiStore {
+  constructor() {
+    super(INITIAL_SCREENS_STATE)
+
+    // Bind scope
+    this.select = this.select.bind(this)
+    this.reset = this.reset.bind(this)
+    this.syncAppScreens = this.syncAppScreens.bind(this)
+    this.validate = this.validate.bind(this)
+    this.save = this.save.bind(this)
+    this.patch = this.patch.bind(this)
+    this.replace = this.replace.bind(this)
+    this.saveScreen = this.saveScreen.bind(this)
+    this.delete = this.delete.bind(this)
+    this.deleteScreen = this.deleteScreen.bind(this)
+    this.syncScreenData = this.syncScreenData.bind(this)
+    this.updateSetting = this.updateSetting.bind(this)
+    this.sequentialScreenPatch = this.sequentialScreenPatch.bind(this)
+    this.removeCustomLayout = this.removeCustomLayout.bind(this)
+
+    this.history = createHistoryStore({
+      getDoc: id => get(this.store).screens?.find(screen => screen._id === id),
+      selectDoc: this.select,
+      afterAction: () => {
+        // Ensure a valid component is selected
+        if (!get(selectedComponent)) {
+          this.update(state => ({
+            ...state,
+            selectedComponentId: get(this.store).selected?.props._id,
+          }))
+        }
+      },
+    })
+  }
+
+  /**
+   * Reset entire store back to base config
+   */
+  reset() {
+    this.store.set({ ...INITIAL_SCREENS_STATE })
+  }
+
+  /**
+   * Replace ALL store screens with application package screens
+   * @param {object} pkg
+   */
+  syncAppScreens(pkg) {
+    this.update(state => ({
+      ...state,
+      screens: [...pkg.screens],
+    }))
+  }
+
+  /**
+   * Uses a screen _id value to find the corresponding screen in the
+   * store. If found, the _id is persisted as selectedScreenId
+   * @param {string} screenId
+   * @returns
+   */
+  select(screenId) {
+    // Check this screen exists
+    const state = get(this.store)
+    const screen = state.screens.find(screen => screen._id === screenId)
+    if (!screen) {
+      return
+    }
+
+    // Check screen isn't already selected
+    if (state.selectedScreenId === screen._id) {
+      return
+    }
+
+    // Select new screen
+    this.update(state => {
+      state.selectedScreenId = screen._id
+      return state
+    })
+  }
+
+  /**
+   * Recursively parses the entire screen doc and checks for components
+   * violating illegal child configurations.
+   *
+   * @param {object} screen
+   * @throws Will throw an error containing the name of the component causing
+   * the invalid screen state
+   */
+  validate(screen) {
+    // Recursive function to find any illegal children in component trees
+    const findIllegalChild = (
+      component,
+      illegalChildren = [],
+      legalDirectChildren = []
+    ) => {
+      const type = component._component
+
+      if (illegalChildren.includes(type)) {
+        return type
+      }
+      if (legalDirectChildren.length && !legalDirectChildren.includes(type)) {
+        return type
+      }
+      if (!component?._children?.length) {
+        return
+      }
+
+      if (type === "@budibase/standard-components/sidepanel") {
+        illegalChildren = []
+      }
+
+      const definition = componentStore.getDefinition(component._component)
+      // Reset whitelist for direct children
+      legalDirectChildren = []
+      if (definition?.legalDirectChildren?.length) {
+        legalDirectChildren = definition.legalDirectChildren.map(x => {
+          return `@budibase/standard-components/${x}`
+        })
+      }
+
+      // Append blacklisted components and remove duplicates
+      if (definition?.illegalChildren?.length) {
+        const blacklist = definition.illegalChildren.map(x => {
+          return `@budibase/standard-components/${x}`
+        })
+        illegalChildren = [...new Set([...illegalChildren, ...blacklist])]
+      }
+
+      // Recurse on all children
+      for (let child of component._children) {
+        const illegalChild = findIllegalChild(
+          child,
+          illegalChildren,
+          legalDirectChildren
+        )
+        if (illegalChild) {
+          return illegalChild
+        }
+      }
+    }
+
+    // Validate the entire tree and throw an error if an illegal child is
+    // found anywhere
+    const illegalChild = findIllegalChild(screen.props)
+    if (illegalChild) {
+      const def = componentStore.getDefinition(illegalChild)
+      throw `You can't place a ${def.name} here`
+    }
+  }
+
+  /**
+   * Core save method. If creating a new screen, the store will sync the target
+   * screen id to ensure that it is selected in the builder
+   *
+   * @param {object} screen
+   * @returns {object}
+   */
+  async saveScreen(screen) {
+    const appState = get(appStore)
+
+    // Validate screen structure if the app supports it
+    if (appState.features?.componentValidation) {
+      this.validate(screen)
+    }
+
+    // Check screen definition for any component settings which need updated
+    this.enrichEmptySettings(screen)
+
+    // Save screen
+    const creatingNewScreen = screen._id === undefined
+    const savedScreen = await API.saveScreen(screen)
+
+    // Update state
+    this.update(state => {
+      // Update screen object
+      const idx = state.screens.findIndex(x => x._id === savedScreen._id)
+      if (idx !== -1) {
+        state.screens.splice(idx, 1, savedScreen)
+      } else {
+        state.screens.push(savedScreen)
+      }
+
+      // Select the new screen if creating a new one
+      if (creatingNewScreen) {
+        state.selectedScreenId = savedScreen._id
+
+        componentStore.update(state => ({
+          ...state,
+          selectedComponentId: savedScreen.props._id,
+        }))
+      }
+
+      return state
+    })
+
+    await this.syncScreenData(savedScreen)
+
+    return savedScreen
+  }
+
+  /**
+   * After saving a screen, sync plugins and routes to the appStore
+   * @param {object} savedScreen
+   */
+  async syncScreenData(savedScreen) {
+    const appState = get(appStore)
+    // If plugins changed we need to fetch the latest app metadata
+    let usedPlugins = appState.usedPlugins
+    if (savedScreen.pluginAdded) {
+      const { application } = await API.fetchAppPackage(appState.appId)
+      usedPlugins = application.usedPlugins || []
+    }
+
+    const routesResponse = await API.fetchAppRoutes()
+
+    appStore.update(state => ({
+      ...state,
+      routes: routesResponse.routes,
+      usedPlugins: usedPlugins,
+    }))
+  }
+
+  /**
+   * This is a fake implementation of a "patch" API endpoint to try and prevent
+   * 409s. All screen doc mutations (aside from creation) use this function,
+   * which queues up invocations sequentially and ensures pending mutations are
+   * always applied to the most up-to-date doc revision.
+   * This is slightly better than just a traditional "patch" endpoint and this
+   * supports deeply mutating the current doc rather than just appending data.
+   */
+  sequentialScreenPatch = Utils.sequential(async (patchFn, screenId) => {
+    const state = get(this.store)
+    const screen = state.screens.find(screen => screen._id === screenId)
+    if (!screen) {
+      return
+    }
+    let clone = cloneDeep(screen)
+    const result = patchFn(clone)
+
+    // An explicit false result means skip this change
+    if (result === false) {
+      return
+    }
+    return this.save(clone)
+  })
+
+  /**
+   * @param {function} patchFn
+   * @param {string} screenId
+   * @returns
+   */
+  async patch(patchFn, screenId) {
+    // Default to the currently selected screen
+    if (!screenId) {
+      const state = get(this.store)
+      screenId = state.selectedScreenId
+    }
+    if (!screenId || !patchFn) {
+      return
+    }
+    return await this.sequentialScreenPatch(patchFn, screenId)
+  }
+
+  /**
+   * Search the store by screen _id and replace the target with
+   * the screen supplied. If no screen is provided, the target has
+   * been removed by another user and will be filtered from the store.
+   * Used to marshal updates for the websocket
+   * @param {string} screenId
+   * @param {object} screen
+   * @returns
+   */
+  async replace(screenId, screen) {
+    if (!screenId) {
+      return
+    }
+    if (!screen) {
+      // Screen deletion
+      this.update(state => ({
+        ...state,
+        screens: state.screens.filter(x => x._id !== screenId),
+      }))
+    } else {
+      const index = get(this.store).screens.findIndex(x => x._id === screen._id)
+      if (index === -1) {
+        // Screen addition
+        this.update(state => ({
+          ...state,
+          screens: [...state.screens, screen],
+        }))
+      } else {
+        // Screen update
+        this.update(state => {
+          state.screens[index] = screen
+          return state
+        })
+      }
+    }
+  }
+
+  /**
+   * Takes one or more screens and builds an async delete for each.
+   * Once the deletes are processed, the deleted screens are
+   * filtered from the store by doc _id.
+   *
+   * Any deleted screens will then have their routes/links purged
+   *
+   * Wrapped by {@link delete}
+   * @param {object | array} screens
+   * @returns
+   */
+  async deleteScreen(screens) {
+    const screensToDelete = Array.isArray(screens) ? screens : [screens]
+    // Build array of promises to speed up bulk deletions
+    let promises = []
+    let deleteUrls = []
+    screensToDelete.forEach(screen => {
+      // Delete the screen
+      promises.push(
+        API.deleteScreen({
+          screenId: screen._id,
+          screenRev: screen._rev,
+        })
+      )
+      // Remove links to this screen
+      deleteUrls.push(screen.routing.route)
+    })
+    await Promise.all(promises)
+    await navigationStore.deleteLink(deleteUrls)
+    const deletedIds = screensToDelete.map(screen => screen._id)
+    const routesResponse = await API.fetchAppRoutes()
+    this.update(state => {
+      // Remove deleted screens from state
+      state.screens = state.screens.filter(screen => {
+        return !deletedIds.includes(screen._id)
+      })
+
+      // Deselect the current screen if it was deleted
+      if (deletedIds.includes(state.selectedScreenId)) {
+        state.selectedScreenId = null
+        componentStore.update(state => ({
+          ...state,
+          selectedComponentId: null,
+        }))
+      }
+
+      // Update routing
+      appStore.update(state => ({
+        ...state,
+        routes: routesResponse.routes,
+      }))
+
+      return state
+    })
+    return null
+  }
+
+  /**
+   * {@link deleteScreen} wrapped to enable history tracking
+   * @param {object | array} screen
+   *
+   */
+  async delete(screens_x) {
+    const wrappedFn = this.history.wrapDeleteDoc(this.deleteScreen)
+    return wrappedFn(screens_x)
+  }
+
+  /**
+   * {@link saveScreen} wrapped to enable history tracking
+   * @param {object} screen
+   */
+  async save(screen) {
+    const wrappedFn = this.history.wrapSaveDoc(this.saveScreen)
+    return wrappedFn(screen)
+  }
+
+  /**
+   * Update a screen by deep setting a property value by name
+   *
+   * After a successful update, this method ensures that there is only
+   * ONE home screen per user Role.
+   *
+   * @param {object} screen
+   * @param {string} name e.g "routing.homeScreen" or "showNavigation"
+   * @param {any} value
+   * @returns
+   */
+  async updateSetting(screen, name, value) {
+    if (!screen || !name) {
+      return
+    }
+
+    // Apply setting update
+    const patchFn = screen => {
+      if (!screen) {
+        return false
+      }
+      // Skip update if the value is the same
+      if (Helpers.deepGet(screen, name) === value) {
+        return false
+      }
+      Helpers.deepSet(screen, name, value)
+    }
+    await this.patch(patchFn, screen._id)
+
+    // Ensure we don't have more than one home screen for this new role.
+    // This could happen after updating multiple different settings.
+    const state = get(this.store)
+    const updatedScreen = state.screens.find(s => s._id === screen._id)
+    if (!updatedScreen) {
+      return
+    }
+    const otherHomeScreens = state.screens.filter(s => {
+      return (
+        s.routing.roleId === updatedScreen.routing.roleId &&
+        s.routing.homeScreen &&
+        s._id !== screen._id
+      )
+    })
+    if (otherHomeScreens.length && updatedScreen.routing.homeScreen) {
+      const patchFn = screen => {
+        screen.routing.homeScreen = false
+      }
+      for (let otherHomeScreen of otherHomeScreens) {
+        await this.patch(patchFn, otherHomeScreen._id)
+      }
+    }
+  }
+
+  // Move to layouts store
+  async removeCustomLayout(screen) {
+    // Pull relevant settings from old layout, if required
+    const layout = get(layoutStore).layouts.find(x => x._id === screen.layoutId)
+    const patchFn = screen => {
+      screen.layoutId = null
+      screen.showNavigation = layout?.props.navigation !== "None"
+      screen.width = layout?.props.width || "Large"
+    }
+    await this.patch(patchFn, screen._id)
+  }
+
+  /**
+   * Parse the entire screen component tree and ensure settings are valid
+   * and up-to-date. Ensures stability after a product update.
+   * @param {object} screen
+   */
+  async enrichEmptySettings(screen) {
+    // Flatten the recursive component tree
+    const components = findAllMatchingComponents(screen.props, x => x)
+
+    // Iterate over all components and run checks
+    components.forEach(component => {
+      componentStore.enrichEmptySettings(component, {
+        screen,
+      })
+    })
+  }
+}
+
+export const screenStore = new ScreenStore()
+
+export const selectedScreen = derived(screenStore, $store => {
+  return $store.screens.find(screen => screen._id === $store.selectedScreenId)
+})
+
+export const sortedScreens = derived(screenStore, $screenStore => {
+  return $screenStore.screens.slice().sort((a, b) => {
+    // Sort by role first
+    const roleA = RoleUtils.getRolePriority(a.routing.roleId)
+    const roleB = RoleUtils.getRolePriority(b.routing.roleId)
+    if (roleA !== roleB) {
+      return roleA > roleB ? -1 : 1
+    }
+    // Then put home screens first
+    const homeA = !!a.routing.homeScreen
+    const homeB = !!b.routing.homeScreen
+    if (homeA !== homeB) {
+      return homeA ? -1 : 1
+    }
+    // Then sort alphabetically by each URL param
+    const aParams = a.routing.route.split("/")
+    const bParams = b.routing.route.split("/")
+    let minParams = Math.min(aParams.length, bParams.length)
+    for (let i = 0; i < minParams; i++) {
+      if (aParams[i] === bParams[i]) {
+        continue
+      }
+      return aParams[i] < bParams[i] ? -1 : 1
+    }
+    // Then sort by the fewest amount of URL params
+    return aParams.length < bParams.length ? -1 : 1
+  })
+})
diff --git a/packages/builder/src/stores/backend/sortedIntegrations.js b/packages/builder/src/stores/builder/sortedIntegrations.js
similarity index 100%
rename from packages/builder/src/stores/backend/sortedIntegrations.js
rename to packages/builder/src/stores/builder/sortedIntegrations.js
diff --git a/packages/builder/src/stores/backend/tables.js b/packages/builder/src/stores/builder/tables.js
similarity index 100%
rename from packages/builder/src/stores/backend/tables.js
rename to packages/builder/src/stores/builder/tables.js
diff --git a/packages/builder/src/stores/builder/tests/app.test.js b/packages/builder/src/stores/builder/tests/app.test.js
new file mode 100644
index 0000000000..e0e5d17ba6
--- /dev/null
+++ b/packages/builder/src/stores/builder/tests/app.test.js
@@ -0,0 +1,134 @@
+import { it, expect, describe, beforeEach, vi } from "vitest"
+import { get } from "svelte/store"
+import { INITIAL_APP_META_STATE, AppMetaStore } from "stores/builder/app"
+import {
+  clientFeaturesResp,
+  generateAppPackage,
+  generateFakeRoutes,
+  getScreenFixture,
+  getScreenDocId,
+} from "./fixtures"
+import { API } from "api"
+
+vi.mock("api", () => {
+  return {
+    API: {
+      fetchAppRoutes: vi.fn(),
+    },
+  }
+})
+
+describe("Application Meta Store", () => {
+  beforeEach(async ctx => {
+    vi.clearAllMocks()
+
+    const appStore = new AppMetaStore()
+    ctx.test = {
+      get store() {
+        return get(appStore)
+      },
+      appStore,
+    }
+  })
+
+  it("Create base store with defaults", ctx => {
+    expect(ctx.test.store).toStrictEqual(INITIAL_APP_META_STATE)
+  })
+
+  it("Reset the app metadata to default", ctx => {
+    const pkg = generateAppPackage({})
+    ctx.test.appStore.syncAppPackage(pkg)
+
+    expect(ctx.test.store).not.toStrictEqual(INITIAL_APP_META_STATE)
+
+    ctx.test.appStore.reset()
+
+    expect(ctx.test.store).toStrictEqual(INITIAL_APP_META_STATE)
+  })
+
+  it("Sync app metadata from a new app package", async ctx => {
+    const pkg = generateAppPackage({
+      version: "2.5.0",
+      revertableVersion: "2.5.6",
+      upgradableVersion: "2.5.7",
+      plugins: 4,
+    })
+    const { application: app, clientLibPath, hasLock } = pkg
+
+    const {
+      version,
+      instance,
+      revertableVersion,
+      upgradableVersion,
+      usedPlugins,
+      icon,
+      name,
+      appId,
+      url,
+      features,
+      componentLibraries,
+    } = app
+
+    ctx.test.appStore.syncAppPackage(pkg)
+
+    expect(ctx.test.store).toStrictEqual({
+      ...INITIAL_APP_META_STATE,
+      name,
+      appId,
+      url,
+      clientLibPath,
+      libraries: componentLibraries,
+      version,
+      appInstance: instance,
+      revertableVersion,
+      upgradableVersion,
+      usedPlugins,
+      icon,
+      features,
+      hasLock,
+      initialised: true,
+      hasAppPackage: true,
+    })
+  })
+
+  it("Sync component feature flags to state", async ctx => {
+    ctx.test.appStore.syncClientFeatures(clientFeaturesResp)
+
+    expect(ctx.test.store.clientFeatures).toStrictEqual(clientFeaturesResp)
+  })
+
+  it("Sync app routes from the API", async ctx => {
+    const coreScreen = getScreenFixture()
+    const existingDocId = getScreenDocId()
+    coreScreen._json._id = existingDocId
+
+    const fakeRoutes = generateFakeRoutes([coreScreen.json()])
+    const routeSpy = vi
+      .spyOn(API, "fetchAppRoutes")
+      .mockResolvedValue({ routes: fakeRoutes })
+
+    await ctx.test.appStore.syncAppRoutes()
+
+    expect(routeSpy).toBeCalled()
+
+    expect(ctx.test.store.routes).toStrictEqual(fakeRoutes)
+  })
+
+  it("Sync app metadata after socket update", ctx => {
+    const fakeMetadata = {
+      name: "updated_name",
+      url: "/update-url",
+      icon: {
+        name: "Launch",
+        color: "var(--spectrum-global-color-orange-600)",
+      },
+    }
+
+    ctx.test.appStore.syncMetadata(fakeMetadata)
+
+    expect(ctx.test.store).toStrictEqual({
+      ...INITIAL_APP_META_STATE,
+      ...fakeMetadata,
+    })
+  })
+})
diff --git a/packages/builder/src/stores/builder/tests/builder.test.js b/packages/builder/src/stores/builder/tests/builder.test.js
new file mode 100644
index 0000000000..7aac2489db
--- /dev/null
+++ b/packages/builder/src/stores/builder/tests/builder.test.js
@@ -0,0 +1,206 @@
+import { it, expect, describe, beforeEach, vi } from "vitest"
+import { get } from "svelte/store"
+import { INITIAL_BUILDER_STATE, BuilderStore } from "stores/builder/builder"
+import { createBuilderWebsocket } from "../websocket.js"
+import { BuilderSocketEvent } from "@budibase/shared-core"
+
+vi.mock("../websocket.js")
+
+describe("Builder store", () => {
+  beforeEach(ctx => {
+    vi.clearAllMocks()
+    const builderStore = new BuilderStore()
+    ctx.test = {}
+    ctx.test = {
+      get store() {
+        return get(builderStore)
+      },
+      builderStore,
+    }
+  })
+
+  it("Create base builder store with defaults", ctx => {
+    expect(ctx.test.store).toStrictEqual(INITIAL_BUILDER_STATE)
+  })
+
+  it("Initialise the builder and create a websocket if it hasnt already", ctx => {
+    createBuilderWebsocket.mockReturnValue({
+      emit: vi.fn(),
+    })
+
+    ctx.test.builderStore.init({
+      appId: "1234",
+    })
+    expect(createBuilderWebsocket).toBeCalledWith("1234")
+    expect(ctx.test.builderStore.websocket).toBeDefined()
+  })
+
+  it("Ignore initialisation if an appId is not provided", ctx => {
+    ctx.test.builderStore.init()
+    expect(createBuilderWebsocket).not.toBeCalled()
+    expect(ctx.test.builderStore.websocket).not.toBeDefined()
+  })
+
+  it("Reset the app metadata to default values. Disconnect the websocket", ctx => {
+    createBuilderWebsocket.mockReturnValue({
+      emit: vi.fn(),
+      disconnect: vi.fn(),
+    })
+
+    ctx.test.builderStore.init({
+      appId: "1234",
+    })
+
+    ctx.test.builderStore.update(state => ({
+      ...state,
+      builderSidePanel: true,
+      onboarding: true,
+    }))
+
+    let disconnected = false
+    ctx.test.builderStore.websocket.disconnect.mockImplementation(() => {
+      disconnected = true
+    })
+
+    ctx.test.builderStore.reset()
+    expect(disconnected).toBe(true)
+    expect(ctx.test.store).toStrictEqual(INITIAL_BUILDER_STATE)
+    expect(ctx.test.builderStore.websocket).toBeNull()
+  })
+
+  it("Attempt to emit a resource select event to the websocket on select", ctx => {
+    createBuilderWebsocket.mockReturnValue({
+      emit: vi.fn(),
+      disconnect: vi.fn(),
+    })
+
+    ctx.test.builderStore.init({
+      appId: "1234",
+    })
+
+    ctx.test.builderStore.selectResource("tester")
+
+    expect(ctx.test.builderStore.websocket.emit).toHaveBeenCalledWith(
+      BuilderSocketEvent.SelectResource,
+      {
+        resourceId: "tester",
+      }
+    )
+  })
+
+  it("Sync a highlighted setting key to state", ctx => {
+    expect(ctx.test.store.highlightedSettingKey).toBeNull()
+
+    ctx.test.builderStore.highlightSetting("testing")
+
+    expect(ctx.test.store).toStrictEqual({
+      ...INITIAL_BUILDER_STATE,
+      highlightedSettingKey: "testing",
+    })
+  })
+
+  it("Sync a property focus setting key to state", ctx => {
+    expect(ctx.test.store.propertyFocus).toBeNull()
+
+    ctx.test.builderStore.propertyFocus("testing")
+
+    expect(ctx.test.store).toStrictEqual({
+      ...INITIAL_BUILDER_STATE,
+      propertyFocus: "testing",
+    })
+  })
+
+  it("Update the builder side panel visibility", ctx => {
+    expect(ctx.test.store.builderSidePanel).toBe(false)
+
+    ctx.test.builderStore.showBuilderSidePanel()
+
+    expect(ctx.test.store).toStrictEqual({
+      ...INITIAL_BUILDER_STATE,
+      builderSidePanel: true,
+    })
+
+    ctx.test.builderStore.hideBuilderSidePanel()
+
+    expect(ctx.test.store).toStrictEqual({
+      ...INITIAL_BUILDER_STATE,
+      builderSidePanel: false,
+    })
+  })
+
+  it("Update the previousTopNavPath value when empty", ctx => {
+    expect(ctx.test.store.previousTopNavPath).toBeDefined()
+    const dataRoute = "/builder/app/:application/data"
+    const dataURL = "/builder/app/app_dev_123/data/table/ta_users"
+
+    ctx.test.builderStore.setPreviousTopNavPath(dataRoute, dataURL)
+
+    expect(ctx.test.store.previousTopNavPath).toStrictEqual({
+      [dataRoute]: dataURL,
+    })
+  })
+
+  it("Add in new route/path mappings and maintain existing", ctx => {
+    const dataRoute = "/builder/app/:application/data"
+    const dataURL = "/builder/app/app_dev_123/data/table/ta_users"
+
+    const designRoute = "/builder/app/:application/design"
+    const designURL =
+      "/builder/app/app_dev_123/design/screen_456/screen_456-screen"
+
+    ctx.test.builderStore.setPreviousTopNavPath(dataRoute, dataURL)
+
+    expect(ctx.test.store.previousTopNavPath).toStrictEqual({
+      [dataRoute]: dataURL,
+    })
+
+    ctx.test.builderStore.setPreviousTopNavPath(designRoute, designURL)
+
+    expect(ctx.test.store.previousTopNavPath).toStrictEqual({
+      [dataRoute]: dataURL,
+      [designRoute]: designURL,
+    })
+  })
+
+  it("Overrite an existing route/path mapping with a new URL", ctx => {
+    expect(ctx.test.store.previousTopNavPath).toStrictEqual({})
+
+    const dataRoute = "/builder/app/:application/data"
+    const dataURL = "/builder/app/app_dev_123/data/table/ta_users"
+    const updatedURL = "/builder/app/app_dev_123/data/table/ta_employees"
+
+    ctx.test.builderStore.setPreviousTopNavPath(dataRoute, dataURL)
+
+    expect(ctx.test.store.previousTopNavPath).toStrictEqual({
+      [dataRoute]: dataURL,
+    })
+
+    ctx.test.builderStore.setPreviousTopNavPath(dataRoute, updatedURL)
+
+    expect(ctx.test.store.previousTopNavPath).toStrictEqual({
+      [dataRoute]: updatedURL,
+    })
+  })
+
+  it("Register a builder tour node", ctx => {
+    const fakeNode = { name: "node" }
+    ctx.test.builderStore.registerTourNode("sampleKey", fakeNode)
+
+    const registeredNodes = ctx.test.store.tourNodes
+
+    expect(registeredNodes).not.toBeNull()
+    expect(Object.keys(registeredNodes).length).toBe(1)
+    expect(registeredNodes["sampleKey"]).toStrictEqual(fakeNode)
+  })
+
+  it("Clear a destroyed tour node", ctx => {
+    const fakeNode = { name: "node" }
+    ctx.test.builderStore.registerTourNode("sampleKey", fakeNode)
+
+    expect(ctx.test.store.tourNodes).not.toBeNull()
+    expect(Object.keys(ctx.test.store.tourNodes).length).toBe(1)
+
+    ctx.test.builderStore.destroyTourNode("sampleKey")
+    expect(ctx.test.store.tourNodes).toStrictEqual({})
+  })
+})
diff --git a/packages/builder/src/stores/builder/tests/component.test.js b/packages/builder/src/stores/builder/tests/component.test.js
new file mode 100644
index 0000000000..b6c9ca27cd
--- /dev/null
+++ b/packages/builder/src/stores/builder/tests/component.test.js
@@ -0,0 +1,471 @@
+import { it, expect, describe, beforeEach, vi } from "vitest"
+import { get, writable } from "svelte/store"
+import {
+  INITIAL_COMPONENTS_STATE,
+  ComponentStore,
+} from "stores/builder/components"
+import { API } from "api"
+import { appStore, tables } from "stores/builder"
+import {
+  componentDefinitionMap,
+  getComponentFixture,
+  getScreenFixture,
+  pluginDefinitionMap,
+  clientFeaturesResp,
+  sampleTableDoc,
+  internalTableDoc,
+  userTableDoc,
+  externalTableDoc,
+  componentsToNested,
+} from "./fixtures"
+import {
+  DB_TYPE_INTERNAL,
+  DB_TYPE_EXTERNAL,
+  DEFAULT_BB_DATASOURCE_ID,
+} from "constants/backend"
+
+// Could move to fixtures
+const COMP_PREFIX = "@budibase/standard-components"
+
+vi.mock("api", () => {
+  return {
+    API: {
+      fetchComponentLibDefinitions: vi.fn(),
+    },
+  }
+})
+
+vi.mock("stores/builder", async () => {
+  const mockAppStore = writable()
+  const appStore = {
+    subscribe: mockAppStore.subscribe,
+    update: mockAppStore.update,
+    set: mockAppStore.set,
+    syncClientFeatures: vi.fn(),
+  }
+  const mockTableStore = writable()
+  const tables = {
+    subscribe: mockTableStore.subscribe,
+    update: mockTableStore.update,
+    set: mockTableStore.set,
+  }
+  return {
+    appStore,
+    tables,
+  }
+})
+
+// Simple base config for components and data sources
+const baseInitialisation = ctx => {
+  // Init components
+  ctx.test.componentStore.update(state => ({
+    ...state,
+    components: {
+      ...componentDefinitionMap(),
+    },
+  }))
+
+  // Add datasources
+  tables.update(state => ({
+    ...state,
+    list: [sampleTableDoc, internalTableDoc, userTableDoc, externalTableDoc],
+  }))
+}
+
+describe("Component store", () => {
+  beforeEach(ctx => {
+    vi.clearAllMocks()
+    vi.resetAllMocks()
+
+    const componentStore = new ComponentStore()
+    ctx.test = {}
+    ctx.test = {
+      get store() {
+        return get(componentStore)
+      },
+      get $store() {
+        return get(componentStore) //store and $store
+      },
+      componentStore,
+    }
+  })
+
+  it("Create base component store with defaults", ctx => {
+    expect(ctx.test.store).toStrictEqual(INITIAL_COMPONENTS_STATE)
+  })
+
+  it("Reset the component store to default", ctx => {
+    const container = getComponentFixture(`${COMP_PREFIX}/container`)
+    const pluginDefs = pluginDefinitionMap()
+
+    ctx.test.componentStore.update(state => ({
+      ...state,
+      components: {
+        ...componentDefinitionMap(),
+        ...pluginDefs,
+      },
+      customComponents: Object.keys(pluginDefs),
+      componentToPaste: container.json(),
+      selectedComponentId: container._id,
+    }))
+
+    expect(ctx.test.store).not.toStrictEqual(INITIAL_COMPONENTS_STATE)
+
+    ctx.test.componentStore.reset()
+
+    expect(ctx.test.store).toStrictEqual(INITIAL_COMPONENTS_STATE)
+  })
+
+  it("Refresh the component definitions", async ctx => {
+    const componentDefs = componentDefinitionMap()
+    let mockAPIResponse = {
+      features: clientFeaturesResp,
+      ...componentDefs,
+    }
+    const apiDefRequest = vi
+      .spyOn(API, "fetchComponentLibDefinitions")
+      .mockResolvedValue(mockAPIResponse)
+
+    const fakeAppId = "abc123"
+    const components = await ctx.test.componentStore.refreshDefinitions(
+      fakeAppId
+    )
+
+    expect(components).toStrictEqual(mockAPIResponse)
+    expect(ctx.test.store.components).toStrictEqual(mockAPIResponse)
+
+    expect(apiDefRequest).toBeCalled()
+    expect(appStore.syncClientFeatures).toBeCalledWith(clientFeaturesResp)
+  })
+
+  it("Refresh and sync component and plugin definitions", async ctx => {
+    const componentDefs = componentDefinitionMap()
+    const pluginDefs = pluginDefinitionMap()
+
+    let mockAPIResponse = {
+      features: clientFeaturesResp,
+      ...componentDefs,
+      ...pluginDefs,
+    }
+    const apiDefRequest = vi
+      .spyOn(API, "fetchComponentLibDefinitions")
+      .mockResolvedValue(mockAPIResponse)
+
+    const fakeAppId = "abc123"
+    const components = await ctx.test.componentStore.refreshDefinitions(
+      fakeAppId
+    )
+
+    expect(components).toStrictEqual(mockAPIResponse)
+    expect(ctx.test.store.components).toStrictEqual(mockAPIResponse)
+
+    expect(apiDefRequest).toBeCalled()
+    expect(appStore.syncClientFeatures).toBeCalledWith(clientFeaturesResp)
+
+    expect(ctx.test.store.customComponents).toStrictEqual(
+      Object.keys(pluginDefs)
+    )
+  })
+
+  it("Ignores definition sync if no appId is specified.", async ctx => {
+    const apiDefRequest = vi.spyOn(API, "fetchComponentLibDefinitions")
+
+    const components = await ctx.test.componentStore.refreshDefinitions()
+
+    expect(components).toBeUndefined()
+
+    expect(apiDefRequest).not.toBeCalled()
+  })
+
+  it("Retrieves component definitions by component type", ctx => {
+    const pluginDefs = pluginDefinitionMap()
+    const componentDefs = componentDefinitionMap()
+
+    ctx.test.componentStore.update(state => ({
+      ...state,
+      components: {
+        ...componentDefs,
+        ...pluginDefs,
+      },
+      customComponents: Object.keys(pluginDefs),
+    }))
+
+    const def = ctx.test.componentStore.getDefinition(
+      "@budibase/standard-components/container"
+    )
+
+    expect(def).toStrictEqual(
+      componentDefs["@budibase/standard-components/container"]
+    )
+
+    const pluginDef = ctx.test.componentStore.getDefinition("plugin/budi-video")
+
+    expect(pluginDef).toStrictEqual(pluginDefs["plugin/budi-video"])
+  })
+
+  it("Handle missing or invalid component definition keys", ctx => {
+    const pluginDefs = pluginDefinitionMap()
+    const componentDefs = componentDefinitionMap()
+
+    ctx.test.componentStore.update(state => ({
+      ...state,
+      components: {
+        ...componentDefs,
+        ...pluginDefs,
+      },
+      customComponents: Object.keys(pluginDefs),
+    }))
+
+    const def = ctx.test.componentStore.getDefinition(
+      "@budibase/standard-components/mystery"
+    )
+    expect(def).toBeUndefined()
+
+    const defEmpty = ctx.test.componentStore.getDefinition()
+    expect(defEmpty).toBeNull()
+  })
+
+  it("Select an appropriate default datasource - Internal Table ", ctx => {
+    tables.update(state => ({
+      ...state,
+      list: [sampleTableDoc, internalTableDoc, userTableDoc, externalTableDoc],
+    }))
+
+    const table = ctx.test.componentStore.getDefaultDatasource()
+    expect(table.sourceType).toBe(DB_TYPE_INTERNAL)
+    expect(table.sourceId).not.toBe(DEFAULT_BB_DATASOURCE_ID)
+  })
+
+  it("Select an appropriate default datasource - Sample Table ", ctx => {
+    tables.update(state => ({
+      ...state,
+      list: [sampleTableDoc, userTableDoc, externalTableDoc],
+    }))
+
+    const table = ctx.test.componentStore.getDefaultDatasource()
+    expect(table.sourceType).toBe(DB_TYPE_INTERNAL)
+    expect(table.sourceId).toBe(DEFAULT_BB_DATASOURCE_ID)
+  })
+
+  it("Select an appropriate default datasource - External Table ", ctx => {
+    tables.update(state => ({
+      ...state,
+      list: [userTableDoc, externalTableDoc],
+    }))
+
+    const table = ctx.test.componentStore.getDefaultDatasource()
+    expect(table.sourceType).toBe(DB_TYPE_EXTERNAL)
+  })
+
+  it("Select an appropriate default datasource - No Table and ignore user table", ctx => {
+    tables.update(state => ({
+      ...state,
+      list: [userTableDoc],
+    }))
+
+    const table = ctx.test.componentStore.getDefaultDatasource()
+    expect(table).toBeUndefined()
+  })
+
+  it("Apply no migrations if component is not a formblock", ctx => {
+    const comp = getComponentFixture(`${COMP_PREFIX}/container`).json()
+    const orig = { ...comp }
+    const migrated = ctx.test.componentStore.migrateSettings(orig)
+
+    expect(migrated).toBe(false)
+    expect(comp).toStrictEqual(orig)
+  })
+
+  it("Should initialise the buttons prop if it didnt exist", ctx => {
+    const formBlock = getComponentFixture(`${COMP_PREFIX}/formblock`).json()
+    const migrated = ctx.test.componentStore.migrateSettings(formBlock)
+
+    expect(migrated).toBe(true)
+    expect(formBlock.buttons).toEqual([])
+  })
+
+  it("Should initialise the buttons prop if it was nullified/reset", ctx => {
+    const formBlock = getComponentFixture(`${COMP_PREFIX}/formblock`).json()
+    formBlock.buttons = null
+    const migrated = ctx.test.componentStore.migrateSettings(formBlock)
+
+    expect(migrated).toBe(true)
+    expect(formBlock.buttons).toEqual([])
+  })
+
+  it("Should initialise formblock button position when not set", ctx => {
+    const formBlock = getComponentFixture(`${COMP_PREFIX}/formblock`).json()
+    const migrated = ctx.test.componentStore.migrateSettings(formBlock)
+
+    expect(migrated).toBe(true)
+    expect(formBlock.buttonPosition).toEqual("top")
+  })
+
+  it("Should ignore formblock migration if already initialised", ctx => {
+    const formBlock = getComponentFixture(`${COMP_PREFIX}/formblock`).json()
+    formBlock.buttonPosition = "bottom"
+    formBlock.buttons = []
+    const migrated = ctx.test.componentStore.migrateSettings(formBlock)
+
+    expect(migrated).toBe(false)
+    expect(formBlock.buttonPosition).toEqual("bottom")
+  })
+
+  it("enrichEmptySettings - initialise multifield type with schema keys", async ctx => {
+    const coreScreen = getScreenFixture()
+
+    baseInitialisation(ctx)
+
+    const componentDefs = componentDefinitionMap()
+    const targetCompDef =
+      componentDefs["@budibase/standard-components/rowexplorer"]
+
+    const comp = getComponentFixture(`${COMP_PREFIX}/rowexplorer`).json()
+    ctx.test.componentStore.enrichEmptySettings(comp, {
+      parent: null,
+      screen: coreScreen.json(),
+      useDefaultValues: true,
+    })
+
+    const multifieldKey = targetCompDef.settings[0].key
+    const multifieldOptions = comp[multifieldKey]
+
+    expect(multifieldOptions).toStrictEqual(
+      Object.keys(internalTableDoc.schema)
+    )
+  })
+
+  const enrichSettingsDS = (type, ctx) => {
+    const coreScreen = getScreenFixture()
+
+    baseInitialisation(ctx)
+
+    const componentDefs = componentDefinitionMap()
+    const targetCompDef = componentDefs[`${COMP_PREFIX}/${type}`]
+
+    const comp = getComponentFixture(`${COMP_PREFIX}/${type}`).json()
+    ctx.test.componentStore.enrichEmptySettings(comp, {
+      parent: null,
+      screen: coreScreen.json(),
+      useDefaultValues: true,
+    })
+
+    const settingKey = targetCompDef.settings[0].key
+    const settingValue = comp[settingKey]
+
+    expect(settingValue).toStrictEqual({
+      label: internalTableDoc.name,
+      tableId: internalTableDoc._id,
+      resourceId: internalTableDoc._id,
+      type: "table",
+    })
+  }
+
+  it("enrichEmptySettings - set default datasource for 'table' setting type", async ctx => {
+    enrichSettingsDS("formblock", ctx)
+  })
+
+  it("enrichEmptySettings - set default datasource for 'dataSource' setting type", async ctx => {
+    enrichSettingsDS("dataprovider", ctx)
+  })
+
+  it("enrichEmptySettings - set default datasource for type dataprovider", ctx => {
+    const coreScreen = getScreenFixture()
+
+    baseInitialisation(ctx)
+
+    const componentDefs = componentDefinitionMap()
+    const targetCompDef = componentDefs[`${COMP_PREFIX}/table`]
+
+    const providerOne = getComponentFixture(`${COMP_PREFIX}/dataprovider`)
+    const tableOne = getComponentFixture(`${COMP_PREFIX}/table`)
+
+    const components = Array(10)
+      .fill()
+      .map(() => getComponentFixture(`${COMP_PREFIX}/container`))
+
+    components.splice(5, 0, providerOne)
+    components.push(tableOne)
+
+    let nested = componentsToNested(components)
+    coreScreen.addChild(nested)
+
+    const comp = tableOne.json()
+    ctx.test.componentStore.enrichEmptySettings(comp, {
+      parent: null,
+      screen: coreScreen.json(),
+      useDefaultValues: true,
+    })
+    const settingKey = targetCompDef.settings[0].key
+    const settingValue = comp[settingKey]
+
+    expect(settingValue).toBe(`{{ literal [${providerOne.json()._id}] }}`)
+  })
+
+  it("enrichEmptySettings - set default datasource for type dataprovider - get closest provider", ctx => {
+    const coreScreen = getScreenFixture()
+
+    baseInitialisation(ctx)
+
+    const componentDefs = componentDefinitionMap()
+    const targetCompDef = componentDefs[`${COMP_PREFIX}/table`]
+
+    const providerOne = getComponentFixture(`${COMP_PREFIX}/dataprovider`)
+    const providerTwo = getComponentFixture(`${COMP_PREFIX}/dataprovider`)
+    const tableOne = getComponentFixture(`${COMP_PREFIX}/table`)
+
+    const components = Array(10)
+      .fill()
+      .map(() => getComponentFixture(`${COMP_PREFIX}/container`))
+
+    components.unshift(providerOne)
+    components.splice(5, 0, providerTwo)
+    components.push(tableOne)
+
+    let nested = componentsToNested(components)
+    coreScreen.addChild(nested)
+
+    const comp = tableOne.json()
+    ctx.test.componentStore.enrichEmptySettings(comp, {
+      parent: null,
+      screen: coreScreen.json(),
+      useDefaultValues: true,
+    })
+    const settingKey = targetCompDef.settings[0].key
+    const settingValue = comp[settingKey]
+
+    // Get the closest data provider in the tree.
+    expect(settingValue).toBe(`{{ literal [${providerTwo.json()._id}] }}`)
+  })
+
+  it("enrichEmptySettings - set default datasource for type dataprovider - no providers in tree", ctx => {
+    const coreScreen = getScreenFixture()
+
+    baseInitialisation(ctx)
+
+    const componentDefs = componentDefinitionMap()
+    const targetCompDef = componentDefs[`${COMP_PREFIX}/table`]
+
+    const tableOne = getComponentFixture(`${COMP_PREFIX}/table`)
+    const components = Array(10)
+      .fill()
+      .map(() => getComponentFixture(`${COMP_PREFIX}/container`))
+
+    components.push(tableOne)
+
+    let nested = componentsToNested(components)
+    coreScreen.addChild(nested)
+
+    const comp = tableOne.json()
+    ctx.test.componentStore.enrichEmptySettings(comp, {
+      parent: null,
+      screen: coreScreen.json(),
+      useDefaultValues: true,
+    })
+    const settingKey = targetCompDef.settings[0].key
+    const settingValue = comp[settingKey]
+
+    // The value should remain unset
+    expect(settingValue).toBeUndefined()
+  })
+})
diff --git a/packages/builder/src/stores/backend/tests/datasources.spec.js.disabled b/packages/builder/src/stores/builder/tests/datasources.spec.js.disabled
similarity index 100%
rename from packages/builder/src/stores/backend/tests/datasources.spec.js.disabled
rename to packages/builder/src/stores/builder/tests/datasources.spec.js.disabled
diff --git a/packages/builder/src/stores/backend/tests/fixtures/datasources.js b/packages/builder/src/stores/builder/tests/fixtures/datasources.js
similarity index 100%
rename from packages/builder/src/stores/backend/tests/fixtures/datasources.js
rename to packages/builder/src/stores/builder/tests/fixtures/datasources.js
diff --git a/packages/builder/src/stores/builder/tests/fixtures/index.js b/packages/builder/src/stores/builder/tests/fixtures/index.js
new file mode 100644
index 0000000000..f636790f53
--- /dev/null
+++ b/packages/builder/src/stores/builder/tests/fixtures/index.js
@@ -0,0 +1,284 @@
+import { v4 } from "uuid"
+import { Component } from "templates/Component"
+import { Screen } from "templates/Screen"
+import { get } from "svelte/store"
+import {
+  BUDIBASE_INTERNAL_DB_ID,
+  DB_TYPE_INTERNAL,
+  DB_TYPE_EXTERNAL,
+  DEFAULT_BB_DATASOURCE_ID,
+} from "constants/backend"
+
+const getDocId = () => {
+  return v4().replace(/-/g, "")
+}
+
+export const getScreenDocId = () => {
+  return `screen_${getDocId()}`
+}
+
+export const getScreenFixture = () => {
+  return new Screen()
+}
+
+export const getComponentFixture = type => {
+  if (!type) {
+    return null
+  }
+  return new Component(type)
+}
+
+// Sample Definitions
+export const COMPONENT_DEFINITIONS = {
+  form: {
+    name: "Form",
+    hasChildren: true,
+    illegalChildren: ["section", "form", "formblock"],
+  },
+  formblock: {
+    name: "Form Block",
+    block: true,
+    settings: [
+      {
+        type: "table",
+        key: "dataSource",
+      },
+    ],
+  },
+  container: {
+    name: "Container",
+  },
+  rowexplorer: {
+    name: "Row Explorer",
+    settings: [
+      {
+        // combo unique to the row explorer
+        type: "multifield",
+        selectAllFields: true,
+        key: "detailFields",
+      },
+    ],
+  },
+  dataprovider: {
+    name: "Data Provider",
+    settings: [
+      {
+        type: "dataSource",
+      },
+    ],
+  },
+  table: {
+    name: "Table",
+    settings: [
+      {
+        type: "dataProvider",
+        key: "dataProvider",
+      },
+    ],
+  },
+  stringfield: {
+    name: "Text Field",
+    settings: [
+      {
+        type: "field/string",
+        key: "field",
+      },
+    ],
+  },
+}
+
+// Sample plugin definitions
+export const PLUGIN_DEFINITIONS = {
+  "budi-video": {
+    component: "plugin/budi-video",
+    description: "Embedded video component. ",
+    friendlyName: "Budi Video",
+    icon: "VideoOutline",
+    name: "budi-video",
+  },
+}
+
+// Take a component array and turn it into a deeply nested tree
+export const componentsToNested = components => {
+  let nested
+  do {
+    const current = components.pop()
+    if (!nested) {
+      nested = current
+      continue
+    }
+    //review this for the empty
+    current.addChild(nested)
+    nested = current
+  } while (components.length)
+  return nested
+}
+
+export const getFakeScreenPatch = store => {
+  return async (patchFn, screenId) => {
+    const target = get(store).screens.find(screen => screen._id === screenId)
+
+    patchFn(target)
+
+    await store.replace(screenId, target)
+  }
+}
+
+export const componentDefinitionMap = () => {
+  return Object.keys(COMPONENT_DEFINITIONS).reduce((acc, key) => {
+    const def = COMPONENT_DEFINITIONS[key]
+    acc[`@budibase/standard-components/${key}`] = def
+    return acc
+  }, {})
+}
+
+export const pluginDefinitionMap = () => {
+  return Object.keys(PLUGIN_DEFINITIONS).reduce((acc, key) => {
+    const def = PLUGIN_DEFINITIONS[key]
+    acc[`plugin/${key}`] = def
+    return acc
+  }, {})
+}
+
+export const getPluginFixture = pluginName => {
+  const fakeName = pluginName || v4().replace(/-/g, "")
+  return {
+    _id: `plg_${fakeName}`,
+    name: fakeName,
+    version: "1.0.0",
+    hash: v4().replace(/-/g, ""),
+    jsUrl: `/files/signed/plugins/${fakeName}/plugin.min.js`,
+  }
+}
+
+export const generateFakeRoutes = screens => {
+  return {
+    routes: screens.reduce((acc, screen, idx) => {
+      let routing = screen.routing
+      let route = routing.route || "/screen_" + idx
+      acc[route] = {
+        subpaths: {
+          [route]: {
+            screens: {
+              [routing.roleId]: screen._id,
+            },
+          },
+        },
+      }
+      return acc
+    }, {}),
+  }
+}
+
+export const generateAppPackage = ({
+  plugins = 0,
+  version = "1.0.0",
+  upgradableVersion,
+  revertableVersion,
+  appValidation = true,
+  disableUserMetadata = true,
+  name = "Test app",
+  url = "/test-app",
+}) => {
+  const appId = "app_dev_" + getDocId()
+
+  const fakePlugins = Array(plugins)
+    .fill()
+    .map(() => getPluginFixture())
+
+  const features = {}
+  features["componentValidation"] = appValidation
+
+  if (disableUserMetadata) {
+    features["disableUserMetadata"] = false
+  }
+
+  return {
+    application: {
+      appId,
+      version,
+      upgradableVersion,
+      revertableVersion,
+      componentLibraries: ["@budibase/standard-components"],
+      usedPlugins: [...fakePlugins],
+      name,
+      url,
+      instance: {
+        _id: appId,
+      },
+      features,
+      icon: {},
+      type: "app",
+    },
+    clientLibPath: `https://cdn.budibase.net/${appId}/budibase-client.js?v=${version}`,
+    hasLock: true,
+  }
+}
+
+export const clientFeaturesResp = {
+  spectrumThemes: true,
+  intelligentLoading: true,
+  deviceAwareness: true,
+  state: true,
+  customThemes: true,
+  devicePreview: true,
+  messagePassing: true,
+  rowSelection: true,
+  continueIfAction: true,
+  showNotificationAction: true,
+  sidePanel: true,
+}
+
+export const userTableDoc = {
+  _id: "ta_users",
+  type: "table",
+  name: "Users",
+  schema: {},
+}
+
+export const sampleTableDoc = {
+  _id: "ta_bb_employee",
+  type: "table",
+  name: "Employees",
+  sourceId: DEFAULT_BB_DATASOURCE_ID,
+  sourceType: DB_TYPE_INTERNAL,
+  primaryDisplay: "First Name",
+  schema: {
+    "First Name": {
+      name: "First Name",
+      type: "string",
+    },
+    "Last Name": {
+      name: "Last Name",
+      type: "string",
+    },
+  },
+}
+
+export const internalTableDoc = {
+  _id: "ta_db5ac9e254da415899adcec21a025b3f",
+  tableId: "ta_db5ac9e254da415899adcec21a025b3f",
+  type: "table",
+  name: "Media",
+  sourceId: BUDIBASE_INTERNAL_DB_ID,
+  sourceType: DB_TYPE_INTERNAL,
+  schema: {
+    MediaTitle: {
+      name: "MediaTitle",
+      type: "string",
+    },
+    MediaVersion: {
+      name: "MediaVersion",
+      type: "string",
+    },
+  },
+}
+
+export const externalTableDoc = {
+  type: "table",
+  _id: "datasource_plus_c5e6ae7fbe534da6917c44b284c54b45__Tester",
+  name: "Tester",
+  sourceId: "datasource_plus_c5e6ae7fbe534da6917c44b284c54b45",
+  sourceType: DB_TYPE_EXTERNAL,
+  sql: true,
+}
diff --git a/packages/builder/src/stores/backend/tests/fixtures/queries.js b/packages/builder/src/stores/builder/tests/fixtures/queries.js
similarity index 100%
rename from packages/builder/src/stores/backend/tests/fixtures/queries.js
rename to packages/builder/src/stores/builder/tests/fixtures/queries.js
diff --git a/packages/builder/src/stores/backend/tests/fixtures/roles.js b/packages/builder/src/stores/builder/tests/fixtures/roles.js
similarity index 100%
rename from packages/builder/src/stores/backend/tests/fixtures/roles.js
rename to packages/builder/src/stores/builder/tests/fixtures/roles.js
diff --git a/packages/builder/src/stores/backend/tests/fixtures/tables.js b/packages/builder/src/stores/builder/tests/fixtures/tables.js
similarity index 100%
rename from packages/builder/src/stores/backend/tests/fixtures/tables.js
rename to packages/builder/src/stores/builder/tests/fixtures/tables.js
diff --git a/packages/builder/src/stores/backend/tests/fixtures/views.js b/packages/builder/src/stores/builder/tests/fixtures/views.js
similarity index 100%
rename from packages/builder/src/stores/backend/tests/fixtures/views.js
rename to packages/builder/src/stores/builder/tests/fixtures/views.js
diff --git a/packages/builder/src/builderStore/store/history.test.js b/packages/builder/src/stores/builder/tests/history.test.js
similarity index 99%
rename from packages/builder/src/builderStore/store/history.test.js
rename to packages/builder/src/stores/builder/tests/history.test.js
index 2cf9f677e5..9761a32e18 100644
--- a/packages/builder/src/builderStore/store/history.test.js
+++ b/packages/builder/src/stores/builder/tests/history.test.js
@@ -1,5 +1,5 @@
 import { it, expect, describe, beforeEach, vi } from "vitest"
-import { Operations, initialState, createHistoryStore } from "./history"
+import { Operations, initialState, createHistoryStore } from "../history"
 
 import { writable, derived, get } from "svelte/store"
 import * as jsonpatch from "fast-json-patch/index.mjs"
diff --git a/packages/builder/src/stores/builder/tests/navigation.test.js b/packages/builder/src/stores/builder/tests/navigation.test.js
new file mode 100644
index 0000000000..19a3361721
--- /dev/null
+++ b/packages/builder/src/stores/builder/tests/navigation.test.js
@@ -0,0 +1,244 @@
+import { it, expect, describe, beforeEach, vi } from "vitest"
+import { get, writable } from "svelte/store"
+import { API } from "api"
+import {
+  INITIAL_NAVIGATION_STATE,
+  NavigationStore,
+} from "stores/builder/navigation"
+import { appStore } from "stores/builder"
+
+vi.mock("api", () => {
+  return {
+    API: {
+      saveAppMetadata: vi.fn(),
+    },
+  }
+})
+
+vi.mock("stores/builder", async () => {
+  const mockAppStore = writable()
+  const appStore = {
+    subscribe: mockAppStore.subscribe,
+    update: mockAppStore.update,
+    set: mockAppStore.set,
+  }
+
+  return {
+    appStore,
+  }
+})
+
+describe("Navigation store", () => {
+  beforeEach(async ctx => {
+    vi.clearAllMocks()
+
+    const navigationStore = new NavigationStore()
+    ctx.test = {
+      get store() {
+        return get(navigationStore)
+      },
+      navigationStore,
+    }
+  })
+
+  it("Create base navigation store with defaults", ctx => {
+    expect(ctx.test.store).toStrictEqual(INITIAL_NAVIGATION_STATE)
+  })
+
+  it("Save a new link", async ctx => {
+    const links = [
+      {
+        url: "/home",
+        text: "Home",
+      },
+      {
+        url: "/test",
+        text: "Test",
+      },
+    ]
+
+    ctx.test.navigationStore.update(state => ({
+      ...state,
+      links,
+    }))
+
+    const saveSpy = vi
+      .spyOn(ctx.test.navigationStore, "save")
+      .mockImplementation(() => {})
+
+    await ctx.test.navigationStore.saveLink("/test-url", "Testing")
+
+    expect(saveSpy).toBeCalledWith({
+      ...INITIAL_NAVIGATION_STATE,
+      links: [
+        ...links,
+        {
+          url: "/test-url",
+          text: "Testing",
+        },
+      ],
+    })
+  })
+
+  it("Skip save if the link already exists", async ctx => {
+    ctx.test.navigationStore.update(state => ({
+      ...state,
+      links: [
+        {
+          url: "/home",
+          text: "Home",
+        },
+      ],
+    }))
+    const saveSpy = vi
+      .spyOn(ctx.test.navigationStore, "save")
+      .mockImplementation(() => {})
+
+    await ctx.test.navigationStore.saveLink("/home", "Home")
+
+    expect(saveSpy).not.toHaveBeenCalled()
+  })
+
+  it("Should delete all links matching the provided URLs string array", async ctx => {
+    ctx.test.navigationStore.update(state => ({
+      ...state,
+      links: [
+        {
+          url: "/home",
+          text: "Home",
+        },
+        {
+          url: "/test",
+          text: "Test",
+        },
+        {
+          url: "/last",
+          text: "Last Link",
+        },
+      ],
+    }))
+
+    const saveSpy = vi
+      .spyOn(ctx.test.navigationStore, "save")
+      .mockImplementation(() => {})
+
+    await ctx.test.navigationStore.deleteLink(["/home", "/test"])
+
+    expect(saveSpy).toHaveBeenCalledWith({
+      ...ctx.test.store,
+      links: [
+        {
+          text: "Last Link",
+          url: "/last",
+        },
+      ],
+    })
+  })
+
+  it("Should delete link with a single URL string", async ctx => {
+    const links = [
+      {
+        url: "/home",
+        text: "Home",
+      },
+      {
+        url: "/test",
+        text: "Test",
+      },
+      {
+        url: "/last",
+        text: "Last Link",
+      },
+    ]
+
+    ctx.test.navigationStore.update(state => ({
+      ...state,
+      links,
+    }))
+
+    const saveSpy = vi
+      .spyOn(ctx.test.navigationStore, "save")
+      .mockImplementation(() => {})
+
+    await ctx.test.navigationStore.deleteLink(["/test"])
+
+    expect(saveSpy).toHaveBeenCalledWith({
+      ...ctx.test.store,
+      links: [
+        {
+          url: "/home",
+          text: "Home",
+        },
+        {
+          url: "/last",
+          text: "Last Link",
+        },
+      ],
+    })
+  })
+
+  it("Should ignore a request to delete if there are no links", async ctx => {
+    const saveSpy = vi.spyOn(ctx.test.navigationStore, "save")
+
+    await ctx.test.navigationStore.deleteLink({
+      url: "/some-link",
+      text: "Some Link",
+    })
+
+    expect(saveSpy).not.toBeCalled()
+  })
+
+  it("Should save the navigation against the currently loaded builder app", async ctx => {
+    // Set a fake appId to resolve
+    appStore.update(state => ({
+      ...state,
+      appId: "testing_123",
+    }))
+
+    ctx.test.navigationStore.update(state => ({
+      ...state,
+      links: [
+        {
+          url: "/home",
+          text: "Home",
+        },
+        {
+          url: "/last",
+          text: "Last Link",
+        },
+      ],
+    }))
+
+    // Build the update to add 1 new link
+    const update = {
+      ...ctx.test.store,
+      links: [
+        ...ctx.test.store.links,
+        {
+          url: "/new-link",
+          text: "New Link",
+        },
+      ],
+    }
+
+    const saveSpy = vi.spyOn(API, "saveAppMetadata").mockImplementation(() => {
+      return {
+        navigation: update,
+      }
+    })
+
+    expect(ctx.test.store.links.length).toBe(2)
+
+    await ctx.test.navigationStore.save(update)
+
+    expect(saveSpy).toHaveBeenCalledWith({
+      appId: "testing_123",
+      metadata: { navigation: update },
+    })
+
+    expect(ctx.test.store.links.length).toBe(3)
+
+    const newLink = ctx.test.store.links.find(link => link.url === "/new-link")
+    expect(newLink).toBeDefined()
+  })
+})
diff --git a/packages/builder/src/stores/backend/tests/permissions.spec.js.disabled b/packages/builder/src/stores/builder/tests/permissions.spec.js.disabled
similarity index 100%
rename from packages/builder/src/stores/backend/tests/permissions.spec.js.disabled
rename to packages/builder/src/stores/builder/tests/permissions.spec.js.disabled
diff --git a/packages/builder/src/stores/backend/tests/queries.spec.js.disabled b/packages/builder/src/stores/builder/tests/queries.spec.js.disabled
similarity index 100%
rename from packages/builder/src/stores/backend/tests/queries.spec.js.disabled
rename to packages/builder/src/stores/builder/tests/queries.spec.js.disabled
diff --git a/packages/builder/src/stores/backend/tests/roles.spec.js.disabled b/packages/builder/src/stores/builder/tests/roles.spec.js.disabled
similarity index 100%
rename from packages/builder/src/stores/backend/tests/roles.spec.js.disabled
rename to packages/builder/src/stores/builder/tests/roles.spec.js.disabled
diff --git a/packages/builder/src/stores/builder/tests/screens.test.js b/packages/builder/src/stores/builder/tests/screens.test.js
new file mode 100644
index 0000000000..51e3a8d830
--- /dev/null
+++ b/packages/builder/src/stores/builder/tests/screens.test.js
@@ -0,0 +1,800 @@
+import { it, expect, describe, beforeEach, vi } from "vitest"
+import { get, writable } from "svelte/store"
+import { API } from "api"
+import { Constants } from "@budibase/frontend-core"
+import { componentStore, appStore } from "stores/builder"
+import { INITIAL_SCREENS_STATE, ScreenStore } from "stores/builder/screens"
+import {
+  getScreenFixture,
+  getComponentFixture,
+  COMPONENT_DEFINITIONS,
+  componentDefinitionMap,
+  getScreenDocId,
+  getPluginFixture,
+  componentsToNested,
+} from "./fixtures"
+
+const COMP_PREFIX = "@budibase/standard-components"
+
+vi.mock("stores/builder", async () => {
+  const mockAppStore = writable()
+  const mockComponentStore = writable()
+  const mockLayoutStore = writable()
+
+  const componentStore = {
+    getDefinition: vi.fn(),
+    enrichEmptySettings: vi.fn(),
+    update: mockComponentStore.update,
+    subscribe: mockComponentStore.subscribe,
+  }
+
+  const appStore = {
+    subscribe: mockAppStore.subscribe,
+    update: mockAppStore.update,
+    set: mockAppStore.set,
+  }
+
+  const navigationStore = {
+    deleteLink: vi.fn(),
+  }
+
+  return {
+    componentStore,
+    appStore,
+    navigationStore,
+    layoutStore: {
+      update: mockLayoutStore.update,
+      subscribe: mockComponentStore.subscribe,
+    },
+  }
+})
+
+vi.mock("stores/builder/components/utils", () => {
+  return {
+    findAllMatchingComponents: vi.fn().mockImplementation(() => {
+      return []
+    }),
+  }
+})
+
+vi.mock("api", () => {
+  return {
+    API: {
+      fetchAppPackage: vi.fn(),
+      fetchAppRoutes: vi.fn(),
+      saveScreen: vi.fn(),
+      deleteScreen: vi.fn(),
+    },
+  }
+})
+
+describe("Screens store", () => {
+  beforeEach(async ctx => {
+    vi.clearAllMocks()
+
+    const screenStore = new ScreenStore()
+    ctx.test = {
+      get store() {
+        return get(screenStore)
+      },
+      screenStore,
+    }
+  })
+
+  it("Create base screen store with defaults", ctx => {
+    expect(ctx.test.store).toStrictEqual(INITIAL_SCREENS_STATE)
+  })
+
+  it("Syncs all screens from the app package", ctx => {
+    expect(ctx.test.store.screens.length).toBe(0)
+
+    const screens = Array(2)
+      .fill()
+      .map(() => getScreenFixture().json())
+
+    ctx.test.screenStore.syncAppScreens({ screens })
+
+    expect(ctx.test.store.screens).toStrictEqual(screens)
+  })
+
+  it("Reset the screen store back to the default state", ctx => {
+    expect(ctx.test.store.screens.length).toBe(0)
+
+    const screens = Array(2)
+      .fill()
+      .map(() => getScreenFixture().json())
+
+    ctx.test.screenStore.syncAppScreens({ screens })
+    expect(ctx.test.store.screens).toStrictEqual(screens)
+
+    ctx.test.screenStore.update(state => ({
+      ...state,
+      selectedScreenId: screens[0]._id,
+    }))
+
+    ctx.test.screenStore.reset()
+
+    expect(ctx.test.store).toStrictEqual(INITIAL_SCREENS_STATE)
+  })
+
+  it("Marks a valid screen as selected", ctx => {
+    const screens = Array(2)
+      .fill()
+      .map(() => getScreenFixture().json())
+
+    ctx.test.screenStore.syncAppScreens({ screens })
+    expect(ctx.test.store.screens.length).toBe(2)
+
+    ctx.test.screenStore.select(screens[0]._id)
+
+    expect(ctx.test.store.selectedScreenId).toEqual(screens[0]._id)
+  })
+
+  it("Skip selecting a screen if it is not present", ctx => {
+    const screens = Array(2)
+      .fill()
+      .map(() => getScreenFixture().json())
+
+    ctx.test.screenStore.syncAppScreens({ screens })
+    expect(ctx.test.store.screens.length).toBe(2)
+
+    ctx.test.screenStore.select("screen_abc")
+
+    expect(ctx.test.store.selectedScreenId).toBeNull()
+  })
+
+  it("Approve a valid empty screen config", ctx => {
+    const coreScreen = getScreenFixture()
+    ctx.test.screenStore.validate(coreScreen.json())
+  })
+
+  it("Approve a valid screen config with one component and no illegal children", ctx => {
+    const coreScreen = getScreenFixture()
+    const formBlock = getComponentFixture(`${COMP_PREFIX}/formblock`)
+
+    coreScreen.addChild(formBlock)
+
+    const defSpy = vi.spyOn(componentStore, "getDefinition")
+    defSpy.mockReturnValueOnce(COMPONENT_DEFINITIONS.formblock)
+
+    ctx.test.screenStore.validate(coreScreen.json())
+
+    expect(defSpy).toHaveBeenCalled()
+  })
+
+  it("Reject an attempt to nest invalid components", ctx => {
+    const coreScreen = getScreenFixture()
+
+    const formOne = getComponentFixture(`${COMP_PREFIX}/form`)
+    const formTwo = getComponentFixture(`${COMP_PREFIX}/form`)
+
+    formOne.addChild(formTwo)
+    coreScreen.addChild(formOne)
+
+    const defSpy = vi
+      .spyOn(componentStore, "getDefinition")
+      .mockImplementation(comp => {
+        const defMap = componentDefinitionMap()
+        return defMap[comp]
+      })
+
+    expect(() => ctx.test.screenStore.validate(coreScreen.json())).toThrowError(
+      `You can't place a ${COMPONENT_DEFINITIONS.form.name} here`
+    )
+
+    expect(defSpy).toHaveBeenCalled()
+  })
+
+  it("Reject an attempt to deeply nest invalid components", ctx => {
+    const coreScreen = getScreenFixture()
+
+    const formOne = getComponentFixture(`${COMP_PREFIX}/form`)
+    const formTwo = getComponentFixture(`${COMP_PREFIX}/form`)
+
+    const components = Array(10)
+      .fill()
+      .map(() => getComponentFixture(`${COMP_PREFIX}/container`))
+
+    components.splice(5, 0, formOne)
+    components.push(formTwo)
+
+    //Take the array and turn it into a deeply nested tree
+    let nested = componentsToNested(components)
+
+    coreScreen.addChild(nested)
+
+    const defSpy = vi
+      .spyOn(componentStore, "getDefinition")
+      .mockImplementation(comp => {
+        const defMap = componentDefinitionMap()
+        return defMap[comp]
+      })
+
+    expect(() => ctx.test.screenStore.validate(coreScreen.json())).toThrowError(
+      `You can't place a ${COMPONENT_DEFINITIONS.form.name} here`
+    )
+
+    expect(defSpy).toHaveBeenCalled()
+  })
+
+  it("Save a brand new screen and add it to the store. No validation", async ctx => {
+    const coreScreen = getScreenFixture()
+    const formOne = getComponentFixture(`${COMP_PREFIX}/form`)
+
+    coreScreen.addChild(formOne)
+
+    appStore.set({ features: { componentValidation: false } })
+
+    expect(ctx.test.store.screens.length).toBe(0)
+
+    const newDocId = getScreenDocId()
+    const newDoc = { ...coreScreen.json(), _id: newDocId }
+
+    // We dont care for this test
+    const saveSpy = vi.spyOn(API, "saveScreen").mockResolvedValue(newDoc)
+    vi.spyOn(API, "fetchAppRoutes").mockResolvedValue({
+      routes: [],
+    })
+    await ctx.test.screenStore.save(coreScreen.json())
+
+    expect(saveSpy).toHaveBeenCalled()
+
+    expect(ctx.test.store.screens.length).toBe(1)
+
+    expect(ctx.test.store.screens[0]).toStrictEqual(newDoc)
+
+    expect(ctx.test.store.selectedScreenId).toBe(newDocId)
+
+    // The new screen should be selected
+    expect(get(componentStore).selectedComponentId).toBe(
+      coreScreen.json().props._id
+    )
+  })
+
+  it("Sync an updated screen to the screen store on save", async ctx => {
+    const existingScreens = Array(4)
+      .fill()
+      .map(() => {
+        const screenDoc = getScreenFixture()
+        const existingDocId = getScreenDocId()
+        screenDoc._json._id = existingDocId
+        return screenDoc
+      })
+
+    ctx.test.screenStore.update(state => ({
+      ...state,
+      screens: existingScreens.map(screen => screen.json()),
+    }))
+
+    // Modify the fixture screen
+    const form = getComponentFixture(`${COMP_PREFIX}/form`)
+    existingScreens[2].addChild(form)
+
+    const saveSpy = vi
+      .spyOn(API, "saveScreen")
+      .mockResolvedValue(existingScreens[2].json())
+
+    const routeSpy = vi.spyOn(API, "fetchAppRoutes").mockResolvedValue({
+      routes: [],
+    })
+
+    // Saved the existing screen having modified it.
+    await ctx.test.screenStore.save(existingScreens[2].json())
+
+    expect(routeSpy).toHaveBeenCalled()
+    expect(saveSpy).toHaveBeenCalled()
+
+    // On save, the screen is spliced back into the store with the saved content
+    expect(ctx.test.store.screens[2]).toStrictEqual(existingScreens[2].json())
+  })
+
+  it("Sync API data to relevant stores on save. Updated plugins", async ctx => {
+    const coreScreen = getScreenFixture()
+
+    const newDocId = getScreenDocId()
+    const newDoc = { ...coreScreen.json(), _id: newDocId, pluginAdded: true }
+
+    // Fake plugins
+    const plugins = Array(2)
+      .fill()
+      .map(() => getPluginFixture())
+
+    appStore.update(() => ({
+      usedPlugins: [],
+    }))
+
+    const appPackageSpy = vi
+      .spyOn(API, "fetchAppPackage")
+      .mockImplementation(appId => {
+        return {
+          application: {
+            appId: appId,
+            usedPlugins: plugins,
+          },
+        }
+      })
+
+    const routeSpy = vi.spyOn(API, "fetchAppRoutes").mockResolvedValue({
+      routes: [],
+    })
+
+    await ctx.test.screenStore.syncScreenData(newDoc)
+
+    expect(routeSpy).toHaveBeenCalled()
+    expect(appPackageSpy).toHaveBeenCalled()
+
+    expect(get(appStore).usedPlugins).toStrictEqual(plugins)
+  })
+
+  it("Sync API updates to relevant stores on save. Plugins unchanged", async ctx => {
+    const coreScreen = getScreenFixture()
+
+    const newDocId = getScreenDocId()
+    const newDoc = { ...coreScreen.json(), _id: newDocId }
+    const plugin = getPluginFixture()
+
+    // Set existing plugin
+    appStore.update(() => ({
+      usedPlugins: [plugin],
+    }))
+
+    const appPackageSpy = vi.spyOn(API, "fetchAppPackage")
+    const routeSpy = vi.spyOn(API, "fetchAppRoutes").mockResolvedValue({
+      routes: [],
+    })
+
+    await ctx.test.screenStore.syncScreenData(newDoc)
+
+    expect(routeSpy).toHaveBeenCalled()
+    expect(appPackageSpy).not.toHaveBeenCalled()
+
+    // Ensure nothing was updated
+    expect(get(appStore).usedPlugins).toStrictEqual([plugin])
+  })
+
+  it("Proceed to patch if appropriate config are supplied", async ctx => {
+    vi.spyOn(ctx.test.screenStore, "sequentialScreenPatch").mockImplementation(
+      () => {
+        return false
+      }
+    )
+    const noop = () => {}
+
+    await ctx.test.screenStore.patch(noop, "test")
+    expect(ctx.test.screenStore.sequentialScreenPatch).toHaveBeenCalledWith(
+      noop,
+      "test"
+    )
+  })
+
+  it("Return from the patch if all valid config are not present", async ctx => {
+    vi.spyOn(ctx.test.screenStore, "sequentialScreenPatch")
+    await ctx.test.screenStore.patch()
+    expect(ctx.test.screenStore.sequentialScreenPatch).not.toBeCalled()
+  })
+
+  it("Acquire the currently selected screen on patch, if not specified", async ctx => {
+    vi.spyOn(ctx.test.screenStore, "sequentialScreenPatch")
+    await ctx.test.screenStore.patch()
+
+    const noop = () => {}
+    ctx.test.screenStore.update(state => ({
+      ...state,
+      selectedScreenId: "screen_123",
+    }))
+
+    await ctx.test.screenStore.patch(noop)
+    expect(ctx.test.screenStore.sequentialScreenPatch).toHaveBeenCalledWith(
+      noop,
+      "screen_123"
+    )
+  })
+
+  // Used by the websocket
+  it("Ignore a call to replace if no screenId is provided", ctx => {
+    const existingScreens = Array(4)
+      .fill()
+      .map(() => {
+        const screenDoc = getScreenFixture()
+        const existingDocId = getScreenDocId()
+        screenDoc._json._id = existingDocId
+        return screenDoc.json()
+      })
+    ctx.test.screenStore.syncAppScreens({ screens: existingScreens })
+
+    ctx.test.screenStore.replace()
+
+    expect(ctx.test.store.screens).toStrictEqual(existingScreens)
+  })
+
+  it("Remove a screen from the store if a single screenId is supplied", ctx => {
+    const existingScreens = Array(4)
+      .fill()
+      .map(() => {
+        const screenDoc = getScreenFixture()
+        const existingDocId = getScreenDocId()
+        screenDoc._json._id = existingDocId
+        return screenDoc.json()
+      })
+    ctx.test.screenStore.syncAppScreens({ screens: existingScreens })
+
+    ctx.test.screenStore.replace(existingScreens[1]._id)
+
+    const filtered = existingScreens.filter(
+      screen => screen._id != existingScreens[1]._id
+    )
+    expect(ctx.test.store.screens).toStrictEqual(filtered)
+  })
+
+  it("Replace an existing screen with a new version of itself", ctx => {
+    const existingScreens = Array(4)
+      .fill()
+      .map(() => {
+        const screenDoc = getScreenFixture()
+        const existingDocId = getScreenDocId()
+        screenDoc._json._id = existingDocId
+        return screenDoc
+      })
+
+    ctx.test.screenStore.update(state => ({
+      ...state,
+      screens: existingScreens.map(screen => screen.json()),
+    }))
+
+    const formBlock = getComponentFixture(`${COMP_PREFIX}/formblock`)
+    existingScreens[2].addChild(formBlock)
+
+    ctx.test.screenStore.replace(
+      existingScreens[2]._id,
+      existingScreens[2].json()
+    )
+
+    expect(ctx.test.store.screens.length).toBe(4)
+  })
+
+  it("Add a screen when attempting to replace one not present in the store", ctx => {
+    const existingScreens = Array(4)
+      .fill()
+      .map(() => {
+        const screenDoc = getScreenFixture()
+        const existingDocId = getScreenDocId()
+        screenDoc._json._id = existingDocId
+        return screenDoc
+      })
+
+    ctx.test.screenStore.update(state => ({
+      ...state,
+      screens: existingScreens.map(screen => screen.json()),
+    }))
+
+    const newScreenDoc = getScreenFixture()
+    newScreenDoc._json._id = getScreenDocId()
+
+    ctx.test.screenStore.replace(newScreenDoc._json._id, newScreenDoc.json())
+
+    expect(ctx.test.store.screens.length).toBe(5)
+    expect(ctx.test.store.screens[4]).toStrictEqual(newScreenDoc.json())
+  })
+
+  it("Delete a single screen and remove it from the store", async ctx => {
+    const existingScreens = Array(3)
+      .fill()
+      .map(() => {
+        const screenDoc = getScreenFixture()
+        const existingDocId = getScreenDocId()
+        screenDoc._json._id = existingDocId
+        return screenDoc
+      })
+
+    ctx.test.screenStore.update(state => ({
+      ...state,
+      screens: existingScreens.map(screen => screen.json()),
+    }))
+
+    const deleteSpy = vi.spyOn(API, "deleteScreen")
+
+    await ctx.test.screenStore.delete(existingScreens[2].json())
+
+    vi.spyOn(API, "fetchAppRoutes").mockResolvedValue({
+      routes: [],
+    })
+
+    expect(deleteSpy).toBeCalled()
+
+    expect(ctx.test.store.screens.length).toBe(2)
+
+    // Just confirm that the routes at are being initialised
+    expect(get(appStore).routes).toEqual([])
+  })
+
+  it("Upon delete, reset selected screen and component ids if the screen was selected", async ctx => {
+    const existingScreens = Array(3)
+      .fill()
+      .map(() => {
+        const screenDoc = getScreenFixture()
+        const existingDocId = getScreenDocId()
+        screenDoc._json._id = existingDocId
+        return screenDoc
+      })
+
+    ctx.test.screenStore.update(state => ({
+      ...state,
+      screens: existingScreens.map(screen => screen.json()),
+      selectedScreenId: existingScreens[2]._json._id,
+    }))
+
+    componentStore.update(state => ({
+      ...state,
+      selectedComponentId: existingScreens[2]._json._id,
+    }))
+
+    await ctx.test.screenStore.delete(existingScreens[2].json())
+
+    expect(ctx.test.store.screens.length).toBe(2)
+    expect(get(componentStore).selectedComponentId).toBeNull()
+    expect(ctx.test.store.selectedScreenId).toBeNull()
+  })
+
+  it("Delete multiple is not supported and should leave the store unchanged", async ctx => {
+    const existingScreens = Array(3)
+      .fill()
+      .map(() => {
+        const screenDoc = getScreenFixture()
+        const existingDocId = getScreenDocId()
+        screenDoc._json._id = existingDocId
+        return screenDoc
+      })
+
+    const storeScreens = existingScreens.map(screen => screen.json())
+
+    ctx.test.screenStore.update(state => ({
+      ...state,
+      screens: existingScreens.map(screen => screen.json()),
+    }))
+
+    const targets = [storeScreens[1], storeScreens[2]]
+
+    const deleteSpy = vi.spyOn(API, "deleteScreen")
+
+    await ctx.test.screenStore.delete(targets)
+
+    expect(deleteSpy).not.toHaveBeenCalled()
+    expect(ctx.test.store.screens.length).toBe(3)
+    expect(ctx.test.store.screens).toStrictEqual(storeScreens)
+  })
+
+  it("Update a screen setting", async ctx => {
+    const screenDoc = getScreenFixture()
+    const existingDocId = getScreenDocId()
+    screenDoc._json._id = existingDocId
+
+    await ctx.test.screenStore.update(state => ({
+      ...state,
+      screens: [screenDoc.json()],
+    }))
+
+    const patchedDoc = screenDoc.json()
+    const patchSpy = vi
+      .spyOn(ctx.test.screenStore, "patch")
+      .mockImplementation(async patchFn => {
+        patchFn(patchedDoc)
+        return
+      })
+
+    await ctx.test.screenStore.updateSetting(
+      patchedDoc,
+      "showNavigation",
+      false
+    )
+
+    expect(patchSpy).toBeCalled()
+    expect(patchedDoc.showNavigation).toBe(false)
+  })
+
+  it("Ensure only one homescreen per role after updating setting. All screens same role", async ctx => {
+    const existingScreens = Array(3)
+      .fill()
+      .map(() => {
+        const screenDoc = getScreenFixture()
+        const existingDocId = getScreenDocId()
+        screenDoc._json._id = existingDocId
+        return screenDoc
+      })
+
+    const storeScreens = existingScreens
+      .map(screen => screen.json())
+      .filter(screen => screen.routing.roleId == Constants.Roles.BASIC)
+
+    // All default screens have the BASIC role
+    expect(storeScreens.length).toBe(3)
+
+    // Set the 2nd screen as the home screen
+    storeScreens[1].routing.homeScreen = true
+
+    await ctx.test.screenStore.update(state => ({
+      ...state,
+      screens: storeScreens,
+    }))
+
+    const patchSpy = vi
+      .spyOn(ctx.test.screenStore, "patch")
+      .mockImplementation(async (patchFn, screenId) => {
+        const target = ctx.test.store.screens.find(
+          screen => screen._id === screenId
+        )
+        patchFn(target)
+
+        await ctx.test.screenStore.replace(screenId, target)
+      })
+
+    await ctx.test.screenStore.updateSetting(
+      storeScreens[0],
+      "routing.homeScreen",
+      true
+    )
+
+    // One call for the update, one call for to update the existing home screen
+    expect(patchSpy).toBeCalledTimes(2)
+
+    // The new homescreen for BASIC
+    expect(ctx.test.store.screens[0].routing.homeScreen).toBe(true)
+
+    // The previous home screen for the BASIC role is now unset
+    expect(ctx.test.store.screens[1].routing.homeScreen).toBe(false)
+  })
+
+  it("Ensure only one homescreen per role when updating screen setting. Multiple screen roles", async ctx => {
+    const expectedRoles = [
+      Constants.Roles.BASIC,
+      Constants.Roles.POWER,
+      Constants.Roles.PUBLIC,
+      Constants.Roles.ADMIN,
+    ]
+
+    // Build 12 screens, 3 of each role
+    const existingScreens = Array(12)
+      .fill()
+      .map((_, idx) => {
+        const screenDoc = getScreenFixture()
+        screenDoc.role(expectedRoles[idx % 4])
+
+        const existingDocId = getScreenDocId()
+        screenDoc._json._id = existingDocId
+        return screenDoc
+      })
+
+    const sorted = existingScreens
+      .map(screen => screen.json())
+      .sort((a, b) => a.routing.roleId.localeCompare(b.routing.roleId))
+
+    // ADMIN
+    sorted[0].routing.homeScreen = true
+    // BASIC
+    sorted[4].routing.homeScreen = true
+    // PUBLIC
+    sorted[9].routing.homeScreen = true
+
+    // Set screens state
+    await ctx.test.screenStore.update(state => ({
+      ...state,
+      screens: sorted,
+    }))
+
+    const patchSpy = vi
+      .spyOn(ctx.test.screenStore, "patch")
+      .mockImplementation(async (patchFn, screenId) => {
+        const target = ctx.test.store.screens.find(
+          screen => screen._id === screenId
+        )
+        patchFn(target)
+
+        await ctx.test.screenStore.replace(screenId, target)
+      })
+
+    // ADMIN homeScreen updated from 0 to 2
+    await ctx.test.screenStore.updateSetting(
+      sorted[2],
+      "routing.homeScreen",
+      true
+    )
+
+    const results = ctx.test.store.screens.reduce((acc, screen) => {
+      if (screen.routing.homeScreen) {
+        acc[screen.routing.roleId] = acc[screen.routing.roleId] || []
+        acc[screen.routing.roleId].push(screen)
+      }
+      return acc
+    }, {})
+
+    const screens = ctx.test.store.screens
+    // Should still only be one of each homescreen
+    expect(results[Constants.Roles.ADMIN].length).toBe(1)
+    expect(screens[2].routing.homeScreen).toBe(true)
+
+    expect(results[Constants.Roles.BASIC].length).toBe(1)
+    expect(screens[4].routing.homeScreen).toBe(true)
+
+    expect(results[Constants.Roles.PUBLIC].length).toBe(1)
+    expect(screens[9].routing.homeScreen).toBe(true)
+
+    // Homescreen was never set for POWER
+    expect(results[Constants.Roles.POWER]).not.toBeDefined()
+
+    // Once to update the target screen, once to unset the existing homescreen.
+    expect(patchSpy).toBeCalledTimes(2)
+  })
+
+  it("Sequential patch check. Exit if the screenId is not valid.", async ctx => {
+    const screenDoc = getScreenFixture()
+    const existingDocId = getScreenDocId()
+    screenDoc._json._id = existingDocId
+
+    const original = screenDoc.json()
+
+    await ctx.test.screenStore.update(state => ({
+      ...state,
+      screens: [original],
+    }))
+
+    const saveSpy = vi
+      .spyOn(ctx.test.screenStore, "save")
+      .mockImplementation(async () => {
+        return
+      })
+
+    // A screen with this Id does not exist
+    await ctx.test.screenStore.sequentialScreenPatch(() => {}, "123")
+    expect(saveSpy).not.toBeCalled()
+  })
+
+  it("Sequential patch check. Exit if the patchFn result is false", async ctx => {
+    const screenDoc = getScreenFixture()
+    const existingDocId = getScreenDocId()
+    screenDoc._json._id = existingDocId
+
+    const original = screenDoc.json()
+    // Set screens state
+    await ctx.test.screenStore.update(state => ({
+      ...state,
+      screens: [original],
+    }))
+
+    const saveSpy = vi
+      .spyOn(ctx.test.screenStore, "save")
+      .mockImplementation(async () => {
+        return
+      })
+
+    // Returning false from the patch will abort the save
+    await ctx.test.screenStore.sequentialScreenPatch(() => {
+      return false
+    }, "123")
+
+    expect(saveSpy).not.toBeCalled()
+  })
+
+  it("Sequential patch check. Patch applied and save requested", async ctx => {
+    const screenDoc = getScreenFixture()
+    const existingDocId = getScreenDocId()
+    screenDoc._json._id = existingDocId
+
+    const original = screenDoc.json()
+
+    await ctx.test.screenStore.update(state => ({
+      ...state,
+      screens: [original],
+    }))
+
+    const saveSpy = vi
+      .spyOn(ctx.test.screenStore, "save")
+      .mockImplementation(async () => {
+        return
+      })
+
+    await ctx.test.screenStore.sequentialScreenPatch(screen => {
+      screen.name = "updated"
+    }, existingDocId)
+
+    expect(saveSpy).toBeCalledWith({ ...original, name: "updated" })
+  })
+})
diff --git a/packages/builder/src/stores/backend/sortedIntegrations.test.js b/packages/builder/src/stores/builder/tests/sortedIntegrations.test.js
similarity index 92%
rename from packages/builder/src/stores/backend/sortedIntegrations.test.js
rename to packages/builder/src/stores/builder/tests/sortedIntegrations.test.js
index db2323aae5..9b430b1621 100644
--- a/packages/builder/src/stores/backend/sortedIntegrations.test.js
+++ b/packages/builder/src/stores/builder/tests/sortedIntegrations.test.js
@@ -1,15 +1,15 @@
 import { it, expect, describe, beforeEach, vi } from "vitest"
-import { createSortedIntegrationsStore } from "./sortedIntegrations"
+import { createSortedIntegrationsStore } from "stores/builder/sortedIntegrations"
 import { DatasourceTypes } from "constants/backend"
 
 import { derived } from "svelte/store"
-import { integrations } from "stores/backend/integrations"
+import { integrations } from "stores/builder/integrations"
 
 vi.mock("svelte/store", () => ({
   derived: vi.fn(() => {}),
 }))
 
-vi.mock("stores/backend/integrations", () => ({ integrations: vi.fn() }))
+vi.mock("stores/builder/integrations", () => ({ integrations: vi.fn() }))
 
 const inputA = {
   nonRelationalA: {
diff --git a/packages/builder/src/stores/backend/tests/tables.spec.js.disabled b/packages/builder/src/stores/builder/tests/tables.spec.js.disabled
similarity index 100%
rename from packages/builder/src/stores/backend/tests/tables.spec.js.disabled
rename to packages/builder/src/stores/builder/tests/tables.spec.js.disabled
diff --git a/packages/builder/src/stores/builder/theme.js b/packages/builder/src/stores/builder/theme.js
new file mode 100644
index 0000000000..afdf3e9805
--- /dev/null
+++ b/packages/builder/src/stores/builder/theme.js
@@ -0,0 +1,64 @@
+import { writable, get } from "svelte/store"
+import { API } from "api"
+
+const INITIAL_THEMES_STATE = {
+  theme: "",
+  customTheme: {},
+}
+
+export const themes = () => {
+  const store = writable({
+    ...INITIAL_THEMES_STATE,
+  })
+
+  const syncAppTheme = app => {
+    store.update(state => ({
+      ...state,
+      theme: app.theme || "spectrum--light",
+      customTheme: app.customTheme,
+    }))
+  }
+
+  const save = async (theme, appId) => {
+    const app = await API.saveAppMetadata({
+      appId,
+      metadata: { theme },
+    })
+    store.update(state => {
+      state.theme = app.theme
+      return state
+    })
+  }
+
+  const saveCustom = async (theme, appId) => {
+    const updated = { ...get(store).customTheme, ...theme }
+    const app = await API.saveAppMetadata({
+      appId,
+      metadata: { customTheme: updated },
+    })
+    store.update(state => {
+      state.customTheme = app.customTheme
+      return state
+    })
+  }
+
+  const syncMetadata = metadata => {
+    const { theme, customTheme } = metadata
+    store.update(state => ({
+      ...state,
+      theme,
+      customTheme,
+    }))
+  }
+
+  return {
+    subscribe: store.subscribe,
+    update: store.update,
+    syncMetadata,
+    syncAppTheme,
+    save,
+    saveCustom,
+  }
+}
+
+export const themeStore = themes()
diff --git a/packages/builder/src/builderStore/store/users.js b/packages/builder/src/stores/builder/users.js
similarity index 56%
rename from packages/builder/src/builderStore/store/users.js
rename to packages/builder/src/stores/builder/users.js
index 6e10b081d6..0794c63289 100644
--- a/packages/builder/src/builderStore/store/users.js
+++ b/packages/builder/src/stores/builder/users.js
@@ -1,6 +1,6 @@
-import { writable, get } from "svelte/store"
+import { writable, get, derived } from "svelte/store"
 
-export const getUserStore = () => {
+export const createUserStore = () => {
   const store = writable([])
 
   const init = users => {
@@ -40,3 +40,23 @@ export const getUserStore = () => {
     },
   }
 }
+
+export const userStore = createUserStore()
+
+export const userSelectedResourceMap = derived(userStore, $userStore => {
+  let map = {}
+  $userStore.forEach(user => {
+    const resource = user.builderMetadata?.selectedResourceId
+    if (resource) {
+      if (!map[resource]) {
+        map[resource] = []
+      }
+      map[resource].push(user)
+    }
+  })
+  return map
+})
+
+export const isOnlyUser = derived(userStore, $userStore => {
+  return $userStore.length < 2
+})
diff --git a/packages/builder/src/stores/backend/views.js b/packages/builder/src/stores/builder/views.js
similarity index 100%
rename from packages/builder/src/stores/backend/views.js
rename to packages/builder/src/stores/builder/views.js
diff --git a/packages/builder/src/stores/backend/viewsV2.js b/packages/builder/src/stores/builder/viewsV2.js
similarity index 100%
rename from packages/builder/src/stores/backend/viewsV2.js
rename to packages/builder/src/stores/builder/viewsV2.js
diff --git a/packages/builder/src/builderStore/websocket.js b/packages/builder/src/stores/builder/websocket.js
similarity index 84%
rename from packages/builder/src/builderStore/websocket.js
rename to packages/builder/src/stores/builder/websocket.js
index 4482e3ae1e..bbdf7b6d63 100644
--- a/packages/builder/src/builderStore/websocket.js
+++ b/packages/builder/src/stores/builder/websocket.js
@@ -1,13 +1,17 @@
 import { createWebsocket } from "@budibase/frontend-core"
 import {
-  userStore,
-  store,
-  deploymentStore,
   automationStore,
-} from "builderStore"
-import { datasources, tables } from "stores/backend"
+  userStore,
+  appStore,
+  themeStore,
+  navigationStore,
+  deploymentStore,
+  datasources,
+  tables,
+} from "stores/builder"
 import { get } from "svelte/store"
 import { auth, apps } from "stores/portal"
+import { screenStore } from "./screens"
 import { SocketEvent, BuilderSocketEvent, helpers } from "@budibase/shared-core"
 import { notifications } from "@budibase/bbui"
 
@@ -36,7 +40,7 @@ export const createBuilderWebsocket = appId => {
   })
   socket.onOther(BuilderSocketEvent.LockTransfer, ({ userId }) => {
     if (userId === get(auth)?.user?._id) {
-      store.update(state => ({
+      appStore.update(state => ({
         ...state,
         hasLock: true,
       }))
@@ -53,17 +57,20 @@ export const createBuilderWebsocket = appId => {
 
   // Design section events
   socket.onOther(BuilderSocketEvent.ScreenChange, ({ id, screen }) => {
-    store.actions.screens.replace(id, screen)
+    screenStore.replace(id, screen)
   })
   socket.onOther(BuilderSocketEvent.AppMetadataChange, ({ metadata }) => {
-    store.actions.metadata.replace(metadata)
+    //Sync app metadata across the stores
+    appStore.syncMetadata(metadata)
+    themeStore.syncMetadata(metadata)
+    navigationStore.syncMetadata(metadata)
   })
   socket.onOther(
     BuilderSocketEvent.AppPublishChange,
     async ({ user, published }) => {
       await apps.load()
       if (published) {
-        await deploymentStore.actions.load()
+        await deploymentStore.load()
       }
       const verb = published ? "published" : "unpublished"
       notifications.success(`${helpers.getUserLabel(user)} ${verb} this app`)
diff --git a/packages/builder/src/stores/portal/apps.js b/packages/builder/src/stores/portal/apps.js
index f84e0c973c..5fcf567ef5 100644
--- a/packages/builder/src/stores/portal/apps.js
+++ b/packages/builder/src/stores/portal/apps.js
@@ -1,5 +1,5 @@
 import { writable } from "svelte/store"
-import { AppStatus } from "../../constants"
+import { AppStatus } from "constants"
 import { API } from "api"
 
 // properties that should always come from the dev app, not the deployed
diff --git a/packages/builder/src/stores/portal/index.js b/packages/builder/src/stores/portal/index.js
index 7f1b9e10f0..ad2a59ddcd 100644
--- a/packages/builder/src/stores/portal/index.js
+++ b/packages/builder/src/stores/portal/index.js
@@ -16,6 +16,8 @@ export { environment } from "./environment"
 export { menu } from "./menu"
 export { auditLogs } from "./auditLogs"
 export { features } from "./features"
+export { themeStore } from "./theme"
+export { temporalStore } from "./temporal"
 export { navigation } from "./navigation"
 
 export const sideBarCollapsed = writable(false)
diff --git a/packages/builder/src/builderStore/store/temporal.js b/packages/builder/src/stores/portal/temporal.js
similarity index 90%
rename from packages/builder/src/builderStore/store/temporal.js
rename to packages/builder/src/stores/portal/temporal.js
index ca70fd6293..96b47d1c7f 100644
--- a/packages/builder/src/builderStore/store/temporal.js
+++ b/packages/builder/src/stores/portal/temporal.js
@@ -1,7 +1,7 @@
 import { createLocalStorageStore } from "@budibase/frontend-core"
 import { get } from "svelte/store"
 
-export const getTemporalStore = () => {
+export const createTemporalStore = () => {
   const initialValue = {}
 
   const localStorageKey = `bb-temporal`
@@ -41,3 +41,5 @@ export const getTemporalStore = () => {
     actions: { setExpiring, getExpiring },
   }
 }
+
+export const temporalStore = createTemporalStore()
diff --git a/packages/builder/src/builderStore/store/theme.js b/packages/builder/src/stores/portal/theme.js
similarity index 94%
rename from packages/builder/src/builderStore/store/theme.js
rename to packages/builder/src/stores/portal/theme.js
index fe89757111..619eb74f6a 100644
--- a/packages/builder/src/builderStore/store/theme.js
+++ b/packages/builder/src/stores/portal/theme.js
@@ -33,3 +33,6 @@ export const getThemeStore = () => {
 
   return store
 }
+
+// ?? confusion
+export const themeStore = getThemeStore()
diff --git a/packages/builder/src/builderStore/store/screenTemplates/utils/BaseStructure.js b/packages/builder/src/templates/BaseStructure.js
similarity index 100%
rename from packages/builder/src/builderStore/store/screenTemplates/utils/BaseStructure.js
rename to packages/builder/src/templates/BaseStructure.js
diff --git a/packages/builder/src/builderStore/store/screenTemplates/utils/Component.js b/packages/builder/src/templates/Component.js
similarity index 100%
rename from packages/builder/src/builderStore/store/screenTemplates/utils/Component.js
rename to packages/builder/src/templates/Component.js
diff --git a/packages/builder/src/builderStore/store/screenTemplates/utils/Screen.js b/packages/builder/src/templates/Screen.js
similarity index 94%
rename from packages/builder/src/builderStore/store/screenTemplates/utils/Screen.js
rename to packages/builder/src/templates/Screen.js
index 6fc79e53b0..afe9123b6d 100644
--- a/packages/builder/src/builderStore/store/screenTemplates/utils/Screen.js
+++ b/packages/builder/src/templates/Screen.js
@@ -33,6 +33,11 @@ export class Screen extends BaseStructure {
     }
   }
 
+  role(role) {
+    this._json.routing.roleId = role
+    return this
+  }
+
   normalStyle(styling) {
     this._json.props._styles.normal = styling
     return this
diff --git a/packages/builder/src/builderStore/store/screenTemplates/utils/commonComponents.js b/packages/builder/src/templates/commonComponents.js
similarity index 97%
rename from packages/builder/src/builderStore/store/screenTemplates/utils/commonComponents.js
rename to packages/builder/src/templates/commonComponents.js
index ace5196bba..1a953224a7 100644
--- a/packages/builder/src/builderStore/store/screenTemplates/utils/commonComponents.js
+++ b/packages/builder/src/templates/commonComponents.js
@@ -1,5 +1,5 @@
 import { Component } from "./Component"
-import { getSchemaForDatasource } from "../../../dataBinding"
+import { getSchemaForDatasource } from "dataBinding"
 
 const fieldTypeToComponentMap = {
   string: "stringfield",
diff --git a/packages/builder/src/builderStore/store/screenTemplates/createFromScratchScreen.js b/packages/builder/src/templates/createFromScratchScreen.js
similarity index 85%
rename from packages/builder/src/builderStore/store/screenTemplates/createFromScratchScreen.js
rename to packages/builder/src/templates/createFromScratchScreen.js
index eee423ef86..13e2a98908 100644
--- a/packages/builder/src/builderStore/store/screenTemplates/createFromScratchScreen.js
+++ b/packages/builder/src/templates/createFromScratchScreen.js
@@ -1,4 +1,4 @@
-import { Screen } from "./utils/Screen"
+import { Screen } from "./Screen"
 
 export default {
   name: `Create from scratch`,
diff --git a/packages/builder/src/builderStore/store/screenTemplates/index.js b/packages/builder/src/templates/index.js
similarity index 100%
rename from packages/builder/src/builderStore/store/screenTemplates/index.js
rename to packages/builder/src/templates/index.js
diff --git a/packages/builder/src/builderStore/store/screenTemplates/rowListScreen.js b/packages/builder/src/templates/rowListScreen.js
similarity index 92%
rename from packages/builder/src/builderStore/store/screenTemplates/rowListScreen.js
rename to packages/builder/src/templates/rowListScreen.js
index 59bcd0d5e8..7781a3d067 100644
--- a/packages/builder/src/builderStore/store/screenTemplates/rowListScreen.js
+++ b/packages/builder/src/templates/rowListScreen.js
@@ -1,6 +1,6 @@
-import sanitizeUrl from "./utils/sanitizeUrl"
-import { Screen } from "./utils/Screen"
-import { Component } from "./utils/Component"
+import sanitizeUrl from "helpers/sanitizeUrl"
+import { Screen } from "./Screen"
+import { Component } from "./Component"
 
 export default function (datasources, mode = "table") {
   if (!Array.isArray(datasources)) {
diff --git a/packages/builder/vite.config.js b/packages/builder/vite.config.js
index 18ce02fe8f..82cd80efed 100644
--- a/packages/builder/vite.config.js
+++ b/packages/builder/vite.config.js
@@ -99,13 +99,21 @@ export default defineConfig(({ mode }) => {
           replacement: path.resolve("./src/components"),
         },
         {
-          find: "builderStore",
-          replacement: path.resolve("./src/builderStore"),
+          find: "pages",
+          replacement: path.resolve("./src/pages"),
+        },
+        {
+          find: "templates",
+          replacement: path.resolve("./src/templates"),
         },
         {
           find: "stores",
           replacement: path.resolve("./src/stores"),
         },
+        {
+          find: "dataBinding",
+          replacement: path.resolve("./src/dataBinding.js"),
+        },
         {
           find: "api",
           replacement: path.resolve("./src/api.js"),
diff --git a/packages/client/manifest.json b/packages/client/manifest.json
index 5bbf465766..0fee0e7478 100644
--- a/packages/client/manifest.json
+++ b/packages/client/manifest.json
@@ -4639,6 +4639,7 @@
     "illegalChildren": ["section"],
     "hasChildren": true,
     "showEmptyState": false,
+    "actions": ["ClearRowSelection"],
     "size": {
       "width": 600,
       "height": 400
@@ -4719,9 +4720,22 @@
         ]
       }
     ],
-    "context": {
-      "type": "schema"
-    }
+    "context": [
+      {
+        "type": "schema",
+        "scope": "local"
+      },
+      {
+        "type": "static",
+        "values": [
+          {
+            "label": "Selected Rows",
+            "key": "selectedRows",
+            "type": "array"
+          }
+        ]
+      }
+    ]
   },
   "daterangepicker": {
     "name": "Date Range",
@@ -5609,37 +5623,50 @@
         ]
       }
     ],
-    "context": {
-      "type": "static",
-      "suffix": "provider",
-      "values": [
-        {
-          "label": "Rows",
-          "key": "rows",
-          "type": "array"
-        },
-        {
-          "label": "Extra Info",
-          "key": "info",
-          "type": "string"
-        },
-        {
-          "label": "Rows Length",
-          "key": "rowsLength",
-          "type": "number"
-        },
-        {
-          "label": "Schema",
-          "key": "schema",
-          "type": "object"
-        },
-        {
-          "label": "Page Number",
-          "key": "pageNumber",
-          "type": "number"
-        }
-      ]
-    }
+    "context": [
+      {
+        "type": "static",
+        "suffix": "provider",
+        "values": [
+          {
+            "label": "Rows",
+            "key": "rows",
+            "type": "array"
+          },
+          {
+            "label": "Extra Info",
+            "key": "info",
+            "type": "string"
+          },
+          {
+            "label": "Rows Length",
+            "key": "rowsLength",
+            "type": "number"
+          },
+          {
+            "label": "Schema",
+            "key": "schema",
+            "type": "object"
+          },
+          {
+            "label": "Page Number",
+            "key": "pageNumber",
+            "type": "number"
+          }
+        ]
+      },
+      {
+        "type": "static",
+        "suffix": "table",
+        "values": [
+          {
+            "label": "Selected Rows",
+            "key": "selectedRows",
+            "type": "array"
+          }
+        ]
+      }
+    ]
   },
   "cardsblock": {
     "block": true,
@@ -6742,6 +6769,17 @@
         "key": "disabled",
         "defaultValue": false
       },
+      {
+        "type": "boolean",
+        "label": "Read only",
+        "key": "readonly",
+        "defaultValue": false,
+        "dependsOn": {
+          "setting": "disabled",
+          "value": true,
+          "invert": true
+        }
+      },
       {
         "type": "select",
         "label": "Layout",
diff --git a/packages/client/src/components/Component.svelte b/packages/client/src/components/Component.svelte
index 6694022b98..6d6af91dcc 100644
--- a/packages/client/src/components/Component.svelte
+++ b/packages/client/src/components/Component.svelte
@@ -113,6 +113,9 @@
   // List of context keys which we use inside bindings
   let knownContextKeyMap = {}
 
+  // Cleanup function to stop observing context changes when unmounting
+  let unobserve
+
   // Set up initial state for each new component instance
   $: initialise(instance)
 
@@ -311,6 +314,11 @@
 
     // Force an initial enrichment of the new settings
     enrichComponentSettings(get(context), settingsDefinitionMap)
+
+    // Start observing changes in context now that we are initialised
+    if (!unobserve) {
+      unobserve = context.actions.observeChanges(handleContextChange)
+    }
   }
 
   // Extracts a map of all context keys which are required by action settings
@@ -567,8 +575,8 @@
     }
   }
 
-  // Register an unregister component instance
   onMount(() => {
+    // Register this component instance for external access
     if ($appStore.isDevApp) {
       if (!componentStore.actions.isComponentRegistered(id)) {
         componentStore.actions.registerInstance(id, {
@@ -581,16 +589,17 @@
           state: store,
         })
       }
-      return () => {
-        if (componentStore.actions.isComponentRegistered(id)) {
-          componentStore.actions.unregisterInstance(id)
-        }
+    }
+    return () => {
+      // Unregister component
+      if (componentStore.actions.isComponentRegistered(id)) {
+        componentStore.actions.unregisterInstance(id)
       }
+
+      // Stop observing context changes
+      unobserve?.()
     }
   })
-
-  // Observe changes to context
-  onMount(() => context.actions.observeChanges(handleContextChange))
 </script>
 
 {#if constructor && initialSettings && (visible || inSelectedPath) && !builderHidden}
diff --git a/packages/client/src/components/app/Layout.svelte b/packages/client/src/components/app/Layout.svelte
index bdab0dd9ab..903eb23ae6 100644
--- a/packages/client/src/components/app/Layout.svelte
+++ b/packages/client/src/components/app/Layout.svelte
@@ -14,6 +14,7 @@
     linkable,
     builderStore,
     sidePanelStore,
+    appStore,
   } = sdk
   const component = getContext("component")
   const context = getContext("context")
@@ -33,6 +34,8 @@
   export let navTextColor
   export let navWidth
   export let pageWidth
+  export let logoLinkUrl
+  export let openLogoLinkInNewTab
 
   export let embedded = false
 
@@ -150,6 +153,16 @@
     }
     return style
   }
+
+  const getSanitizedUrl = (url, openInNewTab) => {
+    if (!isInternal(url)) {
+      return ensureExternal(url)
+    }
+    if (openInNewTab) {
+      return `#${url}`
+    }
+    return url
+  }
 </script>
 
 <div
@@ -192,7 +205,23 @@
               {/if}
               <div class="logo">
                 {#if !hideLogo}
-                  <img src={logoUrl || "/builder/bblogo.png"} alt={title} />
+                  {#if logoLinkUrl && isInternal(logoLinkUrl) && !openLogoLinkInNewTab}
+                    <a
+                      href={getSanitizedUrl(logoLinkUrl, openLogoLinkInNewTab)}
+                      use:linkable
+                    >
+                      <img src={logoUrl || "/builder/bblogo.png"} alt={title} />
+                    </a>
+                  {:else if logoLinkUrl}
+                    <a
+                      target={openLogoLinkInNewTab ? "_blank" : "_self"}
+                      href={getSanitizedUrl(logoLinkUrl, openLogoLinkInNewTab)}
+                    >
+                      <img src={logoUrl || "/builder/bblogo.png"} alt={title} />
+                    </a>
+                  {:else}
+                    <img src={logoUrl || "/builder/bblogo.png"} alt={title} />
+                  {/if}
                 {/if}
                 {#if !hideTitle && title}
                   <Heading size="S">{title}</Heading>
@@ -200,7 +229,12 @@
               </div>
               {#if !embedded}
                 <div class="portal">
-                  <Icon hoverable name="Apps" on:click={navigateToPortal} />
+                  <Icon
+                    hoverable
+                    name="Apps"
+                    on:click={navigateToPortal}
+                    disabled={$appStore.isDevApp}
+                  />
                 </div>
               {/if}
             </div>
diff --git a/packages/client/src/components/app/Repeater.svelte b/packages/client/src/components/app/Repeater.svelte
index 8796078311..2d07342cf5 100644
--- a/packages/client/src/components/app/Repeater.svelte
+++ b/packages/client/src/components/app/Repeater.svelte
@@ -2,7 +2,9 @@
   import { getContext } from "svelte"
   import Placeholder from "./Placeholder.svelte"
   import Container from "./Container.svelte"
-  import { ContextScopes } from "constants"
+
+  const { Provider, ContextScopes } = getContext("sdk")
+  const component = getContext("component")
 
   export let dataProvider
   export let noRowsMessage
@@ -12,9 +14,6 @@
   export let gap
   export let scope = ContextScopes.Local
 
-  const { Provider } = getContext("sdk")
-  const component = getContext("component")
-
   $: rows = dataProvider?.rows ?? []
   $: loaded = dataProvider?.loaded ?? true
 </script>
diff --git a/packages/client/src/components/app/blocks/CardsBlock.svelte b/packages/client/src/components/app/blocks/CardsBlock.svelte
index e0985a8979..008fa7e730 100644
--- a/packages/client/src/components/app/blocks/CardsBlock.svelte
+++ b/packages/client/src/components/app/blocks/CardsBlock.svelte
@@ -69,7 +69,10 @@
     }
     const col = linkColumn || "_id"
     const split = url.split("/:")
-    return `${split[0]}/{{ ${safe(repeaterId)}.${safe(col)} }}`
+    if (split.length > 1) {
+      return `${split[0]}/{{ ${safe(repeaterId)}.${safe(col)} }}`
+    }
+    return url
   }
 
   // Load the datasource schema so we can determine column types
diff --git a/packages/client/src/components/app/table/SlotRenderer.svelte b/packages/client/src/components/app/table/SlotRenderer.svelte
index dc24f4249c..5d841bab29 100644
--- a/packages/client/src/components/app/table/SlotRenderer.svelte
+++ b/packages/client/src/components/app/table/SlotRenderer.svelte
@@ -3,9 +3,9 @@
 
   export let row
 
-  const { Provider } = getContext("sdk")
+  const { Provider, ContextScopes } = getContext("sdk")
 </script>
 
-<Provider data={row}>
+<Provider data={row} scope={ContextScopes.Local}>
   <slot />
 </Provider>
diff --git a/packages/client/src/components/app/table/Table.svelte b/packages/client/src/components/app/table/Table.svelte
index 4da7dc314b..f16e26bc45 100644
--- a/packages/client/src/components/app/table/Table.svelte
+++ b/packages/client/src/components/app/table/Table.svelte
@@ -3,6 +3,7 @@
   import { Table } from "@budibase/bbui"
   import SlotRenderer from "./SlotRenderer.svelte"
   import { canBeSortColumn } from "@budibase/shared-core"
+  import Provider from "../../context/Provider.svelte"
 
   export let dataProvider
   export let columns
@@ -55,6 +56,11 @@
     }
   }
 
+  // Build our data context
+  $: dataContext = {
+    selectedRows,
+  }
+
   const getFields = (
     schema,
     customColumns,
@@ -150,33 +156,42 @@
     }
   }
 
+  const actions = [
+    {
+      type: ActionTypes.ClearRowSelection,
+      callback: () => (selectedRows = []),
+    },
+  ]
+
   onDestroy(() => {
     rowSelectionStore.actions.updateSelection($component.id, [])
   })
 </script>
 
 <div use:styleable={$component.styles} class={size}>
-  <Table
-    {data}
-    {schema}
-    {loading}
-    {rowCount}
-    {quiet}
-    {compact}
-    {customRenderers}
-    allowSelectRows={allowSelectRows && table}
-    bind:selectedRows
-    allowEditRows={false}
-    allowEditColumns={false}
-    showAutoColumns={true}
-    disableSorting
-    autoSortColumns={!columns?.length}
-    on:sort={onSort}
-    on:click={handleClick}
-    placeholderText={noRowsMessage || "No rows found"}
-  >
-    <slot />
-  </Table>
+  <Provider {actions} data={dataContext}>
+    <Table
+      {data}
+      {schema}
+      {loading}
+      {rowCount}
+      {quiet}
+      {compact}
+      {customRenderers}
+      allowSelectRows={allowSelectRows && table}
+      bind:selectedRows
+      allowEditRows={false}
+      allowEditColumns={false}
+      showAutoColumns={true}
+      disableSorting
+      autoSortColumns={!columns?.length}
+      on:sort={onSort}
+      on:click={handleClick}
+      placeholderText={noRowsMessage || "No rows found"}
+    >
+      <slot />
+    </Table>
+  </Provider>
   {#if allowSelectRows && selectedRows.length}
     <div class="row-count">
       {selectedRows.length} row{selectedRows.length === 1 ? "" : "s"} selected
diff --git a/packages/client/src/components/context/Provider.svelte b/packages/client/src/components/context/Provider.svelte
index ad5b580c4f..fe4463821e 100644
--- a/packages/client/src/components/context/Provider.svelte
+++ b/packages/client/src/components/context/Provider.svelte
@@ -1,9 +1,11 @@
 <script>
   import { getContext, setContext, onDestroy } from "svelte"
   import { dataSourceStore, createContextStore } from "stores"
-  import { ActionTypes, ContextScopes } from "constants"
+  import { ActionTypes } from "constants"
   import { generate } from "shortid"
 
+  const { ContextScopes } = getContext("sdk")
+
   export let data
   export let actions
   export let key
diff --git a/packages/client/src/constants.js b/packages/client/src/constants.js
index 4c9df42809..d3f1ab8be9 100644
--- a/packages/client/src/constants.js
+++ b/packages/client/src/constants.js
@@ -10,11 +10,7 @@ export const ActionTypes = {
   ClearForm: "ClearForm",
   ChangeFormStep: "ChangeFormStep",
   ScrollTo: "ScrollTo",
-}
-
-export const ContextScopes = {
-  Local: "local",
-  Global: "global",
+  ClearRowSelection: "ClearRowSelection",
 }
 
 export const DNDPlaceholderID = "dnd-placeholder"
diff --git a/packages/client/src/sdk.js b/packages/client/src/sdk.js
index 536ae93ea0..557d5ca8da 100644
--- a/packages/client/src/sdk.js
+++ b/packages/client/src/sdk.js
@@ -14,6 +14,7 @@ import {
   dndIsDragging,
   confirmationStore,
   roleStore,
+  appStore,
   stateStore,
   createContextStore,
 } from "stores"
@@ -23,18 +24,19 @@ import { getAction } from "utils/getAction"
 import Provider from "components/context/Provider.svelte"
 import Block from "components/Block.svelte"
 import BlockComponent from "components/BlockComponent.svelte"
-import { ActionTypes, ContextScopes } from "./constants"
+import { ActionTypes } from "./constants"
 import { fetchDatasourceSchema } from "./utils/schema.js"
 import { getAPIKey } from "./utils/api.js"
 import { enrichButtonActions } from "./utils/buttonActions.js"
 import { processStringSync, makePropSafe } from "@budibase/string-templates"
-import { fetchData, LuceneUtils } from "@budibase/frontend-core"
+import { fetchData, LuceneUtils, Constants } from "@budibase/frontend-core"
 
 export default {
   API,
 
   // Stores
   authStore,
+  appStore,
   notificationStore,
   routeStore,
   rowSelectionStore,
@@ -57,7 +59,7 @@ export default {
   fetchDatasourceSchema,
   fetchData,
   LuceneUtils,
-  ContextScopes,
+  ContextScopes: Constants.ContextScopes,
   getAPIKey,
   enrichButtonActions,
   processStringSync,
diff --git a/packages/client/src/stores/rowSelection.js b/packages/client/src/stores/rowSelection.js
index de40ae595e..4c0a196678 100644
--- a/packages/client/src/stores/rowSelection.js
+++ b/packages/client/src/stores/rowSelection.js
@@ -5,7 +5,7 @@ const createRowSelectionStore = () => {
 
   function updateSelection(componentId, tableId, selectedRows) {
     store.update(state => {
-      state[componentId] = { tableId: tableId, selectedRows: selectedRows }
+      state[componentId] = { tableId, selectedRows }
       return state
     })
   }
diff --git a/packages/client/src/utils/buttonActions.js b/packages/client/src/utils/buttonActions.js
index 68b7c84878..b2068ad152 100644
--- a/packages/client/src/utils/buttonActions.js
+++ b/packages/client/src/utils/buttonActions.js
@@ -47,6 +47,8 @@ export const getActionContextKey = action => {
       return key(action.parameters.componentId, ActionTypes.ClearForm)
     case "Change Form Step":
       return key(action.parameters.componentId, ActionTypes.ChangeFormStep)
+    case "Clear Row Selection":
+      return key(action.parameters.componentId, ActionTypes.ClearRowSelection)
     default:
       return null
   }
@@ -211,29 +213,27 @@ const deleteRowHandler = async action => {
 
 const triggerAutomationHandler = async action => {
   const { fields, notificationOverride, timeout } = action.parameters
-  if (fields) {
-    try {
-      const result = await API.triggerAutomation({
-        automationId: action.parameters.automationId,
-        fields,
-        timeout,
-      })
-
-      // Value will exist if automation is synchronous, so return it.
-      if (result.value) {
-        if (!notificationOverride) {
-          notificationStore.actions.success("Automation ran successfully")
-        }
-        return { result }
-      }
+  try {
+    const result = await API.triggerAutomation({
+      automationId: action.parameters.automationId,
+      fields,
+      timeout,
+    })
 
+    // Value will exist if automation is synchronous, so return it.
+    if (result.value) {
       if (!notificationOverride) {
-        notificationStore.actions.success("Automation triggered")
+        notificationStore.actions.success("Automation ran successfully")
       }
-    } catch (error) {
-      // Abort next actions
-      return false
+      return { result }
     }
+
+    if (!notificationOverride) {
+      notificationStore.actions.success("Automation triggered")
+    }
+  } catch (error) {
+    // Abort next actions
+    return false
   }
 }
 const navigationHandler = action => {
@@ -343,7 +343,10 @@ const exportDataHandler = async action => {
         format: action.parameters.type,
         columns: action.parameters.columns,
       })
-      download(data, `${selection.tableId}.${action.parameters.type}`)
+      download(
+        new Blob([data], { type: "text/plain" }),
+        `${selection.tableId}.${action.parameters.type}`
+      )
     } catch (error) {
       notificationStore.actions.error("There was an error exporting the data")
     }
@@ -382,14 +385,14 @@ const showNotificationHandler = action => {
 
 const promptUserHandler = () => {}
 
-const OpenSidePanelHandler = action => {
+const openSidePanelHandler = action => {
   const { id } = action.parameters
   if (id) {
     sidePanelStore.actions.open(id)
   }
 }
 
-const CloseSidePanelHandler = () => {
+const closeSidePanelHandler = () => {
   sidePanelStore.actions.close()
 }
 
@@ -409,8 +412,8 @@ const handlerMap = {
   ["Continue if / Stop if"]: continueIfHandler,
   ["Show Notification"]: showNotificationHandler,
   ["Prompt User"]: promptUserHandler,
-  ["Open Side Panel"]: OpenSidePanelHandler,
-  ["Close Side Panel"]: CloseSidePanelHandler,
+  ["Open Side Panel"]: openSidePanelHandler,
+  ["Close Side Panel"]: closeSidePanelHandler,
 }
 
 const confirmTextMap = {
diff --git a/packages/frontend-core/src/constants.js b/packages/frontend-core/src/constants.js
index 44199ae891..edfdb1c5ef 100644
--- a/packages/frontend-core/src/constants.js
+++ b/packages/frontend-core/src/constants.js
@@ -106,3 +106,8 @@ export const Themes = [
 export const EventPublishType = {
   ENV_VAR_UPGRADE_PANEL_OPENED: "environment_variable_upgrade_panel_opened",
 }
+
+export const ContextScopes = {
+  Local: "local",
+  Global: "global",
+}
diff --git a/packages/frontend-core/src/utils/cookies.js b/packages/frontend-core/src/utils/cookies.js
index 5ecaa3424f..35d6807a68 100644
--- a/packages/frontend-core/src/utils/cookies.js
+++ b/packages/frontend-core/src/utils/cookies.js
@@ -1,8 +1,12 @@
-export function setCookie(name, value) {
+export function setCookie(name, value, domain) {
   if (getCookie(name)) {
     removeCookie(name)
   }
-  window.document.cookie = `${name}=${value}; Path=/;`
+  let cookieString = `${name}=${value}; Path=/;`
+  if (domain) {
+    cookieString += ` Domain=${domain};`
+  }
+  window.document.cookie = cookieString
 }
 
 export function getCookie(cookieName) {
diff --git a/packages/server/Dockerfile b/packages/server/Dockerfile
index e79a52cef3..f63481c373 100644
--- a/packages/server/Dockerfile
+++ b/packages/server/Dockerfile
@@ -82,6 +82,8 @@ EXPOSE 4001
 # due to this causing yarn to stop installing dev dependencies
 # which are actually needed to get this environment up and running
 ENV NODE_ENV=production
+# this is required for isolated-vm to work on Node 20+
+ENV NODE_OPTIONS="--no-node-snapshot"
 ENV CLUSTER_MODE=${CLUSTER_MODE}
 ENV TOP_LEVEL_PATH=/app
 
diff --git a/packages/server/__mocks__/@sendgrid/mail.ts b/packages/server/__mocks__/@sendgrid/mail.ts
index 81e3a5d3b7..030a2dbd4c 100644
--- a/packages/server/__mocks__/@sendgrid/mail.ts
+++ b/packages/server/__mocks__/@sendgrid/mail.ts
@@ -11,7 +11,7 @@ module SendgridMock {
     }
 
     async send(msg: any) {
-      if (msg.to === "invalid@test.com") {
+      if (msg.to === "invalid@example.com") {
         throw "Invalid"
       }
       return msg
diff --git a/packages/server/__mocks__/aws-sdk.ts b/packages/server/__mocks__/aws-sdk.ts
index fa6d099f56..3cf4bba007 100644
--- a/packages/server/__mocks__/aws-sdk.ts
+++ b/packages/server/__mocks__/aws-sdk.ts
@@ -1,7 +1,13 @@
+import fs from "fs"
+import { join } from "path"
+
 module AwsMock {
   const aws: any = {}
 
-  const response = (body: any) => () => ({ promise: () => body })
+  const response = (body: any, extra?: any) => () => ({
+    promise: () => body,
+    ...extra,
+  })
 
   function DocumentClient() {
     // @ts-ignore
@@ -54,7 +60,7 @@ module AwsMock {
 
     // @ts-ignore
     this.getSignedUrl = (operation, params) => {
-      return `http://test.com/${params.Bucket}/${params.Key}`
+      return `http://example.com/${params.Bucket}/${params.Key}`
     }
 
     // @ts-ignore
@@ -73,9 +79,18 @@ module AwsMock {
 
     // @ts-ignore
     this.getObject = jest.fn(
-      response({
-        Body: "",
-      })
+      response(
+        {
+          Body: "",
+        },
+        {
+          createReadStream: jest
+            .fn()
+            .mockReturnValue(
+              fs.createReadStream(join(__dirname, "aws-sdk.ts"))
+            ),
+        }
+      )
     )
   }
 
diff --git a/packages/server/__mocks__/node-fetch.ts b/packages/server/__mocks__/node-fetch.ts
index 53aa76e0c6..265d6b1c36 100644
--- a/packages/server/__mocks__/node-fetch.ts
+++ b/packages/server/__mocks__/node-fetch.ts
@@ -36,8 +36,8 @@ module FetchMock {
 
     if (url.includes("/api/global")) {
       const user = {
-        email: "test@test.com",
-        _id: "us_test@test.com",
+        email: "test@example.com",
+        _id: "us_test@example.com",
         status: "active",
         roles: {},
         builder: {
@@ -58,7 +58,7 @@ module FetchMock {
           url: "/app1",
         },
       })
-    } else if (url.includes("test.com")) {
+    } else if (url.includes("example.com")) {
       return json({
         body: opts.body,
         url,
diff --git a/packages/server/nodemon.json b/packages/server/nodemon.json
index 5535e0772e..3b3d9aa46d 100644
--- a/packages/server/nodemon.json
+++ b/packages/server/nodemon.json
@@ -8,6 +8,6 @@
     "../string-templates"
   ],
   "ext": "js,ts,json,svelte",
-  "ignore": ["src/**/*.spec.ts", "src/**/*.spec.js", "../*/dist/**/*"],
-  "exec": "yarn build && node ./dist/index.js"
+  "ignore": ["**/*.spec.ts", "**/*.spec.js", "../*/dist/**/*"],
+  "exec": "yarn build && node --no-node-snapshot ./dist/index.js"
 }
diff --git a/packages/server/package.json b/packages/server/package.json
index f35b82565d..e600e36bd3 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -13,8 +13,12 @@
     "build": "node ./scripts/build.js",
     "postbuild": "copyfiles -f ../client/dist/budibase-client.js ../client/manifest.json client && copyfiles -f ../../yarn.lock ./dist/",
     "check:types": "tsc -p tsconfig.json --noEmit --paths null",
+    "build:isolated-vm-lib:string-templates": "esbuild --minify --bundle src/jsRunner/bundles/index-helpers.ts --outfile=src/jsRunner/bundles/index-helpers.ivm.bundle.js --platform=node --format=esm --external:handlebars",
+    "build:isolated-vm-lib:bson": "esbuild --minify --bundle src/jsRunner/bundles/bsonPackage.ts --outfile=src/jsRunner/bundles/bson.ivm.bundle.js --platform=node --format=esm",
+    "build:isolated-vm-libs": "yarn build:isolated-vm-lib:string-templates && yarn build:isolated-vm-lib:bson",
     "build:dev": "yarn prebuild && tsc --build --watch --preserveWatchOutput",
     "debug": "yarn build && node --expose-gc --inspect=9222 dist/index.js",
+    "jest": "NODE_OPTIONS=\"--no-node-snapshot $NODE_OPTIONS\" jest",
     "test": "bash scripts/test.sh",
     "test:memory": "jest --maxWorkers=2 --logHeapUsage --forceExit",
     "test:watch": "jest --watch",
@@ -49,8 +53,8 @@
     "@budibase/shared-core": "0.0.0",
     "@budibase/string-templates": "0.0.0",
     "@budibase/types": "0.0.0",
-    "@bull-board/api": "3.7.0",
-    "@bull-board/koa": "3.9.4",
+    "@bull-board/api": "5.10.2",
+    "@bull-board/koa": "5.10.2",
     "@elastic/elasticsearch": "7.10.0",
     "@google-cloud/firestore": "6.8.0",
     "@koa/router": "8.0.8",
@@ -65,14 +69,15 @@
     "cookies": "0.8.0",
     "csvtojson": "2.0.10",
     "curlconverter": "3.21.0",
-    "dd-trace": "5.0.0",
+    "dd-trace": "5.2.0",
     "dotenv": "8.2.0",
     "form-data": "4.0.0",
     "global-agent": "3.0.0",
     "google-auth-library": "7.12.0",
     "google-spreadsheet": "3.2.0",
     "ioredis": "5.3.2",
-    "jimp": "0.16.1",
+    "isolated-vm": "^4.7.2",
+    "jimp": "0.22.10",
     "joi": "17.6.0",
     "js-yaml": "4.1.0",
     "jsonschema": "1.4.0",
@@ -85,7 +90,7 @@
     "koa2-ratelimit": "1.1.1",
     "lodash": "4.17.21",
     "memorystream": "0.3.1",
-    "mongodb": "5.7",
+    "mongodb": "^6.3.0",
     "mssql": "10.0.1",
     "mysql2": "3.5.2",
     "node-fetch": "2.6.7",
@@ -98,13 +103,16 @@
     "pouchdb-all-dbs": "1.1.1",
     "pouchdb-find": "7.2.2",
     "redis": "4",
+    "serialize-error": "^7.0.1",
     "server-destroy": "1.0.1",
     "snowflake-promise": "^4.5.0",
     "socket.io": "4.6.1",
     "svelte": "^3.49.0",
     "tar": "6.1.15",
     "to-json-schema": "0.2.5",
-    "uuid": "3.3.2",
+    "undici": "^6.0.1",
+    "undici-types": "^6.0.1",
+    "uuid": "^8.3.2",
     "validate.js": "0.13.1",
     "vm2": "^3.9.19",
     "worker-farm": "1.7.0",
@@ -129,6 +137,7 @@
     "@types/server-destroy": "1.0.1",
     "@types/supertest": "2.0.14",
     "@types/tar": "6.1.5",
+    "@types/uuid": "8.3.4",
     "apidoc": "0.50.4",
     "copyfiles": "2.4.1",
     "docker-compose": "0.23.17",
diff --git a/packages/server/scripts/dev/manage.js b/packages/server/scripts/dev/manage.js
index 1c7a70931b..509e9a05ac 100644
--- a/packages/server/scripts/dev/manage.js
+++ b/packages/server/scripts/dev/manage.js
@@ -38,7 +38,6 @@ async function init() {
     SELF_HOSTED: "1",
     DISABLE_ACCOUNT_PORTAL: "1",
     MULTI_TENANCY: "",
-    DISABLE_THREADING: "1",
     SERVICE: "app-service",
     DEPLOYMENT_ENVIRONMENT: "development",
     BB_ADMIN_USER_EMAIL: "",
diff --git a/packages/server/scripts/integrations/mongo/docker-compose.yaml b/packages/server/scripts/integrations/mongo/docker-compose.yaml
new file mode 100644
index 0000000000..913febcedd
--- /dev/null
+++ b/packages/server/scripts/integrations/mongo/docker-compose.yaml
@@ -0,0 +1,24 @@
+# Use root/example as user/password credentials
+version: "3.1"
+
+services:
+  mongo:
+    image: mongo
+    restart: always
+    ports:
+      - 27017:27017
+    environment:
+      MONGO_INITDB_ROOT_USERNAME: root
+      MONGO_INITDB_ROOT_PASSWORD: example
+
+  mongo-express:
+    image: mongo-express
+    restart: always
+    ports:
+      - 8081:8081
+    environment:
+      ME_CONFIG_MONGODB_ADMINUSERNAME: root
+      ME_CONFIG_MONGODB_ADMINPASSWORD: example
+      ME_CONFIG_MONGODB_AUTH_USERNAME: admin
+      ME_CONFIG_MONGODB_AUTH_PASSWORD: pass
+      ME_CONFIG_MONGODB_URL: mongodb://root:example@mongo:27017/
diff --git a/packages/server/scripts/test.sh b/packages/server/scripts/test.sh
index 7f871ac337..9efef05526 100644
--- a/packages/server/scripts/test.sh
+++ b/packages/server/scripts/test.sh
@@ -3,12 +3,12 @@ set -e
 
 if [[ -n $CI ]]
 then
-  # Running in ci, where resources are limited
-  export NODE_OPTIONS="--max-old-space-size=4096"
+  export NODE_OPTIONS="--max-old-space-size=4096 --no-node-snapshot"
   echo "jest --coverage --maxWorkers=2 --forceExit --workerIdleMemoryLimit=2000MB --bail $@"
   jest --coverage --maxWorkers=2 --forceExit --workerIdleMemoryLimit=2000MB --bail $@
 else
   # --maxWorkers performs better in development
+  export NODE_OPTIONS="--no-node-snapshot"
   echo "jest --coverage --maxWorkers=2 --forceExit $@"
   jest --coverage --maxWorkers=2 --forceExit $@
 fi
\ No newline at end of file
diff --git a/packages/server/specs/openapi.json b/packages/server/specs/openapi.json
index da532802ab..1cf2d0ebce 100644
--- a/packages/server/specs/openapi.json
+++ b/packages/server/specs/openapi.json
@@ -367,7 +367,7 @@
         "value": {
           "data": {
             "_id": "us_693a73206518477283a8d5ae31103252",
-            "email": "test@test.com",
+            "email": "test@example.com",
             "roles": {
               "app_957b12f943d348faa61db7e18e088d0f": "BASIC"
             },
@@ -397,7 +397,7 @@
           "data": [
             {
               "_id": "us_693a73206518477283a8d5ae31103252",
-              "email": "test@test.com",
+              "email": "test@example.com",
               "roles": {
                 "app_957b12f943d348faa61db7e18e088d0f": "BASIC"
               },
diff --git a/packages/server/specs/openapi.yaml b/packages/server/specs/openapi.yaml
index 7543641ba6..a1615e7426 100644
--- a/packages/server/specs/openapi.yaml
+++ b/packages/server/specs/openapi.yaml
@@ -256,7 +256,7 @@ components:
       value:
         data:
           _id: us_693a73206518477283a8d5ae31103252
-          email: test@test.com
+          email: test@example.com
           roles:
             app_957b12f943d348faa61db7e18e088d0f: BASIC
           builder:
@@ -278,7 +278,7 @@ components:
       value:
         data:
           - _id: us_693a73206518477283a8d5ae31103252
-            email: test@test.com
+            email: test@example.com
             roles:
               app_957b12f943d348faa61db7e18e088d0f: BASIC
             builder:
diff --git a/packages/server/specs/resources/user.ts b/packages/server/specs/resources/user.ts
index caf736f1ab..bb97985349 100644
--- a/packages/server/specs/resources/user.ts
+++ b/packages/server/specs/resources/user.ts
@@ -3,7 +3,7 @@ import Resource from "./utils/Resource"
 
 const user = {
   _id: "us_693a73206518477283a8d5ae31103252",
-  email: "test@test.com",
+  email: "test@example.com",
   roles: {
     app_957b12f943d348faa61db7e18e088d0f: "BASIC",
   },
diff --git a/packages/server/src/api/controllers/application.ts b/packages/server/src/api/controllers/application.ts
index 70298c7172..33582cf656 100644
--- a/packages/server/src/api/controllers/application.ts
+++ b/packages/server/src/api/controllers/application.ts
@@ -445,6 +445,9 @@ export async function update(ctx: UserCtx) {
     name: app.name,
     url: app.url,
     icon: app.icon,
+    automations: {
+      chainAutomations: app.automations?.chainAutomations,
+    },
   })
 }
 
diff --git a/packages/server/src/api/controllers/query/index.ts b/packages/server/src/api/controllers/query/index.ts
index d38df00443..1be836b169 100644
--- a/packages/server/src/api/controllers/query/index.ts
+++ b/packages/server/src/api/controllers/query/index.ts
@@ -15,6 +15,9 @@ import {
   SessionCookie,
   QuerySchema,
   FieldType,
+  type ExecuteQueryRequest,
+  type ExecuteQueryResponse,
+  type Row,
 } from "@budibase/types"
 import { ValidQueryNameRegex } from "@budibase/shared-core"
 
@@ -223,7 +226,7 @@ export async function preview(ctx: UserCtx) {
 }
 
 async function execute(
-  ctx: UserCtx,
+  ctx: UserCtx<ExecuteQueryRequest, ExecuteQueryResponse | Row[]>,
   opts: any = { rowsOnly: false, isAutomation: false }
 ) {
   const db = context.getAppDB()
diff --git a/packages/server/src/api/controllers/script.ts b/packages/server/src/api/controllers/script.ts
index 8af339b0b5..d5b99d0733 100644
--- a/packages/server/src/api/controllers/script.ts
+++ b/packages/server/src/api/controllers/script.ts
@@ -1,12 +1,12 @@
 import ScriptRunner from "../../utilities/scriptRunner"
-import { BBContext } from "@budibase/types"
+import { Ctx } from "@budibase/types"
 
-export async function execute(ctx: BBContext) {
+export async function execute(ctx: Ctx) {
   const { script, context } = ctx.request.body
   const runner = new ScriptRunner(script, context)
   ctx.body = runner.execute()
 }
 
-export async function save(ctx: BBContext) {
+export async function save(ctx: Ctx) {
   ctx.throw(501, "Not currently implemented")
 }
diff --git a/packages/server/src/api/controllers/static/index.ts b/packages/server/src/api/controllers/static/index.ts
index 5f383e837d..ec45361604 100644
--- a/packages/server/src/api/controllers/static/index.ts
+++ b/packages/server/src/api/controllers/static/index.ts
@@ -3,7 +3,7 @@ import { InvalidFileExtensions } from "@budibase/shared-core"
 require("svelte/register")
 
 import { join } from "../../../utilities/centralPath"
-import uuid from "uuid"
+import * as uuid from "uuid"
 import { ObjectStoreBuckets } from "../../../constants"
 import { processString } from "@budibase/string-templates"
 import {
diff --git a/packages/server/src/api/controllers/table/index.ts b/packages/server/src/api/controllers/table/index.ts
index db2bd672d0..55a896373f 100644
--- a/packages/server/src/api/controllers/table/index.ts
+++ b/packages/server/src/api/controllers/table/index.ts
@@ -14,7 +14,6 @@ import { events } from "@budibase/backend-core"
 import {
   BulkImportRequest,
   BulkImportResponse,
-  DocumentType,
   FetchTablesResponse,
   MigrateRequest,
   MigrateResponse,
@@ -25,7 +24,6 @@ import {
   TableResponse,
   TableSourceType,
   UserCtx,
-  SEPARATOR,
 } from "@budibase/types"
 import sdk from "../../../sdk"
 import { jsonFromCsvString } from "../../../utilities/csv"
@@ -77,9 +75,10 @@ export async function save(ctx: UserCtx<SaveTableRequest, SaveTableResponse>) {
   const table = ctx.request.body
   const isImport = table.rows
 
-  const savedTable = await pickApi({ table }).save(ctx)
+  let savedTable = await pickApi({ table }).save(ctx)
   if (!table._id) {
     await events.table.created(savedTable)
+    savedTable = sdk.tables.enrichViewSchemas(savedTable)
   } else {
     await events.table.updated(savedTable)
   }
diff --git a/packages/server/src/api/controllers/table/internal.ts b/packages/server/src/api/controllers/table/internal.ts
index bb94f2bc01..8e90007d88 100644
--- a/packages/server/src/api/controllers/table/internal.ts
+++ b/packages/server/src/api/controllers/table/internal.ts
@@ -19,10 +19,15 @@ export async function save(ctx: UserCtx<SaveTableRequest, SaveTableResponse>) {
   } = {
     _id: generateTableID(),
     ...rest,
-    type: "table",
-    sourceType: TableSourceType.INTERNAL,
-    views: {},
+    // Ensure these fields are populated, even if not sent in the request
+    type: rest.type || "table",
+    sourceType: rest.sourceType || TableSourceType.INTERNAL,
   }
+
+  if (!tableToSave.views) {
+    tableToSave.views = {}
+  }
+
   const renaming = tableToSave._rename
   delete tableToSave._rename
 
diff --git a/packages/server/src/api/routes/tests/appSync.spec.ts b/packages/server/src/api/routes/tests/appSync.spec.ts
index bc35c81ae9..0773b2b008 100644
--- a/packages/server/src/api/routes/tests/appSync.spec.ts
+++ b/packages/server/src/api/routes/tests/appSync.spec.ts
@@ -12,7 +12,7 @@ describe("/api/applications/:appId/sync", () => {
     app = await config.init()
     // create some users which we will use throughout the tests
     await config.createUser({
-      email: "sync1@test.com",
+      email: "sync1@example.com",
       roles: {
         [app._id!]: roles.BUILTIN_ROLE_IDS.BASIC,
       },
diff --git a/packages/server/src/api/routes/tests/datasource.spec.ts b/packages/server/src/api/routes/tests/datasource.spec.ts
index 445c49c026..73bb5056ce 100644
--- a/packages/server/src/api/routes/tests/datasource.spec.ts
+++ b/packages/server/src/api/routes/tests/datasource.spec.ts
@@ -77,7 +77,7 @@ describe("/datasources", () => {
         const { datasource, query } = await config.dynamicVariableDatasource()
         // preview once to cache variables
         await preview(datasource, {
-          path: "www.test.com",
+          path: "www.example.com",
           queryString: "test={{ variable3 }}",
         })
         // check variables in cache
diff --git a/packages/server/src/api/routes/tests/queries/mongodb.spec.ts b/packages/server/src/api/routes/tests/queries/mongodb.spec.ts
new file mode 100644
index 0000000000..b61f905bef
--- /dev/null
+++ b/packages/server/src/api/routes/tests/queries/mongodb.spec.ts
@@ -0,0 +1,393 @@
+import { Datasource, Query } from "@budibase/types"
+import * as setup from "../utilities"
+import { databaseTestProviders } from "../../../../integrations/tests/utils"
+import { MongoClient, type Collection, BSON } from "mongodb"
+
+jest.unmock("mongodb")
+
+const collection = "test_collection"
+
+const expectValidId = expect.stringMatching(/^\w{24}$/)
+const expectValidBsonObjectId = expect.any(BSON.ObjectId)
+
+describe("/queries", () => {
+  let config = setup.getConfig()
+  let datasource: Datasource
+
+  async function createQuery(query: Partial<Query>): Promise<Query> {
+    const defaultQuery: Query = {
+      datasourceId: datasource._id!,
+      name: "New Query",
+      parameters: [],
+      fields: {},
+      schema: {},
+      queryVerb: "read",
+      transformer: "return data",
+      readable: true,
+    }
+    const combinedQuery = { ...defaultQuery, ...query }
+    if (
+      combinedQuery.fields &&
+      combinedQuery.fields.extra &&
+      !combinedQuery.fields.extra.collection
+    ) {
+      combinedQuery.fields.extra.collection = collection
+    }
+    return await config.api.query.create(combinedQuery)
+  }
+
+  async function withClient(
+    callback: (client: MongoClient) => Promise<void>
+  ): Promise<void> {
+    const ds = await databaseTestProviders.mongodb.datasource()
+    const client = new MongoClient(ds.config!.connectionString)
+    await client.connect()
+    try {
+      await callback(client)
+    } finally {
+      await client.close()
+    }
+  }
+
+  async function withCollection(
+    callback: (collection: Collection) => Promise<void>
+  ): Promise<void> {
+    await withClient(async client => {
+      const db = client.db(
+        (await databaseTestProviders.mongodb.datasource()).config!.db
+      )
+      await callback(db.collection(collection))
+    })
+  }
+
+  afterAll(async () => {
+    await databaseTestProviders.mongodb.stop()
+    setup.afterAll()
+  })
+
+  beforeAll(async () => {
+    await config.init()
+    datasource = await config.api.datasource.create(
+      await databaseTestProviders.mongodb.datasource()
+    )
+  })
+
+  beforeEach(async () => {
+    await withCollection(async collection => {
+      await collection.insertMany([
+        { name: "one" },
+        { name: "two" },
+        { name: "three" },
+        { name: "four" },
+        { name: "five" },
+      ])
+    })
+  })
+
+  afterEach(async () => {
+    await withCollection(async collection => {
+      await collection.drop()
+    })
+  })
+
+  it("should execute a count query", async () => {
+    const query = await createQuery({
+      fields: {
+        json: {},
+        extra: {
+          actionType: "count",
+        },
+      },
+    })
+
+    const result = await config.api.query.execute(query._id!)
+
+    expect(result.data).toEqual([{ value: 5 }])
+  })
+
+  it("should execute a count query with a transformer", async () => {
+    const query = await createQuery({
+      fields: {
+        json: {},
+        extra: {
+          actionType: "count",
+        },
+      },
+      transformer: "return data + 1",
+    })
+
+    const result = await config.api.query.execute(query._id!)
+
+    expect(result.data).toEqual([{ value: 6 }])
+  })
+
+  it("should execute a find query", async () => {
+    const query = await createQuery({
+      fields: {
+        json: {},
+        extra: {
+          actionType: "find",
+        },
+      },
+    })
+
+    const result = await config.api.query.execute(query._id!)
+
+    expect(result.data).toEqual([
+      { _id: expectValidId, name: "one" },
+      { _id: expectValidId, name: "two" },
+      { _id: expectValidId, name: "three" },
+      { _id: expectValidId, name: "four" },
+      { _id: expectValidId, name: "five" },
+    ])
+  })
+
+  it("should execute a findOne query", async () => {
+    const query = await createQuery({
+      fields: {
+        json: {},
+        extra: {
+          actionType: "findOne",
+        },
+      },
+    })
+
+    const result = await config.api.query.execute(query._id!)
+
+    expect(result.data).toEqual([{ _id: expectValidId, name: "one" }])
+  })
+
+  it("should execute a findOneAndUpdate query", async () => {
+    const query = await createQuery({
+      fields: {
+        json: {
+          filter: { name: { $eq: "one" } },
+          update: { $set: { name: "newName" } },
+        },
+        extra: {
+          actionType: "findOneAndUpdate",
+        },
+      },
+    })
+
+    const result = await config.api.query.execute(query._id!)
+
+    expect(result.data).toEqual([
+      {
+        lastErrorObject: { n: 1, updatedExisting: true },
+        ok: 1,
+        value: { _id: expectValidId, name: "one" },
+      },
+    ])
+
+    await withCollection(async collection => {
+      expect(await collection.countDocuments()).toBe(5)
+
+      const doc = await collection.findOne({ name: { $eq: "newName" } })
+      expect(doc).toEqual({
+        _id: expectValidBsonObjectId,
+        name: "newName",
+      })
+    })
+  })
+
+  it("should execute a distinct query", async () => {
+    const query = await createQuery({
+      fields: {
+        json: "name",
+        extra: {
+          actionType: "distinct",
+        },
+      },
+    })
+
+    const result = await config.api.query.execute(query._id!)
+    const values = result.data.map(o => o.value).sort()
+    expect(values).toEqual(["five", "four", "one", "three", "two"])
+  })
+
+  it("should execute a create query with parameters", async () => {
+    const query = await createQuery({
+      fields: {
+        json: { foo: "{{ foo }}" },
+        extra: {
+          actionType: "insertOne",
+        },
+      },
+      queryVerb: "create",
+      parameters: [
+        {
+          name: "foo",
+          default: "default",
+        },
+      ],
+    })
+
+    const result = await config.api.query.execute(query._id!, {
+      parameters: { foo: "bar" },
+    })
+
+    expect(result.data).toEqual([
+      {
+        acknowledged: true,
+        insertedId: expectValidId,
+      },
+    ])
+
+    await withCollection(async collection => {
+      const doc = await collection.findOne({ foo: { $eq: "bar" } })
+      expect(doc).toEqual({
+        _id: expectValidBsonObjectId,
+        foo: "bar",
+      })
+    })
+  })
+
+  it("should execute a delete query with parameters", async () => {
+    const query = await createQuery({
+      fields: {
+        json: { name: { $eq: "{{ name }}" } },
+        extra: {
+          actionType: "deleteOne",
+        },
+      },
+      queryVerb: "delete",
+      parameters: [
+        {
+          name: "name",
+          default: "",
+        },
+      ],
+    })
+
+    const result = await config.api.query.execute(query._id!, {
+      parameters: { name: "one" },
+    })
+
+    expect(result.data).toEqual([
+      {
+        acknowledged: true,
+        deletedCount: 1,
+      },
+    ])
+
+    await withCollection(async collection => {
+      const doc = await collection.findOne({ name: { $eq: "one" } })
+      expect(doc).toBeNull()
+    })
+  })
+
+  it("should execute an update query with parameters", async () => {
+    const query = await createQuery({
+      fields: {
+        json: {
+          filter: { name: { $eq: "{{ name }}" } },
+          update: { $set: { name: "{{ newName }}" } },
+        },
+        extra: {
+          actionType: "updateOne",
+        },
+      },
+      queryVerb: "update",
+      parameters: [
+        {
+          name: "name",
+          default: "",
+        },
+        {
+          name: "newName",
+          default: "",
+        },
+      ],
+    })
+
+    const result = await config.api.query.execute(query._id!, {
+      parameters: { name: "one", newName: "newOne" },
+    })
+
+    expect(result.data).toEqual([
+      {
+        acknowledged: true,
+        matchedCount: 1,
+        modifiedCount: 1,
+        upsertedCount: 0,
+        upsertedId: null,
+      },
+    ])
+
+    await withCollection(async collection => {
+      const doc = await collection.findOne({ name: { $eq: "newOne" } })
+      expect(doc).toEqual({
+        _id: expectValidBsonObjectId,
+        name: "newOne",
+      })
+
+      const oldDoc = await collection.findOne({ name: { $eq: "one" } })
+      expect(oldDoc).toBeNull()
+    })
+  })
+
+  it("should be able to delete all records", async () => {
+    const query = await createQuery({
+      fields: {
+        json: {},
+        extra: {
+          actionType: "deleteMany",
+        },
+      },
+      queryVerb: "delete",
+    })
+
+    const result = await config.api.query.execute(query._id!)
+
+    expect(result.data).toEqual([
+      {
+        acknowledged: true,
+        deletedCount: 5,
+      },
+    ])
+
+    await withCollection(async collection => {
+      const docs = await collection.find().toArray()
+      expect(docs).toHaveLength(0)
+    })
+  })
+
+  it("should be able to update all documents", async () => {
+    const query = await createQuery({
+      fields: {
+        json: {
+          filter: {},
+          update: { $set: { name: "newName" } },
+        },
+        extra: {
+          actionType: "updateMany",
+        },
+      },
+      queryVerb: "update",
+    })
+
+    const result = await config.api.query.execute(query._id!)
+
+    expect(result.data).toEqual([
+      {
+        acknowledged: true,
+        matchedCount: 5,
+        modifiedCount: 5,
+        upsertedCount: 0,
+        upsertedId: null,
+      },
+    ])
+
+    await withCollection(async collection => {
+      const docs = await collection.find().toArray()
+      expect(docs).toHaveLength(5)
+      for (const doc of docs) {
+        expect(doc).toEqual({
+          _id: expectValidBsonObjectId,
+          name: "newName",
+        })
+      }
+    })
+  })
+})
diff --git a/packages/server/src/api/routes/tests/queries/postgres.spec.ts b/packages/server/src/api/routes/tests/queries/postgres.spec.ts
new file mode 100644
index 0000000000..487644e787
--- /dev/null
+++ b/packages/server/src/api/routes/tests/queries/postgres.spec.ts
@@ -0,0 +1,170 @@
+import { Datasource, Query } from "@budibase/types"
+import * as setup from "../utilities"
+import { databaseTestProviders } from "../../../../integrations/tests/utils"
+import { Client } from "pg"
+
+jest.unmock("pg")
+
+const createTableSQL = `
+CREATE TABLE test_table (
+    id serial PRIMARY KEY,
+    name VARCHAR ( 50 ) NOT NULL
+);
+`
+
+const insertSQL = `
+INSERT INTO test_table (name) VALUES ('one');
+INSERT INTO test_table (name) VALUES ('two');
+INSERT INTO test_table (name) VALUES ('three');
+INSERT INTO test_table (name) VALUES ('four');
+INSERT INTO test_table (name) VALUES ('five');
+`
+
+const dropTableSQL = `
+DROP TABLE test_table;
+`
+
+describe("/queries", () => {
+  let config = setup.getConfig()
+  let datasource: Datasource
+
+  async function createQuery(query: Partial<Query>): Promise<Query> {
+    const defaultQuery: Query = {
+      datasourceId: datasource._id!,
+      name: "New Query",
+      parameters: [],
+      fields: {},
+      schema: {},
+      queryVerb: "read",
+      transformer: "return data",
+      readable: true,
+    }
+    return await config.api.query.create({ ...defaultQuery, ...query })
+  }
+
+  async function withClient(
+    callback: (client: Client) => Promise<void>
+  ): Promise<void> {
+    const ds = await databaseTestProviders.postgres.datasource()
+    const client = new Client(ds.config!)
+    await client.connect()
+    try {
+      await callback(client)
+    } finally {
+      await client.end()
+    }
+  }
+
+  afterAll(async () => {
+    await databaseTestProviders.postgres.stop()
+    setup.afterAll()
+  })
+
+  beforeAll(async () => {
+    await config.init()
+    datasource = await config.api.datasource.create(
+      await databaseTestProviders.postgres.datasource()
+    )
+  })
+
+  beforeEach(async () => {
+    await withClient(async client => {
+      await client.query(createTableSQL)
+      await client.query(insertSQL)
+    })
+  })
+
+  afterEach(async () => {
+    await withClient(async client => {
+      await client.query(dropTableSQL)
+    })
+  })
+
+  it("should execute a query", async () => {
+    const query = await createQuery({
+      fields: {
+        sql: "SELECT * FROM test_table ORDER BY id",
+      },
+    })
+
+    const result = await config.api.query.execute(query._id!)
+
+    expect(result.data).toEqual([
+      {
+        id: 1,
+        name: "one",
+      },
+      {
+        id: 2,
+        name: "two",
+      },
+      {
+        id: 3,
+        name: "three",
+      },
+      {
+        id: 4,
+        name: "four",
+      },
+      {
+        id: 5,
+        name: "five",
+      },
+    ])
+  })
+
+  it("should be able to transform a query", async () => {
+    const query = await createQuery({
+      fields: {
+        sql: "SELECT * FROM test_table WHERE id = 1",
+      },
+      transformer: `
+        data[0].id = data[0].id + 1;
+        return data;
+      `,
+    })
+
+    const result = await config.api.query.execute(query._id!)
+
+    expect(result.data).toEqual([
+      {
+        id: 2,
+        name: "one",
+      },
+    ])
+  })
+
+  it("should be able to insert with bindings", async () => {
+    const query = await createQuery({
+      fields: {
+        sql: "INSERT INTO test_table (name) VALUES ({{ foo }})",
+      },
+      parameters: [
+        {
+          name: "foo",
+          default: "bar",
+        },
+      ],
+      queryVerb: "create",
+    })
+
+    const result = await config.api.query.execute(query._id!, {
+      parameters: {
+        foo: "baz",
+      },
+    })
+
+    expect(result.data).toEqual([
+      {
+        created: true,
+      },
+    ])
+
+    await withClient(async client => {
+      const { rows } = await client.query(
+        "SELECT * FROM test_table WHERE name = 'baz'"
+      )
+      expect(rows).toHaveLength(1)
+    })
+  })
+})
diff --git a/packages/server/src/api/routes/tests/query.seq.spec.ts b/packages/server/src/api/routes/tests/queries/query.seq.spec.ts
similarity index 99%
rename from packages/server/src/api/routes/tests/query.seq.spec.ts
rename to packages/server/src/api/routes/tests/queries/query.seq.spec.ts
index 2790a9d8bf..ba41ba3d16 100644
--- a/packages/server/src/api/routes/tests/query.seq.spec.ts
+++ b/packages/server/src/api/routes/tests/queries/query.seq.spec.ts
@@ -16,9 +16,9 @@ jest.mock("@budibase/backend-core", () => {
     },
   }
 })
-import * as setup from "./utilities"
-import { checkBuilderEndpoint } from "./utilities/TestFunctions"
-import { checkCacheForDynamicVariable } from "../../../threads/utils"
+import * as setup from "../utilities"
+import { checkBuilderEndpoint } from "../utilities/TestFunctions"
+import { checkCacheForDynamicVariable } from "../../../../threads/utils"
 
 const { basicQuery, basicDatasource } = setup.structures
 import { events, db as dbCore } from "@budibase/backend-core"
diff --git a/packages/server/src/api/routes/tests/row.spec.ts b/packages/server/src/api/routes/tests/row.spec.ts
index f481fa8068..10dac3c0ea 100644
--- a/packages/server/src/api/routes/tests/row.spec.ts
+++ b/packages/server/src/api/routes/tests/row.spec.ts
@@ -12,7 +12,6 @@ import {
   FieldTypeSubtypes,
   FormulaType,
   INTERNAL_TABLE_SOURCE_ID,
-  MonthlyQuotaName,
   PermissionLevel,
   QuotaUsageType,
   RelationshipType,
@@ -53,7 +52,7 @@ describe.each([
 
   afterAll(async () => {
     if (dsProvider) {
-      await dsProvider.stopContainer()
+      await dsProvider.stop()
     }
     setup.afterAll()
   })
@@ -63,7 +62,7 @@ describe.each([
 
     if (dsProvider) {
       await config.createDatasource({
-        datasource: await dsProvider.getDsConfig(),
+        datasource: await dsProvider.datasource(),
       })
     }
   })
@@ -117,16 +116,6 @@ describe.each([
     return total
   }
 
-  const getQueryUsage = async () => {
-    const { total } = await config.doInContext(null, () =>
-      quotas.getCurrentUsageValues(
-        QuotaUsageType.MONTHLY,
-        MonthlyQuotaName.QUERIES
-      )
-    )
-    return total
-  }
-
   const assertRowUsage = async (expected: number) => {
     const usage = await getRowUsage()
     expect(usage).toBe(expected)
@@ -162,7 +151,6 @@ describe.each([
   describe("save, load, update", () => {
     it("returns a success message when the row is created", async () => {
       const rowUsage = await getRowUsage()
-      const queryUsage = await getQueryUsage()
 
       const res = await request
         .post(`/api/${tableId}/rows`)
@@ -180,7 +168,6 @@ describe.each([
 
     it("Increment row autoId per create row request", async () => {
       const rowUsage = await getRowUsage()
-      const queryUsage = await getQueryUsage()
 
       const tableConfig = generateTableConfig()
       const newTable = await createTable(
@@ -231,7 +218,6 @@ describe.each([
     it("updates a row successfully", async () => {
       const existing = await config.createRow()
       const rowUsage = await getRowUsage()
-      const queryUsage = await getQueryUsage()
 
       const res = await config.api.row.save(tableId, {
         _id: existing._id,
@@ -246,7 +232,6 @@ describe.each([
 
     it("should load a row", async () => {
       const existing = await config.createRow()
-      const queryUsage = await getQueryUsage()
 
       const res = await config.api.row.get(tableId, existing._id!)
 
@@ -268,7 +253,6 @@ describe.each([
       }
       const firstRow = await config.createRow({ tableId })
       await config.createRow(newRow)
-      const queryUsage = await getQueryUsage()
 
       const res = await config.api.row.fetch(tableId)
 
@@ -279,7 +263,6 @@ describe.each([
 
     it("load should return 404 when row does not exist", async () => {
       await config.createRow()
-      const queryUsage = await getQueryUsage()
 
       await config.api.row.get(tableId, "1234567", {
         expectStatus: 404,
@@ -530,7 +513,6 @@ describe.each([
       const existing = await config.createRow()
 
       const rowUsage = await getRowUsage()
-      const queryUsage = await getQueryUsage()
 
       const row = await config.api.row.patch(table._id!, {
         _id: existing._id!,
@@ -552,7 +534,6 @@ describe.each([
     it("should throw an error when given improper types", async () => {
       const existing = await config.createRow()
       const rowUsage = await getRowUsage()
-      const queryUsage = await getQueryUsage()
 
       await config.api.row.patch(
         table._id!,
@@ -650,7 +631,6 @@ describe.each([
     it("should be able to delete a row", async () => {
       const createdRow = await config.createRow()
       const rowUsage = await getRowUsage()
-      const queryUsage = await getQueryUsage()
 
       const res = await config.api.row.delete(table._id!, [createdRow])
       expect(res.body[0]._id).toEqual(createdRow._id)
@@ -666,7 +646,6 @@ describe.each([
 
     it("should return no errors on valid row", async () => {
       const rowUsage = await getRowUsage()
-      const queryUsage = await getQueryUsage()
 
       const res = await config.api.row.validate(table._id!, { name: "ivan" })
 
@@ -677,7 +656,6 @@ describe.each([
 
     it("should errors on invalid row", async () => {
       const rowUsage = await getRowUsage()
-      const queryUsage = await getQueryUsage()
 
       const res = await config.api.row.validate(table._id!, { name: 1 })
 
@@ -703,7 +681,6 @@ describe.each([
       const row1 = await config.createRow()
       const row2 = await config.createRow()
       const rowUsage = await getRowUsage()
-      const queryUsage = await getQueryUsage()
 
       const res = await config.api.row.delete(table._id!, [row1, row2])
 
@@ -719,7 +696,6 @@ describe.each([
         config.createRow(),
       ])
       const rowUsage = await getRowUsage()
-      const queryUsage = await getQueryUsage()
 
       const res = await config.api.row.delete(table._id!, [
         row1,
@@ -735,7 +711,6 @@ describe.each([
     it("should accept a valid row object and delete the row", async () => {
       const row1 = await config.createRow()
       const rowUsage = await getRowUsage()
-      const queryUsage = await getQueryUsage()
 
       const res = await config.api.row.delete(table._id!, row1)
 
@@ -746,7 +721,6 @@ describe.each([
 
     it("Should ignore malformed/invalid delete requests", async () => {
       const rowUsage = await getRowUsage()
-      const queryUsage = await getQueryUsage()
 
       const res = await config.api.row.delete(
         table._id!,
@@ -782,7 +756,6 @@ describe.each([
       it("should be able to fetch tables contents via 'view'", async () => {
         const row = await config.createRow()
         const rowUsage = await getRowUsage()
-        const queryUsage = await getQueryUsage()
 
         const res = await config.api.legacyView.get(table._id!)
         expect(res.body.length).toEqual(1)
@@ -792,7 +765,6 @@ describe.each([
 
       it("should throw an error if view doesn't exist", async () => {
         const rowUsage = await getRowUsage()
-        const queryUsage = await getQueryUsage()
 
         await config.api.legacyView.get("derp", { expectStatus: 404 })
 
@@ -808,7 +780,6 @@ describe.each([
         })
         const row = await config.createRow()
         const rowUsage = await getRowUsage()
-        const queryUsage = await getQueryUsage()
 
         const res = await config.api.legacyView.get(view.name)
         expect(res.body.length).toEqual(1)
@@ -864,7 +835,6 @@ describe.each([
         }
       )
       const rowUsage = await getRowUsage()
-      const queryUsage = await getQueryUsage()
 
       // test basic enrichment
       const resBasic = await config.api.row.get(
@@ -1100,7 +1070,6 @@ describe.each([
 
         const createdRow = await config.createRow()
         const rowUsage = await getRowUsage()
-        const queryUsage = await getQueryUsage()
 
         await config.api.row.delete(view.id, [createdRow])
 
@@ -1127,7 +1096,6 @@ describe.each([
           config.createRow(),
         ])
         const rowUsage = await getRowUsage()
-        const queryUsage = await getQueryUsage()
 
         await config.api.row.delete(view.id, [rows[0], rows[2]])
 
@@ -2063,7 +2031,7 @@ describe.each([
 
   describe("Formula JS protection", () => {
     it("should time out JS execution if a single cell takes too long", async () => {
-      await config.withEnv({ JS_PER_EXECUTION_TIME_LIMIT_MS: 20 }, async () => {
+      await config.withEnv({ JS_PER_INVOCATION_TIMEOUT_MS: 20 }, async () => {
         const js = Buffer.from(
           `
               let i = 0;
@@ -2103,8 +2071,8 @@ describe.each([
     it("should time out JS execution if a multiple cells take too long", async () => {
       await config.withEnv(
         {
-          JS_PER_EXECUTION_TIME_LIMIT_MS: 20,
-          JS_PER_REQUEST_TIME_LIMIT_MS: 40,
+          JS_PER_INVOCATION_TIMEOUT_MS: 20,
+          JS_PER_REQUEST_TIMEOUT_MS: 40,
         },
         async () => {
           const js = Buffer.from(
diff --git a/packages/server/src/api/routes/tests/static.spec.js b/packages/server/src/api/routes/tests/static.spec.js
index a28d9ecd79..30417c3a98 100644
--- a/packages/server/src/api/routes/tests/static.spec.js
+++ b/packages/server/src/api/routes/tests/static.spec.js
@@ -80,7 +80,7 @@ describe("/static", () => {
           .set(config.defaultHeaders())
           .expect("Content-Type", /json/)
           .expect(200)
-        expect(res.body.signedUrl).toEqual("http://test.com/foo/bar")
+        expect(res.body.signedUrl).toEqual("http://example.com/foo/bar")
         expect(res.body.publicUrl).toEqual(
           `https://${bucket}.s3.eu-west-1.amazonaws.com/${key}`
         )
diff --git a/packages/server/src/api/routes/tests/table.spec.ts b/packages/server/src/api/routes/tests/table.spec.ts
index 9129fd14c3..c8cb3ef21b 100644
--- a/packages/server/src/api/routes/tests/table.spec.ts
+++ b/packages/server/src/api/routes/tests/table.spec.ts
@@ -5,6 +5,7 @@ import {
   FieldType,
   INTERNAL_TABLE_SOURCE_ID,
   InternalTable,
+  NumberFieldMetadata,
   RelationshipType,
   Row,
   SaveTableRequest,
@@ -16,7 +17,13 @@ import {
 import { checkBuilderEndpoint } from "./utilities/TestFunctions"
 import * as setup from "./utilities"
 import sdk from "../../../sdk"
-import uuid from "uuid"
+import * as uuid from "uuid"
+
+import tk from "timekeeper"
+import { mocks } from "@budibase/backend-core/tests"
+import { TableToBuild } from "../../../tests/utilities/TestConfiguration"
+
+tk.freeze(mocks.date.MOCK_DATE)
 
 const { basicTable } = setup.structures
 
@@ -60,6 +67,67 @@ describe("/tables", () => {
       expect(events.table.created).toBeCalledWith(res.body)
     })
 
+    it("creates all the passed fields", async () => {
+      const tableData: TableToBuild = {
+        name: "TestTable",
+        type: "table",
+        schema: {
+          autoId: {
+            name: "id",
+            type: FieldType.NUMBER,
+            subtype: AutoFieldSubType.AUTO_ID,
+            autocolumn: true,
+            constraints: {
+              type: "number",
+              presence: false,
+            },
+          },
+        },
+        views: {
+          "table view": {
+            id: "viewId",
+            version: 2,
+            name: "table view",
+            tableId: "tableId",
+          },
+        },
+      }
+      const testTable = await config.createTable(tableData)
+
+      const expected: Table = {
+        ...tableData,
+        type: "table",
+        views: {
+          "table view": {
+            ...tableData.views!["table view"],
+            schema: {
+              autoId: {
+                autocolumn: true,
+                constraints: {
+                  presence: false,
+                  type: "number",
+                },
+                name: "id",
+                type: FieldType.NUMBER,
+                subtype: AutoFieldSubType.AUTO_ID,
+                visible: false,
+              } as NumberFieldMetadata,
+            },
+          },
+        },
+        sourceType: TableSourceType.INTERNAL,
+        sourceId: expect.any(String),
+        _rev: expect.stringMatching(/^1-.+/),
+        _id: expect.any(String),
+        createdAt: mocks.date.MOCK_DATE.toISOString(),
+        updatedAt: mocks.date.MOCK_DATE.toISOString(),
+      }
+      expect(testTable).toEqual(expected)
+
+      const persistedTable = await config.api.table.get(testTable._id!)
+      expect(persistedTable).toEqual(expected)
+    })
+
     it("creates a table via data import", async () => {
       const table: SaveTableRequest = basicTable()
       table.rows = [{ name: "test-name", description: "test-desc" }]
@@ -152,6 +220,56 @@ describe("/tables", () => {
       expect(res.body.name).toBeUndefined()
     })
 
+    it("updates only the passed fields", async () => {
+      const testTable = await config.createTable({
+        name: "TestTable",
+        type: "table",
+        schema: {
+          autoId: {
+            name: "id",
+            type: FieldType.NUMBER,
+            subtype: AutoFieldSubType.AUTO_ID,
+            autocolumn: true,
+            constraints: {
+              type: "number",
+              presence: false,
+            },
+          },
+        },
+        views: {
+          view1: {
+            id: "viewId",
+            version: 2,
+            name: "table view",
+            tableId: "tableId",
+          },
+        },
+      })
+
+      const response = await request
+        .post(`/api/tables`)
+        .send({
+          ...testTable,
+          name: "UpdatedName",
+        })
+        .set(config.defaultHeaders())
+        .expect("Content-Type", /json/)
+        .expect(200)
+
+      expect(response.body).toEqual({
+        ...testTable,
+        name: "UpdatedName",
+        _rev: expect.stringMatching(/^2-.+/),
+      })
+
+      const persistedTable = await config.api.table.get(testTable._id!)
+      expect(persistedTable).toEqual({
+        ...testTable,
+        name: "UpdatedName",
+        _rev: expect.stringMatching(/^2-.+/),
+      })
+    })
+
     describe("user table", () => {
       it("should add roleId and email field when adjusting user table schema", async () => {
         const res = await request
@@ -230,6 +348,7 @@ describe("/tables", () => {
 
   describe("fetch", () => {
     let testTable: Table
+    const enrichViewSchemasMock = jest.spyOn(sdk.tables, "enrichViewSchemas")
 
     beforeEach(async () => {
       testTable = await config.createTable(testTable)
@@ -239,6 +358,10 @@ describe("/tables", () => {
       delete testTable._rev
     })
 
+    afterAll(() => {
+      enrichViewSchemasMock.mockRestore()
+    })
+
     it("returns all the tables for that instance in the response body", async () => {
       const res = await request
         .get(`/api/tables`)
@@ -287,7 +410,7 @@ describe("/tables", () => {
 
     it("should enrich the view schemas for viewsV2", async () => {
       const tableId = config.table!._id!
-      jest.spyOn(sdk.tables, "enrichViewSchemas").mockImplementation(t => ({
+      enrichViewSchemasMock.mockImplementation(t => ({
         ...t,
         views: {
           view1: {
@@ -295,7 +418,7 @@ describe("/tables", () => {
             name: "view1",
             schema: {},
             id: "new_view_id",
-            tableId,
+            tableId: t._id!,
           },
         },
       }))
@@ -362,11 +485,7 @@ describe("/tables", () => {
     let testTable: Table
 
     beforeEach(async () => {
-      testTable = await config.createTable(testTable)
-    })
-
-    afterEach(() => {
-      delete testTable._rev
+      testTable = await config.createTable()
     })
 
     it("returns a success response when a table is deleted.", async () => {
diff --git a/packages/server/src/api/routes/tests/utilities/index.ts b/packages/server/src/api/routes/tests/utilities/index.ts
index 33d371a376..27c178fc38 100644
--- a/packages/server/src/api/routes/tests/utilities/index.ts
+++ b/packages/server/src/api/routes/tests/utilities/index.ts
@@ -9,7 +9,7 @@ function user() {
     _id: "user",
     _rev: "rev",
     createdAt: Date.now(),
-    email: "test@test.com",
+    email: "test@example.com",
     roles: {},
     tenantId: "default",
     status: "active",
diff --git a/packages/server/src/automations/tests/discord.spec.js b/packages/server/src/automations/tests/discord.spec.js
index ccae42d073..84c7e6f46e 100644
--- a/packages/server/src/automations/tests/discord.spec.js
+++ b/packages/server/src/automations/tests/discord.spec.js
@@ -11,7 +11,7 @@ describe("test the outgoing webhook action", () => {
     await config.init()
     inputs = {
       username: "joe_bloggs",
-      url: "http://www.test.com",
+      url: "http://www.example.com",
     }
   })
 
@@ -19,7 +19,7 @@ describe("test the outgoing webhook action", () => {
 
   it("should be able to run the action", async () => {
     const res = await setup.runStep(setup.actions.discord.stepId, inputs)
-    expect(res.response.url).toEqual("http://www.test.com")
+    expect(res.response.url).toEqual("http://www.example.com")
     expect(res.response.method).toEqual("post")
     expect(res.success).toEqual(true)
   })
diff --git a/packages/server/src/automations/tests/executeScript.spec.js b/packages/server/src/automations/tests/executeScript.spec.js
index 5aac8400cd..42f4f5776f 100644
--- a/packages/server/src/automations/tests/executeScript.spec.js
+++ b/packages/server/src/automations/tests/executeScript.spec.js
@@ -9,34 +9,40 @@ describe("test the execute script action", () => {
   afterAll(setup.afterAll)
 
   it("should be able to execute a script", async () => {
-    let res = await setup.runStep(
-      setup.actions.EXECUTE_SCRIPT.stepId,
-      (inputs = {
-        code: "return 1 + 1",
-      })
-    )
+    const res = await setup.runStep(setup.actions.EXECUTE_SCRIPT.stepId, {
+      code: "return 1 + 1",
+    })
     expect(res.value).toEqual(2)
     expect(res.success).toEqual(true)
   })
 
   it("should handle a null value", async () => {
-    let res = await setup.runStep(
-      setup.actions.EXECUTE_SCRIPT.stepId,
-      (inputs = {
-        code: null,
-      })
-    )
+    const res = await setup.runStep(setup.actions.EXECUTE_SCRIPT.stepId, {
+      code: null,
+    })
     expect(res.response.message).toEqual("Invalid inputs")
     expect(res.success).toEqual(false)
   })
 
-  it("should be able to handle an error gracefully", async () => {
-    let res = await setup.runStep(
+  it("should be able to get a value from context", async () => {
+    const res = await setup.runStep(
       setup.actions.EXECUTE_SCRIPT.stepId,
-      (inputs = {
-        code: "return something.map(x => x.name)",
-      })
+      {
+        code: "return steps.map(d => d.value)",
+      },
+      {
+        steps: [{ value: 0 }, { value: 1 }],
+      }
     )
+    expect(res.value).toEqual([0, 1])
+    expect(res.response).toBeUndefined()
+    expect(res.success).toEqual(true)
+  })
+
+  it("should be able to handle an error gracefully", async () => {
+    const res = await setup.runStep(setup.actions.EXECUTE_SCRIPT.stepId, {
+      code: "return something.map(x => x.name)",
+    })
     expect(res.response).toEqual("ReferenceError: something is not defined")
     expect(res.success).toEqual(false)
   })
diff --git a/packages/server/src/automations/tests/make.spec.ts b/packages/server/src/automations/tests/make.spec.ts
index ddf7dc3f44..62474ae2c0 100644
--- a/packages/server/src/automations/tests/make.spec.ts
+++ b/packages/server/src/automations/tests/make.spec.ts
@@ -12,9 +12,9 @@ describe("test the outgoing webhook action", () => {
   it("should be able to run the action", async () => {
     const res = await runStep(actions.integromat.stepId, {
       value1: "test",
-      url: "http://www.test.com",
+      url: "http://www.example.com",
     })
-    expect(res.response.url).toEqual("http://www.test.com")
+    expect(res.response.url).toEqual("http://www.example.com")
     expect(res.response.method).toEqual("post")
     expect(res.success).toEqual(true)
   })
@@ -30,9 +30,9 @@ describe("test the outgoing webhook action", () => {
       body: {
         value: payload,
       },
-      url: "http://www.test.com",
+      url: "http://www.example.com",
     })
-    expect(res.response.url).toEqual("http://www.test.com")
+    expect(res.response.url).toEqual("http://www.example.com")
     expect(res.response.method).toEqual("post")
     expect(res.response.body).toEqual(payload)
     expect(res.success).toEqual(true)
@@ -45,7 +45,7 @@ describe("test the outgoing webhook action", () => {
       body: {
         value: payload,
       },
-      url: "http://www.test.com",
+      url: "http://www.example.com",
     })
     expect(res.httpStatus).toEqual(400)
     expect(res.response).toEqual("Invalid payload JSON")
diff --git a/packages/server/src/automations/tests/outgoingWebhook.spec.js b/packages/server/src/automations/tests/outgoingWebhook.spec.js
index 4bc51d0989..06fe2e0a38 100644
--- a/packages/server/src/automations/tests/outgoingWebhook.spec.js
+++ b/packages/server/src/automations/tests/outgoingWebhook.spec.js
@@ -11,7 +11,7 @@ describe("test the outgoing webhook action", () => {
     await config.init()
     inputs = {
       requestMethod: "POST",
-      url: "www.test.com",
+      url: "www.example.com",
       requestBody: JSON.stringify({
         a: 1,
       }),
@@ -26,7 +26,7 @@ describe("test the outgoing webhook action", () => {
       inputs
     )
     expect(res.success).toEqual(true)
-    expect(res.response.url).toEqual("http://www.test.com")
+    expect(res.response.url).toEqual("http://www.example.com")
     expect(res.response.method).toEqual("POST")
     expect(JSON.parse(res.response.body).a).toEqual(1)
   })
diff --git a/packages/server/src/automations/tests/sendSmtpEmail.spec.ts b/packages/server/src/automations/tests/sendSmtpEmail.spec.ts
index da274dfffc..b86d190afd 100644
--- a/packages/server/src/automations/tests/sendSmtpEmail.spec.ts
+++ b/packages/server/src/automations/tests/sendSmtpEmail.spec.ts
@@ -33,7 +33,7 @@ describe("test the outgoing webhook action", () => {
     jest
       .spyOn(workerRequests, "sendSmtpEmail")
       .mockImplementationOnce(async () =>
-        generateResponse("user1@test.com", "admin@test.com")
+        generateResponse("user1@example.com", "admin@example.com")
       )
     const invite = {
       startTime: new Date(),
@@ -43,8 +43,8 @@ describe("test the outgoing webhook action", () => {
       url: "url",
     }
     inputs = {
-      to: "user1@test.com",
-      from: "admin@test.com",
+      to: "user1@example.com",
+      from: "admin@example.com",
       subject: "hello",
       contents: "testing",
       cc: "cc",
@@ -61,8 +61,8 @@ describe("test the outgoing webhook action", () => {
     expect(res.success).toEqual(true)
     expect(workerRequests.sendSmtpEmail).toHaveBeenCalledTimes(1)
     expect(workerRequests.sendSmtpEmail).toHaveBeenCalledWith({
-      to: "user1@test.com",
-      from: "admin@test.com",
+      to: "user1@example.com",
+      from: "admin@example.com",
       subject: "hello",
       contents: "testing",
       cc: "cc",
diff --git a/packages/server/src/automations/tests/zapier.spec.ts b/packages/server/src/automations/tests/zapier.spec.ts
index a86185ccad..994df3dc99 100644
--- a/packages/server/src/automations/tests/zapier.spec.ts
+++ b/packages/server/src/automations/tests/zapier.spec.ts
@@ -12,9 +12,9 @@ describe("test the outgoing webhook action", () => {
   it("should be able to run the action", async () => {
     const res = await runStep(actions.zapier.stepId, {
       value1: "test",
-      url: "http://www.test.com",
+      url: "http://www.example.com",
     })
-    expect(res.response.url).toEqual("http://www.test.com")
+    expect(res.response.url).toEqual("http://www.example.com")
     expect(res.response.method).toEqual("post")
     expect(res.success).toEqual(true)
   })
@@ -30,9 +30,9 @@ describe("test the outgoing webhook action", () => {
       body: {
         value: payload,
       },
-      url: "http://www.test.com",
+      url: "http://www.example.com",
     })
-    expect(res.response.url).toEqual("http://www.test.com")
+    expect(res.response.url).toEqual("http://www.example.com")
     expect(res.response.method).toEqual("post")
     expect(res.response.body).toEqual(
       `{"platform":"budibase","value1":1,"value2":2,"value3":3,"value4":4,"value5":5,"name":"Adam","age":9}`
@@ -47,7 +47,7 @@ describe("test the outgoing webhook action", () => {
       body: {
         value: payload,
       },
-      url: "http://www.test.com",
+      url: "http://www.example.com",
     })
     expect(res.httpStatus).toEqual(400)
     expect(res.response).toEqual("Invalid payload JSON")
diff --git a/packages/server/src/automations/utils.ts b/packages/server/src/automations/utils.ts
index 0c28787f67..360802df6a 100644
--- a/packages/server/src/automations/utils.ts
+++ b/packages/server/src/automations/utils.ts
@@ -16,9 +16,9 @@ import {
 } from "@budibase/types"
 import sdk from "../sdk"
 import { automationsEnabled } from "../features"
+import { helpers, REBOOT_CRON } from "@budibase/shared-core"
 import tracer from "dd-trace"
 
-const REBOOT_CRON = "@reboot"
 const WH_STEP_ID = definitions.WEBHOOK.stepId
 const CRON_STEP_ID = definitions.CRON.stepId
 let Runner: Thread
@@ -198,6 +198,13 @@ export async function enableCronTrigger(appId: any, automation: Automation) {
     !isRebootTrigger(automation) &&
     trigger?.inputs.cron
   ) {
+    const cronExp = trigger.inputs.cron
+    const validation = helpers.cron.validate(cronExp)
+    if (!validation.valid) {
+      throw new Error(
+        `Invalid automation CRON "${cronExp}" - ${validation.err.join(", ")}`
+      )
+    }
     // make a job id rather than letting Bull decide, makes it easier to handle on way out
     const jobId = `${appId}_cron_${newid()}`
     const job: any = await automationQueue.add(
@@ -205,7 +212,7 @@ export async function enableCronTrigger(appId: any, automation: Automation) {
         automation,
         event: { appId, timestamp: Date.now() },
       },
-      { repeat: { cron: trigger.inputs.cron }, jobId }
+      { repeat: { cron: cronExp }, jobId }
     )
     // Assign cron job ID from bull so we can remove it later if the cron trigger is removed
     trigger.cronJobId = job.id
diff --git a/packages/server/src/db/newid.ts b/packages/server/src/db/newid.ts
index 0037bc0353..bc8f3bb04b 100644
--- a/packages/server/src/db/newid.ts
+++ b/packages/server/src/db/newid.ts
@@ -1,4 +1,4 @@
-const { v4 } = require("uuid")
+import { v4 } from "uuid"
 
 export default function (): string {
   return v4().replace(/-/g, "")
diff --git a/packages/server/src/environment.ts b/packages/server/src/environment.ts
index e300e86dc1..8e6866d5e4 100644
--- a/packages/server/src/environment.ts
+++ b/packages/server/src/environment.ts
@@ -71,9 +71,9 @@ const environment = {
   SELF_HOSTED: process.env.SELF_HOSTED,
   HTTP_MB_LIMIT: process.env.HTTP_MB_LIMIT,
   FORKED_PROCESS_NAME: process.env.FORKED_PROCESS_NAME || "main",
-  JS_PER_EXECUTION_TIME_LIMIT_MS:
+  JS_PER_INVOCATION_TIMEOUT_MS:
     parseIntSafe(process.env.JS_PER_EXECUTION_TIME_LIMIT_MS) || 1000,
-  JS_PER_REQUEST_TIME_LIMIT_MS: parseIntSafe(
+  JS_PER_REQUEST_TIMEOUT_MS: parseIntSafe(
     process.env.JS_PER_REQUEST_TIME_LIMIT_MS
   ),
   // old
@@ -95,11 +95,9 @@ const environment = {
   TOP_LEVEL_PATH:
     process.env.TOP_LEVEL_PATH || process.env.SERVER_TOP_LEVEL_PATH,
   APP_MIGRATION_TIMEOUT: parseIntSafe(process.env.APP_MIGRATION_TIMEOUT),
-}
-
-// threading can cause memory issues with node-ts in development
-if (coreEnv.isDev() && environment.DISABLE_THREADING == null) {
-  environment._set("DISABLE_THREADING", "1")
+  JS_RUNNER_MEMORY_LIMIT:
+    parseIntSafe(process.env.JS_RUNNER_MEMORY_LIMIT) || 64,
+  LOG_JS_ERRORS: process.env.LOG_JS_ERRORS,
 }
 
 // clean up any environment variable edge cases
diff --git a/packages/server/src/integration-test/postgres.spec.ts b/packages/server/src/integration-test/postgres.spec.ts
index 600566c813..0031fe1136 100644
--- a/packages/server/src/integration-test/postgres.spec.ts
+++ b/packages/server/src/integration-test/postgres.spec.ts
@@ -41,12 +41,12 @@ describe("postgres integrations", () => {
     makeRequest = generateMakeRequest(apiKey, true)
 
     postgresDatasource = await config.api.datasource.create(
-      await databaseTestProviders.postgres.getDsConfig()
+      await databaseTestProviders.postgres.datasource()
     )
   })
 
   afterAll(async () => {
-    await databaseTestProviders.postgres.stopContainer()
+    await databaseTestProviders.postgres.stop()
   })
 
   beforeEach(async () => {
@@ -1041,14 +1041,14 @@ describe("postgres integrations", () => {
   describe("POST /api/datasources/verify", () => {
     it("should be able to verify the connection", async () => {
       const response = await config.api.datasource.verify({
-        datasource: await databaseTestProviders.postgres.getDsConfig(),
+        datasource: await databaseTestProviders.postgres.datasource(),
       })
       expect(response.status).toBe(200)
       expect(response.body.connected).toBe(true)
     })
 
     it("should state an invalid datasource cannot connect", async () => {
-      const dbConfig = await databaseTestProviders.postgres.getDsConfig()
+      const dbConfig = await databaseTestProviders.postgres.datasource()
       const response = await config.api.datasource.verify({
         datasource: {
           ...dbConfig,
@@ -1082,7 +1082,7 @@ describe("postgres integrations", () => {
 
     beforeEach(async () => {
       client = new Client(
-        (await databaseTestProviders.postgres.getDsConfig()).config!
+        (await databaseTestProviders.postgres.datasource()).config!
       )
       await client.connect()
     })
@@ -1125,7 +1125,7 @@ describe("postgres integrations", () => {
       schema2 = "test-2"
 
     beforeAll(async () => {
-      const dsConfig = await databaseTestProviders.postgres.getDsConfig()
+      const dsConfig = await databaseTestProviders.postgres.datasource()
       const dbConfig = dsConfig.config!
 
       client = new Client(dbConfig)
diff --git a/packages/server/src/integrations/mongodb.ts b/packages/server/src/integrations/mongodb.ts
index bc23ac7dbc..d50b8f4320 100644
--- a/packages/server/src/integrations/mongodb.ts
+++ b/packages/server/src/integrations/mongodb.ts
@@ -21,7 +21,6 @@ import environment from "../environment"
 interface MongoDBConfig {
   connectionString: string
   db: string
-  tlsCertificateFile: string
   tlsCertificateKeyFile: string
   tlsCAFile: string
 }
@@ -320,16 +319,11 @@ const getSchema = () => {
   if (environment.SELF_HOSTED) {
     schema.datasource = {
       ...schema.datasource,
-      //@ts-ignore
+      // @ts-ignore
       tls: {
         type: DatasourceFieldType.FIELD_GROUP,
         display: "Configure SSL",
         fields: {
-          tlsCertificateFile: {
-            type: DatasourceFieldType.STRING,
-            required: false,
-            display: "Certificate file path",
-          },
           tlsCertificateKeyFile: {
             type: DatasourceFieldType.STRING,
             required: false,
@@ -356,7 +350,6 @@ class MongoIntegration implements IntegrationBase {
   constructor(config: MongoDBConfig) {
     this.config = config
     const options: MongoClientOptions = {
-      tlsCertificateFile: config.tlsCertificateFile || undefined,
       tlsCertificateKeyFile: config.tlsCertificateKeyFile || undefined,
       tlsCAFile: config.tlsCAFile || undefined,
     }
@@ -525,7 +518,10 @@ class MongoIntegration implements IntegrationBase {
           return await collection.findOneAndUpdate(
             findAndUpdateJson.filter,
             findAndUpdateJson.update,
-            findAndUpdateJson.options
+            {
+              ...findAndUpdateJson.options,
+              includeResultMetadata: true,
+            }
           )
         }
         case "count": {
diff --git a/packages/server/src/integrations/postgres.ts b/packages/server/src/integrations/postgres.ts
index 78955c06dc..9949dee6bb 100644
--- a/packages/server/src/integrations/postgres.ts
+++ b/packages/server/src/integrations/postgres.ts
@@ -29,6 +29,7 @@ import { Client, ClientConfig, types } from "pg"
 import { getReadableErrorMessage } from "./base/errorMapping"
 import { exec } from "child_process"
 import { storeTempFile } from "../utilities/fileSystem"
+import { env } from "@budibase/backend-core"
 
 // Return "date" and "timestamp" types as plain strings.
 // This lets us reference the original stored timezone.
@@ -202,8 +203,13 @@ class PostgresIntegration extends Sql implements DatasourcePlus {
       await this.openConnection()
       response.connected = true
     } catch (e: any) {
-      console.log(e)
-      response.error = e.message as string
+      if (typeof e.message === "string" && e.message !== "") {
+        response.error = e.message as string
+      } else if (typeof e.code === "string" && e.code !== "") {
+        response.error = e.code
+      } else {
+        response.error = "Unknown error"
+      }
     } finally {
       await this.closeConnection()
     }
@@ -428,6 +434,14 @@ class PostgresIntegration extends Sql implements DatasourcePlus {
   }
 
   async getExternalSchema() {
+    if (!env.SELF_HOSTED) {
+      // This is because it relies on shelling out to pg_dump and we don't want
+      // to enable shell injection attacks.
+      throw new Error(
+        "schema export for Postgres is not supported in Budibase Cloud"
+      )
+    }
+
     const dumpCommandParts = [
       `user=${this.config.user}`,
       `host=${this.config.host}`,
diff --git a/packages/server/src/integrations/tests/mongo.spec.ts b/packages/server/src/integrations/tests/mongo.spec.ts
index 51ec839db2..93e54c7bc7 100644
--- a/packages/server/src/integrations/tests/mongo.spec.ts
+++ b/packages/server/src/integrations/tests/mongo.spec.ts
@@ -221,6 +221,7 @@ describe("MongoDB Integration", () => {
     })
     expect(args[2]).toEqual({
       upsert: false,
+      includeResultMetadata: true,
     })
   })
 
diff --git a/packages/server/src/integrations/tests/utils/index.ts b/packages/server/src/integrations/tests/utils/index.ts
index a28141db08..77fb5d7128 100644
--- a/packages/server/src/integrations/tests/utils/index.ts
+++ b/packages/server/src/integrations/tests/utils/index.ts
@@ -1,14 +1,16 @@
 jest.unmock("pg")
 
 import { Datasource } from "@budibase/types"
-import * as pg from "./postgres"
+import * as postgres from "./postgres"
+import * as mongodb from "./mongodb"
+import { StartedTestContainer } from "testcontainers"
 
 jest.setTimeout(30000)
 
-export interface DatabasePlusTestProvider {
-  getDsConfig(): Promise<Datasource>
+export interface DatabaseProvider {
+  start(): Promise<StartedTestContainer>
+  stop(): Promise<void>
+  datasource(): Promise<Datasource>
 }
 
-export const databaseTestProviders = {
-  postgres: pg,
-}
+export const databaseTestProviders = { postgres, mongodb }
diff --git a/packages/server/src/integrations/tests/utils/mongodb.ts b/packages/server/src/integrations/tests/utils/mongodb.ts
new file mode 100644
index 0000000000..ebd76e4baf
--- /dev/null
+++ b/packages/server/src/integrations/tests/utils/mongodb.ts
@@ -0,0 +1,41 @@
+import { Datasource, SourceName } from "@budibase/types"
+import { GenericContainer, Wait, StartedTestContainer } from "testcontainers"
+
+let container: StartedTestContainer | undefined
+
+export async function start(): Promise<StartedTestContainer> {
+  return await new GenericContainer("mongo:7.0-jammy")
+    .withExposedPorts(27017)
+    .withEnvironment({
+      MONGO_INITDB_ROOT_USERNAME: "mongo",
+      MONGO_INITDB_ROOT_PASSWORD: "password",
+    })
+    .withWaitStrategy(
+      Wait.forSuccessfulCommand(`mongosh --eval "db.version()"`)
+    )
+    .start()
+}
+
+export async function datasource(): Promise<Datasource> {
+  if (!container) {
+    container = await start()
+  }
+  const host = container.getHost()
+  const port = container.getMappedPort(27017)
+  return {
+    type: "datasource",
+    source: SourceName.MONGODB,
+    plus: false,
+    config: {
+      connectionString: `mongodb://mongo:password@${host}:${port}`,
+      db: "mongo",
+    },
+  }
+}
+
+export async function stop() {
+  if (container) {
+    await container.stop()
+    container = undefined
+  }
+}
diff --git a/packages/server/src/integrations/tests/utils/postgres.ts b/packages/server/src/integrations/tests/utils/postgres.ts
index 8e66ef02d6..82a62e3916 100644
--- a/packages/server/src/integrations/tests/utils/postgres.ts
+++ b/packages/server/src/integrations/tests/utils/postgres.ts
@@ -3,45 +3,44 @@ import { GenericContainer, Wait, StartedTestContainer } from "testcontainers"
 
 let container: StartedTestContainer | undefined
 
-export async function getDsConfig(): Promise<Datasource> {
-  try {
-    if (!container) {
-      container = await new GenericContainer("postgres:16.1-bullseye")
-        .withExposedPorts(5432)
-        .withEnvironment({ POSTGRES_PASSWORD: "password" })
-        .withWaitStrategy(
-          Wait.forLogMessage(
-            "database system is ready to accept connections",
-            2
-          )
-        )
-        .start()
-    }
-    const host = container.getHost()
-    const port = container.getMappedPort(5432)
+export async function start(): Promise<StartedTestContainer> {
+  return await new GenericContainer("postgres:16.1-bullseye")
+    .withExposedPorts(5432)
+    .withEnvironment({ POSTGRES_PASSWORD: "password" })
+    .withWaitStrategy(
+      Wait.forSuccessfulCommand(
+        "pg_isready -h localhost -p 5432"
+      ).withStartupTimeout(10000)
+    )
+    .start()
+}
 
-    return {
-      type: "datasource_plus",
-      source: SourceName.POSTGRES,
-      plus: true,
-      config: {
-        host,
-        port,
-        database: "postgres",
-        user: "postgres",
-        password: "password",
-        schema: "public",
-        ssl: false,
-        rejectUnauthorized: false,
-        ca: false,
-      },
-    }
-  } catch (err) {
-    throw new Error("**UNABLE TO CREATE TO POSTGRES CONTAINER**")
+export async function datasource(): Promise<Datasource> {
+  if (!container) {
+    container = await start()
+  }
+  const host = container.getHost()
+  const port = container.getMappedPort(5432)
+
+  return {
+    type: "datasource_plus",
+    source: SourceName.POSTGRES,
+    plus: true,
+    config: {
+      host,
+      port,
+      database: "postgres",
+      user: "postgres",
+      password: "password",
+      schema: "public",
+      ssl: false,
+      rejectUnauthorized: false,
+      ca: false,
+    },
   }
 }
 
-export async function stopContainer() {
+export async function stop() {
   if (container) {
     await container.stop()
     container = undefined
diff --git a/packages/server/src/jsRunner/bundles/README.md b/packages/server/src/jsRunner/bundles/README.md
new file mode 100644
index 0000000000..fac8ebe14a
--- /dev/null
+++ b/packages/server/src/jsRunner/bundles/README.md
@@ -0,0 +1,15 @@
+# Bundles for isolated-vm
+
+[Isolated-vm](https://github.com/laverdet/isolated-vm) requires for us to have some libraries, such as string-templates helpers, built in a single file without external dependencies. These libraries are pretty much static. To avoid building this in every dev command, in every test command and in every pipeline, these libraries are already compiled and commited into the repo.
+
+## How are they consumed?
+
+These libaries are compiled with a special extension: .ivm.bundle.js. This extension is configured in [esbuild](/scripts/build.js) in order to not be bundled as javascript, and to be treated as a `string` instead. This will allow us to read it's context on runtime and inject it to `isolated-vm`.
+
+## How to update it?
+
+These libraries are pretty much static, but they might require some updates from time to time when something changes on the source code. In order to do this, we just need to run the following command and commit the updated bundles:
+
+```
+yarn build:isolated-vm-libs
+```
diff --git a/packages/server/src/jsRunner/bundles/bson.ivm.bundle.js b/packages/server/src/jsRunner/bundles/bson.ivm.bundle.js
new file mode 100644
index 0000000000..b23efa87d1
--- /dev/null
+++ b/packages/server/src/jsRunner/bundles/bson.ivm.bundle.js
@@ -0,0 +1,7 @@
+function kt(e){return["[object ArrayBuffer]","[object SharedArrayBuffer]"].includes(Object.prototype.toString.call(e))}function Lt(e){return Object.prototype.toString.call(e)==="[object Uint8Array]"}function qt(e){return Object.prototype.toString.call(e)==="[object RegExp]"}function Rt(e){return Object.prototype.toString.call(e)==="[object Map]"}function Zt(e){return Object.prototype.toString.call(e)==="[object Date]"}function j(e,t){return JSON.stringify(e,(n,s)=>typeof s=="bigint"?{$numberLong:`${s}`}:Rt(s)?Object.fromEntries(s):s)}function Kt(e){if(e!=null&&typeof e=="object"&&"stylize"in e&&typeof e.stylize=="function")return e.stylize}var mt=6,Dt=2147483647,jt=-2147483648,zt=Math.pow(2,63)-1,Ft=-Math.pow(2,63),Gt=Math.pow(2,53),Xt=-Math.pow(2,53),wt=1,Qt=2,vt=3,te=4,ee=5,ne=6,se=7,re=8,ie=9,oe=10,pt=11,fe=12,le=13,ce=14,he=15,St=16,ae=17,ge=18,ue=19,ye=255,me=127;var ct=4,cn=Object.freeze({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}),o=class extends Error{get bsonError(){return!0}get name(){return"BSONError"}constructor(t,n){super(t,n)}static isBSONError(t){return t!=null&&typeof t=="object"&&"bsonError"in t&&t.bsonError===!0&&"name"in t&&"message"in t&&"stack"in t}},yt=class extends o{get name(){return"BSONVersionError"}constructor(){super(`Unsupported BSON version, bson types must be from bson ${mt}.x.x`)}},ht=class extends o{get name(){return"BSONRuntimeError"}constructor(t){super(t)}},we=128,pe=192,Se=224,Ne=240,Be=248,Oe=192,be=224,Ee=240,Te=128;function Mt(e,t,n){let s=0;for(let r=t;r<n;r+=1){let i=e[r];if(s){if((i&pe)!==Te)return!1;s-=1}else if(i&we)if((i&Se)===Oe)s=1;else if((i&Ne)===be)s=2;else if((i&Be)===Ee)s=3;else return!1}return!s}function xt(e,t,n){if(e.length===0)return"";let s=n-t;if(s===0)return"";if(s>20)return null;if(s===1&&e[t]<128)return String.fromCharCode(e[t]);if(s===2&&e[t]<128&&e[t+1]<128)return String.fromCharCode(e[t])+String.fromCharCode(e[t+1]);if(s===3&&e[t]<128&&e[t+1]<128&&e[t+2]<128)return String.fromCharCode(e[t])+String.fromCharCode(e[t+1])+String.fromCharCode(e[t+2]);let r=[];for(let i=t;i<n;i++){let u=e[i];if(u>127)return null;r.push(u)}return String.fromCharCode(...r)}function Ie(e){return C.fromNumberArray(Array.from({length:e},()=>Math.floor(Math.random()*256)))}var de=await(async()=>{try{return(await import("crypto")).randomBytes}catch{return Ie}})(),C={toLocalBufferType(e){if(Buffer.isBuffer(e))return e;if(ArrayBuffer.isView(e))return Buffer.from(e.buffer,e.byteOffset,e.byteLength);let t=e?.[Symbol.toStringTag]??Object.prototype.toString.call(e);if(t==="ArrayBuffer"||t==="SharedArrayBuffer"||t==="[object ArrayBuffer]"||t==="[object SharedArrayBuffer]")return Buffer.from(e);throw new o(`Cannot create Buffer from ${String(e)}`)},allocate(e){return Buffer.alloc(e)},equals(e,t){return C.toLocalBufferType(e).equals(t)},fromNumberArray(e){return Buffer.from(e)},fromBase64(e){return Buffer.from(e,"base64")},toBase64(e){return C.toLocalBufferType(e).toString("base64")},fromISO88591(e){return Buffer.from(e,"binary")},toISO88591(e){return C.toLocalBufferType(e).toString("binary")},fromHex(e){return Buffer.from(e,"hex")},toHex(e){return C.toLocalBufferType(e).toString("hex")},fromUTF8(e){return Buffer.from(e,"utf8")},toUTF8(e,t,n,s){let r=n-t<=20?xt(e,t,n):null;if(r!=null)return r;let i=C.toLocalBufferType(e).toString("utf8",t,n);if(s){for(let u=0;u<i.length;u++)if(i.charCodeAt(u)===65533){if(!Mt(e,t,n))throw new o("Invalid UTF-8 string in BSON document");break}}return i},utf8ByteLength(e){return Buffer.byteLength(e,"utf8")},encodeUTF8Into(e,t,n){return C.toLocalBufferType(e).write(t,n,void 0,"utf8")},randomBytes:de};function $e(){let{navigator:e}=globalThis;return typeof e=="object"&&e.product==="ReactNative"}function Ae(e){if(e<0)throw new RangeError(`The argument 'byteLength' is invalid. Received ${e}`);return X.fromNumberArray(Array.from({length:e},()=>Math.floor(Math.random()*256)))}var _e=(()=>{let{crypto:e}=globalThis;if(e!=null&&typeof e.getRandomValues=="function")return t=>e.getRandomValues(X.allocate(t));if($e()){let{console:t}=globalThis;t?.warn?.("BSON: For React Native please polyfill crypto.getRandomValues, e.g. using: https://www.npmjs.com/package/react-native-get-random-values.")}return Ae})(),Nt=/(\d|[a-f])/i,X={toLocalBufferType(e){let t=e?.[Symbol.toStringTag]??Object.prototype.toString.call(e);if(t==="Uint8Array")return e;if(ArrayBuffer.isView(e))return new Uint8Array(e.buffer.slice(e.byteOffset,e.byteOffset+e.byteLength));if(t==="ArrayBuffer"||t==="SharedArrayBuffer"||t==="[object ArrayBuffer]"||t==="[object SharedArrayBuffer]")return new Uint8Array(e);throw new o(`Cannot make a Uint8Array from ${String(e)}`)},allocate(e){if(typeof e!="number")throw new TypeError(`The "size" argument must be of type number. Received ${String(e)}`);return new Uint8Array(e)},equals(e,t){if(e.byteLength!==t.byteLength)return!1;for(let n=0;n<e.byteLength;n++)if(e[n]!==t[n])return!1;return!0},fromNumberArray(e){return Uint8Array.from(e)},fromBase64(e){return Uint8Array.from(atob(e),t=>t.charCodeAt(0))},toBase64(e){return btoa(X.toISO88591(e))},fromISO88591(e){return Uint8Array.from(e,t=>t.charCodeAt(0)&255)},toISO88591(e){return Array.from(Uint16Array.from(e),t=>String.fromCharCode(t)).join("")},fromHex(e){let t=e.length%2===0?e:e.slice(0,e.length-1),n=[];for(let s=0;s<t.length;s+=2){let r=t[s],i=t[s+1];if(!Nt.test(r)||!Nt.test(i))break;let u=Number.parseInt(`${r}${i}`,16);n.push(u)}return Uint8Array.from(n)},toHex(e){return Array.from(e,t=>t.toString(16).padStart(2,"0")).join("")},fromUTF8(e){return new TextEncoder().encode(e)},toUTF8(e,t,n,s){let r=n-t<=20?xt(e,t,n):null;if(r!=null)return r;if(s)try{return new TextDecoder("utf8",{fatal:s}).decode(e.slice(t,n))}catch(i){throw new o("Invalid UTF-8 string in BSON document",{cause:i})}return new TextDecoder("utf8",{fatal:s}).decode(e.slice(t,n))},utf8ByteLength(e){return X.fromUTF8(e).byteLength},encodeUTF8Into(e,t,n){let s=X.fromUTF8(t);return e.set(s,n),s.byteLength},randomBytes:_e},Ue=typeof Buffer=="function"&&Buffer.prototype?._isBuffer!==!0,h=Ue?C:X,Q=class extends DataView{static fromUint8Array(t){return new DataView(t.buffer,t.byteOffset,t.byteLength)}},D=class{get[Symbol.for("@@mdb.bson.version")](){return mt}[Symbol.for("nodejs.util.inspect.custom")](t,n,s){return this.inspect(t,n,s)}},_=class e extends D{get _bsontype(){return"Binary"}constructor(t,n){if(super(),t!=null&&typeof t=="string"&&!ArrayBuffer.isView(t)&&!kt(t)&&!Array.isArray(t))throw new o("Binary can only be constructed from Uint8Array or number[]");this.sub_type=n??e.BSON_BINARY_SUBTYPE_DEFAULT,t==null?(this.buffer=h.allocate(e.BUFFER_SIZE),this.position=0):(this.buffer=Array.isArray(t)?h.fromNumberArray(t):h.toLocalBufferType(t),this.position=this.buffer.byteLength)}put(t){if(typeof t=="string"&&t.length!==1)throw new o("only accepts single character String");if(typeof t!="number"&&t.length!==1)throw new o("only accepts single character Uint8Array or Array");let n;if(typeof t=="string"?n=t.charCodeAt(0):typeof t=="number"?n=t:n=t[0],n<0||n>255)throw new o("only accepts number in a valid unsigned byte range 0-255");if(this.buffer.byteLength>this.position)this.buffer[this.position++]=n;else{let s=h.allocate(e.BUFFER_SIZE+this.buffer.length);s.set(this.buffer,0),this.buffer=s,this.buffer[this.position++]=n}}write(t,n){if(n=typeof n=="number"?n:this.position,this.buffer.byteLength<n+t.length){let s=h.allocate(this.buffer.byteLength+t.length);s.set(this.buffer,0),this.buffer=s}if(ArrayBuffer.isView(t))this.buffer.set(h.toLocalBufferType(t),n),this.position=n+t.byteLength>this.position?n+t.length:this.position;else if(typeof t=="string")throw new o("input cannot be string")}read(t,n){return n=n&&n>0?n:this.position,this.buffer.slice(t,t+n)}value(){return this.buffer.length===this.position?this.buffer:this.buffer.subarray(0,this.position)}length(){return this.position}toJSON(){return h.toBase64(this.buffer)}toString(t){return t==="hex"?h.toHex(this.buffer):t==="base64"?h.toBase64(this.buffer):t==="utf8"||t==="utf-8"?h.toUTF8(this.buffer,0,this.buffer.byteLength,!1):h.toUTF8(this.buffer,0,this.buffer.byteLength,!1)}toExtendedJSON(t){t=t||{};let n=h.toBase64(this.buffer),s=Number(this.sub_type).toString(16);return t.legacy?{$binary:n,$type:s.length===1?"0"+s:s}:{$binary:{base64:n,subType:s.length===1?"0"+s:s}}}toUUID(){if(this.sub_type===e.SUBTYPE_UUID)return new W(this.buffer.slice(0,this.position));throw new o(`Binary sub_type "${this.sub_type}" is not supported for converting to UUID. Only "${e.SUBTYPE_UUID}" is currently supported.`)}static createFromHexString(t,n){return new e(h.fromHex(t),n)}static createFromBase64(t,n){return new e(h.fromBase64(t),n)}static fromExtendedJSON(t,n){n=n||{};let s,r;if("$binary"in t?n.legacy&&typeof t.$binary=="string"&&"$type"in t?(r=t.$type?parseInt(t.$type,16):0,s=h.fromBase64(t.$binary)):typeof t.$binary!="string"&&(r=t.$binary.subType?parseInt(t.$binary.subType,16):0,s=h.fromBase64(t.$binary.base64)):"$uuid"in t&&(r=4,s=W.bytesFromString(t.$uuid)),!s)throw new o(`Unexpected Binary Extended JSON format ${JSON.stringify(t)}`);return r===ct?new W(s):new e(s,r)}inspect(t,n,s){s??=j;let r=h.toBase64(this.buffer.subarray(0,this.position)),i=s(r,n),u=s(this.sub_type,n);return`Binary.createFromBase64(${i}, ${u})`}};_.BSON_BINARY_SUBTYPE_DEFAULT=0;_.BUFFER_SIZE=256;_.SUBTYPE_DEFAULT=0;_.SUBTYPE_FUNCTION=1;_.SUBTYPE_BYTE_ARRAY=2;_.SUBTYPE_UUID_OLD=3;_.SUBTYPE_UUID=4;_.SUBTYPE_MD5=5;_.SUBTYPE_ENCRYPTED=6;_.SUBTYPE_COLUMN=7;_.SUBTYPE_USER_DEFINED=128;var gt=16,Le=/^[0-9A-F]{32}$/i,Re=/^[0-9A-F]{8}-[0-9A-F]{4}-[0-9A-F]{4}-[0-9A-F]{4}-[0-9A-F]{12}$/i,W=class e extends _{constructor(t){let n;if(t==null)n=e.generate();else if(t instanceof e)n=h.toLocalBufferType(new Uint8Array(t.buffer));else if(ArrayBuffer.isView(t)&&t.byteLength===gt)n=h.toLocalBufferType(t);else if(typeof t=="string")n=e.bytesFromString(t);else throw new o("Argument passed in UUID constructor must be a UUID, a 16 byte Buffer or a 32/36 character hex string (dashes excluded/included, format: xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx).");super(n,ct)}get id(){return this.buffer}set id(t){this.buffer=t}toHexString(t=!0){return t?[h.toHex(this.buffer.subarray(0,4)),h.toHex(this.buffer.subarray(4,6)),h.toHex(this.buffer.subarray(6,8)),h.toHex(this.buffer.subarray(8,10)),h.toHex(this.buffer.subarray(10,16))].join("-"):h.toHex(this.buffer)}toString(t){return t==="hex"?h.toHex(this.id):t==="base64"?h.toBase64(this.id):this.toHexString()}toJSON(){return this.toHexString()}equals(t){if(!t)return!1;if(t instanceof e)return h.equals(t.id,this.id);try{return h.equals(new e(t).id,this.id)}catch{return!1}}toBinary(){return new _(this.id,_.SUBTYPE_UUID)}static generate(){let t=h.randomBytes(gt);return t[6]=t[6]&15|64,t[8]=t[8]&63|128,t}static isValid(t){return t?typeof t=="string"?e.isValidUUIDString(t):Lt(t)?t.byteLength===gt:t._bsontype==="Binary"&&t.sub_type===this.SUBTYPE_UUID&&t.buffer.byteLength===16:!1}static createFromHexString(t){let n=e.bytesFromString(t);return new e(n)}static createFromBase64(t){return new e(h.fromBase64(t))}static bytesFromString(t){if(!e.isValidUUIDString(t))throw new o("UUID string representation must be 32 hex digits or canonical hyphenated representation");return h.fromHex(t.replace(/-/g,""))}static isValidUUIDString(t){return Le.test(t)||Re.test(t)}inspect(t,n,s){return s??=j,`new UUID(${s(this.toHexString(),n)})`}},Y=class e extends D{get _bsontype(){return"Code"}constructor(t,n){super(),this.code=t.toString(),this.scope=n??null}toJSON(){return this.scope!=null?{code:this.code,scope:this.scope}:{code:this.code}}toExtendedJSON(){return this.scope?{$code:this.code,$scope:this.scope}:{$code:this.code}}static fromExtendedJSON(t){return new e(t.$code,t.$scope)}inspect(t,n,s){s??=j;let r=s(this.code,n),i=r.includes(`
+`);this.scope!=null&&(r+=`,${i?`
+`:" "}${s(this.scope,n)}`);let u=i&&this.scope===null;return`new Code(${i?`
+`:""}${r}${u?`
+`:""})`}};function Ht(e){return e!=null&&typeof e=="object"&&"$id"in e&&e.$id!=null&&"$ref"in e&&typeof e.$ref=="string"&&(!("$db"in e)||"$db"in e&&typeof e.$db=="string")}var P=class e extends D{get _bsontype(){return"DBRef"}constructor(t,n,s,r){super();let i=t.split(".");i.length===2&&(s=i.shift(),t=i.shift()),this.collection=t,this.oid=n,this.db=s,this.fields=r||{}}get namespace(){return this.collection}set namespace(t){this.collection=t}toJSON(){let t=Object.assign({$ref:this.collection,$id:this.oid},this.fields);return this.db!=null&&(t.$db=this.db),t}toExtendedJSON(t){t=t||{};let n={$ref:this.collection,$id:this.oid};return t.legacy||(this.db&&(n.$db=this.db),n=Object.assign(n,this.fields)),n}static fromExtendedJSON(t){let n=Object.assign({},t);return delete n.$ref,delete n.$id,delete n.$db,new e(t.$ref,t.$id,t.$db,n)}inspect(t,n,s){s??=j;let r=[s(this.namespace,n),s(this.oid,n),...this.db?[s(this.db,n)]:[],...Object.keys(this.fields).length>0?[s(this.fields,n)]:[]];return r[1]=s===j?`new ObjectId(${r[1]})`:r[1],`new DBRef(${r.join(", ")})`}},z;try{z=new WebAssembly.Instance(new WebAssembly.Module(new Uint8Array([0,97,115,109,1,0,0,0,1,13,2,96,0,1,127,96,4,127,127,127,127,1,127,3,7,6,0,1,1,1,1,1,6,6,1,127,1,65,0,11,7,50,6,3,109,117,108,0,1,5,100,105,118,95,115,0,2,5,100,105,118,95,117,0,3,5,114,101,109,95,115,0,4,5,114,101,109,95,117,0,5,8,103,101,116,95,104,105,103,104,0,0,10,191,1,6,4,0,35,0,11,36,1,1,126,32,0,173,32,1,173,66,32,134,132,32,2,173,32,3,173,66,32,134,132,126,34,4,66,32,135,167,36,0,32,4,167,11,36,1,1,126,32,0,173,32,1,173,66,32,134,132,32,2,173,32,3,173,66,32,134,132,127,34,4,66,32,135,167,36,0,32,4,167,11,36,1,1,126,32,0,173,32,1,173,66,32,134,132,32,2,173,32,3,173,66,32,134,132,128,34,4,66,32,135,167,36,0,32,4,167,11,36,1,1,126,32,0,173,32,1,173,66,32,134,132,32,2,173,32,3,173,66,32,134,132,129,34,4,66,32,135,167,36,0,32,4,167,11,36,1,1,126,32,0,173,32,1,173,66,32,134,132,32,2,173,32,3,173,66,32,134,132,130,34,4,66,32,135,167,36,0,32,4,167,11])),{}).exports}catch{}var Bt=65536,De=1<<24,G=Bt*Bt,Jt=G*G,Ot=Jt/2,bt={},Et={},je=20,ze=/^(\+?0|(\+|-)?[1-9][0-9]*)$/,f=class e extends D{get _bsontype(){return"Long"}get __isLong__(){return!0}constructor(t=0,n,s){super(),typeof t=="bigint"?Object.assign(this,e.fromBigInt(t,!!n)):typeof t=="string"?Object.assign(this,e.fromString(t,!!n)):(this.low=t|0,this.high=n|0,this.unsigned=!!s)}static fromBits(t,n,s){return new e(t,n,s)}static fromInt(t,n){let s,r,i;return n?(t>>>=0,(i=0<=t&&t<256)&&(r=Et[t],r)?r:(s=e.fromBits(t,(t|0)<0?-1:0,!0),i&&(Et[t]=s),s)):(t|=0,(i=-128<=t&&t<128)&&(r=bt[t],r)?r:(s=e.fromBits(t,t<0?-1:0,!1),i&&(bt[t]=s),s))}static fromNumber(t,n){if(isNaN(t))return n?e.UZERO:e.ZERO;if(n){if(t<0)return e.UZERO;if(t>=Jt)return e.MAX_UNSIGNED_VALUE}else{if(t<=-Ot)return e.MIN_VALUE;if(t+1>=Ot)return e.MAX_VALUE}return t<0?e.fromNumber(-t,n).neg():e.fromBits(t%G|0,t/G|0,n)}static fromBigInt(t,n){return e.fromString(t.toString(),n)}static fromString(t,n,s){if(t.length===0)throw new o("empty string");if(t==="NaN"||t==="Infinity"||t==="+Infinity"||t==="-Infinity")return e.ZERO;if(typeof n=="number"?(s=n,n=!1):n=!!n,s=s||10,s<2||36<s)throw new o("radix");let r;if((r=t.indexOf("-"))>0)throw new o("interior hyphen");if(r===0)return e.fromString(t.substring(1),n,s).neg();let i=e.fromNumber(Math.pow(s,8)),u=e.ZERO;for(let a=0;a<t.length;a+=8){let I=Math.min(8,t.length-a),S=parseInt(t.substring(a,a+I),s);if(I<8){let w=e.fromNumber(Math.pow(s,I));u=u.mul(w).add(e.fromNumber(S))}else u=u.mul(i),u=u.add(e.fromNumber(S))}return u.unsigned=n,u}static fromBytes(t,n,s){return s?e.fromBytesLE(t,n):e.fromBytesBE(t,n)}static fromBytesLE(t,n){return new e(t[0]|t[1]<<8|t[2]<<16|t[3]<<24,t[4]|t[5]<<8|t[6]<<16|t[7]<<24,n)}static fromBytesBE(t,n){return new e(t[4]<<24|t[5]<<16|t[6]<<8|t[7],t[0]<<24|t[1]<<16|t[2]<<8|t[3],n)}static isLong(t){return t!=null&&typeof t=="object"&&"__isLong__"in t&&t.__isLong__===!0}static fromValue(t,n){return typeof t=="number"?e.fromNumber(t,n):typeof t=="string"?e.fromString(t,n):e.fromBits(t.low,t.high,typeof n=="boolean"?n:t.unsigned)}add(t){e.isLong(t)||(t=e.fromValue(t));let n=this.high>>>16,s=this.high&65535,r=this.low>>>16,i=this.low&65535,u=t.high>>>16,a=t.high&65535,I=t.low>>>16,S=t.low&65535,w=0,m=0,O=0,d=0;return d+=i+S,O+=d>>>16,d&=65535,O+=r+I,m+=O>>>16,O&=65535,m+=s+a,w+=m>>>16,m&=65535,w+=n+u,w&=65535,e.fromBits(O<<16|d,w<<16|m,this.unsigned)}and(t){return e.isLong(t)||(t=e.fromValue(t)),e.fromBits(this.low&t.low,this.high&t.high,this.unsigned)}compare(t){if(e.isLong(t)||(t=e.fromValue(t)),this.eq(t))return 0;let n=this.isNegative(),s=t.isNegative();return n&&!s?-1:!n&&s?1:this.unsigned?t.high>>>0>this.high>>>0||t.high===this.high&&t.low>>>0>this.low>>>0?-1:1:this.sub(t).isNegative()?-1:1}comp(t){return this.compare(t)}divide(t){if(e.isLong(t)||(t=e.fromValue(t)),t.isZero())throw new o("division by zero");if(z){if(!this.unsigned&&this.high===-2147483648&&t.low===-1&&t.high===-1)return this;let i=(this.unsigned?z.div_u:z.div_s)(this.low,this.high,t.low,t.high);return e.fromBits(i,z.get_high(),this.unsigned)}if(this.isZero())return this.unsigned?e.UZERO:e.ZERO;let n,s,r;if(this.unsigned){if(t.unsigned||(t=t.toUnsigned()),t.gt(this))return e.UZERO;if(t.gt(this.shru(1)))return e.UONE;r=e.UZERO}else{if(this.eq(e.MIN_VALUE))return t.eq(e.ONE)||t.eq(e.NEG_ONE)?e.MIN_VALUE:t.eq(e.MIN_VALUE)?e.ONE:(n=this.shr(1).div(t).shl(1),n.eq(e.ZERO)?t.isNegative()?e.ONE:e.NEG_ONE:(s=this.sub(t.mul(n)),r=n.add(s.div(t)),r));if(t.eq(e.MIN_VALUE))return this.unsigned?e.UZERO:e.ZERO;if(this.isNegative())return t.isNegative()?this.neg().div(t.neg()):this.neg().div(t).neg();if(t.isNegative())return this.div(t.neg()).neg();r=e.ZERO}for(s=this;s.gte(t);){n=Math.max(1,Math.floor(s.toNumber()/t.toNumber()));let i=Math.ceil(Math.log(n)/Math.LN2),u=i<=48?1:Math.pow(2,i-48),a=e.fromNumber(n),I=a.mul(t);for(;I.isNegative()||I.gt(s);)n-=u,a=e.fromNumber(n,this.unsigned),I=a.mul(t);a.isZero()&&(a=e.ONE),r=r.add(a),s=s.sub(I)}return r}div(t){return this.divide(t)}equals(t){return e.isLong(t)||(t=e.fromValue(t)),this.unsigned!==t.unsigned&&this.high>>>31===1&&t.high>>>31===1?!1:this.high===t.high&&this.low===t.low}eq(t){return this.equals(t)}getHighBits(){return this.high}getHighBitsUnsigned(){return this.high>>>0}getLowBits(){return this.low}getLowBitsUnsigned(){return this.low>>>0}getNumBitsAbs(){if(this.isNegative())return this.eq(e.MIN_VALUE)?64:this.neg().getNumBitsAbs();let t=this.high!==0?this.high:this.low,n;for(n=31;n>0&&!(t&1<<n);n--);return this.high!==0?n+33:n+1}greaterThan(t){return this.comp(t)>0}gt(t){return this.greaterThan(t)}greaterThanOrEqual(t){return this.comp(t)>=0}gte(t){return this.greaterThanOrEqual(t)}ge(t){return this.greaterThanOrEqual(t)}isEven(){return(this.low&1)===0}isNegative(){return!this.unsigned&&this.high<0}isOdd(){return(this.low&1)===1}isPositive(){return this.unsigned||this.high>=0}isZero(){return this.high===0&&this.low===0}lessThan(t){return this.comp(t)<0}lt(t){return this.lessThan(t)}lessThanOrEqual(t){return this.comp(t)<=0}lte(t){return this.lessThanOrEqual(t)}modulo(t){if(e.isLong(t)||(t=e.fromValue(t)),z){let n=(this.unsigned?z.rem_u:z.rem_s)(this.low,this.high,t.low,t.high);return e.fromBits(n,z.get_high(),this.unsigned)}return this.sub(this.div(t).mul(t))}mod(t){return this.modulo(t)}rem(t){return this.modulo(t)}multiply(t){if(this.isZero())return e.ZERO;if(e.isLong(t)||(t=e.fromValue(t)),z){let x=z.mul(this.low,this.high,t.low,t.high);return e.fromBits(x,z.get_high(),this.unsigned)}if(t.isZero())return e.ZERO;if(this.eq(e.MIN_VALUE))return t.isOdd()?e.MIN_VALUE:e.ZERO;if(t.eq(e.MIN_VALUE))return this.isOdd()?e.MIN_VALUE:e.ZERO;if(this.isNegative())return t.isNegative()?this.neg().mul(t.neg()):this.neg().mul(t).neg();if(t.isNegative())return this.mul(t.neg()).neg();if(this.lt(e.TWO_PWR_24)&&t.lt(e.TWO_PWR_24))return e.fromNumber(this.toNumber()*t.toNumber(),this.unsigned);let n=this.high>>>16,s=this.high&65535,r=this.low>>>16,i=this.low&65535,u=t.high>>>16,a=t.high&65535,I=t.low>>>16,S=t.low&65535,w=0,m=0,O=0,d=0;return d+=i*S,O+=d>>>16,d&=65535,O+=r*S,m+=O>>>16,O&=65535,O+=i*I,m+=O>>>16,O&=65535,m+=s*S,w+=m>>>16,m&=65535,m+=r*I,w+=m>>>16,m&=65535,m+=i*a,w+=m>>>16,m&=65535,w+=n*S+s*I+r*a+i*u,w&=65535,e.fromBits(O<<16|d,w<<16|m,this.unsigned)}mul(t){return this.multiply(t)}negate(){return!this.unsigned&&this.eq(e.MIN_VALUE)?e.MIN_VALUE:this.not().add(e.ONE)}neg(){return this.negate()}not(){return e.fromBits(~this.low,~this.high,this.unsigned)}notEquals(t){return!this.equals(t)}neq(t){return this.notEquals(t)}ne(t){return this.notEquals(t)}or(t){return e.isLong(t)||(t=e.fromValue(t)),e.fromBits(this.low|t.low,this.high|t.high,this.unsigned)}shiftLeft(t){return e.isLong(t)&&(t=t.toInt()),(t&=63)===0?this:t<32?e.fromBits(this.low<<t,this.high<<t|this.low>>>32-t,this.unsigned):e.fromBits(0,this.low<<t-32,this.unsigned)}shl(t){return this.shiftLeft(t)}shiftRight(t){return e.isLong(t)&&(t=t.toInt()),(t&=63)===0?this:t<32?e.fromBits(this.low>>>t|this.high<<32-t,this.high>>t,this.unsigned):e.fromBits(this.high>>t-32,this.high>=0?0:-1,this.unsigned)}shr(t){return this.shiftRight(t)}shiftRightUnsigned(t){if(e.isLong(t)&&(t=t.toInt()),t&=63,t===0)return this;{let n=this.high;if(t<32){let s=this.low;return e.fromBits(s>>>t|n<<32-t,n>>>t,this.unsigned)}else return t===32?e.fromBits(n,0,this.unsigned):e.fromBits(n>>>t-32,0,this.unsigned)}}shr_u(t){return this.shiftRightUnsigned(t)}shru(t){return this.shiftRightUnsigned(t)}subtract(t){return e.isLong(t)||(t=e.fromValue(t)),this.add(t.neg())}sub(t){return this.subtract(t)}toInt(){return this.unsigned?this.low>>>0:this.low}toNumber(){return this.unsigned?(this.high>>>0)*G+(this.low>>>0):this.high*G+(this.low>>>0)}toBigInt(){return BigInt(this.toString())}toBytes(t){return t?this.toBytesLE():this.toBytesBE()}toBytesLE(){let t=this.high,n=this.low;return[n&255,n>>>8&255,n>>>16&255,n>>>24,t&255,t>>>8&255,t>>>16&255,t>>>24]}toBytesBE(){let t=this.high,n=this.low;return[t>>>24,t>>>16&255,t>>>8&255,t&255,n>>>24,n>>>16&255,n>>>8&255,n&255]}toSigned(){return this.unsigned?e.fromBits(this.low,this.high,!1):this}toString(t){if(t=t||10,t<2||36<t)throw new o("radix");if(this.isZero())return"0";if(this.isNegative())if(this.eq(e.MIN_VALUE)){let i=e.fromNumber(t),u=this.div(i),a=u.mul(i).sub(this);return u.toString(t)+a.toInt().toString(t)}else return"-"+this.neg().toString(t);let n=e.fromNumber(Math.pow(t,6),this.unsigned),s=this,r="";for(;;){let i=s.div(n),a=(s.sub(i.mul(n)).toInt()>>>0).toString(t);if(s=i,s.isZero())return a+r;for(;a.length<6;)a="0"+a;r=""+a+r}}toUnsigned(){return this.unsigned?this:e.fromBits(this.low,this.high,!0)}xor(t){return e.isLong(t)||(t=e.fromValue(t)),e.fromBits(this.low^t.low,this.high^t.high,this.unsigned)}eqz(){return this.isZero()}le(t){return this.lessThanOrEqual(t)}toExtendedJSON(t){return t&&t.relaxed?this.toNumber():{$numberLong:this.toString()}}static fromExtendedJSON(t,n){let{useBigInt64:s=!1,relaxed:r=!0}={...n};if(t.$numberLong.length>je)throw new o("$numberLong string is too long");if(!ze.test(t.$numberLong))throw new o(`$numberLong string "${t.$numberLong}" is in an invalid format`);if(s){let u=BigInt(t.$numberLong);return BigInt.asIntN(64,u)}let i=e.fromString(t.$numberLong);return r?i.toNumber():i}inspect(t,n,s){s??=j;let r=s(this.toString(),n),i=this.unsigned?`, ${s(this.unsigned,n)}`:"";return`new Long(${r}${i})`}};f.TWO_PWR_24=f.fromInt(De);f.MAX_UNSIGNED_VALUE=f.fromBits(-1,-1,!0);f.ZERO=f.fromInt(0);f.UZERO=f.fromInt(0,!0);f.ONE=f.fromInt(1);f.UONE=f.fromInt(1,!0);f.NEG_ONE=f.fromInt(-1);f.MAX_VALUE=f.fromBits(-1,2147483647,!1);f.MIN_VALUE=f.fromBits(0,-2147483648,!1);var Fe=/^(\+|-)?(\d+|(\d*\.\d*))?(E|e)?([-+])?(\d+)?$/,Me=/^(\+|-)?(Infinity|inf)$/i,xe=/^(\+|-)?NaN$/i,K=6111,nt=-6176,Tt=6176,It=34,ut=h.fromNumberArray([124,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0].reverse()),dt=h.fromNumberArray([248,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0].reverse()),$t=h.fromNumberArray([120,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0].reverse()),He=/^([-+])?(\d+)?$/,Je=31,At=16383,Ce=30,Pe=31;function _t(e){return!isNaN(parseInt(e,10))}function Ve(e){let t=f.fromNumber(1e9),n=f.fromNumber(0);if(!e.parts[0]&&!e.parts[1]&&!e.parts[2]&&!e.parts[3])return{quotient:e,rem:n};for(let s=0;s<=3;s++)n=n.shiftLeft(32),n=n.add(new f(e.parts[s],0)),e.parts[s]=n.div(t).low,n=n.modulo(t);return{quotient:e,rem:n}}function We(e,t){if(!e&&!t)return{high:f.fromNumber(0),low:f.fromNumber(0)};let n=e.shiftRightUnsigned(32),s=new f(e.getLowBits(),0),r=t.shiftRightUnsigned(32),i=new f(t.getLowBits(),0),u=n.multiply(r),a=n.multiply(i),I=s.multiply(r),S=s.multiply(i);return u=u.add(a.shiftRightUnsigned(32)),a=new f(a.getLowBits(),0).add(I).add(S.shiftRightUnsigned(32)),u=u.add(a.shiftRightUnsigned(32)),S=a.shiftLeft(32).add(new f(S.getLowBits(),0)),{high:u,low:S}}function Ye(e,t){let n=e.high>>>0,s=t.high>>>0;if(n<s)return!0;if(n===s){let r=e.low>>>0,i=t.low>>>0;if(r<i)return!0}return!1}function M(e,t){throw new o(`"${e}" is not a valid Decimal128 string - ${t}`)}var st=class e extends D{get _bsontype(){return"Decimal128"}constructor(t){if(super(),typeof t=="string")this.bytes=e.fromString(t).bytes;else if(Lt(t)){if(t.byteLength!==16)throw new o("Decimal128 must take a Buffer of 16 bytes");this.bytes=t}else throw new o("Decimal128 must take a Buffer or string")}static fromString(t){return e._fromString(t,{allowRounding:!1})}static fromStringWithRounding(t){return e._fromString(t,{allowRounding:!0})}static _fromString(t,n){let s=!1,r=!1,i=!1,u=!1,a=0,I=0,S=0,w=0,m=0,O=[0],d=0,x=0,E=0,$=0,L=new f(0,0),T=new f(0,0),F=0,g=0;if(t.length>=7e3)throw new o(""+t+" not a valid Decimal128 string");let U=t.match(Fe),ft=t.match(Me),N=t.match(xe);if(!U&&!ft&&!N||t.length===0)throw new o(""+t+" not a valid Decimal128 string");if(U){let c=U[2],l=U[4],p=U[5],B=U[6];l&&B===void 0&&M(t,"missing exponent power"),l&&c===void 0&&M(t,"missing exponent base"),l===void 0&&(p||B)&&M(t,"missing e before exponent")}if((t[g]==="+"||t[g]==="-")&&(r=!0,s=t[g++]==="-"),!_t(t[g])&&t[g]!=="."){if(t[g]==="i"||t[g]==="I")return new e(s?dt:$t);if(t[g]==="N")return new e(ut)}for(;_t(t[g])||t[g]===".";){if(t[g]==="."){i&&M(t,"contains multiple periods"),i=!0,g=g+1;continue}d<It&&(t[g]!=="0"||u)&&(u||(m=I),u=!0,O[x++]=parseInt(t[g],10),d=d+1),u&&(S=S+1),i&&(w=w+1),I=I+1,g=g+1}if(i&&!I)throw new o(""+t+" not a valid Decimal128 string");if(t[g]==="e"||t[g]==="E"){let c=t.substr(++g).match(He);if(!c||!c[2])return new e(ut);$=parseInt(c[0],10),g=g+c[0].length}if(t[g])return new e(ut);if(!d)O[0]=0,S=1,d=1,a=0;else if(E=d-1,a=S,a!==1)for(;t[m+a-1+Number(r)+Number(i)]==="0";)a=a-1;for($<=w&&w>$+16384?$=nt:$=$-w;$>K;){if(E=E+1,E>=It){if(a===0){$=K;break}M(t,"overflow")}$=$-1}if(n.allowRounding){for(;$<nt||d<S;){if(E===0&&a<d){$=nt,a=0;break}if(d<S?S=S-1:E=E-1,$<K)$=$+1;else{if(O.join("").match(/^0+$/)){$=K;break}M(t,"overflow")}}if(E+1<a){let c=I;i&&(m=m+1,c=c+1),r&&(m=m+1,c=c+1);let l=parseInt(t[m+E+1],10),p=0;if(l>=5&&(p=1,l===5)){p=O[E]%2===1?1:0;for(let B=m+E+2;B<c;B++)if(parseInt(t[B],10)){p=1;break}}if(p){let B=E;for(;B>=0&&++O[B]>9;B--)if(O[B]=0,B===0)if($<K)$=$+1,O[B]=1;else return new e(s?dt:$t)}}}else{for(;$<nt||d<S;){if(E===0){if(a===0){$=nt;break}M(t,"exponent underflow")}d<S?(t[S-1+Number(r)+Number(i)]!=="0"&&a!==0&&M(t,"inexact rounding"),S=S-1):(O[E]!==0&&M(t,"inexact rounding"),E=E-1),$<K?$=$+1:M(t,"overflow")}E+1<a&&(i&&(m=m+1),r&&(m=m+1),parseInt(t[m+E+1],10)!==0&&M(t,"inexact rounding"))}if(L=f.fromNumber(0),T=f.fromNumber(0),a===0)L=f.fromNumber(0),T=f.fromNumber(0);else if(E<17){let c=0;for(T=f.fromNumber(O[c++]),L=new f(0,0);c<=E;c++)T=T.multiply(f.fromNumber(10)),T=T.add(f.fromNumber(O[c]))}else{let c=0;for(L=f.fromNumber(O[c++]);c<=E-17;c++)L=L.multiply(f.fromNumber(10)),L=L.add(f.fromNumber(O[c]));for(T=f.fromNumber(O[c++]);c<=E;c++)T=T.multiply(f.fromNumber(10)),T=T.add(f.fromNumber(O[c]))}let y=We(L,f.fromString("100000000000000000"));y.low=y.low.add(T),Ye(y.low,T)&&(y.high=y.high.add(f.fromNumber(1))),F=$+Tt;let b={low:f.fromNumber(0),high:f.fromNumber(0)};y.high.shiftRightUnsigned(49).and(f.fromNumber(1)).equals(f.fromNumber(1))?(b.high=b.high.or(f.fromNumber(3).shiftLeft(61)),b.high=b.high.or(f.fromNumber(F).and(f.fromNumber(16383).shiftLeft(47))),b.high=b.high.or(y.high.and(f.fromNumber(0x7fffffffffff)))):(b.high=b.high.or(f.fromNumber(F&16383).shiftLeft(49)),b.high=b.high.or(y.high.and(f.fromNumber(562949953421311)))),b.low=y.low,s&&(b.high=b.high.or(f.fromString("9223372036854775808")));let A=h.allocate(16);return g=0,A[g++]=b.low.low&255,A[g++]=b.low.low>>8&255,A[g++]=b.low.low>>16&255,A[g++]=b.low.low>>24&255,A[g++]=b.low.high&255,A[g++]=b.low.high>>8&255,A[g++]=b.low.high>>16&255,A[g++]=b.low.high>>24&255,A[g++]=b.high.low&255,A[g++]=b.high.low>>8&255,A[g++]=b.high.low>>16&255,A[g++]=b.high.low>>24&255,A[g++]=b.high.high&255,A[g++]=b.high.high>>8&255,A[g++]=b.high.high>>16&255,A[g++]=b.high.high>>24&255,new e(A)}toString(){let t,n=0,s=new Array(36);for(let g=0;g<s.length;g++)s[g]=0;let r=0,i=!1,u,a={parts:[0,0,0,0]},I,S,w=[];r=0;let m=this.bytes,O=m[r++]|m[r++]<<8|m[r++]<<16|m[r++]<<24,d=m[r++]|m[r++]<<8|m[r++]<<16|m[r++]<<24,x=m[r++]|m[r++]<<8|m[r++]<<16|m[r++]<<24,E=m[r++]|m[r++]<<8|m[r++]<<16|m[r++]<<24;r=0,{low:new f(O,d),high:new f(x,E)}.high.lessThan(f.ZERO)&&w.push("-");let L=E>>26&Je;if(L>>3===3){if(L===Ce)return w.join("")+"Infinity";if(L===Pe)return"NaN";t=E>>15&At,u=8+(E>>14&1)}else u=E>>14&7,t=E>>17&At;let T=t-Tt;if(a.parts[0]=(E&16383)+((u&15)<<14),a.parts[1]=x,a.parts[2]=d,a.parts[3]=O,a.parts[0]===0&&a.parts[1]===0&&a.parts[2]===0&&a.parts[3]===0)i=!0;else for(S=3;S>=0;S--){let g=0,U=Ve(a);if(a=U.quotient,g=U.rem.low,!!g)for(I=8;I>=0;I--)s[S*9+I]=g%10,g=Math.floor(g/10)}if(i)n=1,s[r]=0;else for(n=36;!s[r];)n=n-1,r=r+1;let F=n-1+T;if(F>=34||F<=-7||T>0){if(n>34)return w.push("0"),T>0?w.push(`E+${T}`):T<0&&w.push(`E${T}`),w.join("");w.push(`${s[r++]}`),n=n-1,n&&w.push(".");for(let g=0;g<n;g++)w.push(`${s[r++]}`);w.push("E"),F>0?w.push(`+${F}`):w.push(`${F}`)}else if(T>=0)for(let g=0;g<n;g++)w.push(`${s[r++]}`);else{let g=n+T;if(g>0)for(let U=0;U<g;U++)w.push(`${s[r++]}`);else w.push("0");for(w.push(".");g++<0;)w.push("0");for(let U=0;U<n-Math.max(g-1,0);U++)w.push(`${s[r++]}`)}return w.join("")}toJSON(){return{$numberDecimal:this.toString()}}toExtendedJSON(){return{$numberDecimal:this.toString()}}static fromExtendedJSON(t){return e.fromString(t.$numberDecimal)}inspect(t,n,s){return s??=j,`new Decimal128(${s(this.toString(),n)})`}},v=class e extends D{get _bsontype(){return"Double"}constructor(t){super(),t instanceof Number&&(t=t.valueOf()),this.value=+t}valueOf(){return this.value}toJSON(){return this.value}toString(t){return this.value.toString(t)}toExtendedJSON(t){return t&&(t.legacy||t.relaxed&&isFinite(this.value))?this.value:Object.is(Math.sign(this.value),-0)?{$numberDouble:"-0.0"}:{$numberDouble:Number.isInteger(this.value)?this.value.toFixed(1):this.value.toString()}}static fromExtendedJSON(t,n){let s=parseFloat(t.$numberDouble);return n&&n.relaxed?s:new e(s)}inspect(t,n,s){return s??=j,`new Double(${s(this.value,n)})`}},tt=class e extends D{get _bsontype(){return"Int32"}constructor(t){super(),t instanceof Number&&(t=t.valueOf()),this.value=+t|0}valueOf(){return this.value}toString(t){return this.value.toString(t)}toJSON(){return this.value}toExtendedJSON(t){return t&&(t.relaxed||t.legacy)?this.value:{$numberInt:this.value.toString()}}static fromExtendedJSON(t,n){return n&&n.relaxed?parseInt(t.$numberInt,10):new e(t.$numberInt)}inspect(t,n,s){return s??=j,`new Int32(${s(this.value,n)})`}},rt=class e extends D{get _bsontype(){return"MaxKey"}toExtendedJSON(){return{$maxKey:1}}static fromExtendedJSON(){return new e}inspect(){return"new MaxKey()"}},it=class e extends D{get _bsontype(){return"MinKey"}toExtendedJSON(){return{$minKey:1}}static fromExtendedJSON(){return new e}inspect(){return"new MinKey()"}},ke=new RegExp("^[0-9a-fA-F]{24}$"),V=null,H=Symbol("id"),k=class e extends D{get _bsontype(){return"ObjectId"}constructor(t){super();let n;if(typeof t=="object"&&t&&"id"in t){if(typeof t.id!="string"&&!ArrayBuffer.isView(t.id))throw new o("Argument passed in must have an id that is of type string or Buffer");"toHexString"in t&&typeof t.toHexString=="function"?n=h.fromHex(t.toHexString()):n=t.id}else n=t;if(n==null||typeof n=="number")this[H]=e.generate(typeof n=="number"?n:void 0);else if(ArrayBuffer.isView(n)&&n.byteLength===12)this[H]=h.toLocalBufferType(n);else if(typeof n=="string")if(n.length===24&&ke.test(n))this[H]=h.fromHex(n);else throw new o("input must be a 24 character hex string, 12 byte Uint8Array, or an integer");else throw new o("Argument passed in does not match the accepted types");e.cacheHexString&&(this.__id=h.toHex(this.id))}get id(){return this[H]}set id(t){this[H]=t,e.cacheHexString&&(this.__id=h.toHex(t))}toHexString(){if(e.cacheHexString&&this.__id)return this.__id;let t=h.toHex(this.id);return e.cacheHexString&&!this.__id&&(this.__id=t),t}static getInc(){return e.index=(e.index+1)%16777215}static generate(t){typeof t!="number"&&(t=Math.floor(Date.now()/1e3));let n=e.getInc(),s=h.allocate(12);return Q.fromUint8Array(s).setUint32(0,t,!1),V===null&&(V=h.randomBytes(5)),s[4]=V[0],s[5]=V[1],s[6]=V[2],s[7]=V[3],s[8]=V[4],s[11]=n&255,s[10]=n>>8&255,s[9]=n>>16&255,s}toString(t){return t==="base64"?h.toBase64(this.id):t==="hex"?this.toHexString():this.toHexString()}toJSON(){return this.toHexString()}static is(t){return t!=null&&typeof t=="object"&&"_bsontype"in t&&t._bsontype==="ObjectId"}equals(t){if(t==null)return!1;if(e.is(t))return this[H][11]===t[H][11]&&h.equals(this[H],t[H]);if(typeof t=="string")return t.toLowerCase()===this.toHexString();if(typeof t=="object"&&typeof t.toHexString=="function"){let n=t.toHexString(),s=this.toHexString();return typeof n=="string"&&n.toLowerCase()===s}return!1}getTimestamp(){let t=new Date,n=Q.fromUint8Array(this.id).getUint32(0,!1);return t.setTime(Math.floor(n)*1e3),t}static createPk(){return new e}static createFromTime(t){let n=h.fromNumberArray([0,0,0,0,0,0,0,0,0,0,0,0]);return Q.fromUint8Array(n).setUint32(0,t,!1),new e(n)}static createFromHexString(t){if(t?.length!==24)throw new o("hex string must be 24 characters");return new e(h.fromHex(t))}static createFromBase64(t){if(t?.length!==16)throw new o("base64 string must be 16 characters");return new e(h.fromBase64(t))}static isValid(t){if(t==null)return!1;try{return new e(t),!0}catch{return!1}}toExtendedJSON(){return this.toHexString?{$oid:this.toHexString()}:{$oid:this.toString("hex")}}static fromExtendedJSON(t){return new e(t.$oid)}inspect(t,n,s){return s??=j,`new ObjectId(${s(this.toHexString(),n)})`}};k.index=Math.floor(Math.random()*16777215);function qe(e){return e.split("").sort().join("")}var q=class e extends D{get _bsontype(){return"BSONRegExp"}constructor(t,n){if(super(),this.pattern=t,this.options=qe(n??""),this.pattern.indexOf("\0")!==-1)throw new o(`BSON Regex patterns cannot contain null bytes, found: ${JSON.stringify(this.pattern)}`);if(this.options.indexOf("\0")!==-1)throw new o(`BSON Regex options cannot contain null bytes, found: ${JSON.stringify(this.options)}`);for(let s=0;s<this.options.length;s++)if(!(this.options[s]==="i"||this.options[s]==="m"||this.options[s]==="x"||this.options[s]==="l"||this.options[s]==="s"||this.options[s]==="u"))throw new o(`The regular expression option [${this.options[s]}] is not supported`)}static parseOptions(t){return t?t.split("").sort().join(""):""}toExtendedJSON(t){return t=t||{},t.legacy?{$regex:this.pattern,$options:this.options}:{$regularExpression:{pattern:this.pattern,options:this.options}}}static fromExtendedJSON(t){if("$regex"in t)if(typeof t.$regex!="string"){if(t.$regex._bsontype==="BSONRegExp")return t}else return new e(t.$regex,e.parseOptions(t.$options));if("$regularExpression"in t)return new e(t.$regularExpression.pattern,e.parseOptions(t.$regularExpression.options));throw new o(`Unexpected BSONRegExp EJSON object form: ${JSON.stringify(t)}`)}inspect(t,n,s){let r=Kt(n)??(a=>a);s??=j;let i=r(s(this.pattern),"regexp"),u=r(s(this.options),"regexp");return`new BSONRegExp(${i}, ${u})`}},ot=class e extends D{get _bsontype(){return"BSONSymbol"}constructor(t){super(),this.value=t}valueOf(){return this.value}toString(){return this.value}toJSON(){return this.value}toExtendedJSON(){return{$symbol:this.value}}static fromExtendedJSON(t){return new e(t.$symbol)}inspect(t,n,s){return s??=j,`new BSONSymbol(${s(this.value,n)})`}},Ze=f,et=class e extends Ze{get _bsontype(){return"Timestamp"}constructor(t){if(t==null)super(0,0,!0);else if(typeof t=="bigint")super(t,!0);else if(f.isLong(t))super(t.low,t.high,!0);else if(typeof t=="object"&&"t"in t&&"i"in t){if(typeof t.t!="number"&&(typeof t.t!="object"||t.t._bsontype!=="Int32"))throw new o("Timestamp constructed from { t, i } must provide t as a number");if(typeof t.i!="number"&&(typeof t.i!="object"||t.i._bsontype!=="Int32"))throw new o("Timestamp constructed from { t, i } must provide i as a number");let n=Number(t.t),s=Number(t.i);if(n<0||Number.isNaN(n))throw new o("Timestamp constructed from { t, i } must provide a positive t");if(s<0||Number.isNaN(s))throw new o("Timestamp constructed from { t, i } must provide a positive i");if(n>4294967295)throw new o("Timestamp constructed from { t, i } must provide t equal or less than uint32 max");if(s>4294967295)throw new o("Timestamp constructed from { t, i } must provide i equal or less than uint32 max");super(s,n,!0)}else throw new o("A Timestamp can only be constructed with: bigint, Long, or { t: number; i: number }")}toJSON(){return{$timestamp:this.toString()}}static fromInt(t){return new e(f.fromInt(t,!0))}static fromNumber(t){return new e(f.fromNumber(t,!0))}static fromBits(t,n){return new e({i:t,t:n})}static fromString(t,n){return new e(f.fromString(t,!0,n))}toExtendedJSON(){return{$timestamp:{t:this.high>>>0,i:this.low>>>0}}}static fromExtendedJSON(t){let n=f.isLong(t.$timestamp.i)?t.$timestamp.i.getLowBitsUnsigned():t.$timestamp.i,s=f.isLong(t.$timestamp.t)?t.$timestamp.t.getLowBitsUnsigned():t.$timestamp.t;return new e({t:s,i:n})}inspect(t,n,s){s??=j;let r=s(this.high>>>0,n),i=s(this.low>>>0,n);return`new Timestamp({ t: ${r}, i: ${i} })`}};et.MAX_VALUE=f.MAX_UNSIGNED_VALUE;var Ke=f.fromNumber(Gt),Ge=f.fromNumber(Xt);function Xe(e,t,n){t=t??{};let s=t&&t.index?t.index:0,r=e[s]|e[s+1]<<8|e[s+2]<<16|e[s+3]<<24;if(r<5)throw new o(`bson size must be >= 5, is ${r}`);if(t.allowObjectSmallerThanBufferSize&&e.length<r)throw new o(`buffer length ${e.length} must be >= bson size ${r}`);if(!t.allowObjectSmallerThanBufferSize&&e.length!==r)throw new o(`buffer length ${e.length} must === bson size ${r}`);if(r+s>e.byteLength)throw new o(`(bson size ${r} + options.index ${s} must be <= buffer length ${e.byteLength})`);if(e[s+r-1]!==0)throw new o("One object, sized correctly, with a spot for an EOO, but the EOO isn't 0x00");return lt(e,s,t,n)}var Qe=/^\$ref$|^\$id$|^\$db$/;function lt(e,t,n,s=!1){let r=n.fieldsAsRaw==null?null:n.fieldsAsRaw,i=n.raw==null?!1:n.raw,u=typeof n.bsonRegExp=="boolean"?n.bsonRegExp:!1,a=n.promoteBuffers??!1,I=n.promoteLongs??!0,S=n.promoteValues??!0,w=n.useBigInt64??!1;if(w&&!S)throw new o("Must either request bigint or Long for int64 deserialization");if(w&&!I)throw new o("Must either request bigint or Long for int64 deserialization");let m=n.validation==null?{utf8:!0}:n.validation,O=!0,d,x=new Set,E=m.utf8;if(typeof E=="boolean")d=E;else{O=!1;let N=Object.keys(E).map(function(y){return E[y]});if(N.length===0)throw new o("UTF-8 validation setting cannot be empty");if(typeof N[0]!="boolean")throw new o("Invalid UTF-8 validation option, must specify boolean values");if(d=N[0],!N.every(y=>y===d))throw new o("Invalid UTF-8 validation option - keys must be all true or all false")}if(!O)for(let N of Object.keys(E))x.add(N);let $=t;if(e.length<5)throw new o("corrupt bson message < 5 bytes long");let L=e[t++]|e[t++]<<8|e[t++]<<16|e[t++]<<24;if(L<5||L>e.length)throw new o("corrupt bson message");let T=s?[]:{},F=0,g=!1,U=s?!1:null,ft=new DataView(e.buffer,e.byteOffset,e.byteLength);for(;!g;){let N=e[t++];if(N===0)break;let y=t;for(;e[y]!==0&&y<e.length;)y++;if(y>=e.byteLength)throw new o("Bad BSON Document: illegal CString");let b=s?F++:h.toUTF8(e,t,y,!1),A=!0;O||x.has(b)?A=d:A=!d,U!==!1&&b[0]==="$"&&(U=Qe.test(b));let c;if(t=y+1,N===Qt){let l=e[t++]|e[t++]<<8|e[t++]<<16|e[t++]<<24;if(l<=0||l>e.length-t||e[t+l-1]!==0)throw new o("bad string length in bson");c=h.toUTF8(e,t,t+l-1,A),t=t+l}else if(N===se){let l=h.allocate(12);l.set(e.subarray(t,t+12)),c=new k(l),t=t+12}else if(N===St&&S===!1)c=new tt(e[t++]|e[t++]<<8|e[t++]<<16|e[t++]<<24);else if(N===St)c=e[t++]|e[t++]<<8|e[t++]<<16|e[t++]<<24;else if(N===wt&&S===!1)c=new v(ft.getFloat64(t,!0)),t=t+8;else if(N===wt)c=ft.getFloat64(t,!0),t=t+8;else if(N===ie){let l=e[t++]|e[t++]<<8|e[t++]<<16|e[t++]<<24,p=e[t++]|e[t++]<<8|e[t++]<<16|e[t++]<<24;c=new Date(new f(l,p).toNumber())}else if(N===re){if(e[t]!==0&&e[t]!==1)throw new o("illegal boolean type value");c=e[t++]===1}else if(N===vt){let l=t,p=e[t]|e[t+1]<<8|e[t+2]<<16|e[t+3]<<24;if(p<=0||p>e.length-t)throw new o("bad embedded document length in bson");if(i)c=e.slice(t,t+p);else{let B=n;O||(B={...n,validation:{utf8:A}}),c=lt(e,l,B,!1)}t=t+p}else if(N===te){let l=t,p=e[t]|e[t+1]<<8|e[t+2]<<16|e[t+3]<<24,B=n,R=t+p;if(r&&r[b]&&(B={...n,raw:!0}),O||(B={...B,validation:{utf8:A}}),c=lt(e,l,B,!0),t=t+p,e[t-1]!==0)throw new o("invalid array terminator byte");if(t!==R)throw new o("corrupted array bson")}else if(N===ne)c=void 0;else if(N===oe)c=null;else if(N===ge){let l=Q.fromUint8Array(e.subarray(t,t+8)),p=e[t++]|e[t++]<<8|e[t++]<<16|e[t++]<<24,B=e[t++]|e[t++]<<8|e[t++]<<16|e[t++]<<24,R=new f(p,B);w?c=l.getBigInt64(0,!0):I&&S===!0?c=R.lessThanOrEqual(Ke)&&R.greaterThanOrEqual(Ge)?R.toNumber():R:c=R}else if(N===ue){let l=h.allocate(16);l.set(e.subarray(t,t+16),0),t=t+16,c=new st(l)}else if(N===ee){let l=e[t++]|e[t++]<<8|e[t++]<<16|e[t++]<<24,p=l,B=e[t++];if(l<0)throw new o("Negative binary type element size found");if(l>e.byteLength)throw new o("Binary type size larger than document size");if(e.slice!=null){if(B===_.SUBTYPE_BYTE_ARRAY){if(l=e[t++]|e[t++]<<8|e[t++]<<16|e[t++]<<24,l<0)throw new o("Negative binary type element size found for subtype 0x02");if(l>p-4)throw new o("Binary type with subtype 0x02 contains too long binary size");if(l<p-4)throw new o("Binary type with subtype 0x02 contains too short binary size")}a&&S?c=h.toLocalBufferType(e.slice(t,t+l)):(c=new _(e.slice(t,t+l),B),B===ct&&W.isValid(c)&&(c=c.toUUID()))}else{let R=h.allocate(l);if(B===_.SUBTYPE_BYTE_ARRAY){if(l=e[t++]|e[t++]<<8|e[t++]<<16|e[t++]<<24,l<0)throw new o("Negative binary type element size found for subtype 0x02");if(l>p-4)throw new o("Binary type with subtype 0x02 contains too long binary size");if(l<p-4)throw new o("Binary type with subtype 0x02 contains too short binary size")}for(y=0;y<l;y++)R[y]=e[t+y];a&&S?c=R:(c=new _(e.slice(t,t+l),B),B===ct&&W.isValid(c)&&(c=c.toUUID()))}t=t+l}else if(N===pt&&u===!1){for(y=t;e[y]!==0&&y<e.length;)y++;if(y>=e.length)throw new o("Bad BSON Document: illegal CString");let l=h.toUTF8(e,t,y,!1);for(t=y+1,y=t;e[y]!==0&&y<e.length;)y++;if(y>=e.length)throw new o("Bad BSON Document: illegal CString");let p=h.toUTF8(e,t,y,!1);t=y+1;let B=new Array(p.length);for(y=0;y<p.length;y++)switch(p[y]){case"m":B[y]="m";break;case"s":B[y]="g";break;case"i":B[y]="i";break}c=new RegExp(l,B.join(""))}else if(N===pt&&u===!0){for(y=t;e[y]!==0&&y<e.length;)y++;if(y>=e.length)throw new o("Bad BSON Document: illegal CString");let l=h.toUTF8(e,t,y,!1);for(t=y+1,y=t;e[y]!==0&&y<e.length;)y++;if(y>=e.length)throw new o("Bad BSON Document: illegal CString");let p=h.toUTF8(e,t,y,!1);t=y+1,c=new q(l,p)}else if(N===ce){let l=e[t++]|e[t++]<<8|e[t++]<<16|e[t++]<<24;if(l<=0||l>e.length-t||e[t+l-1]!==0)throw new o("bad string length in bson");let p=h.toUTF8(e,t,t+l-1,A);c=S?p:new ot(p),t=t+l}else if(N===ae){let l=e[t++]+e[t++]*256+e[t++]*65536+e[t++]*16777216,p=e[t++]+e[t++]*256+e[t++]*65536+e[t++]*(1<<24);c=new et({i:l,t:p})}else if(N===ye)c=new it;else if(N===me)c=new rt;else if(N===le){let l=e[t++]|e[t++]<<8|e[t++]<<16|e[t++]<<24;if(l<=0||l>e.length-t||e[t+l-1]!==0)throw new o("bad string length in bson");let p=h.toUTF8(e,t,t+l-1,A);c=new Y(p),t=t+l}else if(N===he){let l=e[t++]|e[t++]<<8|e[t++]<<16|e[t++]<<24;if(l<4+4+4+1)throw new o("code_w_scope total size shorter minimum expected length");let p=e[t++]|e[t++]<<8|e[t++]<<16|e[t++]<<24;if(p<=0||p>e.length-t||e[t+p-1]!==0)throw new o("bad string length in bson");let B=h.toUTF8(e,t,t+p-1,A);t=t+p;let R=t,at=e[t]|e[t+1]<<8|e[t+2]<<16|e[t+3]<<24,Yt=lt(e,R,n,!1);if(t=t+at,l<4+4+at+p)throw new o("code_w_scope total size is too short, truncating scope");if(l>4+4+at+p)throw new o("code_w_scope total size is too long, clips outer document");c=new Y(B,Yt)}else if(N===fe){let l=e[t++]|e[t++]<<8|e[t++]<<16|e[t++]<<24;if(l<=0||l>e.length-t||e[t+l-1]!==0)throw new o("bad string length in bson");if(m!=null&&m.utf8&&!Mt(e,t,t+l-1))throw new o("Invalid UTF-8 string in BSON document");let p=h.toUTF8(e,t,t+l-1,!1);t=t+l;let B=h.allocate(12);B.set(e.subarray(t,t+12),0);let R=new k(B);t=t+12,c=new P(p,R)}else throw new o(`Detected unknown BSON type ${N.toString(16)} for fieldname "${b}"`);b==="__proto__"?Object.defineProperty(T,b,{value:c,writable:!0,enumerable:!0,configurable:!0}):T[b]=c}if(L!==t-$)throw s?new o("corrupt array bson"):new o("corrupt object bson");if(!U)return T;if(Ht(T)){let N=Object.assign({},T);return delete N.$ref,delete N.$id,delete N.$db,new P(T.$ref,T.$id,T.$db,N)}return T}var Ct=new DataView(new ArrayBuffer(8),0,8),hn=new Uint8Array(Ct.buffer,0,4),an=new Uint8Array(Ct.buffer,0,8);function ve(e){return e!=null&&typeof e=="object"&&"_bsontype"in e&&typeof e._bsontype=="string"}var tn={$oid:k,$binary:_,$uuid:_,$symbol:ot,$numberInt:tt,$numberDecimal:st,$numberDouble:v,$numberLong:f,$minKey:it,$maxKey:rt,$regex:q,$regularExpression:q,$timestamp:et};function Pt(e,t={}){if(typeof e=="number"){let s=e<=Dt&&e>=jt,r=e<=zt&&e>=Ft;if(t.relaxed||t.legacy)return e;if(Number.isInteger(e)&&!Object.is(e,-0)){if(s)return new tt(e);if(r)return t.useBigInt64?BigInt(e):f.fromNumber(e)}return new v(e)}if(e==null||typeof e!="object")return e;if(e.$undefined)return null;let n=Object.keys(e).filter(s=>s.startsWith("$")&&e[s]!=null);for(let s=0;s<n.length;s++){let r=tn[n[s]];if(r)return r.fromExtendedJSON(e,t)}if(e.$date!=null){let s=e.$date,r=new Date;if(t.legacy)if(typeof s=="number")r.setTime(s);else if(typeof s=="string")r.setTime(Date.parse(s));else if(typeof s=="bigint")r.setTime(Number(s));else throw new ht(`Unrecognized type for EJSON date: ${typeof s}`);else if(typeof s=="string")r.setTime(Date.parse(s));else if(f.isLong(s))r.setTime(s.toNumber());else if(typeof s=="number"&&t.relaxed)r.setTime(s);else if(typeof s=="bigint")r.setTime(Number(s));else throw new ht(`Unrecognized type for EJSON date: ${typeof s}`);return r}if(e.$code!=null){let s=Object.assign({},e);return e.$scope&&(s.$scope=Pt(e.$scope)),Y.fromExtendedJSON(e)}if(Ht(e)||e.$dbPointer){let s=e.$ref?e:e.$dbPointer;if(s instanceof P)return s;let r=Object.keys(s).filter(u=>u.startsWith("$")),i=!0;if(r.forEach(u=>{["$ref","$id","$db"].indexOf(u)===-1&&(i=!1)}),i)return P.fromExtendedJSON(s)}return e}function en(e,t){return e.map((n,s)=>{t.seenObjects.push({propertyName:`index ${s}`,obj:null});try{return J(n,t)}finally{t.seenObjects.pop()}})}function Ut(e){let t=e.toISOString();return e.getUTCMilliseconds()!==0?t:t.slice(0,-5)+"Z"}function J(e,t){if(e instanceof Map||Rt(e)){let n=Object.create(null);for(let[s,r]of e){if(typeof s!="string")throw new o("Can only serialize maps with string keys");n[s]=r}return J(n,t)}if((typeof e=="object"||typeof e=="function")&&e!==null){let n=t.seenObjects.findIndex(s=>s.obj===e);if(n!==-1){let s=t.seenObjects.map(w=>w.propertyName),r=s.slice(0,n).map(w=>`${w} -> `).join(""),i=s[n],u=" -> "+s.slice(n+1,s.length-1).map(w=>`${w} -> `).join(""),a=s[s.length-1],I=" ".repeat(r.length+i.length/2),S="-".repeat(u.length+(i.length+a.length)/2-1);throw new o(`Converting circular structure to EJSON:
+    ${r}${i}${u}${a}
+    ${I}\\${S}/`)}t.seenObjects[t.seenObjects.length-1].obj=e}if(Array.isArray(e))return en(e,t);if(e===void 0)return null;if(e instanceof Date||Zt(e)){let n=e.getTime(),s=n>-1&&n<2534023188e5;return t.legacy?t.relaxed&&s?{$date:e.getTime()}:{$date:Ut(e)}:t.relaxed&&s?{$date:Ut(e)}:{$date:{$numberLong:e.getTime().toString()}}}if(typeof e=="number"&&(!t.relaxed||!isFinite(e))){if(Number.isInteger(e)&&!Object.is(e,-0)){if(e>=jt&&e<=Dt)return{$numberInt:e.toString()};if(e>=Ft&&e<=zt)return{$numberLong:e.toString()}}return{$numberDouble:Object.is(e,-0)?"-0.0":e.toString()}}if(typeof e=="bigint")return t.relaxed?Number(BigInt.asIntN(64,e)):{$numberLong:BigInt.asIntN(64,e).toString()};if(e instanceof RegExp||qt(e)){let n=e.flags;if(n===void 0){let r=e.toString().match(/[gimuy]*$/);r&&(n=r[0])}return new q(e.source,n).toExtendedJSON(t)}return e!=null&&typeof e=="object"?sn(e,t):e}var nn={Binary:e=>new _(e.value(),e.sub_type),Code:e=>new Y(e.code,e.scope),DBRef:e=>new P(e.collection||e.namespace,e.oid,e.db,e.fields),Decimal128:e=>new st(e.bytes),Double:e=>new v(e.value),Int32:e=>new tt(e.value),Long:e=>f.fromBits(e.low!=null?e.low:e.low_,e.low!=null?e.high:e.high_,e.low!=null?e.unsigned:e.unsigned_),MaxKey:()=>new rt,MinKey:()=>new it,ObjectId:e=>new k(e),BSONRegExp:e=>new q(e.pattern,e.options),BSONSymbol:e=>new ot(e.value),Timestamp:e=>et.fromBits(e.low,e.high)};function sn(e,t){if(e==null||typeof e!="object")throw new o("not an object instance");let n=e._bsontype;if(typeof n>"u"){let s={};for(let r of Object.keys(e)){t.seenObjects.push({propertyName:r,obj:null});try{let i=J(e[r],t);r==="__proto__"?Object.defineProperty(s,r,{value:i,writable:!0,enumerable:!0,configurable:!0}):s[r]=i}finally{t.seenObjects.pop()}}return s}else{if(e!=null&&typeof e=="object"&&typeof e._bsontype=="string"&&e[Symbol.for("@@mdb.bson.version")]!==mt)throw new yt;if(ve(e)){let s=e;if(typeof s.toExtendedJSON!="function"){let r=nn[e._bsontype];if(!r)throw new o("Unrecognized or invalid _bsontype: "+e._bsontype);s=r(s)}return n==="Code"&&s.scope?s=new Y(s.code,J(s.scope,t)):n==="DBRef"&&s.oid&&(s=new P(J(s.collection,t),J(s.oid,t),J(s.db,t),J(s.fields,t))),s.toExtendedJSON(t)}else throw new o("_bsontype must be a string, but was: "+typeof n)}}function Vt(e,t){let n={useBigInt64:t?.useBigInt64??!1,relaxed:t?.relaxed??!0,legacy:t?.legacy??!1};return JSON.parse(e,(s,r)=>{if(s.indexOf("\0")!==-1)throw new o(`BSON Document field names cannot contain null bytes, found: ${JSON.stringify(s)}`);return Pt(r,n)})}function Wt(e,t,n,s){n!=null&&typeof n=="object"&&(s=n,n=0),t!=null&&typeof t=="object"&&!Array.isArray(t)&&(s=t,t=void 0,n=0);let r=Object.assign({relaxed:!0,legacy:!1},s,{seenObjects:[{propertyName:"(root)",obj:null}]}),i=J(e,r);return JSON.stringify(i,t,n)}function rn(e,t){return t=t||{},JSON.parse(Wt(e,t))}function on(e,t){return t=t||{},Vt(JSON.stringify(e),t)}var Z=Object.create(null);Z.parse=Vt;Z.stringify=Wt;Z.serialize=rn;Z.deserialize=on;Object.freeze(Z);var fn=1024*1024*17,gn=h.allocate(fn);function ln(e,t={}){return Xe(h.toLocalBufferType(e),t)}var mn=Z.deserialize;export{ln as deserialize,mn as toJson};
diff --git a/packages/server/src/jsRunner/bundles/bsonPackage.ts b/packages/server/src/jsRunner/bundles/bsonPackage.ts
new file mode 100644
index 0000000000..b2e9016879
--- /dev/null
+++ b/packages/server/src/jsRunner/bundles/bsonPackage.ts
@@ -0,0 +1,4 @@
+import { EJSON } from "bson"
+
+export { deserialize } from "bson"
+export const toJson = EJSON.deserialize
diff --git a/packages/server/src/jsRunner/bundles/index-helpers.ivm.bundle.js b/packages/server/src/jsRunner/bundles/index-helpers.ivm.bundle.js
new file mode 100644
index 0000000000..706625b757
--- /dev/null
+++ b/packages/server/src/jsRunner/bundles/index-helpers.ivm.bundle.js
@@ -0,0 +1,59 @@
+var De=Object.defineProperty;var un=Object.getOwnPropertyDescriptor;var sn=Object.getOwnPropertyNames;var fn=Object.prototype.hasOwnProperty;var Ue=(e=>typeof require<"u"?require:typeof Proxy<"u"?new Proxy(e,{get:(t,r)=>(typeof require<"u"?require:t)[r]}):e)(function(e){if(typeof require<"u")return require.apply(this,arguments);throw Error('Dynamic require of "'+e+'" is not supported')});var Z=(e,t)=>()=>(e&&(t=e(e=0)),t);var U=(e,t)=>()=>(t||e((t={exports:{}}).exports,t),t.exports),on=(e,t)=>{for(var r in t)De(e,r,{get:t[r],enumerable:!0})},an=(e,t,r,n)=>{if(t&&typeof t=="object"||typeof t=="function")for(let i of sn(t))!fn.call(e,i)&&i!==r&&De(e,i,{get:()=>t[i],enumerable:!(n=un(t,i))||n.enumerable});return e};var cn=e=>an(De({},"__esModule",{value:!0}),e);var gt=U((Te,qe)=>{(function(e,t){typeof Te=="object"&&typeof qe<"u"?qe.exports=t():typeof define=="function"&&define.amd?define(t):(e=typeof globalThis<"u"?globalThis:e||self).dayjs=t()})(Te,function(){"use strict";var e=1e3,t=6e4,r=36e5,n="millisecond",i="second",u="minute",s="hour",f="day",w="week",g="month",l="quarter",x="year",v="date",a="Invalid Date",T=/^(\d{4})[-/]?(\d{1,2})?[-/]?(\d{0,2})[Tt\s]*(\d{1,2})?:?(\d{1,2})?:?(\d{1,2})?[.:]?(\d+)?$/,E=/\[([^\]]+)]|Y{1,4}|M{1,4}|D{1,2}|d{1,4}|H{1,2}|h{1,2}|a|A|m{1,2}|s{1,2}|Z{1,2}|SSS/g,I={name:"en",weekdays:"Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"),months:"January_February_March_April_May_June_July_August_September_October_November_December".split("_"),ordinal:function($){var h=["th","st","nd","rd"],c=$%100;return"["+$+(h[(c-20)%10]||h[c]||h[0])+"]"}},Y=function($,h,c){var b=String($);return!b||b.length>=h?$:""+Array(h+1-b.length).join(c)+$},F={s:Y,z:function($){var h=-$.utcOffset(),c=Math.abs(h),b=Math.floor(c/60),d=c%60;return(h<=0?"+":"-")+Y(b,2,"0")+":"+Y(d,2,"0")},m:function $(h,c){if(h.date()<c.date())return-$(c,h);var b=12*(c.year()-h.year())+(c.month()-h.month()),d=h.clone().add(b,g),M=c-d<0,j=h.clone().add(b+(M?-1:1),g);return+(-(b+(c-d)/(M?d-j:j-d))||0)},a:function($){return $<0?Math.ceil($)||0:Math.floor($)},p:function($){return{M:g,y:x,w,d:f,D:v,h:s,m:u,s:i,ms:n,Q:l}[$]||String($||"").toLowerCase().replace(/s$/,"")},u:function($){return $===void 0}},q="en",S={};S[q]=I;var p="$isDayjsObject",o=function($){return $ instanceof B||!(!$||!$[p])},D=function $(h,c,b){var d;if(!h)return q;if(typeof h=="string"){var M=h.toLowerCase();S[M]&&(d=M),c&&(S[M]=c,d=M);var j=h.split("-");if(!d&&j.length>1)return $(j[0])}else{var _=h.name;S[_]=h,d=_}return!b&&d&&(q=d),d||!b&&q},N=function($,h){if(o($))return $.clone();var c=typeof h=="object"?h:{};return c.date=$,c.args=arguments,new B(c)},O=F;O.l=D,O.i=o,O.w=function($,h){return N($,{locale:h.$L,utc:h.$u,x:h.$x,$offset:h.$offset})};var B=function(){function $(c){this.$L=D(c.locale,null,!0),this.parse(c),this.$x=this.$x||c.x||{},this[p]=!0}var h=$.prototype;return h.parse=function(c){this.$d=function(b){var d=b.date,M=b.utc;if(d===null)return new Date(NaN);if(O.u(d))return new Date;if(d instanceof Date)return new Date(d);if(typeof d=="string"&&!/Z$/i.test(d)){var j=d.match(T);if(j){var _=j[2]-1||0,H=(j[7]||"0").substring(0,3);return M?new Date(Date.UTC(j[1],_,j[3]||1,j[4]||0,j[5]||0,j[6]||0,H)):new Date(j[1],_,j[3]||1,j[4]||0,j[5]||0,j[6]||0,H)}}return new Date(d)}(c),this.init()},h.init=function(){var c=this.$d;this.$y=c.getFullYear(),this.$M=c.getMonth(),this.$D=c.getDate(),this.$W=c.getDay(),this.$H=c.getHours(),this.$m=c.getMinutes(),this.$s=c.getSeconds(),this.$ms=c.getMilliseconds()},h.$utils=function(){return O},h.isValid=function(){return this.$d.toString()!==a},h.isSame=function(c,b){var d=N(c);return this.startOf(b)<=d&&d<=this.endOf(b)},h.isAfter=function(c,b){return N(c)<this.startOf(b)},h.isBefore=function(c,b){return this.endOf(b)<N(c)},h.$g=function(c,b,d){return O.u(c)?this[b]:this.set(d,c)},h.unix=function(){return Math.floor(this.valueOf()/1e3)},h.valueOf=function(){return this.$d.getTime()},h.startOf=function(c,b){var d=this,M=!!O.u(b)||b,j=O.p(c),_=function(se,Q){var re=O.w(d.$u?Date.UTC(d.$y,Q,se):new Date(d.$y,Q,se),d);return M?re:re.endOf(f)},H=function(se,Q){return O.w(d.toDate()[se].apply(d.toDate("s"),(M?[0,0,0,0]:[23,59,59,999]).slice(Q)),d)},L=this.$W,G=this.$M,K=this.$D,de="set"+(this.$u?"UTC":"");switch(j){case x:return M?_(1,0):_(31,11);case g:return M?_(1,G):_(0,G+1);case w:var ue=this.$locale().weekStart||0,pe=(L<ue?L+7:L)-ue;return _(M?K-pe:K+(6-pe),G);case f:case v:return H(de+"Hours",0);case s:return H(de+"Minutes",1);case u:return H(de+"Seconds",2);case i:return H(de+"Milliseconds",3);default:return this.clone()}},h.endOf=function(c){return this.startOf(c,!1)},h.$set=function(c,b){var d,M=O.p(c),j="set"+(this.$u?"UTC":""),_=(d={},d[f]=j+"Date",d[v]=j+"Date",d[g]=j+"Month",d[x]=j+"FullYear",d[s]=j+"Hours",d[u]=j+"Minutes",d[i]=j+"Seconds",d[n]=j+"Milliseconds",d)[M],H=M===f?this.$D+(b-this.$W):b;if(M===g||M===x){var L=this.clone().set(v,1);L.$d[_](H),L.init(),this.$d=L.set(v,Math.min(this.$D,L.daysInMonth())).$d}else _&&this.$d[_](H);return this.init(),this},h.set=function(c,b){return this.clone().$set(c,b)},h.get=function(c){return this[O.p(c)]()},h.add=function(c,b){var d,M=this;c=Number(c);var j=O.p(b),_=function(G){var K=N(M);return O.w(K.date(K.date()+Math.round(G*c)),M)};if(j===g)return this.set(g,this.$M+c);if(j===x)return this.set(x,this.$y+c);if(j===f)return _(1);if(j===w)return _(7);var H=(d={},d[u]=t,d[s]=r,d[i]=e,d)[j]||1,L=this.$d.getTime()+c*H;return O.w(L,this)},h.subtract=function(c,b){return this.add(-1*c,b)},h.format=function(c){var b=this,d=this.$locale();if(!this.isValid())return d.invalidDate||a;var M=c||"YYYY-MM-DDTHH:mm:ssZ",j=O.z(this),_=this.$H,H=this.$m,L=this.$M,G=d.weekdays,K=d.months,de=d.meridiem,ue=function(Q,re,me,Oe){return Q&&(Q[re]||Q(b,M))||me[re].slice(0,Oe)},pe=function(Q){return O.s(_%12||12,Q,"0")},se=de||function(Q,re,me){var Oe=Q<12?"AM":"PM";return me?Oe.toLowerCase():Oe};return M.replace(E,function(Q,re){return re||function(me){switch(me){case"YY":return String(b.$y).slice(-2);case"YYYY":return O.s(b.$y,4,"0");case"M":return L+1;case"MM":return O.s(L+1,2,"0");case"MMM":return ue(d.monthsShort,L,K,3);case"MMMM":return ue(K,L);case"D":return b.$D;case"DD":return O.s(b.$D,2,"0");case"d":return String(b.$W);case"dd":return ue(d.weekdaysMin,b.$W,G,2);case"ddd":return ue(d.weekdaysShort,b.$W,G,3);case"dddd":return G[b.$W];case"H":return String(_);case"HH":return O.s(_,2,"0");case"h":return pe(1);case"hh":return pe(2);case"a":return se(_,H,!0);case"A":return se(_,H,!1);case"m":return String(H);case"mm":return O.s(H,2,"0");case"s":return String(b.$s);case"ss":return O.s(b.$s,2,"0");case"SSS":return O.s(b.$ms,3,"0");case"Z":return j}return null}(Q)||j.replace(":","")})},h.utcOffset=function(){return 15*-Math.round(this.$d.getTimezoneOffset()/15)},h.diff=function(c,b,d){var M,j=this,_=O.p(b),H=N(c),L=(H.utcOffset()-this.utcOffset())*t,G=this-H,K=function(){return O.m(j,H)};switch(_){case x:M=K()/12;break;case g:M=K();break;case l:M=K()/3;break;case w:M=(G-L)/6048e5;break;case f:M=(G-L)/864e5;break;case s:M=G/r;break;case u:M=G/t;break;case i:M=G/e;break;default:M=G}return d?M:O.a(M)},h.daysInMonth=function(){return this.endOf(g).$D},h.$locale=function(){return S[this.$L]},h.locale=function(c,b){if(!c)return this.$L;var d=this.clone(),M=D(c,b,!0);return M&&(d.$L=M),d},h.clone=function(){return O.w(this.$d,this)},h.toDate=function(){return new Date(this.valueOf())},h.toJSON=function(){return this.isValid()?this.toISOString():null},h.toISOString=function(){return this.$d.toISOString()},h.toString=function(){return this.$d.toUTCString()},$}(),J=B.prototype;return N.prototype=J,[["$ms",n],["$s",i],["$m",u],["$H",s],["$W",f],["$M",g],["$y",x],["$D",v]].forEach(function($){J[$[1]]=function(h){return this.$g(h,$[0],$[1])}}),N.extend=function($,h){return $.$i||($(h,B,N),$.$i=!0),N},N.locale=D,N.isDayjs=o,N.unix=function($){return N(1e3*$)},N.en=S[q],N.Ls=S,N.p={},N})});var yt=U((Ye,Ce)=>{(function(e,t){typeof Ye=="object"&&typeof Ce<"u"?Ce.exports=t():typeof define=="function"&&define.amd?define(t):(e=typeof globalThis<"u"?globalThis:e||self).dayjs_plugin_duration=t()})(Ye,function(){"use strict";var e,t,r=1e3,n=6e4,i=36e5,u=864e5,s=/\[([^\]]+)]|Y{1,4}|M{1,4}|D{1,2}|d{1,4}|H{1,2}|h{1,2}|a|A|m{1,2}|s{1,2}|Z{1,2}|SSS/g,f=31536e6,w=2628e6,g=/^(-|\+)?P(?:([-+]?[0-9,.]*)Y)?(?:([-+]?[0-9,.]*)M)?(?:([-+]?[0-9,.]*)W)?(?:([-+]?[0-9,.]*)D)?(?:T(?:([-+]?[0-9,.]*)H)?(?:([-+]?[0-9,.]*)M)?(?:([-+]?[0-9,.]*)S)?)?$/,l={years:f,months:w,days:u,hours:i,minutes:n,seconds:r,milliseconds:1,weeks:6048e5},x=function(S){return S instanceof F},v=function(S,p,o){return new F(S,o,p.$l)},a=function(S){return t.p(S)+"s"},T=function(S){return S<0},E=function(S){return T(S)?Math.ceil(S):Math.floor(S)},I=function(S){return Math.abs(S)},Y=function(S,p){return S?T(S)?{negative:!0,format:""+I(S)+p}:{negative:!1,format:""+S+p}:{negative:!1,format:""}},F=function(){function S(o,D,N){var O=this;if(this.$d={},this.$l=N,o===void 0&&(this.$ms=0,this.parseFromMilliseconds()),D)return v(o*l[a(D)],this);if(typeof o=="number")return this.$ms=o,this.parseFromMilliseconds(),this;if(typeof o=="object")return Object.keys(o).forEach(function($){O.$d[a($)]=o[$]}),this.calMilliseconds(),this;if(typeof o=="string"){var B=o.match(g);if(B){var J=B.slice(2).map(function($){return $!=null?Number($):0});return this.$d.years=J[0],this.$d.months=J[1],this.$d.weeks=J[2],this.$d.days=J[3],this.$d.hours=J[4],this.$d.minutes=J[5],this.$d.seconds=J[6],this.calMilliseconds(),this}}return this}var p=S.prototype;return p.calMilliseconds=function(){var o=this;this.$ms=Object.keys(this.$d).reduce(function(D,N){return D+(o.$d[N]||0)*l[N]},0)},p.parseFromMilliseconds=function(){var o=this.$ms;this.$d.years=E(o/f),o%=f,this.$d.months=E(o/w),o%=w,this.$d.days=E(o/u),o%=u,this.$d.hours=E(o/i),o%=i,this.$d.minutes=E(o/n),o%=n,this.$d.seconds=E(o/r),o%=r,this.$d.milliseconds=o},p.toISOString=function(){var o=Y(this.$d.years,"Y"),D=Y(this.$d.months,"M"),N=+this.$d.days||0;this.$d.weeks&&(N+=7*this.$d.weeks);var O=Y(N,"D"),B=Y(this.$d.hours,"H"),J=Y(this.$d.minutes,"M"),$=this.$d.seconds||0;this.$d.milliseconds&&($+=this.$d.milliseconds/1e3,$=Math.round(1e3*$)/1e3);var h=Y($,"S"),c=o.negative||D.negative||O.negative||B.negative||J.negative||h.negative,b=B.format||J.format||h.format?"T":"",d=(c?"-":"")+"P"+o.format+D.format+O.format+b+B.format+J.format+h.format;return d==="P"||d==="-P"?"P0D":d},p.toJSON=function(){return this.toISOString()},p.format=function(o){var D=o||"YYYY-MM-DDTHH:mm:ss",N={Y:this.$d.years,YY:t.s(this.$d.years,2,"0"),YYYY:t.s(this.$d.years,4,"0"),M:this.$d.months,MM:t.s(this.$d.months,2,"0"),D:this.$d.days,DD:t.s(this.$d.days,2,"0"),H:this.$d.hours,HH:t.s(this.$d.hours,2,"0"),m:this.$d.minutes,mm:t.s(this.$d.minutes,2,"0"),s:this.$d.seconds,ss:t.s(this.$d.seconds,2,"0"),SSS:t.s(this.$d.milliseconds,3,"0")};return D.replace(s,function(O,B){return B||String(N[O])})},p.as=function(o){return this.$ms/l[a(o)]},p.get=function(o){var D=this.$ms,N=a(o);return N==="milliseconds"?D%=1e3:D=N==="weeks"?E(D/l[N]):this.$d[N],D||0},p.add=function(o,D,N){var O;return O=D?o*l[a(D)]:x(o)?o.$ms:v(o,this).$ms,v(this.$ms+O*(N?-1:1),this)},p.subtract=function(o,D){return this.add(o,D,!0)},p.locale=function(o){var D=this.clone();return D.$l=o,D},p.clone=function(){return v(this.$ms,this)},p.humanize=function(o){return e().add(this.$ms,"ms").locale(this.$l).fromNow(!o)},p.valueOf=function(){return this.asMilliseconds()},p.milliseconds=function(){return this.get("milliseconds")},p.asMilliseconds=function(){return this.as("milliseconds")},p.seconds=function(){return this.get("seconds")},p.asSeconds=function(){return this.as("seconds")},p.minutes=function(){return this.get("minutes")},p.asMinutes=function(){return this.as("minutes")},p.hours=function(){return this.get("hours")},p.asHours=function(){return this.as("hours")},p.days=function(){return this.get("days")},p.asDays=function(){return this.as("days")},p.weeks=function(){return this.get("weeks")},p.asWeeks=function(){return this.as("weeks")},p.months=function(){return this.get("months")},p.asMonths=function(){return this.as("months")},p.years=function(){return this.get("years")},p.asYears=function(){return this.as("years")},S}(),q=function(S,p,o){return S.add(p.years()*o,"y").add(p.months()*o,"M").add(p.days()*o,"d").add(p.hours()*o,"h").add(p.minutes()*o,"m").add(p.seconds()*o,"s").add(p.milliseconds()*o,"ms")};return function(S,p,o){e=o,t=o().$utils(),o.duration=function(O,B){var J=o.locale();return v(O,{$l:J},B)},o.isDuration=x;var D=p.prototype.add,N=p.prototype.subtract;p.prototype.add=function(O,B){return x(O)?q(this,O,1):D.bind(this)(O,B)},p.prototype.subtract=function(O,B){return x(O)?q(this,O,-1):N.bind(this)(O,B)}}})});var vt=U((Ee,Ie)=>{(function(e,t){typeof Ee=="object"&&typeof Ie<"u"?Ie.exports=t():typeof define=="function"&&define.amd?define(t):(e=typeof globalThis<"u"?globalThis:e||self).dayjs_plugin_advancedFormat=t()})(Ee,function(){"use strict";return function(e,t){var r=t.prototype,n=r.format;r.format=function(i){var u=this,s=this.$locale();if(!this.isValid())return n.bind(this)(i);var f=this.$utils(),w=(i||"YYYY-MM-DDTHH:mm:ssZ").replace(/\[([^\]]+)]|Q|wo|ww|w|WW|W|zzz|z|gggg|GGGG|Do|X|x|k{1,2}|S/g,function(g){switch(g){case"Q":return Math.ceil((u.$M+1)/3);case"Do":return s.ordinal(u.$D);case"gggg":return u.weekYear();case"GGGG":return u.isoWeekYear();case"wo":return s.ordinal(u.week(),"W");case"w":case"ww":return f.s(u.week(),g==="w"?1:2,"0");case"W":case"WW":return f.s(u.isoWeek(),g==="W"?1:2,"0");case"k":case"kk":return f.s(String(u.$H===0?24:u.$H),g==="k"?1:2,"0");case"X":return Math.floor(u.$d.getTime()/1e3);case"x":return u.$d.getTime();case"z":return"["+u.offsetName()+"]";case"zzz":return"["+u.offsetName("long")+"]";default:return g}});return n.bind(this)(w)}}})});var $t=U((_e,We)=>{(function(e,t){typeof _e=="object"&&typeof We<"u"?We.exports=t():typeof define=="function"&&define.amd?define(t):(e=typeof globalThis<"u"?globalThis:e||self).dayjs_plugin_isoWeek=t()})(_e,function(){"use strict";var e="day";return function(t,r,n){var i=function(f){return f.add(4-f.isoWeekday(),e)},u=r.prototype;u.isoWeekYear=function(){return i(this).year()},u.isoWeek=function(f){if(!this.$utils().u(f))return this.add(7*(f-this.isoWeek()),e);var w,g,l,x,v=i(this),a=(w=this.isoWeekYear(),g=this.$u,l=(g?n.utc:n)().year(w).startOf("year"),x=4-l.isoWeekday(),l.isoWeekday()>4&&(x+=7),l.add(x,e));return v.diff(a,"week")+1},u.isoWeekday=function(f){return this.$utils().u(f)?this.day()||7:this.day(this.day()%7?f:f-7)};var s=u.startOf;u.startOf=function(f,w){var g=this.$utils(),l=!!g.u(w)||w;return g.p(f)==="isoweek"?l?this.date(this.date()-(this.isoWeekday()-1)).startOf("day"):this.date(this.date()-1-(this.isoWeekday()-1)+7).endOf("day"):s.bind(this)(f,w)}}})});var bt=U((Fe,He)=>{(function(e,t){typeof Fe=="object"&&typeof He<"u"?He.exports=t():typeof define=="function"&&define.amd?define(t):(e=typeof globalThis<"u"?globalThis:e||self).dayjs_plugin_weekYear=t()})(Fe,function(){"use strict";return function(e,t){t.prototype.weekYear=function(){var r=this.month(),n=this.week(),i=this.year();return n===1&&r===11?i+1:r===0&&n>=52?i-1:i}}})});var wt=U((Be,Le)=>{(function(e,t){typeof Be=="object"&&typeof Le<"u"?Le.exports=t():typeof define=="function"&&define.amd?define(t):(e=typeof globalThis<"u"?globalThis:e||self).dayjs_plugin_weekOfYear=t()})(Be,function(){"use strict";var e="week",t="year";return function(r,n,i){var u=n.prototype;u.week=function(s){if(s===void 0&&(s=null),s!==null)return this.add(7*(s-this.week()),"day");var f=this.$locale().yearStart||1;if(this.month()===11&&this.date()>25){var w=i(this).startOf(t).add(1,t).date(f),g=i(this).endOf(e);if(w.isBefore(g))return 1}var l=i(this).startOf(t).date(f).startOf(e).subtract(1,"millisecond"),x=this.diff(l,e,!0);return x<0?i(this).startOf("week").week():Math.ceil(x)},u.weeks=function(s){return s===void 0&&(s=null),this.week(s)}}})});var Ot=U((ze,Pe)=>{(function(e,t){typeof ze=="object"&&typeof Pe<"u"?Pe.exports=t():typeof define=="function"&&define.amd?define(t):(e=typeof globalThis<"u"?globalThis:e||self).dayjs_plugin_relativeTime=t()})(ze,function(){"use strict";return function(e,t,r){e=e||{};var n=t.prototype,i={future:"in %s",past:"%s ago",s:"a few seconds",m:"a minute",mm:"%d minutes",h:"an hour",hh:"%d hours",d:"a day",dd:"%d days",M:"a month",MM:"%d months",y:"a year",yy:"%d years"};function u(f,w,g,l){return n.fromToBase(f,w,g,l)}r.en.relativeTime=i,n.fromToBase=function(f,w,g,l,x){for(var v,a,T,E=g.$locale().relativeTime||i,I=e.thresholds||[{l:"s",r:44,d:"second"},{l:"m",r:89},{l:"mm",r:44,d:"minute"},{l:"h",r:89},{l:"hh",r:21,d:"hour"},{l:"d",r:35},{l:"dd",r:25,d:"day"},{l:"M",r:45},{l:"MM",r:10,d:"month"},{l:"y",r:17},{l:"yy",d:"year"}],Y=I.length,F=0;F<Y;F+=1){var q=I[F];q.d&&(v=l?r(f).diff(g,q.d,!0):g.diff(f,q.d,!0));var S=(e.rounding||Math.round)(Math.abs(v));if(T=v>0,S<=q.r||!q.r){S<=1&&F>0&&(q=I[F-1]);var p=E[q.l];x&&(S=x(""+S)),a=typeof p=="string"?p.replace("%d",S):p(S,w,q.l,T);break}}if(w)return a;var o=T?E.future:E.past;return typeof o=="function"?o(a):o.replace("%s",a)},n.to=function(f,w){return u(f,w,this,!0)},n.from=function(f,w){return u(f,w,this)};var s=function(f){return f.$u?r.utc():r()};n.toNow=function(f){return this.to(s(this),f)},n.fromNow=function(f){return this.from(s(this),f)}}})});var xt=U((Re,Je)=>{(function(e,t){typeof Re=="object"&&typeof Je<"u"?Je.exports=t():typeof define=="function"&&define.amd?define(t):(e=typeof globalThis<"u"?globalThis:e||self).dayjs_plugin_utc=t()})(Re,function(){"use strict";var e="minute",t=/[+-]\d\d(?::?\d\d)?/g,r=/([+-]|\d\d)/g;return function(n,i,u){var s=i.prototype;u.utc=function(a){var T={date:a,utc:!0,args:arguments};return new i(T)},s.utc=function(a){var T=u(this.toDate(),{locale:this.$L,utc:!0});return a?T.add(this.utcOffset(),e):T},s.local=function(){return u(this.toDate(),{locale:this.$L,utc:!1})};var f=s.parse;s.parse=function(a){a.utc&&(this.$u=!0),this.$utils().u(a.$offset)||(this.$offset=a.$offset),f.call(this,a)};var w=s.init;s.init=function(){if(this.$u){var a=this.$d;this.$y=a.getUTCFullYear(),this.$M=a.getUTCMonth(),this.$D=a.getUTCDate(),this.$W=a.getUTCDay(),this.$H=a.getUTCHours(),this.$m=a.getUTCMinutes(),this.$s=a.getUTCSeconds(),this.$ms=a.getUTCMilliseconds()}else w.call(this)};var g=s.utcOffset;s.utcOffset=function(a,T){var E=this.$utils().u;if(E(a))return this.$u?0:E(this.$offset)?g.call(this):this.$offset;if(typeof a=="string"&&(a=function(q){q===void 0&&(q="");var S=q.match(t);if(!S)return null;var p=(""+S[0]).match(r)||["-",0,0],o=p[0],D=60*+p[1]+ +p[2];return D===0?0:o==="+"?D:-D}(a),a===null))return this;var I=Math.abs(a)<=16?60*a:a,Y=this;if(T)return Y.$offset=I,Y.$u=a===0,Y;if(a!==0){var F=this.$u?this.toDate().getTimezoneOffset():-1*this.utcOffset();(Y=this.local().add(I+F,e)).$offset=I,Y.$x.$localOffset=F}else Y=this.utc();return Y};var l=s.format;s.format=function(a){var T=a||(this.$u?"YYYY-MM-DDTHH:mm:ss[Z]":"");return l.call(this,T)},s.valueOf=function(){var a=this.$utils().u(this.$offset)?0:this.$offset+(this.$x.$localOffset||this.$d.getTimezoneOffset());return this.$d.valueOf()-6e4*a},s.isUTC=function(){return!!this.$u},s.toISOString=function(){return this.toDate().toISOString()},s.toString=function(){return this.toDate().toUTCString()};var x=s.toDate;s.toDate=function(a){return a==="s"&&this.$offset?u(this.format("YYYY-MM-DD HH:mm:ss:SSS")).toDate():x.call(this)};var v=s.diff;s.diff=function(a,T,E){if(a&&this.$u===a.$u)return v.call(this,a,T,E);var I=this.local(),Y=u(a).local();return v.call(I,Y,T,E)}}})});var St=U((Ge,Ze)=>{(function(e,t){typeof Ge=="object"&&typeof Ze<"u"?Ze.exports=t():typeof define=="function"&&define.amd?define(t):(e=typeof globalThis<"u"?globalThis:e||self).dayjs_plugin_timezone=t()})(Ge,function(){"use strict";var e={year:0,month:1,day:2,hour:3,minute:4,second:5},t={};return function(r,n,i){var u,s=function(l,x,v){v===void 0&&(v={});var a=new Date(l),T=function(E,I){I===void 0&&(I={});var Y=I.timeZoneName||"short",F=E+"|"+Y,q=t[F];return q||(q=new Intl.DateTimeFormat("en-US",{hour12:!1,timeZone:E,year:"numeric",month:"2-digit",day:"2-digit",hour:"2-digit",minute:"2-digit",second:"2-digit",timeZoneName:Y}),t[F]=q),q}(x,v);return T.formatToParts(a)},f=function(l,x){for(var v=s(l,x),a=[],T=0;T<v.length;T+=1){var E=v[T],I=E.type,Y=E.value,F=e[I];F>=0&&(a[F]=parseInt(Y,10))}var q=a[3],S=q===24?0:q,p=a[0]+"-"+a[1]+"-"+a[2]+" "+S+":"+a[4]+":"+a[5]+":000",o=+l;return(i.utc(p).valueOf()-(o-=o%1e3))/6e4},w=n.prototype;w.tz=function(l,x){l===void 0&&(l=u);var v=this.utcOffset(),a=this.toDate(),T=a.toLocaleString("en-US",{timeZone:l}),E=Math.round((a-new Date(T))/1e3/60),I=i(T,{locale:this.$L}).$set("millisecond",this.$ms).utcOffset(15*-Math.round(a.getTimezoneOffset()/15)-E,!0);if(x){var Y=I.utcOffset();I=I.add(v-Y,"minute")}return I.$x.$timezone=l,I},w.offsetName=function(l){var x=this.$x.$timezone||i.tz.guess(),v=s(this.valueOf(),x,{timeZoneName:l}).find(function(a){return a.type.toLowerCase()==="timezonename"});return v&&v.value};var g=w.startOf;w.startOf=function(l,x){if(!this.$x||!this.$x.$timezone)return g.call(this,l,x);var v=i(this.format("YYYY-MM-DD HH:mm:ss:SSS"),{locale:this.$L});return g.call(v,l,x).tz(this.$x.$timezone,!0)},i.tz=function(l,x,v){var a=v&&x,T=v||x||u,E=f(+i(),T);if(typeof l!="string")return i(l).tz(T);var I=function(S,p,o){var D=S-60*p*1e3,N=f(D,o);if(p===N)return[D,p];var O=f(D-=60*(N-p)*1e3,o);return N===O?[D,N]:[S-60*Math.min(N,O)*1e3,Math.max(N,O)]}(i.utc(l,a).valueOf(),E,T),Y=I[0],F=I[1],q=i(Y).utcOffset(F);return q.$x.$timezone=T,q},i.tz.guess=function(){return Intl.DateTimeFormat().resolvedOptions().timeZone},i.tz.setDefault=function(l){u=l}}})});var Mt=U((ji,Ke)=>{var X=gt();X.extend(yt());X.extend(vt());X.extend($t());X.extend(bt());X.extend(wt());X.extend(Ot());X.extend(xt());X.extend(St());function fe(e){return typeof e=="object"&&typeof e.hash=="object"}function Ve(e){return typeof e=="object"&&typeof e.options=="object"&&typeof e.app=="object"}function Qe(e,t,r){if(fe(e))return Qe({},t,e);if(fe(t))return Qe(e,r,t);let n=Ve(e)?e.context:{};r=r||{},fe(r)||(t=Object.assign({},t,r)),fe(r)&&r.hash.root===!0&&(t=Object.assign({},r.data.root,t));let i=Object.assign({},n,t,r.hash);return Ve(e)||(i=Object.assign({},e,i)),Ve(e)&&e.view&&e.view.data&&(i=Object.assign({},i,e.view.data)),i}function Xe(e,t,r){return fe(t)&&(r=t,t=null),fe(e)&&(r=e,t=null,e=null),{str:e,pattern:t,options:r}}function Nt(e,t,r){let n=Xe(e,t,r),i={lang:"en",date:new Date(n.str)},u=Qe(this,i,{});X.locale(u.lang||u.language)}Ke.exports.date=(e,t,r)=>{let n=Xe(e,t,r);if(n.str==null&&n.pattern==null)return X.locale("en"),X().format("MMMM DD, YYYY");Nt(n.str,n.pattern,n.options);let i=X(new Date(n.str));return typeof n.options=="string"?i=n.options.toLowerCase()==="utc"?i.utc():i.tz(n.options):i=i.tz(X.tz.guess()),n.pattern===""?i.toISOString():i.format(n.pattern)};Ke.exports.duration=(e,t,r)=>{let n=Xe(e,t);Nt(n.str,n.pattern);let i=X.duration(n.str,n.pattern);return r&&!fe(r)?i.format(r):i.humanize()}});var et=U((Ai,At)=>{At.exports=function(e){return e!=null&&(jt(e)||ln(e)||!!e._isBuffer)};function jt(e){return!!e.constructor&&typeof e.constructor.isBuffer=="function"&&e.constructor.isBuffer(e)}function ln(e){return typeof e.readFloatLE=="function"&&typeof e.slice=="function"&&jt(e.slice(0,0))}});var Dt=U((ki,kt)=>{var dn=et(),hn=Object.prototype.toString;kt.exports=function(t){if(typeof t>"u")return"undefined";if(t===null)return"null";if(t===!0||t===!1||t instanceof Boolean)return"boolean";if(typeof t=="string"||t instanceof String)return"string";if(typeof t=="number"||t instanceof Number)return"number";if(typeof t=="function"||t instanceof Function)return"function";if(typeof Array.isArray<"u"&&Array.isArray(t))return"array";if(t instanceof RegExp)return"regexp";if(t instanceof Date)return"date";var r=hn.call(t);return r==="[object RegExp]"?"regexp":r==="[object Date]"?"date":r==="[object Arguments]"?"arguments":r==="[object Error]"?"error":dn(t)?"buffer":r==="[object Set]"?"set":r==="[object WeakSet]"?"weakset":r==="[object Map]"?"map":r==="[object WeakMap]"?"weakmap":r==="[object Symbol]"?"symbol":r==="[object Int8Array]"?"int8array":r==="[object Uint8Array]"?"uint8array":r==="[object Uint8ClampedArray]"?"uint8clampedarray":r==="[object Int16Array]"?"int16array":r==="[object Uint16Array]"?"uint16array":r==="[object Int32Array]"?"int32array":r==="[object Uint32Array]"?"uint32array":r==="[object Float32Array]"?"float32array":r==="[object Float64Array]"?"float64array":"object"}});var Yt=U((Di,qt)=>{"use strict";var Ut=Dt(),Tt={arguments:"an arguments object",array:"an array",boolean:"a boolean",buffer:"a buffer",date:"a date",error:"an error",float32array:"a float32array",float64array:"a float64array",function:"a function",int16array:"an int16array",int32array:"an int32array",int8array:"an int8array",map:"a Map",null:"null",number:"a number",object:"an object",regexp:"a regular expression",set:"a Set",string:"a string",symbol:"a symbol",uint16array:"an uint16array",uint32array:"an uint32array",uint8array:"an uint8array",uint8clampedarray:"an uint8clampedarray",undefined:"undefined",weakmap:"a WeakMap",weakset:"a WeakSet"};function tt(e){return Tt[Ut(e)]}tt.types=Tt;tt.typeOf=Ut;qt.exports=tt});var xe=U((Ui,Et)=>{var pn=Object.prototype.toString;Et.exports=function(t){if(t===void 0)return"undefined";if(t===null)return"null";var r=typeof t;if(r==="boolean")return"boolean";if(r==="string")return"string";if(r==="number")return"number";if(r==="symbol")return"symbol";if(r==="function")return $n(t)?"generatorfunction":"function";if(mn(t))return"array";if(On(t))return"buffer";if(wn(t))return"arguments";if(yn(t))return"date";if(gn(t))return"error";if(vn(t))return"regexp";switch(Ct(t)){case"Symbol":return"symbol";case"Promise":return"promise";case"WeakMap":return"weakmap";case"WeakSet":return"weakset";case"Map":return"map";case"Set":return"set";case"Int8Array":return"int8array";case"Uint8Array":return"uint8array";case"Uint8ClampedArray":return"uint8clampedarray";case"Int16Array":return"int16array";case"Uint16Array":return"uint16array";case"Int32Array":return"int32array";case"Uint32Array":return"uint32array";case"Float32Array":return"float32array";case"Float64Array":return"float64array"}if(bn(t))return"generator";switch(r=pn.call(t),r){case"[object Object]":return"object";case"[object Map Iterator]":return"mapiterator";case"[object Set Iterator]":return"setiterator";case"[object String Iterator]":return"stringiterator";case"[object Array Iterator]":return"arrayiterator"}return r.slice(8,-1).toLowerCase().replace(/\s/g,"")};function Ct(e){return typeof e.constructor=="function"?e.constructor.name:null}function mn(e){return Array.isArray?Array.isArray(e):e instanceof Array}function gn(e){return e instanceof Error||typeof e.message=="string"&&e.constructor&&typeof e.constructor.stackTraceLimit=="number"}function yn(e){return e instanceof Date?!0:typeof e.toDateString=="function"&&typeof e.getDate=="function"&&typeof e.setDate=="function"}function vn(e){return e instanceof RegExp?!0:typeof e.flags=="string"&&typeof e.ignoreCase=="boolean"&&typeof e.multiline=="boolean"&&typeof e.global=="boolean"}function $n(e,t){return Ct(e)==="GeneratorFunction"}function bn(e){return typeof e.throw=="function"&&typeof e.return=="function"&&typeof e.next=="function"}function wn(e){try{if(typeof e.length=="number"&&typeof e.callee=="function")return!0}catch(t){if(t.message.indexOf("callee")!==-1)return!0}return!1}function On(e){return e.constructor&&typeof e.constructor.isBuffer=="function"?e.constructor.isBuffer(e):!1}});var ee=U((Wt,Ft)=>{"use strict";var xn=Ue("util"),It=Yt(),Sn=xe(),m=Wt=Ft.exports;m.extend=_t;m.indexOf=Dn;m.escapeExpression=Un;m.isEmpty=Cn;m.createFrame=Tn;m.blockParams=qn;m.appendContextPath=Yn;var Nn={"&":"&amp;","<":"&lt;",">":"&gt;",'"':"&quot;","'":"&#x27;","`":"&#x60;","=":"&#x3D;"},Mn=/[&<>"'`=]/g,jn=/[&<>"'`=]/;function An(e){return Nn[e]}function _t(e){for(var t=1;t<arguments.length;t++)for(var r in arguments[t])Object.prototype.hasOwnProperty.call(arguments[t],r)&&(e[r]=arguments[t][r]);return e}var nt=Object.prototype.toString;m.toString=nt;var rt=function(t){return typeof t=="function"};rt(/x/)&&(m.isFunction=rt=function(e){return typeof e=="function"&&nt.call(e)==="[object Function]"});m.isFunction=rt;var kn=Array.isArray||function(e){return e&&typeof e=="object"?nt.call(e)==="[object Array]":!1};m.isArray=kn;function Dn(e,t){for(var r=0,n=e.length;r<n;r++)if(e[r]===t)return r;return-1}function Un(e){if(typeof e!="string"){if(e&&e.toHTML)return e.toHTML();if(e==null)return"";if(!e)return e+"";e=""+e}return jn.test(e)?e.replace(Mn,An):e}function Tn(e){var t=_t({},e);return t._parent=e,t}function qn(e,t){return e.path=t,e}function Yn(e,t){return(e?e+".":"")+t}m.expectedType=function(e,t,r){var n=It.types[t],i=xn.inspect(r);return"expected "+e+" to be "+n+" but received "+It(r)+": "+i};m.isBlock=function(e){return m.isOptions(e)&&typeof e.fn=="function"&&typeof e.inverse=="function"};m.fn=function(e,t,r){return m.isOptions(e)?m.fn("",e,r):m.isOptions(t)?m.fn(e,{},t):m.isBlock(r)?r.fn(t):e};m.inverse=function(e,t,r){return m.isOptions(e)?m.identity("",e,r):m.isOptions(t)?m.inverse(e,{},t):m.isBlock(r)?r.inverse(t):e};m.value=function(e,t,r){return m.isOptions(e)?m.value(null,e,r):m.isOptions(t)?m.value(e,{},t):m.isBlock(r)?e?r.fn(t):r.inverse(t):e};m.isOptions=function(e){return m.isObject(e)&&m.isObject(e.hash)};m.isUndefined=function(e){return e==null||m.isOptions(e)&&e.hash!=null};m.isApp=function(e){return m.isObject(e)&&m.isObject(e.options)&&m.isObject(e.app)};m.options=function(e,t,r){if(m.isOptions(e))return m.options({},t,e);if(m.isOptions(t))return m.options(e,r,t);r=r||{},m.isOptions(r)||(t=Object.assign({},t,r));var n=Object.assign({},t,r.hash);return m.isObject(e)&&(n=Object.assign({},e.options,n)),n[r.name]&&(n=Object.assign({},n[r.name],n)),n};m.context=function(e,t,r){if(m.isOptions(e))return m.context({},t,e);if(m.isOptions(t))return m.context(e,r,t);var n=m.isApp(e)?e.context:{};r=r||{},m.isOptions(r)||(t=Object.assign({},t,r)),m.isOptions(r)&&r.hash.root===!0&&(t=Object.assign({},r.data.root,t));var i=Object.assign({},n,t,r.hash);return m.isApp(e)||(i=Object.assign({},e,i)),m.isApp(e)&&e.view&&e.view.data&&(i=Object.assign({},i,e.view.data)),i};m.isObject=function(e){return Sn(e)==="object"};function Cn(e){return e===0||typeof e=="boolean"?!1:e==null||(m.isObject(e)&&(e=Object.keys(e)),!e.length)}m.result=function(e){return typeof e=="function"?e.apply(this,[].slice.call(arguments,1)):e};m.identity=function(e){return e};m.isString=function(e){return typeof e=="string"&&e!==""};m.arrayify=function(e){return e!=null?Array.isArray(e)?e:[e]:[]};m.tryParse=function(e){try{return JSON.parse(e)}catch{}return{}}});var Se=U(he=>{"use strict";var En=ee();he.contains=function(e,t,r){return e==null||t==null||isNaN(e.length)?!1:e.indexOf(t,r)!==-1};he.chop=function(e){if(typeof e!="string")return"";var t=/^[-_.\W\s]+|[-_.\W\s]+$/g;return e.trim().replace(t,"")};he.changecase=function(e,t){if(typeof e!="string")return"";if(e.length===1)return e.toLowerCase();e=he.chop(e).toLowerCase(),typeof t!="function"&&(t=En.identity);var r=/[-_.\W\s]+(\w|$)/g;return e.replace(r,function(n,i){return t(i)})};he.random=function(e,t){return e+Math.floor(Math.random()*(t-e+1))}});var Bt=U((qi,Ht)=>{"use strict";var In=Se(),V=Ht.exports;V.abs=function(e){if(isNaN(e))throw new TypeError("expected a number");return Math.abs(e)};V.add=function(e,t){return!isNaN(e)&&!isNaN(t)?Number(e)+Number(t):typeof e=="string"&&typeof t=="string"?e+t:""};V.avg=function(){let e=[].concat.apply([],arguments);return e.pop(),V.sum(e)/e.length};V.ceil=function(e){if(isNaN(e))throw new TypeError("expected a number");return Math.ceil(e)};V.divide=function(e,t){if(isNaN(e))throw new TypeError("expected the first argument to be a number");if(isNaN(t))throw new TypeError("expected the second argument to be a number");return Number(e)/Number(t)};V.floor=function(e){if(isNaN(e))throw new TypeError("expected a number");return Math.floor(e)};V.minus=function(e,t){if(isNaN(e))throw new TypeError("expected the first argument to be a number");if(isNaN(t))throw new TypeError("expected the second argument to be a number");return Number(e)-Number(t)};V.modulo=function(e,t){if(isNaN(e))throw new TypeError("expected the first argument to be a number");if(isNaN(t))throw new TypeError("expected the second argument to be a number");return Number(e)%Number(t)};V.multiply=function(e,t){if(isNaN(e))throw new TypeError("expected the first argument to be a number");if(isNaN(t))throw new TypeError("expected the second argument to be a number");return Number(e)*Number(t)};V.plus=function(e,t){if(isNaN(e))throw new TypeError("expected the first argument to be a number");if(isNaN(t))throw new TypeError("expected the second argument to be a number");return Number(e)+Number(t)};V.random=function(e,t){if(isNaN(e))throw new TypeError("expected minimum to be a number");if(isNaN(t))throw new TypeError("expected maximum to be a number");return In.random(e,t)};V.remainder=function(e,t){return e%t};V.round=function(e){if(isNaN(e))throw new TypeError("expected a number");return Math.round(e)};V.subtract=function(e,t){if(isNaN(e))throw new TypeError("expected the first argument to be a number");if(isNaN(t))throw new TypeError("expected the second argument to be a number");return Number(e)-Number(t)};V.sum=function(){for(var e=[].concat.apply([],arguments),t=e.length,r=0;t--;)isNaN(e[t])||(r+=Number(e[t]));return r}});var zt=U((Yi,Lt)=>{"use strict";Lt.exports=function(t){return t!=null&&typeof t=="object"&&Array.isArray(t)===!1}});var Ne=U((Ci,Gt)=>{var Jt=zt();Gt.exports=function(e,t,r){if(Jt(r)||(r={default:r}),!Rt(e))return typeof r.default<"u"?r.default:e;typeof t=="number"&&(t=String(t));let n=Array.isArray(t),i=typeof t=="string",u=r.separator||".",s=r.joinChar||(typeof u=="string"?u:".");if(!i&&!n)return e;if(i&&t in e)return it(t,e,r)?e[t]:r.default;let f=n?t:_n(t,u,r),w=f.length,g=0;do{let l=f[g];for(typeof l=="number"&&(l=String(l));l&&l.slice(-1)==="\\";)l=Pt([l.slice(0,-1),f[++g]||""],s,r);if(l in e){if(!it(l,e,r))return r.default;e=e[l]}else{let x=!1,v=g+1;for(;v<w;)if(l=Pt([l,f[v++]],s,r),x=l in e){if(!it(l,e,r))return r.default;e=e[l],g=v-1;break}if(!x)return r.default}}while(++g<w&&Rt(e));return g===w?e:r.default};function Pt(e,t,r){return typeof r.join=="function"?r.join(e):e[0]+t+e[1]}function _n(e,t,r){return typeof r.split=="function"?r.split(e):e.split(t)}function it(e,t,r){return typeof r.isValid=="function"?r.isValid(e,t):!0}function Rt(e){return Jt(e)||Array.isArray(e)||typeof e=="function"}});var ut=U((Ei,Zt)=>{"use strict";Zt.exports=function(t){if(typeof t!="object")throw new TypeError("createFrame expects data to be an object");var r=Object.assign({},t);if(r._parent=t,r.extend=function(s){Object.assign(this,s)},arguments.length>1)for(var n=[].slice.call(arguments,1),i=n.length,u=-1;++u<i;)r.extend(n[u]||{});return r}});var Me=U((Ii,Vt)=>{"use strict";var y=ee(),C=Vt.exports,oe=Ne(),Wn=ut();C.after=function(e,t){return y.isUndefined(e)?"":(e=y.result(e),Array.isArray(e)?e.slice(t):"")};C.arrayify=function(e){return y.isUndefined(e)?[]:e?Array.isArray(e)?e:[e]:[]};C.before=function(e,t){return y.isUndefined(e)?"":(e=y.result(e),Array.isArray(e)?e.slice(0,t-1):"")};C.eachIndex=function(e,t){var r="";if(y.isUndefined(e))return"";if(e=y.result(e),Array.isArray(e))for(var n=0;n<e.length;n++)r+=t.fn({item:e[n],index:n});return r};C.filter=function(e,t,r){if(y.isUndefined(e))return r.inverse(this);if(e=y.result(e),Array.isArray(e)){var n="",i=[],u=r.hash&&(r.hash.property||r.hash.prop);if(u?i=e.filter(function(f){return t===oe(f,u)}):i=e.filter(function(f){return t===f}),i&&i.length>0){for(var s=0;s<i.length;s++)n+=r.fn(i[s]);return n}}return r.inverse(this)};C.first=function(e,t){return y.isUndefined(e)?[]:(e=y.result(e),Array.isArray(e)?isNaN(t)?e[0]:e.slice(0,t):[])};C.forEach=function(e,t){if(y.isUndefined(e))return t.inverse(this);if(e=y.result(e),Array.isArray(e)){for(var r=Wn(t,t.hash),n=e.length,i="",u=-1;++u<n;){var s=e[u];r.index=u,s.index=u+1,s.total=n,s.isFirst=u===0,s.isLast=u===n-1,i+=t.fn(s,{data:r})}return i}return t.inverse(this)};C.inArray=function(e,t,r){return y.isUndefined(e)?"":(e=y.result(e),Array.isArray(e)?y.value(y.indexOf(e,t)>-1,this,r):"")};C.isArray=function(e){return Array.isArray(e)};C.itemAt=function(e,t){if(y.isUndefined(e))return null;if(e=y.result(e),Array.isArray(e)){if(t=isNaN(t)?0:+t,t<0)return e[e.length+t];if(t<e.length)return e[t]}return null};C.join=function(e,t){return y.isUndefined(e)?"":typeof e=="string"?e:(e=y.result(e),Array.isArray(e)?(t=y.isString(t)?t:", ",e.join(t)):"")};C.equalsLength=function(e,t,r){y.isOptions(t)&&(r=t,t=0);var n=C.length(e);return y.value(n===t,this,r)};C.last=function(e,t){return y.isUndefined(e)||!Array.isArray(e)&&typeof value!="string"?"":isNaN(t)?e[e.length-1]:e.slice(-Math.abs(t))};C.length=function(e){return y.isUndefined(e)?0:(y.isObject(e)&&!y.isOptions(e)&&(e=Object.keys(e)),typeof e=="string"&&e.startsWith("[")&&e.endsWith("]")?e.split(",").length:typeof e=="string"||Array.isArray(e)?e.length:0)};C.lengthEqual=C.equalsLength;C.map=function(e,t){if(y.isUndefined(e)||!Array.isArray(e))return"";var r=e.length,n=new Array(r),i=-1;if(typeof t!="function")return e;for(;++i<r;)n[i]=t(e[i],i,e);return n};C.pluck=function(e,t){if(y.isUndefined(e))return"";if(e=y.result(e),Array.isArray(e)){for(var r=[],n=0;n<e.length;n++){var i=oe(e[n],t);typeof i<"u"&&r.push(i)}return r}return""};C.reverse=function(e){return y.isUndefined(e)?"":(e=y.result(e),Array.isArray(e)?(e.reverse(),e):e&&typeof e=="string"?e.split("").reverse().join(""):"")};C.some=function(e,t,r){if(y.isUndefined(e))return r.inverse(this);if(e=y.result(e),Array.isArray(e)){for(var n=0;n<e.length;n++)if(t(e[n],n,e))return r.fn(this)}return r.inverse(this)};C.sort=function(e,t){return y.isUndefined(e)?"":(e=y.result(e),Array.isArray(e)?oe(t,"hash.reverse")?e.sort().reverse():e.sort():"")};C.sortBy=function(e,t,r){if(y.isUndefined(e))return"";if(e=y.result(e),Array.isArray(e)){var n=[].slice.call(arguments);return n.pop(),!y.isString(t)&&typeof t!="function"?e.sort():typeof t=="function"?e.sort(t):e.sort((i,u)=>i[t]>u[t]?1:-1)}return""};C.withAfter=function(e,t,r){if(y.isUndefined(e))return"";if(e=y.result(e),Array.isArray(e)){e=e.slice(t);for(var n="",i=0;i<e.length;i++)n+=r.fn(e[i]);return n}return""};C.withBefore=function(e,t,r){if(y.isUndefined(e))return"";if(e=y.result(e),Array.isArray(e)){e=e.slice(0,-t);for(var n="",i=0;i<e.length;i++)n+=r.fn(e[i]);return n}return""};C.withFirst=function(e,t,r){if(y.isUndefined(e))return"";if(e=y.result(e),Array.isArray(e)){if(y.isUndefined(t)||(t=parseFloat(y.result(t))),y.isUndefined(t))return r=t,r.fn(e[0]);e=e.slice(0,t);for(var n="",i=0;i<e.length;i++)n+=r.fn(e[i]);return n}return""};C.withGroup=function(e,t,r){if(y.isUndefined(e))return"";var n="";if(e=y.result(e),Array.isArray(e)&&e.length>0){for(var i=[],u=0;u<e.length;u++)u>0&&u%t===0&&(n+=r.fn(i),i=[]),i.push(e[u]);n+=r.fn(i)}return n};C.withLast=function(e,t,r){if(y.isUndefined(e))return"";if(e=y.result(e),Array.isArray(e)){if(y.isUndefined(t)||(t=parseFloat(y.result(t))),y.isUndefined(t))return r=t,r.fn(e[e.length-1]);e=e.slice(-t);for(var n=e.length,i=-1,u="";++i<n;)u+=r.fn(e[i]);return u}return""};C.withSort=function(e,t,r){if(y.isUndefined(e))return"";if(e=y.result(e),Array.isArray(e)){var n="";if(y.isUndefined(t)){r=t,e=e.sort(),oe(r,"hash.reverse")&&(e=e.reverse());for(var i=0,u=e.length;i<u;i++)n+=r.fn(e[i]);return n}e.sort(function(w,g){return w=oe(w,t),g=oe(g,t),w>g?1:w<g?-1:0}),oe(r,"hash.reverse")&&(e=e.reverse());for(var s=e.length,f=-1;++f<s;)n+=r.fn(e[f]);return n}return""};C.unique=function(e,t){return y.isUndefined(e)?"":(e=y.result(e),Array.isArray(e)?e.filter(function(r,n,i){return i.indexOf(r)===n}):"")}});var Kt=U((_i,Xt)=>{"use strict";var Qt=ee(),te=Xt.exports;te.bytes=function(e,t,r){if(e==null||isNaN(e)&&(e=e.length,!e))return"0 B";isNaN(t)&&(t=2);var n=["B","kB","MB","GB","TB","PB","EB","ZB","YB"];t=Math.pow(10,t),e=Number(e);for(var i=n.length-1;i-->=0;){var u=Math.pow(10,i*3);if(u<=e+1){e=Math.round(e*t/u)/t,e+=" "+n[i];break}}return e};te.addCommas=function(e){return e.toString().replace(/(\d)(?=(\d\d\d)+(?!\d))/g,"$1,")};te.phoneNumber=function(e){return e=e.toString(),"("+e.substr(0,3)+") "+e.substr(3,3)+"-"+e.substr(6,4)};te.toAbbr=function(e,t){isNaN(e)&&(e=0),Qt.isUndefined(t)&&(t=2),e=Number(e),t=Math.pow(10,t);for(var r=["k","m","b","t","q"],n=r.length-1;n>=0;){var i=Math.pow(10,(n+1)*3);if(i<=e+1){e=Math.round(e*t/i)/t,e+=r[n];break}n--}return e};te.toExponential=function(e,t){return isNaN(e)&&(e=0),Qt.isUndefined(t)&&(t=0),Number(e).toExponential(t)};te.toFixed=function(e,t){return isNaN(e)&&(e=0),isNaN(t)&&(t=0),Number(e).toFixed(t)};te.toFloat=function(e){return parseFloat(e)};te.toInt=function(e){return parseInt(e,10)};te.toPrecision=function(e,t){return isNaN(e)&&(e=0),isNaN(t)&&(t=1),Number(e).toPrecision(t)}});var tr=U((Wi,er)=>{"use strict";var st=Ue("url"),ge=ee(),Fn=Ue("querystring"),ae=er.exports;ae.encodeURI=function(e){if(ge.isString(e))return encodeURIComponent(e)};ae.escape=function(e){if(ge.isString(e))return Fn.escape(e)};ae.decodeURI=function(e){if(ge.isString(e))return decodeURIComponent(e)};ae.urlResolve=function(e,t){return st.resolve(e,t)};ae.urlParse=function(e){return st.parse(e)};ae.stripQuerystring=function(e){if(ge.isString(e))return e.split("?")[0]};ae.stripProtocol=function(e){if(ge.isString(e)){var t=st.parse(e);return t.protocol="",t.format()}}});var ir=U((rr,nr)=>{"use strict";var z=ee(),ce=Se(),A=nr.exports;A.append=function(e,t){return typeof e=="string"&&typeof t=="string"?e+t:e};A.camelcase=function(e){return typeof e!="string"?"":ce.changecase(e,function(t){return t.toUpperCase()})};A.capitalize=function(e){return typeof e!="string"?"":e.charAt(0).toUpperCase()+e.slice(1)};A.capitalizeAll=function(e){if(typeof e!="string")return"";if(z.isString(e))return e.replace(/\w\S*/g,function(t){return A.capitalize(t)})};A.center=function(e,t){if(typeof e!="string")return"";for(var r="",n=0;n<t;)r+="&nbsp;",n++;return r+e+r};A.chop=function(e){return typeof e!="string"?"":ce.chop(e)};A.dashcase=function(e){return typeof e!="string"?"":ce.changecase(e,function(t){return"-"+t})};A.dotcase=function(e){return typeof e!="string"?"":ce.changecase(e,function(t){return"."+t})};A.downcase=function(){return A.lowercase.apply(this,arguments)};A.ellipsis=function(e,t){if(z.isString(e))return e.length<=t?e:A.truncate(e,t)+"\u2026"};A.hyphenate=function(e){return typeof e!="string"?"":e.split(" ").join("-")};A.isString=function(e){return typeof e=="string"};A.lowercase=function(e){return z.isObject(e)&&e.fn?e.fn(this).toLowerCase():typeof e!="string"?"":e.toLowerCase()};A.occurrences=function(e,t){if(typeof e!="string")return"";for(var r=t.length,n=0,i=0;(n=e.indexOf(t,n))>-1;)i++,n+=r;return i};A.pascalcase=function(e){return typeof e!="string"?"":(e=ce.changecase(e,function(t){return t.toUpperCase()}),e.charAt(0).toUpperCase()+e.slice(1))};A.pathcase=function(e){return typeof e!="string"?"":ce.changecase(e,function(t){return"/"+t})};A.plusify=function(e,t){return typeof e!="string"?"":(z.isString(t)||(t=" "),e.split(t).join("+"))};A.prepend=function(e,t){return typeof e=="string"&&typeof t=="string"?t+e:e};A.raw=function(e){var t=e.fn(),r=z.options(this,e);if(r.escape!==!1)for(var n=0;(n=t.indexOf("{{",n))!==-1;)t[n-1]!=="\\"&&(t=t.slice(0,n)+"\\"+t.slice(n)),n+=3;return t};A.remove=function(e,t){return typeof e!="string"?"":z.isString(t)?e.split(t).join(""):e};A.removeFirst=function(e,t){return typeof e!="string"?"":z.isString(t)?e.replace(t,""):e};A.replace=function(e,t,r){return typeof e!="string"?"":z.isString(t)?(z.isString(r)||(r=""),e.split(t).join(r)):e};A.replaceFirst=function(e,t,r){return typeof e!="string"?"":z.isString(t)?(z.isString(r)||(r=""),e.replace(t,r)):e};A.reverse=Me().reverse;A.sentence=function(e){return typeof e!="string"?"":e.replace(/((?:\S[^\.\?\!]*)[\.\?\!]*)/g,function(t){return t.charAt(0).toUpperCase()+t.substr(1).toLowerCase()})};A.snakecase=function(e){return typeof e!="string"?"":ce.changecase(e,function(t){return"_"+t})};A.split=function(e,t){return typeof e!="string"?"":(z.isString(t)||(t=","),e.split(t))};A.startsWith=function(e,t,r){var n=[].slice.call(arguments);return r=n.pop(),z.isString(t)&&t.indexOf(e)===0?r.fn(this):typeof r.inverse=="function"?r.inverse(this):""};A.titleize=function(e){if(typeof e!="string")return"";for(var t=e.replace(/[- _]+/g," "),r=t.split(" "),n=r.length,i=[],u=0;n--;){var s=r[u++];i.push(rr.capitalize(s))}return i.join(" ")};A.trim=function(e){return typeof e=="string"?e.trim():""};A.trimLeft=function(e){if(z.isString(e))return e.replace(/^\s+/,"")};A.trimRight=function(e){if(z.isString(e))return e.replace(/\s+$/,"")};A.truncate=function(e,t,r){if(z.isString(e))return typeof r!="string"&&(r=""),e.length>t?e.slice(0,t-r.length)+r:e};A.truncateWords=function(e,t,r){if(z.isString(e)&&!isNaN(t)){typeof r!="string"&&(r="\u2026");var n=Number(t),i=e.split(/[ \t]/);if(n>=i.length)return e;i=i.slice(0,n);var u=i.join(" ").trim();return u+r}};A.upcase=function(){return A.uppercase.apply(this,arguments)};A.uppercase=function(e){return z.isObject(e)&&e.fn?e.fn(this).toUpperCase():typeof e!="string"?"":e.toUpperCase()}});var sr=U((Fi,ur)=>{"use strict";var Hn=xe();ur.exports=function e(t){switch(Hn(t)){case"boolean":case"date":case"function":case"null":case"number":return!0;case"undefined":return!1;case"regexp":return t.source!=="(?:)"&&t.source!=="";case"buffer":return t.toString()!=="";case"error":return t.message!=="";case"string":case"arguments":return t.length!==0;case"file":case"map":case"set":return t.size!==0;case"array":case"object":for(let r of Object.keys(t))if(e(t[r]))return!0;return!1;default:return!0}}});var or=U((Hi,fr)=>{"use strict";var Bn=Ne(),Ln=sr();fr.exports=function(e,t,r){return zn(e)&&(typeof t=="string"||Array.isArray(t))?Ln(Bn(e,t,r)):!1};function zn(e){return e!=null&&(typeof e=="object"||typeof e=="function"||Array.isArray(e))}});var cr=U((Bi,ar)=>{"use strict";function ft(e,t){if(!e)return!0;let r=t||ft.keywords;Array.isArray(r)||(r=[r]);let n=typeof e=="string"?e.toLowerCase():null;for(let i of r)if(i===e||i===n)return!0;return!1}ft.keywords=["0","false","nada","nil","nay","nah","negative","no","none","nope","nul","null","nix","nyet","uh-uh","veto","zero"];ar.exports=ft});var dr=U((Li,lr)=>{"use strict";lr.exports=function(t){let r=Math.abs(t);if(isNaN(r))throw new TypeError("expected a number");if(!Number.isInteger(r))throw new Error("expected an integer");if(!Number.isSafeInteger(r))throw new Error("value exceeds maximum safe integer");return r%2===1}});var gr=U((zi,mr)=>{"use strict";var Pn=or(),k=ee(),Rn=Se(),hr=cr(),pr=dr(),W=mr.exports;W.and=function(){for(var e=arguments.length-1,t=arguments[e],r=!0,n=0;n<e;n++)if(!arguments[n]){r=!1;break}return k.value(r,this,t)};W.compare=function(e,t,r,n){if(arguments.length<4)throw new Error("handlebars Helper {{compare}} expects 4 arguments");var i;switch(t){case"==":i=e==r;break;case"===":i=e===r;break;case"!=":i=e!=r;break;case"!==":i=e!==r;break;case"<":i=e<r;break;case">":i=e>r;break;case"<=":i=e<=r;break;case">=":i=e>=r;break;case"typeof":i=typeof e===r;break;default:throw new Error("helper {{compare}}: invalid operator: `"+t+"`")}return k.value(i,this,n)};W.contains=function(e,t,r,n){typeof r=="object"&&(n=r,r=void 0);var i=Rn.contains(e,t,r);return k.value(i,this,n)};W.default=function(){for(var e=0;e<arguments.length-1;e++)if(arguments[e]!=null)return arguments[e];return""};W.eq=function(e,t,r){return arguments.length===2&&(r=t,t=r.hash.compare),k.value(e===t,this,r)};W.gt=function(e,t,r){return arguments.length===2&&(r=t,t=r.hash.compare),k.value(e>t,this,r)};W.gte=function(e,t,r){return arguments.length===2&&(r=t,t=r.hash.compare),k.value(e>=t,this,r)};W.has=function(e,t,r){return k.isOptions(e)&&(r=e,t=null,e=null),k.isOptions(t)&&(r=t,t=null),e===null?k.value(!1,this,r):arguments.length===2?k.value(Pn(this,e),this,r):(Array.isArray(e)||k.isString(e))&&k.isString(t)&&e.indexOf(t)>-1?k.fn(!0,this,r):k.isObject(e)&&k.isString(t)&&t in e?k.fn(!0,this,r):k.inverse(!1,this,r)};W.isFalsey=function(e,t){return k.value(hr(e),this,t)};W.isTruthy=function(e,t){return k.value(!hr(e),this,t)};W.ifEven=function(e,t){return k.value(!pr(e),this,t)};W.ifNth=function(e,t,r){var n=!isNaN(e)&&!isNaN(t)&&t%e===0;return k.value(n,this,r)};W.ifOdd=function(e,t){return k.value(pr(e),this,t)};W.is=function(e,t,r){return arguments.length===2&&(r=t,t=r.hash.compare),k.value(e==t,this,r)};W.isnt=function(e,t,r){return arguments.length===2&&(r=t,t=r.hash.compare),k.value(e!=t,this,r)};W.lt=function(e,t,r){return arguments.length===2&&(r=t,t=r.hash.compare),k.value(e<t,this,r)};W.lte=function(e,t,r){return arguments.length===2&&(r=t,t=r.hash.compare),k.value(e<=t,this,r)};W.neither=function(e,t,r){return k.value(!e&&!t,this,r)};W.not=function(e,t){return k.value(!e,this,t)};W.or=function(){for(var e=arguments.length-1,t=arguments[e],r=!1,n=0;n<e;n++)if(arguments[n]){r=!0;break}return k.value(r,this,t)};W.unlessEq=function(e,t,r){return k.isOptions(t)&&(r=t,t=r.hash.compare),k.value(e!==t,this,r)};W.unlessGt=function(e,t,r){return k.isOptions(t)&&(r=t,t=r.hash.compare),k.value(e<=t,this,r)};W.unlessLt=function(e,t,r){return k.isOptions(t)&&(r=t,t=r.hash.compare),k.value(e>=t,this,r)};W.unlessGteq=function(e,t,r){return k.isOptions(t)&&(r=t,t=r.hash.compare),k.value(e<t,this,r)};W.unlessLteq=function(e,t,r){return k.isOptions(t)&&(r=t,t=r.hash.compare),k.value(e>t,this,r)}});var vr=U((Pi,yr)=>{var Jn=et(),Gn=Object.prototype.toString;yr.exports=function(t){if(typeof t>"u")return"undefined";if(t===null)return"null";if(t===!0||t===!1||t instanceof Boolean)return"boolean";if(typeof t=="string"||t instanceof String)return"string";if(typeof t=="number"||t instanceof Number)return"number";if(typeof t=="function"||t instanceof Function)return"function";if(typeof Array.isArray<"u"&&Array.isArray(t))return"array";if(t instanceof RegExp)return"regexp";if(t instanceof Date)return"date";var r=Gn.call(t);return r==="[object RegExp]"?"regexp":r==="[object Date]"?"date":r==="[object Arguments]"?"arguments":r==="[object Error]"?"error":Jn(t)?"buffer":r==="[object Set]"?"set":r==="[object WeakSet]"?"weakset":r==="[object Map]"?"map":r==="[object WeakMap]"?"weakmap":r==="[object Symbol]"?"symbol":r==="[object Int8Array]"?"int8array":r==="[object Uint8Array]"?"uint8array":r==="[object Uint8ClampedArray]"?"uint8clampedarray":r==="[object Int16Array]"?"int16array":r==="[object Uint16Array]"?"uint16array":r==="[object Int32Array]"?"int32array":r==="[object Uint32Array]"?"uint32array":r==="[object Float32Array]"?"float32array":r==="[object Float64Array]"?"float64array":"object"}});var br=U((Ri,$r)=>{"use strict";var Zn=vr();$r.exports=function(t){var r=Zn(t);if(r!=="number"&&r!=="string")return!1;var n=+t;return n-n+1>=0&&t!==""}});var Or=U((Ji,wr)=>{"use strict";var Vn=br();wr.exports=function(t,r){if(!r)return t;if(!t)return{};for(var n=String(r).split(/[[.\]]/).filter(Boolean),i=n[n.length-1],u={};r=n.shift();)if(t=t[r],!t)return{};return Vn(i)?[t]:(u[i]=t,u)}});var Mr=U((Gi,Nr)=>{"use strict";var Qn=Object.hasOwnProperty,ye=ee(),Xn=Me(),P=Nr.exports,Kn=Ne(),xr=Or(),Sr=ut();P.extend=function(){var e=[].slice.call(arguments),t={};ye.isOptions(e[e.length-1])&&(t=e.pop().hash,e.push(t));for(var r={},n=0;n<e.length;n++){var i=e[n];if(ye.isObject(i))for(var u=Object.keys(i),s=0;s<u.length;s++){var f=u[s];r[f]=i[f]}}return r};P.forIn=function(e,t){if(!ye.isOptions(t))return e.inverse(this);var r=Sr(t,t.hash),n="";for(var i in e)r.key=i,n+=t.fn(e[i],{data:r});return n};P.forOwn=function(e,t){if(!ye.isOptions(t))return e.inverse(this);var r=Sr(t,t.hash),n="";for(var i in e)e.hasOwnProperty(i)&&(r.key=i,n+=t.fn(e[i],{data:r}));return n};P.toPath=function(){for(var e=[],t=0;t<arguments.length;t++)(typeof arguments[t]=="string"||typeof arguments[t]=="number")&&e.push(arguments[t]);return e.join(".")};P.get=function(e,t,r){var n=Kn(t,e);return r&&r.fn?n?r.fn(n):r.inverse(t):n};P.getObject=function(e,t){return xr(t,e)};P.hasOwn=function(e,t){return Qn.call(e,t)};P.isObject=function(e){return typeof e=="object"};P.JSONparse=function(e,t){return JSON.parse(e)};P.JSONstringify=function(e,t){return isNaN(t)&&(t=0),JSON.stringify(e,null,t)};P.merge=function(e){var t=[].slice.call(arguments),r={};return ye.isOptions(t[t.length-1])&&(r=t.pop().hash,t.push(r)),Object.assign.apply(null,t)};P.parseJSON=P.JSONparse;P.pick=function(e,t,r){for(var n=Xn.arrayify(e),i=n.length,u=-1,s={};++u<i;)s=P.extend({},s,xr(t,n[u]));return r.fn?Object.keys(s).length?r.fn(s):r.inverse(t):s};P.stringify=P.JSONstringify});var kr=U((Zi,Ar)=>{"use strict";var ei=ee(),jr=Ar.exports,ti=xe();jr.toRegex=function(e,t,r){var n=ei.options({},t,r);return new RegExp(e,n.flags)};jr.test=function(e,t){if(typeof e!="string")return!1;if(ti(t)!=="regexp")throw new TypeError("expected a regular expression");return t.test(e)}});import ri from"crypto";function ve(){return je>Ae.length-16&&(ri.randomFillSync(Ae),je=0),Ae.slice(je,je+=16)}var Ae,je,ot=Z(()=>{Ae=new Uint8Array(256),je=Ae.length});var Dr,Ur=Z(()=>{Dr=/^(?:[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}|00000000-0000-0000-0000-000000000000)$/i});function ni(e){return typeof e=="string"&&Dr.test(e)}var ne,$e=Z(()=>{Ur();ne=ni});function le(e,t=0){return R[e[t+0]]+R[e[t+1]]+R[e[t+2]]+R[e[t+3]]+"-"+R[e[t+4]]+R[e[t+5]]+"-"+R[e[t+6]]+R[e[t+7]]+"-"+R[e[t+8]]+R[e[t+9]]+"-"+R[e[t+10]]+R[e[t+11]]+R[e[t+12]]+R[e[t+13]]+R[e[t+14]]+R[e[t+15]]}function ii(e,t=0){let r=le(e,t);if(!ne(r))throw TypeError("Stringified UUID is invalid");return r}var R,Tr,be=Z(()=>{$e();R=[];for(let e=0;e<256;++e)R.push((e+256).toString(16).slice(1));Tr=ii});function ui(e,t,r){let n=t&&r||0,i=t||new Array(16);e=e||{};let u=e.node||qr,s=e.clockseq!==void 0?e.clockseq:at;if(u==null||s==null){let v=e.random||(e.rng||ve)();u==null&&(u=qr=[v[0]|1,v[1],v[2],v[3],v[4],v[5]]),s==null&&(s=at=(v[6]<<8|v[7])&16383)}let f=e.msecs!==void 0?e.msecs:Date.now(),w=e.nsecs!==void 0?e.nsecs:lt+1,g=f-ct+(w-lt)/1e4;if(g<0&&e.clockseq===void 0&&(s=s+1&16383),(g<0||f>ct)&&e.nsecs===void 0&&(w=0),w>=1e4)throw new Error("uuid.v1(): Can't create more than 10M uuids/sec");ct=f,lt=w,at=s,f+=122192928e5;let l=((f&268435455)*1e4+w)%4294967296;i[n++]=l>>>24&255,i[n++]=l>>>16&255,i[n++]=l>>>8&255,i[n++]=l&255;let x=f/4294967296*1e4&268435455;i[n++]=x>>>8&255,i[n++]=x&255,i[n++]=x>>>24&15|16,i[n++]=x>>>16&255,i[n++]=s>>>8|128,i[n++]=s&255;for(let v=0;v<6;++v)i[n+v]=u[v];return t||le(i)}var qr,at,ct,lt,Yr,Cr=Z(()=>{ot();be();ct=0,lt=0;Yr=ui});function si(e){if(!ne(e))throw TypeError("Invalid UUID");let t,r=new Uint8Array(16);return r[0]=(t=parseInt(e.slice(0,8),16))>>>24,r[1]=t>>>16&255,r[2]=t>>>8&255,r[3]=t&255,r[4]=(t=parseInt(e.slice(9,13),16))>>>8,r[5]=t&255,r[6]=(t=parseInt(e.slice(14,18),16))>>>8,r[7]=t&255,r[8]=(t=parseInt(e.slice(19,23),16))>>>8,r[9]=t&255,r[10]=(t=parseInt(e.slice(24,36),16))/1099511627776&255,r[11]=t/4294967296&255,r[12]=t>>>24&255,r[13]=t>>>16&255,r[14]=t>>>8&255,r[15]=t&255,r}var ke,dt=Z(()=>{$e();ke=si});function fi(e){e=unescape(encodeURIComponent(e));let t=[];for(let r=0;r<e.length;++r)t.push(e.charCodeAt(r));return t}function we(e,t,r){function n(i,u,s,f){var w;if(typeof i=="string"&&(i=fi(i)),typeof u=="string"&&(u=ke(u)),((w=u)===null||w===void 0?void 0:w.length)!==16)throw TypeError("Namespace must be array-like (16 iterable integer values, 0-255)");let g=new Uint8Array(16+i.length);if(g.set(u),g.set(i,u.length),g=r(g),g[6]=g[6]&15|t,g[8]=g[8]&63|128,s){f=f||0;for(let l=0;l<16;++l)s[f+l]=g[l];return s}return le(g)}try{n.name=e}catch{}return n.DNS=oi,n.URL=ai,n}var oi,ai,ht=Z(()=>{be();dt();oi="6ba7b810-9dad-11d1-80b4-00c04fd430c8",ai="6ba7b811-9dad-11d1-80b4-00c04fd430c8"});import ci from"crypto";function li(e){return Array.isArray(e)?e=Buffer.from(e):typeof e=="string"&&(e=Buffer.from(e,"utf8")),ci.createHash("md5").update(e).digest()}var Er,Ir=Z(()=>{Er=li});var di,_r,Wr=Z(()=>{ht();Ir();di=we("v3",48,Er),_r=di});import hi from"crypto";var pt,Fr=Z(()=>{pt={randomUUID:hi.randomUUID}});function pi(e,t,r){if(pt.randomUUID&&!t&&!e)return pt.randomUUID();e=e||{};let n=e.random||(e.rng||ve)();if(n[6]=n[6]&15|64,n[8]=n[8]&63|128,t){r=r||0;for(let i=0;i<16;++i)t[r+i]=n[i];return t}return le(n)}var Hr,Br=Z(()=>{Fr();ot();be();Hr=pi});import mi from"crypto";function gi(e){return Array.isArray(e)?e=Buffer.from(e):typeof e=="string"&&(e=Buffer.from(e,"utf8")),mi.createHash("sha1").update(e).digest()}var Lr,zr=Z(()=>{Lr=gi});var yi,Pr,Rr=Z(()=>{ht();zr();yi=we("v5",80,Lr),Pr=yi});var Jr,Gr=Z(()=>{Jr="00000000-0000-0000-0000-000000000000"});function vi(e){if(!ne(e))throw TypeError("Invalid UUID");return parseInt(e.slice(14,15),16)}var Zr,Vr=Z(()=>{$e();Zr=vi});var Qr={};on(Qr,{NIL:()=>Jr,parse:()=>ke,stringify:()=>Tr,v1:()=>Yr,v3:()=>_r,v4:()=>Hr,v5:()=>Pr,validate:()=>ne,version:()=>Zr});var Xr=Z(()=>{Cr();Wr();Br();Rr();Gr();Vr();$e();be();dt()});var en=U((Wu,Kr)=>{var $i=(Xr(),cn(Qr)),bi=Kr.exports;bi.uuid=function(){return $i.v4()}});var nn=U((Fu,mt)=>{var{date:wi,duration:Oi}=Mt(),xi={math:Bt(),array:Me(),number:Kt(),url:tr(),string:ir(),comparison:gr(),object:Mr(),regex:kr(),uuid:en()},rn=["sortBy"];mt.exports.helpersToRemoveForJs=rn;var tn={date:wi,duration:Oi},ie;mt.exports.getJsHelperList=()=>{if(ie)return ie;ie={};for(let e of Object.values(xi))for(let[t,r]of Object.entries(e))ie[t]=(...n)=>r(...n,{});for(let e of Object.keys(tn))ie[e]=tn[e];for(let e of rn)delete ie[e];return Object.freeze(ie),ie}});var{getJsHelperList:Si}=nn(),Ni=Si(),Hu={...Ni,stripProtocol:helpersStripProtocol};export{Hu as default};
+/*! Bundled license information:
+
+is-buffer/index.js:
+  (*!
+   * Determine if an object is a Buffer
+   *
+   * @author   Feross Aboukhadijeh <https://feross.org>
+   * @license  MIT
+   *)
+
+isobject/index.js:
+  (*!
+   * isobject <https://github.com/jonschlinkert/isobject>
+   *
+   * Copyright (c) 2014-2017, Jon Schlinkert.
+   * Released under the MIT License.
+   *)
+
+get-value/index.js:
+  (*!
+   * get-value <https://github.com/jonschlinkert/get-value>
+   *
+   * Copyright (c) 2014-2018, Jon Schlinkert.
+   * Released under the MIT License.
+   *)
+
+has-values/index.js:
+  (*!
+   * has-values <https://github.com/jonschlinkert/has-values>
+   *
+   * Copyright (c) 2014-2018, Jon Schlinkert.
+   * Released under the MIT License.
+   *)
+
+has-value/index.js:
+  (*!
+   * has-value <https://github.com/jonschlinkert/has-value>
+   *
+   * Copyright (c) 2014-2018, Jon Schlinkert.
+   * Released under the MIT License.
+   *)
+
+is-number/index.js:
+  (*!
+   * is-number <https://github.com/jonschlinkert/is-number>
+   *
+   * Copyright (c) 2014-2015, Jon Schlinkert.
+   * Licensed under the MIT License.
+   *)
+
+get-object/index.js:
+  (*!
+   * get-object <https://github.com/jonschlinkert/get-object>
+   *
+   * Copyright (c) 2014 Jon Schlinkert, contributors.
+   * Licensed under the MIT License
+   *)
+*/
diff --git a/packages/server/src/jsRunner/bundles/index-helpers.ts b/packages/server/src/jsRunner/bundles/index-helpers.ts
new file mode 100644
index 0000000000..fc3c860f20
--- /dev/null
+++ b/packages/server/src/jsRunner/bundles/index-helpers.ts
@@ -0,0 +1,12 @@
+const {
+  getJsHelperList,
+} = require("../../../../string-templates/src/helpers/list.js")
+
+const helpers = getJsHelperList()
+export default {
+  ...helpers,
+  // pointing stripProtocol to a unexisting function to be able to declare it on isolated-vm
+  // @ts-ignore
+  // eslint-disable-next-line no-undef
+  stripProtocol: helpersStripProtocol,
+}
diff --git a/packages/server/src/jsRunner/bundles/index.ts b/packages/server/src/jsRunner/bundles/index.ts
new file mode 100644
index 0000000000..37e677ef46
--- /dev/null
+++ b/packages/server/src/jsRunner/bundles/index.ts
@@ -0,0 +1,28 @@
+import { utils } from "@budibase/shared-core"
+import environment from "../../environment"
+import fs from "fs"
+
+export const enum BundleType {
+  HELPERS = "helpers",
+  BSON = "bson",
+}
+
+const bundleSourceCode = {
+  [BundleType.HELPERS]: "../bundles/index-helpers.ivm.bundle.js",
+  [BundleType.BSON]: "../bundles/bson.ivm.bundle.js",
+}
+
+export function loadBundle(type: BundleType) {
+  if (environment.isJest()) {
+    return fs.readFileSync(require.resolve(bundleSourceCode[type]), "utf-8")
+  }
+
+  switch (type) {
+    case BundleType.HELPERS:
+      return require("../bundles/index-helpers.ivm.bundle.js")
+    case BundleType.BSON:
+      return require("../bundles/bson.ivm.bundle.js")
+    default:
+      utils.unreachable(type)
+  }
+}
diff --git a/packages/server/src/jsRunner.ts b/packages/server/src/jsRunner/index.ts
similarity index 77%
rename from packages/server/src/jsRunner.ts
rename to packages/server/src/jsRunner/index.ts
index 9594ffaf65..e39dab1313 100644
--- a/packages/server/src/jsRunner.ts
+++ b/packages/server/src/jsRunner/index.ts
@@ -1,15 +1,16 @@
 import vm from "vm"
-import env from "./environment"
-import { setJSRunner } from "@budibase/string-templates"
-import { context, timers } from "@budibase/backend-core"
+import env from "../environment"
+import { setJSRunner, setOnErrorLog } from "@budibase/string-templates"
+import { context, logging, timers } from "@budibase/backend-core"
 import tracer from "dd-trace"
+import { serializeError } from "serialize-error"
 
 type TrackerFn = <T>(f: () => T) => T
 
 export function init() {
   setJSRunner((js: string, ctx: vm.Context) => {
     return tracer.trace("runJS", {}, span => {
-      const perRequestLimit = env.JS_PER_REQUEST_TIME_LIMIT_MS
+      const perRequestLimit = env.JS_PER_REQUEST_TIMEOUT_MS
       let track: TrackerFn = f => f()
       if (perRequestLimit) {
         const bbCtx = tracer.trace("runJS.getCurrentContext", {}, span =>
@@ -53,9 +54,15 @@ export function init() {
       vm.createContext(ctx)
       return track(() =>
         vm.runInNewContext(js, ctx, {
-          timeout: env.JS_PER_EXECUTION_TIME_LIMIT_MS,
+          timeout: env.JS_PER_INVOCATION_TIMEOUT_MS,
         })
       )
     })
   })
+
+  if (env.LOG_JS_ERRORS) {
+    setOnErrorLog((error: Error) => {
+      logging.logWarn(JSON.stringify(serializeError(error)))
+    })
+  }
 }
diff --git a/packages/server/src/jsRunner/tests/jsRunner.spec.ts b/packages/server/src/jsRunner/tests/jsRunner.spec.ts
new file mode 100644
index 0000000000..04f1bf20f1
--- /dev/null
+++ b/packages/server/src/jsRunner/tests/jsRunner.spec.ts
@@ -0,0 +1,83 @@
+// import { validate as isValidUUID } from "uuid"
+
+jest.mock("@budibase/handlebars-helpers/lib/math", () => {
+  const actual = jest.requireActual("@budibase/handlebars-helpers/lib/math")
+
+  return {
+    ...actual,
+    random: () => 10,
+  }
+})
+jest.mock("@budibase/handlebars-helpers/lib/uuid", () => {
+  const actual = jest.requireActual("@budibase/handlebars-helpers/lib/uuid")
+
+  return {
+    ...actual,
+    uuid: () => "f34ebc66-93bd-4f7c-b79b-92b5569138bc",
+  }
+})
+
+import { processStringSync, encodeJSBinding } from "@budibase/string-templates"
+
+const { runJsHelpersTests } = require("@budibase/string-templates/test/utils")
+
+import tk from "timekeeper"
+import { init } from ".."
+import TestConfiguration from "../../tests/utilities/TestConfiguration"
+
+tk.freeze("2021-01-21T12:00:00")
+
+describe("jsRunner", () => {
+  const config = new TestConfiguration()
+
+  beforeAll(async () => {
+    // Register js runner
+    init()
+    await config.init()
+  })
+
+  const processJS = (js: string, context?: object) => {
+    return config.doInContext(config.getAppId(), async () =>
+      processStringSync(encodeJSBinding(js), context || {})
+    )
+  }
+
+  it("it can run a basic javascript", async () => {
+    const output = await processJS(`return 1 + 2`)
+    expect(output).toBe(3)
+  })
+
+  // TODO This should be reenabled when running on isolated-vm
+  it.skip("should prevent sandbox escape", async () => {
+    const output = await processJS(
+      `return this.constructor.constructor("return process")()`
+    )
+    expect(output).toBe("Error while executing JS")
+  })
+
+  describe("helpers", () => {
+    runJsHelpersTests({
+      funcWrap: (func: any) => config.doInContext(config.getAppId(), func),
+      // testsToSkip: ["random", "uuid"],
+    })
+
+    // describe("uuid", () => {
+    //   it("uuid helper returns a valid uuid", async () => {
+    //     const result = await processJS("return helpers.uuid()")
+    //     expect(result).toBeDefined()
+    //     expect(isValidUUID(result)).toBe(true)
+    //   })
+    // })
+
+    // describe("random", () => {
+    //   it("random helper returns a valid number", async () => {
+    //     const min = 1
+    //     const max = 8
+    //     const result = await processJS(`return helpers.random(${min}, ${max})`)
+    //     expect(result).toBeDefined()
+    //     expect(result).toBeGreaterThanOrEqual(min)
+    //     expect(result).toBeLessThanOrEqual(max)
+    //   })
+    // })
+  })
+})
diff --git a/packages/server/src/jsRunner/vm/index.ts b/packages/server/src/jsRunner/vm/index.ts
new file mode 100644
index 0000000000..ab26f3f6d1
--- /dev/null
+++ b/packages/server/src/jsRunner/vm/index.ts
@@ -0,0 +1,270 @@
+import ivm from "isolated-vm"
+import bson from "bson"
+
+import url from "url"
+import crypto from "crypto"
+import querystring from "querystring"
+
+import { BundleType, loadBundle } from "../bundles"
+import { VM } from "@budibase/types"
+
+class ExecutionTimeoutError extends Error {
+  constructor(message: string) {
+    super(message)
+    this.name = "ExecutionTimeoutError"
+  }
+}
+
+class ModuleHandler {
+  private modules: {
+    import: string
+    moduleKey: string
+    module: ivm.Module
+  }[] = []
+
+  private generateRandomKey = () => `i${crypto.randomUUID().replace(/-/g, "")}`
+
+  registerModule(module: ivm.Module, imports: string) {
+    this.modules.push({
+      moduleKey: this.generateRandomKey(),
+      import: imports,
+      module: module,
+    })
+  }
+
+  generateImports() {
+    return this.modules
+      .map(m => `import ${m.import} from "${m.moduleKey}"`)
+      .join(";")
+  }
+
+  getModule(key: string) {
+    const module = this.modules.find(m => m.moduleKey === key)
+    return module?.module
+  }
+}
+
+export class IsolatedVM implements VM {
+  private isolate: ivm.Isolate
+  private vm: ivm.Context
+  private jail: ivm.Reference
+  private invocationTimeout: number
+  private isolateAccumulatedTimeout?: number
+
+  // By default the wrapper returns itself
+  private codeWrapper: (code: string) => string = code => code
+
+  private moduleHandler = new ModuleHandler()
+
+  private readonly resultKey = "results"
+
+  constructor({
+    memoryLimit,
+    invocationTimeout,
+    isolateAccumulatedTimeout,
+  }: {
+    memoryLimit: number
+    invocationTimeout: number
+    isolateAccumulatedTimeout?: number
+  }) {
+    this.isolate = new ivm.Isolate({ memoryLimit })
+    this.vm = this.isolate.createContextSync()
+    this.jail = this.vm.global
+    this.jail.setSync("global", this.jail.derefInto())
+
+    this.addToContext({
+      [this.resultKey]: { out: "" },
+    })
+
+    this.invocationTimeout = invocationTimeout
+    this.isolateAccumulatedTimeout = isolateAccumulatedTimeout
+  }
+
+  withHelpers() {
+    const urlModule = this.registerCallbacks({
+      resolve: url.resolve,
+      parse: url.parse,
+    })
+
+    const querystringModule = this.registerCallbacks({
+      escape: querystring.escape,
+    })
+
+    this.addToContext({
+      helpersStripProtocol: new ivm.Callback((str: string) => {
+        var parsed = url.parse(str) as any
+        parsed.protocol = ""
+        return parsed.format()
+      }),
+    })
+
+    const injectedRequire = `const require=function req(val) {
+        switch (val) {
+            case "url": return ${urlModule};
+            case "querystring": return ${querystringModule};
+        }
+      }`
+    const helpersSource = loadBundle(BundleType.HELPERS)
+    const helpersModule = this.isolate.compileModuleSync(
+      `${injectedRequire};${helpersSource}`
+    )
+
+    helpersModule.instantiateSync(this.vm, specifier => {
+      if (specifier === "crypto") {
+        const cryptoModule = this.registerCallbacks({
+          randomUUID: crypto.randomUUID,
+        })
+        const module = this.isolate.compileModuleSync(
+          `export default ${cryptoModule}`
+        )
+        module.instantiateSync(this.vm, specifier => {
+          throw new Error(`No imports allowed. Required: ${specifier}`)
+        })
+        return module
+      }
+      throw new Error(`No imports allowed. Required: ${specifier}`)
+    })
+
+    this.moduleHandler.registerModule(helpersModule, "helpers")
+    return this
+  }
+
+  withContext(context: Record<string, any>) {
+    this.addToContext(context)
+
+    return this
+  }
+
+  withParsingBson(data: any) {
+    this.addToContext({
+      bsonData: bson.BSON.serialize({ data }),
+    })
+
+    // If we need to parse bson, we follow the next steps:
+    // 1. Serialise the data from potential BSON to buffer before passing it to the isolate
+    // 2. Deserialise the data within the isolate, to get the original data
+    // 3. Process script
+    // 4. Stringify the result in order to convert the result from BSON to json
+    this.codeWrapper = code =>
+      `(function(){
+            const data = deserialize(bsonData, { validation: { utf8: false } }).data;
+            const result = ${code}
+            return toJson(result);
+        })();`
+
+    const bsonSource = loadBundle(BundleType.BSON)
+
+    this.addToContext({
+      textDecoderCb: new ivm.Callback(
+        (args: {
+          constructorArgs: any
+          functionArgs: Parameters<InstanceType<typeof TextDecoder>["decode"]>
+        }) => {
+          const result = new TextDecoder(...args.constructorArgs).decode(
+            ...args.functionArgs
+          )
+          return result
+        }
+      ),
+    })
+
+    // "Polyfilling" text decoder. `bson.deserialize` requires decoding. We are creating a bridge function so we don't need to inject the full library
+    const textDecoderPolyfill = class TextDecoder {
+      constructorArgs
+
+      constructor(...constructorArgs: any) {
+        this.constructorArgs = constructorArgs
+      }
+
+      decode(...input: any) {
+        // @ts-ignore
+        return textDecoderCb({
+          constructorArgs: this.constructorArgs,
+          functionArgs: input,
+        })
+      }
+    }.toString()
+    const bsonModule = this.isolate.compileModuleSync(
+      `${textDecoderPolyfill};${bsonSource}`
+    )
+    bsonModule.instantiateSync(this.vm, specifier => {
+      throw new Error(`No imports allowed. Required: ${specifier}`)
+    })
+
+    this.moduleHandler.registerModule(bsonModule, "{deserialize, toJson}")
+
+    return this
+  }
+
+  execute(code: string): any {
+    if (this.isolateAccumulatedTimeout) {
+      const cpuMs = Number(this.isolate.cpuTime) / 1e6
+      if (cpuMs > this.isolateAccumulatedTimeout) {
+        throw new ExecutionTimeoutError(
+          `CPU time limit exceeded (${cpuMs}ms > ${this.isolateAccumulatedTimeout}ms)`
+        )
+      }
+    }
+
+    code = `${this.moduleHandler.generateImports()};results.out=${this.codeWrapper(
+      code
+    )};`
+
+    const script = this.isolate.compileModuleSync(code)
+
+    script.instantiateSync(this.vm, specifier => {
+      const module = this.moduleHandler.getModule(specifier)
+      if (module) {
+        return module
+      }
+
+      throw new Error(`"${specifier}" import not allowed`)
+    })
+
+    script.evaluateSync({ timeout: this.invocationTimeout })
+
+    const result = this.getFromContext(this.resultKey)
+    return result.out
+  }
+
+  private registerCallbacks(functions: Record<string, any>) {
+    const libId = crypto.randomUUID().replace(/-/g, "")
+
+    const x: Record<string, string> = {}
+    for (const [funcName, func] of Object.entries(functions)) {
+      const key = `f${libId}${funcName}cb`
+      x[funcName] = key
+
+      this.addToContext({
+        [key]: new ivm.Callback((...params: any[]) => (func as any)(...params)),
+      })
+    }
+
+    const mod =
+      `{` +
+      Object.entries(x)
+        .map(([key, func]) => `${key}: ${func}`)
+        .join() +
+      "}"
+    return mod
+  }
+
+  private addToContext(context: Record<string, any>) {
+    for (let key in context) {
+      const value = context[key]
+      this.jail.setSync(
+        key,
+        typeof value === "function"
+          ? value
+          : new ivm.ExternalCopy(value).copyInto({ release: true })
+      )
+    }
+  }
+
+  private getFromContext(key: string) {
+    const ref = this.vm.global.getSync(key, { reference: true })
+    const result = ref.copySync()
+    ref.release()
+    return result
+  }
+}
diff --git a/packages/server/src/migrations/tests/structures.ts b/packages/server/src/migrations/tests/structures.ts
index b075c04f5c..e2113e6a7c 100644
--- a/packages/server/src/migrations/tests/structures.ts
+++ b/packages/server/src/migrations/tests/structures.ts
@@ -46,7 +46,7 @@ export const smtp = (conf?: SMTPConfig): SMTPConfig => {
     config: {
       port: 12345,
       host: "smtptesthost.com",
-      from: "testfrom@test.com",
+      from: "testfrom@example.com",
       subject: "Hello!",
       secure: false,
       ...conf,
diff --git a/packages/server/src/sdk/app/applications/tests/sync.spec.ts b/packages/server/src/sdk/app/applications/tests/sync.spec.ts
index 8609e59a2f..1d28ed977c 100644
--- a/packages/server/src/sdk/app/applications/tests/sync.spec.ts
+++ b/packages/server/src/sdk/app/applications/tests/sync.spec.ts
@@ -94,8 +94,8 @@ function buildRoles() {
 }
 
 describe("app user/group sync", () => {
-  const groupEmail = "test2@test.com",
-    normalEmail = "test@test.com"
+  const groupEmail = "test2@example.com",
+    normalEmail = "test@example.com"
   async function checkEmail(
     email: string,
     opts?: { group?: boolean; notFound?: boolean }
@@ -131,7 +131,7 @@ describe("app user/group sync", () => {
   })
 
   it("should be able to handle builder users", async () => {
-    await createUser("test3@test.com", {}, true)
-    await checkEmail("test3@test.com")
+    await createUser("test3@example.com", {}, true)
+    await checkEmail("test3@example.com")
   })
 })
diff --git a/packages/server/src/sdk/app/backups/exports.ts b/packages/server/src/sdk/app/backups/exports.ts
index 813f813177..8a67ba2dae 100644
--- a/packages/server/src/sdk/app/backups/exports.ts
+++ b/packages/server/src/sdk/app/backups/exports.ts
@@ -14,6 +14,7 @@ import {
   ATTACHMENT_DIRECTORY,
 } from "./constants"
 import fs from "fs"
+import fsp from "fs/promises"
 import { join } from "path"
 import env from "../../../environment"
 import { v4 as uuid } from "uuid"
@@ -117,7 +118,7 @@ export async function exportApp(appId: string, config?: ExportOpts) {
           ObjectStoreBuckets.APPS,
           join(appPath, path)
         )
-        fs.writeFileSync(join(tmpPath, path), contents)
+        await fsp.writeFile(join(tmpPath, path), contents)
       }
     }
     // get all the files
@@ -131,14 +132,14 @@ export async function exportApp(appId: string, config?: ExportOpts) {
 
   const downloadedPath = join(tmpPath, appPath)
   if (fs.existsSync(downloadedPath)) {
-    const allFiles = fs.readdirSync(downloadedPath)
+    const allFiles = await fsp.readdir(downloadedPath)
     for (let file of allFiles) {
       const path = join(downloadedPath, file)
       // move out of app directory, simplify structure
-      fs.renameSync(path, join(downloadedPath, "..", file))
+      await fsp.rename(path, join(downloadedPath, "..", file))
     }
     // remove the old app directory created by object export
-    fs.rmdirSync(downloadedPath)
+    await fsp.rmdir(downloadedPath)
   }
   // enforce an export of app DB to the tmp path
   const dbPath = join(tmpPath, DB_EXPORT_FILE)
@@ -148,7 +149,7 @@ export async function exportApp(appId: string, config?: ExportOpts) {
   })
 
   if (config?.encryptPassword) {
-    for (let file of fs.readdirSync(tmpPath)) {
+    for (let file of await fsp.readdir(tmpPath)) {
       const path = join(tmpPath, file)
 
       // skip the attachments - too big to encrypt
@@ -157,7 +158,7 @@ export async function exportApp(appId: string, config?: ExportOpts) {
           { dir: tmpPath, filename: file },
           config.encryptPassword
         )
-        fs.rmSync(path)
+        await fsp.rm(path)
       }
     }
   }
@@ -165,9 +166,9 @@ export async function exportApp(appId: string, config?: ExportOpts) {
   // if tar requested, return where the tarball is
   if (config?.tar) {
     // now the tmpPath contains both the DB export and attachments, tar this
-    const tarPath = await tarFilesToTmp(tmpPath, fs.readdirSync(tmpPath))
+    const tarPath = await tarFilesToTmp(tmpPath, await fsp.readdir(tmpPath))
     // cleanup the tmp export files as tarball returned
-    fs.rmSync(tmpPath, { recursive: true, force: true })
+    await fsp.rm(tmpPath, { recursive: true, force: true })
 
     return tarPath
   }
diff --git a/packages/server/src/sdk/app/backups/imports.ts b/packages/server/src/sdk/app/backups/imports.ts
index 7f76945107..75c17dfa95 100644
--- a/packages/server/src/sdk/app/backups/imports.ts
+++ b/packages/server/src/sdk/app/backups/imports.ts
@@ -17,6 +17,7 @@ import { downloadTemplate } from "../../../utilities/fileSystem"
 import { ObjectStoreBuckets } from "../../../constants"
 import { join } from "path"
 import fs from "fs"
+import fsp from "fs/promises"
 import sdk from "../../"
 import { v4 as uuid } from "uuid"
 import tar from "tar"
@@ -119,7 +120,7 @@ async function getTemplateStream(template: TemplateType) {
 
 export async function untarFile(file: { path: string }) {
   const tmpPath = join(budibaseTempDir(), uuid())
-  fs.mkdirSync(tmpPath)
+  await fsp.mkdir(tmpPath)
   // extract the tarball
   await tar.extract({
     cwd: tmpPath,
@@ -130,12 +131,12 @@ export async function untarFile(file: { path: string }) {
 
 async function decryptFiles(path: string, password: string) {
   try {
-    for (let file of fs.readdirSync(path)) {
+    for (let file of await fsp.readdir(path)) {
       const inputPath = join(path, file)
       if (!inputPath.endsWith(ATTACHMENT_DIRECTORY)) {
         const outputPath = inputPath.replace(/\.enc$/, "")
         await encryption.decryptFile(inputPath, outputPath, password)
-        fs.rmSync(inputPath)
+        await fsp.rm(inputPath)
       }
     }
   } catch (err: any) {
@@ -164,13 +165,14 @@ export async function importApp(
   let dbStream: any
   const isTar = template.file && template?.file?.type?.endsWith("gzip")
   const isDirectory =
-    template.file && fs.lstatSync(template.file.path).isDirectory()
+    template.file && (await fsp.lstat(template.file.path)).isDirectory()
+  let tmpPath: string | undefined = undefined
   if (template.file && (isTar || isDirectory)) {
-    const tmpPath = isTar ? await untarFile(template.file) : template.file.path
+    tmpPath = isTar ? await untarFile(template.file) : template.file.path
     if (isTar && template.file.password) {
       await decryptFiles(tmpPath, template.file.password)
     }
-    const contents = fs.readdirSync(tmpPath)
+    const contents = await fsp.readdir(tmpPath)
     // have to handle object import
     if (contents.length && opts.importObjStoreContents) {
       let promises = []
@@ -181,7 +183,7 @@ export async function importApp(
           continue
         }
         filename = join(prodAppId, filename)
-        if (fs.lstatSync(path).isDirectory()) {
+        if ((await fsp.lstat(path)).isDirectory()) {
           promises.push(
             objectStore.uploadDirectory(ObjectStoreBuckets.APPS, path, filename)
           )
@@ -208,5 +210,9 @@ export async function importApp(
   }
   await updateAttachmentColumns(prodAppId, db)
   await updateAutomations(prodAppId, db)
+  // clear up afterward
+  if (tmpPath) {
+    await fsp.rm(tmpPath, { recursive: true, force: true })
+  }
   return ok
 }
diff --git a/packages/server/src/sdk/app/rows/search/tests/utils.spec.ts b/packages/server/src/sdk/app/rows/search/tests/utils.spec.ts
index 055628c41c..269902bc88 100644
--- a/packages/server/src/sdk/app/rows/search/tests/utils.spec.ts
+++ b/packages/server/src/sdk/app/rows/search/tests/utils.spec.ts
@@ -76,7 +76,7 @@ describe.each([tableWithUserCol, tableWithUsersCol])(
     })
 
     it("shouldn't change any other input", () => {
-      const email = "test@test.com"
+      const email = "test@example.com"
       const params: SearchParams = {
         tableId,
         query: {
diff --git a/packages/server/src/sdk/app/tables/internal/index.ts b/packages/server/src/sdk/app/tables/internal/index.ts
index 25fe145484..5d9feb5fe8 100644
--- a/packages/server/src/sdk/app/tables/internal/index.ts
+++ b/packages/server/src/sdk/app/tables/internal/index.ts
@@ -75,11 +75,13 @@ export async function save(
     if (!tableView) continue
 
     if (viewsSdk.isV2(tableView)) {
-      table.views[view] = viewsSdk.syncSchema(
-        oldTable!.views![view] as ViewV2,
-        table.schema,
-        renaming
-      )
+      if (oldTable?.views && oldTable.views[view]) {
+        table.views[view] = viewsSdk.syncSchema(
+          oldTable.views[view] as ViewV2,
+          table.schema,
+          renaming
+        )
+      }
       continue
     }
 
diff --git a/packages/server/src/tests/utilities/TestConfiguration.ts b/packages/server/src/tests/utilities/TestConfiguration.ts
index d96655af43..ea3204536a 100644
--- a/packages/server/src/tests/utilities/TestConfiguration.ts
+++ b/packages/server/src/tests/utilities/TestConfiguration.ts
@@ -84,12 +84,12 @@ type DefaultUserValues = {
   csrfToken: string
 }
 
-interface TableToBuild extends Omit<Table, "sourceId" | "sourceType"> {
+export interface TableToBuild extends Omit<Table, "sourceId" | "sourceType"> {
   sourceId?: string
   sourceType?: TableSourceType
 }
 
-class TestConfiguration {
+export default class TestConfiguration {
   server: any
   request: supertest.SuperTest<supertest.Test> | undefined
   started: boolean
@@ -912,4 +912,4 @@ class TestConfiguration {
   }
 }
 
-export = TestConfiguration
+module.exports = TestConfiguration
diff --git a/packages/server/src/tests/utilities/api/index.ts b/packages/server/src/tests/utilities/api/index.ts
index 20b96f7a99..fdcec3098d 100644
--- a/packages/server/src/tests/utilities/api/index.ts
+++ b/packages/server/src/tests/utilities/api/index.ts
@@ -10,6 +10,7 @@ import { ApplicationAPI } from "./application"
 import { BackupAPI } from "./backup"
 import { AttachmentAPI } from "./attachment"
 import { UserAPI } from "./user"
+import { QueryAPI } from "./query"
 
 export default class API {
   table: TableAPI
@@ -23,6 +24,7 @@ export default class API {
   backup: BackupAPI
   attachment: AttachmentAPI
   user: UserAPI
+  query: QueryAPI
 
   constructor(config: TestConfiguration) {
     this.table = new TableAPI(config)
@@ -36,5 +38,6 @@ export default class API {
     this.backup = new BackupAPI(config)
     this.attachment = new AttachmentAPI(config)
     this.user = new UserAPI(config)
+    this.query = new QueryAPI(config)
   }
 }
diff --git a/packages/server/src/tests/utilities/api/query.ts b/packages/server/src/tests/utilities/api/query.ts
new file mode 100644
index 0000000000..350fe03c74
--- /dev/null
+++ b/packages/server/src/tests/utilities/api/query.ts
@@ -0,0 +1,44 @@
+import TestConfiguration from "../TestConfiguration"
+import {
+  Query,
+  type ExecuteQueryRequest,
+  type ExecuteQueryResponse,
+} from "@budibase/types"
+import { TestAPI } from "./base"
+
+export class QueryAPI extends TestAPI {
+  constructor(config: TestConfiguration) {
+    super(config)
+  }
+
+  create = async (body: Query): Promise<Query> => {
+    const res = await this.request
+      .post(`/api/queries`)
+      .set(this.config.defaultHeaders())
+      .send(body)
+      .expect("Content-Type", /json/)
+
+    if (res.status !== 200) {
+      throw new Error(JSON.stringify(res.body))
+    }
+
+    return res.body as Query
+  }
+
+  execute = async (
+    queryId: string,
+    body?: ExecuteQueryRequest
+  ): Promise<ExecuteQueryResponse> => {
+    const res = await this.request
+      .post(`/api/v2/queries/${queryId}`)
+      .set(this.config.defaultHeaders())
+      .send(body)
+      .expect("Content-Type", /json/)
+
+    if (res.status !== 200) {
+      throw new Error(JSON.stringify(res.body))
+    }
+
+    return res.body
+  }
+}
diff --git a/packages/server/src/threads/definitions.ts b/packages/server/src/threads/definitions.ts
index 90dc136cb5..52f5576d9d 100644
--- a/packages/server/src/threads/definitions.ts
+++ b/packages/server/src/threads/definitions.ts
@@ -1,10 +1,10 @@
-import { QuerySchema, Row } from "@budibase/types"
+import { Datasource, QuerySchema, Row } from "@budibase/types"
 
 export type WorkerCallback = (error: any, response?: any) => void
 
 export interface QueryEvent {
   appId?: string
-  datasource: any
+  datasource: Datasource
   queryVerb: string
   fields: { [key: string]: any }
   parameters: { [key: string]: any }
diff --git a/packages/server/src/threads/query.ts b/packages/server/src/threads/query.ts
index e31bc70b6a..6b11ce4759 100644
--- a/packages/server/src/threads/query.ts
+++ b/packages/server/src/threads/query.ts
@@ -14,13 +14,13 @@ import { context, cache, auth } from "@budibase/backend-core"
 import { getGlobalIDFromUserMetadataID } from "../db/utils"
 import sdk from "../sdk"
 import { cloneDeep } from "lodash/fp"
-import { Query } from "@budibase/types"
+import { Datasource, Query, SourceName } from "@budibase/types"
 
 import { isSQL } from "../integrations/utils"
 import { interpolateSQL } from "../integrations/queries/sql"
 
 class QueryRunner {
-  datasource: any
+  datasource: Datasource
   queryVerb: string
   queryId: string
   fields: any
@@ -68,7 +68,7 @@ class QueryRunner {
       throw "Integration type does not exist."
     }
 
-    if (datasourceClone.config.authConfigs) {
+    if (datasourceClone.config?.authConfigs) {
       const updatedConfigs = []
       for (let config of datasourceClone.config.authConfigs) {
         updatedConfigs.push(await sdk.queries.enrichContext(config, this.ctx))
@@ -93,7 +93,7 @@ class QueryRunner {
     const enrichedContext = { ...enrichedParameters, ...this.ctx }
 
     // Parse global headers
-    if (datasourceClone.config.defaultHeaders) {
+    if (datasourceClone.config?.defaultHeaders) {
       datasourceClone.config.defaultHeaders = await sdk.queries.enrichContext(
         datasourceClone.config.defaultHeaders,
         enrichedContext
@@ -152,11 +152,6 @@ class QueryRunner {
       return this.execute()
     }
 
-    // check for undefined response
-    if (!rows) {
-      rows = []
-    }
-
     // needs to an array for next step
     if (!Array.isArray(rows)) {
       rows = [rows]
diff --git a/packages/server/src/threads/utils.ts b/packages/server/src/threads/utils.ts
index a0f3bbdc47..cd547cacae 100644
--- a/packages/server/src/threads/utils.ts
+++ b/packages/server/src/threads/utils.ts
@@ -2,6 +2,7 @@ import { QueryVariable } from "./definitions"
 import env from "../environment"
 import * as db from "../db"
 import { redis, db as dbCore } from "@budibase/backend-core"
+import * as jsRunner from "../jsRunner"
 
 const VARIABLE_TTL_SECONDS = 3600
 let client: any
@@ -29,7 +30,9 @@ export function threadSetup() {
     console.debug(`[${env.FORKED_PROCESS_NAME}] thread setup skipped`)
     return
   }
+
   console.debug(`[${env.FORKED_PROCESS_NAME}] thread setup running`)
+  jsRunner.init()
   db.init()
 }
 
diff --git a/packages/server/src/utilities/fileSystem/filesystem.ts b/packages/server/src/utilities/fileSystem/filesystem.ts
index be656f54d1..add587cdea 100644
--- a/packages/server/src/utilities/fileSystem/filesystem.ts
+++ b/packages/server/src/utilities/fileSystem/filesystem.ts
@@ -4,7 +4,7 @@ import { resolve, join } from "path"
 import env from "../../environment"
 import tar from "tar"
 
-const uuid = require("uuid/v4")
+import { v4 as uuid } from "uuid"
 
 export const TOP_LEVEL_PATH =
   env.TOP_LEVEL_PATH || resolve(join(__dirname, "..", "..", ".."))
diff --git a/packages/server/src/utilities/workerRequests.ts b/packages/server/src/utilities/workerRequests.ts
index 1604a724d2..69ce58c8a9 100644
--- a/packages/server/src/utilities/workerRequests.ts
+++ b/packages/server/src/utilities/workerRequests.ts
@@ -1,4 +1,4 @@
-import fetch from "node-fetch"
+import { Response, default as fetch } from "node-fetch"
 import env from "../environment"
 import { checkSlashesInUrl } from "./index"
 import {
@@ -40,25 +40,21 @@ export function request(ctx?: Ctx, request?: any) {
 }
 
 async function checkResponse(
-  response: any,
+  response: Response,
   errorMsg: string,
   { ctx }: { ctx?: Ctx } = {}
 ) {
-  if (response.status !== 200) {
-    let error
-    try {
-      error = await response.json()
-      if (!error.message) {
-        error = JSON.stringify(error)
-      }
-    } catch (err) {
-      error = await response.text()
+  if (response.status >= 300) {
+    let responseErrorMessage
+    if (response.headers.get("content-type")?.includes("json")) {
+      const error = await response.json()
+      responseErrorMessage = error.message ?? JSON.stringify(error)
+    } else {
+      responseErrorMessage = await response.text()
     }
-    const msg = `Unable to ${errorMsg} - ${
-      error.message ? error.message : error
-    }`
+    const msg = `Unable to ${errorMsg} - ${responseErrorMessage}`
     if (ctx) {
-      ctx.throw(400, msg)
+      ctx.throw(msg, response.status)
     } else {
       throw msg
     }
diff --git a/packages/shared-core/package.json b/packages/shared-core/package.json
index edbbd1dc56..777896a7f7 100644
--- a/packages/shared-core/package.json
+++ b/packages/shared-core/package.json
@@ -14,7 +14,8 @@
     "check:types": "tsc -p tsconfig.json --noEmit --paths null"
   },
   "dependencies": {
-    "@budibase/types": "0.0.0"
+    "@budibase/types": "0.0.0",
+    "cron-validate": "1.4.5"
   },
   "devDependencies": {
     "rimraf": "3.0.2",
diff --git a/packages/shared-core/src/constants/index.ts b/packages/shared-core/src/constants/index.ts
index a23913dd11..99fb5c2a73 100644
--- a/packages/shared-core/src/constants/index.ts
+++ b/packages/shared-core/src/constants/index.ts
@@ -99,6 +99,8 @@ export const SocketSessionTTL = 60
 export const ValidQueryNameRegex = /^[^()]*$/
 export const ValidColumnNameRegex = /^[_a-zA-Z0-9\s]*$/g
 
+export const REBOOT_CRON = "@reboot"
+
 export const InvalidFileExtensions = [
   "7z",
   "action",
diff --git a/packages/shared-core/src/helpers/cron.ts b/packages/shared-core/src/helpers/cron.ts
new file mode 100644
index 0000000000..ca1f1badb7
--- /dev/null
+++ b/packages/shared-core/src/helpers/cron.ts
@@ -0,0 +1,47 @@
+import cronValidate from "cron-validate"
+
+const INPUT_CRON_START = "(Input cron: "
+const ERROR_SWAPS = {
+  "smaller than lower limit": "less than",
+  "bigger than upper limit": "greater than",
+  daysOfMonth: "'days of the month'",
+  daysOfWeek: "'days of the week'",
+  years: "'years'",
+  months: "'months'",
+  hours: "'hours'",
+  minutes: "'minutes'",
+  seconds: "'seconds'",
+}
+
+function improveErrors(errors: string[]): string[] {
+  const finalErrors: string[] = []
+
+  for (let error of errors) {
+    if (error.includes(INPUT_CRON_START)) {
+      error = error.split(INPUT_CRON_START)[0].trim()
+    }
+    for (let [oldErr, newErr] of Object.entries(ERROR_SWAPS)) {
+      if (error.includes(oldErr)) {
+        error = error.replace(new RegExp(oldErr, "g"), newErr)
+      }
+    }
+    finalErrors.push(error)
+  }
+  return finalErrors
+}
+
+export function validate(
+  cronExpression: string
+): { valid: false; err: string[] } | { valid: true } {
+  const result = cronValidate(cronExpression, {
+    preset: "npm-node-cron",
+    override: {
+      useSeconds: false,
+    },
+  })
+  if (!result.isValid()) {
+    return { valid: false, err: improveErrors(result.getError()) }
+  } else {
+    return { valid: true }
+  }
+}
diff --git a/packages/shared-core/src/helpers/index.ts b/packages/shared-core/src/helpers/index.ts
index fd185aa1e9..e76022b14b 100644
--- a/packages/shared-core/src/helpers/index.ts
+++ b/packages/shared-core/src/helpers/index.ts
@@ -1,2 +1,3 @@
 export * from "./helpers"
 export * from "./integrations"
+export * as cron from "./cron"
diff --git a/packages/shared-core/src/tests/cron.test.ts b/packages/shared-core/src/tests/cron.test.ts
new file mode 100644
index 0000000000..d56165b2b8
--- /dev/null
+++ b/packages/shared-core/src/tests/cron.test.ts
@@ -0,0 +1,22 @@
+import { expect, describe, it } from "vitest"
+import { cron } from "../helpers"
+
+describe("check valid and invalid crons", () => {
+  it("invalid - 0 0 0 11 *", () => {
+    expect(cron.validate("0 0 0 11 *")).toStrictEqual({
+      valid: false,
+      err: [expect.stringContaining("less than '1'")],
+    })
+  })
+
+  it("invalid - 5 4 32 1 1", () => {
+    expect(cron.validate("5 4 32 1 1")).toStrictEqual({
+      valid: false,
+      err: [expect.stringContaining("greater than '31'")],
+    })
+  })
+
+  it("valid - * * * * *", () => {
+    expect(cron.validate("* * * * *")).toStrictEqual({ valid: true })
+  })
+})
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index 36f95060b4..ceafd5364f 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -2,16 +2,17 @@
   "name": "@budibase/string-templates",
   "version": "0.0.0",
   "description": "Handlebars wrapper for Budibase templating.",
-  "main": "src/index.cjs",
+  "main": "src/index.js",
   "module": "dist/bundle.mjs",
   "license": "MPL-2.0",
   "types": "dist/index.d.ts",
   "exports": {
     ".": {
-      "require": "./src/index.cjs",
+      "require": "./src/index.js",
       "import": "./dist/bundle.mjs"
     },
-    "./package.json": "./package.json"
+    "./package.json": "./package.json",
+    "./test/utils": "./test/utils.js"
   },
   "files": [
     "dist",
@@ -20,7 +21,7 @@
   ],
   "scripts": {
     "build": "tsc && rollup -c",
-    "dev": "tsc && rollup -cw",
+    "dev": "concurrently \"tsc --watch\" \"rollup -cw\"",
     "test": "jest",
     "manifest": "node ./scripts/gen-collection-info.js"
   },
@@ -28,12 +29,12 @@
     "@budibase/handlebars-helpers": "^0.13.1",
     "dayjs": "^1.10.8",
     "handlebars": "^4.7.6",
-    "lodash.clonedeep": "^4.5.0",
-    "vm2": "^3.9.19"
+    "lodash.clonedeep": "^4.5.0"
   },
   "devDependencies": {
     "@rollup/plugin-commonjs": "^17.1.0",
     "@rollup/plugin-json": "^4.1.0",
+    "concurrently": "^8.2.2",
     "doctrine": "^3.0.0",
     "jest": "29.7.0",
     "marked": "^4.0.10",
diff --git a/packages/string-templates/src/errors.js b/packages/string-templates/src/errors.js
new file mode 100644
index 0000000000..e0dcc3de1c
--- /dev/null
+++ b/packages/string-templates/src/errors.js
@@ -0,0 +1,11 @@
+class JsErrorTimeout extends Error {
+  code = "ERR_SCRIPT_EXECUTION_TIMEOUT"
+
+  constructor() {
+    super()
+  }
+}
+
+module.exports = {
+  JsErrorTimeout,
+}
diff --git a/packages/string-templates/src/helpers/javascript.js b/packages/string-templates/src/helpers/javascript.js
index eff125dd72..4a7f602690 100644
--- a/packages/string-templates/src/helpers/javascript.js
+++ b/packages/string-templates/src/helpers/javascript.js
@@ -4,10 +4,13 @@ const { LITERAL_MARKER } = require("../helpers/constants")
 const { getJsHelperList } = require("./list")
 
 // The method of executing JS scripts depends on the bundle being built.
-// This setter is used in the entrypoint (either index.cjs or index.mjs).
+// This setter is used in the entrypoint (either index.js or index.mjs).
 let runJS
 module.exports.setJSRunner = runner => (runJS = runner)
 
+let onErrorLog
+module.exports.setOnErrorLog = delegate => (onErrorLog = delegate)
+
 // Helper utility to strip square brackets from a value
 const removeSquareBrackets = value => {
   if (!value || typeof value !== "string") {
@@ -42,7 +45,7 @@ module.exports.processJS = (handlebars, context) => {
   try {
     // Wrap JS in a function and immediately invoke it.
     // This is required to allow the final `return` statement to be valid.
-    const js = `function run(){${atob(handlebars)}};run();`
+    const js = `(function(){${atob(handlebars)}})();`
 
     // Our $ context function gets a value from context.
     // We clone the context to avoid mutation in the binding affecting real
@@ -56,6 +59,8 @@ module.exports.processJS = (handlebars, context) => {
     const res = { data: runJS(js, sandboxContext) }
     return `{{${LITERAL_MARKER} js_result-${JSON.stringify(res)}}}`
   } catch (error) {
+    onErrorLog && onErrorLog(error)
+
     if (error.code === "ERR_SCRIPT_EXECUTION_TIMEOUT") {
       return "Timed out while executing JS"
     }
diff --git a/packages/string-templates/src/helpers/list.js b/packages/string-templates/src/helpers/list.js
index e956958865..883ab5678e 100644
--- a/packages/string-templates/src/helpers/list.js
+++ b/packages/string-templates/src/helpers/list.js
@@ -1,29 +1,42 @@
-const externalHandlebars = require("./external")
-const helperList = require("@budibase/handlebars-helpers")
+const { date, duration } = require("./date")
 
-let helpers = undefined
+// https://github.com/evanw/esbuild/issues/56
+const externalCollections = {
+  math: require("@budibase/handlebars-helpers/lib/math"),
+  array: require("@budibase/handlebars-helpers/lib/array"),
+  number: require("@budibase/handlebars-helpers/lib/number"),
+  url: require("@budibase/handlebars-helpers/lib/url"),
+  string: require("@budibase/handlebars-helpers/lib/string"),
+  comparison: require("@budibase/handlebars-helpers/lib/comparison"),
+  object: require("@budibase/handlebars-helpers/lib/object"),
+  regex: require("@budibase/handlebars-helpers/lib/regex"),
+  uuid: require("@budibase/handlebars-helpers/lib/uuid"),
+}
 
 const helpersToRemoveForJs = ["sortBy"]
 module.exports.helpersToRemoveForJs = helpersToRemoveForJs
 
+const addedHelpers = {
+  date: date,
+  duration: duration,
+}
+
+let helpers = undefined
+
 module.exports.getJsHelperList = () => {
   if (helpers) {
     return helpers
   }
 
   helpers = {}
-  let constructed = []
-  for (let collection of externalHandlebars.externalCollections) {
-    constructed.push(helperList[collection]())
-  }
-  for (let collection of constructed) {
+  for (let collection of Object.values(externalCollections)) {
     for (let [key, func] of Object.entries(collection)) {
       // Handlebars injects the hbs options to the helpers by default. We are adding an empty {} as a last parameter to simulate it
       helpers[key] = (...props) => func(...props, {})
     }
   }
-  for (let key of Object.keys(externalHandlebars.addedHelpers)) {
-    helpers[key] = externalHandlebars.addedHelpers[key]
+  for (let key of Object.keys(addedHelpers)) {
+    helpers[key] = addedHelpers[key]
   }
 
   for (const toRemove of helpersToRemoveForJs) {
diff --git a/packages/string-templates/src/index.cjs b/packages/string-templates/src/index.cjs
deleted file mode 100644
index 7d3aa02be8..0000000000
--- a/packages/string-templates/src/index.cjs
+++ /dev/null
@@ -1,38 +0,0 @@
-const templates = require("./index.js")
-
-/**
- * CJS entrypoint for rollup
- */
-module.exports.isValid = templates.isValid
-module.exports.makePropSafe = templates.makePropSafe
-module.exports.getManifest = templates.getManifest
-module.exports.isJSBinding = templates.isJSBinding
-module.exports.encodeJSBinding = templates.encodeJSBinding
-module.exports.decodeJSBinding = templates.decodeJSBinding
-module.exports.processStringSync = templates.processStringSync
-module.exports.processObjectSync = templates.processObjectSync
-module.exports.processString = templates.processString
-module.exports.processObject = templates.processObject
-module.exports.doesContainStrings = templates.doesContainStrings
-module.exports.doesContainString = templates.doesContainString
-module.exports.disableEscaping = templates.disableEscaping
-module.exports.findHBSBlocks = templates.findHBSBlocks
-module.exports.convertToJS = templates.convertToJS
-module.exports.setJSRunner = templates.setJSRunner
-module.exports.FIND_ANY_HBS_REGEX = templates.FIND_ANY_HBS_REGEX
-module.exports.helpersToRemoveForJs = templates.helpersToRemoveForJs
-
-if (!process.env.NO_JS) {
-  const { VM } = require("vm2")
-  const { setJSRunner } = require("./helpers/javascript")
-  /**
-   * Use vm2 to run JS scripts in a node env
-   */
-  setJSRunner((js, context) => {
-    const vm = new VM({
-      sandbox: context,
-      timeout: 1000,
-    })
-    return vm.run(js)
-  })
-}
diff --git a/packages/string-templates/src/index.js b/packages/string-templates/src/index.js
index eb9a8ac81d..bcd63d2e6f 100644
--- a/packages/string-templates/src/index.js
+++ b/packages/string-templates/src/index.js
@@ -1,3 +1,4 @@
+const vm = require("vm")
 const handlebars = require("handlebars")
 const { registerAll, registerMinimum } = require("./helpers/index")
 const processors = require("./processors")
@@ -365,6 +366,7 @@ module.exports.doesContainString = (template, string) => {
 }
 
 module.exports.setJSRunner = javascript.setJSRunner
+module.exports.setOnErrorLog = javascript.setOnErrorLog
 
 module.exports.convertToJS = hbs => {
   const blocks = exports.findHBSBlocks(hbs)
@@ -395,4 +397,25 @@ module.exports.convertToJS = hbs => {
 }
 
 module.exports.FIND_ANY_HBS_REGEX = FIND_ANY_HBS_REGEX
+
+const errors = require("./errors")
+// We cannot use dynamic exports, otherwise the typescript file will not be generating it
+module.exports.JsErrorTimeout = errors.JsErrorTimeout
+
 module.exports.helpersToRemoveForJs = helpersToRemoveForJs
+
+if (process && !process.env.NO_JS) {
+  /**
+   * Use polyfilled vm to run JS scripts in a browser Env
+   */
+  javascript.setJSRunner((js, context) => {
+    context = {
+      ...context,
+      alert: undefined,
+      setInterval: undefined,
+      setTimeout: undefined,
+    }
+    vm.createContext(context)
+    return vm.runInNewContext(js, context, { timeout: 1000 })
+  })
+}
diff --git a/packages/string-templates/src/index.mjs b/packages/string-templates/src/index.mjs
index ad93a7bed4..f54ca7e23e 100644
--- a/packages/string-templates/src/index.mjs
+++ b/packages/string-templates/src/index.mjs
@@ -1,4 +1,3 @@
-import vm from "vm"
 import templates from "./index.js"
 
 /**
@@ -20,21 +19,8 @@ export const disableEscaping = templates.disableEscaping
 export const findHBSBlocks = templates.findHBSBlocks
 export const convertToJS = templates.convertToJS
 export const setJSRunner = templates.setJSRunner
+export const setOnErrorLog = templates.setOnErrorLog
 export const FIND_ANY_HBS_REGEX = templates.FIND_ANY_HBS_REGEX
 export const helpersToRemoveForJs = templates.helpersToRemoveForJs
 
-if (process && !process.env.NO_JS) {
-  /**
-   * Use polyfilled vm to run JS scripts in a browser Env
-   */
-  setJSRunner((js, context) => {
-    context = {
-      ...context,
-      alert: undefined,
-      setInterval: undefined,
-      setTimeout: undefined,
-    }
-    vm.createContext(context)
-    return vm.runInNewContext(js, context, { timeout: 1000 })
-  })
-}
+export * from "./errors.js"
diff --git a/packages/string-templates/test/basic.spec.js b/packages/string-templates/test/basic.spec.js
index a5054bf489..0b78e3cafd 100644
--- a/packages/string-templates/test/basic.spec.js
+++ b/packages/string-templates/test/basic.spec.js
@@ -8,7 +8,7 @@ const {
   doesContainString,
   disableEscaping,
   findHBSBlocks,
-} = require("../src/index.cjs")
+} = require("../src/index.js")
 
 describe("Test that the string processing works correctly", () => {
   it("should process a basic template string", async () => {
diff --git a/packages/string-templates/test/escapes.spec.js b/packages/string-templates/test/escapes.spec.js
index d27ca64240..caa2f7d0c1 100644
--- a/packages/string-templates/test/escapes.spec.js
+++ b/packages/string-templates/test/escapes.spec.js
@@ -1,4 +1,4 @@
-const { processString } = require("../src/index.cjs")
+const { processString } = require("../src/index.js")
 
 describe("Handling context properties with spaces in their name", () => {
   it("should allow through literal specifiers", async () => {
diff --git a/packages/string-templates/test/examples/table.json b/packages/string-templates/test/examples/table.json
index 4d982e012b..31b5be5020 100644
--- a/packages/string-templates/test/examples/table.json
+++ b/packages/string-templates/test/examples/table.json
@@ -2,7 +2,7 @@
   "user":{
     "_id":"ro_ta_users_us_b0bc7ba0ce304294accc1ced8165dd23",
     "_rev":"1-e9199d92e7286005a9c11c614fdbcc51",
-    "email":"test2@test.com",
+    "email":"test2@example.com",
     "status":"active",
     "roleId":"PUBLIC",
     "test-Created By_text":"",
diff --git a/packages/string-templates/test/hbsToJs.spec.js b/packages/string-templates/test/hbsToJs.spec.js
index 5d5b6c6d0b..08d8ff5f67 100644
--- a/packages/string-templates/test/hbsToJs.spec.js
+++ b/packages/string-templates/test/hbsToJs.spec.js
@@ -1,4 +1,4 @@
-const { convertToJS } = require("../src/index.cjs")
+const { convertToJS } = require("../src/index.js")
 
 function checkLines(response, lines) {
   const toCheck = response.split("\n")
diff --git a/packages/string-templates/test/helpers.spec.js b/packages/string-templates/test/helpers.spec.js
index 75de373109..86fef538d3 100644
--- a/packages/string-templates/test/helpers.spec.js
+++ b/packages/string-templates/test/helpers.spec.js
@@ -1,4 +1,4 @@
-const { processString, processObject, isValid } = require("../src/index.cjs")
+const { processString, processObject, isValid } = require("../src/index.js")
 const tableJson = require("./examples/table.json")
 const dayjs = require("dayjs")
 const { UUID_REGEX } = require("./constants")
@@ -448,7 +448,7 @@ describe("Cover a few complex use cases", () => {
   it("getting a nice date from the user", async () => {
     const input = { text: `{{ date user.subscriptionDue "DD-MM" }}` }
     const context = JSON.parse(
-      `{"user":{"email":"test@test.com","roleId":"ADMIN","type":"user","tableId":"ta_users","subscriptionDue":"2021-01-12T12:00:00.000Z","_id":"ro_ta_users_us_test@test.com","_rev":"2-24cc794985eb54183ecb93e148563f3d"}}`
+      `{"user":{"email":"test@example.com","roleId":"ADMIN","type":"user","tableId":"ta_users","subscriptionDue":"2021-01-12T12:00:00.000Z","_id":"ro_ta_users_us_test@example.com","_rev":"2-24cc794985eb54183ecb93e148563f3d"}}`
     )
     const output = await processObject(input, context)
     expect(output.text).toBe("12-01")
diff --git a/packages/string-templates/test/javascript.spec.js b/packages/string-templates/test/javascript.spec.js
index d8b42678a7..0e9f196da6 100644
--- a/packages/string-templates/test/javascript.spec.js
+++ b/packages/string-templates/test/javascript.spec.js
@@ -1,149 +1,156 @@
-const { processStringSync, encodeJSBinding } = require("../src/index.cjs")
+const vm = require("vm")
+
+const {
+  processStringSync,
+  encodeJSBinding,
+  setJSRunner,
+} = require("../src/index.js")
 const { UUID_REGEX } = require("./constants")
 
 const processJS = (js, context) => {
   return processStringSync(encodeJSBinding(js), context)
 }
 
-describe("Test the JavaScript helper", () => {
-  it("should execute a simple expression", () => {
-    const output = processJS(`return 1 + 2`)
-    expect(output).toBe(3)
-  })
-
-  it("should be able to use primitive bindings", () => {
-    const output = processJS(`return $("foo")`, {
-      foo: "bar",
+describe("Javascript", () => {
+  beforeAll(() => {
+    setJSRunner((js, context) => {
+      return vm.runInNewContext(js, context, { timeout: 1000 })
     })
-    expect(output).toBe("bar")
   })
 
-  it("should be able to use an object binding", () => {
-    const output = processJS(`return $("foo").bar`, {
-      foo: {
-        bar: "baz",
-      },
+  describe("Test the JavaScript helper", () => {
+    it("should execute a simple expression", () => {
+      const output = processJS(`return 1 + 2`)
+      expect(output).toBe(3)
     })
-    expect(output).toBe("baz")
-  })
 
-  it("should be able to use a complex object binding", () => {
-    const output = processJS(`return $("foo").bar[0].baz`, {
-      foo: {
-        bar: [
-          {
-            baz: "shazbat",
-          },
-        ],
-      },
+    it("should be able to use primitive bindings", () => {
+      const output = processJS(`return $("foo")`, {
+        foo: "bar",
+      })
+      expect(output).toBe("bar")
     })
-    expect(output).toBe("shazbat")
-  })
 
-  it("should be able to use a deep binding", () => {
-    const output = processJS(`return $("foo.bar.baz")`, {
-      foo: {
-        bar: {
-          baz: "shazbat",
-        },
-      },
-    })
-    expect(output).toBe("shazbat")
-  })
-
-  it("should be able to return an object", () => {
-    const output = processJS(`return $("foo")`, {
-      foo: {
-        bar: {
-          baz: "shazbat",
-        },
-      },
-    })
-    expect(output.bar.baz).toBe("shazbat")
-  })
-
-  it("should be able to return an array", () => {
-    const output = processJS(`return $("foo")`, {
-      foo: ["a", "b", "c"],
-    })
-    expect(output[2]).toBe("c")
-  })
-
-  it("should be able to return null", () => {
-    const output = processJS(`return $("foo")`, {
-      foo: null,
-    })
-    expect(output).toBe(null)
-  })
-
-  it("should be able to return undefined", () => {
-    const output = processJS(`return $("foo")`, {
-      foo: undefined,
-    })
-    expect(output).toBe(undefined)
-  })
-
-  it("should be able to return 0", () => {
-    const output = processJS(`return $("foo")`, {
-      foo: 0,
-    })
-    expect(output).toBe(0)
-  })
-
-  it("should be able to return an empty string", () => {
-    const output = processJS(`return $("foo")`, {
-      foo: "",
-    })
-    expect(output).toBe("")
-  })
-
-  it("should be able to use a deep array binding", () => {
-    const output = processJS(`return $("foo.0.bar")`, {
-      foo: [
-        {
+    it("should be able to use an object binding", () => {
+      const output = processJS(`return $("foo").bar`, {
+        foo: {
           bar: "baz",
         },
-      ],
+      })
+      expect(output).toBe("baz")
+    })
+
+    it("should be able to use a complex object binding", () => {
+      const output = processJS(`return $("foo").bar[0].baz`, {
+        foo: {
+          bar: [
+            {
+              baz: "shazbat",
+            },
+          ],
+        },
+      })
+      expect(output).toBe("shazbat")
+    })
+
+    it("should be able to use a deep binding", () => {
+      const output = processJS(`return $("foo.bar.baz")`, {
+        foo: {
+          bar: {
+            baz: "shazbat",
+          },
+        },
+      })
+      expect(output).toBe("shazbat")
+    })
+
+    it("should be able to return an object", () => {
+      const output = processJS(`return $("foo")`, {
+        foo: {
+          bar: {
+            baz: "shazbat",
+          },
+        },
+      })
+      expect(output.bar.baz).toBe("shazbat")
+    })
+
+    it("should be able to return an array", () => {
+      const output = processJS(`return $("foo")`, {
+        foo: ["a", "b", "c"],
+      })
+      expect(output[2]).toBe("c")
+    })
+
+    it("should be able to return null", () => {
+      const output = processJS(`return $("foo")`, {
+        foo: null,
+      })
+      expect(output).toBe(null)
+    })
+
+    it("should be able to return undefined", () => {
+      const output = processJS(`return $("foo")`, {
+        foo: undefined,
+      })
+      expect(output).toBe(undefined)
+    })
+
+    it("should be able to return 0", () => {
+      const output = processJS(`return $("foo")`, {
+        foo: 0,
+      })
+      expect(output).toBe(0)
+    })
+
+    it("should be able to return an empty string", () => {
+      const output = processJS(`return $("foo")`, {
+        foo: "",
+      })
+      expect(output).toBe("")
+    })
+
+    it("should be able to use a deep array binding", () => {
+      const output = processJS(`return $("foo.0.bar")`, {
+        foo: [
+          {
+            bar: "baz",
+          },
+        ],
+      })
+      expect(output).toBe("baz")
+    })
+
+    it("should handle errors", () => {
+      const output = processJS(`throw "Error"`)
+      expect(output).toBe("Error while executing JS")
+    })
+
+    it("should timeout after one second", () => {
+      const output = processJS(`while (true) {}`)
+      expect(output).toBe("Timed out while executing JS")
+    })
+
+    it("should prevent access to the process global", () => {
+      const output = processJS(`return process`)
+      expect(output).toBe("Error while executing JS")
     })
-    expect(output).toBe("baz")
   })
 
-  it("should handle errors", () => {
-    const output = processJS(`throw "Error"`)
-    expect(output).toBe("Error while executing JS")
-  })
+  describe("check JS helpers", () => {
+    it("should error if using the format helper. not helpers.", () => {
+      const output = processJS(`return helper.toInt(4.3)`)
+      expect(output).toBe("Error while executing JS")
+    })
 
-  it("should timeout after one second", () => {
-    const output = processJS(`while (true) {}`)
-    expect(output).toBe("Timed out while executing JS")
-  })
+    it("should be able to use toInt", () => {
+      const output = processJS(`return helpers.toInt(4.3)`)
+      expect(output).toBe(4)
+    })
 
-  it("should prevent access to the process global", () => {
-    const output = processJS(`return process`)
-    expect(output).toBe("Error while executing JS")
-  })
-
-  it("should prevent sandbox escape", () => {
-    const output = processJS(
-      `return this.constructor.constructor("return process")()`
-    )
-    expect(output).toBe("Error while executing JS")
-  })
-})
-
-describe("check JS helpers", () => {
-  it("should error if using the format helper. not helpers.", () => {
-    const output = processJS(`return helper.toInt(4.3)`)
-    expect(output).toBe("Error while executing JS")
-  })
-
-  it("should be able to use toInt", () => {
-    const output = processJS(`return helpers.toInt(4.3)`)
-    expect(output).toBe(4)
-  })
-
-  it("should be able to use uuid", () => {
-    const output = processJS(`return helpers.uuid()`)
-    expect(output).toMatch(UUID_REGEX)
+    it("should be able to use uuid", () => {
+      const output = processJS(`return helpers.uuid()`)
+      expect(output).toMatch(UUID_REGEX)
+    })
   })
 })
diff --git a/packages/string-templates/test/manifest.spec.js b/packages/string-templates/test/manifest.spec.js
index 3e39d775f5..81183f13c9 100644
--- a/packages/string-templates/test/manifest.spec.js
+++ b/packages/string-templates/test/manifest.spec.js
@@ -1,3 +1,5 @@
+const vm = require("vm")
+
 jest.mock("@budibase/handlebars-helpers/lib/math", () => {
   const actual = jest.requireActual("@budibase/handlebars-helpers/lib/math")
 
@@ -15,81 +17,29 @@ jest.mock("@budibase/handlebars-helpers/lib/uuid", () => {
   }
 })
 
-const fs = require("fs")
-const {
-  processString,
-  convertToJS,
-  processStringSync,
-  encodeJSBinding,
-} = require("../src/index.cjs")
+const { processString, setJSRunner } = require("../src/index.js")
 
 const tk = require("timekeeper")
-const { getJsHelperList } = require("../src/helpers")
+const { getParsedManifest, runJsHelpersTests } = require("./utils")
 
 tk.freeze("2021-01-21T12:00:00")
 
-const processJS = (js, context) => {
-  return processStringSync(encodeJSBinding(js), context)
-}
-
-const manifest = JSON.parse(
-  fs.readFileSync(require.resolve("../manifest.json"), "utf8")
-)
-
-const collections = Object.keys(manifest)
-const examples = collections.reduce((acc, collection) => {
-  const functions = Object.entries(manifest[collection])
-    .filter(([_, details]) => details.example)
-    .map(([name, details]) => {
-      const example = details.example
-      let [hbs, js] = example.split("->").map(x => x.trim())
-      if (!js) {
-        // The function has no return value
-        return
-      }
-
-      // Trim 's
-      js = js.replace(/^\'|\'$/g, "")
-      if ((parsedExpected = tryParseJson(js))) {
-        if (Array.isArray(parsedExpected)) {
-          if (typeof parsedExpected[0] === "object") {
-            js = JSON.stringify(parsedExpected)
-          } else {
-            js = parsedExpected.join(",")
-          }
-        }
-      }
-      const requiresHbsBody = details.requiresBlock
-      return [name, { hbs, js, requiresHbsBody }]
-    })
-    .filter(x => !!x)
-
-  if (Object.keys(functions).length) {
-    acc[collection] = functions
-  }
-  return acc
-}, {})
-
 function escapeRegExp(string) {
   return string.replace(/[.*+?^${}()|[\]\\]/g, "\\$&") // $& means the whole matched string
 }
 
-function tryParseJson(str) {
-  if (typeof str !== "string") {
-    return
-  }
-
-  try {
-    return JSON.parse(str.replace(/\'/g, '"'))
-  } catch (e) {
-    return
-  }
-}
-
 describe("manifest", () => {
+  const manifest = getParsedManifest()
+
+  beforeAll(() => {
+    setJSRunner((js, context) => {
+      return vm.runInNewContext(js, context, { timeout: 1000 })
+    })
+  })
+
   describe("examples are valid", () => {
-    describe.each(Object.keys(examples))("%s", collection => {
-      it.each(examples[collection])("%s", async (_, { hbs, js }) => {
+    describe.each(Object.keys(manifest))("%s", collection => {
+      it.each(manifest[collection])("%s", async (_, { hbs, js }) => {
         const context = {
           double: i => i * 2,
           isString: x => typeof x === "string",
@@ -108,36 +58,5 @@ describe("manifest", () => {
     })
   })
 
-  describe("can be parsed and run as js", () => {
-    const jsHelpers = getJsHelperList()
-    const jsExamples = Object.keys(examples).reduce((acc, v) => {
-      acc[v] = examples[v].filter(([key]) => jsHelpers[key])
-      return acc
-    }, {})
-
-    describe.each(Object.keys(jsExamples))("%s", collection => {
-      it.each(
-        jsExamples[collection].filter(
-          ([_, { requiresHbsBody }]) => !requiresHbsBody
-        )
-      )("%s", async (_, { hbs, js }) => {
-        const context = {
-          double: i => i * 2,
-          isString: x => typeof x === "string",
-        }
-
-        const arrays = hbs.match(/\[[^/\]]+\]/)
-        arrays?.forEach((arrayString, i) => {
-          hbs = hbs.replace(new RegExp(escapeRegExp(arrayString)), `array${i}`)
-          context[`array${i}`] = JSON.parse(arrayString.replace(/\'/g, '"'))
-        })
-
-        let convertedJs = convertToJS(hbs)
-
-        let result = processJS(convertedJs, context)
-        result = result.replace(/&nbsp;/g, " ")
-        expect(result).toEqual(js)
-      })
-    })
-  })
+  runJsHelpersTests()
 })
diff --git a/packages/string-templates/test/renderApp.spec.js b/packages/string-templates/test/renderApp.spec.js
index 13d478980d..582e70701f 100644
--- a/packages/string-templates/test/renderApp.spec.js
+++ b/packages/string-templates/test/renderApp.spec.js
@@ -1,4 +1,4 @@
-const { processString } = require("../src/index.cjs")
+const { processString } = require("../src/index.js")
 
 describe("specific test case for whether or not full app template can still be rendered", () => {
   it("should be able to render the app template", async () => {
diff --git a/packages/string-templates/test/utils.js b/packages/string-templates/test/utils.js
new file mode 100644
index 0000000000..927a6e3aeb
--- /dev/null
+++ b/packages/string-templates/test/utils.js
@@ -0,0 +1,111 @@
+const { getManifest } = require("../src")
+const { getJsHelperList } = require("../src/helpers")
+
+const {
+  convertToJS,
+  processStringSync,
+  encodeJSBinding,
+} = require("../src/index.js")
+
+function tryParseJson(str) {
+  if (typeof str !== "string") {
+    return
+  }
+
+  try {
+    return JSON.parse(str.replace(/'/g, '"'))
+  } catch (e) {
+    return
+  }
+}
+
+const getParsedManifest = () => {
+  const manifest = getManifest()
+  const collections = Object.keys(manifest)
+  const examples = collections.reduce((acc, collection) => {
+    const functions = Object.entries(manifest[collection])
+      .filter(([_, details]) => details.example)
+      .map(([name, details]) => {
+        const example = details.example
+        let [hbs, js] = example.split("->").map(x => x.trim())
+        if (!js) {
+          // The function has no return value
+          return
+        }
+
+        // Trim 's
+        js = js.replace(/^'|'$/g, "")
+        let parsedExpected
+        if ((parsedExpected = tryParseJson(js))) {
+          if (Array.isArray(parsedExpected)) {
+            if (typeof parsedExpected[0] === "object") {
+              js = JSON.stringify(parsedExpected)
+            } else {
+              js = parsedExpected.join(",")
+            }
+          }
+        }
+        const requiresHbsBody = details.requiresBlock
+        return [name, { hbs, js, requiresHbsBody }]
+      })
+      .filter(x => !!x)
+
+    if (Object.keys(functions).length) {
+      acc[collection] = functions
+    }
+    return acc
+  }, {})
+
+  return examples
+}
+module.exports.getParsedManifest = getParsedManifest
+
+module.exports.runJsHelpersTests = ({ funcWrap, testsToSkip } = {}) => {
+  funcWrap = funcWrap || (delegate => delegate())
+  const manifest = getParsedManifest()
+
+  const processJS = (js, context) => {
+    return funcWrap(() => processStringSync(encodeJSBinding(js), context))
+  }
+
+  function escapeRegExp(string) {
+    return string.replace(/[.*+?^${}()|[\]\\]/g, "\\$&") // $& means the whole matched string
+  }
+
+  describe("can be parsed and run as js", () => {
+    const jsHelpers = getJsHelperList()
+    const jsExamples = Object.keys(manifest).reduce((acc, v) => {
+      acc[v] = manifest[v].filter(([key]) => jsHelpers[key])
+      return acc
+    }, {})
+
+    describe.each(Object.keys(jsExamples))("%s", collection => {
+      const examplesToRun = jsExamples[collection]
+        .filter(([_, { requiresHbsBody }]) => !requiresHbsBody)
+        .filter(([key]) => !testsToSkip?.includes(key))
+
+      examplesToRun.length &&
+        it.each(examplesToRun)("%s", async (_, { hbs, js }) => {
+          const context = {
+            double: i => i * 2,
+            isString: x => typeof x === "string",
+          }
+
+          const arrays = hbs.match(/\[[^/\]]+\]/)
+          arrays?.forEach((arrayString, i) => {
+            hbs = hbs.replace(
+              new RegExp(escapeRegExp(arrayString)),
+              `array${i}`
+            )
+            context[`array${i}`] = JSON.parse(arrayString.replace(/'/g, '"'))
+          })
+
+          let convertedJs = convertToJS(hbs)
+
+          let result = await processJS(convertedJs, context)
+          result = result.replace(/&nbsp;/g, " ")
+          expect(result).toEqual(js)
+        })
+    })
+  })
+}
diff --git a/packages/types/src/documents/app/query.ts b/packages/types/src/documents/app/query.ts
index 473449bffb..790c297813 100644
--- a/packages/types/src/documents/app/query.ts
+++ b/packages/types/src/documents/app/query.ts
@@ -1,4 +1,5 @@
 import { Document } from "../document"
+import type { Row } from "./row"
 
 export interface QuerySchema {
   name?: string
@@ -54,3 +55,12 @@ export interface PreviewQueryRequest extends Omit<Query, "parameters"> {
     urlName?: boolean
   }
 }
+
+export interface ExecuteQueryRequest {
+  parameters?: { [key: string]: string }
+  pagination?: any
+}
+
+export interface ExecuteQueryResponse {
+  data: Row[]
+}
diff --git a/packages/types/src/sdk/index.ts b/packages/types/src/sdk/index.ts
index 0eab2ba556..36faaae9c3 100644
--- a/packages/types/src/sdk/index.ts
+++ b/packages/types/src/sdk/index.ts
@@ -20,3 +20,4 @@ export * from "./cli"
 export * from "./websocket"
 export * from "./permissions"
 export * from "./row"
+export * from "./vm"
diff --git a/packages/types/src/sdk/vm.ts b/packages/types/src/sdk/vm.ts
new file mode 100644
index 0000000000..43b7775d3b
--- /dev/null
+++ b/packages/types/src/sdk/vm.ts
@@ -0,0 +1,3 @@
+export interface VM {
+  execute(code: string): any
+}
diff --git a/packages/worker/Dockerfile b/packages/worker/Dockerfile
index ca6c84cc2a..52fd3677b1 100644
--- a/packages/worker/Dockerfile
+++ b/packages/worker/Dockerfile
@@ -44,6 +44,8 @@ EXPOSE 4001
 # due to this causing yarn to stop installing dev dependencies
 # which are actually needed to get this environment up and running
 ENV NODE_ENV=production
+# this is required for isolated-vm to work on Node 20+
+ENV NODE_OPTIONS="--no-node-snapshot"
 ENV CLUSTER_MODE=${CLUSTER_MODE}
 ENV SERVICE=worker-service
 ENV POSTHOG_TOKEN=phc_bIjZL7oh2GEUd2vqvTBH8WvrX0fWTFQMs6H5KQxiUxU
diff --git a/packages/worker/nodemon.json b/packages/worker/nodemon.json
index a8e9d45b47..497025e9e9 100644
--- a/packages/worker/nodemon.json
+++ b/packages/worker/nodemon.json
@@ -8,6 +8,6 @@
     "../string-templates"
   ],
   "ext": "js,ts,json",
-  "ignore": ["src/**/*.spec.ts", "src/**/*.spec.js", "../*/dist/**/*"],
-  "exec": "yarn build && node dist/index.js"
+  "ignore": ["**/*.spec.ts", "**/*.spec.js", "../*/dist/**/*"],
+  "exec": "yarn build && node --no-node-snapshot dist/index.js"
 }
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 2e3200fda5..e01a50d981 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -48,7 +48,7 @@
     "bcrypt": "5.1.0",
     "bcryptjs": "2.4.3",
     "bull": "4.10.1",
-    "dd-trace": "5.0.0",
+    "dd-trace": "5.2.0",
     "dotenv": "8.6.0",
     "global-agent": "3.0.0",
     "ical-generator": "4.1.0",
@@ -63,12 +63,14 @@
     "koa-useragent": "^4.1.0",
     "lodash": "4.17.21",
     "node-fetch": "2.6.7",
-    "nodemailer": "6.7.2",
+    "nodemailer": "6.9.9",
     "passport-google-oauth": "2.0.0",
     "passport-local": "1.0.0",
     "pouchdb": "7.3.0",
     "pouchdb-all-dbs": "1.1.1",
-    "server-destroy": "1.0.1"
+    "server-destroy": "1.0.1",
+    "undici": "^6.0.1",
+    "undici-types": "^6.0.1"
   },
   "devDependencies": {
     "@swc/core": "1.3.71",
diff --git a/packages/worker/scripts/load/heavyUse.js b/packages/worker/scripts/load/heavyUse.js
index 87c1cc687f..988e69b7a9 100644
--- a/packages/worker/scripts/load/heavyUse.js
+++ b/packages/worker/scripts/load/heavyUse.js
@@ -23,27 +23,27 @@ const USERS = [
     password: "test",
   },
   {
-    email: "loadtest2@test.com",
+    email: "loadtest2@example.com",
     password: "test",
   },
   {
-    email: "loadtest3@test.com",
+    email: "loadtest3@example.com",
     password: "test",
   },
   {
-    email: "loadtest4@test.com",
+    email: "loadtest4@example.com",
     password: "test",
   },
   {
-    email: "loadtest5@test.com",
+    email: "loadtest5@example.com",
     password: "test",
   },
   {
-    email: "loadtest6@test.com",
+    email: "loadtest6@example.com",
     password: "test",
   },
   {
-    email: "loadtest7@test.com",
+    email: "loadtest7@example.com",
     password: "test",
   },
 ]
diff --git a/packages/worker/src/api/controllers/global/configs.ts b/packages/worker/src/api/controllers/global/configs.ts
index 462aa3060d..a44b173869 100644
--- a/packages/worker/src/api/controllers/global/configs.ts
+++ b/packages/worker/src/api/controllers/global/configs.ts
@@ -498,6 +498,12 @@ export async function configChecklist(ctx: Ctx) {
 
         // They have set up a global user
         const userExists = await checkAnyUserExists()
+
+        // They have set up branding
+        const configDoc = await configs.getSettingsConfigDoc()
+        const config = configDoc.config
+        const branding = await pro.branding.getBrandingConfig(config)
+
         return {
           apps: {
             checked: apps.length > 0,
@@ -519,6 +525,7 @@ export async function configChecklist(ctx: Ctx) {
             label: "Set up single sign-on",
             link: "/builder/portal/settings/auth",
           },
+          branding,
         }
       }
     )
diff --git a/packages/worker/src/api/routes/global/tests/auth.spec.ts b/packages/worker/src/api/routes/global/tests/auth.spec.ts
index d280e3b5f1..e9edfdf1cf 100644
--- a/packages/worker/src/api/routes/global/tests/auth.spec.ts
+++ b/packages/worker/src/api/routes/global/tests/auth.spec.ts
@@ -80,7 +80,7 @@ describe("/api/global/auth", () => {
 
       it("should return 403 when user doesn't exist", async () => {
         const tenantId = config.tenantId!
-        const email = "invaliduser@test.com"
+        const email = "invaliduser@example.com"
         const password = "password"
 
         const response = await config.api.auth.login(
diff --git a/packages/worker/src/api/routes/global/tests/users.spec.ts b/packages/worker/src/api/routes/global/tests/users.spec.ts
index c792de70a9..744b0a5578 100644
--- a/packages/worker/src/api/routes/global/tests/users.spec.ts
+++ b/packages/worker/src/api/routes/global/tests/users.spec.ts
@@ -490,7 +490,7 @@ describe("/api/global/users", () => {
     it("should not be able to update email address", async () => {
       const email = structures.email()
       const user = await config.createUser(structures.users.user({ email }))
-      user.email = "new@test.com"
+      user.email = "new@example.com"
 
       const response = await config.api.users.saveUser(user, 400)
 
diff --git a/packages/worker/src/tests/api/email.ts b/packages/worker/src/tests/api/email.ts
index fd3c622cfa..6ed0580229 100644
--- a/packages/worker/src/tests/api/email.ts
+++ b/packages/worker/src/tests/api/email.ts
@@ -10,7 +10,7 @@ export class EmailAPI extends TestAPI {
     return this.request
       .post(`/api/global/email/send`)
       .send({
-        email: "test@test.com",
+        email: "test@example.com",
         purpose,
         tenantId: this.config.getTenantId(),
         userId: this.config.user?._id!,
diff --git a/packages/worker/src/tests/structures/configs.ts b/packages/worker/src/tests/structures/configs.ts
index d50f5ebc72..8f13058dbe 100644
--- a/packages/worker/src/tests/structures/configs.ts
+++ b/packages/worker/src/tests/structures/configs.ts
@@ -45,7 +45,7 @@ export function smtp(conf?: any): SMTPConfig {
     config: {
       port: 12345,
       host: "smtptesthost.com",
-      from: "testfrom@test.com",
+      from: "testfrom@example.com",
       subject: "Hello!",
       secure: false,
       ...conf,
@@ -59,7 +59,7 @@ export function smtpEthereal(): SMTPConfig {
     config: {
       port: 587,
       host: "smtp.ethereal.email",
-      from: "testfrom@test.com",
+      from: "testfrom@example.com",
       secure: false,
       auth: {
         user: "wyatt.zulauf29@ethereal.email",
diff --git a/scripts/build.js b/scripts/build.js
index c76217bb8b..ad31381684 100755
--- a/scripts/build.js
+++ b/scripts/build.js
@@ -49,6 +49,7 @@ function runBuild(entry, outfile) {
     preserveSymlinks: true,
     loader: {
       ".svelte": "copy",
+      ".ivm.bundle.js": "text",
     },
     metafile: true,
     external: [
@@ -60,6 +61,7 @@ function runBuild(entry, outfile) {
       "bcrypt",
       "bcryptjs",
       "graphql/*",
+      "bson",
     ],
   }
 
diff --git a/yarn.lock b/yarn.lock
index 2c12097fb5..1937482837 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1089,7 +1089,7 @@
 "@babel/highlight@^7.23.4":
   version "7.23.4"
   resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.23.4.tgz#edaadf4d8232e1a961432db785091207ead0621b"
-  integrity sha512-acGdbYSfp2WheJoJm/EBBBLh/ID8KDc64ISZ9DYtBmC8/Q204PZJLHyzeB5qMzJ5trcOkybd78M4x2KWsUq++A==
+  integrity "sha1-7arfTYIy4alhQy23hQkSB+rQYhs= sha512-acGdbYSfp2WheJoJm/EBBBLh/ID8KDc64ISZ9DYtBmC8/Q204PZJLHyzeB5qMzJ5trcOkybd78M4x2KWsUq++A=="
   dependencies:
     "@babel/helper-validator-identifier" "^7.22.20"
     chalk "^2.4.2"
@@ -1980,7 +1980,14 @@
   resolved "https://registry.yarnpkg.com/@babel/regjsgen/-/regjsgen-0.8.0.tgz#f0ba69b075e1f05fb2825b7fad991e7adbb18310"
   integrity sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA==
 
-"@babel/runtime@^7.12.5", "@babel/runtime@^7.13.10", "@babel/runtime@^7.15.4", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.4", "@babel/runtime@^7.9.2":
+"@babel/runtime@^7.10.5":
+  version "7.23.9"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.23.9.tgz#47791a15e4603bb5f905bc0753801cf21d6345f7"
+  integrity sha512-0CX6F+BI2s9dkUqr08KFrAIZgNFj75rdBU/DjCyYLIaV/quFjkk6T+EJ2LkZHyZTbEV4L5p97mNkUsHl2wLFAw==
+  dependencies:
+    regenerator-runtime "^0.14.0"
+
+"@babel/runtime@^7.12.5", "@babel/runtime@^7.13.10", "@babel/runtime@^7.15.4", "@babel/runtime@^7.21.0", "@babel/runtime@^7.8.4", "@babel/runtime@^7.9.2":
   version "7.23.8"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.23.8.tgz#8ee6fe1ac47add7122902f257b8ddf55c898f650"
   integrity sha512-Y7KbAP984rn1VGMbGqKmBLio9V7y5Je9GvU4rQPCPinCyNfUcToxIXl06d59URp/F3LwinvODxab5N/G6qggkw==
@@ -2075,40 +2082,33 @@
     pouchdb-promise "^6.0.4"
     through2 "^2.0.0"
 
-"@bull-board/api@3.7.0":
-  version "3.7.0"
-  resolved "https://registry.yarnpkg.com/@bull-board/api/-/api-3.7.0.tgz#231f687187c0cb34e0b97f463917b6aaeb4ef6af"
-  integrity sha512-BGAqOUqMa7KMsqR+07LhMDVARLBHRekGGxWCIOYx17mMbSev54ausSGQsVaSKvzPbHpp1YbRlh7RzIJUjxsY/A==
+"@bull-board/api@5.10.2":
+  version "5.10.2"
+  resolved "https://registry.yarnpkg.com/@bull-board/api/-/api-5.10.2.tgz#ae8ff6918b23897bf879a6ead3683f964374c4b3"
+  integrity sha512-Gx98cqN0cryJB35mVKjYsEnD3NxArWY3Xi2E5Wrr17QTVOzWEP4jyDQ/riiapVdnYqc9RSsxCCmdIaNdNPcXlQ==
   dependencies:
     redis-info "^3.0.8"
 
-"@bull-board/api@3.9.4":
-  version "3.9.4"
-  resolved "https://registry.yarnpkg.com/@bull-board/api/-/api-3.9.4.tgz#984f25e6d5501d97152d81184968ff135757b57a"
-  integrity sha512-1X1YCqPEID2kKwq+g4aEspZm2j+vUgEYDlqINCLztThBXWbzJhI1vqwktVGJF9DAe98Jl6R84vb7cO/AgjaKMA==
+"@bull-board/koa@5.10.2":
+  version "5.10.2"
+  resolved "https://registry.yarnpkg.com/@bull-board/koa/-/koa-5.10.2.tgz#568fc5aea98b674073bba76a9d589acce9ca338a"
+  integrity sha512-fVgs2/Y5vqYQGe0Hn5AanricF6TCM9uglxzaxBSDNHHpYIJDl8aLoU6L1/x5/K2fPE16STpSyGhJf+UFEWCQ0A==
   dependencies:
-    redis-info "^3.0.8"
-
-"@bull-board/koa@3.9.4":
-  version "3.9.4"
-  resolved "https://registry.yarnpkg.com/@bull-board/koa/-/koa-3.9.4.tgz#c741500cf42f01e339e1b0c05c80a42b310b31dd"
-  integrity sha512-d5TBzok0VjYycNhrIuHwRpoRBJk071xv/nAKbN9yC5IVXxxJnWb90u2Lc9qhSFssJTLX/6WuXglZJSMJMkNiJQ==
-  dependencies:
-    "@bull-board/api" "3.9.4"
-    "@bull-board/ui" "3.9.4"
-    ejs "^3.1.6"
+    "@bull-board/api" "5.10.2"
+    "@bull-board/ui" "5.10.2"
+    ejs "^3.1.7"
     koa "^2.13.1"
     koa-mount "^4.0.0"
     koa-router "^10.0.0"
     koa-static "^5.0.0"
     koa-views "^7.0.1"
 
-"@bull-board/ui@3.9.4":
-  version "3.9.4"
-  resolved "https://registry.yarnpkg.com/@bull-board/ui/-/ui-3.9.4.tgz#3a58c2903c91048c9f200f2d7525847a6a84a78c"
-  integrity sha512-FjKmoEWerJmqh3mSx9wltVZvjNuBpux17CPQpI/nWJCtWzCQp0icxbJ8VBb6LP97xl8puDZ+na3zm89TdOPM9g==
+"@bull-board/ui@5.10.2":
+  version "5.10.2"
+  resolved "https://registry.yarnpkg.com/@bull-board/ui/-/ui-5.10.2.tgz#08dcaa5095fbf11ba6488d9ae9370cdea7aebd59"
+  integrity sha512-wU9XmrX/COISZ3+sn3VEDB1UtPt7szu4QSKTw1O0q+U1JLM4Kxfs3tH9ZAIulzMrY+CQtkJXd+dKZPuRqy4rfQ==
   dependencies:
-    "@bull-board/api" "3.9.4"
+    "@bull-board/api" "5.10.2"
 
 "@codemirror/autocomplete@^6.0.0", "@codemirror/autocomplete@^6.7.1":
   version "6.7.1"
@@ -2234,6 +2234,13 @@
   dependencies:
     node-gyp-build "^3.9.0"
 
+"@datadog/native-appsec@7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@datadog/native-appsec/-/native-appsec-7.0.0.tgz#a380174dd49aef2d9bb613a0ec8ead6dc7822095"
+  integrity sha512-bywstWFW2hWxzPuS0+mFMVHHL0geulx5yQFtsjfszaH2LTAgk2D+Rt40MKbAoZ8q3tRw2dy6aYQ7svO3ca8jpA==
+  dependencies:
+    node-gyp-build "^3.9.0"
+
 "@datadog/native-iast-rewriter@2.2.2":
   version "2.2.2"
   resolved "https://registry.yarnpkg.com/@datadog/native-iast-rewriter/-/native-iast-rewriter-2.2.2.tgz#3f7feaf6be1af4c83ad063065b8ed509bbaf11cb"
@@ -2550,6 +2557,11 @@
   resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.52.0.tgz#78fe5f117840f69dc4a353adf9b9cd926353378c"
   integrity sha512-mjZVbpaeMZludF2fsWLD0Z9gCref1Tk4i9+wddjRvpUNqqcndPkBD09N/Mapey0b3jaXbLm2kICwFv2E64QinA==
 
+"@fastify/busboy@^2.0.0":
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/@fastify/busboy/-/busboy-2.1.0.tgz#0709e9f4cb252351c609c6e6d8d6779a8d25edff"
+  integrity sha512-+KpH+QxZU7O4675t3mnkQKcZZg56u+K/Ct2K+N2AZYNVK8kyeo/bI18tI8aPm3tvNNRyTWfj6s5tnGNlcbQRsA==
+
 "@fontsource/source-sans-pro@^5.0.3":
   version "5.0.3"
   resolved "https://registry.yarnpkg.com/@fontsource/source-sans-pro/-/source-sans-pro-5.0.3.tgz#7d6e84a8169ba12fa5e6ce70757aa2ca7e74d855"
@@ -2638,6 +2650,14 @@
     teeny-request "^8.0.0"
     uuid "^8.0.0"
 
+"@govtechsg/passport-openidconnect@^1.0.2":
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/@govtechsg/passport-openidconnect/-/passport-openidconnect-1.0.2.tgz#a29e3468f828d89ed77ef0340cef09e4638d8148"
+  integrity sha512-uE685U40/mUHw189D9HNwu2EDb53bhNan7jDO0k3DElLTvmZVl2je49lI5+f1w8qR39xYKBgwMPFQk0WIvZVrQ==
+  dependencies:
+    oauth "^0.10.0"
+    passport-strategy "^1.0.0"
+
 "@grpc/grpc-js@1.9.7":
   version "1.9.7"
   resolved "https://registry.yarnpkg.com/@grpc/grpc-js/-/grpc-js-1.9.7.tgz#7d0e29bc162287bee2523901c9bc9320d8402397"
@@ -2973,294 +2993,261 @@
     "@types/yargs" "^17.0.8"
     chalk "^4.0.0"
 
-"@jimp/bmp@^0.16.13":
-  version "0.16.13"
-  resolved "https://registry.yarnpkg.com/@jimp/bmp/-/bmp-0.16.13.tgz#57ffa5b17417b5a181f6f184bdabc8218e8448ef"
-  integrity sha512-9edAxu7N2FX7vzkdl5Jo1BbACfycUtBQX+XBMcHA2bk62P8R0otgkHg798frgAk/WxQIzwxqOH6wMiCwrlAzdQ==
+"@jimp/bmp@^0.22.10":
+  version "0.22.10"
+  resolved "https://registry.yarnpkg.com/@jimp/bmp/-/bmp-0.22.10.tgz#e4fe8934a83f1e677cbfd74ad22a684bf1aad529"
+  integrity sha512-1UXRl1Nw1KptZ1r0ANqtXOst9vGH51dq7keVKQzyyTO2lz4dOaezS9StuSTNh+RmiHg/SVPaFRpPfB0S/ln4Kg==
   dependencies:
-    "@babel/runtime" "^7.7.2"
-    "@jimp/utils" "^0.16.13"
+    "@jimp/utils" "^0.22.10"
     bmp-js "^0.1.0"
 
-"@jimp/core@^0.16.13":
-  version "0.16.13"
-  resolved "https://registry.yarnpkg.com/@jimp/core/-/core-0.16.13.tgz#7171745a912b5b847f8bf53e70b0672c5ca92744"
-  integrity sha512-qXpA1tzTnlkTku9yqtuRtS/wVntvE6f3m3GNxdTdtmc+O+Wcg9Xo2ABPMh7Nc0AHbMKzwvwgB2JnjZmlmJEObg==
+"@jimp/core@^0.22.10":
+  version "0.22.10"
+  resolved "https://registry.yarnpkg.com/@jimp/core/-/core-0.22.10.tgz#a106e719a9e1bc668c9595065a0872767cda3934"
+  integrity sha512-ZKyrehVy6wu1PnBXIUpn/fXmyMRQiVSbvHDubgXz4bfTOao3GiOurKHjByutQIgozuAN6ZHWiSge1dKA+dex3w==
   dependencies:
-    "@babel/runtime" "^7.7.2"
-    "@jimp/utils" "^0.16.13"
+    "@jimp/utils" "^0.22.10"
     any-base "^1.1.0"
     buffer "^5.2.0"
     exif-parser "^0.1.12"
     file-type "^16.5.4"
-    load-bmfont "^1.3.1"
-    mkdirp "^0.5.1"
-    phin "^2.9.1"
+    isomorphic-fetch "^3.0.0"
     pixelmatch "^4.0.2"
-    tinycolor2 "^1.4.1"
+    tinycolor2 "^1.6.0"
 
-"@jimp/custom@^0.16.1":
-  version "0.16.13"
-  resolved "https://registry.yarnpkg.com/@jimp/custom/-/custom-0.16.13.tgz#2e4ed447b7410b81fe9103682b4166af904daf84"
-  integrity sha512-LTATglVUPGkPf15zX1wTMlZ0+AU7cGEGF6ekVF1crA8eHUWsGjrYTB+Ht4E3HTrCok8weQG+K01rJndCp/l4XA==
+"@jimp/custom@^0.22.10":
+  version "0.22.10"
+  resolved "https://registry.yarnpkg.com/@jimp/custom/-/custom-0.22.10.tgz#621f3ec418c59c78ca43c5bc6f91a467e48a7a87"
+  integrity sha512-sPZkUYe1hu0iIgNisjizxPJqq2vaaKvkCkPoXq2U6UV3ZA1si/WVdrg25da3IcGIEV+83AoHgM8TvqlLgrCJsg==
   dependencies:
-    "@babel/runtime" "^7.7.2"
-    "@jimp/core" "^0.16.13"
+    "@jimp/core" "^0.22.10"
 
-"@jimp/gif@^0.16.13":
-  version "0.16.13"
-  resolved "https://registry.yarnpkg.com/@jimp/gif/-/gif-0.16.13.tgz#fa72f35d8ad67d6ce3a3d7ef6c8d04a462afaaf9"
-  integrity sha512-yFAMZGv3o+YcjXilMWWwS/bv1iSqykFahFMSO169uVMtfQVfa90kt4/kDwrXNR6Q9i6VHpFiGZMlF2UnHClBvg==
+"@jimp/gif@^0.22.10":
+  version "0.22.10"
+  resolved "https://registry.yarnpkg.com/@jimp/gif/-/gif-0.22.10.tgz#fc47738edc5f5327a0c023ad40e89417fdb5ef60"
+  integrity sha512-yEX2dSpamvkSx1PPDWGnKeWDrBz0vrCKjVG/cn4Zr68MRRT75tbZIeOrBa+RiUpY3ho5ix7d36LkYvt3qfUIhQ==
   dependencies:
-    "@babel/runtime" "^7.7.2"
-    "@jimp/utils" "^0.16.13"
-    gifwrap "^0.9.2"
+    "@jimp/utils" "^0.22.10"
+    gifwrap "^0.10.1"
     omggif "^1.0.9"
 
-"@jimp/jpeg@^0.16.13":
-  version "0.16.13"
-  resolved "https://registry.yarnpkg.com/@jimp/jpeg/-/jpeg-0.16.13.tgz#e1c128a591bd7f8a26c8731fd0bc65d32d4ba32a"
-  integrity sha512-BJHlDxzTlCqP2ThqP8J0eDrbBfod7npWCbJAcfkKqdQuFk0zBPaZ6KKaQKyKxmWJ87Z6ohANZoMKEbtvrwz1AA==
+"@jimp/jpeg@^0.22.10":
+  version "0.22.10"
+  resolved "https://registry.yarnpkg.com/@jimp/jpeg/-/jpeg-0.22.10.tgz#b4aba85d607d598d5a4ce0c66cefe69a8fc45c26"
+  integrity sha512-6bu98pAcVN4DY2oiDLC4TOgieX/lZrLd1tombWZOFCN5PBmqaHQxm7IUmT+Wj4faEvh8QSHgVLSA+2JQQRJWVA==
   dependencies:
-    "@babel/runtime" "^7.7.2"
-    "@jimp/utils" "^0.16.13"
-    jpeg-js "^0.4.2"
+    "@jimp/utils" "^0.22.10"
+    jpeg-js "^0.4.4"
 
-"@jimp/plugin-blit@^0.16.13":
-  version "0.16.13"
-  resolved "https://registry.yarnpkg.com/@jimp/plugin-blit/-/plugin-blit-0.16.13.tgz#370303edef02b75aa3e316726c5a3aac3e92f5d0"
-  integrity sha512-8Z1k96ZFxlhK2bgrY1JNWNwvaBeI/bciLM0yDOni2+aZwfIIiC7Y6PeWHTAvjHNjphz+XCt01WQmOYWCn0ML6g==
+"@jimp/plugin-blit@^0.22.10":
+  version "0.22.10"
+  resolved "https://registry.yarnpkg.com/@jimp/plugin-blit/-/plugin-blit-0.22.10.tgz#c351a27d52d8273b61d4f3cd68a9b73b03dd7b14"
+  integrity sha512-6EI8Sl+mxYHEIy6Yteh6eknD+EZguKpNdr3sCKxNezmLR0+vK99vHcllo6uGSjXXiwtwS67Xqxn8SsoatL+UJQ==
   dependencies:
-    "@babel/runtime" "^7.7.2"
-    "@jimp/utils" "^0.16.13"
+    "@jimp/utils" "^0.22.10"
 
-"@jimp/plugin-blur@^0.16.13":
-  version "0.16.13"
-  resolved "https://registry.yarnpkg.com/@jimp/plugin-blur/-/plugin-blur-0.16.13.tgz#27b82295a3dee88d6e029d4d62f5de8118b845e6"
-  integrity sha512-PvLrfa8vkej3qinlebyhLpksJgCF5aiysDMSVhOZqwH5nQLLtDE9WYbnsofGw4r0VVpyw3H/ANCIzYTyCtP9Cg==
+"@jimp/plugin-blur@^0.22.10":
+  version "0.22.10"
+  resolved "https://registry.yarnpkg.com/@jimp/plugin-blur/-/plugin-blur-0.22.10.tgz#22a67bb8b21403ac28b44bef6cf9a934846fec83"
+  integrity sha512-4XRTWuPVdMXJeclJMisXPGizeHtTryVaVV5HnuQXpKqIZtzXReCCpNGH8q/i0kBQOQMXhGWS3mpqOEwtpPePKw==
   dependencies:
-    "@babel/runtime" "^7.7.2"
-    "@jimp/utils" "^0.16.13"
+    "@jimp/utils" "^0.22.10"
 
-"@jimp/plugin-circle@^0.16.13":
-  version "0.16.13"
-  resolved "https://registry.yarnpkg.com/@jimp/plugin-circle/-/plugin-circle-0.16.13.tgz#d7af61a95b17e67c7fd4361cd1d588e00b58b6b6"
-  integrity sha512-RNave7EFgZrb5V5EpdvJGAEHMnDAJuwv05hKscNfIYxf0kR3KhViBTDy+MoTnMlIvaKFULfwIgaZWzyhuINMzA==
+"@jimp/plugin-circle@^0.22.10":
+  version "0.22.10"
+  resolved "https://registry.yarnpkg.com/@jimp/plugin-circle/-/plugin-circle-0.22.10.tgz#2a4c81b5c1a49f583d2d5090496c1ecb29c52c1a"
+  integrity sha512-mhcwTO1ywRxiCgtLGge6tDDIDPlX6qkI3CY+BjgGG/XhVHccCddXgOGLdlf+5OuKIEF2Nqs0V01LQEQIJFTmEw==
   dependencies:
-    "@babel/runtime" "^7.7.2"
-    "@jimp/utils" "^0.16.13"
+    "@jimp/utils" "^0.22.10"
 
-"@jimp/plugin-color@^0.16.13":
-  version "0.16.13"
-  resolved "https://registry.yarnpkg.com/@jimp/plugin-color/-/plugin-color-0.16.13.tgz#825227e7e6f32d227740ad1bd97c389083c1d0d1"
-  integrity sha512-xW+9BtEvoIkkH/Wde9ql4nAFbYLkVINhpgAE7VcBUsuuB34WUbcBl/taOuUYQrPEFQJ4jfXiAJZ2H/rvKjCVnQ==
+"@jimp/plugin-color@^0.22.10":
+  version "0.22.10"
+  resolved "https://registry.yarnpkg.com/@jimp/plugin-color/-/plugin-color-0.22.10.tgz#cf053aa30eb3bf7df3cceb8547ef78a841bfcd72"
+  integrity sha512-e4t3L7Kedd96E0x1XjsTM6NcgulKUU66HdFTao7Tc9FYJRFSlttARZ/C6LEryGDm/i69R6bJEpo7BkNz0YL55Q==
   dependencies:
-    "@babel/runtime" "^7.7.2"
-    "@jimp/utils" "^0.16.13"
-    tinycolor2 "^1.4.1"
+    "@jimp/utils" "^0.22.10"
+    tinycolor2 "^1.6.0"
 
-"@jimp/plugin-contain@^0.16.13":
-  version "0.16.13"
-  resolved "https://registry.yarnpkg.com/@jimp/plugin-contain/-/plugin-contain-0.16.13.tgz#7a42ed1ce580bf910f812ba2f35e0fa2cfe501ac"
-  integrity sha512-QayTXw4tXMwU6q6acNTQrTTFTXpNRBe+MgTGMDU0lk+23PjlFCO/9sacflelG8lsp7vNHhAxFeHptDMAksEYzg==
+"@jimp/plugin-contain@^0.22.10":
+  version "0.22.10"
+  resolved "https://registry.yarnpkg.com/@jimp/plugin-contain/-/plugin-contain-0.22.10.tgz#5302e088a09884ff0ae6656e0e682e2e487c2199"
+  integrity sha512-eP8KrzctuEoqibQAxi9WhbnoRosydhiwg+IYya3dKuKDBTrD9UHt+ERlPQ/lTNWHzV/l4S1ntV3r9s9saJgsXA==
   dependencies:
-    "@babel/runtime" "^7.7.2"
-    "@jimp/utils" "^0.16.13"
+    "@jimp/utils" "^0.22.10"
 
-"@jimp/plugin-cover@^0.16.13":
-  version "0.16.13"
-  resolved "https://registry.yarnpkg.com/@jimp/plugin-cover/-/plugin-cover-0.16.13.tgz#9c964be05b163e0f0e06866a9afcebe775dff246"
-  integrity sha512-BSsP71GTNaqWRcvkbWuIVH+zK7b3TSNebbhDkFK0fVaUTzHuKMS/mgY4hDZIEVt7Rf5FjadAYtsujHN9w0iSYA==
+"@jimp/plugin-cover@^0.22.10":
+  version "0.22.10"
+  resolved "https://registry.yarnpkg.com/@jimp/plugin-cover/-/plugin-cover-0.22.10.tgz#746b25bbea92aa7f9b130feca5af02717122e6d5"
+  integrity sha512-kJCwL5T1igfa0InCfkE7bBeqg26m46aoRt10ug+rvm11P6RrvRMGrgINFyIKB+mnB7CiyBN/MOula1CvLhSInQ==
   dependencies:
-    "@babel/runtime" "^7.7.2"
-    "@jimp/utils" "^0.16.13"
+    "@jimp/utils" "^0.22.10"
 
-"@jimp/plugin-crop@^0.16.13":
-  version "0.16.13"
-  resolved "https://registry.yarnpkg.com/@jimp/plugin-crop/-/plugin-crop-0.16.13.tgz#80c6ae4d401a8de6cc11b265f3cdecd80425b9a9"
-  integrity sha512-WEl2tPVYwzYL8OKme6Go2xqiWgKsgxlMwyHabdAU4tXaRwOCnOI7v4021gCcBb9zn/oWwguHuKHmK30Fw2Z/PA==
+"@jimp/plugin-crop@^0.22.10":
+  version "0.22.10"
+  resolved "https://registry.yarnpkg.com/@jimp/plugin-crop/-/plugin-crop-0.22.10.tgz#6204fd6be751d7edb64a86ab788ba762843b9877"
+  integrity sha512-BOZ+YGaZlhU7c5ye65RxikicXH0Ki0It6/XHISvipR5WZrfjLjL2Ke20G+AGnwBQc76gKenVcMXVUCnEjtZV+Q==
   dependencies:
-    "@babel/runtime" "^7.7.2"
-    "@jimp/utils" "^0.16.13"
+    "@jimp/utils" "^0.22.10"
 
-"@jimp/plugin-displace@^0.16.13":
-  version "0.16.13"
-  resolved "https://registry.yarnpkg.com/@jimp/plugin-displace/-/plugin-displace-0.16.13.tgz#fd72aa93b3fe97a1c3da729e6b26399661ce8ce5"
-  integrity sha512-qt9WKq8vWrcjySa9DyQ0x/RBMHQeiVjdVSY1SJsMjssPUf0pS74qorcuAkGi89biN3YoGUgPkpqECnAWnYwgGA==
+"@jimp/plugin-displace@^0.22.10":
+  version "0.22.10"
+  resolved "https://registry.yarnpkg.com/@jimp/plugin-displace/-/plugin-displace-0.22.10.tgz#6dc277c84c0c6b2c2d793271ddf45b61284cb043"
+  integrity sha512-llNiWWMTKISDXt5+cXI0GaFmZWAjlT+4fFLYf4eXquuL/9wZoQsEBhv2GdGd48mkiS8jZq1Nnb2Q4ehEPTvrzw==
   dependencies:
-    "@babel/runtime" "^7.7.2"
-    "@jimp/utils" "^0.16.13"
+    "@jimp/utils" "^0.22.10"
 
-"@jimp/plugin-dither@^0.16.13":
-  version "0.16.13"
-  resolved "https://registry.yarnpkg.com/@jimp/plugin-dither/-/plugin-dither-0.16.13.tgz#430750f73d528df7ebe21bb508fb80f9f515305d"
-  integrity sha512-5/N3yJggbWQTlGZHQYJPmQXEwR52qaXjEzkp1yRBbtdaekXE3BG/suo0fqeoV/csf8ooI78sJzYmIrxNoWVtgQ==
+"@jimp/plugin-dither@^0.22.10":
+  version "0.22.10"
+  resolved "https://registry.yarnpkg.com/@jimp/plugin-dither/-/plugin-dither-0.22.10.tgz#9cbad07fb16d2dcb88d86c16d5437dee9232426a"
+  integrity sha512-05WLmeV5M+P/0FS+bWf13hMew2X0oa8w9AtmevL2UyA/5GqiyvP2Xm5WfGQ8oFiiMvpnL6RFomJQOZtWca0C2w==
   dependencies:
-    "@babel/runtime" "^7.7.2"
-    "@jimp/utils" "^0.16.13"
+    "@jimp/utils" "^0.22.10"
 
-"@jimp/plugin-fisheye@^0.16.13":
-  version "0.16.13"
-  resolved "https://registry.yarnpkg.com/@jimp/plugin-fisheye/-/plugin-fisheye-0.16.13.tgz#caf69851ab25c44d13c952880a8e43c928abd3f1"
-  integrity sha512-2rZmTdFbT/cF9lEZIkXCYO0TsT114Q27AX5IAo0Sju6jVQbvIk1dFUTnwLDadTo8wkJlFzGqMQ24Cs8cHWOliA==
+"@jimp/plugin-fisheye@^0.22.10":
+  version "0.22.10"
+  resolved "https://registry.yarnpkg.com/@jimp/plugin-fisheye/-/plugin-fisheye-0.22.10.tgz#94cbb32947d24cdd596f7259754e390e69c3e7a6"
+  integrity sha512-InjiXvc7Gkzrx8VWtU97kDqV7ENnhHGPULymJWeZaF2aicud9Fpk4iCtd/DcZIrk7Cbe60A8RwNXN00HXIbSCg==
   dependencies:
-    "@babel/runtime" "^7.7.2"
-    "@jimp/utils" "^0.16.13"
+    "@jimp/utils" "^0.22.10"
 
-"@jimp/plugin-flip@^0.16.13":
-  version "0.16.13"
-  resolved "https://registry.yarnpkg.com/@jimp/plugin-flip/-/plugin-flip-0.16.13.tgz#3dd167e14d03d62410c519990728ac3c247c0692"
-  integrity sha512-EmcgAA74FTc5u7Z+hUO/sRjWwfPPLuOQP5O64x5g4j0T12Bd29IgsYZxoutZo/rb3579+JNa/3wsSEmyVv1EpA==
+"@jimp/plugin-flip@^0.22.10":
+  version "0.22.10"
+  resolved "https://registry.yarnpkg.com/@jimp/plugin-flip/-/plugin-flip-0.22.10.tgz#58f9e05c5038d1ab849bda41cee4f0416fe07fb5"
+  integrity sha512-42GkGtTHWnhnwTMPVK/kXObZbkYIpQWfuIfy5EMEMk6zRj05zpv4vsjkKWfuemweZINwfvD7wDJF7FVFNNcZZg==
   dependencies:
-    "@babel/runtime" "^7.7.2"
-    "@jimp/utils" "^0.16.13"
+    "@jimp/utils" "^0.22.10"
 
-"@jimp/plugin-gaussian@^0.16.13":
-  version "0.16.13"
-  resolved "https://registry.yarnpkg.com/@jimp/plugin-gaussian/-/plugin-gaussian-0.16.13.tgz#79879d9371aff3e1714c54be0771418573ac2954"
-  integrity sha512-A1XKfGQD0iDdIiKqFYi8nZMv4dDVYdxbrmgR7y/CzUHhSYdcmoljLIIsZZM3Iks/Wa353W3vtvkWLuDbQbch1w==
+"@jimp/plugin-gaussian@^0.22.10":
+  version "0.22.10"
+  resolved "https://registry.yarnpkg.com/@jimp/plugin-gaussian/-/plugin-gaussian-0.22.10.tgz#69effed5dccd11eada36262bd65fbaa06bd8be84"
+  integrity sha512-ykrG/6lTp9Q5YA8jS5XzwMHtRxb9HOFMgtmnrUZ8kU+BK8REecfy9Ic5BUEOjCYvS1a/xLsnrZQU07iiYxBxFg==
   dependencies:
-    "@babel/runtime" "^7.7.2"
-    "@jimp/utils" "^0.16.13"
+    "@jimp/utils" "^0.22.10"
 
-"@jimp/plugin-invert@^0.16.13":
-  version "0.16.13"
-  resolved "https://registry.yarnpkg.com/@jimp/plugin-invert/-/plugin-invert-0.16.13.tgz#7449283d5b0f405ce2cd1b93a6d79169c970e431"
-  integrity sha512-xFMrIn7czEZbdbMzZWuaZFnlLGJDVJ82y5vlsKsXRTG2kcxRsMPXvZRWHV57nSs1YFsNqXSbrC8B98n0E32njQ==
+"@jimp/plugin-invert@^0.22.10":
+  version "0.22.10"
+  resolved "https://registry.yarnpkg.com/@jimp/plugin-invert/-/plugin-invert-0.22.10.tgz#370b4ce4634b3e2c5fbbe88270a74f5673c765bb"
+  integrity sha512-d8j9BlUJYs/c994t4azUWSWmQq4LLPG4ecm8m6SSNqap+S/HlVQGqjYhJEBbY9EXkOTYB9vBL9bqwSM1Rr6paA==
   dependencies:
-    "@babel/runtime" "^7.7.2"
-    "@jimp/utils" "^0.16.13"
+    "@jimp/utils" "^0.22.10"
 
-"@jimp/plugin-mask@^0.16.13":
-  version "0.16.13"
-  resolved "https://registry.yarnpkg.com/@jimp/plugin-mask/-/plugin-mask-0.16.13.tgz#70b4bef4a598e41571f9a3e0c33fcc730eeae24d"
-  integrity sha512-wLRYKVBXql2GAYgt6FkTnCfE+q5NomM7Dlh0oIPGAoMBWDyTx0eYutRK6PlUrRK2yMHuroAJCglICTbxqGzowQ==
+"@jimp/plugin-mask@^0.22.10":
+  version "0.22.10"
+  resolved "https://registry.yarnpkg.com/@jimp/plugin-mask/-/plugin-mask-0.22.10.tgz#6404f54a782c952fecf7b6ae0f3d894d4fc99c51"
+  integrity sha512-yRBs1230XZkz24uFTdTcSlZ0HXZpIWzM3iFQN56MzZ7USgdVZjPPDCQ8I9RpqfZ36nDflQkUO0wV7ucsi4ogow==
   dependencies:
-    "@babel/runtime" "^7.7.2"
-    "@jimp/utils" "^0.16.13"
+    "@jimp/utils" "^0.22.10"
 
-"@jimp/plugin-normalize@^0.16.13":
-  version "0.16.13"
-  resolved "https://registry.yarnpkg.com/@jimp/plugin-normalize/-/plugin-normalize-0.16.13.tgz#fd7c802c3f6be8d34abf0dbeadfe1d783e531d67"
-  integrity sha512-3tfad0n9soRna4IfW9NzQdQ2Z3ijkmo21DREHbE6CGcMIxOSvfRdSvf1qQPApxjTSo8LTU4MCi/fidx/NZ0GqQ==
+"@jimp/plugin-normalize@^0.22.10":
+  version "0.22.10"
+  resolved "https://registry.yarnpkg.com/@jimp/plugin-normalize/-/plugin-normalize-0.22.10.tgz#6a8d0f57a8f90a3ec15f2391c338b94f3eb49e72"
+  integrity sha512-Wk9GX6eJMchX/ZAazVa70Fagu+OXMvHiPY+HrcEwcclL+p1wo8xAHEsf9iKno7Ja4EU9lLhbBRY5hYJyiKMEkg==
   dependencies:
-    "@babel/runtime" "^7.7.2"
-    "@jimp/utils" "^0.16.13"
+    "@jimp/utils" "^0.22.10"
 
-"@jimp/plugin-print@^0.16.13":
-  version "0.16.13"
-  resolved "https://registry.yarnpkg.com/@jimp/plugin-print/-/plugin-print-0.16.13.tgz#595fb6db6677ac3d2b6bfe7144658019791bf288"
-  integrity sha512-0m6i3p01PGRkGAK9r53hDYrkyMq+tlhLOIbsSTmZyh6HLshUKlTB7eXskF5OpVd5ZUHoltlNc6R+ggvKIzxRFw==
+"@jimp/plugin-print@^0.22.10":
+  version "0.22.10"
+  resolved "https://registry.yarnpkg.com/@jimp/plugin-print/-/plugin-print-0.22.10.tgz#8c96df70851c1ead0b79c8ea74c8411445d921ca"
+  integrity sha512-1U3VloIR+beE1kWPdGEJMiE2h1Do29iv3w8sBbvPyRP4qXxRFcDpmCGtctsrKmb1krlBFlj8ubyAY90xL+5n9w==
   dependencies:
-    "@babel/runtime" "^7.7.2"
-    "@jimp/utils" "^0.16.13"
-    load-bmfont "^1.4.0"
+    "@jimp/utils" "^0.22.10"
+    load-bmfont "^1.4.1"
 
-"@jimp/plugin-resize@^0.16.13":
-  version "0.16.13"
-  resolved "https://registry.yarnpkg.com/@jimp/plugin-resize/-/plugin-resize-0.16.13.tgz#6267087f724d47e7bb8824c5b842d9315f50b8e7"
-  integrity sha512-qoqtN8LDknm3fJm9nuPygJv30O3vGhSBD2TxrsCnhtOsxKAqVPJtFVdGd/qVuZ8nqQANQmTlfqTiK9mVWQ7MiQ==
+"@jimp/plugin-resize@^0.22.10":
+  version "0.22.10"
+  resolved "https://registry.yarnpkg.com/@jimp/plugin-resize/-/plugin-resize-0.22.10.tgz#d968f0167069c9f7e612bceefdbcc4b3c65934b5"
+  integrity sha512-ixomxVcnAONXDgaq0opvAx4UAOiEhOA/tipuhFFOvPKFd4yf1BAnEviB5maB0SBHHkJXPUSzDp/73xVTMGSe7g==
   dependencies:
-    "@babel/runtime" "^7.7.2"
-    "@jimp/utils" "^0.16.13"
+    "@jimp/utils" "^0.22.10"
 
-"@jimp/plugin-rotate@^0.16.13":
-  version "0.16.13"
-  resolved "https://registry.yarnpkg.com/@jimp/plugin-rotate/-/plugin-rotate-0.16.13.tgz#9981f24631b1a0ad486d2b75a0163918ff912491"
-  integrity sha512-Ev+Jjmj1nHYw897z9C3R9dYsPv7S2/nxdgfFb/h8hOwK0Ovd1k/+yYS46A0uj/JCKK0pQk8wOslYBkPwdnLorw==
+"@jimp/plugin-rotate@^0.22.10":
+  version "0.22.10"
+  resolved "https://registry.yarnpkg.com/@jimp/plugin-rotate/-/plugin-rotate-0.22.10.tgz#93d3781eca02d549a632db74bc63d27a6bb9a38c"
+  integrity sha512-eeFX8dnRyf3LAdsdXWKWuN18hLRg8zy1cP0cP9rHzQVWRK7ck/QsLxK1vHq7MADGwQalNaNTJ9SQxH6c8mz6jw==
   dependencies:
-    "@babel/runtime" "^7.7.2"
-    "@jimp/utils" "^0.16.13"
+    "@jimp/utils" "^0.22.10"
 
-"@jimp/plugin-scale@^0.16.13":
-  version "0.16.13"
-  resolved "https://registry.yarnpkg.com/@jimp/plugin-scale/-/plugin-scale-0.16.13.tgz#36b1b7d70819591901339926a91dae4864cc1b92"
-  integrity sha512-05POQaEJVucjTiSGMoH68ZiELc7QqpIpuQlZ2JBbhCV+WCbPFUBcGSmE7w4Jd0E2GvCho/NoMODLwgcVGQA97A==
+"@jimp/plugin-scale@^0.22.10":
+  version "0.22.10"
+  resolved "https://registry.yarnpkg.com/@jimp/plugin-scale/-/plugin-scale-0.22.10.tgz#69127d45eb0837cd23cd04cff3677344064670ac"
+  integrity sha512-TG/H0oUN69C9ArBCZg4PmuoixFVKIiru8282KzSB/Tp1I0xwX0XLTv3dJ5pobPlIgPcB+TmD4xAIdkCT4rtWxg==
   dependencies:
-    "@babel/runtime" "^7.7.2"
-    "@jimp/utils" "^0.16.13"
+    "@jimp/utils" "^0.22.10"
 
-"@jimp/plugin-shadow@^0.16.13":
-  version "0.16.13"
-  resolved "https://registry.yarnpkg.com/@jimp/plugin-shadow/-/plugin-shadow-0.16.13.tgz#f5b58122c0a6e1307efcddfc165ce1291415d553"
-  integrity sha512-nmu5VSZ9hsB1JchTKhnnCY+paRBnwzSyK5fhkhtQHHoFD5ArBQ/5wU8y6tCr7k/GQhhGq1OrixsECeMjPoc8Zw==
+"@jimp/plugin-shadow@^0.22.10":
+  version "0.22.10"
+  resolved "https://registry.yarnpkg.com/@jimp/plugin-shadow/-/plugin-shadow-0.22.10.tgz#ccf379a8d41861eb07c35a60f3dcdede8e856de7"
+  integrity sha512-TN9xm6fI7XfxbMUQqFPZjv59Xdpf0tSiAQdINB4g6pJMWiVANR/74OtDONoy3KKpenu5Y38s+FkrtID/KcQAhw==
   dependencies:
-    "@babel/runtime" "^7.7.2"
-    "@jimp/utils" "^0.16.13"
+    "@jimp/utils" "^0.22.10"
 
-"@jimp/plugin-threshold@^0.16.13":
-  version "0.16.13"
-  resolved "https://registry.yarnpkg.com/@jimp/plugin-threshold/-/plugin-threshold-0.16.13.tgz#8de7500b03342b251201bc0feb84955dd3e410f0"
-  integrity sha512-+3zArBH0OE3Rhjm4HyAokMsZlIq5gpQec33CncyoSwxtRBM2WAhUVmCUKuBo+Lr/2/4ISoY4BWpHKhMLDix6cA==
+"@jimp/plugin-threshold@^0.22.10":
+  version "0.22.10"
+  resolved "https://registry.yarnpkg.com/@jimp/plugin-threshold/-/plugin-threshold-0.22.10.tgz#590bda5ddf9071adad36f98197e710f33cb47a26"
+  integrity sha512-DA2lSnU0TgIRbAgmXaxroYw3Ad6J2DOFEoJp0NleSm2h3GWbZEE5yW9U2B6hD3iqn4AenG4E2b2WzHXZyzSutw==
   dependencies:
-    "@babel/runtime" "^7.7.2"
-    "@jimp/utils" "^0.16.13"
+    "@jimp/utils" "^0.22.10"
 
-"@jimp/plugins@^0.16.1":
-  version "0.16.13"
-  resolved "https://registry.yarnpkg.com/@jimp/plugins/-/plugins-0.16.13.tgz#cf441ee13204dd9474bc0e67e41c50afc910de4f"
-  integrity sha512-CJLdqODEhEVs4MgWCxpWL5l95sCBlkuSLz65cxEm56X5akIsn4LOlwnKoSEZioYcZUBvHhCheH67AyPTudfnQQ==
+"@jimp/plugins@^0.22.10":
+  version "0.22.10"
+  resolved "https://registry.yarnpkg.com/@jimp/plugins/-/plugins-0.22.10.tgz#7062b6a36dc2d9c8dbd574a7697b6efaccecdee8"
+  integrity sha512-KDMZyM6pmvS8freB+UBLko1TO/k4D7URS/nphCozuH+P7i3UMe7NdckXKJ8u+WD6sqN0YFYvBehpkpnUiw/91w==
   dependencies:
-    "@babel/runtime" "^7.7.2"
-    "@jimp/plugin-blit" "^0.16.13"
-    "@jimp/plugin-blur" "^0.16.13"
-    "@jimp/plugin-circle" "^0.16.13"
-    "@jimp/plugin-color" "^0.16.13"
-    "@jimp/plugin-contain" "^0.16.13"
-    "@jimp/plugin-cover" "^0.16.13"
-    "@jimp/plugin-crop" "^0.16.13"
-    "@jimp/plugin-displace" "^0.16.13"
-    "@jimp/plugin-dither" "^0.16.13"
-    "@jimp/plugin-fisheye" "^0.16.13"
-    "@jimp/plugin-flip" "^0.16.13"
-    "@jimp/plugin-gaussian" "^0.16.13"
-    "@jimp/plugin-invert" "^0.16.13"
-    "@jimp/plugin-mask" "^0.16.13"
-    "@jimp/plugin-normalize" "^0.16.13"
-    "@jimp/plugin-print" "^0.16.13"
-    "@jimp/plugin-resize" "^0.16.13"
-    "@jimp/plugin-rotate" "^0.16.13"
-    "@jimp/plugin-scale" "^0.16.13"
-    "@jimp/plugin-shadow" "^0.16.13"
-    "@jimp/plugin-threshold" "^0.16.13"
+    "@jimp/plugin-blit" "^0.22.10"
+    "@jimp/plugin-blur" "^0.22.10"
+    "@jimp/plugin-circle" "^0.22.10"
+    "@jimp/plugin-color" "^0.22.10"
+    "@jimp/plugin-contain" "^0.22.10"
+    "@jimp/plugin-cover" "^0.22.10"
+    "@jimp/plugin-crop" "^0.22.10"
+    "@jimp/plugin-displace" "^0.22.10"
+    "@jimp/plugin-dither" "^0.22.10"
+    "@jimp/plugin-fisheye" "^0.22.10"
+    "@jimp/plugin-flip" "^0.22.10"
+    "@jimp/plugin-gaussian" "^0.22.10"
+    "@jimp/plugin-invert" "^0.22.10"
+    "@jimp/plugin-mask" "^0.22.10"
+    "@jimp/plugin-normalize" "^0.22.10"
+    "@jimp/plugin-print" "^0.22.10"
+    "@jimp/plugin-resize" "^0.22.10"
+    "@jimp/plugin-rotate" "^0.22.10"
+    "@jimp/plugin-scale" "^0.22.10"
+    "@jimp/plugin-shadow" "^0.22.10"
+    "@jimp/plugin-threshold" "^0.22.10"
     timm "^1.6.1"
 
-"@jimp/png@^0.16.13":
-  version "0.16.13"
-  resolved "https://registry.yarnpkg.com/@jimp/png/-/png-0.16.13.tgz#8b130cc5e1e754c074c42fa3fe2609897cefdf7c"
-  integrity sha512-8cGqINvbWJf1G0Her9zbq9I80roEX0A+U45xFby3tDWfzn+Zz8XKDF1Nv9VUwVx0N3zpcG1RPs9hfheG4Cq2kg==
+"@jimp/png@^0.22.10":
+  version "0.22.10"
+  resolved "https://registry.yarnpkg.com/@jimp/png/-/png-0.22.10.tgz#397da6479f515dc87525b0f25efe4cb11cb75156"
+  integrity sha512-RYinU7tZToeeR2g2qAMn42AU+8OUHjXPKZZ9RkmoL4bguA1xyZWaSdr22/FBkmnHhOERRlr02KPDN1OTOYHLDQ==
   dependencies:
-    "@babel/runtime" "^7.7.2"
-    "@jimp/utils" "^0.16.13"
-    pngjs "^3.3.3"
+    "@jimp/utils" "^0.22.10"
+    pngjs "^6.0.0"
 
-"@jimp/tiff@^0.16.13":
-  version "0.16.13"
-  resolved "https://registry.yarnpkg.com/@jimp/tiff/-/tiff-0.16.13.tgz#9cf8d19f2b0b0c46758e81acfc7d656835ee6da1"
-  integrity sha512-oJY8d9u95SwW00VPHuCNxPap6Q1+E/xM5QThb9Hu+P6EGuu6lIeLaNBMmFZyblwFbwrH+WBOZlvIzDhi4Dm/6Q==
+"@jimp/tiff@^0.22.10":
+  version "0.22.10"
+  resolved "https://registry.yarnpkg.com/@jimp/tiff/-/tiff-0.22.10.tgz#e5511e21c73719a308545732f1ec050f52a8e0ad"
+  integrity sha512-OaivlSYzpNTHyH/h7pEtl3A7F7TbsgytZs52GLX/xITW92ffgDgT6PkldIrMrET6ERh/hdijNQiew7IoEEr2og==
   dependencies:
-    "@babel/runtime" "^7.7.2"
-    utif "^2.0.1"
+    utif2 "^4.0.1"
 
-"@jimp/types@^0.16.1":
-  version "0.16.13"
-  resolved "https://registry.yarnpkg.com/@jimp/types/-/types-0.16.13.tgz#39be1886cbfa4fb5e77e17441a046a1f961d3046"
-  integrity sha512-mC0yVNUobFDjoYLg4hoUwzMKgNlxynzwt3cDXzumGvRJ7Kb8qQGOWJQjQFo5OxmGExqzPphkirdbBF88RVLBCg==
+"@jimp/types@^0.22.10":
+  version "0.22.10"
+  resolved "https://registry.yarnpkg.com/@jimp/types/-/types-0.22.10.tgz#1ae01dfea9f36ba9751e63a1eedecb4c4da9ef16"
+  integrity sha512-u/r+XYzbCx4zZukDmxx8S0er3Yq3iDPI6+31WKX0N18i2qPPJYcn8qwIFurfupRumGvJ8SlGLCgt/T+Y8zzUIw==
   dependencies:
-    "@babel/runtime" "^7.7.2"
-    "@jimp/bmp" "^0.16.13"
-    "@jimp/gif" "^0.16.13"
-    "@jimp/jpeg" "^0.16.13"
-    "@jimp/png" "^0.16.13"
-    "@jimp/tiff" "^0.16.13"
+    "@jimp/bmp" "^0.22.10"
+    "@jimp/gif" "^0.22.10"
+    "@jimp/jpeg" "^0.22.10"
+    "@jimp/png" "^0.22.10"
+    "@jimp/tiff" "^0.22.10"
     timm "^1.6.1"
 
-"@jimp/utils@^0.16.13":
-  version "0.16.13"
-  resolved "https://registry.yarnpkg.com/@jimp/utils/-/utils-0.16.13.tgz#afde41b9c6cdadfb45d83cb5e16deb65f369bf99"
-  integrity sha512-VyCpkZzFTHXtKgVO35iKN0sYR10psGpV6SkcSeV4oF7eSYlR8Bl6aQLCzVeFjvESF7mxTmIiI3/XrMobVrtxDA==
+"@jimp/utils@^0.22.10":
+  version "0.22.10"
+  resolved "https://registry.yarnpkg.com/@jimp/utils/-/utils-0.22.10.tgz#d05934fae1c4bd988205d3decc2a649df0724a26"
+  integrity sha512-ztlOK9Mm2iLG2AMoabzM4i3WZ/FtshcgsJCbZCRUs/DKoeS2tySRJTnQZ1b7Roq0M4Ce+FUAxnCAcBV0q7PH9w==
   dependencies:
-    "@babel/runtime" "^7.7.2"
     regenerator-runtime "^0.13.3"
 
 "@jridgewell/gen-mapping@^0.1.0":
@@ -3430,6 +3417,13 @@
     semver "^7.3.5"
     tar "^6.1.11"
 
+"@mongodb-js/saslprep@^1.1.0":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@mongodb-js/saslprep/-/saslprep-1.1.1.tgz#9a6c2516bc9188672c4d953ec99760ba49970da7"
+  integrity sha512-t7c5K033joZZMspnHg/gWPE4kandgc2OxE74aYOtGKfgB9VPuVJPix0H6fhmm2erj5PBJ21mqcx34lpIGtUCsQ==
+  dependencies:
+    sparse-bitfield "^3.0.3"
+
 "@msgpackr-extract/msgpackr-extract-darwin-arm64@3.0.2":
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/@msgpackr-extract/msgpackr-extract-darwin-arm64/-/msgpackr-extract-darwin-arm64-3.0.2.tgz#44d752c1a2dc113f15f781b7cc4f53a307e3fa38"
@@ -5478,6 +5472,11 @@
   resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.200.tgz#435b6035c7eba9cdf1e039af8212c9e9281e7149"
   integrity sha512-YI/M/4HRImtNf3pJgbF+W6FrXovqj+T+/HpENLTooK9PnkacBsDpeP3IpHab40CClUfhNmdM2WTNP2sa2dni5Q==
 
+"@types/lodash@^4.14.165":
+  version "4.14.202"
+  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.202.tgz#f09dbd2fb082d507178b2f2a5c7e74bd72ff98f8"
+  integrity sha512-OvlIYQK9tNneDlS0VN54LLd5uiPCBOp7gS5Z0f1mjoJYBrtStzgmJBxONW3U6OZqdtNzZPmn9BS/7WI7BFFcFQ==
+
 "@types/long@^4.0.0":
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/@types/long/-/long-4.0.2.tgz#b74129719fc8d11c01868010082d483b7545591a"
@@ -5543,10 +5542,10 @@
     "@types/node" "*"
     form-data "^3.0.0"
 
-"@types/node@*", "@types/node@>=10.0.0", "@types/node@>=12.12.47", "@types/node@>=13.13.4", "@types/node@>=13.7.0":
-  version "20.10.7"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.10.7.tgz#40fe8faf25418a75de9fe68a8775546732a3a901"
-  integrity sha512-fRbIKb8C/Y2lXxB5eVMj4IU7xpdox0Lh8bUPEdtLysaylsml1hOOx1+STloRs/B9nf7C6kPRmmg/V7aQW7usNg==
+"@types/node@*", "@types/node@>=10.0.0", "@types/node@>=12.12.47", "@types/node@>=13.13.4", "@types/node@>=13.7.0", "@types/node@>=8.1.0":
+  version "20.11.2"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.11.2.tgz#39cea3fe02fbbc2f80ed283e94e1d24f2d3856fb"
+  integrity sha512-cZShBaVa+UO1LjWWBPmWRR4+/eY/JR/UIEcDlVsw3okjWEu+rB7/mH6X3B/L+qJVHDLjk9QW/y2upp9wp1yDXA==
   dependencies:
     undici-types "~5.26.4"
 
@@ -5572,13 +5571,6 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-14.18.37.tgz#0bfcd173e8e1e328337473a8317e37b3b14fd30d"
   integrity sha512-7GgtHCs/QZrBrDzgIJnQtuSvhFSwhyYSI2uafSwZoNt1iOGhEN5fwNrQMjtONyHm9+/LoA4453jH0CMYcr06Pg==
 
-"@types/node@>=8.1.0":
-  version "20.11.6"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.11.6.tgz#6adf4241460e28be53836529c033a41985f85b6e"
-  integrity sha512-+EOokTnksGVgip2PbYbr3xnR7kZigh4LbybAfBAw5BpnQ+FqBYUsvCEjYd70IXKlbohQ64mzEYmMtlWUY8q//Q==
-  dependencies:
-    undici-types "~5.26.4"
-
 "@types/node@^18.11.18":
   version "18.19.10"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-18.19.10.tgz#4de314ab66faf6bc8ba691021a091ddcdf13a158"
@@ -6003,12 +5995,11 @@
   resolved "https://registry.yarnpkg.com/@types/webidl-conversions/-/webidl-conversions-7.0.0.tgz#2b8e60e33906459219aa587e9d1a612ae994cfe7"
   integrity sha512-xTE1E+YF4aWPJJeUzaZI5DRntlkY3+BCVJi0axFptnjGmAoWxkyREIh/XMrfxVLejwQxMCfDXdICo0VLxThrog==
 
-"@types/whatwg-url@^8.2.1":
-  version "8.2.2"
-  resolved "https://registry.yarnpkg.com/@types/whatwg-url/-/whatwg-url-8.2.2.tgz#749d5b3873e845897ada99be4448041d4cc39e63"
-  integrity sha512-FtQu10RWgn3D9U4aazdwIE2yzphmTJREDqNdODHrbrZmmMqI0vMheC/6NE/J1Yveaj8H+ela+YwWTjq5PGmuhA==
+"@types/whatwg-url@^11.0.2":
+  version "11.0.3"
+  resolved "https://registry.yarnpkg.com/@types/whatwg-url/-/whatwg-url-11.0.3.tgz#9f584c9a9421f0971029ee504dd62a831cb8f3aa"
+  integrity sha512-z1ELvMijRL1QmU7QuzDkeYXSF2+dXI0ITKoQsIoVKcNBOiK5RMmWy+pYYxJTHFt8vkpZe7UsvRErQwcxZkjoUw==
   dependencies:
-    "@types/node" "*"
     "@types/webidl-conversions" "*"
 
 "@types/yargs-parser@*":
@@ -6473,9 +6464,9 @@ acorn@^7.1.1:
   integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==
 
 acorn@^8.1.0, acorn@^8.10.0, acorn@^8.2.4, acorn@^8.4.1, acorn@^8.5.0, acorn@^8.7.0, acorn@^8.7.1, acorn@^8.8.1, acorn@^8.8.2, acorn@^8.9.0:
-  version "8.11.2"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.11.2.tgz#ca0d78b51895be5390a5903c5b3bdcdaf78ae40b"
-  integrity sha512-nc0Axzp/0FILLEVsm4fNwLCwMttvhEI263QtVPQcbpfZZ3ts0hLsZGOpE6czNlid7CJ9MlyH8reXkpsf3YUY4w==
+  version "8.11.3"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.11.3.tgz#71e0b14e13a4ec160724b38fb7b0f233b1b81d7a"
+  integrity sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==
 
 add-stream@^1.0.0:
   version "1.0.0"
@@ -6910,7 +6901,7 @@ asn1.js@^5.0.0, asn1.js@^5.2.0, asn1.js@^5.4.1:
     minimalistic-assert "^1.0.0"
     safer-buffer "^2.1.0"
 
-asn1@^0.2.4, asn1@^0.2.6, asn1@~0.2.3:
+asn1@^0.2.6, asn1@~0.2.3:
   version "0.2.6"
   resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.6.tgz#0d3a7bb6e64e02a90c0303b31f292868ea09a08d"
   integrity sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==
@@ -6961,12 +6952,7 @@ async@^2.6.3:
   dependencies:
     lodash "^4.17.14"
 
-async@^3.2.1, async@^3.2.3:
-  version "3.2.4"
-  resolved "https://registry.yarnpkg.com/async/-/async-3.2.4.tgz#2d22e00f8cddeb5fde5dd33522b56d1cf569a81c"
-  integrity sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ==
-
-async@^3.2.4:
+async@^3.2.1, async@^3.2.3, async@^3.2.4:
   version "3.2.5"
   resolved "https://registry.yarnpkg.com/async/-/async-3.2.5.tgz#ebd52a8fdaf7a2289a24df399f8d8485c8a46b66"
   integrity sha512-baNZyqaaLhyLVKm/DlvdW051MSgO6b8eVfIezl9E5PqWxFgzLm/wQntEW4zOytVburDEr0JlALEpdOFwvErLsg==
@@ -7029,40 +7015,10 @@ axios-retry@^3.1.9:
     "@babel/runtime" "^7.15.4"
     is-retry-allowed "^2.2.0"
 
-axios@0.24.0:
-  version "0.24.0"
-  resolved "https://registry.yarnpkg.com/axios/-/axios-0.24.0.tgz#804e6fa1e4b9c5288501dd9dff56a7a0940d20d6"
-  integrity sha512-Q6cWsys88HoPgAaFAVUb0WpPk0O8iTeisR9IMqy9G8AbO4NlpVknrnQS03zzF9PGAWgO3cgletO3VjV/P7VztA==
-  dependencies:
-    follow-redirects "^1.14.4"
-
-axios@1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/axios/-/axios-1.1.3.tgz#8274250dada2edf53814ed7db644b9c2866c1e35"
-  integrity sha512-00tXVRwKx/FZr/IDVFt4C+f9FYairX517WoGCL6dpOntqLkZofjhu43F/Xl44UOpqa+9sLFDrG/XAnFsUYgkDA==
-  dependencies:
-    follow-redirects "^1.15.0"
-    form-data "^4.0.0"
-    proxy-from-env "^1.1.0"
-
-axios@^0.21.1, axios@^0.21.4:
-  version "0.21.4"
-  resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.4.tgz#c67b90dc0568e5c1cf2b0b858c43ba28e2eda575"
-  integrity sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==
-  dependencies:
-    follow-redirects "^1.14.0"
-
-axios@^0.26.0:
-  version "0.26.1"
-  resolved "https://registry.yarnpkg.com/axios/-/axios-0.26.1.tgz#1ede41c51fcf51bbbd6fd43669caaa4f0495aaa9"
-  integrity sha512-fPwcX4EvnSHuInCMItEhAGnaSEXRBjtzh9fOtsE6E1G6p7vl7edEeZe11QHf18+6+9gR5PbKV/sGKNaD8YaMeA==
-  dependencies:
-    follow-redirects "^1.14.8"
-
-axios@^1.0.0, axios@^1.1.3, axios@^1.5.0:
-  version "1.6.2"
-  resolved "https://registry.yarnpkg.com/axios/-/axios-1.6.2.tgz#de67d42c755b571d3e698df1b6504cde9b0ee9f2"
-  integrity sha512-7i24Ri4pmDRfJTR7LDBhsOTtcm+9kjX5WiY1X3wIisx6G9So3pfMkEiU7emUBe46oceVImccTEM3k6C5dbVW8A==
+axios@0.24.0, axios@1.1.3, axios@1.6.3, axios@^0.21.1, axios@^0.21.4, axios@^0.26.0, axios@^1.0.0, axios@^1.1.3, axios@^1.5.0:
+  version "1.6.3"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-1.6.3.tgz#7f50f23b3aa246eff43c54834272346c396613f4"
+  integrity sha512-fWyNdeawGam70jXSVlKl+SUNVcL6j6W79CuSIPfi6HnDUmSCH6gyUys/HrqHeA/wU0Az41rRgean494d0Jb+ww==
   dependencies:
     follow-redirects "^1.15.0"
     form-data "^4.0.0"
@@ -7492,10 +7448,10 @@ bser@2.1.1:
   dependencies:
     node-int64 "^0.4.0"
 
-bson@^5.4.0:
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/bson/-/bson-5.4.0.tgz#0eea77276d490953ad8616b483298dbff07384c6"
-  integrity sha512-WRZ5SQI5GfUuKnPTNmAYPiKIof3ORXAF4IRU5UcgmivNIon01rWQlw5RUH954dpu8yGL8T59YShVddIPaU/gFA==
+bson@^6.2.0:
+  version "6.3.0"
+  resolved "https://registry.yarnpkg.com/bson/-/bson-6.3.0.tgz#d47acba525ba7d7eb0e816c10538bce26a337fe0"
+  integrity sha512-balJfqwwTBddxfnidJZagCBPP/f48zj9Sdp3OJswREOgsJzHiQSaOIAtApSgDQFYgHqAvFkp53AFSqjMDZoTFw==
 
 btoa@^1.2.1:
   version "1.2.1"
@@ -7592,11 +7548,6 @@ bufferutil@^4.0.1:
   dependencies:
     node-gyp-build "^4.3.0"
 
-buildcheck@0.0.3:
-  version "0.0.3"
-  resolved "https://registry.yarnpkg.com/buildcheck/-/buildcheck-0.0.3.tgz#70451897a95d80f7807e68fc412eb2e7e35ff4d5"
-  integrity sha512-pziaA+p/wdVImfcbsZLNF32EiWyujlQLwolMqUQE8xpKNOH7KmZQaY8sXN7DGOEzPAElo9QTaeNRfGnf3iOJbA==
-
 buildcheck@~0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/buildcheck/-/buildcheck-0.0.6.tgz#89aa6e417cfd1e2196e3f8fe915eb709d2fe4238"
@@ -8355,6 +8306,21 @@ concat-with-sourcemaps@^1.1.0:
   dependencies:
     source-map "^0.6.1"
 
+concurrently@^8.2.2:
+  version "8.2.2"
+  resolved "https://registry.yarnpkg.com/concurrently/-/concurrently-8.2.2.tgz#353141985c198cfa5e4a3ef90082c336b5851784"
+  integrity sha512-1dP4gpXFhei8IOtlXRE/T/4H88ElHgTiUzh71YUmtjTEHMSRS2Z/fgOxHSxxusGHogsRfxNq1vyAwxSC+EVyDg==
+  dependencies:
+    chalk "^4.1.2"
+    date-fns "^2.30.0"
+    lodash "^4.17.21"
+    rxjs "^7.8.1"
+    shell-quote "^1.8.1"
+    spawn-command "0.0.2"
+    supports-color "^8.1.1"
+    tree-kill "^1.2.2"
+    yargs "^17.7.2"
+
 condense-newlines@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/condense-newlines/-/condense-newlines-0.2.1.tgz#3de985553139475d32502c83b02f60684d24c55f"
@@ -8579,14 +8545,6 @@ cosmiconfig@^8.2.0:
     parse-json "^5.0.0"
     path-type "^4.0.0"
 
-cpu-features@~0.0.4:
-  version "0.0.4"
-  resolved "https://registry.yarnpkg.com/cpu-features/-/cpu-features-0.0.4.tgz#0023475bb4f4c525869c162e4108099e35bf19d8"
-  integrity sha512-fKiZ/zp1mUwQbnzb9IghXtHtDoTMtNeb8oYGx6kX2SYfhnG0HNdBEBIzB9b5KlXu5DQPhfy3mInbBxFcgwAr3A==
-  dependencies:
-    buildcheck "0.0.3"
-    nan "^2.15.0"
-
 cpu-features@~0.0.9:
   version "0.0.9"
   resolved "https://registry.yarnpkg.com/cpu-features/-/cpu-features-0.0.9.tgz#5226b92f0f1c63122b0a3eb84cb8335a4de499fc"
@@ -8676,6 +8634,13 @@ cron-parser@^4.2.1:
   dependencies:
     luxon "^3.2.1"
 
+cron-validate@1.4.5:
+  version "1.4.5"
+  resolved "https://registry.yarnpkg.com/cron-validate/-/cron-validate-1.4.5.tgz#eceb221f7558e6302e5f84c7b3a454fdf4d064c3"
+  integrity sha512-nKlOJEnYKudMn/aNyNH8xxWczlfpaazfWV32Pcx/2St51r2bxWbGhZD7uwzMcRhunA/ZNL+Htm/i0792Z59UMQ==
+  dependencies:
+    yup "0.32.9"
+
 cross-spawn@^6.0.0:
   version "6.0.5"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
@@ -8907,6 +8872,13 @@ data-urls@^4.0.0:
     whatwg-mimetype "^3.0.0"
     whatwg-url "^12.0.0"
 
+date-fns@^2.30.0:
+  version "2.30.0"
+  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.30.0.tgz#f367e644839ff57894ec6ac480de40cae4b0f4d0"
+  integrity sha512-fnULvOpxnC5/Vg3NCiWelDsLiUc9bRwAPs/+LfTLNvetFCtCTN+yQz15C/fs4AwX1R9K5GLtLfn8QW+dWisaAw==
+  dependencies:
+    "@babel/runtime" "^7.21.0"
+
 dateformat@^3.0.3:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-3.0.3.tgz#a6e37499a4d9a9cf85ef5872044d62901c9889ae"
@@ -8967,6 +8939,43 @@ dd-trace@5.0.0:
     semver "^7.5.4"
     tlhunter-sorted-set "^0.1.0"
 
+dd-trace@5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/dd-trace/-/dd-trace-5.2.0.tgz#6ca2d76ece95f08d98468d7782c22f24192afa53"
+  integrity sha512-Z5ql3ZKzVW3DPstHPkTPcIPvKljHNtzTYY/WuZRlgT4XK7rMaN0j5nA8LlUh7m+tOPWs05IiKngbYVZjsqhRgA==
+  dependencies:
+    "@datadog/native-appsec" "7.0.0"
+    "@datadog/native-iast-rewriter" "2.2.2"
+    "@datadog/native-iast-taint-tracking" "1.6.4"
+    "@datadog/native-metrics" "^2.0.0"
+    "@datadog/pprof" "5.0.0"
+    "@datadog/sketches-js" "^2.1.0"
+    "@opentelemetry/api" "^1.0.0"
+    "@opentelemetry/core" "^1.14.0"
+    crypto-randomuuid "^1.0.0"
+    dc-polyfill "^0.1.2"
+    ignore "^5.2.4"
+    import-in-the-middle "^1.7.3"
+    int64-buffer "^0.1.9"
+    ipaddr.js "^2.1.0"
+    istanbul-lib-coverage "3.2.0"
+    jest-docblock "^29.7.0"
+    koalas "^1.0.2"
+    limiter "1.1.5"
+    lodash.sortby "^4.7.0"
+    lru-cache "^7.14.0"
+    methods "^1.1.2"
+    module-details-from-path "^1.0.3"
+    msgpack-lite "^0.1.26"
+    node-abort-controller "^3.1.1"
+    opentracing ">=0.12.1"
+    path-to-regexp "^0.1.2"
+    pprof-format "^2.0.7"
+    protobufjs "^7.2.5"
+    retry "^0.13.1"
+    semver "^7.5.4"
+    tlhunter-sorted-set "^0.1.0"
+
 debug@4, debug@4.3.4, debug@^4.0.0, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.2.0, debug@^4.3.1, debug@^4.3.2, debug@^4.3.3, debug@^4.3.4, debug@~4.3.1, debug@~4.3.2:
   version "4.3.4"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
@@ -9520,16 +9529,7 @@ docker-modem@^3.0.0:
     split-ca "^1.0.1"
     ssh2 "^1.11.0"
 
-dockerode@^3.2.1:
-  version "3.3.4"
-  resolved "https://registry.yarnpkg.com/dockerode/-/dockerode-3.3.4.tgz#875de614a1be797279caa9fe27e5637cf0e40548"
-  integrity sha512-3EUwuXnCU+RUlQEheDjmBE0B7q66PV9Rw5NiH1sXwINq0M9c5ERP9fxgkw36ZHOtzf4AGEEYySnkx/sACC9EgQ==
-  dependencies:
-    "@balena/dockerignore" "^1.0.2"
-    docker-modem "^3.0.0"
-    tar-fs "~2.0.1"
-
-dockerode@^3.3.5:
+dockerode@^3.2.1, dockerode@^3.3.5:
   version "3.3.5"
   resolved "https://registry.yarnpkg.com/dockerode/-/dockerode-3.3.5.tgz#7ae3f40f2bec53ae5e9a741ce655fff459745629"
   integrity sha512-/0YNa3ZDNeLr/tSckmD69+Gq+qVNhvKfAHNeZJBnp7EOP6RGKV8ORrJHkUn20So5wU+xxT7+1n5u8PjHbfjbSA==
@@ -9654,9 +9654,9 @@ dotenv@8.6.0, dotenv@^8.2.0:
   integrity sha512-IrPdXQsk2BbzvCBGBOTmmSH5SodmqZNt4ERAZDmW4CT+tL8VtvinqywuANaFu4bOMWki16nqf0e4oC0QIaDr/g==
 
 dotenv@^16.3.1:
-  version "16.4.0"
-  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-16.4.0.tgz#ac21c3fcaad2e7832a1cd0c0e4e8e52225ecda0e"
-  integrity sha512-WvImr5kpN5NGNn7KaDjJnLTh5rDVLZiDf/YLA8T1ZEZEBZNEDOE+mnkS0PVjPax8ZxBP5zC5SLMB3/9VV5de9g==
+  version "16.3.1"
+  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-16.3.1.tgz#369034de7d7e5b120972693352a3bf112172cc3e"
+  integrity sha512-IPzF4w4/Rd94bA9imS68tZBaYyBWSCE47V1RGuMrB94iyTOIEwRmVL2x/4An+6mETpLrKJ5hQkB8W4kFAadeIQ==
 
 dotenv@~10.0.0:
   version "10.0.0"
@@ -9774,7 +9774,7 @@ ee-first@1.1.1:
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
   integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==
 
-ejs@^3.1.6, ejs@^3.1.7:
+ejs@^3.1.7:
   version "3.1.9"
   resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.9.tgz#03c9e8777fe12686a9effcef22303ca3d8eeb361"
   integrity sha512-rC+QVNMJWv+MtPgkt0y+0rVEIdbtxVADApW9JXrUVlzHetgcyczP/E7DJmWJ4fJCZF2cPcBk0laWO9ZHMG3DmQ==
@@ -10530,6 +10530,11 @@ exit@^0.1.2:
   resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c"
   integrity sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==
 
+expand-template@^2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/expand-template/-/expand-template-2.0.3.tgz#6e14b3fcee0f3a6340ecb57d2e8918692052a47c"
+  integrity sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==
+
 expand-tilde@^1.2.2:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/expand-tilde/-/expand-tilde-1.2.2.tgz#0b81eba897e5a3d31d1c3d102f8f01441e559449"
@@ -10692,20 +10697,13 @@ fast-xml-parser@4.2.5:
   dependencies:
     strnum "^1.0.5"
 
-fast-xml-parser@^4.1.3:
+fast-xml-parser@^4.1.3, fast-xml-parser@^4.2.2, fast-xml-parser@^4.2.5:
   version "4.3.3"
   resolved "https://registry.yarnpkg.com/fast-xml-parser/-/fast-xml-parser-4.3.3.tgz#aeaf5778392329f17168c40c51bcbfec8ff965be"
   integrity sha512-coV/D1MhrShMvU6D0I+VAK3umz6hUaxxhL0yp/9RjfiYUfAv14rDhGQL+PLForhMdr0wq3PiV07WtkkNjJjNHg==
   dependencies:
     strnum "^1.0.5"
 
-fast-xml-parser@^4.2.2, fast-xml-parser@^4.2.5:
-  version "4.3.2"
-  resolved "https://registry.yarnpkg.com/fast-xml-parser/-/fast-xml-parser-4.3.2.tgz#761e641260706d6e13251c4ef8e3f5694d4b0d79"
-  integrity "sha1-dh5kEmBwbW4TJRxO+OP1aU1LDXk= sha512-rmrXUXwbJedoXkStenj1kkljNF7ugn5ZjR9FJcwmCfcCbtOMDghPajbc+Tck6vE6F5XsDmx+Pr2le9fw8+pXBg=="
-  dependencies:
-    strnum "^1.0.5"
-
 fastest-levenshtein@^1.0.12:
   version "1.0.16"
   resolved "https://registry.yarnpkg.com/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz#210e61b6ff181de91ea9b3d1b84fdedd47e034e5"
@@ -10958,7 +10956,7 @@ fn.name@1.x.x:
   resolved "https://registry.yarnpkg.com/fn.name/-/fn.name-1.1.0.tgz#26cad8017967aea8731bc42961d04a3d5988accc"
   integrity sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw==
 
-follow-redirects@^1.14.0, follow-redirects@^1.14.4, follow-redirects@^1.14.8, follow-redirects@^1.15.0:
+follow-redirects@^1.15.0:
   version "1.15.2"
   resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.2.tgz#b460864144ba63f2681096f274c4e57026da2c13"
   integrity sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==
@@ -11386,10 +11384,10 @@ getpass@^0.1.1:
   dependencies:
     assert-plus "^1.0.0"
 
-gifwrap@^0.9.2:
-  version "0.9.4"
-  resolved "https://registry.yarnpkg.com/gifwrap/-/gifwrap-0.9.4.tgz#f4eb6169ba027d61df64aafbdcb1f8ae58ccc0c5"
-  integrity sha512-MDMwbhASQuVeD4JKd1fKgNgCRL3fGqMM4WaqpNhWO0JiMOAjbQdumbs4BbBZEy9/M00EHEjKN3HieVhCUlwjeQ==
+gifwrap@^0.10.1:
+  version "0.10.1"
+  resolved "https://registry.yarnpkg.com/gifwrap/-/gifwrap-0.10.1.tgz#9ed46a5d51913b482d4221ce9c727080260b681e"
+  integrity sha512-2760b1vpJHNmLzZ/ubTtNnEx5WApN/PYWJvXvgS+tL1egTTthayFYIQQNi136FLEDcN/IyEY2EcGpIITD6eYUw==
   dependencies:
     image-q "^4.0.0"
     omggif "^1.0.10"
@@ -11441,6 +11439,11 @@ gitconfiglocal@^1.0.0:
   dependencies:
     ini "^1.3.2"
 
+github-from-package@0.0.0:
+  version "0.0.0"
+  resolved "https://registry.yarnpkg.com/github-from-package/-/github-from-package-0.0.0.tgz#97fb5d96bfde8973313f20e8288ef9a167fa64ce"
+  integrity sha512-SyHy3T1v2NUXn29OsWdxmK6RwHD+vkj3v8en8AOBZ1wBQ/hCAQ5bAQTD02kW4W9tUp/3Qh6J8r9EvntiyCmOOw==
+
 glob-parent@5.1.2, glob-parent@^5.1.2, glob-parent@~5.1.2:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4"
@@ -12082,12 +12085,7 @@ http-assert@^1.3.0:
     deep-equal "~1.0.1"
     http-errors "~1.8.0"
 
-http-cache-semantics@3.8.1:
-  version "3.8.1"
-  resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz#39b0e16add9b605bf0a9ef3d9daaf4843b4cacd2"
-  integrity sha512-5ai2iksyV8ZXmnZhHH4rWPoxxistEexSi5936zIQ1bnNTW5VnA85B6P/VpXiRM017IgRvb2kKo1a//y+0wSp3w==
-
-http-cache-semantics@^4.0.0, http-cache-semantics@^4.1.0, http-cache-semantics@^4.1.1:
+http-cache-semantics@3.8.1, http-cache-semantics@4.1.1, http-cache-semantics@^4.0.0, http-cache-semantics@^4.1.0, http-cache-semantics@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz#abe02fcb2985460bf0323be664436ec3476a6d5a"
   integrity sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==
@@ -12312,10 +12310,10 @@ import-from@^3.0.0:
   dependencies:
     resolve-from "^5.0.0"
 
-import-in-the-middle@^1.7.1:
-  version "1.7.2"
-  resolved "https://registry.yarnpkg.com/import-in-the-middle/-/import-in-the-middle-1.7.2.tgz#31c44088271b50ecb9cacbdfb1e5732c802e0658"
-  integrity sha512-coz7AjRnPyKW36J6JX5Bjz1mcX7MX1H2XsEGseVcnXMdzsAbbAu0HBZhiAem+3SAmuZdi+p8OwoB2qUpTRgjOQ==
+import-in-the-middle@^1.7.1, import-in-the-middle@^1.7.3:
+  version "1.7.3"
+  resolved "https://registry.yarnpkg.com/import-in-the-middle/-/import-in-the-middle-1.7.3.tgz#ffa784cdd57a47d2b68d2e7dd33070ff06baee43"
+  integrity sha512-R2I11NRi0lI3jD2+qjqyVlVEahsejw7LDnYEbGb47QEFjczE3bZYsmWheCTQA+LFs2DzOQxR7Pms7naHW1V4bQ==
   dependencies:
     acorn "^8.8.2"
     acorn-import-assertions "^1.9.0"
@@ -13023,6 +13021,26 @@ isobject@^3.0.1:
   resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
   integrity sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==
 
+isobject@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/isobject/-/isobject-4.0.0.tgz#3f1c9155e73b192022a80819bacd0343711697b0"
+  integrity sha512-S/2fF5wH8SJA/kmwr6HYhK/RI/OkhD84k8ntalo0iJjZikgq1XFvR5M8NPT1x5F7fBwCG3qHfnzeP/Vh/ZxCUA==
+
+isolated-vm@^4.7.2:
+  version "4.7.2"
+  resolved "https://registry.yarnpkg.com/isolated-vm/-/isolated-vm-4.7.2.tgz#5670d5cce1d92004f9b825bec5b0b11fc7501b65"
+  integrity sha512-JVEs5gzWObzZK5+OlBplCdYSpokMcdhLSs/xWYYxmYWVfOOFF4oZJsYh7E/FmfX8e7gMioXMpMMeEyX1afuKrg==
+  dependencies:
+    prebuild-install "^7.1.1"
+
+isomorphic-fetch@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/isomorphic-fetch/-/isomorphic-fetch-3.0.0.tgz#0267b005049046d2421207215d45d6a262b8b8b4"
+  integrity sha512-qvUtwJ3j6qwsF3jLxkZ72qCgjMysPzDfeV240JHiGZsANBYd+EEuu35v7dfrJ9Up0Ak07D7GGSkGhCHTqg/5wA==
+  dependencies:
+    node-fetch "^2.6.1"
+    whatwg-fetch "^3.4.1"
+
 isstream@~0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
@@ -13531,15 +13549,14 @@ jest@29.7.0:
     import-local "^3.0.2"
     jest-cli "^29.7.0"
 
-jimp@0.16.1:
-  version "0.16.1"
-  resolved "https://registry.yarnpkg.com/jimp/-/jimp-0.16.1.tgz#192f851a30e5ca11112a3d0aa53137659a78ca7a"
-  integrity sha512-+EKVxbR36Td7Hfd23wKGIeEyHbxShZDX6L8uJkgVW3ESA9GiTEPK08tG1XI2r/0w5Ch0HyJF5kPqF9K7EmGjaw==
+jimp@0.22.10:
+  version "0.22.10"
+  resolved "https://registry.yarnpkg.com/jimp/-/jimp-0.22.10.tgz#2cc3e265a99cdbe69ec60ddd57cbcde6a6cf0519"
+  integrity sha512-lCaHIJAgTOsplyJzC1w/laxSxrbSsEBw4byKwXgUdMmh+ayPsnidTblenQm+IvhIs44Gcuvlb6pd2LQ0wcKaKg==
   dependencies:
-    "@babel/runtime" "^7.7.2"
-    "@jimp/custom" "^0.16.1"
-    "@jimp/plugins" "^0.16.1"
-    "@jimp/types" "^0.16.1"
+    "@jimp/custom" "^0.22.10"
+    "@jimp/plugins" "^0.22.10"
+    "@jimp/types" "^0.22.10"
     regenerator-runtime "^0.13.3"
 
 jmespath@0.15.0:
@@ -13568,7 +13585,7 @@ joycon@^3.0.1, joycon@^3.1.1:
   resolved "https://registry.yarnpkg.com/joycon/-/joycon-3.1.1.tgz#bce8596d6ae808f8b68168f5fc69280996894f03"
   integrity sha512-34wB/Y7MW7bzjKRjUKTa46I2Z7eV62Rkhva+KkopW7Qvv/OSWBqvkSY7vusOPrNuZcUG3tApvdVgNB8POj3SPw==
 
-jpeg-js@^0.4.2:
+jpeg-js@^0.4.4:
   version "0.4.4"
   resolved "https://registry.yarnpkg.com/jpeg-js/-/jpeg-js-0.4.4.tgz#a9f1c6f1f9f0fa80cdb3484ed9635054d28936aa"
   integrity sha512-WZzeDOEtTOBK4Mdsar0IqEU5sMr3vSV2RqkAIzUEV2BHnUfKGyswWFPFwK5EeDo93K3FohSHbLAjj0s1Wzd+dg==
@@ -14045,6 +14062,13 @@ koa-passport@4.1.4, koa-passport@^4.1.4:
   dependencies:
     passport "^0.4.0"
 
+koa-passport@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/koa-passport/-/koa-passport-6.0.0.tgz#c30d2b859eaff8349c553eb479f365244188df53"
+  integrity sha512-bgcrQN7Ylfgi1PVr5l6hHYkr38RHUzx+ty3m7e/xoTte8MR0zbDt6+pvP3/nuF/yXL6Ba7IzX1rSqmCy6OrrIw==
+  dependencies:
+    passport "^0.6.0"
+
 koa-pino-logger@4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/koa-pino-logger/-/koa-pino-logger-4.0.0.tgz#a45c9fd0a39e9cd84ac23da502055054ee51b80d"
@@ -14552,7 +14576,7 @@ linkify-it@^3.0.1:
   dependencies:
     uc.micro "^1.0.1"
 
-load-bmfont@^1.3.1, load-bmfont@^1.4.0:
+load-bmfont@^1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/load-bmfont/-/load-bmfont-1.4.1.tgz#c0f5f4711a1e2ccff725a7b6078087ccfcddd3e9"
   integrity sha512-8UyQoYmdRDy81Brz6aLAUhfZLwr5zV0L3taTQ4hju7m6biuwiWiJXjPhBJxbUQJA8PrkvJ/7Enqmwk2sM14soA==
@@ -14645,7 +14669,7 @@ lock@^1.1.0:
   resolved "https://registry.yarnpkg.com/lock/-/lock-1.1.0.tgz#53157499d1653b136ca66451071fca615703fa55"
   integrity sha512-NZQIJJL5Rb9lMJ0Yl1JoVr9GSdo4HTPsUEWsSFzB8dE8DSoiLCVavWZPi7Rnlv/o73u6I24S/XYc/NmG4l8EKA==
 
-lodash-es@^4.17.21:
+lodash-es@^4.17.15, lodash-es@^4.17.21:
   version "4.17.21"
   resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.21.tgz#43e626c46e6591b7750beb2b50117390c609e3ee"
   integrity sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==
@@ -14795,7 +14819,7 @@ lodash.xor@^4.5.0:
   resolved "https://registry.yarnpkg.com/lodash.xor/-/lodash.xor-4.5.0.tgz#4d48ed7e98095b0632582ba714d3ff8ae8fb1db6"
   integrity sha512-sVN2zimthq7aZ5sPGXnSz32rZPuqcparVW50chJQe+mzTYV+IsxSsl/2gnkWWE2Of7K3myBQBqtLKOUEHJKRsQ==
 
-lodash@4.17.21, lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.21, lodash@^4.17.3, lodash@^4.7.0:
+lodash@4.17.21, lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.3, lodash@^4.7.0:
   version "4.17.21"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
@@ -15352,7 +15376,7 @@ minimist-options@4.1.0:
     is-plain-obj "^1.1.0"
     kind-of "^6.0.3"
 
-minimist@^1.2.0, minimist@^1.2.5, minimist@^1.2.6:
+minimist@^1.2.0, minimist@^1.2.3, minimist@^1.2.5, minimist@^1.2.6:
   version "1.2.8"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c"
   integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==
@@ -15445,12 +15469,12 @@ minizlib@^2.1.1, minizlib@^2.1.2:
     minipass "^3.0.0"
     yallist "^4.0.0"
 
-mkdirp-classic@^0.5.2:
+mkdirp-classic@^0.5.2, mkdirp-classic@^0.5.3:
   version "0.5.3"
   resolved "https://registry.yarnpkg.com/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz#fa10c9115cc6d8865be221ba47ee9bed78601113"
   integrity sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==
 
-mkdirp@^0.5.0, mkdirp@^0.5.1:
+mkdirp@^0.5.0:
   version "0.5.6"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.6.tgz#7def03d2432dcae4ba1d611445c48396062255f6"
   integrity sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==
@@ -15521,24 +15545,22 @@ moment@^2.29.4:
   resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.4.tgz#3dbe052889fe7c1b2ed966fcb3a77328964ef108"
   integrity sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==
 
-mongodb-connection-string-url@^2.6.0:
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/mongodb-connection-string-url/-/mongodb-connection-string-url-2.6.0.tgz#57901bf352372abdde812c81be47b75c6b2ec5cf"
-  integrity sha512-WvTZlI9ab0QYtTYnuMLgobULWhokRjtC7db9LtcVfJ+Hsnyr5eo6ZtNAt3Ly24XZScGMelOcGtm7lSn0332tPQ==
+mongodb-connection-string-url@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/mongodb-connection-string-url/-/mongodb-connection-string-url-3.0.0.tgz#b4f87f92fd8593f3b9365f592515a06d304a1e9c"
+  integrity sha512-t1Vf+m1I5hC2M5RJx/7AtxgABy1cZmIPQRMXw+gEIPn/cZNF3Oiy+l0UIypUwVB5trcWHq3crg2g3uAR9aAwsQ==
   dependencies:
-    "@types/whatwg-url" "^8.2.1"
-    whatwg-url "^11.0.0"
+    "@types/whatwg-url" "^11.0.2"
+    whatwg-url "^13.0.0"
 
-mongodb@5.7:
-  version "5.7.0"
-  resolved "https://registry.yarnpkg.com/mongodb/-/mongodb-5.7.0.tgz#e16d2fcdfd9f8503ec2d88288392dc3235bb3ecc"
-  integrity sha512-zm82Bq33QbqtxDf58fLWBwTjARK3NSvKYjyz997KSy6hpat0prjeX/kxjbPVyZY60XYPDNETaHkHJI2UCzSLuw==
+mongodb@^6.3.0:
+  version "6.3.0"
+  resolved "https://registry.yarnpkg.com/mongodb/-/mongodb-6.3.0.tgz#ec9993b19f7ed2ea715b903fcac6171c9d1d38ca"
+  integrity sha512-tt0KuGjGtLUhLoU263+xvQmPHEGTw5LbcNC73EoFRYgSHwZt5tsoJC110hDyO1kjQzpgNrpdcSza9PknWN4LrA==
   dependencies:
-    bson "^5.4.0"
-    mongodb-connection-string-url "^2.6.0"
-    socks "^2.7.1"
-  optionalDependencies:
-    saslprep "^1.0.3"
+    "@mongodb-js/saslprep" "^1.1.0"
+    bson "^6.2.0"
+    mongodb-connection-string-url "^3.0.0"
 
 ms@2.1.2:
   version "2.1.2"
@@ -15560,7 +15582,7 @@ msgpack-lite@^0.1.26:
     int64-buffer "^0.1.9"
     isarray "^1.0.0"
 
-msgpackr-extract@^3.0.1:
+msgpackr-extract@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/msgpackr-extract/-/msgpackr-extract-3.0.2.tgz#e05ec1bb4453ddf020551bcd5daaf0092a2c279d"
   integrity sha512-SdzXp4kD/Qf8agZ9+iTu6eql0m3kWm1A2y1hkpTeVNENutaB0BwHlSvAIaMxwntmRUAUjon2V4L8Z/njd0Ct8A==
@@ -15574,12 +15596,12 @@ msgpackr-extract@^3.0.1:
     "@msgpackr-extract/msgpackr-extract-linux-x64" "3.0.2"
     "@msgpackr-extract/msgpackr-extract-win32-x64" "3.0.2"
 
-msgpackr@^1.5.2:
-  version "1.8.4"
-  resolved "https://registry.yarnpkg.com/msgpackr/-/msgpackr-1.8.4.tgz#5d6b10eb4937f324381a382a95aef6ebd18fcc1f"
-  integrity sha512-BE3hD3PqV7jsNaV022uq0jMW+ZVc32wSYyQmwAoJUc+vPtCeyro2MOtAW61Fd9ZKNySM6y913E9fBY0mG+hKXg==
+msgpackr@1.10.1, msgpackr@^1.5.2:
+  version "1.10.1"
+  resolved "https://registry.yarnpkg.com/msgpackr/-/msgpackr-1.10.1.tgz#51953bb4ce4f3494f0c4af3f484f01cfbb306555"
+  integrity sha512-r5VRLv9qouXuLiIBrLpl2d5ZvPt8svdQTl5/vMvE4nzDMyEX4sgW5yWhuBBj5UmgwOTWj8CIdSXn5sAfsHAWIQ==
   optionalDependencies:
-    msgpackr-extract "^3.0.1"
+    msgpackr-extract "^3.0.2"
 
 mssql@10.0.1:
   version "10.0.1"
@@ -15657,11 +15679,6 @@ named-placeholders@^1.1.3:
   dependencies:
     lru-cache "^7.14.1"
 
-nan@^2.15.0, nan@^2.16.0:
-  version "2.17.0"
-  resolved "https://registry.yarnpkg.com/nan/-/nan-2.17.0.tgz#c0150a2368a182f033e9aa5195ec76ea41a199cb"
-  integrity sha512-2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ==
-
 nan@^2.17.0, nan@^2.18.0:
   version "2.18.0"
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.18.0.tgz#26a6faae7ffbeb293a39660e88a76b82e30b7554"
@@ -15682,6 +15699,11 @@ nanoid@^3.3.6:
   resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.6.tgz#443380c856d6e9f9824267d960b4236ad583ea4c"
   integrity sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==
 
+napi-build-utils@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/napi-build-utils/-/napi-build-utils-1.0.2.tgz#b1fddc0b2c46e380a0b7a76f984dd47c41a13806"
+  integrity sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg==
+
 napi-macros@~2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/napi-macros/-/napi-macros-2.0.0.tgz#2b6bae421e7b96eb687aa6c77a7858640670001b"
@@ -15732,6 +15754,13 @@ nice-try@^1.0.4:
   resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
   integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==
 
+node-abi@^3.3.0:
+  version "3.54.0"
+  resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.54.0.tgz#f6386f7548817acac6434c6cba02999c9aebcc69"
+  integrity sha512-p7eGEiQil0YUV3ItH4/tBb781L5impVmmx2E9FRKF7d18XXzp4PGT2tdYMFY6wQqgxD0IwNZOiSJ0/K0fSi/OA==
+  dependencies:
+    semver "^7.3.5"
+
 node-abort-controller@^3.0.1, node-abort-controller@^3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/node-abort-controller/-/node-abort-controller-3.1.1.tgz#a94377e964a9a37ac3976d848cb5c765833b8548"
@@ -15757,25 +15786,13 @@ node-duration@^1.0.4:
   resolved "https://registry.yarnpkg.com/node-duration/-/node-duration-1.0.4.tgz#3e94ecc0e473691c89c4560074503362071cecac"
   integrity sha512-eUXYNSY7DL53vqfTosggWkvyIW3bhAcqBDIlolgNYlZhianXTrCL50rlUJWD1eRqkIxMppXTfiFbp+9SjpPrgA==
 
-node-fetch@2.6.0:
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.0.tgz#e633456386d4aa55863f676a7ab0daa8fdecb0fd"
-  integrity sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA==
-
-node-fetch@2.6.7:
+node-fetch@2.6.0, node-fetch@2.6.7, node-fetch@^2.6.0, node-fetch@^2.6.1, node-fetch@^2.6.7, node-fetch@^2.6.9, node-fetch@^2.7.0:
   version "2.6.7"
   resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.7.tgz#24de9fba827e3b4ae44dc8b20256a379160052ad"
   integrity sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==
   dependencies:
     whatwg-url "^5.0.0"
 
-node-fetch@^2.6.0, node-fetch@^2.6.1, node-fetch@^2.6.7, node-fetch@^2.6.9, node-fetch@^2.7.0:
-  version "2.7.0"
-  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.7.0.tgz#d0f0fa6e3e2dc1d27efcd8ad99d550bda94d187d"
-  integrity sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==
-  dependencies:
-    whatwg-url "^5.0.0"
-
 node-forge@^1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-1.3.1.tgz#be8da2af243b2417d5f646a770663a92b7e9ded3"
@@ -15867,6 +15884,11 @@ nodemailer@6.7.2:
   resolved "https://registry.yarnpkg.com/nodemailer/-/nodemailer-6.7.2.tgz#44b2ad5f7ed71b7067f7a21c4fedabaec62b85e0"
   integrity sha512-Dz7zVwlef4k5R71fdmxwR8Q39fiboGbu3xgswkzGwczUfjp873rVxt1O46+Fh0j1ORnAC6L9+heI8uUpO6DT7Q==
 
+nodemailer@6.9.9:
+  version "6.9.9"
+  resolved "https://registry.yarnpkg.com/nodemailer/-/nodemailer-6.9.9.tgz#4549bfbf710cc6addec5064dd0f19874d24248d9"
+  integrity sha512-dexTll8zqQoVJEZPwQAKzxxtFn0qTnjdQTchoU6Re9BUUGBJiOy3YMn/0ShTW6J5M0dfQ1NeDeRTTl4oIWgQMA==
+
 nodemon@2.0.15:
   version "2.0.15"
   resolved "https://registry.yarnpkg.com/nodemon/-/nodemon-2.0.15.tgz#504516ce3b43d9dc9a955ccd9ec57550a31a8d4e"
@@ -16209,6 +16231,11 @@ oauth@0.9.x, oauth@^0.9.15:
   resolved "https://registry.yarnpkg.com/oauth/-/oauth-0.9.15.tgz#bd1fefaf686c96b75475aed5196412ff60cfb9c1"
   integrity sha512-a5ERWK1kh38ExDEfoO6qUHJb32rd7aYmPHuyCu3Fta/cnICvYmgd2uhuKXvPD+PXB+gCEYYEaQdIRAjCOwAKNA==
 
+oauth@^0.10.0:
+  version "0.10.0"
+  resolved "https://registry.yarnpkg.com/oauth/-/oauth-0.10.0.tgz#3551c4c9b95c53ea437e1e21e46b649482339c58"
+  integrity sha512-1orQ9MT1vHFGQxhuy7E/0gECD3fd2fCC+PIX+/jgmU/gI3EpRocXtmtvxCO5x3WZ443FLTLFWNDjl5MPJf9u+Q==
+
 object-assign@^2.0.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-2.1.1.tgz#43c36e5d569ff8e4816c4efa8be02d26967c18aa"
@@ -16727,7 +16754,7 @@ pacote@^15.2.0:
     ssri "^10.0.0"
     tar "^6.1.11"
 
-pako@^1.0.5:
+pako@^1.0.11:
   version "1.0.11"
   resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.11.tgz#6c9599d340d54dfd3946380252a35705a6b992bf"
   integrity sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==
@@ -16915,13 +16942,14 @@ passport-strategy@1.x.x, passport-strategy@^1.0.0:
   resolved "https://registry.yarnpkg.com/passport-strategy/-/passport-strategy-1.0.0.tgz#b5539aa8fc225a3d1ad179476ddf236b440f52e4"
   integrity sha512-CB97UUvDKJde2V0KDWWB3lyf6PC3FaZP7YxZ2G8OAtn9p4HI9j9JLP9qjOGZFvyl8uwNT8qM+hGnz/n16NI7oA==
 
-passport@^0.4.0:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/passport/-/passport-0.4.1.tgz#941446a21cb92fc688d97a0861c38ce9f738f270"
-  integrity sha512-IxXgZZs8d7uFSt3eqNjM9NQ3g3uQCW5avD8mRNoXV99Yig50vjuaez6dQK2qC0kVWPRTujxY0dWgGfT09adjYg==
+passport@0.6.0, passport@^0.4.0, passport@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/passport/-/passport-0.6.0.tgz#e869579fab465b5c0b291e841e6cc95c005fac9d"
+  integrity sha512-0fe+p3ZnrWRW74fe8+SvCyf4a3Pb2/h7gFkQ8yTJpAO50gDzlfjZUZTO1k5Eg9kUct22OxHLqDZoKUWRHOh9ug==
   dependencies:
     passport-strategy "1.x.x"
     pause "0.0.1"
+    utils-merge "^1.0.1"
 
 path-exists@^3.0.0:
   version "3.0.0"
@@ -17285,11 +17313,16 @@ pluralize@^8.0.0:
   resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-8.0.0.tgz#1a6fa16a38d12a1901e0320fa017051c539ce3b1"
   integrity sha512-Nc3IT5yHzflTfbjgqWcCPpo7DaKy4FnpB0l/zCAW0Tc7jxAiuqSxHasntB3D7887LSrA93kDJ9IXovxJYxyLCA==
 
-pngjs@^3.0.0, pngjs@^3.3.3:
+pngjs@^3.0.0:
   version "3.4.0"
   resolved "https://registry.yarnpkg.com/pngjs/-/pngjs-3.4.0.tgz#99ca7d725965fb655814eaf65f38f12bbdbf555f"
   integrity sha512-NCrCHhWmnQklfH4MtJMRjZ2a8c80qXeMlQMv2uVp9ISJMTt562SbGd6n2oq0PaPgKm7Z6pL9E2UlLIhC+SHL3w==
 
+pngjs@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/pngjs/-/pngjs-6.0.0.tgz#ca9e5d2aa48db0228a52c419c3308e87720da821"
+  integrity sha512-TRzzuFRRmEoSW/p1KVAmiOgPco2Irlah+bGFCeNfJXxxYGwSw7YwAOAcd7X28K/m5bjBWKsC29KyoMfHbypayg==
+
 postcss-calc@^8.2.3:
   version "8.2.4"
   resolved "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-8.2.4.tgz#77b9c29bfcbe8a07ff6693dc87050828889739a5"
@@ -17609,18 +17642,10 @@ postgres-interval@^1.1.0:
   dependencies:
     xtend "^4.0.0"
 
-posthog-js@^1.13.4:
-  version "1.101.0"
-  resolved "https://registry.yarnpkg.com/posthog-js/-/posthog-js-1.101.0.tgz#00e0fc6e164addd52b1738f087996bb0d6685943"
-  integrity sha512-mzwYSSWr9FdEMDeVpc+diLfc85+10r/LgELGtsW/HaYk+0du/GEql6szpqG8YXMMgb2dE4dnj0JICZFIJd7K3w==
-  dependencies:
-    fflate "^0.4.1"
-    preact "^10.19.3"
-
-posthog-js@^1.36.0:
-  version "1.96.1"
-  resolved "https://registry.yarnpkg.com/posthog-js/-/posthog-js-1.96.1.tgz#4f9719a24e4e14037b0e72d430194d7cdb576447"
-  integrity sha512-kv1vQqYMt2BV3YHS+wxsbGuP+tz+M3y1AzNhz8TfkpY1HT8W/ONT0i0eQpeRr9Y+d4x/fZ6M4cXG5GMvi9lRCA==
+posthog-js@^1.13.4, posthog-js@^1.36.0:
+  version "1.100.0"
+  resolved "https://registry.yarnpkg.com/posthog-js/-/posthog-js-1.100.0.tgz#687b9a6e4ed226aa6572f4040b418ea0c8b3d353"
+  integrity sha512-r2XZEiHQ9mBK7D1G9k57I8uYZ2kZTAJ0OCX6K/OOdCWN8jKPhw3h5F9No5weilP6eVAn+hrsy7NvPV7SCX7gMg==
   dependencies:
     fflate "^0.4.1"
 
@@ -17861,10 +17886,23 @@ pprof-format@^2.0.7:
   resolved "https://registry.yarnpkg.com/pprof-format/-/pprof-format-2.0.7.tgz#526e4361f8b37d16b2ec4bb0696b5292de5046a4"
   integrity sha512-1qWaGAzwMpaXJP9opRa23nPnt2Egi7RMNoNBptEE/XwHbcn4fC2b/4U4bKc5arkGkIh2ZabpF2bEb+c5GNHEKA==
 
-preact@^10.19.3:
-  version "10.19.3"
-  resolved "https://registry.yarnpkg.com/preact/-/preact-10.19.3.tgz#7a7107ed2598a60676c943709ea3efb8aaafa899"
-  integrity sha512-nHHTeFVBTHRGxJXKkKu5hT8C/YWBkPso4/Gad6xuj5dbptt9iF9NZr9pHbPhBrnT2klheu7mHTxTZ/LjwJiEiQ==
+prebuild-install@^7.1.1:
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-7.1.1.tgz#de97d5b34a70a0c81334fd24641f2a1702352e45"
+  integrity sha512-jAXscXWMcCK8GgCoHOfIr0ODh5ai8mj63L2nWrjuAgXE6tDyYGnx4/8o/rCgU+B4JSyZBKbeZqzhtwtC3ovxjw==
+  dependencies:
+    detect-libc "^2.0.0"
+    expand-template "^2.0.3"
+    github-from-package "0.0.0"
+    minimist "^1.2.3"
+    mkdirp-classic "^0.5.3"
+    napi-build-utils "^1.0.1"
+    node-abi "^3.3.0"
+    pump "^3.0.0"
+    rc "^1.2.7"
+    simple-get "^4.0.0"
+    tar-fs "^2.0.0"
+    tunnel-agent "^0.6.0"
 
 precinct@^8.1.0:
   version "8.3.1"
@@ -18168,7 +18206,7 @@ pseudomap@^1.0.2:
   resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
   integrity sha512-b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ==
 
-psl@^1.1.28, psl@^1.1.33:
+psl@^1.1.33:
   version "1.9.0"
   resolved "https://registry.yarnpkg.com/psl/-/psl-1.9.0.tgz#d0df2a137f00794565fcaf3b2c00cd09f8d5a5a7"
   integrity sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==
@@ -19083,10 +19121,10 @@ rxjs@^6.6.6:
   dependencies:
     tslib "^1.9.0"
 
-rxjs@^7.5.5:
-  version "7.8.0"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.8.0.tgz#90a938862a82888ff4c7359811a595e14e1e09a4"
-  integrity sha512-F2+gxDshqmIub1KdvZkaEfGDwLNpPvk9Fs6LD/MyQxNgMds/WH9OdDDXOmxUZpME+iSK3rQCctkL0DYyytUqMg==
+rxjs@^7.5.5, rxjs@^7.8.1:
+  version "7.8.1"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.8.1.tgz#6f6f3d99ea8044291efd92e7c7fcf562c4057543"
+  integrity sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==
   dependencies:
     tslib "^2.1.0"
 
@@ -19151,13 +19189,6 @@ sanitize-s3-objectkey@0.0.1:
   resolved "https://registry.yarnpkg.com/sanitize-s3-objectkey/-/sanitize-s3-objectkey-0.0.1.tgz#efa9887cd45275b40234fb4bb12fc5754fe64e7e"
   integrity sha512-ZTk7aqLxy4sD40GWcYWoLfbe05XLmkKvh6vGKe13ADlei24xlezcvjgKy1qRArlaIbIMYaqK7PCalvZtulZlaQ==
 
-saslprep@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/saslprep/-/saslprep-1.0.3.tgz#4c02f946b56cf54297e347ba1093e7acac4cf226"
-  integrity sha512-/MY/PEMbk2SuY5sScONwhUDsV2p77Znkb/q3nSVstq/yQzYJOH/Azh29p9oJLsl3LnQwSvZDKagDGBsBwSooag==
-  dependencies:
-    sparse-bitfield "^3.0.3"
-
 sass-lookup@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/sass-lookup/-/sass-lookup-3.0.0.tgz#3b395fa40569738ce857bc258e04df2617c48cac"
@@ -19170,7 +19201,7 @@ sax@1.2.1:
   resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.1.tgz#7b8e656190b228e81a66aea748480d828cd2d37a"
   integrity sha512-8I2a3LovHTOpm7NV5yOyO8IHqgVsfK4+UuySrXU8YXkSRX7k6hCV9b3HrkKCr3nMpgj+0bmocaJJWpvp1oc7ZA==
 
-sax@>=0.1.1, sax@>=0.6.0:
+sax@>=0.6.0:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
   integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
@@ -19250,47 +19281,13 @@ semver-diff@^3.1.1:
   dependencies:
     semver "^6.3.0"
 
-"semver@2 || 3 || 4 || 5", semver@^5.5.0, semver@^5.6.0, semver@^5.7.1:
-  version "5.7.1"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
-  integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
-
-semver@7.3.7:
-  version "7.3.7"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.7.tgz#12c5b649afdbf9049707796e22a4028814ce523f"
-  integrity sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==
-  dependencies:
-    lru-cache "^6.0.0"
-
-semver@7.5.3:
+"semver@2 || 3 || 4 || 5", semver@7.5.3, semver@^5.5.0, semver@^5.6.0, semver@^5.7.1, semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.2.0, semver@^6.3.0, semver@^6.3.1, semver@^7.0.0, semver@^7.1.1, semver@^7.1.2, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8, semver@^7.5.3, semver@^7.5.4, semver@~2.3.1, semver@~7.0.0:
   version "7.5.3"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.3.tgz#161ce8c2c6b4b3bdca6caadc9fa3317a4c4fe88e"
   integrity sha512-QBlUtyVk/5EeHbi7X0fw6liDZc7BBmEaSYn01fMU1OUYbf6GPsbTtd8WmnqbI20SeycoHSeiybkE/q1Q+qlThQ==
   dependencies:
     lru-cache "^6.0.0"
 
-semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.2.0, semver@^6.3.0, semver@^6.3.1:
-  version "6.3.1"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
-  integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
-
-semver@^7.0.0, semver@^7.1.1, semver@^7.1.2, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8, semver@^7.5.3, semver@^7.5.4:
-  version "7.5.4"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e"
-  integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==
-  dependencies:
-    lru-cache "^6.0.0"
-
-semver@~2.3.1:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-2.3.2.tgz#b9848f25d6cf36333073ec9ef8856d42f1233e52"
-  integrity sha512-abLdIKCosKfpnmhS52NCTjO4RiLspDfsn37prjzGrp9im5DPJOgh82Os92vtwGh6XdQryKI/7SREZnV+aqiXrA==
-
-semver@~7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e"
-  integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==
-
 seq-queue@^0.0.5:
   version "0.0.5"
   resolved "https://registry.yarnpkg.com/seq-queue/-/seq-queue-0.0.5.tgz#d56812e1c017a6e4e7c3e3a37a1da6d78dd3c93e"
@@ -19405,6 +19402,11 @@ shell-exec@1.0.2:
   resolved "https://registry.yarnpkg.com/shell-exec/-/shell-exec-1.0.2.tgz#2e9361b0fde1d73f476c4b6671fa17785f696756"
   integrity sha512-jyVd+kU2X+mWKMmGhx4fpWbPsjvD53k9ivqetutVW/BQ+WIZoDoP4d8vUMGezV6saZsiNoW2f9GIhg9Dondohg==
 
+shell-quote@^1.8.1:
+  version "1.8.1"
+  resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.8.1.tgz#6dbf4db75515ad5bac63b4f1894c3a154c766680"
+  integrity sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA==
+
 shortid@2.2.15:
   version "2.2.15"
   resolved "https://registry.yarnpkg.com/shortid/-/shortid-2.2.15.tgz#2b902eaa93a69b11120373cd42a1f1fe4437c122"
@@ -19458,6 +19460,20 @@ sigstore@^1.3.0, sigstore@^1.4.0:
     make-fetch-happen "^11.0.1"
     tuf-js "^1.1.3"
 
+simple-concat@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/simple-concat/-/simple-concat-1.0.1.tgz#f46976082ba35c2263f1c8ab5edfe26c41c9552f"
+  integrity sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==
+
+simple-get@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/simple-get/-/simple-get-4.0.1.tgz#4a39db549287c979d352112fa03fd99fd6bc3543"
+  integrity sha512-brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA==
+  dependencies:
+    decompress-response "^6.0.0"
+    once "^1.3.1"
+    simple-concat "^1.0.0"
+
 simple-lru-cache@^0.0.2:
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/simple-lru-cache/-/simple-lru-cache-0.0.2.tgz#d59cc3a193c1a5d0320f84ee732f6e4713e511dd"
@@ -19591,7 +19607,7 @@ socks-proxy-agent@^7.0.0:
     debug "^4.3.3"
     socks "^2.6.2"
 
-socks@^2.6.2, socks@^2.7.1:
+socks@^2.6.2:
   version "2.7.1"
   resolved "https://registry.yarnpkg.com/socks/-/socks-2.7.1.tgz#d8e651247178fde79c0663043e07240196857d55"
   integrity sha512-7maUZy1N7uo6+WVEX6psASxtNlKaNVMlGQKkG/63nEDdLOWNbiUMoLK7X4uYoLhQstau72mLgfEWcXcwsaHbYQ==
@@ -19704,6 +19720,11 @@ sparse-bitfield@^3.0.3:
   dependencies:
     memory-pager "^1.0.2"
 
+spawn-command@0.0.2:
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/spawn-command/-/spawn-command-0.0.2.tgz#9544e1a43ca045f8531aac1a48cb29bdae62338e"
+  integrity sha512-zC8zGoGkmc8J9ndvml8Xksr1Amk9qBujgbF0JAIWO7kXr43w0h/0GJNM/Vustixu+YE8N/MTrQ7N31FvHUACxQ==
+
 spdx-correct@^3.0.0:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.1.tgz#dece81ac9c1e6713e5f7d1b6f17d468fa53d89a9"
@@ -19789,18 +19810,7 @@ ssh-remote-port-forward@^1.0.4:
     "@types/ssh2" "^0.5.48"
     ssh2 "^1.4.0"
 
-ssh2@^1.11.0:
-  version "1.11.0"
-  resolved "https://registry.yarnpkg.com/ssh2/-/ssh2-1.11.0.tgz#ce60186216971e12f6deb553dcf82322498fe2e4"
-  integrity sha512-nfg0wZWGSsfUe/IBJkXVll3PEZ//YH2guww+mP88gTpuSU4FtZN7zu9JoeTGOyCNx2dTDtT9fOpWwlzyj4uOOw==
-  dependencies:
-    asn1 "^0.2.4"
-    bcrypt-pbkdf "^1.0.2"
-  optionalDependencies:
-    cpu-features "~0.0.4"
-    nan "^2.16.0"
-
-ssh2@^1.4.0:
+ssh2@^1.11.0, ssh2@^1.4.0:
   version "1.15.0"
   resolved "https://registry.yarnpkg.com/ssh2/-/ssh2-1.15.0.tgz#2f998455036a7f89e0df5847efb5421748d9871b"
   integrity sha512-C0PHgX4h6lBxYx7hcXwu3QWdh4tg6tZZsTfXcdvc5caW/EMxaB4H9dWsl7qk+F7LAW762hp8VbXOX7x4xUYvEw==
@@ -20266,7 +20276,7 @@ supports-color@^7.0.0, supports-color@^7.1.0:
   dependencies:
     has-flag "^4.0.0"
 
-supports-color@^8.0.0:
+supports-color@^8.0.0, supports-color@^8.1.1:
   version "8.1.1"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-8.1.1.tgz#cd6fc17e28500cff56c1b86c0a7fd4a54a73005c"
   integrity sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==
@@ -20449,7 +20459,7 @@ tapable@^2.1.1, tapable@^2.2.0:
   resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.2.1.tgz#1967a73ef4060a82f12ab96af86d52fdb76eeca0"
   integrity sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==
 
-tar-fs@2.1.1, tar-fs@^2.1.0:
+tar-fs@2.1.1, tar-fs@^2.0.0, tar-fs@^2.1.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.1.1.tgz#489a15ab85f1f0befabb370b7de4f9eb5cbe8784"
   integrity sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==
@@ -20749,7 +20759,7 @@ tinybench@^2.3.1:
   resolved "https://registry.yarnpkg.com/tinybench/-/tinybench-2.5.1.tgz#3408f6552125e53a5a48adee31261686fd71587e"
   integrity sha512-65NKvSuAVDP/n4CqH+a9w2kTlLReS9vhsAP06MWx+/89nMinJyB2icyl58RIcqCmIggpojIGeuJGhjU1aGMBSg==
 
-tinycolor2@^1.4.1:
+tinycolor2@^1.6.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/tinycolor2/-/tinycolor2-1.6.0.tgz#f98007460169b0263b97072c5ae92484ce02d09e"
   integrity sha512-XPaBkWQJdsf3pLKJV9p4qN/S+fm2Oj8AIPo1BTUhg5oxkvm9+SVEGFdhyOz7tTdUTfvxMiAs4sp6/eZO2Ew+pw==
@@ -20852,7 +20862,7 @@ touch@^3.1.0:
   dependencies:
     nopt "~1.0.10"
 
-"tough-cookie@^2.3.3 || ^3.0.1 || ^4.0.0", tough-cookie@^4.0.0, tough-cookie@^4.1.2:
+tough-cookie@4.1.3, "tough-cookie@^2.3.3 || ^3.0.1 || ^4.0.0", tough-cookie@^4.0.0, tough-cookie@^4.1.2, tough-cookie@~2.5.0:
   version "4.1.3"
   resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.1.3.tgz#97b9adb0728b42280aa3d814b6b999b2ff0318bf"
   integrity sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==
@@ -20862,14 +20872,6 @@ touch@^3.1.0:
     universalify "^0.2.0"
     url-parse "^1.5.3"
 
-tough-cookie@~2.5.0:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2"
-  integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==
-  dependencies:
-    psl "^1.1.28"
-    punycode "^2.1.1"
-
 tr46@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/tr46/-/tr46-2.1.0.tgz#fa87aa81ca5d5941da8cbf1f9b749dc969a4e240"
@@ -20877,13 +20879,6 @@ tr46@^2.1.0:
   dependencies:
     punycode "^2.1.1"
 
-tr46@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/tr46/-/tr46-3.0.0.tgz#555c4e297a950617e8eeddef633c87d4d9d6cbf9"
-  integrity sha512-l7FvfAHlcmulp8kr+flpQZmVwtu7nfRV7NZujtN0OqES8EL4O4e0qqzL0DC5gAvx/ZC/9lk6rhcUwYvkBnBnYA==
-  dependencies:
-    punycode "^2.1.1"
-
 tr46@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/tr46/-/tr46-4.1.1.tgz#281a758dcc82aeb4fe38c7dfe4d11a395aac8469"
@@ -20896,6 +20891,11 @@ tr46@~0.0.3:
   resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
   integrity sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==
 
+tree-kill@^1.2.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.2.tgz#4ca09a9092c88b73a7cdc5e8a01b507b0790a0cc"
+  integrity sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==
+
 trim-newlines@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-3.0.1.tgz#260a5d962d8b752425b32f3a7db0dcacd176c144"
@@ -21240,6 +21240,11 @@ underscore@~1.13.2:
   resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.13.6.tgz#04786a1f589dc6c09f761fc5f45b89e935136441"
   integrity sha512-+A5Sja4HP1M08MaXya7p5LvjuM7K6q/2EaC0+iovj/wOcMsTzMvDFbasi/oSapiwOlt252IqsKqPjCl7huKS0A==
 
+undici-types@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.0.1.tgz#62e2af9fcd3ce359634175658de39df8d0f37197"
+  integrity sha512-i9dNdkCziyqGpFxhatR9LITcInbFWh+ExlWkrZQpZHje8FfCcJKgps0IbmMd7D1o8c8syG4pIOV+aKIoC9JEyA==
+
 undici-types@~5.26.4:
   version "5.26.5"
   resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617"
@@ -21250,6 +21255,13 @@ undici@^4.14.1:
   resolved "https://registry.yarnpkg.com/undici/-/undici-4.16.0.tgz#469bb87b3b918818d3d7843d91a1d08da357d5ff"
   integrity sha512-tkZSECUYi+/T1i4u+4+lwZmQgLXd4BLGlrc7KZPcLIW7Jpq99+Xpc30ONv7nS6F5UNOxp/HBZSSL9MafUrvJbw==
 
+undici@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/undici/-/undici-6.0.1.tgz#385572addca36d1c2b280629cb694b726170027e"
+  integrity sha512-eZFYQLeS9BiXpsU0cuFhCwfeda2MnC48EVmmOz/eCjsTgmyTdaHdVsPSC/kwC2GtW2e0uH0HIPbadf3/bRWSxw==
+  dependencies:
+    "@fastify/busboy" "^2.0.0"
+
 unicode-canonical-property-names-ecmascript@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz#301acdc525631670d39f6146e0e77ff6bbdebddc"
@@ -21333,6 +21345,14 @@ unpipe@1.0.0:
   resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
   integrity sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==
 
+unset-value@2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-2.0.1.tgz#57bed0c22d26f28d69acde5df9a11b77c74d2df3"
+  integrity sha512-2hvrBfjUE00PkqN+q0XP6yRAOGrR06uSiUoIQGZkc7GxvQ9H7v8quUPNtZjMg4uux69i8HWpIjLPUKwCuRGyNg==
+  dependencies:
+    has-value "^2.0.2"
+    isobject "^4.0.0"
+
 untildify@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/untildify/-/untildify-4.0.0.tgz#2bc947b953652487e4600949fb091e3ae8cd919b"
@@ -21423,19 +21443,19 @@ utf-8-validate@^5.0.2:
   dependencies:
     node-gyp-build "^4.3.0"
 
-utif@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/utif/-/utif-2.0.1.tgz#9e1582d9bbd20011a6588548ed3266298e711759"
-  integrity sha512-Z/S1fNKCicQTf375lIP9G8Sa1H/phcysstNrrSdZKj1f9g58J4NMgb5IgiEZN9/nLMPDwF0W7hdOe9Qq2IYoLg==
+utif2@^4.0.1:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/utif2/-/utif2-4.1.0.tgz#e768d37bd619b995d56d9780b5d2b4611a3d932b"
+  integrity sha512-+oknB9FHrJ7oW7A2WZYajOcv4FcDR4CfoGB0dPNfxbi4GO05RRnFmt5oa23+9w32EanrYcSJWspUiJkLMs+37w==
   dependencies:
-    pako "^1.0.5"
+    pako "^1.0.11"
 
 util-deprecate@^1.0.1, util-deprecate@^1.0.2, util-deprecate@~1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
   integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==
 
-utils-merge@1.x.x:
+utils-merge@1.x.x, utils-merge@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
   integrity sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==
@@ -21790,6 +21810,11 @@ whatwg-encoding@^2.0.0:
   dependencies:
     iconv-lite "0.6.3"
 
+whatwg-fetch@^3.4.1:
+  version "3.6.20"
+  resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-3.6.20.tgz#580ce6d791facec91d37c72890995a0b48d31c70"
+  integrity sha512-EqhiFU6daOA8kpjOWTL0olhVOF3i7OrFzSYiGsEMB8GcXS+RrzauAERX65xMeNWVqxA6HXH2m69Z9LaKKdisfg==
+
 whatwg-mimetype@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz#3d4b1e0312d2079879f826aff18dbeeca5960fbf"
@@ -21800,14 +21825,6 @@ whatwg-mimetype@^3.0.0:
   resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-3.0.0.tgz#5fa1a7623867ff1af6ca3dc72ad6b8a4208beba7"
   integrity sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q==
 
-whatwg-url@^11.0.0:
-  version "11.0.0"
-  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-11.0.0.tgz#0a849eebb5faf2119b901bb76fd795c2848d4018"
-  integrity sha512-RKT8HExMpoYx4igMiVMY83lN6UeITKJlBQ+vR/8ZJ8OCdSiN3RwCq+9gH0+Xzj0+5IrM6i4j/6LuvzbZIQgEcQ==
-  dependencies:
-    tr46 "^3.0.0"
-    webidl-conversions "^7.0.0"
-
 whatwg-url@^12.0.0, whatwg-url@^12.0.1:
   version "12.0.1"
   resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-12.0.1.tgz#fd7bcc71192e7c3a2a97b9a8d6b094853ed8773c"
@@ -21816,6 +21833,14 @@ whatwg-url@^12.0.0, whatwg-url@^12.0.1:
     tr46 "^4.1.1"
     webidl-conversions "^7.0.0"
 
+whatwg-url@^13.0.0:
+  version "13.0.0"
+  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-13.0.0.tgz#b7b536aca48306394a34e44bda8e99f332410f8f"
+  integrity sha512-9WWbymnqj57+XEuqADHrCJ2eSXzn8WXIW/YSGaZtb2WKAInQ6CHfaUUcTyyver0p8BDg5StLQq8h1vtZuwmOig==
+  dependencies:
+    tr46 "^4.1.1"
+    webidl-conversions "^7.0.0"
+
 whatwg-url@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d"
@@ -22106,33 +22131,10 @@ xml-parse-from-string@^1.0.0:
   resolved "https://registry.yarnpkg.com/xml-parse-from-string/-/xml-parse-from-string-1.0.1.tgz#a9029e929d3dbcded169f3c6e28238d95a5d5a28"
   integrity sha512-ErcKwJTF54uRzzNMXq2X5sMIy88zJvfN2DmdoQvy7PAFJ+tPRU6ydWuOKNMyfmOjdyBQTFREi60s0Y0SyI0G0g==
 
-xml2js@0.1.x:
-  version "0.1.14"
-  resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.1.14.tgz#5274e67f5a64c5f92974cd85139e0332adc6b90c"
-  integrity sha512-pbdws4PPPNc1HPluSUKamY4GWMk592K7qwcj6BExbVOhhubub8+pMda/ql68b6L3luZs/OGjGSB5goV7SnmgnA==
-  dependencies:
-    sax ">=0.1.1"
-
-xml2js@0.4.19:
-  version "0.4.19"
-  resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.4.19.tgz#686c20f213209e94abf0d1bcf1efaa291c7827a7"
-  integrity sha512-esZnJZJOiJR9wWKMyuvSE1y6Dq5LCuJanqhxslH2bxM6duahNZ+HMpCLhBQGZkbX6xRf8x1Y2eJlgt2q3qo49Q==
-  dependencies:
-    sax ">=0.6.0"
-    xmlbuilder "~9.0.1"
-
-xml2js@0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.5.0.tgz#d9440631fbb2ed800203fad106f2724f62c493b7"
-  integrity sha512-drPFnkQJik/O+uPKpqSgr22mpuFHqKdbS835iAQrUC73L2F5WkboIRd63ai/2Yg6I1jzifPFKH2NTK+cfglkIA==
-  dependencies:
-    sax ">=0.6.0"
-    xmlbuilder "~11.0.0"
-
-xml2js@^0.4.19, xml2js@^0.4.5:
-  version "0.4.23"
-  resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.4.23.tgz#a0c69516752421eb2ac758ee4d4ccf58843eac66"
-  integrity sha512-ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug==
+xml2js@0.1.x, xml2js@0.4.19, xml2js@0.5.0, xml2js@0.6.2, xml2js@^0.4.19, xml2js@^0.4.5:
+  version "0.6.2"
+  resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.6.2.tgz#dd0b630083aa09c161e25a4d0901e2b2a929b499"
+  integrity sha512-T4rieHaC1EXcES0Kxxj4JWgaUQHDk+qwHcYOCFHfiwKz7tOVPLq7Hjq9dM1WCMhylqMEfP7hMcOIChvotiZegA==
   dependencies:
     sax ">=0.6.0"
     xmlbuilder "~11.0.0"
@@ -22142,11 +22144,6 @@ xmlbuilder@~11.0.0:
   resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-11.0.1.tgz#be9bae1c8a046e76b31127726347d0ad7002beb3"
   integrity sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==
 
-xmlbuilder@~9.0.1:
-  version "9.0.7"
-  resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.7.tgz#132ee63d2ec5565c557e20f4c22df9aca686b10d"
-  integrity sha512-7YXTQc3P2l9+0rjaUbLwMKRhtmwg1M1eDf6nag7urC7pIPYLD9W/jmzQ4ptRSUbodw5S0jfoGTflLemQibSpeQ==
-
 xmlchars@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz#060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb"
@@ -22227,12 +22224,7 @@ yaml@^1.10.2:
   resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b"
   integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==
 
-yaml@^2.1.1:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.3.2.tgz#f522db4313c671a0ca963a75670f1c12ea909144"
-  integrity sha512-N/lyzTPaJasoDmfV7YTrYCI0G/3ivm/9wdG0aHuheKowWQwGTsK0Eoiw6utmzAnI6pkJa0DUVygvp3spqqEKXg==
-
-yaml@^2.2.2:
+yaml@^2.1.1, yaml@^2.2.2:
   version "2.3.4"
   resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.3.4.tgz#53fc1d514be80aabf386dc6001eb29bf3b7523b2"
   integrity sha512-8aAvwVUSHpfEqTQ4w/KMlf3HcRdt50E5ODIQJBw1fQ5RL34xabzxtUlzTXVqc4rkZsPbvrXKWnABCD7kWSmocA==
@@ -22339,6 +22331,19 @@ yocto-queue@^1.0.0:
   resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-1.0.0.tgz#7f816433fb2cbc511ec8bf7d263c3b58a1a3c251"
   integrity sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g==
 
+yup@0.32.9:
+  version "0.32.9"
+  resolved "https://registry.yarnpkg.com/yup/-/yup-0.32.9.tgz#9367bec6b1b0e39211ecbca598702e106019d872"
+  integrity sha512-Ci1qN+i2H0XpY7syDQ0k5zKQ/DoxO0LzPg8PAR/X4Mpj6DqaeCoIYEEjDJwhArh3Fa7GWbQQVDZKeXYlSH4JMg==
+  dependencies:
+    "@babel/runtime" "^7.10.5"
+    "@types/lodash" "^4.14.165"
+    lodash "^4.17.20"
+    lodash-es "^4.17.15"
+    nanoclone "^0.2.1"
+    property-expr "^2.0.4"
+    toposort "^2.0.2"
+
 yup@^0.32.11:
   version "0.32.11"
   resolved "https://registry.yarnpkg.com/yup/-/yup-0.32.11.tgz#d67fb83eefa4698607982e63f7ca4c5ed3cf18c5"