diff --git a/.eslintrc.json b/.eslintrc.json
index 75584b8163..79f7e56712 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -19,6 +19,7 @@
     "bundle.js"
   ],
   "extends": ["eslint:recommended"],
+  "plugins": ["import", "eslint-plugin-local-rules"],
   "overrides": [
     {
       "files": ["**/*.svelte"],
@@ -30,7 +31,6 @@
         "sourceType": "module",
         "allowImportExportEverywhere": true
       }
-
     },
     {
       "files": ["**/*.ts"],
@@ -42,13 +42,25 @@
         "no-case-declarations": "off",
         "no-useless-escape": "off",
         "no-undef": "off",
-        "no-prototype-builtins": "off"
+        "no-prototype-builtins": "off",
+        "local-rules/no-budibase-imports": "error"
       }
     }
   ],
   "rules": {
     "no-self-assign": "off",
-    "no-unused-vars": ["error", { "varsIgnorePattern": "^_", "argsIgnorePattern": "^_", "destructuredArrayIgnorePattern": "^_" }]
+    "no-unused-vars": [
+      "error",
+      {
+        "varsIgnorePattern": "^_",
+        "argsIgnorePattern": "^_",
+        "destructuredArrayIgnorePattern": "^_"
+      }
+    ],
+    "import/no-relative-packages": "error",
+    "import/export": "error",
+    "import/no-duplicates": "error",
+    "import/newline-after-import": "error"
   },
   "globals": {
     "GeolocationPositionError": true
diff --git a/.github/workflows/budibase_ci.yml b/.github/workflows/budibase_ci.yml
index 77867c8617..6e04ca6f67 100644
--- a/.github/workflows/budibase_ci.yml
+++ b/.github/workflows/budibase_ci.yml
@@ -12,6 +12,13 @@ on:
       - master
   pull_request:
   workflow_dispatch:
+  workflow_call:
+    inputs:
+      run_as_oss:
+        type: boolean
+        required: false
+        description: Force running checks as if it was an OSS contributor
+        default: false
 
 env:
   BRANCH: ${{ github.event.pull_request.head.ref }}
@@ -19,50 +26,41 @@ env:
   PERSONAL_ACCESS_TOKEN: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
   NX_BASE_BRANCH: origin/${{ github.base_ref }}
   USE_NX_AFFECTED: ${{ github.event_name == 'pull_request' }}
+  IS_OSS_CONTRIBUTOR: ${{ inputs.run_as_oss == true || (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != 'Budibase/budibase') }}
 
 jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout repo and submodules
+      - name: Checkout repo
         uses: actions/checkout@v3
-        if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'Budibase/budibase'
         with:
-          submodules: true
+          submodules: ${{ env.IS_OSS_CONTRIBUTOR == 'false' }}
           token: ${{ secrets.PERSONAL_ACCESS_TOKEN || github.token }}
-      - name: Checkout repo only
-        uses: actions/checkout@v3
-        if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != 'Budibase/budibase'
 
       - name: Use Node.js 18.x
         uses: actions/setup-node@v3
         with:
           node-version: 18.x
-          cache: "yarn"
+          cache: yarn
       - run: yarn --frozen-lockfile
       - run: yarn lint
 
   build:
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout repo and submodules
+      - name: Checkout repo
         uses: actions/checkout@v3
-        if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'Budibase/budibase'
         with:
-          submodules: true
+          submodules: ${{ env.IS_OSS_CONTRIBUTOR == 'false' }}
           token: ${{ secrets.PERSONAL_ACCESS_TOKEN || github.token }}
           fetch-depth: 0
-      - name: Checkout repo only
-        uses: actions/checkout@v3
-        if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != 'Budibase/budibase'
-        with:
-          fetch-depth: 0
 
       - name: Use Node.js 18.x
         uses: actions/setup-node@v3
         with:
           node-version: 18.x
-          cache: "yarn"
+          cache: yarn
       - run: yarn --frozen-lockfile
 
       # Run build all the projects
@@ -81,24 +79,18 @@ jobs:
   test-libraries:
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout repo and submodules
+      - name: Checkout repo
         uses: actions/checkout@v3
-        if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'Budibase/budibase'
         with:
-          submodules: true
+          submodules: ${{ env.IS_OSS_CONTRIBUTOR == 'false' }}
           token: ${{ secrets.PERSONAL_ACCESS_TOKEN || github.token }}
           fetch-depth: 0
-      - name: Checkout repo only
-        uses: actions/checkout@v3
-        if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != 'Budibase/budibase'
-        with:
-          fetch-depth: 0
 
       - name: Use Node.js 18.x
         uses: actions/setup-node@v3
         with:
           node-version: 18.x
-          cache: "yarn"
+          cache: yarn
       - run: yarn --frozen-lockfile
       - name: Test
         run: |
@@ -116,24 +108,18 @@ jobs:
   test-worker:
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout repo and submodules
+      - name: Checkout repo
         uses: actions/checkout@v3
-        if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'Budibase/budibase'
         with:
-          submodules: true
+          submodules: ${{ env.IS_OSS_CONTRIBUTOR == 'false' }}
           token: ${{ secrets.PERSONAL_ACCESS_TOKEN || github.token }}
           fetch-depth: 0
-      - name: Checkout repo only
-        uses: actions/checkout@v3
-        if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != 'Budibase/budibase'
-        with:
-          fetch-depth: 0
 
       - name: Use Node.js 18.x
         uses: actions/setup-node@v3
         with:
           node-version: 18.x
-          cache: "yarn"
+          cache: yarn
       - run: yarn --frozen-lockfile
       - name: Test worker
         run: |
@@ -152,24 +138,18 @@ jobs:
   test-server:
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout repo and submodules
+      - name: Checkout repo
         uses: actions/checkout@v3
-        if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'Budibase/budibase'
         with:
-          submodules: true
+          submodules: ${{ env.IS_OSS_CONTRIBUTOR == 'false' }}
           token: ${{ secrets.PERSONAL_ACCESS_TOKEN || github.token }}
           fetch-depth: 0
-      - name: Checkout repo only
-        uses: actions/checkout@v3
-        if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != 'Budibase/budibase'
-        with:
-          fetch-depth: 0
 
       - name: Use Node.js 18.x
         uses: actions/setup-node@v3
         with:
           node-version: 18.x
-          cache: "yarn"
+          cache: yarn
       - run: yarn --frozen-lockfile
       - name: Test server
         run: |
@@ -200,7 +180,7 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version: 18.x
-          cache: "yarn"
+          cache: yarn
       - run: yarn --frozen-lockfile
       - name: Test
         run: |
@@ -213,24 +193,23 @@ jobs:
   integration-test:
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout repo and submodules
+      - name: Checkout repo
         uses: actions/checkout@v3
-        if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'Budibase/budibase'
         with:
-          submodules: true
+          submodules: ${{ env.IS_OSS_CONTRIBUTOR == 'false' }}
           token: ${{ secrets.PERSONAL_ACCESS_TOKEN || github.token }}
-      - name: Checkout repo only
-        uses: actions/checkout@v3
-        if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != 'Budibase/budibase'
 
       - name: Use Node.js 18.x
         uses: actions/setup-node@v3
         with:
           node-version: 18.x
-          cache: "yarn"
+          cache: yarn
       - run: yarn --frozen-lockfile
       - name: Build packages
         run: yarn build --scope @budibase/server --scope @budibase/worker
+      - name: Build backend-core for OSS contributor (required for pro)
+        if: ${{ env.IS_OSS_CONTRIBUTOR == 'true' }}
+        run: yarn build --scope @budibase/backend-core
       - name: Run tests
         run: |
           cd qa-core
diff --git a/.github/workflows/check-oss-contributor.yml b/.github/workflows/check-oss-contributor.yml
new file mode 100644
index 0000000000..398f07a130
--- /dev/null
+++ b/.github/workflows/check-oss-contributor.yml
@@ -0,0 +1,35 @@
+name: OSS contributor checks
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: "0 8,16 * * 1-5" # on weekdays at 8am and 4pm
+
+jobs:
+  run-checks:
+    name: Publish server and worker docker images
+    uses: ./.github/workflows/budibase_ci.yml
+    with:
+      run_as_oss: true
+    secrets: inherit
+
+  notify-error:
+    needs: ["run-checks"]
+    if: ${{ failure() }}
+    name: Notify error
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Set commit SHA
+        id: set_sha
+        run: echo "::set-output name=sha::$(git rev-parse --short ${{ github.sha }})"
+
+      - name: Notify error
+        uses: tsickert/discord-webhook@v5.3.0
+        with:
+          webhook-url: ${{ secrets.OSS_CHECKS_WEBHOOK_URL }}
+          embed-title: 🚨 OSS checks failed in master
+          embed-url: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}"
+          embed-description: |
+            Git sha: `${{ steps.set_sha.outputs.sha }}`
diff --git a/.github/workflows/deploy-featurebranch.yml b/.github/workflows/deploy-featurebranch.yml
index f1fb12c087..c70f2fff20 100644
--- a/.github/workflows/deploy-featurebranch.yml
+++ b/.github/workflows/deploy-featurebranch.yml
@@ -7,6 +7,7 @@ on:
 
 jobs:
   release:
+    if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'Budibase/budibase'
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
diff --git a/.prettierignore b/.prettierignore
index 64607d74ab..ce7617224b 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -1,13 +1,11 @@
 node_modules
 dist
-*.spec.js
-packages/builder/src/components/design/AppPreview/CurrentItemPreview.svelte
 packages/server/builder
 packages/server/coverage
-packages/worker/coverage
-packages/backend-core/coverage
 packages/server/client
 packages/server/src/definitions/openapi.ts
+packages/worker/coverage
+packages/backend-core/coverage
 packages/builder/.routify
 packages/sdk/sdk
 packages/pro/coverage
\ No newline at end of file
diff --git a/charts/budibase/templates/minio-service-deployment.yaml b/charts/budibase/templates/minio-service-deployment.yaml
index 41af2624bf..f98ecc139d 100644
--- a/charts/budibase/templates/minio-service-deployment.yaml
+++ b/charts/budibase/templates/minio-service-deployment.yaml
@@ -46,11 +46,9 @@ spec:
         image: minio/minio
         imagePullPolicy: ""
         livenessProbe:
-          exec:
-            command:
-            - curl
-            - -f
-            - http://localhost:9000/minio/health/live
+          httpGet:
+            path: /minio/health/live
+            port: 9000
           failureThreshold: 3
           periodSeconds: 30
           timeoutSeconds: 20
diff --git a/eslint-local-rules/index.js b/eslint-local-rules/index.js
new file mode 100644
index 0000000000..af02599c90
--- /dev/null
+++ b/eslint-local-rules/index.js
@@ -0,0 +1,21 @@
+module.exports = {
+  "no-budibase-imports": {
+    create: function (context) {
+      return {
+        ImportDeclaration(node) {
+          const importPath = node.source.value
+
+          if (
+            /^@budibase\/[^/]+\/.*$/.test(importPath) &&
+            importPath !== "@budibase/backend-core/tests"
+          ) {
+            context.report({
+              node,
+              message: `Importing from @budibase is not allowed, except for @budibase/backend-core/tests.`,
+            })
+          }
+        },
+      }
+    },
+  },
+}
diff --git a/hosting/scripts/build-target-paths.sh b/hosting/scripts/build-target-paths.sh
deleted file mode 100644
index 34227011f4..0000000000
--- a/hosting/scripts/build-target-paths.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/bash
-
-echo ${TARGETBUILD} > /buildtarget.txt
-if [[ "${TARGETBUILD}" = "aas" ]]; then
-    # Azure AppService uses /home for persistent data & SSH on port 2222
-    DATA_DIR="${DATA_DIR:-/home}"
-    WEBSITES_ENABLE_APP_SERVICE_STORAGE=true
-    mkdir -p $DATA_DIR/{search,minio,couch}
-    mkdir -p $DATA_DIR/couch/{dbs,views}
-    chown -R couchdb:couchdb $DATA_DIR/couch/
-    apt update
-    apt-get install -y openssh-server
-    echo "root:Docker!" | chpasswd
-    mkdir -p /tmp
-    chmod +x /tmp/ssh_setup.sh \
-        && (sleep 1;/tmp/ssh_setup.sh 2>&1 > /dev/null)
-    cp /etc/sshd_config /etc/ssh/sshd_config
-    /etc/init.d/ssh restart
-    sed -i "s#DATA_DIR#/home#g" /opt/clouseau/clouseau.ini
-    sed -i "s#DATA_DIR#/home#g" /opt/couchdb/etc/local.ini
-else
-    sed -i "s#DATA_DIR#/data#g" /opt/clouseau/clouseau.ini
-    sed -i "s#DATA_DIR#/data#g" /opt/couchdb/etc/local.ini
-fi
\ No newline at end of file
diff --git a/hosting/single/healthcheck.sh b/hosting/single/healthcheck.sh
index 592b3e94fa..12e340062c 100644
--- a/hosting/single/healthcheck.sh
+++ b/hosting/single/healthcheck.sh
@@ -25,7 +25,7 @@ if [[ $(curl -s -w "%{http_code}\n" http://localhost:4002/health -o /dev/null) -
     healthy=false
 fi
 
-if [[ $(curl -s -w "%{http_code}\n" http://localhost:5984/ -o /dev/null) -ne 200 ]]; then
+if [[ $(curl -s -w "%{http_code}\n" http://localhost:5984/_up -o /dev/null) -ne 200 ]]; then
     echo 'ERROR: CouchDB is not running';
     healthy=false
 fi
diff --git a/lerna.json b/lerna.json
index aafb6b22ce..faba64ce90 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.13.9",
+  "version": "2.13.15",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/package.json b/package.json
index 8a27cde104..2978483448 100644
--- a/package.json
+++ b/package.json
@@ -2,11 +2,17 @@
   "name": "root",
   "private": true,
   "devDependencies": {
+    "@babel/core": "^7.22.5",
+    "@babel/eslint-parser": "^7.22.5",
+    "@babel/preset-env": "^7.22.5",
     "@esbuild-plugins/tsconfig-paths": "^0.1.2",
     "@typescript-eslint/parser": "6.7.2",
     "esbuild": "^0.18.17",
     "esbuild-node-externals": "^1.8.0",
     "eslint": "^8.44.0",
+    "eslint-plugin-import": "^2.29.0",
+    "eslint-plugin-local-rules": "^2.0.0",
+    "eslint-plugin-svelte": "^2.32.2",
     "husky": "^8.0.3",
     "kill-port": "^1.6.1",
     "lerna": "7.1.1",
@@ -17,12 +23,8 @@
     "prettier": "2.8.8",
     "prettier-plugin-svelte": "^2.3.0",
     "svelte": "3.49.0",
-    "typescript": "5.2.2",
-    "@babel/core": "^7.22.5",
-    "@babel/eslint-parser": "^7.22.5",
-    "@babel/preset-env": "^7.22.5",
-    "eslint-plugin-svelte": "^2.32.2",
-    "svelte-eslint-parser": "^0.32.0"
+    "svelte-eslint-parser": "^0.32.0",
+    "typescript": "5.2.2"
   },
   "scripts": {
     "preinstall": "node scripts/syncProPackage.js",
diff --git a/packages/backend-core/src/auth/auth.ts b/packages/backend-core/src/auth/auth.ts
index 0100a2d0e2..e31bc81eed 100644
--- a/packages/backend-core/src/auth/auth.ts
+++ b/packages/backend-core/src/auth/auth.ts
@@ -1,5 +1,6 @@
 const _passport = require("koa-passport")
 const LocalStrategy = require("passport-local").Strategy
+
 import { getGlobalDB } from "../context"
 import { Cookie } from "../constants"
 import { getSessionsForUser, invalidateSessions } from "../security/sessions"
@@ -26,6 +27,7 @@ import { clearCookie, getCookie } from "../utils"
 import { ssoSaveUserNoOp } from "../middleware/passport/sso/sso"
 
 const refresh = require("passport-oauth2-refresh")
+
 export {
   auditLog,
   authError,
diff --git a/packages/backend-core/src/cache/generic.ts b/packages/backend-core/src/cache/generic.ts
index 7cd5d6227f..7a2be5a0f0 100644
--- a/packages/backend-core/src/cache/generic.ts
+++ b/packages/backend-core/src/cache/generic.ts
@@ -1,6 +1,6 @@
-const BaseCache = require("./base")
+import BaseCache from "./base"
 
-const GENERIC = new BaseCache.default()
+const GENERIC = new BaseCache()
 
 export enum CacheKey {
   CHECKLIST = "checklist",
@@ -19,6 +19,7 @@ export enum TTL {
 }
 
 function performExport(funcName: string) {
+  // @ts-ignore
   return (...args: any) => GENERIC[funcName](...args)
 }
 
diff --git a/packages/backend-core/src/cache/index.ts b/packages/backend-core/src/cache/index.ts
index 58928c271a..4fa986e4e2 100644
--- a/packages/backend-core/src/cache/index.ts
+++ b/packages/backend-core/src/cache/index.ts
@@ -2,4 +2,6 @@ export * as generic from "./generic"
 export * as user from "./user"
 export * as app from "./appMetadata"
 export * as writethrough from "./writethrough"
+export * as invite from "./invite"
+export * as passwordReset from "./passwordReset"
 export * from "./generic"
diff --git a/packages/backend-core/src/cache/invite.ts b/packages/backend-core/src/cache/invite.ts
new file mode 100644
index 0000000000..e43ebc4aa8
--- /dev/null
+++ b/packages/backend-core/src/cache/invite.ts
@@ -0,0 +1,86 @@
+import * as utils from "../utils"
+import { Duration, DurationType } from "../utils"
+import env from "../environment"
+import { getTenantId } from "../context"
+import * as redis from "../redis/init"
+
+const TTL_SECONDS = Duration.fromDays(7).toSeconds()
+
+interface Invite {
+  email: string
+  info: any
+}
+
+interface InviteWithCode extends Invite {
+  code: string
+}
+
+/**
+ * Given an invite code and invite body, allow the update an existing/valid invite in redis
+ * @param code The invite code for an invite in redis
+ * @param value The body of the updated user invitation
+ */
+export async function updateCode(code: string, value: Invite) {
+  const client = await redis.getInviteClient()
+  await client.store(code, value, TTL_SECONDS)
+}
+
+/**
+ * Generates an invitation code and writes it to redis - which can later be checked for user creation.
+ * @param email the email address which the code is being sent to (for use later).
+ * @param info Information to be carried along with the invitation.
+ * @return returns the code that was stored to redis.
+ */
+export async function createCode(email: string, info: any): Promise<string> {
+  const code = utils.newid()
+  const client = await redis.getInviteClient()
+  await client.store(code, { email, info }, TTL_SECONDS)
+  return code
+}
+
+/**
+ * Checks that the provided invite code is valid - will return the email address of user that was invited.
+ * @param code the invite code that was provided as part of the link.
+ * @return If the code is valid then an email address will be returned.
+ */
+export async function getCode(code: string): Promise<Invite> {
+  const client = await redis.getInviteClient()
+  const value = (await client.get(code)) as Invite | undefined
+  if (!value) {
+    throw "Invitation is not valid or has expired, please request a new one."
+  }
+  return value
+}
+
+export async function deleteCode(code: string) {
+  const client = await redis.getInviteClient()
+  await client.delete(code)
+}
+
+/**
+ Get all currently available user invitations for the current tenant.
+ **/
+export async function getInviteCodes(): Promise<InviteWithCode[]> {
+  const client = await redis.getInviteClient()
+  const invites: { key: string; value: Invite }[] = await client.scan()
+
+  const results: InviteWithCode[] = invites.map(invite => {
+    return {
+      ...invite.value,
+      code: invite.key,
+    }
+  })
+  if (!env.MULTI_TENANCY) {
+    return results
+  }
+  const tenantId = getTenantId()
+  return results.filter(invite => tenantId === invite.info.tenantId)
+}
+
+export async function getExistingInvites(
+  emails: string[]
+): Promise<InviteWithCode[]> {
+  return (await getInviteCodes()).filter(invite =>
+    emails.includes(invite.email)
+  )
+}
diff --git a/packages/backend-core/src/cache/passwordReset.ts b/packages/backend-core/src/cache/passwordReset.ts
new file mode 100644
index 0000000000..7f5a93f149
--- /dev/null
+++ b/packages/backend-core/src/cache/passwordReset.ts
@@ -0,0 +1,38 @@
+import * as redis from "../redis/init"
+import * as utils from "../utils"
+import { Duration, DurationType } from "../utils"
+
+const TTL_SECONDS = Duration.fromHours(1).toSeconds()
+
+interface PasswordReset {
+  userId: string
+  info: any
+}
+
+/**
+ * Given a user ID this will store a code (that is returned) for an hour in redis.
+ * The user can then return this code for resetting their password (through their reset link).
+ * @param userId the ID of the user which is to be reset.
+ * @param info Info about the user/the reset process.
+ * @return returns the code that was stored to redis.
+ */
+export async function createCode(userId: string, info: any): Promise<string> {
+  const code = utils.newid()
+  const client = await redis.getPasswordResetClient()
+  await client.store(code, { userId, info }, TTL_SECONDS)
+  return code
+}
+
+/**
+ * Given a reset code this will lookup to redis, check if the code is valid.
+ * @param code The code provided via the email link.
+ * @return returns the user ID if it is found
+ */
+export async function getCode(code: string): Promise<PasswordReset> {
+  const client = await redis.getPasswordResetClient()
+  const value = (await client.get(code)) as PasswordReset | undefined
+  if (!value) {
+    throw "Provided information is not valid, cannot reset password - please try again."
+  }
+  return value
+}
diff --git a/packages/backend-core/src/configs/configs.ts b/packages/backend-core/src/configs/configs.ts
index 0c83ed005d..0d189e3f7d 100644
--- a/packages/backend-core/src/configs/configs.ts
+++ b/packages/backend-core/src/configs/configs.ts
@@ -17,7 +17,6 @@ import { DocumentType, SEPARATOR } from "../constants"
 import { CacheKey, TTL, withCache } from "../cache"
 import * as context from "../context"
 import env from "../environment"
-import environment from "../environment"
 
 // UTILS
 
@@ -181,10 +180,10 @@ export async function getGoogleDatasourceConfig(): Promise<
 }
 
 export function getDefaultGoogleConfig(): GoogleInnerConfig | undefined {
-  if (environment.GOOGLE_CLIENT_ID && environment.GOOGLE_CLIENT_SECRET) {
+  if (env.GOOGLE_CLIENT_ID && env.GOOGLE_CLIENT_SECRET) {
     return {
-      clientID: environment.GOOGLE_CLIENT_ID!,
-      clientSecret: environment.GOOGLE_CLIENT_SECRET!,
+      clientID: env.GOOGLE_CLIENT_ID!,
+      clientSecret: env.GOOGLE_CLIENT_SECRET!,
       activated: true,
     }
   }
diff --git a/packages/backend-core/src/constants/db.ts b/packages/backend-core/src/constants/db.ts
index bb944556af..ac00483021 100644
--- a/packages/backend-core/src/constants/db.ts
+++ b/packages/backend-core/src/constants/db.ts
@@ -1,4 +1,5 @@
 import { prefixed, DocumentType } from "@budibase/types"
+
 export {
   SEPARATOR,
   UNICODE_MAX,
diff --git a/packages/backend-core/src/db/tests/index.spec.js b/packages/backend-core/src/db/tests/index.spec.js
index 0d257f7ed7..e03c9a5b0e 100644
--- a/packages/backend-core/src/db/tests/index.spec.js
+++ b/packages/backend-core/src/db/tests/index.spec.js
@@ -5,7 +5,6 @@ const { getDB } = require("../db")
 describe("db", () => {
   describe("getDB", () => {
     it("returns a db", async () => {
-      
       const dbName = structures.db.id()
       const db = getDB(dbName)
       expect(db).toBeDefined()
diff --git a/packages/backend-core/src/db/utils.ts b/packages/backend-core/src/db/utils.ts
index d7a4b8224a..906a95e1db 100644
--- a/packages/backend-core/src/db/utils.ts
+++ b/packages/backend-core/src/db/utils.ts
@@ -6,6 +6,7 @@ import { AppState, DeletedApp, getAppMetadata } from "../cache/appMetadata"
 import { isDevApp, isDevAppID, getProdAppID } from "../docIds/conversions"
 import { App, Database } from "@budibase/types"
 import { getStartEndKeyURL } from "../docIds"
+
 export * from "../docIds"
 
 /**
diff --git a/packages/backend-core/src/docIds/conversions.ts b/packages/backend-core/src/docIds/conversions.ts
index b168b74e16..ec43d01389 100644
--- a/packages/backend-core/src/docIds/conversions.ts
+++ b/packages/backend-core/src/docIds/conversions.ts
@@ -1,5 +1,6 @@
 import { APP_DEV_PREFIX, APP_PREFIX } from "../constants"
 import { App } from "@budibase/types"
+
 const NO_APP_ERROR = "No app provided"
 
 export function isDevAppID(appId?: string) {
diff --git a/packages/backend-core/src/events/processors/posthog/index.ts b/packages/backend-core/src/events/processors/posthog/index.ts
index dceb10d2cd..5a2b1afc9f 100644
--- a/packages/backend-core/src/events/processors/posthog/index.ts
+++ b/packages/backend-core/src/events/processors/posthog/index.ts
@@ -1,2 +1,3 @@
 import PosthogProcessor from "./PosthogProcessor"
+
 export default PosthogProcessor
diff --git a/packages/backend-core/src/events/processors/posthog/tests/PosthogProcessor.spec.ts b/packages/backend-core/src/events/processors/posthog/tests/PosthogProcessor.spec.ts
index 0722fc3293..d9a5504073 100644
--- a/packages/backend-core/src/events/processors/posthog/tests/PosthogProcessor.spec.ts
+++ b/packages/backend-core/src/events/processors/posthog/tests/PosthogProcessor.spec.ts
@@ -1,7 +1,9 @@
 import { testEnv } from "../../../../../tests/extra"
 import PosthogProcessor from "../PosthogProcessor"
 import { Event, IdentityType, Hosting } from "@budibase/types"
+
 const tk = require("timekeeper")
+
 import * as cache from "../../../../cache/generic"
 import { CacheKey } from "../../../../cache/generic"
 import * as context from "../../../../context"
diff --git a/packages/backend-core/src/features/index.ts b/packages/backend-core/src/features/index.ts
index 8f5c903e05..ad517082de 100644
--- a/packages/backend-core/src/features/index.ts
+++ b/packages/backend-core/src/features/index.ts
@@ -1,5 +1,6 @@
 import env from "../environment"
 import * as context from "../context"
+
 export * from "./installation"
 
 /**
diff --git a/packages/backend-core/src/index.ts b/packages/backend-core/src/index.ts
index c7cf9f56cc..d04f48e5fc 100644
--- a/packages/backend-core/src/index.ts
+++ b/packages/backend-core/src/index.ts
@@ -32,11 +32,13 @@ export * as blacklist from "./blacklist"
 export * as docUpdates from "./docUpdates"
 export * from "./utils/Duration"
 export { SearchParams } from "./db"
+export * as docIds from "./docIds"
 // Add context to tenancy for backwards compatibility
 // only do this for external usages to prevent internal
 // circular dependencies
 import * as context from "./context"
 import * as _tenancy from "./tenancy"
+
 export const tenancy = {
   ..._tenancy,
   ...context,
@@ -50,6 +52,7 @@ export * from "./constants"
 
 // expose package init function
 import * as db from "./db"
+
 export const init = (opts: any = {}) => {
   db.init(opts.db)
 }
diff --git a/packages/backend-core/src/installation.ts b/packages/backend-core/src/installation.ts
index 17eda2004d..ca35b926fb 100644
--- a/packages/backend-core/src/installation.ts
+++ b/packages/backend-core/src/installation.ts
@@ -1,7 +1,6 @@
 import { newid } from "./utils"
 import * as events from "./events"
-import { StaticDatabases } from "./db"
-import { doWithDB } from "./db"
+import { StaticDatabases, doWithDB } from "./db"
 import { Installation, IdentityType, Database } from "@budibase/types"
 import * as context from "./context"
 import semver from "semver"
diff --git a/packages/backend-core/src/logging/correlation/correlation.ts b/packages/backend-core/src/logging/correlation/correlation.ts
index b5b47df9c6..0498bd43d5 100644
--- a/packages/backend-core/src/logging/correlation/correlation.ts
+++ b/packages/backend-core/src/logging/correlation/correlation.ts
@@ -1,4 +1,5 @@
 import { Header } from "../../constants"
+
 const correlator = require("correlation-id")
 
 export const setHeader = (headers: any) => {
diff --git a/packages/backend-core/src/logging/correlation/middleware.ts b/packages/backend-core/src/logging/correlation/middleware.ts
index f77714a5ae..45baee1fb1 100644
--- a/packages/backend-core/src/logging/correlation/middleware.ts
+++ b/packages/backend-core/src/logging/correlation/middleware.ts
@@ -1,5 +1,6 @@
 import { Header } from "../../constants"
 import { v4 as uuid } from "uuid"
+
 const correlator = require("correlation-id")
 
 const correlation = (ctx: any, next: any) => {
diff --git a/packages/backend-core/src/logging/pino/middleware.ts b/packages/backend-core/src/logging/pino/middleware.ts
index 569420c5f2..df18a35eb1 100644
--- a/packages/backend-core/src/logging/pino/middleware.ts
+++ b/packages/backend-core/src/logging/pino/middleware.ts
@@ -1,9 +1,12 @@
 import env from "../../environment"
 import { logger } from "./logger"
 import { IncomingMessage } from "http"
+
 const pino = require("koa-pino-logger")
+
 import { Options } from "pino-http"
 import { Ctx } from "@budibase/types"
+
 const correlator = require("correlation-id")
 
 export function pinoSettings(): Options {
diff --git a/packages/backend-core/src/middleware/index.ts b/packages/backend-core/src/middleware/index.ts
index 980bf06b00..e1eb7f1d26 100644
--- a/packages/backend-core/src/middleware/index.ts
+++ b/packages/backend-core/src/middleware/index.ts
@@ -2,6 +2,7 @@ export * as local from "./passport/local"
 export * as google from "./passport/sso/google"
 export * as oidc from "./passport/sso/oidc"
 import * as datasourceGoogle from "./passport/datasource/google"
+
 export const datasource = {
   google: datasourceGoogle,
 }
diff --git a/packages/backend-core/src/middleware/passport/sso/google.ts b/packages/backend-core/src/middleware/passport/sso/google.ts
index ad7593e63d..2a08ad7665 100644
--- a/packages/backend-core/src/middleware/passport/sso/google.ts
+++ b/packages/backend-core/src/middleware/passport/sso/google.ts
@@ -8,6 +8,7 @@ import {
   SaveSSOUserFunction,
   GoogleInnerConfig,
 } from "@budibase/types"
+
 const GoogleStrategy = require("passport-google-oauth").OAuth2Strategy
 
 export function buildVerifyFn(saveUserFn: SaveSSOUserFunction) {
diff --git a/packages/backend-core/src/middleware/passport/sso/tests/google.spec.ts b/packages/backend-core/src/middleware/passport/sso/tests/google.spec.ts
index d0689a1f0a..9bf855b3c5 100644
--- a/packages/backend-core/src/middleware/passport/sso/tests/google.spec.ts
+++ b/packages/backend-core/src/middleware/passport/sso/tests/google.spec.ts
@@ -6,6 +6,7 @@ const mockStrategy = require("passport-google-oauth").OAuth2Strategy
 
 jest.mock("../sso")
 import * as _sso from "../sso"
+
 const sso = jest.mocked(_sso)
 
 const mockSaveUserFn = jest.fn()
diff --git a/packages/backend-core/src/middleware/passport/sso/tests/sso.spec.ts b/packages/backend-core/src/middleware/passport/sso/tests/sso.spec.ts
index c3ddf220e6..d3486a5b14 100644
--- a/packages/backend-core/src/middleware/passport/sso/tests/sso.spec.ts
+++ b/packages/backend-core/src/middleware/passport/sso/tests/sso.spec.ts
@@ -11,6 +11,7 @@ const mockSaveUser = jest.fn()
 
 jest.mock("../../../../users")
 import * as _users from "../../../../users"
+
 const users = jest.mocked(_users)
 
 const getErrorMessage = () => {
diff --git a/packages/backend-core/src/middleware/tests/builder.spec.ts b/packages/backend-core/src/middleware/tests/builder.spec.ts
index d350eff4f6..0514dc13f0 100644
--- a/packages/backend-core/src/middleware/tests/builder.spec.ts
+++ b/packages/backend-core/src/middleware/tests/builder.spec.ts
@@ -5,6 +5,7 @@ import { structures } from "../../../tests"
 import { ContextUser, ServiceType } from "@budibase/types"
 import { doInAppContext } from "../../context"
 import env from "../../environment"
+
 env._set("SERVICE_TYPE", ServiceType.APPS)
 
 const appId = "app_aaa"
diff --git a/packages/backend-core/src/objectStore/objectStore.ts b/packages/backend-core/src/objectStore/objectStore.ts
index 76d2dd6689..cdaf19fa55 100644
--- a/packages/backend-core/src/objectStore/objectStore.ts
+++ b/packages/backend-core/src/objectStore/objectStore.ts
@@ -1,4 +1,5 @@
 const sanitize = require("sanitize-s3-objectkey")
+
 import AWS from "aws-sdk"
 import stream, { Readable } from "stream"
 import fetch from "node-fetch"
diff --git a/packages/backend-core/src/redis/init.ts b/packages/backend-core/src/redis/init.ts
index 55ffe3dd12..f3bcee3209 100644
--- a/packages/backend-core/src/redis/init.ts
+++ b/packages/backend-core/src/redis/init.ts
@@ -7,15 +7,19 @@ let userClient: Client,
   cacheClient: Client,
   writethroughClient: Client,
   lockClient: Client,
-  socketClient: Client
+  socketClient: Client,
+  inviteClient: Client,
+  passwordResetClient: Client
 
-async function init() {
+export async function init() {
   userClient = await new Client(utils.Databases.USER_CACHE).init()
   sessionClient = await new Client(utils.Databases.SESSIONS).init()
   appClient = await new Client(utils.Databases.APP_METADATA).init()
   cacheClient = await new Client(utils.Databases.GENERIC_CACHE).init()
   lockClient = await new Client(utils.Databases.LOCKS).init()
   writethroughClient = await new Client(utils.Databases.WRITE_THROUGH).init()
+  inviteClient = await new Client(utils.Databases.INVITATIONS).init()
+  passwordResetClient = await new Client(utils.Databases.PW_RESETS).init()
   socketClient = await new Client(
     utils.Databases.SOCKET_IO,
     utils.SelectableDatabase.SOCKET_IO
@@ -29,6 +33,8 @@ export async function shutdown() {
   if (cacheClient) await cacheClient.finish()
   if (writethroughClient) await writethroughClient.finish()
   if (lockClient) await lockClient.finish()
+  if (inviteClient) await inviteClient.finish()
+  if (passwordResetClient) await passwordResetClient.finish()
   if (socketClient) await socketClient.finish()
 }
 
@@ -84,3 +90,17 @@ export async function getSocketClient() {
   }
   return socketClient
 }
+
+export async function getInviteClient() {
+  if (!inviteClient) {
+    await init()
+  }
+  return inviteClient
+}
+
+export async function getPasswordResetClient() {
+  if (!passwordResetClient) {
+    await init()
+  }
+  return passwordResetClient
+}
diff --git a/packages/backend-core/src/redis/redlockImpl.ts b/packages/backend-core/src/redis/redlockImpl.ts
index 7fe61a409e..266f1fe989 100644
--- a/packages/backend-core/src/redis/redlockImpl.ts
+++ b/packages/backend-core/src/redis/redlockImpl.ts
@@ -3,6 +3,7 @@ import { getLockClient } from "./init"
 import { LockOptions, LockType } from "@budibase/types"
 import * as context from "../context"
 import env from "../environment"
+import { logWarn } from "../logging"
 
 async function getClient(
   type: LockType,
@@ -116,7 +117,7 @@ export async function doWithLock<T>(
     const result = await task()
     return { executed: true, result }
   } catch (e: any) {
-    console.warn("lock error")
+    logWarn(`lock type: ${opts.type} error`, e)
     // lock limit exceeded
     if (e.name === "LockError") {
       if (opts.type === LockType.TRY_ONCE) {
@@ -124,11 +125,9 @@ export async function doWithLock<T>(
         // due to retry count (0) exceeded
         return { executed: false }
       } else {
-        console.error(e)
         throw e
       }
     } else {
-      console.error(e)
       throw e
     }
   } finally {
diff --git a/packages/backend-core/src/redis/utils.ts b/packages/backend-core/src/redis/utils.ts
index 5187fe13f8..4d8b1bb9a4 100644
--- a/packages/backend-core/src/redis/utils.ts
+++ b/packages/backend-core/src/redis/utils.ts
@@ -75,10 +75,12 @@ export function getRedisConnectionDetails() {
   }
   const [host, port] = url.split(":")
 
+  const portNumber = parseInt(port)
   return {
     host,
     password,
-    port: parseInt(port),
+    // assume default port for redis if invalid found
+    port: isNaN(portNumber) ? 6379 : portNumber,
   }
 }
 
diff --git a/packages/backend-core/src/security/roles.ts b/packages/backend-core/src/security/roles.ts
index 0d33031de5..4f048c0a11 100644
--- a/packages/backend-core/src/security/roles.ts
+++ b/packages/backend-core/src/security/roles.ts
@@ -1,7 +1,12 @@
 import { BuiltinPermissionID, PermissionLevel } from "./permissions"
-import { prefixRoleID, getRoleParams, DocumentType, SEPARATOR } from "../db"
+import {
+  prefixRoleID,
+  getRoleParams,
+  DocumentType,
+  SEPARATOR,
+  doWithDB,
+} from "../db"
 import { getAppDB } from "../context"
-import { doWithDB } from "../db"
 import { Screen, Role as RoleDoc } from "@budibase/types"
 import cloneDeep from "lodash/fp/cloneDeep"
 
diff --git a/packages/backend-core/src/security/sessions.ts b/packages/backend-core/src/security/sessions.ts
index 5a535c0c46..a86a829b17 100644
--- a/packages/backend-core/src/security/sessions.ts
+++ b/packages/backend-core/src/security/sessions.ts
@@ -1,6 +1,7 @@
 const redis = require("../redis/init")
 const { v4: uuidv4 } = require("uuid")
 const { logWarn } = require("../logging")
+
 import env from "../environment"
 import {
   Session,
diff --git a/packages/backend-core/src/users/db.ts b/packages/backend-core/src/users/db.ts
index 59f698d99c..2b6fd52d44 100644
--- a/packages/backend-core/src/users/db.ts
+++ b/packages/backend-core/src/users/db.ts
@@ -1,9 +1,8 @@
 import env from "../environment"
 import * as eventHelpers from "./events"
-import * as accounts from "../accounts"
 import * as accountSdk from "../accounts"
 import * as cache from "../cache"
-import { getGlobalDB, getIdentity, getTenantId } from "../context"
+import { doInTenant, getGlobalDB, getIdentity, getTenantId } from "../context"
 import * as dbUtils from "../db"
 import { EmailUnavailableError, HTTPError } from "../errors"
 import * as platform from "../platform"
@@ -11,12 +10,10 @@ import * as sessions from "../security/sessions"
 import * as usersCore from "./users"
 import {
   Account,
-  AllDocsResponse,
   BulkUserCreated,
   BulkUserDeleted,
   isSSOAccount,
   isSSOUser,
-  RowResponse,
   SaveUserOpts,
   User,
   UserStatus,
@@ -303,7 +300,7 @@ export class UserDB {
 
   static async bulkCreate(
     newUsersRequested: User[],
-    groups: string[]
+    groups?: string[]
   ): Promise<BulkUserCreated> {
     const tenantId = getTenantId()
 
@@ -328,7 +325,7 @@ export class UserDB {
         })
         continue
       }
-      newUser.userGroups = groups
+      newUser.userGroups = groups || []
       newUsers.push(newUser)
       if (isCreator(newUser)) {
         newCreators.push(newUser)
@@ -467,7 +464,7 @@ export class UserDB {
     if (!env.SELF_HOSTED && !env.DISABLE_ACCOUNT_PORTAL) {
       // root account holder can't be deleted from inside budibase
       const email = dbUser.email
-      const account = await accounts.getAccount(email)
+      const account = await accountSdk.getAccount(email)
       if (account) {
         if (dbUser.userId === getIdentity()!._id) {
           throw new HTTPError('Please visit "Account" to delete this user', 400)
@@ -488,6 +485,37 @@ export class UserDB {
     await sessions.invalidateSessions(userId, { reason: "deletion" })
   }
 
+  static async createAdminUser(
+    email: string,
+    password: string,
+    tenantId: string,
+    opts?: { ssoId?: string; hashPassword?: boolean; requirePassword?: boolean }
+  ) {
+    const user: User = {
+      email: email,
+      password: password,
+      createdAt: Date.now(),
+      roles: {},
+      builder: {
+        global: true,
+      },
+      admin: {
+        global: true,
+      },
+      tenantId,
+    }
+    if (opts?.ssoId) {
+      user.ssoId = opts.ssoId
+    }
+    // always bust checklist beforehand, if an error occurs but can proceed, don't get
+    // stuck in a cycle
+    await cache.bustCache(cache.CacheKey.CHECKLIST)
+    return await UserDB.save(user, {
+      hashPassword: opts?.hashPassword,
+      requirePassword: opts?.requirePassword,
+    })
+  }
+
   static async getGroups(groupIds: string[]) {
     return await this.groups.getBulk(groupIds)
   }
diff --git a/packages/backend-core/src/users/lookup.ts b/packages/backend-core/src/users/lookup.ts
index 17d0e91d88..355be74dab 100644
--- a/packages/backend-core/src/users/lookup.ts
+++ b/packages/backend-core/src/users/lookup.ts
@@ -6,6 +6,7 @@ import {
 } from "@budibase/types"
 import * as dbUtils from "../db"
 import { ViewName } from "../constants"
+import { getExistingInvites } from "../cache/invite"
 
 /**
  * Apply a system-wide search on emails:
@@ -26,6 +27,9 @@ export async function searchExistingEmails(emails: string[]) {
   const existingAccounts = await getExistingAccounts(emails)
   matchedEmails.push(...existingAccounts.map(account => account.email))
 
+  const invitedEmails = await getExistingInvites(emails)
+  matchedEmails.push(...invitedEmails.map(invite => invite.email))
+
   return [...new Set(matchedEmails.map(email => email.toLowerCase()))]
 }
 
diff --git a/packages/backend-core/src/users/users.ts b/packages/backend-core/src/users/users.ts
index 9f4a41f6df..6aed45371a 100644
--- a/packages/backend-core/src/users/users.ts
+++ b/packages/backend-core/src/users/users.ts
@@ -43,7 +43,7 @@ function removeUserPassword(users: User | User[]) {
   return users
 }
 
-export const isSupportedUserSearch = (query: SearchQuery) => {
+export function isSupportedUserSearch(query: SearchQuery) {
   const allowed = [
     { op: SearchQueryOperators.STRING, key: "email" },
     { op: SearchQueryOperators.EQUAL, key: "_id" },
@@ -68,10 +68,10 @@ export const isSupportedUserSearch = (query: SearchQuery) => {
   return true
 }
 
-export const bulkGetGlobalUsersById = async (
+export async function bulkGetGlobalUsersById(
   userIds: string[],
   opts?: GetOpts
-) => {
+) {
   const db = getGlobalDB()
   let users = (
     await db.allDocs({
@@ -85,7 +85,7 @@ export const bulkGetGlobalUsersById = async (
   return users
 }
 
-export const getAllUserIds = async () => {
+export async function getAllUserIds() {
   const db = getGlobalDB()
   const startKey = `${DocumentType.USER}${SEPARATOR}`
   const response = await db.allDocs({
@@ -95,7 +95,7 @@ export const getAllUserIds = async () => {
   return response.rows.map(row => row.id)
 }
 
-export const bulkUpdateGlobalUsers = async (users: User[]) => {
+export async function bulkUpdateGlobalUsers(users: User[]) {
   const db = getGlobalDB()
   return (await db.bulkDocs(users)) as BulkDocsResponse
 }
@@ -113,10 +113,10 @@ export async function getById(id: string, opts?: GetOpts): Promise<User> {
  * Given an email address this will use a view to search through
  * all the users to find one with this email address.
  */
-export const getGlobalUserByEmail = async (
+export async function getGlobalUserByEmail(
   email: String,
   opts?: GetOpts
-): Promise<User | undefined> => {
+): Promise<User | undefined> {
   if (email == null) {
     throw "Must supply an email address to view"
   }
@@ -139,11 +139,23 @@ export const getGlobalUserByEmail = async (
   return user
 }
 
-export const searchGlobalUsersByApp = async (
+export async function doesUserExist(email: string) {
+  try {
+    const user = await getGlobalUserByEmail(email)
+    if (Array.isArray(user) || user != null) {
+      return true
+    }
+  } catch (err) {
+    return false
+  }
+  return false
+}
+
+export async function searchGlobalUsersByApp(
   appId: any,
   opts: DatabaseQueryOpts,
   getOpts?: GetOpts
-) => {
+) {
   if (typeof appId !== "string") {
     throw new Error("Must provide a string based app ID")
   }
@@ -167,10 +179,10 @@ export const searchGlobalUsersByApp = async (
   Return any user who potentially has access to the application
   Admins, developers and app users with the explicitly role.
 */
-export const searchGlobalUsersByAppAccess = async (
+export async function searchGlobalUsersByAppAccess(
   appId: any,
   opts?: { limit?: number }
-) => {
+) {
   const roleSelector = `roles.${appId}`
 
   let orQuery: any[] = [
@@ -205,7 +217,7 @@ export const searchGlobalUsersByAppAccess = async (
   return resp.rows
 }
 
-export const getGlobalUserByAppPage = (appId: string, user: User) => {
+export function getGlobalUserByAppPage(appId: string, user: User) {
   if (!user) {
     return
   }
@@ -215,11 +227,11 @@ export const getGlobalUserByAppPage = (appId: string, user: User) => {
 /**
  * Performs a starts with search on the global email view.
  */
-export const searchGlobalUsersByEmail = async (
+export async function searchGlobalUsersByEmail(
   email: string | unknown,
   opts: any,
   getOpts?: GetOpts
-) => {
+) {
   if (typeof email !== "string") {
     throw new Error("Must provide a string to search by")
   }
@@ -242,12 +254,12 @@ export const searchGlobalUsersByEmail = async (
 }
 
 const PAGE_LIMIT = 8
-export const paginatedUsers = async ({
+export async function paginatedUsers({
   bookmark,
   query,
   appId,
   limit,
-}: SearchUsersRequest = {}) => {
+}: SearchUsersRequest = {}) {
   const db = getGlobalDB()
   const pageSize = limit ?? PAGE_LIMIT
   const pageLimit = pageSize + 1
diff --git a/packages/backend-core/src/utils/Duration.ts b/packages/backend-core/src/utils/Duration.ts
index f376c2f7c7..3c7ef23b11 100644
--- a/packages/backend-core/src/utils/Duration.ts
+++ b/packages/backend-core/src/utils/Duration.ts
@@ -28,6 +28,9 @@ export class Duration {
       toMs: () => {
         return Duration.convert(from, DurationType.MILLISECONDS, duration)
       },
+      toSeconds: () => {
+        return Duration.convert(from, DurationType.SECONDS, duration)
+      },
     }
   }
 
diff --git a/packages/backend-core/src/utils/hashing.ts b/packages/backend-core/src/utils/hashing.ts
index aba11f38e6..54d7de4aba 100644
--- a/packages/backend-core/src/utils/hashing.ts
+++ b/packages/backend-core/src/utils/hashing.ts
@@ -1,4 +1,5 @@
 import env from "../environment"
+
 export * from "../docIds/newid"
 const bcrypt = env.JS_BCRYPT ? require("bcryptjs") : require("bcrypt")
 
diff --git a/packages/backend-core/src/utils/utils.ts b/packages/backend-core/src/utils/utils.ts
index 1c1ca8473b..b10d9ebdc0 100644
--- a/packages/backend-core/src/utils/utils.ts
+++ b/packages/backend-core/src/utils/utils.ts
@@ -11,6 +11,7 @@ import {
   TenantResolutionStrategy,
 } from "@budibase/types"
 import type { SetOption } from "cookies"
+
 const jwt = require("jsonwebtoken")
 
 const APP_PREFIX = DocumentType.APP + SEPARATOR
diff --git a/packages/backend-core/tests/core/users/users.spec.js b/packages/backend-core/tests/core/users/users.spec.js
index ae7109344a..f08c435b95 100644
--- a/packages/backend-core/tests/core/users/users.spec.js
+++ b/packages/backend-core/tests/core/users/users.spec.js
@@ -1,5 +1,5 @@
-const _ = require('lodash/fp')
-const {structures} = require("../../../tests")
+const _ = require("lodash/fp")
+const { structures } = require("../../../tests")
 
 jest.mock("../../../src/context")
 jest.mock("../../../src/db")
@@ -7,10 +7,9 @@ jest.mock("../../../src/db")
 const context = require("../../../src/context")
 const db = require("../../../src/db")
 
-const {getCreatorCount} = require('../../../src/users/users')
+const { getCreatorCount } = require("../../../src/users/users")
 
 describe("Users", () => {
-
   let getGlobalDBMock
   let getGlobalUserParamsMock
   let paginationMock
@@ -26,26 +25,26 @@ describe("Users", () => {
   it("Retrieves the number of creators", async () => {
     const getUsers = (offset, limit, creators = false) => {
       const range = _.range(offset, limit)
-      const opts = creators ? {builder: {global: true}} : undefined
+      const opts = creators ? { builder: { global: true } } : undefined
       return range.map(() => structures.users.user(opts))
     }
     const page1Data = getUsers(0, 8)
     const page2Data = getUsers(8, 12, true)
     getGlobalDBMock.mockImplementation(() => ({
-      name   : "fake-db",
+      name: "fake-db",
       allDocs: () => ({
-        rows: [...page1Data, ...page2Data]
-      })
+        rows: [...page1Data, ...page2Data],
+      }),
     }))
     paginationMock.mockImplementationOnce(() => ({
       data: page1Data,
       hasNextPage: true,
-      nextPage: "1"
+      nextPage: "1",
     }))
     paginationMock.mockImplementation(() => ({
       data: page2Data,
       hasNextPage: false,
-      nextPage: undefined
+      nextPage: undefined,
     }))
     const creatorsCount = await getCreatorCount()
     expect(creatorsCount).toBe(4)
diff --git a/packages/backend-core/tests/core/utilities/mocks/alerts.ts b/packages/backend-core/tests/core/utilities/mocks/alerts.ts
index 90c9759c92..0b26e98363 100644
--- a/packages/backend-core/tests/core/utilities/mocks/alerts.ts
+++ b/packages/backend-core/tests/core/utilities/mocks/alerts.ts
@@ -1,3 +1,4 @@
 jest.mock("../../../../src/logging/alerts")
 import * as _alerts from "../../../../src/logging/alerts"
+
 export const alerts = jest.mocked(_alerts)
diff --git a/packages/backend-core/tests/core/utilities/mocks/index.ts b/packages/backend-core/tests/core/utilities/mocks/index.ts
index 9a72b38ef5..8705e563cb 100644
--- a/packages/backend-core/tests/core/utilities/mocks/index.ts
+++ b/packages/backend-core/tests/core/utilities/mocks/index.ts
@@ -1,5 +1,6 @@
 jest.mock("../../../../src/accounts")
 import * as _accounts from "../../../../src/accounts"
+
 export const accounts = jest.mocked(_accounts)
 
 export * as date from "./date"
diff --git a/packages/backend-core/tests/core/utilities/structures/generator.ts b/packages/backend-core/tests/core/utilities/structures/generator.ts
index ed4dac8255..64eb5ecc97 100644
--- a/packages/backend-core/tests/core/utilities/structures/generator.ts
+++ b/packages/backend-core/tests/core/utilities/structures/generator.ts
@@ -1,2 +1,3 @@
 import Chance from "./Chance"
+
 export const generator = new Chance()
diff --git a/packages/backend-core/tests/core/utilities/structures/users.ts b/packages/backend-core/tests/core/utilities/structures/users.ts
index 66d23696e0..68ee29686c 100644
--- a/packages/backend-core/tests/core/utilities/structures/users.ts
+++ b/packages/backend-core/tests/core/utilities/structures/users.ts
@@ -12,7 +12,7 @@ import { generator } from "./generator"
 import { tenant } from "."
 
 export const newEmail = () => {
-  return `${uuid()}@test.com`
+  return `${uuid()}@example.com`
 }
 
 export const user = (userProps?: Partial<Omit<User, "userId">>): User => {
diff --git a/packages/backend-core/tests/jestSetup.ts b/packages/backend-core/tests/jestSetup.ts
index 42a24ce733..e5d144290b 100644
--- a/packages/backend-core/tests/jestSetup.ts
+++ b/packages/backend-core/tests/jestSetup.ts
@@ -9,6 +9,7 @@ mocks.fetch.enable()
 // mock all dates to 2020-01-01T00:00:00.000Z
 // use tk.reset() to use real dates in individual tests
 import tk from "timekeeper"
+
 tk.freeze(mocks.date.MOCK_DATE)
 
 if (!process.env.DEBUG) {
diff --git a/packages/bbui/src/ActionGroup/ActionGroup.svelte b/packages/bbui/src/ActionGroup/ActionGroup.svelte
index 43d8cd8de5..978e920c42 100644
--- a/packages/bbui/src/ActionGroup/ActionGroup.svelte
+++ b/packages/bbui/src/ActionGroup/ActionGroup.svelte
@@ -1,5 +1,6 @@
 <script>
   import "@spectrum-css/actiongroup/dist/index-vars.css"
+
   export let vertical = false
   export let justified = false
   export let quiet = false
diff --git a/packages/bbui/src/Avatar/Avatar.svelte b/packages/bbui/src/Avatar/Avatar.svelte
index 0faf50f55a..e1d912ffa4 100644
--- a/packages/bbui/src/Avatar/Avatar.svelte
+++ b/packages/bbui/src/Avatar/Avatar.svelte
@@ -1,5 +1,6 @@
 <script>
   import "@spectrum-css/avatar/dist/index-vars.css"
+
   let sizes = new Map([
     ["XXS", "--spectrum-alias-avatar-size-50"],
     ["XS", "--spectrum-alias-avatar-size-75"],
diff --git a/packages/bbui/src/ButtonGroup/ButtonGroup.svelte b/packages/bbui/src/ButtonGroup/ButtonGroup.svelte
index 50d0073a25..3768fc1954 100644
--- a/packages/bbui/src/ButtonGroup/ButtonGroup.svelte
+++ b/packages/bbui/src/ButtonGroup/ButtonGroup.svelte
@@ -1,5 +1,6 @@
 <script>
   import "@spectrum-css/buttongroup/dist/index-vars.css"
+
   export let vertical = false
   export let gap = ""
 
diff --git a/packages/bbui/src/Divider/Divider.svelte b/packages/bbui/src/Divider/Divider.svelte
index e4f0f2fb61..f6837ca97c 100644
--- a/packages/bbui/src/Divider/Divider.svelte
+++ b/packages/bbui/src/Divider/Divider.svelte
@@ -1,5 +1,6 @@
 <script>
   import "@spectrum-css/divider/dist/index-vars.css"
+
   export let size = "M"
 
   export let vertical = false
diff --git a/packages/bbui/src/Drawer/Drawer.svelte b/packages/bbui/src/Drawer/Drawer.svelte
index 421d12615f..8976bfb81e 100644
--- a/packages/bbui/src/Drawer/Drawer.svelte
+++ b/packages/bbui/src/Drawer/Drawer.svelte
@@ -3,8 +3,7 @@
   import Button from "../Button/Button.svelte"
   import Body from "../Typography/Body.svelte"
   import Heading from "../Typography/Heading.svelte"
-  import { setContext } from "svelte"
-  import { createEventDispatcher } from "svelte"
+  import { setContext, createEventDispatcher } from "svelte"
   import { generate } from "shortid"
 
   export let title
diff --git a/packages/bbui/src/Form/Checkbox.svelte b/packages/bbui/src/Form/Checkbox.svelte
index 6aa88f6dee..6e6cf0d8e8 100644
--- a/packages/bbui/src/Form/Checkbox.svelte
+++ b/packages/bbui/src/Form/Checkbox.svelte
@@ -10,6 +10,7 @@
   export let disabled = false
   export let error = null
   export let size = "M"
+  export let helpText = null
 
   const dispatch = createEventDispatcher()
   const onChange = e => {
@@ -18,6 +19,6 @@
   }
 </script>
 
-<Field {label} {labelPosition} {error}>
+<Field {helpText} {label} {labelPosition} {error}>
   <Checkbox {error} {disabled} {text} {value} {size} on:change={onChange} />
 </Field>
diff --git a/packages/bbui/src/Form/Combobox.svelte b/packages/bbui/src/Form/Combobox.svelte
index 343af559cb..44854d949e 100644
--- a/packages/bbui/src/Form/Combobox.svelte
+++ b/packages/bbui/src/Form/Combobox.svelte
@@ -11,6 +11,7 @@
   export let error = null
   export let placeholder = "Choose an option or type"
   export let options = []
+  export let helpText = null
   export let getOptionLabel = option => extractProperty(option, "label")
   export let getOptionValue = option => extractProperty(option, "value")
 
@@ -27,7 +28,7 @@
   }
 </script>
 
-<Field {label} {labelPosition} {error}>
+<Field {helpText} {label} {labelPosition} {error}>
   <Combobox
     {error}
     {disabled}
diff --git a/packages/bbui/src/Form/Core/Checkbox.svelte b/packages/bbui/src/Form/Core/Checkbox.svelte
index e24f5669eb..21fe00e864 100644
--- a/packages/bbui/src/Form/Core/Checkbox.svelte
+++ b/packages/bbui/src/Form/Core/Checkbox.svelte
@@ -4,7 +4,6 @@
   import { createEventDispatcher } from "svelte"
 
   export let value = false
-  export let error = null
   export let id = null
   export let text = null
   export let disabled = false
@@ -22,7 +21,6 @@
 
 <label
   class="spectrum-Checkbox spectrum-Checkbox--emphasized {sizeClass}"
-  class:is-invalid={!!error}
   class:checked={value}
   class:is-indeterminate={indeterminate}
   class:readonly
diff --git a/packages/bbui/src/Form/Core/CheckboxGroup.svelte b/packages/bbui/src/Form/Core/CheckboxGroup.svelte
index 66ac55561b..d1a107fcc5 100644
--- a/packages/bbui/src/Form/Core/CheckboxGroup.svelte
+++ b/packages/bbui/src/Form/Core/CheckboxGroup.svelte
@@ -6,7 +6,6 @@
   export let direction = "vertical"
   export let value = []
   export let options = []
-  export let error = null
   export let disabled = false
   export let readonly = false
   export let getOptionLabel = option => option
@@ -34,7 +33,6 @@
       <div
         title={getOptionLabel(option)}
         class="spectrum-Checkbox spectrum-FieldGroup-item"
-        class:is-invalid={!!error}
         class:readonly
       >
         <label
diff --git a/packages/bbui/src/Form/Core/Combobox.svelte b/packages/bbui/src/Form/Core/Combobox.svelte
index b1b264a9b7..572d82ecf8 100644
--- a/packages/bbui/src/Form/Core/Combobox.svelte
+++ b/packages/bbui/src/Form/Core/Combobox.svelte
@@ -10,7 +10,6 @@
   export let placeholder = "Choose an option or type"
   export let disabled = false
   export let readonly = false
-  export let error = null
   export let options = []
   export let getOptionLabel = option => option
   export let getOptionValue = option => option
@@ -39,12 +38,10 @@
 <div
   class="spectrum-InputGroup"
   class:is-focused={open || focus}
-  class:is-invalid={!!error}
   class:is-disabled={disabled}
 >
   <div
     class="spectrum-Textfield spectrum-InputGroup-textfield"
-    class:is-invalid={!!error}
     class:is-disabled={disabled}
     class:is-focused={open || focus}
   >
diff --git a/packages/bbui/src/Form/Core/DatePicker.svelte b/packages/bbui/src/Form/Core/DatePicker.svelte
index 786aee40b6..607899683a 100644
--- a/packages/bbui/src/Form/Core/DatePicker.svelte
+++ b/packages/bbui/src/Form/Core/DatePicker.svelte
@@ -10,7 +10,6 @@
   export let id = null
   export let disabled = false
   export let readonly = false
-  export let error = null
   export let enableTime = true
   export let value = null
   export let placeholder = null
@@ -188,7 +187,6 @@
     <div
       id={flatpickrId}
       class:is-disabled={disabled || readonly}
-      class:is-invalid={!!error}
       class="flatpickr spectrum-InputGroup spectrum-Datepicker"
       class:is-focused={open}
       aria-readonly="false"
@@ -199,17 +197,7 @@
         on:click={flatpickr?.open}
         class="spectrum-Textfield spectrum-InputGroup-textfield"
         class:is-disabled={disabled}
-        class:is-invalid={!!error}
       >
-        {#if !!error}
-          <svg
-            class="spectrum-Icon spectrum-Icon--sizeM spectrum-Textfield-validationIcon"
-            focusable="false"
-            aria-hidden="true"
-          >
-            <use xlink:href="#spectrum-icon-18-Alert" />
-          </svg>
-        {/if}
         <input
           {disabled}
           {readonly}
@@ -227,7 +215,6 @@
         class="spectrum-Picker spectrum-Picker--sizeM spectrum-InputGroup-button"
         tabindex="-1"
         class:is-disabled={disabled}
-        class:is-invalid={!!error}
         on:click={flatpickr?.open}
       >
         <svg
diff --git a/packages/bbui/src/Form/Core/Dropzone.svelte b/packages/bbui/src/Form/Core/Dropzone.svelte
index bfa0285250..dc89476db2 100644
--- a/packages/bbui/src/Form/Core/Dropzone.svelte
+++ b/packages/bbui/src/Form/Core/Dropzone.svelte
@@ -22,7 +22,6 @@
   export let handleFileTooLarge = null
   export let handleTooManyFiles = null
   export let gallery = true
-  export let error = null
   export let fileTags = []
   export let maximum = null
   export let extensions = "*"
@@ -222,7 +221,6 @@
   {#if showDropzone}
     <div
       class="spectrum-Dropzone"
-      class:is-invalid={!!error}
       class:disabled
       role="region"
       tabindex="0"
@@ -351,9 +349,6 @@
   .spectrum-Dropzone {
     user-select: none;
   }
-  .spectrum-Dropzone.is-invalid {
-    border-color: var(--spectrum-global-color-red-400);
-  }
   input[type="file"] {
     display: none;
   }
diff --git a/packages/bbui/src/Form/Core/InputDropdown.svelte b/packages/bbui/src/Form/Core/InputDropdown.svelte
index 944d79655d..153501ce5a 100644
--- a/packages/bbui/src/Form/Core/InputDropdown.svelte
+++ b/packages/bbui/src/Form/Core/InputDropdown.svelte
@@ -14,7 +14,6 @@
   export let disabled = false
   export let readonly = false
   export let updateOnChange = true
-  export let error = null
   export let options = []
   export let getOptionLabel = option => extractProperty(option, "label")
   export let getOptionValue = option => extractProperty(option, "value")
@@ -111,27 +110,12 @@
   }
 </script>
 
-<div
-  class="spectrum-InputGroup"
-  class:is-invalid={!!error}
-  class:is-disabled={disabled}
->
+<div class="spectrum-InputGroup" class:is-disabled={disabled}>
   <div
     class="spectrum-Textfield spectrum-InputGroup-textfield"
-    class:is-invalid={!!error}
     class:is-disabled={disabled}
     class:is-focused={focus}
   >
-    {#if error}
-      <svg
-        class="spectrum-Icon spectrum-Icon--sizeM spectrum-Textfield-validationIcon"
-        focusable="false"
-        aria-hidden="true"
-      >
-        <use xlink:href="#spectrum-icon-18-Alert" />
-      </svg>
-    {/if}
-
     <input
       {id}
       on:click
diff --git a/packages/bbui/src/Form/Core/Multiselect.svelte b/packages/bbui/src/Form/Core/Multiselect.svelte
index 8d72dd0652..d5d6515d2d 100644
--- a/packages/bbui/src/Form/Core/Multiselect.svelte
+++ b/packages/bbui/src/Form/Core/Multiselect.svelte
@@ -6,7 +6,6 @@
   export let id = null
   export let placeholder = null
   export let disabled = false
-  export let error = null
   export let options = []
   export let getOptionLabel = option => option
   export let getOptionValue = option => option
@@ -84,7 +83,6 @@
 <Picker
   on:loadMore
   {id}
-  {error}
   {disabled}
   {readonly}
   {fieldText}
diff --git a/packages/bbui/src/Form/Core/Picker.svelte b/packages/bbui/src/Form/Core/Picker.svelte
index aa06d5f748..6361b345d1 100644
--- a/packages/bbui/src/Form/Core/Picker.svelte
+++ b/packages/bbui/src/Form/Core/Picker.svelte
@@ -14,7 +14,6 @@
 
   export let id = null
   export let disabled = false
-  export let error = null
   export let fieldText = ""
   export let fieldIcon = ""
   export let fieldColour = ""
@@ -113,7 +112,6 @@
   class="spectrum-Picker spectrum-Picker--sizeM"
   class:spectrum-Picker--quiet={quiet}
   {disabled}
-  class:is-invalid={!!error}
   class:is-open={open}
   aria-haspopup="listbox"
   on:click={onClick}
@@ -142,16 +140,6 @@
   >
     {fieldText}
   </span>
-  {#if error}
-    <svg
-      class="spectrum-Icon spectrum-Icon--sizeM spectrum-Picker-validationIcon"
-      focusable="false"
-      aria-hidden="true"
-      aria-label="Folder"
-    >
-      <use xlink:href="#spectrum-icon-18-Alert" />
-    </svg>
-  {/if}
   <svg
     class="spectrum-Icon spectrum-UIIcon-ChevronDown100 spectrum-Picker-menuIcon"
     focusable="false"
diff --git a/packages/bbui/src/Form/Core/PickerDropdown.svelte b/packages/bbui/src/Form/Core/PickerDropdown.svelte
index b0a884738f..e22a30a1d3 100644
--- a/packages/bbui/src/Form/Core/PickerDropdown.svelte
+++ b/packages/bbui/src/Form/Core/PickerDropdown.svelte
@@ -16,7 +16,6 @@
   export let id = null
   export let placeholder = "Choose an option or type"
   export let disabled = false
-  export let error = null
   export let secondaryOptions = []
   export let primaryOptions = []
   export let secondaryFieldText = ""
@@ -105,14 +104,9 @@
   }
 </script>
 
-<div
-  class="spectrum-InputGroup"
-  class:is-invalid={!!error}
-  class:is-disabled={disabled}
->
+<div class="spectrum-InputGroup" class:is-disabled={disabled}>
   <div
     class="spectrum-Textfield spectrum-InputGroup-textfield"
-    class:is-invalid={!!error}
     class:is-disabled={disabled}
     class:is-focused={focus}
     class:is-full-width={!secondaryOptions.length}
diff --git a/packages/bbui/src/Form/Core/RadioGroup.svelte b/packages/bbui/src/Form/Core/RadioGroup.svelte
index 648c46b5fc..04007b58b1 100644
--- a/packages/bbui/src/Form/Core/RadioGroup.svelte
+++ b/packages/bbui/src/Form/Core/RadioGroup.svelte
@@ -6,7 +6,6 @@
   export let direction = "vertical"
   export let value = null
   export let options = []
-  export let error = null
   export let disabled = false
   export let readonly = false
   export let getOptionLabel = option => option
@@ -40,7 +39,6 @@
       <div
         title={getOptionTitle(option)}
         class="spectrum-Radio spectrum-FieldGroup-item spectrum-Radio--emphasized"
-        class:is-invalid={!!error}
         class:readonly
       >
         <input
diff --git a/packages/bbui/src/Form/Core/RichTextField.svelte b/packages/bbui/src/Form/Core/RichTextField.svelte
index 3e0b0caf4d..08032059e7 100644
--- a/packages/bbui/src/Form/Core/RichTextField.svelte
+++ b/packages/bbui/src/Form/Core/RichTextField.svelte
@@ -5,14 +5,13 @@
   export let placeholder = null
   export let disabled = false
   export let readonly = false
-  export let error = null
   export let height = null
   export let id = null
   export let fullScreenOffset = null
   export let easyMDEOptions = null
 </script>
 
-<div class:error>
+<div>
   <MarkdownEditor
     {value}
     {placeholder}
@@ -27,18 +26,4 @@
 </div>
 
 <style>
-  .error :global(.EasyMDEContainer .editor-toolbar) {
-    border-top-color: var(--spectrum-semantic-negative-color-default);
-    border-left-color: var(--spectrum-semantic-negative-color-default);
-    border-right-color: var(--spectrum-semantic-negative-color-default);
-  }
-  .error :global(.EasyMDEContainer .CodeMirror) {
-    border-bottom-color: var(--spectrum-semantic-negative-color-default);
-    border-left-color: var(--spectrum-semantic-negative-color-default);
-    border-right-color: var(--spectrum-semantic-negative-color-default);
-  }
-  .error :global(.EasyMDEContainer .editor-preview-side) {
-    border-bottom-color: var(--spectrum-semantic-negative-color-default);
-    border-right-color: var(--spectrum-semantic-negative-color-default);
-  }
 </style>
diff --git a/packages/bbui/src/Form/Core/Select.svelte b/packages/bbui/src/Form/Core/Select.svelte
index a85d4094c5..e928ae689d 100644
--- a/packages/bbui/src/Form/Core/Select.svelte
+++ b/packages/bbui/src/Form/Core/Select.svelte
@@ -6,7 +6,6 @@
   export let id = null
   export let placeholder = "Choose an option"
   export let disabled = false
-  export let error = null
   export let options = []
   export let getOptionLabel = option => option
   export let getOptionValue = option => option
@@ -71,7 +70,6 @@
   on:loadMore
   {quiet}
   {id}
-  {error}
   {disabled}
   {readonly}
   {fieldText}
diff --git a/packages/bbui/src/Form/Core/Stepper.svelte b/packages/bbui/src/Form/Core/Stepper.svelte
index 895dc2d3de..816add249f 100644
--- a/packages/bbui/src/Form/Core/Stepper.svelte
+++ b/packages/bbui/src/Form/Core/Stepper.svelte
@@ -7,7 +7,6 @@
   export let value = null
   export let placeholder = null
   export let disabled = false
-  export let error = null
   export let id = null
   export let readonly = false
   export let updateOnChange = true
@@ -98,20 +97,9 @@
 <div
   class="spectrum-Stepper"
   class:spectrum-Stepper--quiet={quiet}
-  class:is-invalid={!!error}
   class:is-disabled={disabled}
   class:is-focused={focus}
 >
-  {#if error}
-    <svg
-      class="spectrum-Icon spectrum-Icon--sizeM spectrum-Textfield-validationIcon"
-      focusable="false"
-      aria-hidden="true"
-    >
-      <use xlink:href="#spectrum-icon-18-Alert" />
-    </svg>
-  {/if}
-
   <div class="spectrum-Textfield spectrum-Stepper-textfield">
     <input
       {disabled}
diff --git a/packages/bbui/src/Form/Core/TextArea.svelte b/packages/bbui/src/Form/Core/TextArea.svelte
index be7eed466d..9b49f54f58 100644
--- a/packages/bbui/src/Form/Core/TextArea.svelte
+++ b/packages/bbui/src/Form/Core/TextArea.svelte
@@ -6,7 +6,6 @@
   export let placeholder = null
   export let disabled = false
   export let readonly = false
-  export let error = null
   export let id = null
   export let height = null
   export let minHeight = null
@@ -41,20 +40,9 @@
 <div
   style={`${heightString}${minHeightString}`}
   class="spectrum-Textfield spectrum-Textfield--multiline"
-  class:is-invalid={!!error}
   class:is-disabled={disabled}
   class:is-focused={focus}
 >
-  {#if error}
-    <svg
-      class="spectrum-Icon spectrum-Icon--sizeM
-      spectrum-Textfield-validationIcon"
-      focusable="false"
-      aria-hidden="true"
-    >
-      <use xlink:href="#spectrum-icon-18-Alert" />
-    </svg>
-  {/if}
   <!-- prettier-ignore -->
   <textarea
     bind:this={textarea}
diff --git a/packages/bbui/src/Form/Core/TextField.svelte b/packages/bbui/src/Form/Core/TextField.svelte
index 008007256a..3335d3567b 100644
--- a/packages/bbui/src/Form/Core/TextField.svelte
+++ b/packages/bbui/src/Form/Core/TextField.svelte
@@ -6,7 +6,6 @@
   export let placeholder = null
   export let type = "text"
   export let disabled = false
-  export let error = null
   export let id = null
   export let readonly = false
   export let updateOnChange = true
@@ -79,19 +78,9 @@
 <div
   class="spectrum-Textfield"
   class:spectrum-Textfield--quiet={quiet}
-  class:is-invalid={!!error}
   class:is-disabled={disabled}
   class:is-focused={focus}
 >
-  {#if error}
-    <svg
-      class="spectrum-Icon spectrum-Icon--sizeM spectrum-Textfield-validationIcon"
-      focusable="false"
-      aria-hidden="true"
-    >
-      <use xlink:href="#spectrum-icon-18-Alert" />
-    </svg>
-  {/if}
   <input
     bind:this={field}
     {disabled}
diff --git a/packages/bbui/src/Form/DatePicker.svelte b/packages/bbui/src/Form/DatePicker.svelte
index f17871a576..fe861f59ec 100644
--- a/packages/bbui/src/Form/DatePicker.svelte
+++ b/packages/bbui/src/Form/DatePicker.svelte
@@ -16,6 +16,7 @@
   export let appendTo = undefined
   export let ignoreTimezones = false
   export let range = false
+  export let helpText = null
   const dispatch = createEventDispatcher()
 
   const onChange = e => {
@@ -30,7 +31,7 @@
   }
 </script>
 
-<Field {label} {labelPosition} {error}>
+<Field {helpText} {label} {labelPosition} {error}>
   <DatePicker
     {error}
     {disabled}
diff --git a/packages/bbui/src/Form/Dropzone.svelte b/packages/bbui/src/Form/Dropzone.svelte
index 2a6fa1c57b..5a624e523c 100644
--- a/packages/bbui/src/Form/Dropzone.svelte
+++ b/packages/bbui/src/Form/Dropzone.svelte
@@ -17,6 +17,7 @@
   export let fileTags = []
   export let maximum = undefined
   export let compact = false
+  export let helpText = null
 
   const dispatch = createEventDispatcher()
   const onChange = e => {
@@ -25,7 +26,7 @@
   }
 </script>
 
-<Field {label} {labelPosition} {error}>
+<Field {helpText} {label} {labelPosition} {error}>
   <CoreDropzone
     {error}
     {disabled}
diff --git a/packages/bbui/src/Form/EnvDropdown.svelte b/packages/bbui/src/Form/EnvDropdown.svelte
index b5db23a870..4045d9e6df 100644
--- a/packages/bbui/src/Form/EnvDropdown.svelte
+++ b/packages/bbui/src/Form/EnvDropdown.svelte
@@ -16,6 +16,7 @@
   export let autofocus
   export let variables
   export let showModal
+  export let helpText = null
   export let environmentVariablesEnabled
   export let handleUpgradePanel
   const dispatch = createEventDispatcher()
@@ -25,7 +26,7 @@
   }
 </script>
 
-<Field {label} {labelPosition} {error}>
+<Field {helpText} {label} {labelPosition} {error}>
   <EnvDropdown
     {updateOnChange}
     {error}
diff --git a/packages/bbui/src/Form/Field.svelte b/packages/bbui/src/Form/Field.svelte
index 5033c28f7d..0c031b0235 100644
--- a/packages/bbui/src/Form/Field.svelte
+++ b/packages/bbui/src/Form/Field.svelte
@@ -1,11 +1,13 @@
 <script>
   import "@spectrum-css/fieldlabel/dist/index-vars.css"
   import FieldLabel from "./FieldLabel.svelte"
+  import Icon from "../Icon/Icon.svelte"
 
   export let id = null
   export let label = null
   export let labelPosition = "above"
   export let error = null
+  export let helpText = null
   export let tooltip = ""
 </script>
 
@@ -17,6 +19,10 @@
     <slot />
     {#if error}
       <div class="error">{error}</div>
+    {:else if helpText}
+      <div class="helpText">
+        <Icon name="HelpOutline" /> <span>{helpText}</span>
+      </div>
     {/if}
   </div>
 </div>
@@ -39,4 +45,21 @@
     font-size: var(--spectrum-global-dimension-font-size-75);
     margin-top: var(--spectrum-global-dimension-size-75);
   }
+
+  .helpText {
+    display: flex;
+    margin-top: var(--spectrum-global-dimension-size-75);
+    align-items: center;
+  }
+
+  .helpText :global(svg) {
+    width: 14px;
+    color: var(--grey-5);
+    margin-right: 6px;
+  }
+
+  .helpText span {
+    color: var(--grey-7);
+    font-size: var(--spectrum-global-dimension-font-size-75);
+  }
 </style>
diff --git a/packages/bbui/src/Form/File.svelte b/packages/bbui/src/Form/File.svelte
index 03cacea814..4c00cafc35 100644
--- a/packages/bbui/src/Form/File.svelte
+++ b/packages/bbui/src/Form/File.svelte
@@ -14,6 +14,7 @@
   export let title = null
   export let value = null
   export let tooltip = null
+  export let helpText = null
 
   const dispatch = createEventDispatcher()
   const onChange = e => {
@@ -22,7 +23,7 @@
   }
 </script>
 
-<Field {label} {labelPosition} {error} {tooltip}>
+<Field {helpText} {label} {labelPosition} {error} {tooltip}>
   <CoreFile
     {error}
     {disabled}
diff --git a/packages/bbui/src/Form/Input.svelte b/packages/bbui/src/Form/Input.svelte
index d3cb13e731..47962720af 100644
--- a/packages/bbui/src/Form/Input.svelte
+++ b/packages/bbui/src/Form/Input.svelte
@@ -15,6 +15,7 @@
   export let quiet = false
   export let autofocus
   export let autocomplete
+  export let helpText = null
 
   const dispatch = createEventDispatcher()
   const onChange = e => {
@@ -23,7 +24,7 @@
   }
 </script>
 
-<Field {label} {labelPosition} {error}>
+<Field {helpText} {label} {labelPosition} {error}>
   <TextField
     {updateOnChange}
     {error}
diff --git a/packages/bbui/src/Form/InputDropdown.svelte b/packages/bbui/src/Form/InputDropdown.svelte
index 12db30a43a..93766495b8 100644
--- a/packages/bbui/src/Form/InputDropdown.svelte
+++ b/packages/bbui/src/Form/InputDropdown.svelte
@@ -15,6 +15,7 @@
   export let updateOnChange = true
   export let quiet = false
   export let autofocus
+  export let helpText = null
   export let options = []
 
   const dispatch = createEventDispatcher()
@@ -29,7 +30,7 @@
   }
 </script>
 
-<Field {label} {labelPosition} {error}>
+<Field {helpText} {label} {labelPosition} {error}>
   <InputDropdown
     {updateOnChange}
     {error}
diff --git a/packages/bbui/src/Form/Multiselect.svelte b/packages/bbui/src/Form/Multiselect.svelte
index 3ae56693c7..b0246c8530 100644
--- a/packages/bbui/src/Form/Multiselect.svelte
+++ b/packages/bbui/src/Form/Multiselect.svelte
@@ -18,6 +18,7 @@
   export let autocomplete = false
   export let searchTerm = null
   export let customPopoverHeight
+  export let helpText = null
 
   const dispatch = createEventDispatcher()
   const onChange = e => {
@@ -26,7 +27,7 @@
   }
 </script>
 
-<Field {label} {labelPosition} {error}>
+<Field {helpText} {label} {labelPosition} {error}>
   <Multiselect
     {error}
     {disabled}
diff --git a/packages/bbui/src/Form/PickerDropdown.svelte b/packages/bbui/src/Form/PickerDropdown.svelte
index 156ec9bc7e..bf490ff2d7 100644
--- a/packages/bbui/src/Form/PickerDropdown.svelte
+++ b/packages/bbui/src/Form/PickerDropdown.svelte
@@ -26,6 +26,7 @@
   export let secondaryOptions = []
   export let searchTerm
   export let showClearIcon = true
+  export let helpText = null
 
   let primaryLabel
   let secondaryLabel
@@ -93,7 +94,7 @@
   }
 </script>
 
-<Field {label} {labelPosition} {error}>
+<Field {helpText} {label} {labelPosition} {error}>
   <PickerDropdown
     {searchTerm}
     {autocomplete}
diff --git a/packages/bbui/src/Form/RadioGroup.svelte b/packages/bbui/src/Form/RadioGroup.svelte
index 843a3657b4..f261973e1f 100644
--- a/packages/bbui/src/Form/RadioGroup.svelte
+++ b/packages/bbui/src/Form/RadioGroup.svelte
@@ -13,6 +13,7 @@
   export let getOptionLabel = option => extractProperty(option, "label")
   export let getOptionValue = option => extractProperty(option, "value")
   export let getOptionTitle = option => extractProperty(option, "label")
+  export let helpText = null
 
   const dispatch = createEventDispatcher()
   const onChange = e => {
@@ -27,7 +28,7 @@
   }
 </script>
 
-<Field {label} {labelPosition} {error}>
+<Field {helpText} {label} {labelPosition} {error}>
   <RadioGroup
     {error}
     {disabled}
diff --git a/packages/bbui/src/Form/RichTextField.svelte b/packages/bbui/src/Form/RichTextField.svelte
index 275242df49..527710e010 100644
--- a/packages/bbui/src/Form/RichTextField.svelte
+++ b/packages/bbui/src/Form/RichTextField.svelte
@@ -13,6 +13,7 @@
   export let id = null
   export let fullScreenOffset = null
   export let easyMDEOptions = null
+  export let helpText = null
 
   const dispatch = createEventDispatcher()
   const onChange = e => {
@@ -21,7 +22,7 @@
   }
 </script>
 
-<Field {label} {labelPosition} {error}>
+<Field {helpText} {label} {labelPosition} {error}>
   <RichTextField
     {error}
     {disabled}
diff --git a/packages/bbui/src/Form/Search.svelte b/packages/bbui/src/Form/Search.svelte
index 74ffeeb22a..2fbda275eb 100644
--- a/packages/bbui/src/Form/Search.svelte
+++ b/packages/bbui/src/Form/Search.svelte
@@ -11,6 +11,7 @@
   export let updateOnChange = true
   export let quiet = false
   export let inputRef
+  export let helpText = null
 
   const dispatch = createEventDispatcher()
   const onChange = e => {
@@ -19,7 +20,7 @@
   }
 </script>
 
-<Field {label} {labelPosition}>
+<Field {helpText} {label} {labelPosition}>
   <Search
     {updateOnChange}
     {disabled}
diff --git a/packages/bbui/src/Form/Select.svelte b/packages/bbui/src/Form/Select.svelte
index a9214320f9..f9d9532ba5 100644
--- a/packages/bbui/src/Form/Select.svelte
+++ b/packages/bbui/src/Form/Select.svelte
@@ -26,6 +26,7 @@
   export let align
   export let footer = null
   export let tag = null
+  export let helpText = null
   const dispatch = createEventDispatcher()
   const onChange = e => {
     value = e.detail
@@ -40,7 +41,7 @@
   }
 </script>
 
-<Field {label} {labelPosition} {error} {tooltip}>
+<Field {helpText} {label} {labelPosition} {error} {tooltip}>
   <Select
     {quiet}
     {error}
diff --git a/packages/bbui/src/Form/Slider.svelte b/packages/bbui/src/Form/Slider.svelte
index 34b2251b35..192f4bc9b1 100644
--- a/packages/bbui/src/Form/Slider.svelte
+++ b/packages/bbui/src/Form/Slider.svelte
@@ -11,6 +11,7 @@
   export let step = 1
   export let disabled = false
   export let error = null
+  export let helpText = null
 
   const dispatch = createEventDispatcher()
   const onChange = e => {
@@ -19,6 +20,6 @@
   }
 </script>
 
-<Field {label} {labelPosition} {error}>
+<Field {helpText} {label} {labelPosition} {error}>
   <Slider {disabled} {value} {min} {max} {step} on:change={onChange} />
 </Field>
diff --git a/packages/bbui/src/Form/Stepper.svelte b/packages/bbui/src/Form/Stepper.svelte
index 9eff2e368e..509aa2178a 100644
--- a/packages/bbui/src/Form/Stepper.svelte
+++ b/packages/bbui/src/Form/Stepper.svelte
@@ -15,6 +15,7 @@
   export let min = null
   export let max = null
   export let step = 1
+  export let helpText = null
 
   const dispatch = createEventDispatcher()
   const onChange = e => {
@@ -23,7 +24,7 @@
   }
 </script>
 
-<Field {label} {labelPosition} {error}>
+<Field {helpText} {label} {labelPosition} {error}>
   <Stepper
     {updateOnChange}
     {error}
diff --git a/packages/bbui/src/Form/TextArea.svelte b/packages/bbui/src/Form/TextArea.svelte
index c9451a40cd..15e91d72c1 100644
--- a/packages/bbui/src/Form/TextArea.svelte
+++ b/packages/bbui/src/Form/TextArea.svelte
@@ -12,6 +12,7 @@
   export let getCaretPosition = null
   export let height = null
   export let minHeight = null
+  export let helpText = null
 
   const dispatch = createEventDispatcher()
   const onChange = e => {
@@ -20,7 +21,7 @@
   }
 </script>
 
-<Field {label} {labelPosition} {error}>
+<Field {helpText} {label} {labelPosition} {error}>
   <TextArea
     bind:getCaretPosition
     {error}
diff --git a/packages/bbui/src/Form/Toggle.svelte b/packages/bbui/src/Form/Toggle.svelte
index 8cc6506651..d452aa8f80 100644
--- a/packages/bbui/src/Form/Toggle.svelte
+++ b/packages/bbui/src/Form/Toggle.svelte
@@ -9,6 +9,7 @@
   export let text = null
   export let disabled = false
   export let error = null
+  export let helpText = null
 
   const dispatch = createEventDispatcher()
   const onChange = e => {
@@ -17,6 +18,6 @@
   }
 </script>
 
-<Field {label} {labelPosition} {error}>
+<Field {helpText} {label} {labelPosition} {error}>
   <Switch {error} {disabled} {text} {value} on:change={onChange} />
 </Field>
diff --git a/packages/bbui/src/Link/Link.svelte b/packages/bbui/src/Link/Link.svelte
index 5eaeceaf76..58f999473a 100644
--- a/packages/bbui/src/Link/Link.svelte
+++ b/packages/bbui/src/Link/Link.svelte
@@ -16,10 +16,9 @@
 
   const dispatch = createEventDispatcher()
 
-  const onClick = e => {
+  const onClick = () => {
     if (!disabled) {
       dispatch("click")
-      e.stopPropagation()
     }
   }
 </script>
diff --git a/packages/bbui/src/Modal/Content.svelte b/packages/bbui/src/Modal/Content.svelte
index 550994ef7c..485229acd6 100644
--- a/packages/bbui/src/Modal/Content.svelte
+++ b/packages/bbui/src/Modal/Content.svelte
@@ -1,5 +1,6 @@
 <script>
   import Input from "../Form/Input.svelte"
+
   let value = ""
 </script>
 
diff --git a/packages/bbui/src/OptionSelectDnD/OptionSelectDnD.svelte b/packages/bbui/src/OptionSelectDnD/OptionSelectDnD.svelte
index 8b13135b33..d4ecda246d 100644
--- a/packages/bbui/src/OptionSelectDnD/OptionSelectDnD.svelte
+++ b/packages/bbui/src/OptionSelectDnD/OptionSelectDnD.svelte
@@ -4,6 +4,7 @@
   import Icon from "../Icon/Icon.svelte"
   import Popover from "../Popover/Popover.svelte"
   import { onMount } from "svelte"
+
   const flipDurationMs = 150
 
   export let constraints
diff --git a/packages/bbui/src/Popover/Popover.svelte b/packages/bbui/src/Popover/Popover.svelte
index 4c4b818440..a68430e973 100644
--- a/packages/bbui/src/Popover/Popover.svelte
+++ b/packages/bbui/src/Popover/Popover.svelte
@@ -1,11 +1,10 @@
 <script>
   import "@spectrum-css/popover/dist/index-vars.css"
   import Portal from "svelte-portal"
-  import { createEventDispatcher } from "svelte"
+  import { createEventDispatcher, getContext } from "svelte"
   import positionDropdown from "../Actions/position_dropdown"
   import clickOutside from "../Actions/click_outside"
   import { fly } from "svelte/transition"
-  import { getContext } from "svelte"
   import Context from "../context"
 
   const dispatch = createEventDispatcher()
diff --git a/packages/bbui/src/SideNavigation/Item.svelte b/packages/bbui/src/SideNavigation/Item.svelte
index dab88b05bc..40d0af0d6e 100644
--- a/packages/bbui/src/SideNavigation/Item.svelte
+++ b/packages/bbui/src/SideNavigation/Item.svelte
@@ -1,7 +1,9 @@
 <script>
   import { getContext } from "svelte"
+
   const multilevel = getContext("sidenav-type")
   import Badge from "../Badge/Badge.svelte"
+
   export let href = ""
   export let external = false
   export let heading = ""
diff --git a/packages/bbui/src/SideNavigation/Navigation.svelte b/packages/bbui/src/SideNavigation/Navigation.svelte
index d4d090ec1f..c13b6b56c8 100644
--- a/packages/bbui/src/SideNavigation/Navigation.svelte
+++ b/packages/bbui/src/SideNavigation/Navigation.svelte
@@ -1,6 +1,7 @@
 <script>
   import { setContext } from "svelte"
   import "@spectrum-css/sidenav/dist/index-vars.css"
+
   export let multilevel = false
   setContext("sidenav-type", multilevel)
 </script>
diff --git a/packages/bbui/src/Table/ArrayRenderer.svelte b/packages/bbui/src/Table/ArrayRenderer.svelte
index 637454dbca..303397054a 100644
--- a/packages/bbui/src/Table/ArrayRenderer.svelte
+++ b/packages/bbui/src/Table/ArrayRenderer.svelte
@@ -1,6 +1,7 @@
 <script>
   import "@spectrum-css/label/dist/index-vars.css"
   import Badge from "../Badge/Badge.svelte"
+
   export let value
 
   const displayLimit = 5
diff --git a/packages/bbui/src/Tabs/Tab.svelte b/packages/bbui/src/Tabs/Tab.svelte
index 0e6752afae..44bc2cfe2a 100644
--- a/packages/bbui/src/Tabs/Tab.svelte
+++ b/packages/bbui/src/Tabs/Tab.svelte
@@ -1,6 +1,7 @@
 <script>
   import { getContext, onMount, createEventDispatcher } from "svelte"
   import Portal from "svelte-portal"
+
   export let title
   export let icon = ""
   export let id
diff --git a/packages/bbui/src/helpers.js b/packages/bbui/src/helpers.js
index 32030322d9..abb7c9a8aa 100644
--- a/packages/bbui/src/helpers.js
+++ b/packages/bbui/src/helpers.js
@@ -1,4 +1,5 @@
 import { helpers } from "@budibase/shared-core"
+
 export const deepGet = helpers.deepGet
 
 /**
diff --git a/packages/builder/src/builderStore/dataBinding.js b/packages/builder/src/builderStore/dataBinding.js
index 8445bf9e6d..85ac822006 100644
--- a/packages/builder/src/builderStore/dataBinding.js
+++ b/packages/builder/src/builderStore/dataBinding.js
@@ -228,7 +228,12 @@ export const getContextProviderComponents = (
 /**
  * Gets all data provider components above a component.
  */
-export const getActionProviderComponents = (asset, componentId, actionType) => {
+export const getActionProviders = (
+  asset,
+  componentId,
+  actionType,
+  options = { includeSelf: false }
+) => {
   if (!asset || !componentId) {
     return []
   }
@@ -236,13 +241,30 @@ export const getActionProviderComponents = (asset, componentId, actionType) => {
   // Get the component tree leading up to this component, ignoring the component
   // itself
   const path = findComponentPath(asset.props, componentId)
-  path.pop()
+  if (!options?.includeSelf) {
+    path.pop()
+  }
 
-  // Filter by only data provider components
-  return path.filter(component => {
+  // Find matching contexts and generate bindings
+  let providers = []
+  path.forEach(component => {
     const def = store.actions.components.getDefinition(component._component)
-    return def?.actions?.includes(actionType)
+    const actions = (def?.actions || []).map(action => {
+      return typeof action === "string" ? { type: action } : action
+    })
+    const action = actions.find(x => x.type === actionType)
+    if (action) {
+      let runtimeBinding = component._id
+      if (action.suffix) {
+        runtimeBinding += `-${action.suffix}`
+      }
+      providers.push({
+        readableBinding: component._instanceName,
+        runtimeBinding,
+      })
+    }
   })
+  return providers
 }
 
 /**
@@ -1068,17 +1090,18 @@ export const removeBindings = (obj, replacement = "Invalid binding") => {
  * When converting from readable to runtime it can sometimes add too many square brackets,
  * this makes sure that doesn't happen.
  */
-const shouldReplaceBinding = (currentValue, convertFrom, convertTo) => {
-  if (!currentValue?.includes(convertFrom)) {
+const shouldReplaceBinding = (currentValue, from, convertTo, binding) => {
+  if (!currentValue?.includes(from)) {
     return false
   }
   if (convertTo === "readableBinding") {
-    return true
+    // Dont replace if the value already matches the readable binding
+    return currentValue.indexOf(binding.readableBinding) === -1
   }
   // remove all the spaces, if the input is surrounded by spaces e.g. [ Auto ID ] then
   // this makes sure it is detected
   const noSpaces = currentValue.replace(/\s+/g, "")
-  const fromNoSpaces = convertFrom.replace(/\s+/g, "")
+  const fromNoSpaces = from.replace(/\s+/g, "")
   const invalids = [
     `[${fromNoSpaces}]`,
     `"${fromNoSpaces}"`,
@@ -1130,8 +1153,11 @@ const bindingReplacement = (
     // in the search, working from longest to shortest so always use best match first
     let searchString = newBoundValue
     for (let from of convertFromProps) {
-      if (isJS || shouldReplaceBinding(newBoundValue, from, convertTo)) {
-        const binding = bindableProperties.find(el => el[convertFrom] === from)
+      const binding = bindableProperties.find(el => el[convertFrom] === from)
+      if (
+        isJS ||
+        shouldReplaceBinding(newBoundValue, from, convertTo, binding)
+      ) {
         let idx
         do {
           // see if any instances of this binding exist in the search string
diff --git a/packages/builder/src/builderStore/index.js b/packages/builder/src/builderStore/index.js
index 8b06e21d68..ece17cb46f 100644
--- a/packages/builder/src/builderStore/index.js
+++ b/packages/builder/src/builderStore/index.js
@@ -4,11 +4,10 @@ import { getTemporalStore } from "./store/temporal"
 import { getThemeStore } from "./store/theme"
 import { getUserStore } from "./store/users"
 import { getDeploymentStore } from "./store/deployments"
-import { derived } from "svelte/store"
+import { derived, get } from "svelte/store"
 import { findComponent, findComponentPath } from "./componentUtils"
 import { RoleUtils } from "@budibase/frontend-core"
 import { createHistoryStore } from "builderStore/store/history"
-import { get } from "svelte/store"
 
 export const store = getFrontendStore()
 export const automationStore = getAutomationStore()
diff --git a/packages/builder/src/builderStore/tests/dataBinding.test.js b/packages/builder/src/builderStore/tests/dataBinding.test.js
new file mode 100644
index 0000000000..47f6564749
--- /dev/null
+++ b/packages/builder/src/builderStore/tests/dataBinding.test.js
@@ -0,0 +1,86 @@
+import { expect, describe, it, vi } from "vitest"
+import {
+  runtimeToReadableBinding,
+  readableToRuntimeBinding,
+} 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 }}.`)
+  })
+})
diff --git a/packages/builder/src/builderStore/websocket.js b/packages/builder/src/builderStore/websocket.js
index 6121831c38..ca3f49e9a3 100644
--- a/packages/builder/src/builderStore/websocket.js
+++ b/packages/builder/src/builderStore/websocket.js
@@ -7,11 +7,9 @@ import {
 } from "builderStore"
 import { datasources, tables } from "stores/backend"
 import { get } from "svelte/store"
-import { auth } from "stores/portal"
-import { SocketEvent, BuilderSocketEvent } from "@budibase/shared-core"
-import { apps } from "stores/portal"
+import { auth, apps } from "stores/portal"
+import { SocketEvent, BuilderSocketEvent, helpers } from "@budibase/shared-core"
 import { notifications } from "@budibase/bbui"
-import { helpers } from "@budibase/shared-core"
 
 export const createBuilderWebsocket = appId => {
   const socket = createWebsocket("/socket/builder")
diff --git a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowChart.svelte b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowChart.svelte
index 54e098c9d5..84fa62fe69 100644
--- a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowChart.svelte
+++ b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowChart.svelte
@@ -1,5 +1,9 @@
 <script>
-  import { automationStore, selectedAutomation } from "builderStore"
+  import {
+    automationStore,
+    selectedAutomation,
+    automationHistoryStore,
+  } from "builderStore"
   import ConfirmDialog from "components/common/ConfirmDialog.svelte"
   import FlowItem from "./FlowItem.svelte"
   import TestDataModal from "./TestDataModal.svelte"
@@ -8,7 +12,6 @@
   import { Icon, notifications, Modal } from "@budibase/bbui"
   import { ActionStepID } from "constants/backend/automations"
   import UndoRedoControl from "components/common/UndoRedoControl.svelte"
-  import { automationHistoryStore } from "builderStore"
 
   export let automation
 
diff --git a/packages/builder/src/components/automation/AutomationPanel/CreateAutomationModal.svelte b/packages/builder/src/components/automation/AutomationPanel/CreateAutomationModal.svelte
index 647a8081cf..9f279427d9 100644
--- a/packages/builder/src/components/automation/AutomationPanel/CreateAutomationModal.svelte
+++ b/packages/builder/src/components/automation/AutomationPanel/CreateAutomationModal.svelte
@@ -1,7 +1,7 @@
 <script>
   import { automationStore } from "builderStore"
-  import { notifications } from "@budibase/bbui"
   import {
+    notifications,
     Input,
     InlineAlert,
     ModalContent,
diff --git a/packages/builder/src/components/automation/AutomationPanel/UpdateAutomationModal.svelte b/packages/builder/src/components/automation/AutomationPanel/UpdateAutomationModal.svelte
index ac96eb6b70..c32f9c84ca 100644
--- a/packages/builder/src/components/automation/AutomationPanel/UpdateAutomationModal.svelte
+++ b/packages/builder/src/components/automation/AutomationPanel/UpdateAutomationModal.svelte
@@ -1,7 +1,12 @@
 <script>
   import { automationStore } from "builderStore"
-  import { notifications } from "@budibase/bbui"
-  import { Icon, Input, ModalContent, Modal } from "@budibase/bbui"
+  import {
+    notifications,
+    Icon,
+    Input,
+    ModalContent,
+    Modal,
+  } from "@budibase/bbui"
 
   export let automation
   export let onCancel = undefined
diff --git a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte
index 9260a197c2..158ecd8281 100644
--- a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte
+++ b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte
@@ -38,12 +38,11 @@
     EditorModes,
   } from "components/common/CodeEditor"
   import FilterDrawer from "components/design/settings/controls/FilterEditor/FilterDrawer.svelte"
-  import { LuceneUtils } from "@budibase/frontend-core"
+  import { LuceneUtils, Utils } from "@budibase/frontend-core"
   import {
     getSchemaForDatasourcePlus,
     getEnvironmentBindings,
   } from "builderStore/dataBinding"
-  import { Utils } from "@budibase/frontend-core"
   import { TriggerStepID, ActionStepID } from "constants/backend/automations"
   import { onMount } from "svelte"
   import { cloneDeep } from "lodash/fp"
diff --git a/packages/builder/src/components/automation/SetupPanel/CronBuilder.svelte b/packages/builder/src/components/automation/SetupPanel/CronBuilder.svelte
index 162285fd73..ee9eed51e9 100644
--- a/packages/builder/src/components/automation/SetupPanel/CronBuilder.svelte
+++ b/packages/builder/src/components/automation/SetupPanel/CronBuilder.svelte
@@ -2,6 +2,7 @@
   import { Button, Select, Input, Label } from "@budibase/bbui"
   import { onMount, createEventDispatcher } from "svelte"
   import { flags } from "stores/backend"
+
   const dispatch = createEventDispatcher()
 
   export let value
diff --git a/packages/builder/src/components/automation/Shared/CreateWebhookModal.svelte b/packages/builder/src/components/automation/Shared/CreateWebhookModal.svelte
index 86eadd66a1..3ad308ac80 100644
--- a/packages/builder/src/components/automation/Shared/CreateWebhookModal.svelte
+++ b/packages/builder/src/components/automation/Shared/CreateWebhookModal.svelte
@@ -1,8 +1,7 @@
 <script>
-  import { Icon, notifications } from "@budibase/bbui"
+  import { Icon, notifications, ModalContent } from "@budibase/bbui"
   import { automationStore, selectedAutomation } from "builderStore"
   import WebhookDisplay from "./WebhookDisplay.svelte"
-  import { ModalContent } from "@budibase/bbui"
   import { onMount, onDestroy } from "svelte"
 
   const POLL_RATE_MS = 2500
diff --git a/packages/builder/src/components/backend/DataTable/modals/CreateEditUser.svelte b/packages/builder/src/components/backend/DataTable/modals/CreateEditUser.svelte
index c18ba313e0..010c320de9 100644
--- a/packages/builder/src/components/backend/DataTable/modals/CreateEditUser.svelte
+++ b/packages/builder/src/components/backend/DataTable/modals/CreateEditUser.svelte
@@ -1,11 +1,15 @@
 <script>
   import { createEventDispatcher } from "svelte"
-  import { tables } from "stores/backend"
-  import { roles } from "stores/backend"
-  import { notifications } from "@budibase/bbui"
+  import { tables, roles } from "stores/backend"
+  import {
+    notifications,
+    keepOpen,
+    ModalContent,
+    Select,
+    Link,
+  } from "@budibase/bbui"
   import RowFieldControl from "../RowFieldControl.svelte"
   import { API } from "api"
-  import { keepOpen, ModalContent, Select, Link } from "@budibase/bbui"
   import ErrorsBox from "components/common/ErrorsBox.svelte"
   import { goto } from "@roxi/routify"
 
diff --git a/packages/builder/src/components/backend/DataTable/modals/EditRoles.svelte b/packages/builder/src/components/backend/DataTable/modals/EditRoles.svelte
index ad51cbbbbb..dd41f16af7 100644
--- a/packages/builder/src/components/backend/DataTable/modals/EditRoles.svelte
+++ b/packages/builder/src/components/backend/DataTable/modals/EditRoles.svelte
@@ -1,8 +1,14 @@
 <script>
-  import { keepOpen, ModalContent, Select, Input, Button } from "@budibase/bbui"
+  import {
+    keepOpen,
+    ModalContent,
+    Select,
+    Input,
+    Button,
+    notifications,
+  } from "@budibase/bbui"
   import { onMount } from "svelte"
   import { API } from "api"
-  import { notifications } from "@budibase/bbui"
   import ErrorsBox from "components/common/ErrorsBox.svelte"
   import { roles } from "stores/backend"
 
diff --git a/packages/builder/src/components/backend/DataTable/modals/ExportModal.svelte b/packages/builder/src/components/backend/DataTable/modals/ExportModal.svelte
index 09f76d3522..c2a7ec33fe 100644
--- a/packages/builder/src/components/backend/DataTable/modals/ExportModal.svelte
+++ b/packages/builder/src/components/backend/DataTable/modals/ExportModal.svelte
@@ -8,7 +8,8 @@
   } from "@budibase/bbui"
   import download from "downloadjs"
   import { API } from "api"
-  import { Constants, LuceneUtils } from "@budibase/frontend-core"
+  import { LuceneUtils } from "@budibase/frontend-core"
+  import { utils } from "@budibase/shared-core"
   import { ROW_EXPORT_FORMATS } from "constants/backend"
 
   export let view
@@ -32,6 +33,8 @@
     },
   ]
 
+  $: appliedFilters = filters?.filter(filter => !filter.onEmptyFilter)
+
   $: options = FORMATS.filter(format => {
     if (formats && !formats.includes(format.key)) {
       return false
@@ -46,23 +49,20 @@
     exportFormat = Array.isArray(options) ? options[0]?.key : []
   }
 
-  $: luceneFilter = LuceneUtils.buildLuceneQuery(filters)
-  $: exportOpDisplay = buildExportOpDisplay(sorting, filterDisplay, filters)
+  $: luceneFilter = LuceneUtils.buildLuceneQuery(appliedFilters)
+  $: exportOpDisplay = buildExportOpDisplay(
+    sorting,
+    filterDisplay,
+    appliedFilters
+  )
 
-  const buildFilterLookup = () => {
-    return Object.keys(Constants.OperatorOptions).reduce((acc, key) => {
-      const op = Constants.OperatorOptions[key]
-      acc[op.value] = op.label
-      return acc
-    }, {})
-  }
-  filterLookup = buildFilterLookup()
+  filterLookup = utils.filterValueToLabel()
 
   const filterDisplay = () => {
-    if (!filters) {
+    if (!appliedFilters) {
       return []
     }
-    return filters.map(filter => {
+    return appliedFilters.map(filter => {
       let newFieldName = filter.field + ""
       const parts = newFieldName.split(":")
       parts.shift()
@@ -77,7 +77,7 @@
 
   const buildExportOpDisplay = (sorting, filterDisplay) => {
     let filterDisplayConfig = filterDisplay()
-    if (sorting) {
+    if (sorting?.sortColumn) {
       filterDisplayConfig = [
         ...filterDisplayConfig,
         {
@@ -132,7 +132,7 @@
         format: exportFormat,
       })
       downloadWithBlob(data, `export.${exportFormat}`)
-    } else if (filters || sorting) {
+    } else if (appliedFilters || sorting) {
       let response
       try {
         response = await API.exportRows({
@@ -163,29 +163,33 @@
   title="Export Data"
   confirmText="Export"
   onConfirm={exportRows}
-  size={filters?.length || sorting ? "M" : "S"}
+  size={appliedFilters?.length || sorting ? "M" : "S"}
 >
   {#if selectedRows?.length}
     <Body size="S">
-      <strong>{selectedRows?.length}</strong>
-      {`row${selectedRows?.length > 1 ? "s" : ""} will be exported`}
+      <span data-testid="exporting-n-rows">
+        <strong>{selectedRows?.length}</strong>
+        {`row${selectedRows?.length > 1 ? "s" : ""} will be exported`}
+      </span>
     </Body>
-  {:else if filters || (sorting?.sortOrder && sorting?.sortColumn)}
+  {:else if appliedFilters?.length || (sorting?.sortOrder && sorting?.sortColumn)}
     <Body size="S">
-      {#if !filters}
-        Exporting <strong>all</strong> rows
+      {#if !appliedFilters}
+        <span data-testid="exporting-rows">
+          Exporting <strong>all</strong> rows
+        </span>
       {:else}
-        Filters applied
+        <span data-testid="filters-applied">Filters applied</span>
       {/if}
     </Body>
 
-    <div class="table-wrap">
+    <div class="table-wrap" data-testid="export-config-table">
       <Table
         schema={displaySchema}
         data={exportOpDisplay}
-        {filters}
+        {appliedFilters}
         loading={false}
-        rowCount={filters?.length + 1}
+        rowCount={appliedFilters?.length + 1}
         disableSorting={true}
         allowSelectRows={false}
         allowEditRows={false}
@@ -196,18 +200,21 @@
     </div>
   {:else}
     <Body size="S">
-      Exporting <strong>all</strong> rows
+      <span data-testid="export-all-rows">
+        Exporting <strong>all</strong> rows
+      </span>
     </Body>
   {/if}
-
-  <Select
-    label="Format"
-    bind:value={exportFormat}
-    {options}
-    placeholder={null}
-    getOptionLabel={x => x.name}
-    getOptionValue={x => x.key}
-  />
+  <span data-testid="format-select">
+    <Select
+      label="Format"
+      bind:value={exportFormat}
+      {options}
+      placeholder={null}
+      getOptionLabel={x => x.name}
+      getOptionValue={x => x.key}
+    />
+  </span>
 </ModalContent>
 
 <style>
diff --git a/packages/builder/src/components/backend/DataTable/modals/ExportModal.test.js b/packages/builder/src/components/backend/DataTable/modals/ExportModal.test.js
new file mode 100644
index 0000000000..f4c2cdc8b2
--- /dev/null
+++ b/packages/builder/src/components/backend/DataTable/modals/ExportModal.test.js
@@ -0,0 +1,240 @@
+import { it, expect, describe, vi } from "vitest"
+import { render, screen } from "@testing-library/svelte"
+import "@testing-library/jest-dom"
+
+import ExportModal from "./ExportModal.svelte"
+import { utils } from "@budibase/shared-core"
+
+const labelLookup = utils.filterValueToLabel()
+
+const rowText = filter => {
+  let readableField = filter.field.split(":")[1]
+  let rowLabel = labelLookup[filter.operator]
+  let value = Array.isArray(filter.value)
+    ? JSON.stringify(filter.value)
+    : filter.value
+  return `${readableField}${rowLabel}${value}`.trim()
+}
+
+const defaultFilters = [
+  {
+    onEmptyFilter: "all",
+  },
+]
+
+vi.mock("svelte", async () => {
+  return {
+    getContext: () => {
+      return {
+        hide: vi.fn(),
+        cancel: vi.fn(),
+      }
+    },
+    createEventDispatcher: vi.fn(),
+    onDestroy: vi.fn(),
+  }
+})
+
+vi.mock("api", async () => {
+  return {
+    API: {
+      exportView: vi.fn(),
+      exportRows: vi.fn(),
+    },
+  }
+})
+
+describe("Export Modal", () => {
+  it("show default messaging with no export config specified", () => {
+    render(ExportModal, {
+      props: {},
+    })
+
+    expect(screen.getByTestId("export-all-rows")).toBeVisible()
+    expect(screen.getByTestId("export-all-rows")).toHaveTextContent(
+      "Exporting all rows"
+    )
+
+    expect(screen.queryByTestId("export-config-table")).toBe(null)
+  })
+
+  it("indicate that a filter is being applied to the export", () => {
+    const propsCfg = {
+      filters: [
+        {
+          id: "MOQkMx9p9",
+          field: "1:Cost",
+          operator: "rangeHigh",
+          value: "100",
+          valueType: "Value",
+          type: "number",
+          noValue: false,
+        },
+        ...defaultFilters,
+      ],
+    }
+
+    render(ExportModal, {
+      props: propsCfg,
+    })
+
+    expect(screen.getByTestId("filters-applied")).toBeVisible()
+    expect(screen.getByTestId("filters-applied").textContent).toBe(
+      "Filters applied"
+    )
+
+    const ele = screen.queryByTestId("export-config-table")
+    expect(ele).toBeVisible()
+
+    const rows = ele.getElementsByClassName("spectrum-Table-row")
+
+    expect(rows.length).toBe(1)
+    let rowTextContent = rowText(propsCfg.filters[0])
+
+    //"CostLess than or equal to100"
+    expect(rows[0].textContent?.trim()).toEqual(rowTextContent)
+  })
+
+  it("Show only selected row messaging if rows are supplied", () => {
+    const propsCfg = {
+      filters: [
+        {
+          id: "MOQkMx9p9",
+          field: "1:Cost",
+          operator: "rangeHigh",
+          value: "100",
+          valueType: "Value",
+          type: "number",
+          noValue: false,
+        },
+        ...defaultFilters,
+      ],
+      sorting: {
+        sortColumn: "Cost",
+        sortOrder: "descending",
+      },
+      selectedRows: [
+        {
+          _id: "ro_ta_bb_expenses_57d5f6fe1b6640d8bb22b15f5eae62cd",
+        },
+        {
+          _id: "ro_ta_bb_expenses_99ce5760a53a430bab4349cd70335a07",
+        },
+      ],
+    }
+
+    render(ExportModal, {
+      props: propsCfg,
+    })
+
+    expect(screen.queryByTestId("export-config-table")).toBeNull()
+    expect(screen.queryByTestId("filters-applied")).toBeNull()
+
+    expect(screen.queryByTestId("exporting-n-rows")).toBeVisible()
+    expect(screen.queryByTestId("exporting-n-rows").textContent).toEqual(
+      "2 rows will be exported"
+    )
+  })
+
+  it("Show only the configured sort when no filters are specified", () => {
+    const propsCfg = {
+      filters: [...defaultFilters],
+      sorting: {
+        sortColumn: "Cost",
+        sortOrder: "descending",
+      },
+    }
+    render(ExportModal, {
+      props: propsCfg,
+    })
+
+    expect(screen.queryByTestId("export-config-table")).toBeVisible()
+    const ele = screen.queryByTestId("export-config-table")
+    const rows = ele.getElementsByClassName("spectrum-Table-row")
+
+    expect(rows.length).toBe(1)
+    expect(rows[0].textContent?.trim()).toEqual(
+      `${propsCfg.sorting.sortColumn}Order By${propsCfg.sorting.sortOrder}`
+    )
+  })
+
+  it("Display all currently configured filters and applied sort", () => {
+    const propsCfg = {
+      filters: [
+        {
+          id: "MOQkMx9p9",
+          field: "1:Cost",
+          operator: "rangeHigh",
+          value: "100",
+          valueType: "Value",
+          type: "number",
+          noValue: false,
+        },
+        {
+          id: "2ot-aB0gE",
+          field: "2:Expense Tags",
+          operator: "contains",
+          value: ["Equipment", "Services"],
+          valueType: "Value",
+          type: "array",
+          noValue: false,
+        },
+        ...defaultFilters,
+      ],
+      sorting: {
+        sortColumn: "Payment Due",
+        sortOrder: "ascending",
+      },
+    }
+
+    render(ExportModal, {
+      props: propsCfg,
+    })
+
+    const ele = screen.queryByTestId("export-config-table")
+    expect(ele).toBeVisible()
+
+    const rows = ele.getElementsByClassName("spectrum-Table-row")
+    expect(rows.length).toBe(3)
+
+    let rowTextContent1 = rowText(propsCfg.filters[0])
+    expect(rows[0].textContent?.trim()).toEqual(rowTextContent1)
+
+    let rowTextContent2 = rowText(propsCfg.filters[1])
+    expect(rows[1].textContent?.trim()).toEqual(rowTextContent2)
+
+    expect(rows[2].textContent?.trim()).toEqual(
+      `${propsCfg.sorting.sortColumn}Order By${propsCfg.sorting.sortOrder}`
+    )
+  })
+
+  it("show only the valid, configured download formats", () => {
+    const propsCfg = {
+      formats: ["badger", "json"],
+    }
+
+    render(ExportModal, {
+      props: propsCfg,
+    })
+
+    let ele = screen.getByTestId("format-select")
+    expect(ele).toBeVisible()
+
+    let formatDisplay = ele.getElementsByTagName("button")[0]
+
+    expect(formatDisplay.textContent.trim()).toBe("JSON")
+  })
+
+  it("Load the default format config when no explicit formats are configured", () => {
+    render(ExportModal, {
+      props: {},
+    })
+
+    let ele = screen.getByTestId("format-select")
+    expect(ele).toBeVisible()
+
+    let formatDisplay = ele.getElementsByTagName("button")[0]
+
+    expect(formatDisplay.textContent.trim()).toBe("CSV")
+  })
+})
diff --git a/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte b/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte
index 0cc61c69e6..23697bf2c7 100644
--- a/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte
+++ b/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte
@@ -1,5 +1,6 @@
 <script>
   import { goto, isActive, params } from "@roxi/routify"
+  import { Layout } from "@budibase/bbui"
   import { BUDIBASE_INTERNAL_DB_ID } from "constants/backend"
   import {
     database,
@@ -21,8 +22,11 @@
   import IntegrationIcon from "./IntegrationIcon.svelte"
   import { TableNames } from "constants"
   import { userSelectedResourceMap } from "builderStore"
+  import { enrichDatasources } from "./datasourceUtils"
+  import { onMount } from "svelte"
 
-  let openDataSources = []
+  export let searchTerm
+  let toggledDatasources = {}
 
   $: enrichedDataSources = enrichDatasources(
     $datasources,
@@ -32,52 +36,9 @@
     $queries,
     $views,
     $viewsV2,
-    openDataSources
+    toggledDatasources,
+    searchTerm
   )
-  $: openDataSource = enrichedDataSources.find(x => x.open)
-  $: {
-    // Ensure the open datasource is always actually open
-    if (openDataSource) {
-      openNode(openDataSource)
-    }
-  }
-
-  const enrichDatasources = (
-    datasources,
-    params,
-    isActive,
-    tables,
-    queries,
-    views,
-    viewsV2,
-    openDataSources
-  ) => {
-    if (!datasources?.list?.length) {
-      return []
-    }
-    return datasources.list.map(datasource => {
-      const selected =
-        isActive("./datasource") &&
-        datasources.selectedDatasourceId === datasource._id
-      const open = openDataSources.includes(datasource._id)
-      const containsSelected = containsActiveEntity(
-        datasource,
-        params,
-        isActive,
-        tables,
-        queries,
-        views,
-        viewsV2
-      )
-      const onlySource = datasources.list.length === 1
-      return {
-        ...datasource,
-        selected,
-        containsSelected,
-        open: selected || open || containsSelected || onlySource,
-      }
-    })
-  }
 
   function selectDatasource(datasource) {
     openNode(datasource)
@@ -91,102 +52,42 @@
     }
   }
 
-  function closeNode(datasource) {
-    openDataSources = openDataSources.filter(id => datasource._id !== id)
-  }
-
   function openNode(datasource) {
-    if (!openDataSources.includes(datasource._id)) {
-      openDataSources = [...openDataSources, datasource._id]
-    }
+    toggledDatasources[datasource._id] = true
   }
 
   function toggleNode(datasource) {
-    const isOpen = openDataSources.includes(datasource._id)
-    if (isOpen) {
-      closeNode(datasource)
-    } else {
-      openNode(datasource)
-    }
+    toggledDatasources[datasource._id] = !datasource.open
   }
 
-  const containsActiveEntity = (
-    datasource,
-    params,
-    isActive,
-    tables,
-    queries,
-    views,
-    viewsV2
-  ) => {
-    // Check for being on a datasource page
-    if (params.datasourceId === datasource._id) {
-      return true
-    }
+  const appUsersTableName = "App users"
+  $: showAppUsersTable =
+    !searchTerm ||
+    appUsersTableName.toLowerCase().indexOf(searchTerm.toLowerCase()) > -1
 
-    // Check for hardcoded datasource edge cases
-    if (
-      isActive("./datasource/bb_internal") &&
-      datasource._id === "bb_internal"
-    ) {
-      return true
-    }
-    if (
-      isActive("./datasource/datasource_internal_bb_default") &&
-      datasource._id === "datasource_internal_bb_default"
-    ) {
-      return true
+  onMount(() => {
+    if ($tables.selected) {
+      toggledDatasources[$tables.selected.sourceId] = true
     }
+  })
 
-    // Check for a matching query
-    if (params.queryId) {
-      const query = queries.list?.find(q => q._id === params.queryId)
-      return datasource._id === query?.datasourceId
-    }
-
-    // If there are no entities it can't contain anything
-    if (!datasource.entities) {
-      return false
-    }
-
-    // Get a list of table options
-    let options = datasource.entities
-    if (!Array.isArray(options)) {
-      options = Object.values(options)
-    }
-
-    // Check for a matching table
-    if (params.tableId) {
-      const selectedTable = tables.selected?._id
-      return options.find(x => x._id === selectedTable) != null
-    }
-
-    // Check for a matching view
-    const selectedView = views.selected?.name
-    const viewTable = options.find(table => {
-      return table.views?.[selectedView] != null
-    })
-    if (viewTable) {
-      return true
-    }
-
-    // Check for a matching viewV2
-    const viewV2Table = options.find(x => x._id === viewsV2.selected?.tableId)
-    return viewV2Table != null
-  }
+  $: showNoResults =
+    searchTerm && !showAppUsersTable && !enrichedDataSources.find(ds => ds.show)
 </script>
 
 {#if $database?._id}
   <div class="hierarchy-items-container">
-    <NavItem
-      icon="UserGroup"
-      text="App users"
-      selected={$isActive("./table/:tableId") &&
-        $tables.selected?._id === TableNames.USERS}
-      on:click={() => selectTable(TableNames.USERS)}
-      selectedBy={$userSelectedResourceMap[TableNames.USERS]}
-    />
-    {#each enrichedDataSources as datasource}
+    {#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}
@@ -210,8 +111,8 @@
       </NavItem>
 
       {#if datasource.open}
-        <TableNavigator sourceId={datasource._id} {selectTable} />
-        {#each $queries.list.filter(query => query.datasourceId === datasource._id) as query}
+        <TableNavigator tables={datasource.tables} {selectTable} />
+        {#each datasource.queries as query}
           <NavItem
             indentLevel={1}
             icon="SQLQuery"
@@ -228,6 +129,13 @@
         {/each}
       {/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>
 {/if}
 
@@ -240,4 +148,8 @@
     place-items: center;
     flex: 0 0 24px;
   }
+
+  .no-results {
+    color: var(--spectrum-global-color-gray-600);
+  }
 </style>
diff --git a/packages/builder/src/components/backend/DatasourceNavigator/datasourceUtils.js b/packages/builder/src/components/backend/DatasourceNavigator/datasourceUtils.js
new file mode 100644
index 0000000000..bc7fa53b49
--- /dev/null
+++ b/packages/builder/src/components/backend/DatasourceNavigator/datasourceUtils.js
@@ -0,0 +1,181 @@
+import { TableNames } from "constants"
+
+const showDatasourceOpen = ({
+  selected,
+  containsSelected,
+  dsToggledStatus,
+  searchTerm,
+  onlyOneSource,
+}) => {
+  // We want to display all the ds expanded while filtering ds
+  if (searchTerm) {
+    return true
+  }
+
+  // If the toggle status has been a value
+  if (dsToggledStatus !== undefined) {
+    return dsToggledStatus
+  }
+
+  if (onlyOneSource) {
+    return true
+  }
+
+  return selected || containsSelected
+}
+
+const containsActiveEntity = (
+  datasource,
+  params,
+  isActive,
+  tables,
+  queries,
+  views,
+  viewsV2
+) => {
+  // Check for being on a datasource page
+  if (params.datasourceId === datasource._id) {
+    return true
+  }
+
+  // Check for hardcoded datasource edge cases
+  if (
+    isActive("./datasource/bb_internal") &&
+    datasource._id === "bb_internal"
+  ) {
+    return true
+  }
+  if (
+    isActive("./datasource/datasource_internal_bb_default") &&
+    datasource._id === "datasource_internal_bb_default"
+  ) {
+    return true
+  }
+
+  // Check for a matching query
+  if (params.queryId) {
+    const query = queries.list?.find(q => q._id === params.queryId)
+    return datasource._id === query?.datasourceId
+  }
+
+  // If there are no entities it can't contain anything
+  if (!datasource.entities) {
+    return false
+  }
+
+  // Get a list of table options
+  let options = datasource.entities
+  if (!Array.isArray(options)) {
+    options = Object.values(options)
+  }
+
+  // Check for a matching table
+  if (params.tableId) {
+    const selectedTable = tables.selected?._id
+    return options.find(x => x._id === selectedTable) != null
+  }
+
+  // Check for a matching view
+  const selectedView = views.selected?.name
+  const viewTable = options.find(table => {
+    return table.views?.[selectedView] != null
+  })
+  if (viewTable) {
+    return true
+  }
+
+  // Check for a matching viewV2
+  const viewV2Table = options.find(x => x._id === viewsV2.selected?.tableId)
+  return viewV2Table != null
+}
+
+export const enrichDatasources = (
+  datasources,
+  params,
+  isActive,
+  tables,
+  queries,
+  views,
+  viewsV2,
+  toggledDatasources,
+  searchTerm
+) => {
+  if (!datasources?.list?.length) {
+    return []
+  }
+
+  const onlySource = datasources.list.length === 1
+  return datasources.list.map(datasource => {
+    const selected =
+      isActive("./datasource") &&
+      datasources.selectedDatasourceId === datasource._id
+    const containsSelected = containsActiveEntity(
+      datasource,
+      params,
+      isActive,
+      tables,
+      queries,
+      views,
+      viewsV2
+    )
+
+    const dsTables = tables.list.filter(
+      table =>
+        table.sourceId === datasource._id && table._id !== TableNames.USERS
+    )
+    const dsQueries = queries.list.filter(
+      query => query.datasourceId === datasource._id
+    )
+
+    const open = showDatasourceOpen({
+      selected,
+      containsSelected,
+      dsToggledStatus: toggledDatasources[datasource._id],
+      searchTerm,
+      onlyOneSource: onlySource,
+    })
+
+    const visibleDsQueries = dsQueries.filter(
+      q =>
+        !searchTerm ||
+        q.name?.toLowerCase()?.indexOf(searchTerm.toLowerCase()) > -1
+    )
+
+    const visibleDsTables = dsTables
+      .map(t => ({
+        ...t,
+        views: !searchTerm
+          ? t.views
+          : Object.keys(t.views || {})
+              .filter(
+                viewName =>
+                  viewName.toLowerCase().indexOf(searchTerm.toLowerCase()) > -1
+              )
+              .reduce(
+                (acc, viewName) => ({ ...acc, [viewName]: t.views[viewName] }),
+                {}
+              ),
+      }))
+      .filter(
+        table =>
+          !searchTerm ||
+          table.name?.toLowerCase()?.indexOf(searchTerm.toLowerCase()) > -1 ||
+          Object.keys(table.views).length
+      )
+
+    const show = !!(
+      !searchTerm ||
+      visibleDsQueries.length ||
+      visibleDsTables.length
+    )
+    return {
+      ...datasource,
+      selected,
+      containsSelected,
+      open,
+      queries: visibleDsQueries,
+      tables: visibleDsTables,
+      show,
+    }
+  })
+}
diff --git a/packages/builder/src/components/backend/DatasourceNavigator/modals/UpdateDatasourceModal.svelte b/packages/builder/src/components/backend/DatasourceNavigator/modals/UpdateDatasourceModal.svelte
index 991e170a2e..2bc374056d 100644
--- a/packages/builder/src/components/backend/DatasourceNavigator/modals/UpdateDatasourceModal.svelte
+++ b/packages/builder/src/components/backend/DatasourceNavigator/modals/UpdateDatasourceModal.svelte
@@ -1,8 +1,7 @@
 <script>
   import { get } from "svelte/store"
   import { datasources, integrations } from "stores/backend"
-  import { notifications } from "@budibase/bbui"
-  import { Input, ModalContent, Modal } from "@budibase/bbui"
+  import { notifications, Input, ModalContent, Modal } from "@budibase/bbui"
   import { integrationForDatasource } from "stores/selectors"
 
   let error = ""
diff --git a/packages/builder/src/components/backend/DatasourceNavigator/popovers/EditDatasourcePopover.svelte b/packages/builder/src/components/backend/DatasourceNavigator/popovers/EditDatasourcePopover.svelte
index 344bfab4e4..11fdd219dc 100644
--- a/packages/builder/src/components/backend/DatasourceNavigator/popovers/EditDatasourcePopover.svelte
+++ b/packages/builder/src/components/backend/DatasourceNavigator/popovers/EditDatasourcePopover.svelte
@@ -1,8 +1,7 @@
 <script>
   import { goto } from "@roxi/routify"
   import { datasources } from "stores/backend"
-  import { notifications } from "@budibase/bbui"
-  import { ActionMenu, MenuItem, Icon } from "@budibase/bbui"
+  import { notifications, ActionMenu, MenuItem, Icon } from "@budibase/bbui"
   import ConfirmDialog from "components/common/ConfirmDialog.svelte"
   import UpdateDatasourceModal from "components/backend/DatasourceNavigator/modals/UpdateDatasourceModal.svelte"
   import { BUDIBASE_DATASOURCE_TYPE } from "constants/backend"
diff --git a/packages/builder/src/components/backend/DatasourceNavigator/tests/datasourceUtils.spec.js b/packages/builder/src/components/backend/DatasourceNavigator/tests/datasourceUtils.spec.js
new file mode 100644
index 0000000000..f71c647490
--- /dev/null
+++ b/packages/builder/src/components/backend/DatasourceNavigator/tests/datasourceUtils.spec.js
@@ -0,0 +1,219 @@
+import { enrichDatasources } from "../datasourceUtils"
+
+describe("datasourceUtils", () => {
+  describe("enrichDatasources", () => {
+    it.each([
+      ["undefined", undefined],
+      ["undefined list", {}],
+      ["empty list", { list: [] }],
+    ])("%s datasources will return an empty list", datasources => {
+      const result = enrichDatasources(datasources)
+
+      expect(result).toEqual([])
+    })
+
+    describe("filtering", () => {
+      const internalTables = {
+        _id: "datasource_internal_bb_default",
+        name: "Sample Data",
+      }
+
+      const pgDatasource = {
+        _id: "pg_ds",
+        name: "PostgreSQL local",
+      }
+
+      const mysqlDatasource = {
+        _id: "mysql_ds",
+        name: "My SQL local",
+      }
+
+      const tables = [
+        ...[
+          {
+            _id: "ta_bb_employee",
+            name: "Employees",
+          },
+          {
+            _id: "ta_bb_expenses",
+            name: "Expenses",
+          },
+          {
+            _id: "ta_bb_expenses_2",
+            name: "Expenses 2",
+          },
+          {
+            _id: "ta_bb_inventory",
+            name: "Inventory",
+          },
+          {
+            _id: "ta_bb_jobs",
+            name: "Jobs",
+          },
+        ].map(t => ({
+          ...t,
+          sourceId: internalTables._id,
+        })),
+        ...[
+          {
+            _id: "pg_ds-external_inventory",
+            name: "External Inventory",
+            views: {
+              "External Inventory first view": {
+                name: "External Inventory first view",
+                id: "pg_ds_view_1",
+              },
+              "External Inventory second view": {
+                name: "External Inventory second view",
+                id: "pg_ds_view_2",
+              },
+            },
+          },
+          {
+            _id: "pg_ds-another_table",
+            name: "Another table",
+            views: {
+              view1: {
+                id: "pg_ds-another_table-view1",
+                name: "view1",
+              },
+              ["View 2"]: {
+                id: "pg_ds-another_table-view2",
+                name: "View 2",
+              },
+            },
+          },
+          {
+            _id: "pg_ds_table2",
+            name: "table2",
+            views: {
+              "new 2": {
+                name: "new 2",
+                id: "pg_ds_table2_new_2",
+              },
+              new: {
+                name: "new",
+                id: "pg_ds_table2_new_",
+              },
+            },
+          },
+        ].map(t => ({
+          ...t,
+          sourceId: pgDatasource._id,
+        })),
+        ...[
+          {
+            _id: "mysql_ds-mysql_table",
+            name: "MySQL table",
+          },
+        ].map(t => ({
+          ...t,
+          sourceId: mysqlDatasource._id,
+        })),
+      ]
+
+      const datasources = {
+        list: [internalTables, pgDatasource, mysqlDatasource],
+      }
+      const isActive = vi.fn().mockReturnValue(true)
+
+      it("without a search term, all datasources are returned", () => {
+        const searchTerm = ""
+
+        const result = enrichDatasources(
+          datasources,
+          {},
+          isActive,
+          { list: [] },
+          { list: [] },
+          { list: [] },
+          { list: [] },
+          {},
+          searchTerm
+        )
+
+        expect(result).toEqual(
+          datasources.list.map(d =>
+            expect.objectContaining({
+              _id: d._id,
+              show: true,
+            })
+          )
+        )
+      })
+
+      it("given a valid search term, all tables are correctly filtered", () => {
+        const searchTerm = "ex"
+
+        const result = enrichDatasources(
+          datasources,
+          {},
+          isActive,
+          { list: tables },
+          { list: [] },
+          { list: [] },
+          { list: [] },
+          {},
+          searchTerm
+        )
+
+        expect(result).toEqual([
+          expect.objectContaining({
+            _id: internalTables._id,
+            show: true,
+            tables: [
+              expect.objectContaining({ _id: "ta_bb_expenses" }),
+              expect.objectContaining({ _id: "ta_bb_expenses_2" }),
+            ],
+          }),
+          expect.objectContaining({
+            _id: pgDatasource._id,
+            show: true,
+            tables: [
+              expect.objectContaining({ _id: "pg_ds-external_inventory" }),
+            ],
+          }),
+          expect.objectContaining({
+            _id: mysqlDatasource._id,
+            show: false,
+            tables: [],
+          }),
+        ])
+      })
+
+      it("given a non matching search term, all entities are empty", () => {
+        const searchTerm = "non matching"
+
+        const result = enrichDatasources(
+          datasources,
+          {},
+          isActive,
+          { list: tables },
+          { list: [] },
+          { list: [] },
+          { list: [] },
+          {},
+          searchTerm
+        )
+
+        expect(result).toEqual([
+          expect.objectContaining({
+            _id: internalTables._id,
+            show: false,
+            tables: [],
+          }),
+          expect.objectContaining({
+            _id: pgDatasource._id,
+            show: false,
+            tables: [],
+          }),
+          expect.objectContaining({
+            _id: mysqlDatasource._id,
+            show: false,
+            tables: [],
+          }),
+        ])
+      })
+    })
+  })
+})
diff --git a/packages/builder/src/components/backend/Datasources/CreateEditRelationship.svelte b/packages/builder/src/components/backend/Datasources/CreateEditRelationship.svelte
index af678a88ba..c837247986 100644
--- a/packages/builder/src/components/backend/Datasources/CreateEditRelationship.svelte
+++ b/packages/builder/src/components/backend/Datasources/CreateEditRelationship.svelte
@@ -1,5 +1,8 @@
 <script>
-  import { RelationshipType } from "constants/backend"
+  import {
+    RelationshipType,
+    PrettyRelationshipDefinitions,
+  } from "constants/backend"
   import {
     keepOpen,
     Button,
@@ -8,13 +11,12 @@
     Select,
     Detail,
     Body,
+    Helpers,
   } from "@budibase/bbui"
   import { tables } from "stores/backend"
-  import { Helpers } from "@budibase/bbui"
   import { RelationshipErrorChecker } from "./relationshipErrors"
   import { onMount } from "svelte"
   import RelationshipSelector from "components/common/RelationshipSelector.svelte"
-  import { PrettyRelationshipDefinitions } from "constants/backend"
 
   export let save
   export let datasource
diff --git a/packages/builder/src/components/backend/TableNavigator/TableNavigator.svelte b/packages/builder/src/components/backend/TableNavigator/TableNavigator.svelte
index 056a36c4a7..33bcb56c98 100644
--- a/packages/builder/src/components/backend/TableNavigator/TableNavigator.svelte
+++ b/packages/builder/src/components/backend/TableNavigator/TableNavigator.svelte
@@ -1,5 +1,10 @@
 <script>
-  import { tables, views, viewsV2, database } from "stores/backend"
+  import {
+    tables as tablesStore,
+    views,
+    viewsV2,
+    database,
+  } from "stores/backend"
   import { TableNames } from "constants"
   import EditTablePopover from "./popovers/EditTablePopover.svelte"
   import EditViewPopover from "./popovers/EditViewPopover.svelte"
@@ -7,14 +12,10 @@
   import { goto, isActive } from "@roxi/routify"
   import { userSelectedResourceMap } from "builderStore"
 
-  export let sourceId
+  export let tables
   export let selectTable
 
-  $: sortedTables = $tables.list
-    .filter(
-      table => table.sourceId === sourceId && table._id !== TableNames.USERS
-    )
-    .sort(alphabetical)
+  $: sortedTables = tables.sort(alphabetical)
 
   const alphabetical = (a, b) => {
     return a.name?.toLowerCase() > b.name?.toLowerCase() ? 1 : -1
@@ -37,7 +38,7 @@
         icon={table._id === TableNames.USERS ? "UserGroup" : "Table"}
         text={table.name}
         selected={$isActive("./table/:tableId") &&
-          $tables.selected?._id === table._id}
+          $tablesStore.selected?._id === table._id}
         on:click={() => selectTable(table._id)}
         selectedBy={$userSelectedResourceMap[table._id]}
       >
@@ -53,7 +54,7 @@
           selected={isViewActive(view, $isActive, $views, $viewsV2)}
           on:click={() => {
             if (view.version === 2) {
-              $goto(`./view/v2/${view.id}`)
+              $goto(`./view/v2/${encodeURIComponent(view.id)}`)
             } else {
               $goto(`./view/v1/${encodeURIComponent(name)}`)
             }
diff --git a/packages/builder/src/components/backend/TableNavigator/modals/CreateTableModal.svelte b/packages/builder/src/components/backend/TableNavigator/modals/CreateTableModal.svelte
index e5227af409..630fa4eb06 100644
--- a/packages/builder/src/components/backend/TableNavigator/modals/CreateTableModal.svelte
+++ b/packages/builder/src/components/backend/TableNavigator/modals/CreateTableModal.svelte
@@ -1,9 +1,13 @@
 <script>
   import { goto, url } from "@roxi/routify"
-  import { tables } from "stores/backend"
-  import { notifications } from "@budibase/bbui"
-  import { Input, Label, ModalContent, Layout } from "@budibase/bbui"
-  import { datasources } from "stores/backend"
+  import { tables, datasources } from "stores/backend"
+  import {
+    notifications,
+    Input,
+    Label,
+    ModalContent,
+    Layout,
+  } from "@budibase/bbui"
   import TableDataImport from "../TableDataImport.svelte"
   import {
     BUDIBASE_INTERNAL_DB_ID,
diff --git a/packages/builder/src/components/common/CustomSVG.svelte b/packages/builder/src/components/common/CustomSVG.svelte
index 3cd73a8d7a..d028bcd86e 100644
--- a/packages/builder/src/components/common/CustomSVG.svelte
+++ b/packages/builder/src/components/common/CustomSVG.svelte
@@ -1,5 +1,6 @@
 <script>
   import { Helpers } from "@budibase/bbui"
+
   export let size
   export let svgHtml
 
diff --git a/packages/builder/src/components/common/NavHeader.svelte b/packages/builder/src/components/common/NavHeader.svelte
new file mode 100644
index 0000000000..5678884223
--- /dev/null
+++ b/packages/builder/src/components/common/NavHeader.svelte
@@ -0,0 +1,149 @@
+<script>
+  import { tick } from "svelte"
+  import { Icon, Body } from "@budibase/bbui"
+  import { keyUtils } from "helpers/keyUtils"
+
+  export let title
+  export let placeholder
+  export let value
+  export let onAdd
+  export let search
+
+  let searchInput
+
+  const openSearch = async () => {
+    search = true
+    await tick()
+    searchInput.focus()
+  }
+
+  const closeSearch = async () => {
+    search = false
+    value = ""
+  }
+
+  const onKeyDown = e => {
+    if (e.key === "Escape") {
+      closeSearch()
+    }
+  }
+
+  const handleAddButton = () => {
+    if (search) {
+      closeSearch()
+    } else {
+      onAdd()
+    }
+  }
+</script>
+
+<svelte:window on:keydown={onKeyDown} />
+
+<div class="header" class:search>
+  <input
+    readonly={!search}
+    bind:value
+    bind:this={searchInput}
+    class="searchBox"
+    class:hide={!search}
+    {placeholder}
+  />
+
+  <div class="title" class:hide={search}>
+    <Body size="S">{title}</Body>
+  </div>
+  <div
+    on:click={openSearch}
+    on:keydown={keyUtils.handleEnter(openSearch)}
+    class="searchButton"
+    class:hide={search}
+  >
+    <Icon size="S" name="Search" />
+  </div>
+
+  <div
+    on:click={handleAddButton}
+    on:keydown={keyUtils.handleEnter(handleAddButton)}
+    class="addButton"
+    class:rotate={search}
+  >
+    <Icon name="Add" />
+  </div>
+</div>
+
+<style>
+  .search {
+    transition: height 300ms ease-out;
+    max-height: none;
+  }
+
+  .header {
+    flex-shrink: 0;
+    flex-direction: row;
+    position: relative;
+    height: 50px;
+    width: 100%;
+    box-sizing: border-box;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    border-bottom: 2px solid transparent;
+    transition: border-bottom 130ms ease-out;
+    gap: var(--spacing-l);
+  }
+
+  .searchBox {
+    font-family: var(--font-sans);
+    color: var(--ink);
+    background-color: transparent;
+    border: none;
+    font-size: var(--spectrum-alias-font-size-default);
+    display: flex;
+  }
+  .searchBox:focus {
+    outline: none;
+  }
+  .searchBox::placeholder {
+    color: var(--spectrum-global-color-gray-600);
+  }
+
+  .title {
+    display: flex;
+    align-items: center;
+    height: 100%;
+    box-sizing: border-box;
+    flex: 1;
+    opacity: 1;
+    z-index: 1;
+  }
+
+  .searchButton {
+    color: var(--grey-7);
+    cursor: pointer;
+    opacity: 1;
+  }
+  .searchButton:hover {
+    color: var(--ink);
+  }
+
+  .hide {
+    opacity: 0;
+    pointer-events: none;
+    display: none !important;
+  }
+
+  .addButton {
+    display: flex;
+    transition: transform 300ms ease-out;
+    color: var(--grey-7);
+    cursor: pointer;
+  }
+
+  .addButton:hover {
+    color: var(--ink);
+  }
+
+  .rotate {
+    transform: rotate(45deg);
+  }
+</style>
diff --git a/packages/builder/src/components/common/NavItem.svelte b/packages/builder/src/components/common/NavItem.svelte
index b6211b6c15..e325c27711 100644
--- a/packages/builder/src/components/common/NavItem.svelte
+++ b/packages/builder/src/components/common/NavItem.svelte
@@ -193,6 +193,7 @@
     flex: 0 0 20px;
     pointer-events: all;
     order: 0;
+    transition: transform 100ms linear;
   }
   .icon.arrow.absolute {
     position: absolute;
diff --git a/packages/builder/src/components/common/bindings/BindingPanel.svelte b/packages/builder/src/components/common/bindings/BindingPanel.svelte
index cdc96e87c5..4df26c5d03 100644
--- a/packages/builder/src/components/common/bindings/BindingPanel.svelte
+++ b/packages/builder/src/components/common/bindings/BindingPanel.svelte
@@ -9,18 +9,18 @@
     Heading,
     Icon,
   } from "@budibase/bbui"
-  import { createEventDispatcher, onMount } from "svelte"
+  import { createEventDispatcher, onMount, getContext } from "svelte"
   import {
     isValid,
     decodeJSBinding,
     encodeJSBinding,
+    convertToJS,
   } from "@budibase/string-templates"
   import {
     readableToRuntimeBinding,
     runtimeToReadableBinding,
   } from "builderStore/dataBinding"
 
-  import { convertToJS } from "@budibase/string-templates"
   import { admin } from "stores/portal"
   import CodeEditor from "../CodeEditor/CodeEditor.svelte"
   import {
@@ -32,7 +32,6 @@
     hbInsert,
     jsInsert,
   } from "../CodeEditor"
-  import { getContext } from "svelte"
   import BindingPicker from "./BindingPicker.svelte"
 
   const dispatch = createEventDispatcher()
diff --git a/packages/builder/src/components/common/bindings/DrawerBindableInput.svelte b/packages/builder/src/components/common/bindings/DrawerBindableInput.svelte
index 5c4f90606d..09732ce4f2 100644
--- a/packages/builder/src/components/common/bindings/DrawerBindableInput.svelte
+++ b/packages/builder/src/components/common/bindings/DrawerBindableInput.svelte
@@ -21,6 +21,7 @@
   export let allowHelpers = true
   export let updateOnChange = true
   export let drawerLeft
+  export let disableBindings = false
 
   const dispatch = createEventDispatcher()
   let bindingDrawer
@@ -62,7 +63,7 @@
     {placeholder}
     {updateOnChange}
   />
-  {#if !disabled}
+  {#if !disabled && !disableBindings}
     <div
       class="icon"
       on:click={() => {
diff --git a/packages/builder/src/components/common/renderers/CapitaliseRenderer.svelte b/packages/builder/src/components/common/renderers/CapitaliseRenderer.svelte
index ea065d217c..b5155fc044 100644
--- a/packages/builder/src/components/common/renderers/CapitaliseRenderer.svelte
+++ b/packages/builder/src/components/common/renderers/CapitaliseRenderer.svelte
@@ -1,5 +1,6 @@
 <script>
   import { capitalise } from "helpers"
+
   export let value
 </script>
 
diff --git a/packages/builder/src/components/common/renderers/DateTimeRenderer.svelte b/packages/builder/src/components/common/renderers/DateTimeRenderer.svelte
index 8bf9499b98..c0fb251dc0 100644
--- a/packages/builder/src/components/common/renderers/DateTimeRenderer.svelte
+++ b/packages/builder/src/components/common/renderers/DateTimeRenderer.svelte
@@ -1,5 +1,6 @@
 <script>
   import dayjs from "dayjs"
+
   export let value
 </script>
 
diff --git a/packages/builder/src/components/deploy/AppActions.svelte b/packages/builder/src/components/deploy/AppActions.svelte
index 7259e7e402..7d14fd0e87 100644
--- a/packages/builder/src/components/deploy/AppActions.svelte
+++ b/packages/builder/src/components/deploy/AppActions.svelte
@@ -20,7 +20,12 @@
   import analytics, { Events, EventSource } from "analytics"
   import { API } from "api"
   import { apps } from "stores/portal"
-  import { deploymentStore, store, isOnlyUser } from "builderStore"
+  import {
+    deploymentStore,
+    store,
+    isOnlyUser,
+    sortedScreens,
+  } from "builderStore"
   import TourWrap from "components/portal/onboarding/TourWrap.svelte"
   import { TOUR_STEP_KEYS } from "components/portal/onboarding/tours.js"
   import { goto } from "@roxi/routify"
@@ -48,7 +53,7 @@
     $store.upgradableVersion &&
     $store.version &&
     $store.upgradableVersion !== $store.version
-  $: canPublish = !publishing && loaded
+  $: canPublish = !publishing && loaded && $sortedScreens.length > 0
   $: lastDeployed = getLastDeployedString($deploymentStore)
 
   const initialiseApp = async () => {
@@ -175,7 +180,12 @@
 
     <div class="app-action-button preview">
       <div class="app-action">
-        <ActionButton quiet icon="PlayCircle" on:click={previewApp}>
+        <ActionButton
+          disabled={$sortedScreens.length === 0}
+          quiet
+          icon="PlayCircle"
+          on:click={previewApp}
+        >
           Preview
         </ActionButton>
       </div>
diff --git a/packages/builder/src/components/design/Panel.svelte b/packages/builder/src/components/design/Panel.svelte
index f9190bea60..01ba714fb4 100644
--- a/packages/builder/src/components/design/Panel.svelte
+++ b/packages/builder/src/components/design/Panel.svelte
@@ -12,6 +12,7 @@
   export let onClickCloseButton
   export let borderLeft = false
   export let borderRight = false
+  export let borderBottomHeader = true
   export let wide = false
   export let extraWide = false
   export let closeButtonIcon = "Close"
@@ -27,7 +28,11 @@
   class:borderLeft
   class:borderRight
 >
-  <div class="header" class:custom={customHeaderContent}>
+  <div
+    class="header"
+    class:custom={customHeaderContent}
+    class:borderBottom={borderBottomHeader}
+  >
     {#if showBackButton}
       <Icon name="ArrowLeft" hoverable on:click={onClickBackButton} />
     {/if}
@@ -99,9 +104,11 @@
     justify-content: space-between;
     align-items: center;
     padding: 0 var(--spacing-l);
-    border-bottom: var(--border-light);
     gap: var(--spacing-m);
   }
+  .header.borderBottom {
+    border-bottom: var(--border-light);
+  }
   .title {
     flex: 1 1 auto;
     width: 0;
diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/ButtonActionEditor.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/ButtonActionEditor.svelte
index 6d9e96a564..d445c98a1a 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/ButtonActionEditor.svelte
+++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/ButtonActionEditor.svelte
@@ -1,7 +1,6 @@
 <script>
-  import { ActionButton, Button, Drawer } from "@budibase/bbui"
+  import { ActionButton, Button, Drawer, notifications } from "@budibase/bbui"
   import { createEventDispatcher } from "svelte"
-  import { notifications } from "@budibase/bbui"
   import ButtonActionDrawer from "./ButtonActionDrawer.svelte"
   import { cloneDeep } from "lodash/fp"
 
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 81a2119474..5905d240dc 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,17 +1,19 @@
 <script>
   import { Select, Label } from "@budibase/bbui"
   import { currentAsset, store } from "builderStore"
-  import { getActionProviderComponents } from "builderStore/dataBinding"
+  import { getActionProviders } from "builderStore/dataBinding"
   import { onMount } from "svelte"
   import DrawerBindableInput from "components/common/bindings/DrawerBindableInput.svelte"
 
   export let parameters
   export let bindings = []
+  export let nested
 
-  $: actionProviders = getActionProviderComponents(
+  $: actionProviders = getActionProviders(
     $currentAsset,
     $store.selectedComponentId,
-    "ChangeFormStep"
+    "ChangeFormStep",
+    { includeSelf: nested }
   )
 
   const typeOptions = [
@@ -46,8 +48,8 @@
     placeholder={null}
     bind:value={parameters.componentId}
     options={actionProviders}
-    getOptionLabel={x => x._instanceName}
-    getOptionValue={x => x._id}
+    getOptionLabel={x => x.readableBinding}
+    getOptionValue={x => x.runtimeBinding}
   />
   <Label small>Step</Label>
   <Select bind:value={parameters.type} options={typeOptions} />
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 b3bf7ebf7c..28343d6523 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,16 @@
 <script>
   import { Select, Label } from "@budibase/bbui"
   import { currentAsset, store } from "builderStore"
-  import { getActionProviderComponents } from "builderStore/dataBinding"
+  import { getActionProviders } from "builderStore/dataBinding"
 
   export let parameters
+  export let nested
 
-  $: actionProviders = getActionProviderComponents(
+  $: actionProviders = getActionProviders(
     $currentAsset,
     $store.selectedComponentId,
-    "ClearForm"
+    "ClearForm",
+    { includeSelf: nested }
   )
 </script>
 
@@ -17,8 +19,8 @@
   <Select
     bind:value={parameters.componentId}
     options={actionProviders}
-    getOptionLabel={x => x._instanceName}
-    getOptionValue={x => x._id}
+    getOptionLabel={x => x.readableBinding}
+    getOptionValue={x => x.runtimeBinding}
   />
 </div>
 
diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ContinueIf.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ContinueIf.svelte
index f284e24645..91b70e0c45 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ContinueIf.svelte
+++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ContinueIf.svelte
@@ -2,6 +2,7 @@
   import { Select, Body } from "@budibase/bbui"
   import { onMount } from "svelte"
   import DrawerBindableInput from "components/common/bindings/DrawerBindableInput.svelte"
+
   export let parameters
   export let bindings
 
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 18711497ff..94364367a8 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
@@ -2,27 +2,20 @@
   import { Select, Label, Body, Checkbox, Input } from "@budibase/bbui"
   import { store, currentAsset } from "builderStore"
   import { tables, viewsV2 } from "stores/backend"
-  import {
-    getContextProviderComponents,
-    getSchemaForDatasourcePlus,
-  } from "builderStore/dataBinding"
+  import { getSchemaForDatasourcePlus } from "builderStore/dataBinding"
   import SaveFields from "./SaveFields.svelte"
+  import { getDatasourceLikeProviders } from "components/design/settings/controls/ButtonActionEditor/actions/utils"
 
   export let parameters
   export let bindings = []
+  export let nested
 
-  $: formComponents = getContextProviderComponents(
-    $currentAsset,
-    $store.selectedComponentId,
-    "form"
-  )
-  $: schemaComponents = getContextProviderComponents(
-    $currentAsset,
-    $store.selectedComponentId,
-    "schema"
-  )
-  $: providerOptions = getProviderOptions(formComponents, schemaComponents)
-  $: schemaFields = getSchemaFields($currentAsset, parameters?.tableId)
+  $: providerOptions = getDatasourceLikeProviders({
+    asset: $currentAsset,
+    componentId: $store.selectedComponentId,
+    nested,
+  })
+  $: schemaFields = getSchemaFields(parameters?.tableId)
   $: tableOptions = $tables.list.map(table => ({
     label: table.name,
     resourceId: table._id,
@@ -33,44 +26,8 @@
   }))
   $: options = [...(tableOptions || []), ...(viewOptions || [])]
 
-  // Gets a context definition of a certain type from a component definition
-  const extractComponentContext = (component, contextType) => {
-    const def = store.actions.components.getDefinition(component?._component)
-    if (!def) {
-      return null
-    }
-    const contexts = Array.isArray(def.context) ? def.context : [def.context]
-    return contexts.find(context => context?.type === contextType)
-  }
-
-  // Gets options for valid context keys which provide valid data to submit
-  const getProviderOptions = (formComponents, schemaComponents) => {
-    const formContexts = formComponents.map(component => ({
-      component,
-      context: extractComponentContext(component, "form"),
-    }))
-    const schemaContexts = schemaComponents.map(component => ({
-      component,
-      context: extractComponentContext(component, "schema"),
-    }))
-    const allContexts = formContexts.concat(schemaContexts)
-
-    return allContexts.map(({ component, context }) => {
-      let runtimeBinding = component._id
-      if (context.suffix) {
-        runtimeBinding += `-${context.suffix}`
-      }
-      return {
-        label: component._instanceName,
-        value: runtimeBinding,
-      }
-    })
-  }
-
-  const getSchemaFields = (asset, tableId) => {
-    const { schema } = getSchemaForDatasourcePlus(tableId)
-    delete schema._id
-    delete schema._rev
+  const getSchemaFields = resourceId => {
+    const { schema } = getSchemaForDatasourcePlus(resourceId)
     return Object.values(schema || {})
   }
 
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 93ddca8c3f..06d1160993 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,16 @@
 <script>
   import { Select, Label } from "@budibase/bbui"
   import { currentAsset, store } from "builderStore"
-  import { getActionProviderComponents } from "builderStore/dataBinding"
+  import { getActionProviders } from "builderStore/dataBinding"
 
   export let parameters
+  export let nested
 
-  $: actionProviders = getActionProviderComponents(
+  $: actionProviders = getActionProviders(
     $currentAsset,
     $store.selectedComponentId,
-    "RefreshDatasource"
+    "RefreshDatasource",
+    { includeSelf: nested }
   )
 </script>
 
@@ -17,8 +19,8 @@
   <Select
     bind:value={parameters.componentId}
     options={actionProviders}
-    getOptionLabel={x => x._instanceName}
-    getOptionValue={x => x._id}
+    getOptionLabel={x => x.readableBinding}
+    getOptionValue={x => x.runtimeBinding}
   />
 </div>
 
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 c1917ad90f..9f70272d78 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
@@ -2,28 +2,19 @@
   import { Select, Label, Body, Checkbox, Input } from "@budibase/bbui"
   import { store, currentAsset } from "builderStore"
   import { tables, viewsV2 } from "stores/backend"
-  import {
-    getContextProviderComponents,
-    getSchemaForDatasourcePlus,
-  } from "builderStore/dataBinding"
+  import { getSchemaForDatasourcePlus } from "builderStore/dataBinding"
   import SaveFields from "./SaveFields.svelte"
+  import { getDatasourceLikeProviders } from "components/design/settings/controls/ButtonActionEditor/actions/utils"
 
   export let parameters
   export let bindings = []
   export let nested
 
-  $: formComponents = getContextProviderComponents(
-    $currentAsset,
-    $store.selectedComponentId,
-    "form",
-    { includeSelf: nested }
-  )
-  $: schemaComponents = getContextProviderComponents(
-    $currentAsset,
-    $store.selectedComponentId,
-    "schema"
-  )
-  $: providerOptions = getProviderOptions(formComponents, schemaComponents)
+  $: providerOptions = getDatasourceLikeProviders({
+    asset: $currentAsset,
+    componentId: $store.selectedComponentId,
+    nested,
+  })
   $: schemaFields = getSchemaFields(parameters?.tableId)
   $: tableOptions = $tables.list.map(table => ({
     label: table.name,
@@ -35,40 +26,6 @@
   }))
   $: options = [...(tableOptions || []), ...(viewOptions || [])]
 
-  // Gets a context definition of a certain type from a component definition
-  const extractComponentContext = (component, contextType) => {
-    const def = store.actions.components.getDefinition(component?._component)
-    if (!def) {
-      return null
-    }
-    const contexts = Array.isArray(def.context) ? def.context : [def.context]
-    return contexts.find(context => context?.type === contextType)
-  }
-
-  // Gets options for valid context keys which provide valid data to submit
-  const getProviderOptions = (formComponents, schemaComponents) => {
-    const formContexts = formComponents.map(component => ({
-      component,
-      context: extractComponentContext(component, "form"),
-    }))
-    const schemaContexts = schemaComponents.map(component => ({
-      component,
-      context: extractComponentContext(component, "schema"),
-    }))
-    const allContexts = formContexts.concat(schemaContexts)
-
-    return allContexts.map(({ component, context }) => {
-      let runtimeBinding = component._id
-      if (context.suffix) {
-        runtimeBinding += `-${context.suffix}`
-      }
-      return {
-        label: component._instanceName,
-        value: runtimeBinding,
-      }
-    })
-  }
-
   const getSchemaFields = resourceId => {
     const { schema } = getSchemaForDatasourcePlus(resourceId)
     return Object.values(schema || {})
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 49a93d71dd..e73884495d 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,22 +1,36 @@
 <script>
   import { currentAsset, store } from "builderStore"
   import { Label, Combobox, Select } from "@budibase/bbui"
-  import {
-    getActionProviderComponents,
-    buildFormSchema,
-  } from "builderStore/dataBinding"
+  import { getActionProviders, buildFormSchema } from "builderStore/dataBinding"
   import { findComponent } from "builderStore/componentUtils"
 
   export let parameters
+  export let nested
 
-  $: formComponent = findComponent($currentAsset.props, parameters.componentId)
+  $: formComponent = getFormComponent(
+    $currentAsset.props,
+    parameters.componentId
+  )
   $: formSchema = buildFormSchema(formComponent)
   $: fieldOptions = Object.keys(formSchema || {})
-  $: actionProviders = getActionProviderComponents(
+  $: actionProviders = getActionProviders(
     $currentAsset,
     $store.selectedComponentId,
-    "ScrollTo"
+    "ScrollTo",
+    { includeSelf: nested }
   )
+
+  const getFormComponent = (asset, id) => {
+    let component = findComponent(asset, id)
+    if (component) {
+      return component
+    }
+    // Check for block component IDs, and use the block itself instead
+    if (id?.includes("-")) {
+      return findComponent(asset, id.split("-")[0])
+    }
+    return null
+  }
 </script>
 
 <div class="root">
@@ -24,8 +38,8 @@
   <Select
     bind:value={parameters.componentId}
     options={actionProviders}
-    getOptionLabel={x => x._instanceName}
-    getOptionValue={x => x._id}
+    getOptionLabel={x => x.readableBinding}
+    getOptionValue={x => x.runtimeBinding}
   />
   <Label small>Field</Label>
   <Combobox bind:value={parameters.field} options={fieldOptions} />
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 cddf3e9fda..f1e21daf56 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
@@ -3,14 +3,12 @@
   import { onMount } from "svelte"
   import DrawerBindableInput from "components/common/bindings/DrawerBindableInput.svelte"
   import { currentAsset, store } from "builderStore"
-  import {
-    getActionProviderComponents,
-    buildFormSchema,
-  } from "builderStore/dataBinding"
+  import { getActionProviders, buildFormSchema } from "builderStore/dataBinding"
   import { findComponent } from "builderStore/componentUtils"
 
   export let parameters
   export let bindings = []
+  export let nested
 
   const typeOptions = [
     {
@@ -23,15 +21,31 @@
     },
   ]
 
-  $: formComponent = findComponent($currentAsset.props, parameters.componentId)
+  $: formComponent = getFormComponent(
+    $currentAsset.props,
+    parameters.componentId
+  )
   $: formSchema = buildFormSchema(formComponent)
   $: fieldOptions = Object.keys(formSchema || {})
-  $: actionProviders = getActionProviderComponents(
+  $: actionProviders = getActionProviders(
     $currentAsset,
     $store.selectedComponentId,
-    "ValidateForm"
+    "ValidateForm",
+    { includeSelf: nested }
   )
 
+  const getFormComponent = (asset, id) => {
+    let component = findComponent(asset, id)
+    if (component) {
+      return component
+    }
+    // Check for block component IDs, and use the block itself instead
+    if (id?.includes("-")) {
+      return findComponent(asset, id.split("-")[0])
+    }
+    return null
+  }
+
   onMount(() => {
     if (!parameters.type) {
       parameters.type = "set"
@@ -44,8 +58,8 @@
   <Select
     bind:value={parameters.componentId}
     options={actionProviders}
-    getOptionLabel={x => x._instanceName}
-    getOptionValue={x => x._id}
+    getOptionLabel={x => x.readableBinding}
+    getOptionValue={x => x.runtimeBinding}
   />
   <Label small>Type</Label>
   <Select
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 e7f3d91ec8..9b27550561 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,16 @@
 <script>
   import { Select, Label } from "@budibase/bbui"
   import { currentAsset, store } from "builderStore"
-  import { getActionProviderComponents } from "builderStore/dataBinding"
+  import { getActionProviders } from "builderStore/dataBinding"
 
   export let parameters
+  export let nested
 
-  $: actionProviders = getActionProviderComponents(
+  $: actionProviders = getActionProviders(
     $currentAsset,
     $store.selectedComponentId,
-    "ValidateForm"
+    "ValidateForm",
+    { includeSelf: nested }
   )
 </script>
 
@@ -17,8 +19,8 @@
   <Select
     bind:value={parameters.componentId}
     options={actionProviders}
-    getOptionLabel={x => x._instanceName}
-    getOptionValue={x => x._id}
+    getOptionLabel={x => x.readableBinding}
+    getOptionValue={x => x.runtimeBinding}
   />
   <div />
 </div>
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
new file mode 100644
index 0000000000..aa076fdd3e
--- /dev/null
+++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/utils.js
@@ -0,0 +1,82 @@
+import { getContextProviderComponents } from "builderStore/dataBinding"
+import { store } from "builderStore"
+import { capitalise } from "helpers"
+
+// Generates bindings for all components that provider "datasource like"
+// contexts. This includes "form" contexts and "schema" contexts. This is used
+// by various button actions as candidates for whole "row" objects.
+// Some examples are saving rows or duplicating rows.
+export const getDatasourceLikeProviders = ({ asset, componentId, nested }) => {
+  // Get all form context providers
+  const formComponents = getContextProviderComponents(
+    asset,
+    componentId,
+    "form",
+    { includeSelf: nested }
+  )
+
+  // Get all schema context providers
+  const schemaComponents = getContextProviderComponents(
+    asset,
+    componentId,
+    "schema",
+    { includeSelf: nested }
+  )
+
+  // Generate contexts for all form providers
+  const formContexts = formComponents.map(component => ({
+    component,
+    context: extractComponentContext(component, "form"),
+  }))
+
+  // Generate contexts for all schema providers
+  const schemaContexts = schemaComponents.map(component => ({
+    component,
+    context: extractComponentContext(component, "schema"),
+  }))
+
+  // Check for duplicate contexts by the same component. In this case, attempt
+  // to label contexts with their suffixes
+  schemaContexts.forEach(schemaContext => {
+    // Check if we have a form context for this component
+    const id = schemaContext.component._id
+    const existing = formContexts.find(x => x.component._id === id)
+    if (existing) {
+      if (existing.context.suffix) {
+        const suffix = capitalise(existing.context.suffix)
+        existing.readableSuffix = ` - ${suffix}`
+      }
+      if (schemaContext.context.suffix) {
+        const suffix = capitalise(schemaContext.context.suffix)
+        schemaContext.readableSuffix = ` - ${suffix}`
+      }
+    }
+  })
+
+  // Generate bindings for all contexts
+  const allContexts = formContexts.concat(schemaContexts)
+  return allContexts.map(({ component, context, readableSuffix }) => {
+    let readableBinding = component._instanceName
+    let runtimeBinding = component._id
+    if (context.suffix) {
+      runtimeBinding += `-${context.suffix}`
+    }
+    if (readableSuffix) {
+      readableBinding += readableSuffix
+    }
+    return {
+      label: readableBinding,
+      value: runtimeBinding,
+    }
+  })
+}
+
+// Gets a context definition of a certain type from a component definition
+const extractComponentContext = (component, contextType) => {
+  const def = store.actions.components.getDefinition(component?._component)
+  if (!def) {
+    return null
+  }
+  const contexts = Array.isArray(def.context) ? def.context : [def.context]
+  return contexts.find(context => context?.type === contextType)
+}
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 324418511b..ce91c8f7b5 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonConfiguration/ButtonConfiguration.svelte
+++ b/packages/builder/src/components/design/settings/controls/ButtonConfiguration/ButtonConfiguration.svelte
@@ -4,10 +4,15 @@
   import { createEventDispatcher } from "svelte"
   import { store } from "builderStore"
   import { Helpers } from "@budibase/bbui"
+  import { getEventContextBindings } from "builderStore/dataBinding"
 
+  export let componentInstance
   export let componentBindings
   export let bindings
   export let value
+  export let key
+  export let nested
+  export let max
 
   const dispatch = createEventDispatcher()
 
@@ -15,12 +20,18 @@
 
   $: buttonList = sanitizeValue(value) || []
   $: buttonCount = buttonList.length
+  $: eventContextBindings = getEventContextBindings({
+    componentInstance,
+    settingKey: key,
+  })
+  $: allBindings = [...bindings, ...eventContextBindings]
   $: itemProps = {
     componentBindings: componentBindings || [],
-    bindings,
+    bindings: allBindings,
     removeButton,
-    canRemove: buttonCount > 1,
+    nested,
   }
+  $: canAddButtons = max == null || buttonList.length < max
 
   const sanitizeValue = val => {
     return val?.map(button => {
@@ -86,11 +97,16 @@
       focus={focusItem}
       draggable={buttonCount > 1}
     />
-
-    <div class="list-footer" on:click={addButton}>
-      <div class="add-button">Add button</div>
-    </div>
   {/if}
+
+  <div
+    class="list-footer"
+    class:disabled={!canAddButtons}
+    on:click={addButton}
+    class:empty={!buttonCount}
+  >
+    <div class="add-button">Add button</div>
+  </div>
 </div>
 
 <style>
@@ -120,15 +136,21 @@
       var(--spectrum-table-border-color, var(--spectrum-alias-border-color-mid));
     cursor: pointer;
   }
-
-  .add-button {
-    margin: var(--spacing-s);
+  .list-footer.empty {
+    border-radius: 4px;
+  }
+  .list-footer.disabled {
+    color: var(--spectrum-global-color-gray-500);
+    pointer-events: none;
   }
-
   .list-footer:hover {
     background-color: var(
       --spectrum-table-row-background-color-hover,
       var(--spectrum-alias-highlight-hover)
     );
   }
+
+  .add-button {
+    margin: var(--spacing-s);
+  }
 </style>
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 a05fd9a39b..56b5deace4 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonConfiguration/ButtonSetting.svelte
+++ b/packages/builder/src/components/design/settings/controls/ButtonConfiguration/ButtonSetting.svelte
@@ -9,11 +9,33 @@
   export let bindings
   export let anchor
   export let removeButton
-  export let canRemove
+  export let nested
 
   $: readableText = isJSBinding(item.text)
     ? "(JavaScript function)"
     : runtimeToReadableBinding([...bindings, componentBindings], item.text)
+
+  // If this is a nested setting (for example inside a grid or form block) then
+  // we need to mark all the settings of the actual buttons as nested too, to
+  // allow us to reference context provided by the block.
+  // We will need to update this in future if the normal button component
+  // gets broken into multiple settings sections, as we assume a flat array.
+  const updatedNestedFlags = settings => {
+    if (!nested || !settings?.length) {
+      return settings
+    }
+    let newSettings = settings.map(setting => ({
+      ...setting,
+      nested: true,
+    }))
+    // We need to prevent bindings for the button names because of how grid
+    // blocks work. This is an edge case but unavoidable.
+    let name = newSettings.find(x => x.key === "text")
+    if (name) {
+      name.disableBindings = true
+    }
+    return newSettings
+  }
 </script>
 
 <div class="list-item-body">
@@ -24,12 +46,12 @@
       {componentBindings}
       {bindings}
       on:change
+      parseSettings={updatedNestedFlags}
     />
     <div class="field-label">{readableText || "Button"}</div>
   </div>
   <div class="list-item-right">
     <Icon
-      disabled={!canRemove}
       size="S"
       name="Close"
       hoverable
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 5cda0ebcca..25aa37365c 100644
--- a/packages/builder/src/components/design/settings/controls/DataSourceSelect/DataSourceSelect.svelte
+++ b/packages/builder/src/components/design/settings/controls/DataSourceSelect/DataSourceSelect.svelte
@@ -24,8 +24,9 @@
     queries as queriesStore,
     viewsV2 as viewsV2Store,
     views as viewsStore,
+    datasources,
+    integrations,
   } from "stores/backend"
-  import { datasources, integrations } from "stores/backend"
   import BindingBuilder from "components/integration/QueryBindingBuilder.svelte"
   import IntegrationQueryEditor from "components/integration/index.svelte"
   import { makePropSafe as safe } from "@budibase/string-templates"
diff --git a/packages/builder/src/components/design/settings/controls/DraggableList/DraggableList.svelte b/packages/builder/src/components/design/settings/controls/DraggableList/DraggableList.svelte
index 1992299e90..69d3c382cd 100644
--- a/packages/builder/src/components/design/settings/controls/DraggableList/DraggableList.svelte
+++ b/packages/builder/src/components/design/settings/controls/DraggableList/DraggableList.svelte
@@ -1,8 +1,7 @@
 <script>
   import { dndzone } from "svelte-dnd-action"
-  import { createEventDispatcher } from "svelte"
+  import { createEventDispatcher, setContext } from "svelte"
   import { generate } from "shortid"
-  import { setContext } from "svelte"
   import { writable, get } from "svelte/store"
   import DragHandle from "./drag-handle.svelte"
 
diff --git a/packages/builder/src/components/design/settings/controls/EditComponentPopover.svelte b/packages/builder/src/components/design/settings/controls/EditComponentPopover.svelte
index 0ba502bbcb..04bb925873 100644
--- a/packages/builder/src/components/design/settings/controls/EditComponentPopover.svelte
+++ b/packages/builder/src/components/design/settings/controls/EditComponentPopover.svelte
@@ -2,9 +2,8 @@
   import { Icon, Popover, Layout } from "@budibase/bbui"
   import { store } from "builderStore"
   import { cloneDeep } from "lodash/fp"
-  import { createEventDispatcher } from "svelte"
+  import { createEventDispatcher, getContext } from "svelte"
   import ComponentSettingsSection from "../../../../pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/ComponentSettingsSection.svelte"
-  import { getContext } from "svelte"
 
   export let anchor
   export let componentInstance
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 2b76bc6591..dfc4ddddc1 100644
--- a/packages/builder/src/components/design/settings/controls/FieldConfiguration/FieldConfiguration.svelte
+++ b/packages/builder/src/components/design/settings/controls/FieldConfiguration/FieldConfiguration.svelte
@@ -7,10 +7,9 @@
     getBindableProperties,
     getComponentBindableProperties,
   } from "builderStore/dataBinding"
-  import { currentAsset } from "builderStore"
+  import { currentAsset, store, selectedScreen } from "builderStore"
   import DraggableList from "../DraggableList/DraggableList.svelte"
   import { createEventDispatcher } from "svelte"
-  import { store, selectedScreen } from "builderStore"
   import FieldSetting from "./FieldSetting.svelte"
   import { convertOldFieldFormat, getComponentForField } from "./utils"
 
@@ -18,6 +17,7 @@
   export let value
 
   const dispatch = createEventDispatcher()
+
   let sanitisedFields
   let fieldList
   let schema
diff --git a/packages/builder/src/components/design/settings/controls/FlatButtonGroup/index.js b/packages/builder/src/components/design/settings/controls/FlatButtonGroup/index.js
index 5221ae4ef4..a1903695f4 100644
--- a/packages/builder/src/components/design/settings/controls/FlatButtonGroup/index.js
+++ b/packages/builder/src/components/design/settings/controls/FlatButtonGroup/index.js
@@ -1,2 +1,3 @@
 import FlatButtonGroup from "./FlatButtonGroup.svelte"
+
 export default FlatButtonGroup
diff --git a/packages/builder/src/components/design/settings/controls/PropertyControl.svelte b/packages/builder/src/components/design/settings/controls/PropertyControl.svelte
index c8135b4f61..a6f3d1b218 100644
--- a/packages/builder/src/components/design/settings/controls/PropertyControl.svelte
+++ b/packages/builder/src/components/design/settings/controls/PropertyControl.svelte
@@ -23,6 +23,7 @@
   export let highlighted = false
   export let propertyFocus = false
   export let info = null
+  export let disableBindings = false
 
   $: nullishValue = value == null || value === ""
   $: allBindings = getAllBindings(bindings, componentBindings, nested)
@@ -99,6 +100,7 @@
       {nested}
       {key}
       {type}
+      {disableBindings}
       {...props}
       on:drawerHide
       on:drawerShow
diff --git a/packages/builder/src/components/design/settings/controls/SectionSelect.svelte b/packages/builder/src/components/design/settings/controls/SectionSelect.svelte
index 4394f47cef..5b4eb8d2a9 100644
--- a/packages/builder/src/components/design/settings/controls/SectionSelect.svelte
+++ b/packages/builder/src/components/design/settings/controls/SectionSelect.svelte
@@ -32,7 +32,9 @@
   }
 </script>
 
-<ActionButton on:click={modal.show}>{layoutMap[value].name}</ActionButton>
+<ActionButton on:click={modal.show}>
+  {layoutMap[value || "mainSidebar"].name}
+</ActionButton>
 <Modal bind:this={modal}>
   <ModalContent
     onConfirm={() => dispatch("change", selected)}
diff --git a/packages/builder/src/components/integration/QueryViewerBindingBuilder.svelte b/packages/builder/src/components/integration/QueryViewerBindingBuilder.svelte
index 3d74e3f6b6..f8a14a6dd1 100644
--- a/packages/builder/src/components/integration/QueryViewerBindingBuilder.svelte
+++ b/packages/builder/src/components/integration/QueryViewerBindingBuilder.svelte
@@ -1,6 +1,7 @@
 <script>
   import KeyValueBuilder from "components/integration/KeyValueBuilder.svelte"
   import { getUserBindings } from "builderStore/dataBinding"
+
   export let bindable = true
   export let queryBindings = []
   export let hideHeading = false
diff --git a/packages/builder/src/components/integration/RestQueryViewer.svelte b/packages/builder/src/components/integration/RestQueryViewer.svelte
index 9634cd9746..64834c1b0b 100644
--- a/packages/builder/src/components/integration/RestQueryViewer.svelte
+++ b/packages/builder/src/components/integration/RestQueryViewer.svelte
@@ -404,7 +404,7 @@
     datasource = $datasources.list.find(ds => ds._id === query?.datasourceId)
     const datasourceUrl = datasource?.config.url
     const qs = query?.fields.queryString
-    breakQs = restUtils.breakQueryString(encodeURI(qs))
+    breakQs = restUtils.breakQueryString(encodeURI(qs ?? ""))
     breakQs = runtimeToReadableMap(mergedBindings, breakQs)
 
     const path = query.fields.path
diff --git a/packages/builder/src/components/portal/environment/CreateEditVariableModal.svelte b/packages/builder/src/components/portal/environment/CreateEditVariableModal.svelte
index e41ec8f745..5c69b151a6 100644
--- a/packages/builder/src/components/portal/environment/CreateEditVariableModal.svelte
+++ b/packages/builder/src/components/portal/environment/CreateEditVariableModal.svelte
@@ -11,6 +11,7 @@
   import { environment } from "stores/portal"
   import ConfirmDialog from "components/common/ConfirmDialog.svelte"
   import { getContext } from "svelte"
+
   const modalContext = getContext(Context.Modal)
 
   export let save
diff --git a/packages/builder/src/components/settings/ThemeModal.svelte b/packages/builder/src/components/settings/ThemeModal.svelte
index 43fe7b7768..fd6674b157 100644
--- a/packages/builder/src/components/settings/ThemeModal.svelte
+++ b/packages/builder/src/components/settings/ThemeModal.svelte
@@ -1,6 +1,5 @@
 <script>
-  import { ModalContent } from "@budibase/bbui"
-  import { Select } from "@budibase/bbui"
+  import { ModalContent, Select } from "@budibase/bbui"
   import { themeStore } from "builderStore"
   import { Constants } from "@budibase/frontend-core"
 </script>
diff --git a/packages/builder/src/components/usage/Usage.svelte b/packages/builder/src/components/usage/Usage.svelte
index 23d8ddc2f3..897a7da3dd 100644
--- a/packages/builder/src/components/usage/Usage.svelte
+++ b/packages/builder/src/components/usage/Usage.svelte
@@ -2,6 +2,7 @@
   import { Body, ProgressBar, Heading, Icon, Link } from "@budibase/bbui"
   import { admin, auth } from "../../stores/portal"
   import { onMount } from "svelte"
+
   export let usage
   export let warnWhenFull = false
 
diff --git a/packages/builder/src/helpers/keyUtils.js b/packages/builder/src/helpers/keyUtils.js
new file mode 100644
index 0000000000..8d6dfb06dc
--- /dev/null
+++ b/packages/builder/src/helpers/keyUtils.js
@@ -0,0 +1,7 @@
+function handleEnter(fnc) {
+  return e => e.key === "Enter" && fnc()
+}
+
+export const keyUtils = {
+  handleEnter,
+}
diff --git a/packages/builder/src/pages/builder/admin/index.svelte b/packages/builder/src/pages/builder/admin/index.svelte
index ede9d85808..9723c6b621 100644
--- a/packages/builder/src/pages/builder/admin/index.svelte
+++ b/packages/builder/src/pages/builder/admin/index.svelte
@@ -1,10 +1,17 @@
 <script>
-  import { Button, Heading, notifications, Layout, Body } from "@budibase/bbui"
+  import {
+    Button,
+    Heading,
+    notifications,
+    Layout,
+    Body,
+    FancyForm,
+    FancyInput,
+  } from "@budibase/bbui"
   import { goto } from "@roxi/routify"
   import { API } from "api"
   import { admin, auth } from "stores/portal"
   import Logo from "assets/bb-emblem.svg"
-  import { FancyForm, FancyInput } from "@budibase/bbui"
   import { TestimonialPage } from "@budibase/frontend-core/src/components"
   import { passwordsMatch, handleError } from "../auth/_components/utils"
 
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 a67c2d3c61..c3bb5171a4 100644
--- a/packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte
@@ -781,7 +781,7 @@
       {/if}
     </div>
   {:else}
-    <Divider />
+    <Divider noMargin />
     <div class="body">
       <Layout gap="L" noPadding>
         <div class="user-invite-form">
@@ -808,19 +808,21 @@
                 : Constants.BudibaseRoleOptionsNew.filter(
                     option => option.value !== Constants.BudibaseRoles.Admin
                   )}
-              label="Role"
+              label="Access"
             />
             {#if creationRoleType !== Constants.BudibaseRoles.Admin}
-              <RoleSelect
-                placeholder={false}
-                bind:value={creationAccessType}
-                allowPublic={false}
-                allowCreator={true}
-                quiet={true}
-                autoWidth
-                align="right"
-                fancySelect
-              />
+              <span class="role-wrap">
+                <RoleSelect
+                  placeholder={false}
+                  bind:value={creationAccessType}
+                  allowPublic={false}
+                  allowCreator={true}
+                  quiet={true}
+                  autoWidth
+                  align="right"
+                  fancySelect
+                />
+              </span>
             {/if}
           </FancyForm>
           {#if creationRoleType === Constants.BudibaseRoles.Admin}
@@ -847,6 +849,13 @@
 </div>
 
 <style>
+  .role-wrap :global(.fancy-field:not(:last-of-type)) {
+    border-bottom-left-radius: 4px;
+    border-bottom-right-radius: 4px;
+    border-top-left-radius: 0;
+    border-top-right-radius: 0;
+  }
+
   .search :global(input) {
     padding-left: 0px;
   }
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 dd18dbba82..16ed110b30 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,6 @@
 <script>
   import { Heading, Body, Layout, Button, Modal } from "@budibase/bbui"
-  import { automationStore, selectedAutomation } from "builderStore"
+  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,7 +8,6 @@
   import { onDestroy, onMount } from "svelte"
   import { syncURLToState } from "helpers/urlStateSync"
   import * as routify from "@roxi/routify"
-  import { store } from "builderStore"
 
   $: automationId = $selectedAutomation?._id
   $: store.actions.websocket.selectResource(automationId)
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 7bd87dd0f0..d1ddc4a39c 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
@@ -1,5 +1,5 @@
 <script>
-  import { Modal, keepOpen } from "@budibase/bbui"
+  import { Modal, keepOpen, notifications } from "@budibase/bbui"
   import { goto } from "@roxi/routify"
   import { IntegrationTypes } from "constants/backend"
   import GoogleAuthPrompt from "./GoogleAuthPrompt.svelte"
@@ -11,7 +11,6 @@
   import { createOnGoogleAuthStore } from "./stores/onGoogleAuth.js"
   import { createDatasourceCreationStore } from "./stores/datasourceCreation.js"
   import { configFromIntegration } from "stores/selectors"
-  import { notifications } from "@budibase/bbui"
 
   export let loading = false
   const store = createDatasourceCreationStore()
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 d89f09fc08..7dea0078fd 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/_layout.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/_layout.svelte
@@ -1,9 +1,12 @@
 <script>
-  import { Button, Layout } from "@budibase/bbui"
+  import { Layout } from "@budibase/bbui"
   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 NavHeader from "components/common/NavHeader.svelte"
+
+  let searchValue
 
   $: {
     // If we ever don't have any data other than the users table, prompt the
@@ -18,10 +21,17 @@
 <!-- routify:options index=1 -->
 <div class="data">
   {#if !$isActive("./new")}
-    <Panel title="Sources" borderRight>
-      <Layout paddingX="L" paddingY="XL" gap="S">
-        <Button cta on:click={() => $goto("./new")}>Add source</Button>
-        <DatasourceNavigator />
+    <Panel borderRight borderBottomHeader={false}>
+      <span class="panel-title-content" slot="panel-title-content">
+        <NavHeader
+          title="Sources"
+          placeholder="Search for sources"
+          bind:value={searchValue}
+          onAdd={() => $goto("./new")}
+        />
+      </span>
+      <Layout paddingX="L" paddingY="none" gap="S">
+        <DatasourceNavigator searchTerm={searchValue} />
       </Layout>
     </Panel>
   {/if}
@@ -51,4 +61,8 @@
     flex: 1 1 auto;
     z-index: 1;
   }
+
+  .panel-title-content {
+    display: contents;
+  }
 </style>
diff --git a/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/EditDatasourceConfigButton.svelte b/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/EditDatasourceConfigButton.svelte
index 06b739e858..f93c32e750 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/EditDatasourceConfigButton.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/EditDatasourceConfigButton.svelte
@@ -2,6 +2,7 @@
   import { Body } from "@budibase/bbui"
   import FontAwesomeIcon from "components/common/FontAwesomeIcon.svelte"
   import { IntegrationTypes } from "constants/backend"
+
   export let datasource
   const getSubtitle = datasource => {
     if (datasource.source === IntegrationTypes.REST) {
diff --git a/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Authentication/RestAuthenticationBuilder.svelte b/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Authentication/RestAuthenticationBuilder.svelte
index c94cbbf81c..341cdcf4b2 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Authentication/RestAuthenticationBuilder.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Authentication/RestAuthenticationBuilder.svelte
@@ -1,8 +1,7 @@
 <script>
-  import { Table, Modal, Layout, ActionButton } from "@budibase/bbui"
+  import { Table, Modal, Layout, ActionButton, Helpers } from "@budibase/bbui"
   import AuthTypeRenderer from "./AuthTypeRenderer.svelte"
   import RestAuthenticationModal from "./RestAuthenticationModal.svelte"
-  import { Helpers } from "@budibase/bbui"
   import { createEventDispatcher } from "svelte"
 
   export let authConfigs = []
diff --git a/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/relationship/[rowId]/index.svelte b/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/relationship/[rowId]/index.svelte
index 1db607ccc1..348ed0b5bf 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/relationship/[rowId]/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/relationship/[rowId]/index.svelte
@@ -1,5 +1,6 @@
 <script>
   import { redirect } from "@roxi/routify"
+
   $redirect("../../")
 </script>
 
diff --git a/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/relationship/index.svelte b/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/relationship/index.svelte
index f0baf88ffe..cecec0ab53 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/relationship/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/relationship/index.svelte
@@ -1,5 +1,6 @@
 <script>
   import { redirect } from "@roxi/routify"
+
   $redirect("../")
 </script>
 
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/ComponentInfoSection.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/ComponentInfoSection.svelte
index e73e6d7841..169dfa7934 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/ComponentInfoSection.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/ComponentInfoSection.svelte
@@ -1,6 +1,7 @@
 <script>
   import { DetailSummary } from "@budibase/bbui"
   import InfoDisplay from "./InfoDisplay.svelte"
+
   export let componentDefinition
 </script>
 
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 6281fc972f..1d2a1b9617 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
@@ -6,13 +6,12 @@
   import DesignSection from "./DesignSection.svelte"
   import CustomStylesSection from "./CustomStylesSection.svelte"
   import ConditionalUISection from "./ConditionalUISection.svelte"
-  import { notifications } from "@budibase/bbui"
+  import { notifications, ActionButton } from "@budibase/bbui"
 
   import {
     getBindableProperties,
     getComponentBindableProperties,
   } from "builderStore/dataBinding"
-  import { ActionButton } from "@budibase/bbui"
   import { capitalise } from "helpers"
 
   const onUpdateName = async value => {
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 65f010e4ec..6093d2a45e 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
@@ -179,6 +179,7 @@
               highlighted={$store.highlightedSettingKey === setting.key}
               propertyFocus={$store.propertyFocus === setting.key}
               info={setting.info}
+              disableBindings={setting.disableBindings}
               props={{
                 // Generic settings
                 placeholder: setting.placeholder || null,
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 a08ded8eee..fb9ee2c8a5 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
@@ -1,7 +1,7 @@
 <script>
   import { get } from "svelte/store"
-  import { Helpers } from "@budibase/bbui"
   import {
+    Helpers,
     Input,
     Checkbox,
     Banner,
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 6b5d356deb..1ad522cbd4 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,13 +1,14 @@
 <script>
-  import { store, userSelectedResourceMap } from "builderStore"
-  import ComponentDropdownMenu from "./ComponentDropdownMenu.svelte"
-  import NavItem from "components/common/NavItem.svelte"
-  import { notifications } from "@budibase/bbui"
   import {
+    store,
+    userSelectedResourceMap,
     selectedComponentPath,
     selectedComponent,
     selectedScreen,
   } from "builderStore"
+  import ComponentDropdownMenu from "./ComponentDropdownMenu.svelte"
+  import NavItem from "components/common/NavItem.svelte"
+  import { notifications } from "@budibase/bbui"
   import {
     findComponentPath,
     getComponentText,
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 7851fe61f8..67b501e141 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
@@ -4,10 +4,9 @@
   import { store, selectedScreen, userSelectedResourceMap } from "builderStore"
   import NavItem from "components/common/NavItem.svelte"
   import ComponentTree from "./ComponentTree.svelte"
-  import { dndStore } from "./dndStore.js"
+  import { dndStore, DropPosition } from "./dndStore.js"
   import ScreenslotDropdownMenu from "./ScreenslotDropdownMenu.svelte"
   import DNDPositionIndicator from "./DNDPositionIndicator.svelte"
-  import { DropPosition } from "./dndStore"
   import ComponentKeyHandler from "./ComponentKeyHandler.svelte"
   import ComponentScrollWrapper from "./ComponentScrollWrapper.svelte"
 
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 9ac544775b..f01533d6bd 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,34 +1,30 @@
 <script>
-  import { Icon, Layout, Body } from "@budibase/bbui"
+  import { Layout } from "@budibase/bbui"
   import { store, sortedScreens, userSelectedResourceMap } from "builderStore"
   import NavItem from "components/common/NavItem.svelte"
   import RoleIndicator from "./RoleIndicator.svelte"
   import DropdownMenu from "./DropdownMenu.svelte"
   import { goto } from "@roxi/routify"
   import { getVerticalResizeActions } from "./resizable"
-  import { tick } from "svelte"
+  import NavHeader from "components/common/NavHeader.svelte"
 
   const [resizable, resizableHandle] = getVerticalResizeActions()
 
   let searching = false
-  let resizing = false
   let searchValue = ""
-  let searchInput
   let screensContainer
   let scrolling = false
 
   $: filteredScreens = getFilteredScreens($sortedScreens, searchValue)
 
-  const openSearch = async () => {
-    searching = true
-    await tick()
-    searchInput.focus()
+  const handleOpenSearch = async () => {
     screensContainer.scroll({ top: 0, behavior: "smooth" })
   }
 
-  const closeSearch = async () => {
-    searching = false
-    searchValue = ""
+  $: {
+    if (searching) {
+      handleOpenSearch()
+    }
   }
 
   const getFilteredScreens = (screens, searchValue) => {
@@ -37,48 +33,20 @@
     })
   }
 
-  const handleAddButton = () => {
-    if (searching) {
-      closeSearch()
-    } else {
-      $goto("../new")
-    }
-  }
-
-  const onKeyDown = e => {
-    if (e.key === "Escape") {
-      closeSearch()
-    }
-  }
-
   const handleScroll = e => {
     scrolling = e.target.scrollTop !== 0
   }
 </script>
 
-<svelte:window on:keydown={onKeyDown} />
-<div class="screens" class:searching class:resizing use:resizable>
+<div class="screens" class:searching use:resizable>
   <div class="header" class:scrolling>
-    <input
-      readonly={!searching}
-      bind:value={searchValue}
-      bind:this={searchInput}
-      class="input"
+    <NavHeader
+      title="Screens"
       placeholder="Search for screens"
+      bind:value={searchValue}
+      bind:search={searching}
+      onAdd={() => $goto("../new")}
     />
-    <div on:click={openSearch} class="title" class:hide={searching}>
-      <Body size="S">Screens</Body>
-    </div>
-    <div on:click={openSearch} class="searchButton" class:hide={searching}>
-      <Icon size="S" name="Search" />
-    </div>
-    <div
-      on:click={handleAddButton}
-      class="addButton"
-      class:closeButton={searching}
-    >
-      <Icon name="Add" />
-    </div>
   </div>
   <div on:scroll={handleScroll} bind:this={screensContainer} class="content">
     {#if filteredScreens?.length}
@@ -132,10 +100,6 @@
     max-height: 100%;
     height: 100% !important;
   }
-  .screens.resizing {
-    user-select: none;
-    cursor: row-resize;
-  }
 
   .header {
     flex-shrink: 0;
@@ -152,77 +116,15 @@
     border-bottom: var(--border-light);
   }
 
-  .input {
-    font-family: var(--font-sans);
-    position: absolute;
-    color: var(--ink);
-    background-color: transparent;
-    border: none;
-    font-size: var(--spectrum-alias-font-size-default);
-    flex: 1;
-    box-sizing: border-box;
-    display: none;
-  }
-  .input:focus {
-    outline: none;
-  }
-  .input::placeholder {
-    color: var(--spectrum-global-color-gray-600);
-  }
-  .screens.searching input {
-    display: block;
-  }
-
-  .title {
-    display: flex;
-    align-items: center;
-    height: 100%;
-    box-sizing: border-box;
-    flex: 1;
-    opacity: 1;
-    z-index: 1;
-  }
-
   .content {
     overflow: auto;
     flex-grow: 1;
   }
-  .screens.resizing .content {
-    pointer-events: none;
-  }
 
   .screens :global(.nav-item) {
     padding-right: 8px !important;
   }
 
-  .searchButton {
-    color: var(--grey-7);
-    cursor: pointer;
-    margin-right: 10px;
-    opacity: 1;
-  }
-  .searchButton:hover {
-    color: var(--ink);
-  }
-
-  .hide {
-    opacity: 0;
-    pointer-events: none;
-  }
-
-  .addButton {
-    color: var(--grey-7);
-    cursor: pointer;
-    transition: transform 300ms ease-out;
-  }
-  .addButton:hover {
-    color: var(--ink);
-  }
-
-  .closeButton {
-    transform: rotate(45deg);
-  }
-
   .icon {
     margin-left: 4px;
     margin-right: 4px;
diff --git a/packages/builder/src/pages/builder/app/[application]/design/_components/NewScreen/DatasourceTemplateRow.svelte b/packages/builder/src/pages/builder/app/[application]/design/_components/NewScreen/DatasourceTemplateRow.svelte
index dac0aaed6e..0db89cfe74 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/_components/NewScreen/DatasourceTemplateRow.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/_components/NewScreen/DatasourceTemplateRow.svelte
@@ -1,5 +1,6 @@
 <script>
   import { Icon } from "@budibase/bbui"
+
   export let datasource
   export let selected = false
 
diff --git a/packages/builder/src/pages/builder/app/[application]/index.svelte b/packages/builder/src/pages/builder/app/[application]/index.svelte
index 0143f38324..561f6c6478 100644
--- a/packages/builder/src/pages/builder/app/[application]/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/index.svelte
@@ -1,4 +1,5 @@
 <script>
   import { redirect } from "@roxi/routify"
+
   $redirect("./data")
 </script>
diff --git a/packages/builder/src/pages/builder/app/[application]/settings/automation-history/_components/StatusRenderer.svelte b/packages/builder/src/pages/builder/app/[application]/settings/automation-history/_components/StatusRenderer.svelte
index fd289163b4..7dd42ad6a6 100644
--- a/packages/builder/src/pages/builder/app/[application]/settings/automation-history/_components/StatusRenderer.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/settings/automation-history/_components/StatusRenderer.svelte
@@ -1,5 +1,6 @@
 <script>
   import { Badge } from "@budibase/bbui"
+
   export let value
 
   $: isError = !value || value.toLowerCase() === "error"
diff --git a/packages/builder/src/pages/builder/app/[application]/settings/backups/_components/TypeRenderer.svelte b/packages/builder/src/pages/builder/app/[application]/settings/backups/_components/TypeRenderer.svelte
index 86ad0f3d4e..9fd15c22df 100644
--- a/packages/builder/src/pages/builder/app/[application]/settings/backups/_components/TypeRenderer.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/settings/backups/_components/TypeRenderer.svelte
@@ -1,5 +1,6 @@
 <script>
   import { BackupTrigger } from "constants/backend/backups"
+
   export let row
 
   $: trigger = row?.trigger || "manual"
diff --git a/packages/builder/src/pages/builder/app/index.svelte b/packages/builder/src/pages/builder/app/index.svelte
index 05a71911d2..cc00116ba0 100644
--- a/packages/builder/src/pages/builder/app/index.svelte
+++ b/packages/builder/src/pages/builder/app/index.svelte
@@ -1,4 +1,5 @@
 <script>
   import { redirect } from "@roxi/routify"
+
   $redirect("../portal")
 </script>
diff --git a/packages/builder/src/pages/builder/auth/forgot.svelte b/packages/builder/src/pages/builder/auth/forgot.svelte
index 9df7196cfe..1d7f602bb0 100644
--- a/packages/builder/src/pages/builder/auth/forgot.svelte
+++ b/packages/builder/src/pages/builder/auth/forgot.svelte
@@ -6,13 +6,14 @@
     Body,
     Heading,
     Icon,
+    FancyForm,
+    FancyInput,
   } from "@budibase/bbui"
   import { organisation, auth } from "stores/portal"
   import Logo from "assets/bb-emblem.svg"
   import { onMount } from "svelte"
   import { goto } from "@roxi/routify"
   import { TestimonialPage } from "@budibase/frontend-core/src/components"
-  import { FancyForm, FancyInput } from "@budibase/bbui"
 
   let email = ""
   let form
diff --git a/packages/builder/src/pages/builder/auth/login.svelte b/packages/builder/src/pages/builder/auth/login.svelte
index 9dae365add..0ba7e6448b 100644
--- a/packages/builder/src/pages/builder/auth/login.svelte
+++ b/packages/builder/src/pages/builder/auth/login.svelte
@@ -8,6 +8,8 @@
     Layout,
     notifications,
     Link,
+    FancyForm,
+    FancyInput,
   } from "@budibase/bbui"
   import { goto } from "@roxi/routify"
   import { auth, organisation, oidc, admin } from "stores/portal"
@@ -16,7 +18,6 @@
   import { handleError } from "./_components/utils"
   import Logo from "assets/bb-emblem.svg"
   import { TestimonialPage } from "@budibase/frontend-core/src/components"
-  import { FancyForm, FancyInput } from "@budibase/bbui"
   import { onMount } from "svelte"
 
   let loaded = false
diff --git a/packages/builder/src/pages/builder/auth/reset.svelte b/packages/builder/src/pages/builder/auth/reset.svelte
index becc30d9a4..ac7414c5ca 100644
--- a/packages/builder/src/pages/builder/auth/reset.svelte
+++ b/packages/builder/src/pages/builder/auth/reset.svelte
@@ -1,10 +1,17 @@
 <script>
-  import { Body, Button, Heading, Layout, notifications } from "@budibase/bbui"
+  import {
+    Body,
+    Button,
+    Heading,
+    Layout,
+    notifications,
+    FancyForm,
+    FancyInput,
+  } from "@budibase/bbui"
   import { goto, params } from "@roxi/routify"
   import { auth, organisation } from "stores/portal"
   import Logo from "assets/bb-emblem.svg"
   import { TestimonialPage } from "@budibase/frontend-core/src/components"
-  import { FancyForm, FancyInput } from "@budibase/bbui"
   import { onMount } from "svelte"
   import { handleError, passwordsMatch } from "./_components/utils"
 
diff --git a/packages/builder/src/pages/builder/invite/index.svelte b/packages/builder/src/pages/builder/invite/index.svelte
index 606a1162ce..12d6ae77cc 100644
--- a/packages/builder/src/pages/builder/invite/index.svelte
+++ b/packages/builder/src/pages/builder/invite/index.svelte
@@ -1,10 +1,17 @@
 <script>
-  import { Layout, Heading, Body, Button, notifications } from "@budibase/bbui"
+  import {
+    Layout,
+    Heading,
+    Body,
+    Button,
+    notifications,
+    FancyForm,
+    FancyInput,
+  } from "@budibase/bbui"
   import { goto, params } from "@roxi/routify"
   import { users, organisation, auth } from "stores/portal"
   import Logo from "assets/bb-emblem.svg"
   import { TestimonialPage } from "@budibase/frontend-core/src/components"
-  import { FancyForm, FancyInput } from "@budibase/bbui"
   import { onMount } from "svelte"
   import { handleError, passwordsMatch } from "../auth/_components/utils"
 
diff --git a/packages/builder/src/pages/builder/portal/account/auditLogs/_components/TimeRenderer.svelte b/packages/builder/src/pages/builder/portal/account/auditLogs/_components/TimeRenderer.svelte
index b6c0262b47..e1867092c0 100644
--- a/packages/builder/src/pages/builder/portal/account/auditLogs/_components/TimeRenderer.svelte
+++ b/packages/builder/src/pages/builder/portal/account/auditLogs/_components/TimeRenderer.svelte
@@ -1,6 +1,7 @@
 <script>
   import dayjs from "dayjs"
   import relativeTime from "dayjs/plugin/relativeTime"
+
   dayjs.extend(relativeTime)
 
   export let row
diff --git a/packages/builder/src/pages/builder/portal/account/index.svelte b/packages/builder/src/pages/builder/portal/account/index.svelte
index 141cf2a73e..49730d7149 100644
--- a/packages/builder/src/pages/builder/portal/account/index.svelte
+++ b/packages/builder/src/pages/builder/portal/account/index.svelte
@@ -1,4 +1,5 @@
 <script>
   import { redirect } from "@roxi/routify"
+
   $redirect("./usage")
 </script>
diff --git a/packages/builder/src/pages/builder/portal/apps/[appId]/ErrorSVG.svelte b/packages/builder/src/pages/builder/portal/apps/[appId]/ErrorSVG.svelte
new file mode 100644
index 0000000000..1366484495
--- /dev/null
+++ b/packages/builder/src/pages/builder/portal/apps/[appId]/ErrorSVG.svelte
@@ -0,0 +1,65 @@
+<xml version="1.0" />
+<svg
+  xmlns="http://www.w3.org/2000/svg"
+  enable-background="new 0 0 48 48"
+  height="48px"
+  viewBox="0 0 48 48"
+  width="48px"
+  xml:space="preserve"
+>
+  <g>
+    <g>
+      <path
+        d="M9,42H3c-0.552,0-1-0.449-1-1v-3.5C2,37.224,2.224,37,2.5,37S3,37.224,3,37.5V41h6    c0.276,0,0.5,0.224,0.5,0.5S9.276,42,9,42z"
+      />
+      <path
+        d="M45,42h-6c-0.276,0-0.5-0.224-0.5-0.5S38.724,41,39,41h6V13H3v27c0,0.276-0.224,0.5-0.5,0.5S2,40.276,2,40    V12h44v29C46,41.551,45.552,42,45,42z"
+      />
+      <g>
+        <path
+          d="M45.5,13h-43C2.224,13,2,12.776,2,12.5v-5C2,6.673,2.673,6,3.5,6h41C45.327,6,46,6.673,46,7.5v5     C46,12.776,45.776,13,45.5,13z M3,12h42V7.5C45,7.224,44.775,7,44.5,7h-41C3.225,7,3,7.224,3,7.5V12z"
+        />
+      </g>
+      <g>
+        <g>
+          <path
+            d="M16.5,11c-0.827,0-1.5-0.673-1.5-1.5S15.673,8,16.5,8S18,8.673,18,9.5S17.327,11,16.5,11z M16.5,9      C16.225,9,16,9.224,16,9.5s0.225,0.5,0.5,0.5S17,9.776,17,9.5S16.775,9,16.5,9z"
+          />
+        </g>
+        <g>
+          <path
+            d="M11.5,11c-0.827,0-1.5-0.673-1.5-1.5S10.673,8,11.5,8S13,8.673,13,9.5S12.327,11,11.5,11z M11.5,9      C11.225,9,11,9.224,11,9.5s0.225,0.5,0.5,0.5S12,9.776,12,9.5S11.775,9,11.5,9z"
+          />
+        </g>
+        <g>
+          <path
+            d="M6.5,11C5.673,11,5,10.327,5,9.5S5.673,8,6.5,8S8,8.673,8,9.5S7.327,11,6.5,11z M6.5,9      C6.225,9,6,9.224,6,9.5S6.225,10,6.5,10S7,9.776,7,9.5S6.775,9,6.5,9z"
+          />
+        </g>
+      </g>
+    </g>
+    <g>
+      <g>
+        <path
+          d="M35.696,44H12.304c-0.728,0-1.313-0.284-1.605-0.779c-0.289-0.489-0.259-1.126,0.084-1.749L22.58,19.996     c0.709-1.285,2.132-1.285,2.839,0l11.799,21.477v0c0.343,0.623,0.373,1.26,0.084,1.749C37.01,43.716,36.424,44,35.696,44z M24,20     c-0.176,0-0.379,0.179-0.544,0.478L11.659,41.954c-0.168,0.306-0.205,0.582-0.101,0.758C11.667,42.895,11.938,43,12.304,43     h23.393c0.365,0,0.637-0.105,0.745-0.288c0.104-0.177,0.067-0.453-0.101-0.758v0L24.543,20.478C24.379,20.179,24.176,20,24,20z"
+        />
+      </g>
+      <g>
+        <path
+          d="M24,36L24,36c-0.225,0-0.421-0.15-0.481-0.366C23.456,35.412,22,30.169,22,28c0-1.103,0.897-2,2-2     s2,0.897,2,2c0,2.232-1.457,7.417-1.519,7.636C24.42,35.851,24.224,36,24,36z M24,27c-0.552,0-1,0.449-1,1     c0,1.266,0.569,3.793,1.002,5.531C24.435,31.806,25,29.301,25,28C25,27.449,24.552,27,24,27z"
+        />
+      </g>
+      <g>
+        <path
+          d="M24,41c-1.103,0-2-0.897-2-2s0.897-2,2-2s2,0.897,2,2S25.103,41,24,41z M24,38c-0.552,0-1,0.449-1,1     s0.448,1,1,1s1-0.449,1-1S24.552,38,24,38z"
+        />
+      </g>
+    </g>
+  </g>
+</svg>
+
+<style>
+  svg {
+    fill: var(--ink);
+  }
+</style>
diff --git a/packages/builder/src/pages/builder/portal/apps/[appId]/index.svelte b/packages/builder/src/pages/builder/portal/apps/[appId]/index.svelte
index 1458b69aec..e87c1104dd 100644
--- a/packages/builder/src/pages/builder/portal/apps/[appId]/index.svelte
+++ b/packages/builder/src/pages/builder/portal/apps/[appId]/index.svelte
@@ -1,8 +1,10 @@
 <script>
   import { params, goto } from "@roxi/routify"
   import { apps, auth, sideBarCollapsed } from "stores/portal"
-  import { ActionButton } from "@budibase/bbui"
+  import { Link, Body, ActionButton } from "@budibase/bbui"
   import { sdk } from "@budibase/shared-core"
+  import { API } from "api"
+  import ErrorSVG from "./ErrorSVG.svelte"
 
   $: app = $apps.find(app => app.appId === $params.appId)
   $: iframeUrl = getIframeURL(app)
@@ -14,6 +16,18 @@
     }
     return `/${app.devId}`
   }
+
+  let noScreens = false
+
+  // Normally fetched in builder/src/pages/builder/app/[application]/_layout.svelte
+  const fetchScreens = async appId => {
+    if (!appId) return
+
+    const pkg = await API.fetchAppPackage(appId)
+    noScreens = pkg.screens.length === 0
+  }
+
+  $: fetchScreens(app?.devId)
 </script>
 
 <div class="container">
@@ -45,6 +59,7 @@
       </ActionButton>
     {/if}
     <ActionButton
+      disabled={noScreens}
       quiet
       icon="LinkOut"
       on:click={() => window.open(iframeUrl, "_blank")}
@@ -52,7 +67,19 @@
       Fullscreen
     </ActionButton>
   </div>
-  <iframe src={iframeUrl} title={app.name} />
+  {#if noScreens}
+    <div class="noScreens">
+      <ErrorSVG />
+      <Body>You haven't added any screens to your app yet.</Body>
+      <Body>
+        <Link size="L" href={`/builder/app/${app.devId}/design`}
+          >Click here</Link
+        > to add some.
+      </Body>
+    </div>
+  {:else}
+    <iframe src={iframeUrl} title={app.name} />
+  {/if}
 </div>
 
 <style>
@@ -64,6 +91,7 @@
     align-items: stretch;
     padding: 0 var(--spacing-l) var(--spacing-l) var(--spacing-l);
   }
+
   .header {
     display: flex;
     justify-content: flex-start;
@@ -71,9 +99,27 @@
     gap: var(--spacing-xs);
     flex: 0 0 50px;
   }
+
   iframe {
     flex: 1 1 auto;
     border-radius: var(--spacing-s);
     border: 1px solid var(--spectrum-global-color-gray-300);
   }
+
+  .noScreens {
+    width: 100%;
+    height: 100%;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    flex-direction: column;
+    padding: 20px;
+    box-sizing: border-box;
+  }
+
+  .noScreens :global(svg) {
+    width: 100px;
+    height: 100px;
+    margin-bottom: 10px;
+  }
 </style>
diff --git a/packages/builder/src/pages/builder/portal/apps/_components/PortalSideBar.svelte b/packages/builder/src/pages/builder/portal/apps/_components/PortalSideBar.svelte
index 7989c5f1a8..3ece483425 100644
--- a/packages/builder/src/pages/builder/portal/apps/_components/PortalSideBar.svelte
+++ b/packages/builder/src/pages/builder/portal/apps/_components/PortalSideBar.svelte
@@ -1,13 +1,10 @@
 <script>
-  import { Icon, Body } from "@budibase/bbui"
   import { apps, sideBarCollapsed } from "stores/portal"
   import { params, goto } from "@roxi/routify"
-  import { tick } from "svelte"
   import NavItem from "components/common/NavItem.svelte"
+  import NavHeader from "components/common/NavHeader.svelte"
 
-  let searchInput
   let searchString
-  let searching = false
 
   $: filteredApps = $apps
     .filter(app => {
@@ -21,39 +18,16 @@
       const lowerB = b.name.toLowerCase()
       return lowerA > lowerB ? 1 : -1
     })
-
-  const startSearching = async () => {
-    searching = true
-    searchString = ""
-    await tick()
-    searchInput.focus()
-  }
-
-  const stopSearching = () => {
-    searching = false
-    searchString = ""
-  }
 </script>
 
 <div class="side-bar" class:collapsed={$sideBarCollapsed}>
   <div class="side-bar-controls">
-    {#if searching}
-      <input
-        bind:this={searchInput}
-        bind:value={searchString}
-        placeholder="Search for apps"
-      />
-    {:else}
-      <Body size="S">Apps</Body>
-      <Icon name="Search" size="S" hoverable on:click={startSearching} />
-    {/if}
-    <div class="rotational" class:rotated={searching}>
-      <Icon
-        name="Add"
-        hoverable
-        on:click={searching ? stopSearching : () => $goto("./create")}
-      />
-    </div>
+    <NavHeader
+      title="Apps"
+      placeholder="Search for apps"
+      bind:value={searchString}
+      onAdd={() => $goto("./create")}
+    />
   </div>
   <div class="side-bar-nav">
     <NavItem
@@ -103,44 +77,13 @@
     gap: var(--spacing-l);
     padding: 0 var(--spacing-l);
   }
-  .side-bar-controls :global(.spectrum-Body),
-  .side-bar-controls input {
-    flex: 1 1 auto;
-  }
   .side-bar-controls :global(.spectrum-Icon) {
     color: var(--spectrum-global-color-gray-700);
   }
 
-  input {
-    outline: none;
-    border: none;
-    max-width: none;
-    flex: 1 1 auto;
-    color: var(--spectrum-global-color-gray-800);
-    font-size: 14px;
-    padding: 0;
-    transition: border 130ms ease-out;
-    font-family: var(--font-sans);
-    background: inherit;
-  }
-  input::placeholder {
-    color: var(--spectrum-global-color-gray-700);
-    transition: color 130ms ease-out;
-  }
-  input:hover::placeholder {
-    color: var(--spectrum-global-color-gray-800);
-  }
-
   .side-bar-nav {
     flex: 1 1 auto;
     overflow: auto;
     overflow-x: hidden;
   }
-
-  div.rotational {
-    transition: transform 130ms ease-out;
-  }
-  div.rotational.rotated {
-    transform: rotate(45deg);
-  }
 </style>
diff --git a/packages/builder/src/pages/builder/portal/index.svelte b/packages/builder/src/pages/builder/portal/index.svelte
index 5426d52fae..8651ae5e08 100644
--- a/packages/builder/src/pages/builder/portal/index.svelte
+++ b/packages/builder/src/pages/builder/portal/index.svelte
@@ -1,4 +1,5 @@
 <script>
   import { redirect } from "@roxi/routify"
+
   $redirect("./apps")
 </script>
diff --git a/packages/builder/src/pages/builder/portal/settings/index.svelte b/packages/builder/src/pages/builder/portal/settings/index.svelte
index 842fe01be8..09ead3e410 100644
--- a/packages/builder/src/pages/builder/portal/settings/index.svelte
+++ b/packages/builder/src/pages/builder/portal/settings/index.svelte
@@ -1,4 +1,5 @@
 <script>
   import { redirect } from "@roxi/routify"
+
   $redirect("./auth")
 </script>
diff --git a/packages/builder/src/pages/builder/portal/users/groups/_components/UsersTableRenderer.svelte b/packages/builder/src/pages/builder/portal/users/groups/_components/UsersTableRenderer.svelte
index 2adc0c82ae..c701f582a2 100644
--- a/packages/builder/src/pages/builder/portal/users/groups/_components/UsersTableRenderer.svelte
+++ b/packages/builder/src/pages/builder/portal/users/groups/_components/UsersTableRenderer.svelte
@@ -1,5 +1,6 @@
 <script>
   import { Icon } from "@budibase/bbui"
+
   export let value
 </script>
 
diff --git a/packages/builder/src/pages/builder/portal/users/index.svelte b/packages/builder/src/pages/builder/portal/users/index.svelte
index 4dbb81f7c6..b876b2866c 100644
--- a/packages/builder/src/pages/builder/portal/users/index.svelte
+++ b/packages/builder/src/pages/builder/portal/users/index.svelte
@@ -1,4 +1,5 @@
 <script>
   import { redirect } from "@roxi/routify"
+
   $redirect("./users")
 </script>
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 e6821cba37..a9f2ca6e08 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,8 +1,7 @@
 <script>
   import { StatusLight } from "@budibase/bbui"
-  import { RoleUtils } from "@budibase/frontend-core"
+  import { RoleUtils, Constants } from "@budibase/frontend-core"
   import { roles } from "stores/backend"
-  import { Constants } from "@budibase/frontend-core"
   import { capitalise } from "helpers"
 
   export let value
diff --git a/packages/builder/src/pages/builder/portal/users/users/_components/RolesTagsTableRenderer.svelte b/packages/builder/src/pages/builder/portal/users/users/_components/RolesTagsTableRenderer.svelte
index 7e63045edd..402344dedd 100644
--- a/packages/builder/src/pages/builder/portal/users/users/_components/RolesTagsTableRenderer.svelte
+++ b/packages/builder/src/pages/builder/portal/users/users/_components/RolesTagsTableRenderer.svelte
@@ -1,5 +1,6 @@
 <script>
   import TagsTableRenderer from "./TagsTableRenderer.svelte"
+
   export let value
 
   $: roles = value?.filter(role => role != null).map(role => role.name) ?? []
diff --git a/packages/builder/src/pages/builder/portal/users/users/_components/TagsTableRenderer.svelte b/packages/builder/src/pages/builder/portal/users/users/_components/TagsTableRenderer.svelte
index d2b56bbf33..8b2fd3c522 100644
--- a/packages/builder/src/pages/builder/portal/users/users/_components/TagsTableRenderer.svelte
+++ b/packages/builder/src/pages/builder/portal/users/users/_components/TagsTableRenderer.svelte
@@ -1,5 +1,6 @@
 <script>
   import { Tag, Tags } from "@budibase/bbui"
+
   export let value
 
   const displayLimit = 5
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 ff8b749602..37cbcabbca 100644
--- a/packages/builder/src/pages/builder/portal/users/users/index.svelte
+++ b/packages/builder/src/pages/builder/portal/users/users/index.svelte
@@ -82,6 +82,7 @@
       minWidth: "200px",
     },
     role: {
+      displayName: "Access",
       sortable: false,
       width: "1fr",
     },
diff --git a/packages/cli/.eslintrc b/packages/cli/.eslintrc
deleted file mode 100644
index 3431bf04fb..0000000000
--- a/packages/cli/.eslintrc
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "globals": {
-    "emit": true,
-    "key": true
-  },
-  "env": {
-    "node": true
-  },
-  "extends": ["eslint:recommended"],
-  "rules": {
-  }
-}
\ No newline at end of file
diff --git a/packages/cli/src/backups/index.ts b/packages/cli/src/backups/index.ts
index 2b148f34af..bc84c9ffc3 100644
--- a/packages/cli/src/backups/index.ts
+++ b/packages/cli/src/backups/index.ts
@@ -13,6 +13,7 @@ import {
   getPouches,
 } from "./utils"
 import { exportObjects, importObjects } from "./objectStore"
+
 const tar = require("tar")
 
 type BackupOpts = { env?: string; import?: string; export?: string }
diff --git a/packages/cli/src/backups/objectStore.ts b/packages/cli/src/backups/objectStore.ts
index d801f6e453..32fc07c05b 100644
--- a/packages/cli/src/backups/objectStore.ts
+++ b/packages/cli/src/backups/objectStore.ts
@@ -3,6 +3,7 @@ import fs from "fs"
 import { join } from "path"
 import { TEMP_DIR, MINIO_DIR } from "./utils"
 import { progressBar } from "../utils"
+
 const {
   ObjectStoreBuckets,
   ObjectStore,
diff --git a/packages/cli/src/exec.ts b/packages/cli/src/exec.ts
index fb84d4fd0f..df35e6681f 100644
--- a/packages/cli/src/exec.ts
+++ b/packages/cli/src/exec.ts
@@ -1,5 +1,6 @@
 import util from "util"
 import childProcess from "child_process"
+
 const runCommand = util.promisify(childProcess.exec)
 
 export async function exec(command: string, dir = "./") {
diff --git a/packages/cli/src/hosting/genUser.ts b/packages/cli/src/hosting/genUser.ts
index e02bb20e1f..3d433272a2 100644
--- a/packages/cli/src/hosting/genUser.ts
+++ b/packages/cli/src/hosting/genUser.ts
@@ -2,6 +2,7 @@ const { success } = require("../utils")
 const { updateDockerComposeService } = require("./utils")
 const randomString = require("randomstring")
 const { GENERATED_USER_EMAIL } = require("../constants")
+
 import { DockerCompose } from "./types"
 
 export async function generateUser(password: string | null, silent: boolean) {
diff --git a/packages/cli/src/hosting/makeFiles.ts b/packages/cli/src/hosting/makeFiles.ts
index b11a07c107..42cc704adf 100644
--- a/packages/cli/src/hosting/makeFiles.ts
+++ b/packages/cli/src/hosting/makeFiles.ts
@@ -4,6 +4,7 @@ import fs from "fs"
 import path from "path"
 import yaml from "yaml"
 import { getAppService } from "./utils"
+
 const randomString = require("randomstring")
 
 const SINGLE_IMAGE = "budibase/budibase:latest"
diff --git a/packages/cli/src/plugins/index.ts b/packages/cli/src/plugins/index.ts
index c29de2a297..a18f78a20c 100644
--- a/packages/cli/src/plugins/index.ts
+++ b/packages/cli/src/plugins/index.ts
@@ -1,5 +1,10 @@
 import { Command } from "../structures/Command"
-import { CommandWord, AnalyticsEvent, InitType } from "../constants"
+import {
+  CommandWord,
+  AnalyticsEvent,
+  InitType,
+  GENERATED_USER_EMAIL,
+} from "../constants"
 import { getSkeleton, fleshOutSkeleton } from "./skeleton"
 import * as questions from "../questions"
 import fs from "fs"
@@ -9,9 +14,9 @@ import { runPkgCommand } from "../exec"
 import { join } from "path"
 import { success, error, info, moveDirectory } from "../utils"
 import { captureEvent } from "../events"
-import { GENERATED_USER_EMAIL } from "../constants"
 import { init as hostingInit } from "../hosting/init"
 import { start as hostingStart } from "../hosting/start"
+
 const fp = require("find-free-port")
 
 type PluginOpts = {
diff --git a/packages/cli/src/plugins/skeleton.ts b/packages/cli/src/plugins/skeleton.ts
index 0146588b38..8618af07bf 100644
--- a/packages/cli/src/plugins/skeleton.ts
+++ b/packages/cli/src/plugins/skeleton.ts
@@ -3,6 +3,7 @@ import fs from "fs"
 import os from "os"
 import { join } from "path"
 import { processStringSync } from "@budibase/string-templates"
+
 const download = require("download")
 const tar = require("tar")
 
diff --git a/packages/cli/src/utils.ts b/packages/cli/src/utils.ts
index b9aa1ffce0..07baafd020 100644
--- a/packages/cli/src/utils.ts
+++ b/packages/cli/src/utils.ts
@@ -1,8 +1,8 @@
 import chalk from "chalk"
 import fs from "fs"
-import path from "path"
-import { join } from "path"
+import path, { join } from "path"
 import fetch from "node-fetch"
+
 const progress = require("cli-progress")
 
 export function downloadFile(url: string, filePath: string) {
diff --git a/packages/client/manifest.json b/packages/client/manifest.json
index 417f6b7fad..07645d874a 100644
--- a/packages/client/manifest.json
+++ b/packages/client/manifest.json
@@ -270,7 +270,6 @@
           {
             "type": "buttonConfiguration",
             "key": "buttons",
-            "nested": true,
             "defaultValue": [
               {
                 "type": "cta",
@@ -2732,6 +2731,11 @@
         "key": "defaultValue",
         "supportsConditions": false
       },
+      {
+        "type": "text",
+        "label": "Help text",
+        "key": "helpText"
+      },
       {
         "type": "event",
         "label": "On change",
@@ -2863,6 +2867,11 @@
         "key": "defaultValue",
         "supportsConditions": false
       },
+      {
+        "type": "text",
+        "label": "Help text",
+        "key": "helpText"
+      },
       {
         "type": "event",
         "label": "On change",
@@ -2960,6 +2969,11 @@
         "key": "defaultValue",
         "supportsConditions": false
       },
+      {
+        "type": "text",
+        "label": "Help text",
+        "key": "helpText"
+      },
       {
         "type": "event",
         "label": "On change",
@@ -3176,6 +3190,11 @@
         "key": "defaultValue",
         "supportsConditions": false
       },
+      {
+        "type": "text",
+        "label": "Help text",
+        "key": "helpText"
+      },
       {
         "type": "boolean",
         "label": "Autocomplete",
@@ -3336,6 +3355,11 @@
         "key": "defaultValue",
         "supportsConditions": false
       },
+      {
+        "type": "text",
+        "label": "Help text",
+        "key": "helpText"
+      },
       {
         "type": "event",
         "label": "On change",
@@ -3560,6 +3584,11 @@
         "key": "defaultValue",
         "supportsConditions": false
       },
+      {
+        "type": "text",
+        "label": "Help text",
+        "key": "helpText"
+      },
       {
         "type": "event",
         "label": "On change",
@@ -3658,6 +3687,11 @@
         "key": "defaultValue",
         "supportsConditions": false
       },
+      {
+        "type": "text",
+        "label": "Help text",
+        "key": "helpText"
+      },
       {
         "type": "event",
         "label": "On change",
@@ -3800,6 +3834,11 @@
         "key": "defaultValue",
         "supportsConditions": false
       },
+      {
+        "type": "text",
+        "label": "Help text",
+        "key": "helpText"
+      },
       {
         "type": "event",
         "label": "On change",
@@ -3895,6 +3934,11 @@
         "key": "defaultValue",
         "supportsConditions": false
       },
+      {
+        "type": "text",
+        "label": "Help text",
+        "key": "helpText"
+      },
       {
         "type": "boolean",
         "label": "Disabled",
@@ -4145,6 +4189,11 @@
         "label": "Label",
         "key": "label"
       },
+      {
+        "type": "text",
+        "label": "Help text",
+        "key": "helpText"
+      },
       {
         "type": "text",
         "label": "Extensions",
@@ -4248,6 +4297,11 @@
         "key": "defaultValue",
         "supportsConditions": false
       },
+      {
+        "type": "text",
+        "label": "Help text",
+        "key": "helpText"
+      },
       {
         "type": "event",
         "label": "On change",
@@ -4356,6 +4410,11 @@
         "key": "defaultValue",
         "supportsConditions": false
       },
+      {
+        "type": "text",
+        "label": "Help text",
+        "key": "helpText"
+      },
       {
         "type": "event",
         "label": "On change",
@@ -6106,6 +6165,24 @@
         "defaultValue": "spectrum--medium"
       }
     ],
+    "actions": [
+      {
+        "type": "ValidateForm",
+        "suffix": "form"
+      },
+      {
+        "type": "ClearForm",
+        "suffix": "form"
+      },
+      {
+        "type": "UpdateFieldValue",
+        "suffix": "form"
+      },
+      {
+        "type": "ScrollTo",
+        "suffix": "form"
+      }
+    ],
     "context": [
       {
         "type": "form",
@@ -6339,8 +6416,30 @@
         "label": "High contrast",
         "key": "stripeRows",
         "defaultValue": false
+      },
+      {
+        "section": true,
+        "name": "Buttons",
+        "settings": [
+          {
+            "type": "buttonConfiguration",
+            "key": "buttons",
+            "nested": true,
+            "max": 3,
+            "context": [
+              {
+                "label": "Clicked row",
+                "key": "row"
+              }
+            ]
+          }
+        ]
       }
-    ]
+    ],
+    "context": {
+      "type": "schema"
+    },
+    "actions": ["RefreshDatasource"]
   },
   "bbreferencefield": {
     "devComment": "As bb reference is only used for user subtype for now, we are using user for icon and labels",
@@ -6375,6 +6474,11 @@
         "label": "Default value",
         "key": "defaultValue"
       },
+      {
+        "type": "text",
+        "label": "Help text",
+        "key": "helpText"
+      },
       {
         "type": "event",
         "label": "On change",
diff --git a/packages/client/src/components/app/ButtonGroup.svelte b/packages/client/src/components/app/ButtonGroup.svelte
index 87b0990701..4954704b1b 100644
--- a/packages/client/src/components/app/ButtonGroup.svelte
+++ b/packages/client/src/components/app/ButtonGroup.svelte
@@ -3,9 +3,9 @@
   import Block from "../Block.svelte"
 
   export let buttons = []
-  export let direction
-  export let hAlign
-  export let vAlign
+  export let direction = "row"
+  export let hAlign = "left"
+  export let vAlign = "top"
   export let gap = "S"
 </script>
 
diff --git a/packages/client/src/components/app/DateRangePicker.svelte b/packages/client/src/components/app/DateRangePicker.svelte
index 0246b68198..5c710ad766 100644
--- a/packages/client/src/components/app/DateRangePicker.svelte
+++ b/packages/client/src/components/app/DateRangePicker.svelte
@@ -1,9 +1,8 @@
 <script>
   import { Select } from "@budibase/bbui"
-  import { getContext } from "svelte"
+  import { getContext, onDestroy } from "svelte"
   import dayjs from "dayjs"
   import utc from "dayjs/plugin/utc"
-  import { onDestroy } from "svelte"
 
   dayjs.extend(utc)
 
diff --git a/packages/client/src/components/app/GridBlock.svelte b/packages/client/src/components/app/GridBlock.svelte
index 8febaf44ff..0b1c12524a 100644
--- a/packages/client/src/components/app/GridBlock.svelte
+++ b/packages/client/src/components/app/GridBlock.svelte
@@ -2,6 +2,7 @@
   // NOTE: this is not a block - it's just named as such to avoid confusing users,
   // because it functions similarly to one
   import { getContext } from "svelte"
+  import { get } from "svelte/store"
   import { Grid } from "@budibase/frontend-core"
 
   // table is actually any datasource, but called table for legacy compatibility
@@ -16,12 +17,25 @@
   export let fixedRowHeight = null
   export let columns = null
   export let onRowClick = null
+  export let buttons = null
 
+  const context = getContext("context")
   const component = getContext("component")
-  const { styleable, API, builderStore, notificationStore } = getContext("sdk")
+  const {
+    styleable,
+    API,
+    builderStore,
+    notificationStore,
+    enrichButtonActions,
+    ActionTypes,
+    createContextStore,
+  } = getContext("sdk")
+
+  let grid
 
   $: columnWhitelist = columns?.map(col => col.name)
   $: schemaOverrides = getSchemaOverrides(columns)
+  $: enrichedButtons = enrichButtons(buttons)
 
   const getSchemaOverrides = columns => {
     let overrides = {}
@@ -33,6 +47,30 @@
     })
     return overrides
   }
+
+  const enrichButtons = buttons => {
+    if (!buttons?.length) {
+      return null
+    }
+    return buttons.map(settings => ({
+      size: "M",
+      text: settings.text,
+      type: settings.type,
+      onClick: async row => {
+        // Create a fake, ephemeral context to run the buttons actions with
+        const id = get(component).id
+        const gridContext = createContextStore(context)
+        gridContext.actions.provideData(id, row)
+        gridContext.actions.provideAction(
+          id,
+          ActionTypes.RefreshDatasource,
+          () => grid?.getContext()?.rows.actions.refreshData()
+        )
+        const fn = enrichButtonActions(settings.onClick, get(gridContext))
+        return await fn?.({ row })
+      },
+    }))
+  }
 </script>
 
 <div
@@ -40,6 +78,7 @@
   class:in-builder={$builderStore.inBuilder}
 >
   <Grid
+    bind:this={grid}
     datasource={table}
     {API}
     {stripeRows}
@@ -58,6 +97,7 @@
     showControls={false}
     notifySuccess={notificationStore.actions.success}
     notifyError={notificationStore.actions.error}
+    buttons={enrichedButtons}
     on:rowclick={e => onRowClick?.({ row: e.detail })}
   />
 </div>
diff --git a/packages/client/src/components/app/forms/AttachmentField.svelte b/packages/client/src/components/app/forms/AttachmentField.svelte
index cc0f7aaac6..b61f88daeb 100644
--- a/packages/client/src/components/app/forms/AttachmentField.svelte
+++ b/packages/client/src/components/app/forms/AttachmentField.svelte
@@ -13,6 +13,7 @@
   export let onChange
   export let maximum = undefined
   export let span
+  export let helpText = null
 
   let fieldState
   let fieldApi
@@ -76,6 +77,7 @@
   {readonly}
   {validation}
   {span}
+  {helpText}
   type="attachment"
   bind:fieldState
   bind:fieldApi
diff --git a/packages/client/src/components/app/forms/BooleanField.svelte b/packages/client/src/components/app/forms/BooleanField.svelte
index 1f59ddcfa6..28cef56aec 100644
--- a/packages/client/src/components/app/forms/BooleanField.svelte
+++ b/packages/client/src/components/app/forms/BooleanField.svelte
@@ -11,6 +11,7 @@
   export let validation
   export let defaultValue
   export let onChange
+  export let helpText = null
 
   let fieldState
   let fieldApi
@@ -42,6 +43,7 @@
   {disabled}
   {readonly}
   {validation}
+  {helpText}
   defaultValue={isTruthy(defaultValue)}
   type="boolean"
   bind:fieldState
diff --git a/packages/client/src/components/app/forms/CodeScanner.svelte b/packages/client/src/components/app/forms/CodeScanner.svelte
index f2e32004cf..ff860d216f 100644
--- a/packages/client/src/components/app/forms/CodeScanner.svelte
+++ b/packages/client/src/components/app/forms/CodeScanner.svelte
@@ -1,6 +1,13 @@
 <script>
-  import { ModalContent, Modal, Icon, ActionButton } from "@budibase/bbui"
-  import { Input, Button, StatusLight } from "@budibase/bbui"
+  import {
+    ModalContent,
+    Modal,
+    Icon,
+    ActionButton,
+    Input,
+    Button,
+    StatusLight,
+  } from "@budibase/bbui"
   import { Html5Qrcode } from "html5-qrcode"
   import { createEventDispatcher } from "svelte"
 
diff --git a/packages/client/src/components/app/forms/CodeScannerField.svelte b/packages/client/src/components/app/forms/CodeScannerField.svelte
index 8e5237a27c..be590106c2 100644
--- a/packages/client/src/components/app/forms/CodeScannerField.svelte
+++ b/packages/client/src/components/app/forms/CodeScannerField.svelte
@@ -16,6 +16,7 @@
   export let beepFrequency
   export let customFrequency
   export let preferredCamera
+  export let helpText = null
 
   let fieldState
   let fieldApi
@@ -38,6 +39,7 @@
   {validation}
   {defaultValue}
   {type}
+  {helpText}
   bind:fieldState
   bind:fieldApi
 >
diff --git a/packages/client/src/components/app/forms/DateTimeField.svelte b/packages/client/src/components/app/forms/DateTimeField.svelte
index 7e2598be81..8ab8e65a15 100644
--- a/packages/client/src/components/app/forms/DateTimeField.svelte
+++ b/packages/client/src/components/app/forms/DateTimeField.svelte
@@ -15,6 +15,7 @@
   export let defaultValue
   export let onChange
   export let span
+  export let helpText = null
 
   let fieldState
   let fieldApi
@@ -35,6 +36,7 @@
   {validation}
   {defaultValue}
   {span}
+  {helpText}
   type="datetime"
   bind:fieldState
   bind:fieldApi
diff --git a/packages/client/src/components/app/forms/Field.svelte b/packages/client/src/components/app/forms/Field.svelte
index 8878b25989..22420b7430 100644
--- a/packages/client/src/components/app/forms/Field.svelte
+++ b/packages/client/src/components/app/forms/Field.svelte
@@ -1,6 +1,7 @@
 <script>
   import Placeholder from "../Placeholder.svelte"
   import { getContext, onDestroy } from "svelte"
+  import { Icon } from "@budibase/bbui"
 
   export let label
   export let field
@@ -13,6 +14,7 @@
   export let readonly = false
   export let validation
   export let span = 6
+  export let helpText = null
 
   // Get contexts
   const formContext = getContext("form")
@@ -97,7 +99,14 @@
     {:else}
       <slot />
       {#if fieldState.error}
-        <div class="error">{fieldState.error}</div>
+        <div class="error">
+          <Icon name="Alert" />
+          <span>{fieldState.error}</span>
+        </div>
+      {:else if helpText}
+        <div class="helpText">
+          <Icon name="HelpOutline" /> <span>{helpText}</span>
+        </div>
       {/if}
     {/if}
   </div>
@@ -127,13 +136,45 @@
     position: relative;
     width: 100%;
   }
+
   .error {
+    display: flex;
+    margin-top: var(--spectrum-global-dimension-size-75);
+    align-items: center;
+  }
+
+  .error :global(svg) {
+    width: 14px;
+    color: var(
+      --spectrum-semantic-negative-color-default,
+      var(--spectrum-global-color-red-500)
+    );
+    margin-right: 4px;
+  }
+
+  .error span {
     color: var(
       --spectrum-semantic-negative-color-default,
       var(--spectrum-global-color-red-500)
     );
     font-size: var(--spectrum-global-dimension-font-size-75);
+  }
+
+  .helpText {
+    display: flex;
     margin-top: var(--spectrum-global-dimension-size-75);
+    align-items: center;
+  }
+
+  .helpText :global(svg) {
+    width: 14px;
+    color: var(--grey-7);
+    margin-right: 6px;
+  }
+
+  .helpText span {
+    color: var(--grey-5);
+    font-size: var(--spectrum-global-dimension-font-size-75);
   }
   .spectrum-FieldLabel--right,
   .spectrum-FieldLabel--left {
diff --git a/packages/client/src/components/app/forms/JSONField.svelte b/packages/client/src/components/app/forms/JSONField.svelte
index cf96f54a23..244a76fcfe 100644
--- a/packages/client/src/components/app/forms/JSONField.svelte
+++ b/packages/client/src/components/app/forms/JSONField.svelte
@@ -10,6 +10,7 @@
   export let readonly = false
   export let defaultValue = ""
   export let onChange
+  export let helpText = null
 
   const component = getContext("component")
   const validation = [
@@ -52,6 +53,7 @@
   {readonly}
   {validation}
   {defaultValue}
+  {helpText}
   type="json"
   bind:fieldState
   bind:fieldApi
diff --git a/packages/client/src/components/app/forms/LongFormField.svelte b/packages/client/src/components/app/forms/LongFormField.svelte
index a9087a0a9c..9b13fca43e 100644
--- a/packages/client/src/components/app/forms/LongFormField.svelte
+++ b/packages/client/src/components/app/forms/LongFormField.svelte
@@ -13,6 +13,7 @@
   export let defaultValue = ""
   export let format = "auto"
   export let onChange
+  export let helpText = null
 
   let fieldState
   let fieldApi
@@ -62,6 +63,7 @@
   {readonly}
   {validation}
   {defaultValue}
+  {helpText}
   type="longform"
   bind:fieldState
   bind:fieldApi
diff --git a/packages/client/src/components/app/forms/MultiFieldSelect.svelte b/packages/client/src/components/app/forms/MultiFieldSelect.svelte
index 519bef4659..c43f52eba8 100644
--- a/packages/client/src/components/app/forms/MultiFieldSelect.svelte
+++ b/packages/client/src/components/app/forms/MultiFieldSelect.svelte
@@ -2,6 +2,7 @@
   import { CoreMultiselect, CoreCheckboxGroup } from "@budibase/bbui"
   import Field from "./Field.svelte"
   import { getOptions } from "./optionsParser"
+
   export let field
   export let label
   export let placeholder
@@ -19,6 +20,7 @@
   export let optionsType = "select"
   export let direction = "vertical"
   export let span
+  export let helpText = null
 
   let fieldState
   let fieldApi
@@ -60,6 +62,7 @@
   {readonly}
   {validation}
   {span}
+  {helpText}
   defaultValue={expandedDefaultValue}
   type="array"
   bind:fieldState
diff --git a/packages/client/src/components/app/forms/OptionsField.svelte b/packages/client/src/components/app/forms/OptionsField.svelte
index f8080419a3..5afeeb707c 100644
--- a/packages/client/src/components/app/forms/OptionsField.svelte
+++ b/packages/client/src/components/app/forms/OptionsField.svelte
@@ -2,6 +2,7 @@
   import { CoreSelect, CoreRadioGroup } from "@budibase/bbui"
   import Field from "./Field.svelte"
   import { getOptions } from "./optionsParser"
+
   export let field
   export let label
   export let placeholder
@@ -20,6 +21,7 @@
   export let onChange
   export let sort = true
   export let span
+  export let helpText = null
 
   let fieldState
   let fieldApi
@@ -51,6 +53,7 @@
   {validation}
   {defaultValue}
   {span}
+  {helpText}
   type="options"
   bind:fieldState
   bind:fieldApi
diff --git a/packages/client/src/components/app/forms/RelationshipField.svelte b/packages/client/src/components/app/forms/RelationshipField.svelte
index 99906fe831..41a071686e 100644
--- a/packages/client/src/components/app/forms/RelationshipField.svelte
+++ b/packages/client/src/components/app/forms/RelationshipField.svelte
@@ -20,6 +20,7 @@
   export let datasourceType = "table"
   export let primaryDisplay
   export let span
+  export let helpText = null
 
   let fieldState
   let fieldApi
@@ -192,6 +193,7 @@
   defaultValue={expandedDefaultValue}
   {type}
   {span}
+  {helpText}
   bind:fieldState
   bind:fieldApi
   bind:fieldSchema
diff --git a/packages/client/src/components/app/forms/S3Upload.svelte b/packages/client/src/components/app/forms/S3Upload.svelte
index 9985c83bb8..0147cbca6e 100644
--- a/packages/client/src/components/app/forms/S3Upload.svelte
+++ b/packages/client/src/components/app/forms/S3Upload.svelte
@@ -1,8 +1,7 @@
 <script>
   import Field from "./Field.svelte"
-  import { CoreDropzone, ProgressCircle } from "@budibase/bbui"
+  import { CoreDropzone, ProgressCircle, Helpers } from "@budibase/bbui"
   import { getContext, onMount, onDestroy } from "svelte"
-  import { cloneDeep } from "../../../../../bbui/src/helpers"
 
   export let datasourceId
   export let bucket
@@ -100,7 +99,7 @@
 
   const handleChange = e => {
     localFiles = e.detail
-    let files = cloneDeep(e.detail) || []
+    let files = Helpers.cloneDeep(e.detail) || []
     // remove URL as it contains the full base64 image data
     files.forEach(file => {
       if (file.type?.startsWith("image")) {
diff --git a/packages/client/src/components/app/forms/StringField.svelte b/packages/client/src/components/app/forms/StringField.svelte
index a8dec6649e..c86a98aeed 100644
--- a/packages/client/src/components/app/forms/StringField.svelte
+++ b/packages/client/src/components/app/forms/StringField.svelte
@@ -13,6 +13,7 @@
   export let align
   export let onChange
   export let span
+  export let helpText = null
 
   let fieldState
   let fieldApi
@@ -33,6 +34,7 @@
   {validation}
   {defaultValue}
   {span}
+  {helpText}
   type={type === "number" ? "number" : "string"}
   bind:fieldState
   bind:fieldApi
@@ -44,7 +46,6 @@
       on:change={handleChange}
       disabled={fieldState.disabled}
       readonly={fieldState.readonly}
-      error={fieldState.error}
       id={fieldState.fieldId}
       {placeholder}
       {type}
diff --git a/packages/client/src/components/app/table/Table.svelte b/packages/client/src/components/app/table/Table.svelte
index a4cc0dc0eb..4da7dc314b 100644
--- a/packages/client/src/components/app/table/Table.svelte
+++ b/packages/client/src/components/app/table/Table.svelte
@@ -1,8 +1,7 @@
 <script>
-  import { getContext } from "svelte"
+  import { getContext, onDestroy } from "svelte"
   import { Table } from "@budibase/bbui"
   import SlotRenderer from "./SlotRenderer.svelte"
-  import { onDestroy } from "svelte"
   import { canBeSortColumn } from "@budibase/shared-core"
 
   export let dataProvider
diff --git a/packages/client/src/components/context/Provider.svelte b/packages/client/src/components/context/Provider.svelte
index 19a5c3a462..3fffaaf7fa 100644
--- a/packages/client/src/components/context/Provider.svelte
+++ b/packages/client/src/components/context/Provider.svelte
@@ -45,12 +45,13 @@
         // Register any "refresh datasource" actions with a singleton store
         // so we can easily refresh data at all levels for any datasource
         if (type === ActionTypes.RefreshDatasource) {
-          const { dataSource } = metadata || {}
-          dataSourceStore.actions.registerDataSource(
-            dataSource,
-            instanceId,
-            callback
-          )
+          if (metadata?.dataSource) {
+            dataSourceStore.actions.registerDataSource(
+              metadata.dataSource,
+              instanceId,
+              callback
+            )
+          }
         }
       })
     }
diff --git a/packages/client/src/index.js b/packages/client/src/index.js
index 1550ba4d7b..415d9fa5f2 100644
--- a/packages/client/src/index.js
+++ b/packages/client/src/index.js
@@ -15,6 +15,7 @@ import { initWebsocket } from "./websocket.js"
 // Provide svelte and svelte/internal as globals for custom components
 import * as svelte from "svelte"
 import * as internal from "svelte/internal"
+
 window.svelte_internal = internal
 window.svelte = svelte
 
diff --git a/packages/client/src/sdk.js b/packages/client/src/sdk.js
index 1d77f3e2da..04499c01ab 100644
--- a/packages/client/src/sdk.js
+++ b/packages/client/src/sdk.js
@@ -14,6 +14,8 @@ import {
   dndIsDragging,
   confirmationStore,
   roleStore,
+  stateStore,
+  createContextStore,
 } from "stores"
 import { styleable } from "utils/styleable"
 import { linkable } from "utils/linkable"
@@ -24,9 +26,13 @@ import BlockComponent from "components/BlockComponent.svelte"
 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"
 
 export default {
   API,
+
+  // Stores
   authStore,
   notificationStore,
   routeStore,
@@ -41,13 +47,24 @@ export default {
   currentRole,
   confirmationStore,
   roleStore,
+  stateStore,
+
+  // Utils
   styleable,
   linkable,
   getAction,
   fetchDatasourceSchema,
-  Provider,
-  ActionTypes,
   getAPIKey,
+  enrichButtonActions,
+  processStringSync,
+  makePropSafe,
+  createContextStore,
+
+  // Components
+  Provider,
   Block,
   BlockComponent,
+
+  // Constants
+  ActionTypes,
 }
diff --git a/packages/frontend-core/src/api/viewsV2.js b/packages/frontend-core/src/api/viewsV2.js
index 3580d08229..a2072c2e1d 100644
--- a/packages/frontend-core/src/api/viewsV2.js
+++ b/packages/frontend-core/src/api/viewsV2.js
@@ -5,7 +5,7 @@ export const buildViewV2Endpoints = API => ({
    */
   fetchDefinition: async viewId => {
     return await API.get({
-      url: `/api/v2/views/${viewId}`,
+      url: `/api/v2/views/${encodeURIComponent(viewId)}`,
     })
   },
   /**
@@ -24,7 +24,7 @@ export const buildViewV2Endpoints = API => ({
    */
   update: async view => {
     return await API.put({
-      url: `/api/v2/views/${view.id}`,
+      url: `/api/v2/views/${encodeURIComponent(view.id)}`,
       body: view,
     })
   },
@@ -50,7 +50,7 @@ export const buildViewV2Endpoints = API => ({
     sortType,
   }) => {
     return await API.post({
-      url: `/api/v2/views/${viewId}/search`,
+      url: `/api/v2/views/${encodeURIComponent(viewId)}/search`,
       body: {
         query,
         paginate,
@@ -67,6 +67,8 @@ export const buildViewV2Endpoints = API => ({
    * @param viewId the id of the view
    */
   delete: async viewId => {
-    return await API.delete({ url: `/api/v2/views/${viewId}` })
+    return await API.delete({
+      url: `/api/v2/views/${encodeURIComponent(viewId)}`,
+    })
   },
 })
diff --git a/packages/frontend-core/src/components/grid/cells/AttachmentCell.svelte b/packages/frontend-core/src/components/grid/cells/AttachmentCell.svelte
index fc0001d55e..9c8b500593 100644
--- a/packages/frontend-core/src/components/grid/cells/AttachmentCell.svelte
+++ b/packages/frontend-core/src/components/grid/cells/AttachmentCell.svelte
@@ -1,6 +1,5 @@
 <script>
-  import { onMount } from "svelte"
-  import { getContext } from "svelte"
+  import { onMount, getContext } from "svelte"
   import { Dropzone } from "@budibase/bbui"
 
   export let value
diff --git a/packages/frontend-core/src/components/grid/cells/GridCell.svelte b/packages/frontend-core/src/components/grid/cells/GridCell.svelte
index dcc76b9c75..d10eb25528 100644
--- a/packages/frontend-core/src/components/grid/cells/GridCell.svelte
+++ b/packages/frontend-core/src/components/grid/cells/GridCell.svelte
@@ -15,7 +15,7 @@
   $: style = getStyle(width, selectedUser)
 
   const getStyle = (width, selectedUser) => {
-    let style = `flex: 0 0 ${width}px;`
+    let style = width === "auto" ? "width: auto;" : `flex: 0 0 ${width}px;`
     if (selectedUser) {
       style += `--user-color:${selectedUser.color};`
     }
diff --git a/packages/frontend-core/src/components/grid/cells/GutterCell.svelte b/packages/frontend-core/src/components/grid/cells/GutterCell.svelte
index ae51599edd..82238f9360 100644
--- a/packages/frontend-core/src/components/grid/cells/GutterCell.svelte
+++ b/packages/frontend-core/src/components/grid/cells/GutterCell.svelte
@@ -1,9 +1,8 @@
 <script>
   import { GutterWidth } from "../lib/constants"
-  import { getContext } from "svelte"
+  import { getContext, createEventDispatcher } from "svelte"
   import { Checkbox, Icon } from "@budibase/bbui"
   import GridCell from "./GridCell.svelte"
-  import { createEventDispatcher } from "svelte"
 
   export let row
   export let rowFocused = false
diff --git a/packages/frontend-core/src/components/grid/layout/ButtonColumn.svelte b/packages/frontend-core/src/components/grid/layout/ButtonColumn.svelte
new file mode 100644
index 0000000000..d484f9408d
--- /dev/null
+++ b/packages/frontend-core/src/components/grid/layout/ButtonColumn.svelte
@@ -0,0 +1,144 @@
+<script>
+  import { getContext, onMount } from "svelte"
+  import { Button } from "@budibase/bbui"
+  import GridCell from "../cells/GridCell.svelte"
+  import GridScrollWrapper from "./GridScrollWrapper.svelte"
+
+  const {
+    renderedRows,
+    hoveredRowId,
+    props,
+    width,
+    rows,
+    focusedRow,
+    selectedRows,
+    visibleColumns,
+    scroll,
+    isDragging,
+    buttonColumnWidth,
+  } = getContext("grid")
+
+  let measureContainer
+
+  $: buttons = $props.buttons?.slice(0, 3) || []
+  $: columnsWidth = $visibleColumns.reduce(
+    (total, col) => (total += col.width),
+    0
+  )
+  $: end = columnsWidth - 1 - $scroll.left
+  $: left = Math.min($width - $buttonColumnWidth, end)
+
+  const handleClick = async (button, row) => {
+    await button.onClick?.(rows.actions.cleanRow(row))
+    // Refresh the row in case it changed
+    await rows.actions.refreshRow(row._id)
+  }
+
+  onMount(() => {
+    const observer = new ResizeObserver(entries => {
+      const width = entries?.[0]?.contentRect?.width ?? 0
+      buttonColumnWidth.set(width)
+    })
+    observer.observe(measureContainer)
+  })
+</script>
+
+<!-- Hidden copy of buttons to measure -->
+<div class="measure" bind:this={measureContainer}>
+  <GridCell width="auto">
+    <div class="buttons">
+      {#each buttons as button}
+        <Button size="S">
+          {button.text || "Button"}
+        </Button>
+      {/each}
+    </div>
+  </GridCell>
+</div>
+
+<div
+  class="button-column"
+  style="left:{left}px"
+  class:hidden={$buttonColumnWidth === 0}
+>
+  <div class="content" on:mouseleave={() => ($hoveredRowId = null)}>
+    <GridScrollWrapper scrollVertically attachHandlers>
+      {#each $renderedRows as row}
+        {@const rowSelected = !!$selectedRows[row._id]}
+        {@const rowHovered = $hoveredRowId === row._id}
+        {@const rowFocused = $focusedRow?._id === row._id}
+        <div
+          class="row"
+          on:mouseenter={$isDragging ? null : () => ($hoveredRowId = row._id)}
+          on:mouseleave={$isDragging ? null : () => ($hoveredRowId = null)}
+        >
+          <GridCell
+            width="auto"
+            rowIdx={row.__idx}
+            selected={rowSelected}
+            highlighted={rowHovered || rowFocused}
+          >
+            <div class="buttons">
+              {#each buttons as button}
+                <Button
+                  newStyles
+                  size="S"
+                  cta={button.type === "cta"}
+                  primary={button.type === "primary"}
+                  secondary={button.type === "secondary"}
+                  warning={button.type === "warning"}
+                  overBackground={button.type === "overBackground"}
+                  on:click={() => handleClick(button, row)}
+                >
+                  {button.text || "Button"}
+                </Button>
+              {/each}
+            </div>
+          </GridCell>
+        </div>
+      {/each}
+    </GridScrollWrapper>
+  </div>
+</div>
+
+<style>
+  .button-column {
+    display: flex;
+    flex-direction: column;
+    background: var(--cell-background);
+    position: absolute;
+    top: 0;
+  }
+  .button-column.hidden {
+    opacity: 0;
+  }
+  .content {
+    position: relative;
+    flex: 1 1 auto;
+  }
+  .row {
+    display: flex;
+    flex-direction: row;
+    justify-content: flex-start;
+    align-items: stretch;
+  }
+  .buttons {
+    display: flex;
+    align-items: center;
+    padding: 0 var(--cell-padding);
+    gap: var(--cell-padding);
+    height: inherit;
+  }
+
+  /* Add left cell border */
+  .button-column :global(.cell) {
+    border-left: var(--cell-border);
+  }
+
+  /* Hidden copy of buttons to measure width against */
+  .measure {
+    position: absolute;
+    opacity: 0;
+    pointer-events: none;
+  }
+</style>
diff --git a/packages/frontend-core/src/components/grid/layout/Grid.svelte b/packages/frontend-core/src/components/grid/layout/Grid.svelte
index e2ecd0f968..285282ddf7 100644
--- a/packages/frontend-core/src/components/grid/layout/Grid.svelte
+++ b/packages/frontend-core/src/components/grid/layout/Grid.svelte
@@ -48,6 +48,7 @@
   export let fixedRowHeight = null
   export let notifySuccess = null
   export let notifyError = null
+  export let buttons = null
 
   // Unique identifier for DOM nodes inside this instance
   const rand = Math.random()
@@ -99,6 +100,7 @@
     fixedRowHeight,
     notifySuccess,
     notifyError,
+    buttons,
   })
 
   // Set context for children to consume
diff --git a/packages/frontend-core/src/components/grid/layout/GridBody.svelte b/packages/frontend-core/src/components/grid/layout/GridBody.svelte
index 0bb2a51fb4..559c465b86 100644
--- a/packages/frontend-core/src/components/grid/layout/GridBody.svelte
+++ b/packages/frontend-core/src/components/grid/layout/GridBody.svelte
@@ -3,6 +3,7 @@
   import GridScrollWrapper from "./GridScrollWrapper.svelte"
   import GridRow from "./GridRow.svelte"
   import { BlankRowID } from "../lib/constants"
+  import ButtonColumn from "./ButtonColumn.svelte"
 
   const {
     bounds,
@@ -13,6 +14,7 @@
     dispatch,
     isDragging,
     config,
+    props,
   } = getContext("grid")
 
   let body
@@ -54,6 +56,9 @@
       />
     {/if}
   </GridScrollWrapper>
+  {#if $props.buttons?.length}
+    <ButtonColumn />
+  {/if}
 </div>
 
 <style>
diff --git a/packages/frontend-core/src/components/grid/layout/NewRow.svelte b/packages/frontend-core/src/components/grid/layout/NewRow.svelte
index 26706b701c..9a60834e34 100644
--- a/packages/frontend-core/src/components/grid/layout/NewRow.svelte
+++ b/packages/frontend-core/src/components/grid/layout/NewRow.svelte
@@ -4,8 +4,7 @@
   import GridScrollWrapper from "./GridScrollWrapper.svelte"
   import DataCell from "../cells/DataCell.svelte"
   import { fade } from "svelte/transition"
-  import { GutterWidth } from "../lib/constants"
-  import { NewRowID } from "../lib/constants"
+  import { GutterWidth, NewRowID } from "../lib/constants"
   import GutterCell from "../cells/GutterCell.svelte"
   import KeyboardShortcut from "./KeyboardShortcut.svelte"
 
diff --git a/packages/frontend-core/src/components/grid/stores/rows.js b/packages/frontend-core/src/components/grid/stores/rows.js
index 82185d6b91..34ba77afa2 100644
--- a/packages/frontend-core/src/components/grid/stores/rows.js
+++ b/packages/frontend-core/src/components/grid/stores/rows.js
@@ -314,8 +314,12 @@ export const createActions = context => {
 
   // Refreshes a specific row
   const refreshRow = async id => {
-    const row = await datasource.actions.getRow(id)
-    replaceRow(id, row)
+    try {
+      const row = await datasource.actions.getRow(id)
+      replaceRow(id, row)
+    } catch {
+      // Do nothing - we probably just don't support refreshing individual rows
+    }
   }
 
   // Refreshes all data
diff --git a/packages/frontend-core/src/components/grid/stores/scroll.js b/packages/frontend-core/src/components/grid/stores/scroll.js
index 89e759854f..88a676f078 100644
--- a/packages/frontend-core/src/components/grid/stores/scroll.js
+++ b/packages/frontend-core/src/components/grid/stores/scroll.js
@@ -20,8 +20,15 @@ export const createStores = () => {
 }
 
 export const deriveStores = context => {
-  const { rows, visibleColumns, stickyColumn, rowHeight, width, height } =
-    context
+  const {
+    rows,
+    visibleColumns,
+    stickyColumn,
+    rowHeight,
+    width,
+    height,
+    buttonColumnWidth,
+  } = context
 
   // Memoize store primitives
   const stickyColumnWidth = derived(stickyColumn, $col => $col?.width || 0, 0)
@@ -40,9 +47,10 @@ export const deriveStores = context => {
 
   // Derive horizontal limits
   const contentWidth = derived(
-    [visibleColumns, stickyColumnWidth],
-    ([$visibleColumns, $stickyColumnWidth]) => {
-      let width = GutterWidth + Padding + $stickyColumnWidth
+    [visibleColumns, stickyColumnWidth, buttonColumnWidth],
+    ([$visibleColumns, $stickyColumnWidth, $buttonColumnWidth]) => {
+      const space = Math.max(Padding, $buttonColumnWidth - 1)
+      let width = GutterWidth + space + $stickyColumnWidth
       $visibleColumns.forEach(col => {
         width += col.width
       })
diff --git a/packages/frontend-core/src/components/grid/stores/ui.js b/packages/frontend-core/src/components/grid/stores/ui.js
index e10e96a722..129d6614e5 100644
--- a/packages/frontend-core/src/components/grid/stores/ui.js
+++ b/packages/frontend-core/src/components/grid/stores/ui.js
@@ -18,6 +18,7 @@ export const createStores = context => {
   const previousFocusedRowId = writable(null)
   const gridFocused = writable(false)
   const isDragging = writable(false)
+  const buttonColumnWidth = writable(0)
 
   // Derive the current focused row ID
   const focusedRowId = derived(
@@ -51,6 +52,7 @@ export const createStores = context => {
     rowHeight,
     gridFocused,
     isDragging,
+    buttonColumnWidth,
     selectedRows: {
       ...selectedRows,
       actions: {
diff --git a/packages/frontend-core/src/index.js b/packages/frontend-core/src/index.js
index f51be616f8..37951dc776 100644
--- a/packages/frontend-core/src/index.js
+++ b/packages/frontend-core/src/index.js
@@ -1,6 +1,5 @@
 export { createAPIClient } from "./api"
 export { fetchData } from "./fetch"
-export { Utils } from "./utils"
 export * as Constants from "./constants"
 export * from "./stores"
 export * from "./utils"
diff --git a/packages/pro b/packages/pro
index e202f415d9..5e3d59fc40 160000
--- a/packages/pro
+++ b/packages/pro
@@ -1 +1 @@
-Subproject commit e202f415d9fa540d08cc2ba6e27394fbc22f357b
+Subproject commit 5e3d59fc4060fd44b14b2599269c207753d4e5be
diff --git a/packages/server/__mocks__/node-fetch.ts b/packages/server/__mocks__/node-fetch.ts
index acf0294e76..53aa76e0c6 100644
--- a/packages/server/__mocks__/node-fetch.ts
+++ b/packages/server/__mocks__/node-fetch.ts
@@ -1,5 +1,6 @@
 // @ts-ignore
 import fs from "fs"
+
 module FetchMock {
   // @ts-ignore
   const fetch = jest.requireActual("node-fetch")
diff --git a/packages/server/specs/generate.ts b/packages/server/specs/generate.ts
index 39d8a50ade..ade667ea66 100644
--- a/packages/server/specs/generate.ts
+++ b/packages/server/specs/generate.ts
@@ -3,6 +3,7 @@ import { writeFileSync } from "fs"
 import { examples, schemas } from "./resources"
 import * as parameters from "./parameters"
 import * as security from "./security"
+
 const swaggerJsdoc = require("swagger-jsdoc")
 
 const VARIABLES = {}
diff --git a/packages/server/src/api/controllers/analytics.ts b/packages/server/src/api/controllers/analytics.ts
index eee86a534b..f60c7b0961 100644
--- a/packages/server/src/api/controllers/analytics.ts
+++ b/packages/server/src/api/controllers/analytics.ts
@@ -1,7 +1,6 @@
-import { events } from "@budibase/backend-core"
+import { events, context } from "@budibase/backend-core"
 import { AnalyticsPingRequest, App, PingSource } from "@budibase/types"
 import { DocumentType, isDevAppID } from "../../db/utils"
-import { context } from "@budibase/backend-core"
 
 export const isEnabled = async (ctx: any) => {
   const enabled = await events.analytics.enabled()
diff --git a/packages/server/src/api/controllers/automation.ts b/packages/server/src/api/controllers/automation.ts
index a4697f99f2..6feba9fb2d 100644
--- a/packages/server/src/api/controllers/automation.ts
+++ b/packages/server/src/api/controllers/automation.ts
@@ -13,7 +13,7 @@ import {
 import { deleteEntityMetadata } from "../../utilities"
 import { MetadataTypes } from "../../constants"
 import { setTestFlag, clearTestFlag } from "../../utilities/redis"
-import { context, cache, events } from "@budibase/backend-core"
+import { context, cache, events, db as dbCore } from "@budibase/backend-core"
 import { automations, features } from "@budibase/pro"
 import {
   App,
@@ -24,7 +24,6 @@ import {
 } from "@budibase/types"
 import { getActionDefinitions as actionDefs } from "../../automations/actions"
 import sdk from "../../sdk"
-import { db as dbCore } from "@budibase/backend-core"
 import { builderSocket } from "../../websockets"
 
 async function getActionDefinitions() {
diff --git a/packages/server/src/api/controllers/component.ts b/packages/server/src/api/controllers/component.ts
index 1d0ccf8784..12051be770 100644
--- a/packages/server/src/api/controllers/component.ts
+++ b/packages/server/src/api/controllers/component.ts
@@ -1,8 +1,7 @@
 import { DocumentType } from "../../db/utils"
-import { App, Plugin } from "@budibase/types"
+import { App, Plugin, UserCtx } from "@budibase/types"
 import { db as dbCore, context, tenancy } from "@budibase/backend-core"
 import { getComponentLibraryManifest } from "../../utilities/fileSystem"
-import { UserCtx } from "@budibase/types"
 
 export async function fetchAppComponentDefinitions(ctx: UserCtx) {
   try {
diff --git a/packages/server/src/api/controllers/dev.ts b/packages/server/src/api/controllers/dev.ts
index cd32fa9359..d8c26725f1 100644
--- a/packages/server/src/api/controllers/dev.ts
+++ b/packages/server/src/api/controllers/dev.ts
@@ -4,8 +4,13 @@ import { checkSlashesInUrl } from "../../utilities"
 import { request } from "../../utilities/workerRequests"
 import { clearLock as redisClearLock } from "../../utilities/redis"
 import { DocumentType } from "../../db/utils"
-import { context, env as envCore } from "@budibase/backend-core"
-import { events, db as dbCore, cache } from "@budibase/backend-core"
+import {
+  context,
+  env as envCore,
+  events,
+  db as dbCore,
+  cache,
+} from "@budibase/backend-core"
 import { App } from "@budibase/types"
 
 async function redirect(ctx: any, method: string, path: string = "global") {
diff --git a/packages/server/src/api/controllers/query/import/sources/base/openapi.ts b/packages/server/src/api/controllers/query/import/sources/base/openapi.ts
index 56c2f0c3e9..c0ff027111 100644
--- a/packages/server/src/api/controllers/query/import/sources/base/openapi.ts
+++ b/packages/server/src/api/controllers/query/import/sources/base/openapi.ts
@@ -1,6 +1,7 @@
 import { ImportSource } from "."
 import SwaggerParser from "@apidevtools/swagger-parser"
 import { OpenAPI } from "openapi-types"
+
 const yaml = require("js-yaml")
 
 export abstract class OpenAPISource extends ImportSource {
diff --git a/packages/server/src/api/controllers/query/import/sources/curl.ts b/packages/server/src/api/controllers/query/import/sources/curl.ts
index 223b9ed98c..ba85d82be0 100644
--- a/packages/server/src/api/controllers/query/import/sources/curl.ts
+++ b/packages/server/src/api/controllers/query/import/sources/curl.ts
@@ -1,6 +1,7 @@
 import { ImportSource, ImportInfo } from "./base"
 import { Query } from "../../../../../definitions/common"
 import { URL } from "url"
+
 const curlconverter = require("curlconverter")
 
 const parseCurl = (data: string): any => {
diff --git a/packages/server/src/api/controllers/query/import/sources/tests/curl/curl.spec.js b/packages/server/src/api/controllers/query/import/sources/tests/curl/curl.spec.js
index 2b17685f24..7ea2f8932b 100644
--- a/packages/server/src/api/controllers/query/import/sources/tests/curl/curl.spec.js
+++ b/packages/server/src/api/controllers/query/import/sources/tests/curl/curl.spec.js
@@ -1,13 +1,13 @@
 const { Curl } = require("../../curl")
 const fs = require("fs")
-const path = require('path')
+const path = require("path")
 
-const getData = (file) => {
+const getData = file => {
   return fs.readFileSync(path.join(__dirname, `./data/${file}.txt`), "utf8")
 }
 
 describe("Curl Import", () => {
-  let curl 
+  let curl
 
   beforeEach(() => {
     curl = new Curl()
@@ -28,7 +28,7 @@ describe("Curl Import", () => {
     expect(supported).toBe(false)
   })
 
-  const init = async (file) => {
+  const init = async file => {
     await curl.isSupported(getData(file))
   }
 
@@ -37,10 +37,9 @@ describe("Curl Import", () => {
     const info = await curl.getInfo()
     expect(info.name).toBe("example.com")
   })
-  
+
   describe("Returns queries", () => {
-    
-    const getQueries = async (file) => {
+    const getQueries = async file => {
       await init(file)
       const queries = await curl.getQueries()
       expect(queries.length).toBe(1)
@@ -58,7 +57,7 @@ describe("Curl Import", () => {
       await testVerb("put", "update")
       await testVerb("delete", "delete")
       await testVerb("patch", "patch")
-    }) 
+    })
 
     const testPath = async (file, urlPath) => {
       const queries = await getQueries(file)
@@ -66,8 +65,8 @@ describe("Curl Import", () => {
     }
 
     it("populates path", async () => {
-        await testPath("get", "http://example.com/")
-        await testPath("path", "http://example.com/paths/abc")
+      await testPath("get", "http://example.com/")
+      await testPath("path", "http://example.com/paths/abc")
     })
 
     const testHeaders = async (file, headers) => {
@@ -77,7 +76,10 @@ describe("Curl Import", () => {
 
     it("populates headers", async () => {
       await testHeaders("get", {})
-      await testHeaders("headers", { "x-bb-header-1" : "123", "x-bb-header-2" : "456"} )
+      await testHeaders("headers", {
+        "x-bb-header-1": "123",
+        "x-bb-header-2": "456",
+      })
     })
 
     const testQuery = async (file, queryString) => {
@@ -91,13 +93,15 @@ describe("Curl Import", () => {
 
     const testBody = async (file, body) => {
       const queries = await getQueries(file)
-      expect(queries[0].fields.requestBody).toStrictEqual(JSON.stringify(body, null, 2))
+      expect(queries[0].fields.requestBody).toStrictEqual(
+        JSON.stringify(body, null, 2)
+      )
     }
 
     it("populates body", async () => {
       await testBody("get", undefined)
-      await testBody("post", { "key" : "val" })
+      await testBody("post", { key: "val" })
       await testBody("empty-body", {})
     })
   })
-})
\ No newline at end of file
+})
diff --git a/packages/server/src/api/controllers/query/import/sources/tests/openapi2/openapi2.spec.js b/packages/server/src/api/controllers/query/import/sources/tests/openapi2/openapi2.spec.js
index 3c5aa89e3c..b61991f7d6 100644
--- a/packages/server/src/api/controllers/query/import/sources/tests/openapi2/openapi2.spec.js
+++ b/packages/server/src/api/controllers/query/import/sources/tests/openapi2/openapi2.spec.js
@@ -1,13 +1,16 @@
 const { OpenAPI2 } = require("../../openapi2")
 const fs = require("fs")
-const path = require('path')
+const path = require("path")
 
 const getData = (file, extension) => {
-  return fs.readFileSync(path.join(__dirname, `./data/${file}/${file}.${extension}`), "utf8")
+  return fs.readFileSync(
+    path.join(__dirname, `./data/${file}/${file}.${extension}`),
+    "utf8"
+  )
 }
 
 describe("OpenAPI2 Import", () => {
-  let openapi2 
+  let openapi2
 
   beforeEach(() => {
     openapi2 = new OpenAPI2()
@@ -47,9 +50,9 @@ describe("OpenAPI2 Import", () => {
   it("returns import info", async () => {
     await runTests("petstore", testImportInfo)
   })
-  
+
   describe("Returns queries", () => {
-    const indexQueries = (queries) => {
+    const indexQueries = queries => {
       return queries.reduce((acc, query) => {
         acc[query.name] = query
         return acc
@@ -72,15 +75,15 @@ describe("OpenAPI2 Import", () => {
 
     it("populates verb", async () => {
       const assertions = {
-        "createEntity" : "create",
-        "getEntities" : "read",
-        "getEntity" : "read",
-        "updateEntity" : "update",
-        "patchEntity" : "patch",
-        "deleteEntity" : "delete"
+        createEntity: "create",
+        getEntities: "read",
+        getEntity: "read",
+        updateEntity: "update",
+        patchEntity: "patch",
+        deleteEntity: "delete",
       }
       await runTests("crud", testVerb, assertions)
-    }) 
+    })
 
     const testPath = async (file, extension, assertions) => {
       const queries = await getQueries(file, extension)
@@ -91,12 +94,12 @@ describe("OpenAPI2 Import", () => {
 
     it("populates path", async () => {
       const assertions = {
-        "createEntity" : "http://example.com/entities",
-        "getEntities" : "http://example.com/entities",
-        "getEntity" : "http://example.com/entities/{{entityId}}",
-        "updateEntity" : "http://example.com/entities/{{entityId}}",
-        "patchEntity" : "http://example.com/entities/{{entityId}}",
-        "deleteEntity" : "http://example.com/entities/{{entityId}}"
+        createEntity: "http://example.com/entities",
+        getEntities: "http://example.com/entities",
+        getEntity: "http://example.com/entities/{{entityId}}",
+        updateEntity: "http://example.com/entities/{{entityId}}",
+        patchEntity: "http://example.com/entities/{{entityId}}",
+        deleteEntity: "http://example.com/entities/{{entityId}}",
       }
       await runTests("crud", testPath, assertions)
     })
@@ -109,27 +112,25 @@ describe("OpenAPI2 Import", () => {
     }
 
     const contentTypeHeader = {
-      "Content-Type" : "application/json",
+      "Content-Type": "application/json",
     }
 
     it("populates headers", async () => {
       const assertions = {
-        "createEntity" : {
-         ...contentTypeHeader
+        createEntity: {
+          ...contentTypeHeader,
         },
-        "getEntities" : {
+        getEntities: {},
+        getEntity: {},
+        updateEntity: {
+          ...contentTypeHeader,
         },
-        "getEntity" : {
+        patchEntity: {
+          ...contentTypeHeader,
         },
-        "updateEntity" : {
-          ...contentTypeHeader
+        deleteEntity: {
+          "x-api-key": "{{x-api-key}}",
         },
-        "patchEntity" : {
-          ...contentTypeHeader
-        },
-        "deleteEntity" : {
-            "x-api-key" : "{{x-api-key}}",
-        }
       }
 
       await runTests("crud", testHeaders, assertions)
@@ -138,18 +139,20 @@ describe("OpenAPI2 Import", () => {
     const testQuery = async (file, extension, assertions) => {
       const queries = await getQueries(file, extension)
       for (let [operationId, queryString] of Object.entries(assertions)) {
-        expect(queries[operationId].fields.queryString).toStrictEqual(queryString)
+        expect(queries[operationId].fields.queryString).toStrictEqual(
+          queryString
+        )
       }
     }
 
     it("populates query", async () => {
       const assertions = {
-        "createEntity" : "",
-        "getEntities" : "page={{page}}&size={{size}}",
-        "getEntity" : "",
-        "updateEntity" : "",
-        "patchEntity" : "",
-        "deleteEntity" : ""
+        createEntity: "",
+        getEntities: "page={{page}}&size={{size}}",
+        getEntity: "",
+        updateEntity: "",
+        patchEntity: "",
+        deleteEntity: "",
       }
       await runTests("crud", testQuery, assertions)
     })
@@ -163,45 +166,45 @@ describe("OpenAPI2 Import", () => {
 
     it("populates parameters", async () => {
       const assertions = {
-        "createEntity" : [],
-        "getEntities" : [
+        createEntity: [],
+        getEntities: [
           {
-            "name" : "page",
-            "default" : "",
+            name: "page",
+            default: "",
           },
           {
-            "name" : "size",
-            "default" : "",
-          }
+            name: "size",
+            default: "",
+          },
         ],
-        "getEntity" : [
+        getEntity: [
           {
-            "name" : "entityId",
-            "default" : "",
-          }
+            name: "entityId",
+            default: "",
+          },
         ],
-        "updateEntity" : [
+        updateEntity: [
           {
-            "name" : "entityId",
-            "default" : "",
-          }
+            name: "entityId",
+            default: "",
+          },
         ],
-        "patchEntity" : [
+        patchEntity: [
           {
-            "name" : "entityId",
-            "default" : "",
-          }
+            name: "entityId",
+            default: "",
+          },
         ],
-        "deleteEntity" : [
+        deleteEntity: [
           {
-            "name" : "entityId",
-            "default" : "",
+            name: "entityId",
+            default: "",
           },
           {
-            "name" : "x-api-key",
-            "default" : "",
-          }
-        ]
+            name: "x-api-key",
+            default: "",
+          },
+        ],
       }
       await runTests("crud", testParameters, assertions)
     })
@@ -209,30 +212,32 @@ describe("OpenAPI2 Import", () => {
     const testBody = async (file, extension, assertions) => {
       const queries = await getQueries(file, extension)
       for (let [operationId, body] of Object.entries(assertions)) {
-        expect(queries[operationId].fields.requestBody).toStrictEqual(JSON.stringify(body, null, 2))
+        expect(queries[operationId].fields.requestBody).toStrictEqual(
+          JSON.stringify(body, null, 2)
+        )
       }
     }
     it("populates body", async () => {
       const assertions = {
-        "createEntity" : {
-          "name" : "name",
-          "type" : "type",
+        createEntity: {
+          name: "name",
+          type: "type",
         },
-        "getEntities" : undefined,
-        "getEntity" : undefined,
-        "updateEntity" : {
-          "id": 1,
-          "name" : "name",
-          "type" : "type",
+        getEntities: undefined,
+        getEntity: undefined,
+        updateEntity: {
+          id: 1,
+          name: "name",
+          type: "type",
         },
-        "patchEntity" : {
-          "id": 1,
-          "name" : "name",
-          "type" : "type",
+        patchEntity: {
+          id: 1,
+          name: "name",
+          type: "type",
         },
-        "deleteEntity" : undefined
+        deleteEntity: undefined,
       }
       await runTests("crud", testBody, assertions)
     })
   })
-})
\ No newline at end of file
+})
diff --git a/packages/server/src/api/controllers/query/import/tests/index.spec.js b/packages/server/src/api/controllers/query/import/tests/index.spec.js
index 60030ae7f3..cef27abb08 100644
--- a/packages/server/src/api/controllers/query/import/tests/index.spec.js
+++ b/packages/server/src/api/controllers/query/import/tests/index.spec.js
@@ -1,11 +1,14 @@
 const TestConfig = require("../../../../../tests/utilities/TestConfiguration")
 const { RestImporter } = require("../index")
 const fs = require("fs")
-const path = require('path')
-const { events} = require("@budibase/backend-core")
+const path = require("path")
+const { events } = require("@budibase/backend-core")
 
-const getData = (file) => {
-  return fs.readFileSync(path.join(__dirname, `../sources/tests/${file}`), "utf8")
+const getData = file => {
+  return fs.readFileSync(
+    path.join(__dirname, `../sources/tests/${file}`),
+    "utf8"
+  )
 }
 
 // openapi2 (swagger)
@@ -14,7 +17,7 @@ const oapi2CrudYaml = getData("openapi2/data/crud/crud.json")
 const oapi2PetstoreJson = getData("openapi2/data/petstore/petstore.json")
 const oapi2PetstoreYaml = getData("openapi2/data/petstore/petstore.json")
 
-// openapi3 
+// openapi3
 const oapi3CrudJson = getData("openapi3/data/crud/crud.json")
 const oapi3CrudYaml = getData("openapi3/data/crud/crud.json")
 const oapi3PetstoreJson = getData("openapi3/data/petstore/petstore.json")
@@ -35,7 +38,7 @@ const datasets = {
   oapi3PetstoreJson,
   oapi3PetstoreYaml,
   // curl
-  curl
+  curl,
 }
 
 describe("Rest Importer", () => {
@@ -45,9 +48,9 @@ describe("Rest Importer", () => {
     await config.init()
   })
 
-  let restImporter 
+  let restImporter
 
-  const init = async (data) => {
+  const init = async data => {
     restImporter = new RestImporter(data)
     await restImporter.init()
   }
@@ -69,35 +72,35 @@ describe("Rest Importer", () => {
   it("gets info", async () => {
     const assertions = {
       // openapi2 (swagger)
-      "oapi2CrudJson" : {
+      oapi2CrudJson: {
         name: "CRUD",
       },
-      "oapi2CrudYaml" : {
+      oapi2CrudYaml: {
         name: "CRUD",
       },
-      "oapi2PetstoreJson" : {
+      oapi2PetstoreJson: {
         name: "Swagger Petstore",
       },
-      "oapi2PetstoreYaml" :{
+      oapi2PetstoreYaml: {
         name: "Swagger Petstore",
       },
       // openapi3
-      "oapi3CrudJson" : {
+      oapi3CrudJson: {
         name: "CRUD",
       },
-      "oapi3CrudYaml" : {
+      oapi3CrudYaml: {
         name: "CRUD",
       },
-      "oapi3PetstoreJson" : {
+      oapi3PetstoreJson: {
         name: "Swagger Petstore - OpenAPI 3.0",
       },
-      "oapi3PetstoreYaml" :{
+      oapi3PetstoreYaml: {
         name: "Swagger Petstore - OpenAPI 3.0",
       },
       // curl
-      "curl": {
+      curl: {
         name: "example.com",
-      }
+      },
     }
     await runTest(testGetInfo, assertions)
   })
@@ -109,54 +112,58 @@ describe("Rest Importer", () => {
     expect(importResult.errorQueries.length).toBe(0)
     expect(importResult.queries.length).toBe(assertions[key].count)
     expect(events.query.imported).toBeCalledTimes(1)
-    expect(events.query.imported).toBeCalledWith(datasource, assertions[key].source, assertions[key].count)
+    expect(events.query.imported).toBeCalledWith(
+      datasource,
+      assertions[key].source,
+      assertions[key].count
+    )
     jest.clearAllMocks()
   }
 
   it("imports queries", async () => {
-    // simple sanity assertions that the whole dataset 
+    // simple sanity assertions that the whole dataset
     // makes it through the importer
     const assertions = {
       // openapi2 (swagger)
-      "oapi2CrudJson" : {
+      oapi2CrudJson: {
         count: 6,
         source: "openapi2.0",
       },
-      "oapi2CrudYaml" :{
+      oapi2CrudYaml: {
         count: 6,
-        source: "openapi2.0"
+        source: "openapi2.0",
       },
-      "oapi2PetstoreJson" : {
+      oapi2PetstoreJson: {
         count: 20,
-        source: "openapi2.0"
+        source: "openapi2.0",
       },
-      "oapi2PetstoreYaml" :{
+      oapi2PetstoreYaml: {
         count: 20,
-        source: "openapi2.0"
+        source: "openapi2.0",
       },
       // openapi3
-      "oapi3CrudJson" : {
+      oapi3CrudJson: {
         count: 6,
-        source: "openapi3.0"
+        source: "openapi3.0",
       },
-      "oapi3CrudYaml" :{
+      oapi3CrudYaml: {
         count: 6,
-        source: "openapi3.0"
+        source: "openapi3.0",
       },
-      "oapi3PetstoreJson" : {
+      oapi3PetstoreJson: {
         count: 19,
-        source: "openapi3.0"
+        source: "openapi3.0",
       },
-      "oapi3PetstoreYaml" :{
+      oapi3PetstoreYaml: {
         count: 19,
-        source: "openapi3.0"
+        source: "openapi3.0",
       },
       // curl
-      "curl": {
+      curl: {
         count: 1,
-        source: "curl"
-      }
+        source: "curl",
+      },
     }
     await runTest(testImportQueries, assertions)
   })
-})
\ No newline at end of file
+})
diff --git a/packages/server/src/api/controllers/row/index.ts b/packages/server/src/api/controllers/row/index.ts
index 018283c8c5..38731a87e1 100644
--- a/packages/server/src/api/controllers/row/index.ts
+++ b/packages/server/src/api/controllers/row/index.ts
@@ -27,6 +27,7 @@ import sdk from "../../../sdk"
 import * as exporters from "../view/exporters"
 import { apiFileReturn } from "../../../utilities/fileSystem"
 import { Format } from "../view/exporters"
+
 export * as views from "./views"
 
 function pickApi(tableId: any) {
diff --git a/packages/server/src/api/controllers/static/index.ts b/packages/server/src/api/controllers/static/index.ts
index 544bde1fbb..4c5415a6c6 100644
--- a/packages/server/src/api/controllers/static/index.ts
+++ b/packages/server/src/api/controllers/static/index.ts
@@ -1,4 +1,4 @@
-import { ValidFileExtensions } from "@budibase/shared-core"
+import { InvalidFileExtensions } from "@budibase/shared-core"
 
 require("svelte/register")
 
@@ -86,7 +86,10 @@ export const uploadFile = async function (
         )
       }
 
-      if (!env.SELF_HOSTED && !ValidFileExtensions.includes(extension)) {
+      if (
+        !env.SELF_HOSTED &&
+        InvalidFileExtensions.includes(extension.toLowerCase())
+      ) {
         throw new BadRequestError(
           `File "${file.name}" has an invalid extension: "${extension}"`
         )
diff --git a/packages/server/src/api/controllers/table/utils.ts b/packages/server/src/api/controllers/table/utils.ts
index ee295ff7af..b52b50c628 100644
--- a/packages/server/src/api/controllers/table/utils.ts
+++ b/packages/server/src/api/controllers/table/utils.ts
@@ -5,16 +5,14 @@ import {
   AutoFieldSubTypes,
   FieldTypes,
   GOOGLE_SHEETS_PRIMARY_KEY,
+  USERS_TABLE_SCHEMA,
+  SwitchableTypes,
+  CanSwitchTypes,
 } from "../../../constants"
 import {
   inputProcessing,
   cleanupAttachments,
 } from "../../../utilities/rowProcessor"
-import {
-  USERS_TABLE_SCHEMA,
-  SwitchableTypes,
-  CanSwitchTypes,
-} from "../../../constants"
 import { getViews, saveView } from "../view/utils"
 import viewTemplate from "../view/viewBuilder"
 import { cloneDeep } from "lodash/fp"
diff --git a/packages/server/src/api/controllers/view/tests/viewBuilder.spec.js b/packages/server/src/api/controllers/view/tests/viewBuilder.spec.js
index 303bb09cf6..7f4298b2ff 100644
--- a/packages/server/src/api/controllers/view/tests/viewBuilder.spec.js
+++ b/packages/server/src/api/controllers/view/tests/viewBuilder.spec.js
@@ -1,65 +1,75 @@
-const viewTemplate = require("../viewBuilder").default;
+const viewTemplate = require("../viewBuilder").default
 
 describe("viewBuilder", () => {
-
   describe("Filter", () => {
     it("creates a view with multiple filters and conjunctions", () => {
-      expect(viewTemplate({
-        "name": "Test View",
-        "tableId": "14f1c4e94d6a47b682ce89d35d4c78b0",
-        "filters": [{
-          "value": "Test",
-          "condition": "EQUALS",
-          "key": "Name"
-        }, {
-          "value": "Value",
-          "condition": "MT",
-          "key": "Yes",
-          "conjunction": "OR"
-        }]
-      })).toMatchSnapshot()
+      expect(
+        viewTemplate({
+          name: "Test View",
+          tableId: "14f1c4e94d6a47b682ce89d35d4c78b0",
+          filters: [
+            {
+              value: "Test",
+              condition: "EQUALS",
+              key: "Name",
+            },
+            {
+              value: "Value",
+              condition: "MT",
+              key: "Yes",
+              conjunction: "OR",
+            },
+          ],
+        })
+      ).toMatchSnapshot()
     })
   })
 
   describe("Calculate", () => {
     it("creates a view with the calculation statistics schema", () => {
-      expect(viewTemplate({
-        "name": "Calculate View",
-        "field": "myField",
-        "calculation": "stats",
-        "tableId": "14f1c4e94d6a47b682ce89d35d4c78b0",
-        "filters": []
-      })).toMatchSnapshot()
+      expect(
+        viewTemplate({
+          name: "Calculate View",
+          field: "myField",
+          calculation: "stats",
+          tableId: "14f1c4e94d6a47b682ce89d35d4c78b0",
+          filters: [],
+        })
+      ).toMatchSnapshot()
     })
   })
 
   describe("Group By", () => {
     it("creates a view emitting the group by field", () => {
-      expect(viewTemplate({
-        "name": "Test Scores Grouped By Age",
-        "tableId": "14f1c4e94d6a47b682ce89d35d4c78b0",
-        "groupBy": "age",
-        "field": "score",
-        "filters": [], 
-      })).toMatchSnapshot()
+      expect(
+        viewTemplate({
+          name: "Test Scores Grouped By Age",
+          tableId: "14f1c4e94d6a47b682ce89d35d4c78b0",
+          groupBy: "age",
+          field: "score",
+          filters: [],
+        })
+      ).toMatchSnapshot()
     })
   })
 
   describe("Calculate and filter", () => {
     it("creates a view with the calculation statistics and filter schema", () => {
-      expect(viewTemplate({
-        "name": "Calculate View",
-        "field": "myField",
-        "calculation": "stats",
-        "tableId": "14f1c4e94d6a47b682ce89d35d4c78b0",
-        "filters": [
-          {
-            "value": 17,
-            "condition": "MT",
-            "key": "age",
-          }
-        ]
-      })).toMatchSnapshot()
+      expect(
+        viewTemplate({
+          name: "Calculate View",
+          field: "myField",
+          calculation: "stats",
+          tableId: "14f1c4e94d6a47b682ce89d35d4c78b0",
+          filters: [
+            {
+              value: 17,
+              condition: "MT",
+              key: "age",
+            },
+          ],
+        })
+      ).toMatchSnapshot()
     })
   })
-});
\ No newline at end of file
+})
diff --git a/packages/server/src/api/controllers/view/views.ts b/packages/server/src/api/controllers/view/views.ts
index d311565524..36b89e084d 100644
--- a/packages/server/src/api/controllers/view/views.ts
+++ b/packages/server/src/api/controllers/view/views.ts
@@ -18,6 +18,7 @@ import {
 import { builderSocket } from "../../../websockets"
 
 const cloneDeep = require("lodash/cloneDeep")
+
 import isEqual from "lodash/isEqual"
 
 export async function fetch(ctx: Ctx) {
diff --git a/packages/server/src/api/index.ts b/packages/server/src/api/index.ts
index b4ee0faa7d..6221909347 100644
--- a/packages/server/src/api/index.ts
+++ b/packages/server/src/api/index.ts
@@ -4,6 +4,7 @@ import currentApp from "../middleware/currentapp"
 import zlib from "zlib"
 import { mainRoutes, staticRoutes, publicRoutes } from "./routes"
 import { middleware as pro } from "@budibase/pro"
+
 export { shutdown } from "./routes/public"
 const compress = require("koa-compress")
 
diff --git a/packages/server/src/api/routes/public/applications.ts b/packages/server/src/api/routes/public/applications.ts
index 5410eb7dcf..3de3b80e26 100644
--- a/packages/server/src/api/routes/public/applications.ts
+++ b/packages/server/src/api/routes/public/applications.ts
@@ -117,7 +117,7 @@ write.push(
  * /applications/{appId}/publish:
  *   post:
  *     operationId: appPublish
- *     summary: Unpublish an application
+ *     summary: Publish an application
  *     tags:
  *       - applications
  *     parameters:
diff --git a/packages/server/src/api/routes/public/tests/metrics.spec.js b/packages/server/src/api/routes/public/tests/metrics.spec.js
index 8e226ec958..8231596d59 100644
--- a/packages/server/src/api/routes/public/tests/metrics.spec.js
+++ b/packages/server/src/api/routes/public/tests/metrics.spec.js
@@ -25,10 +25,9 @@ describe("/metrics", () => {
 
     it("endpoint should not be publicly exposed", async () => {
       await request
-      .get(`/api/public/v1/metrics`)
-      .set(config.publicHeaders())
-      .expect(403)
+        .get(`/api/public/v1/metrics`)
+        .set(config.publicHeaders())
+        .expect(403)
     })
   })
-
 })
diff --git a/packages/server/src/api/routes/query.ts b/packages/server/src/api/routes/query.ts
index e7fe5c5c9b..fd9c51da4d 100644
--- a/packages/server/src/api/routes/query.ts
+++ b/packages/server/src/api/routes/query.ts
@@ -11,6 +11,7 @@ import {
   generateQueryPreviewValidation,
   generateQueryValidation,
 } from "../controllers/query/validation"
+
 const { BUILDER, PermissionType, PermissionLevel } = permissions
 
 const router: Router = new Router()
diff --git a/packages/server/src/api/routes/static.ts b/packages/server/src/api/routes/static.ts
index bd3f1aba2e..4e9e10fd56 100644
--- a/packages/server/src/api/routes/static.ts
+++ b/packages/server/src/api/routes/static.ts
@@ -6,6 +6,7 @@ import { permissions } from "@budibase/backend-core"
 import env from "../../environment"
 import { paramResource } from "../../middleware/resourceId"
 import { devClientLibPath } from "../../utilities/fileSystem"
+
 const { BUILDER, PermissionType, PermissionLevel } = permissions
 
 const router: Router = new Router()
diff --git a/packages/server/src/api/routes/table.ts b/packages/server/src/api/routes/table.ts
index b947fa5e0b..fd2587fa86 100644
--- a/packages/server/src/api/routes/table.ts
+++ b/packages/server/src/api/routes/table.ts
@@ -4,6 +4,7 @@ import authorized from "../../middleware/authorized"
 import { paramResource, bodyResource } from "../../middleware/resourceId"
 import { permissions } from "@budibase/backend-core"
 import { tableValidator } from "./utils/validators"
+
 const { BUILDER, PermissionLevel, PermissionType } = permissions
 
 const router: Router = new Router()
diff --git a/packages/server/src/api/routes/tests/analytics.spec.js b/packages/server/src/api/routes/tests/analytics.spec.js
index 5dfe2ce3e6..c69307656d 100644
--- a/packages/server/src/api/routes/tests/analytics.spec.js
+++ b/packages/server/src/api/routes/tests/analytics.spec.js
@@ -13,8 +13,8 @@ describe("/static", () => {
   beforeAll(async () => {
     app = await config.init()
   })
-  
-  beforeEach(()=>{
+
+  beforeEach(() => {
     jest.clearAllMocks()
   })
 
@@ -22,7 +22,7 @@ describe("/static", () => {
     it("should ping from builder", async () => {
       await request
         .post("/api/bbtel/ping")
-        .send({source: "builder", timezone})
+        .send({ source: "builder", timezone })
         .set(config.defaultHeaders())
         .expect(200)
 
@@ -35,12 +35,15 @@ describe("/static", () => {
     it("should ping from app preview", async () => {
       await request
         .post("/api/bbtel/ping")
-        .send({source: "app", timezone})
+        .send({ source: "app", timezone })
         .set(config.defaultHeaders())
         .expect(200)
 
       expect(events.serve.servedAppPreview).toBeCalledTimes(1)
-      expect(events.serve.servedAppPreview).toBeCalledWith(config.getApp(), timezone)
+      expect(events.serve.servedAppPreview).toBeCalledWith(
+        config.getApp(),
+        timezone
+      )
       expect(events.serve.servedApp).not.toBeCalled()
     })
 
@@ -50,12 +53,16 @@ describe("/static", () => {
 
       await request
         .post("/api/bbtel/ping")
-        .send({source: "app", timezone})
+        .send({ source: "app", timezone })
         .set(headers)
         .expect(200)
 
       expect(events.serve.servedApp).toBeCalledTimes(1)
-      expect(events.serve.servedApp).toBeCalledWith(config.getProdApp(), timezone, undefined)
+      expect(events.serve.servedApp).toBeCalledWith(
+        config.getProdApp(),
+        timezone,
+        undefined
+      )
       expect(events.serve.servedAppPreview).not.toBeCalled()
     })
 
@@ -65,12 +72,16 @@ describe("/static", () => {
 
       await request
         .post("/api/bbtel/ping")
-        .send({source: "app", timezone, embedded: true})
+        .send({ source: "app", timezone, embedded: true })
         .set(headers)
         .expect(200)
 
       expect(events.serve.servedApp).toBeCalledTimes(1)
-      expect(events.serve.servedApp).toBeCalledWith(config.getProdApp(), timezone, true)
+      expect(events.serve.servedApp).toBeCalledWith(
+        config.getProdApp(),
+        timezone,
+        true
+      )
       expect(events.serve.servedAppPreview).not.toBeCalled()
     })
   })
diff --git a/packages/server/src/api/routes/tests/apikeys.spec.js b/packages/server/src/api/routes/tests/apikeys.spec.js
index 4a52ea84b4..eb6933af7d 100644
--- a/packages/server/src/api/routes/tests/apikeys.spec.js
+++ b/packages/server/src/api/routes/tests/apikeys.spec.js
@@ -38,7 +38,7 @@ describe("/api/keys", () => {
         const res = await request
           .put(`/api/keys/TEST`)
           .send({
-            value: "test"
+            value: "test",
           })
           .set(config.defaultHeaders())
           .expect("Content-Type", /json/)
@@ -56,4 +56,4 @@ describe("/api/keys", () => {
       })
     })
   })
-})
\ No newline at end of file
+})
diff --git a/packages/server/src/api/routes/tests/attachment.spec.ts b/packages/server/src/api/routes/tests/attachment.spec.ts
index 14d2e845f6..e230b0688a 100644
--- a/packages/server/src/api/routes/tests/attachment.spec.ts
+++ b/packages/server/src/api/routes/tests/attachment.spec.ts
@@ -35,6 +35,17 @@ describe("/api/applications/:appId/sync", () => {
       })
     })
 
+    it("should reject an upload with a malicious uppercase file extension", async () => {
+      await config.withEnv({ SELF_HOSTED: undefined }, async () => {
+        let resp = (await config.api.attachment.process(
+          "OHNO.EXE",
+          Buffer.from([0]),
+          { expectStatus: 400 }
+        )) as unknown as APIError
+        expect(resp.message).toContain("invalid extension")
+      })
+    })
+
     it("should reject an upload with no file", async () => {
       let resp = (await config.api.attachment.process(
         undefined as any,
diff --git a/packages/server/src/api/routes/tests/auth.spec.js b/packages/server/src/api/routes/tests/auth.spec.js
index 9418d44046..5fbead99b7 100644
--- a/packages/server/src/api/routes/tests/auth.spec.js
+++ b/packages/server/src/api/routes/tests/auth.spec.js
@@ -21,4 +21,4 @@ describe("/authenticate", () => {
       expect(res.body._id).toEqual(generateUserMetadataID(config.user._id))
     })
   })
-})
\ No newline at end of file
+})
diff --git a/packages/server/src/api/routes/tests/component.spec.js b/packages/server/src/api/routes/tests/component.spec.js
index 160a1ca160..c621afae0a 100644
--- a/packages/server/src/api/routes/tests/component.spec.js
+++ b/packages/server/src/api/routes/tests/component.spec.js
@@ -29,4 +29,4 @@ describe("/component", () => {
       })
     })
   })
-})
\ No newline at end of file
+})
diff --git a/packages/server/src/api/routes/tests/datasource.spec.ts b/packages/server/src/api/routes/tests/datasource.spec.ts
index 3c1d7839e8..445c49c026 100644
--- a/packages/server/src/api/routes/tests/datasource.spec.ts
+++ b/packages/server/src/api/routes/tests/datasource.spec.ts
@@ -7,6 +7,7 @@ import sdk from "../../../sdk"
 
 import tk from "timekeeper"
 import { mocks } from "@budibase/backend-core/tests"
+
 tk.freeze(mocks.date.MOCK_DATE)
 
 let { basicDatasource } = setup.structures
diff --git a/packages/server/src/api/routes/tests/debug.spec.ts b/packages/server/src/api/routes/tests/debug.spec.ts
index 26e98d93f9..53e1f67823 100644
--- a/packages/server/src/api/routes/tests/debug.spec.ts
+++ b/packages/server/src/api/routes/tests/debug.spec.ts
@@ -1,5 +1,6 @@
 const { checkBuilderEndpoint } = require("./utilities/TestFunctions")
 const setup = require("./utilities")
+
 import os from "os"
 
 jest.mock("process", () => ({
diff --git a/packages/server/src/api/routes/tests/dev.spec.js b/packages/server/src/api/routes/tests/dev.spec.js
index af1dc82a9d..73f506d17f 100644
--- a/packages/server/src/api/routes/tests/dev.spec.js
+++ b/packages/server/src/api/routes/tests/dev.spec.js
@@ -1,7 +1,6 @@
 const setup = require("./utilities")
 const { events } = require("@budibase/backend-core")
 
-
 describe("/dev", () => {
   let request = setup.getRequest()
   let config = setup.getConfig()
@@ -32,9 +31,9 @@ describe("/dev", () => {
         .expect("Content-Type", /json/)
         .expect(200)
 
-      expect(res.body.version).toBe('0.0.0+jest')
+      expect(res.body.version).toBe("0.0.0+jest")
       expect(events.installation.versionChecked).toBeCalledTimes(1)
-      expect(events.installation.versionChecked).toBeCalledWith('0.0.0+jest')
+      expect(events.installation.versionChecked).toBeCalledWith("0.0.0+jest")
     })
   })
-})
\ No newline at end of file
+})
diff --git a/packages/server/src/api/routes/tests/environmentVariables.spec.ts b/packages/server/src/api/routes/tests/environmentVariables.spec.ts
index 3f32ded816..aacf89ea6d 100644
--- a/packages/server/src/api/routes/tests/environmentVariables.spec.ts
+++ b/packages/server/src/api/routes/tests/environmentVariables.spec.ts
@@ -1,4 +1,5 @@
 const pg = require("pg")
+
 jest.mock("pg", () => {
   return {
     Client: jest.fn().mockImplementation(() => ({
@@ -13,6 +14,7 @@ jest.mock("pg", () => {
 import * as setup from "./utilities"
 import { mocks } from "@budibase/backend-core/tests"
 import { env, events } from "@budibase/backend-core"
+
 const structures = setup.structures
 
 env._set("ENCRYPTION_KEY", "budibase")
diff --git a/packages/server/src/api/routes/tests/integration.spec.js b/packages/server/src/api/routes/tests/integration.spec.js
index dde780681b..798ddcd969 100644
--- a/packages/server/src/api/routes/tests/integration.spec.js
+++ b/packages/server/src/api/routes/tests/integration.spec.js
@@ -49,4 +49,4 @@ describe("/integrations", () => {
       })
     })
   })
-})
\ No newline at end of file
+})
diff --git a/packages/server/src/api/routes/tests/internalSearch.spec.ts b/packages/server/src/api/routes/tests/internalSearch.spec.ts
index fdae513cb6..9e1c3e3340 100644
--- a/packages/server/src/api/routes/tests/internalSearch.spec.ts
+++ b/packages/server/src/api/routes/tests/internalSearch.spec.ts
@@ -1,4 +1,5 @@
 const nodeFetch = require("node-fetch")
+
 nodeFetch.mockSearch()
 import { SearchParams } from "@budibase/backend-core"
 import * as search from "../../../sdk/app/rows/search/internalSearch"
diff --git a/packages/server/src/api/routes/tests/layout.spec.js b/packages/server/src/api/routes/tests/layout.spec.js
index ebd6ab7278..c3a3010e32 100644
--- a/packages/server/src/api/routes/tests/layout.spec.js
+++ b/packages/server/src/api/routes/tests/layout.spec.js
@@ -56,4 +56,4 @@ describe("/layouts", () => {
       })
     })
   })
-})
\ No newline at end of file
+})
diff --git a/packages/server/src/api/routes/tests/metadata.spec.js b/packages/server/src/api/routes/tests/metadata.spec.js
index bb28951ee3..d5563f417e 100644
--- a/packages/server/src/api/routes/tests/metadata.spec.js
+++ b/packages/server/src/api/routes/tests/metadata.spec.js
@@ -14,7 +14,10 @@ describe("/metadata", () => {
     automation = await config.createAutomation()
   })
 
-  async function createMetadata(data, type = MetadataTypes.AUTOMATION_TEST_INPUT) {
+  async function createMetadata(
+    data,
+    type = MetadataTypes.AUTOMATION_TEST_INPUT
+  ) {
     const res = await request
       .post(`/api/metadata/${type}/${automation._id}`)
       .send(data)
@@ -53,7 +56,9 @@ describe("/metadata", () => {
   describe("destroy", () => {
     it("should be able to delete some test inputs", async () => {
       const res = await request
-        .delete(`/api/metadata/${MetadataTypes.AUTOMATION_TEST_INPUT}/${automation._id}`)
+        .delete(
+          `/api/metadata/${MetadataTypes.AUTOMATION_TEST_INPUT}/${automation._id}`
+        )
         .set(config.defaultHeaders())
         .expect("Content-Type", /json/)
         .expect(200)
diff --git a/packages/server/src/api/routes/tests/query.seq.spec.js b/packages/server/src/api/routes/tests/query.seq.spec.js
index d7481fd224..05ca5f7cbb 100644
--- a/packages/server/src/api/routes/tests/query.seq.spec.js
+++ b/packages/server/src/api/routes/tests/query.seq.spec.js
@@ -1,4 +1,4 @@
-const tk = require( "timekeeper")
+const tk = require("timekeeper")
 tk.freeze(Date.now())
 
 // Mock out postgres for this
@@ -14,7 +14,7 @@ jest.mock("@budibase/backend-core", () => {
     db: {
       ...core.db,
       isProdAppID: jest.fn(),
-    }
+    },
   }
 })
 const setup = require("./utilities")
@@ -30,8 +30,7 @@ describe("/queries", () => {
 
   afterAll(setup.afterAll)
 
-  const setupTest = async()=>{
-
+  const setupTest = async () => {
     await config.init()
     datasource = await config.createDatasource()
     query = await config.createQuery()
@@ -52,7 +51,7 @@ describe("/queries", () => {
     return { datasource, query }
   }
 
-  const createQuery = async (query) => {
+  const createQuery = async query => {
     return request
       .post(`/api/queries`)
       .send(query)
@@ -76,7 +75,7 @@ describe("/queries", () => {
         _id: res.body._id,
         ...query,
         createdAt: new Date().toISOString(),
-        updatedAt: new Date().toISOString()
+        updatedAt: new Date().toISOString(),
       })
       expect(events.query.created).toBeCalledTimes(1)
       expect(events.query.updated).not.toBeCalled()
@@ -101,7 +100,7 @@ describe("/queries", () => {
         _id: res.body._id,
         ...query,
         createdAt: new Date().toISOString(),
-        updatedAt: new Date().toISOString()
+        updatedAt: new Date().toISOString(),
       })
       expect(events.query.created).not.toBeCalled()
       expect(events.query.updated).toBeCalledTimes(1)
@@ -109,7 +108,7 @@ describe("/queries", () => {
   })
 
   describe("fetch", () => {
-    beforeEach(async() => {
+    beforeEach(async () => {
       await setupTest()
     })
 
@@ -190,7 +189,7 @@ describe("/queries", () => {
   })
 
   describe("destroy", () => {
-    beforeEach(async() => {
+    beforeEach(async () => {
       await setupTest()
     })
 
@@ -237,8 +236,8 @@ describe("/queries", () => {
         .expect(200)
       // these responses come from the mock
       expect(res.body.schemaFields).toEqual({
-        "a": "string",
-        "b": "number",
+        a: "string",
+        b: "number",
       })
       expect(res.body.rows.length).toEqual(1)
       expect(events.query.previewed).toBeCalledTimes(1)
@@ -256,7 +255,7 @@ describe("/queries", () => {
   })
 
   describe("execute", () => {
-    beforeEach(async() => {
+    beforeEach(async () => {
       await setupTest()
     })
 
@@ -302,9 +301,9 @@ describe("/queries", () => {
       })
       // these responses come from the mock
       expect(res.body.schemaFields).toEqual({
-        "opts": "json",
-        "url": "string",
-        "value": "string",
+        opts: "json",
+        url: "string",
+        value: "string",
       })
       expect(res.body.rows[0].url).toEqual("http://www.google.com?test=1")
     })
@@ -316,9 +315,9 @@ describe("/queries", () => {
         queryString: "test={{ variable3 }}",
       })
       expect(res.body.schemaFields).toEqual({
-        "opts": "json",
-        "url": "string",
-        "value": "string"
+        opts: "json",
+        url: "string",
+        value: "string",
       })
       expect(res.body.rows[0].url).toContain("doctype%20html")
     })
@@ -339,9 +338,9 @@ describe("/queries", () => {
         queryString: "test={{ variable3 }}",
       })
       expect(res.body.schemaFields).toEqual({
-        "fails": "number",
-        "opts": "json",
-        "url": "string"
+        fails: "number",
+        opts: "json",
+        url: "string",
       })
       expect(res.body.rows[0].fails).toEqual(1)
     })
@@ -371,13 +370,19 @@ describe("/queries", () => {
   })
 
   describe("Current User Request Mapping", () => {
-    
     async function previewGet(datasource, fields, params) {
       return config.previewQuery(request, config, datasource, fields, params)
     }
 
     async function previewPost(datasource, fields, params) {
-      return config.previewQuery(request, config, datasource, fields, params, "create")
+      return config.previewQuery(
+        request,
+        config,
+        datasource,
+        fields,
+        params,
+        "create"
+      )
     }
 
     it("should parse global and query level header mappings", async () => {
@@ -385,120 +390,160 @@ describe("/queries", () => {
 
       const datasource = await config.restDatasource({
         defaultHeaders: {
-          "test": "headerVal",
-          "emailHdr": "{{[user].[email]}}"
-        }
+          test: "headerVal",
+          emailHdr: "{{[user].[email]}}",
+        },
       })
       const res = await previewGet(datasource, {
         path: "www.google.com",
         queryString: "email={{[user].[email]}}",
         headers: {
-          queryHdr : "{{[user].[firstName]}}",
-          secondHdr : "1234"
-        }
+          queryHdr: "{{[user].[firstName]}}",
+          secondHdr: "1234",
+        },
       })
 
       const parsedRequest = JSON.parse(res.body.extra.raw)
       expect(parsedRequest.opts.headers).toEqual({
-        "test": "headerVal",
-        "emailHdr": userDetails.email,
-        "queryHdr": userDetails.firstName,
-        "secondHdr" : "1234"
+        test: "headerVal",
+        emailHdr: userDetails.email,
+        queryHdr: userDetails.firstName,
+        secondHdr: "1234",
       })
-      expect(res.body.rows[0].url).toEqual("http://www.google.com?email=" + userDetails.email.replace("@", "%40"))
+      expect(res.body.rows[0].url).toEqual(
+        "http://www.google.com?email=" + userDetails.email.replace("@", "%40")
+      )
     })
 
     it("should bind the current user to query parameters", async () => {
       const userDetails = config.getUserDetails()
-  
+
       const datasource = await config.restDatasource()
-  
-      const res = await previewGet(datasource, {
-        path: "www.google.com",
-        queryString: "test={{myEmail}}&testName={{myName}}&testParam={{testParam}}",
-      }, {
-        "myEmail" : "{{[user].[email]}}",
-        "myName" : "{{[user].[firstName]}}",
-        "testParam" : "1234"
-      })
-  
-      expect(res.body.rows[0].url).toEqual("http://www.google.com?test=" + userDetails.email.replace("@", "%40") +
-        "&testName=" + userDetails.firstName + "&testParam=1234")
+
+      const res = await previewGet(
+        datasource,
+        {
+          path: "www.google.com",
+          queryString:
+            "test={{myEmail}}&testName={{myName}}&testParam={{testParam}}",
+        },
+        {
+          myEmail: "{{[user].[email]}}",
+          myName: "{{[user].[firstName]}}",
+          testParam: "1234",
+        }
+      )
+
+      expect(res.body.rows[0].url).toEqual(
+        "http://www.google.com?test=" +
+          userDetails.email.replace("@", "%40") +
+          "&testName=" +
+          userDetails.firstName +
+          "&testParam=1234"
+      )
     })
 
     it("should bind the current user the request body - plain text", async () => {
       const userDetails = config.getUserDetails()
       const datasource = await config.restDatasource()
-  
-      const res = await previewPost(datasource, {
-        path: "www.google.com",
-        queryString: "testParam={{testParam}}",
-        requestBody: "This is plain text and this is my email: {{[user].[email]}}. This is a test param: {{testParam}}",
-        bodyType: "text"
-      }, {
-        "testParam" : "1234"
-      })
+
+      const res = await previewPost(
+        datasource,
+        {
+          path: "www.google.com",
+          queryString: "testParam={{testParam}}",
+          requestBody:
+            "This is plain text and this is my email: {{[user].[email]}}. This is a test param: {{testParam}}",
+          bodyType: "text",
+        },
+        {
+          testParam: "1234",
+        }
+      )
 
       const parsedRequest = JSON.parse(res.body.extra.raw)
-      expect(parsedRequest.opts.body).toEqual(`This is plain text and this is my email: ${userDetails.email}. This is a test param: 1234`)
-      expect(res.body.rows[0].url).toEqual("http://www.google.com?testParam=1234")
+      expect(parsedRequest.opts.body).toEqual(
+        `This is plain text and this is my email: ${userDetails.email}. This is a test param: 1234`
+      )
+      expect(res.body.rows[0].url).toEqual(
+        "http://www.google.com?testParam=1234"
+      )
     })
 
     it("should bind the current user the request body - json", async () => {
       const userDetails = config.getUserDetails()
       const datasource = await config.restDatasource()
-  
-      const res = await previewPost(datasource, {
-        path: "www.google.com",
-        queryString: "testParam={{testParam}}",
-        requestBody: "{\"email\":\"{{[user].[email]}}\",\"queryCode\":{{testParam}},\"userRef\":\"{{userRef}}\"}",
-        bodyType: "json"
-      }, {
-        "testParam" : "1234",
-        "userRef" : "{{[user].[firstName]}}"
-      })
+
+      const res = await previewPost(
+        datasource,
+        {
+          path: "www.google.com",
+          queryString: "testParam={{testParam}}",
+          requestBody:
+            '{"email":"{{[user].[email]}}","queryCode":{{testParam}},"userRef":"{{userRef}}"}',
+          bodyType: "json",
+        },
+        {
+          testParam: "1234",
+          userRef: "{{[user].[firstName]}}",
+        }
+      )
 
       const parsedRequest = JSON.parse(res.body.extra.raw)
       const test = `{"email":"${userDetails.email}","queryCode":1234,"userRef":"${userDetails.firstName}"}`
       expect(parsedRequest.opts.body).toEqual(test)
-      expect(res.body.rows[0].url).toEqual("http://www.google.com?testParam=1234")
+      expect(res.body.rows[0].url).toEqual(
+        "http://www.google.com?testParam=1234"
+      )
     })
-   
+
     it("should bind the current user the request body - xml", async () => {
       const userDetails = config.getUserDetails()
       const datasource = await config.restDatasource()
-  
-      const res = await previewPost(datasource, {
-        path: "www.google.com",
-        queryString: "testParam={{testParam}}",
-        requestBody: "<note> <email>{{[user].[email]}}</email> <code>{{testParam}}</code> " + 
-          "<ref>{{userId}}</ref> <somestring>testing</somestring> </note>",
-        bodyType: "xml"
-      }, {
-        "testParam" : "1234",
-        "userId" : "{{[user].[firstName]}}"
-      })
+
+      const res = await previewPost(
+        datasource,
+        {
+          path: "www.google.com",
+          queryString: "testParam={{testParam}}",
+          requestBody:
+            "<note> <email>{{[user].[email]}}</email> <code>{{testParam}}</code> " +
+            "<ref>{{userId}}</ref> <somestring>testing</somestring> </note>",
+          bodyType: "xml",
+        },
+        {
+          testParam: "1234",
+          userId: "{{[user].[firstName]}}",
+        }
+      )
 
       const parsedRequest = JSON.parse(res.body.extra.raw)
       const test = `<note> <email>${userDetails.email}</email> <code>1234</code> <ref>${userDetails.firstName}</ref> <somestring>testing</somestring> </note>`
-        
+
       expect(parsedRequest.opts.body).toEqual(test)
-      expect(res.body.rows[0].url).toEqual("http://www.google.com?testParam=1234")
+      expect(res.body.rows[0].url).toEqual(
+        "http://www.google.com?testParam=1234"
+      )
     })
 
     it("should bind the current user the request body - form-data", async () => {
       const userDetails = config.getUserDetails()
       const datasource = await config.restDatasource()
-  
-      const res = await previewPost(datasource, {
-        path: "www.google.com",
-        queryString: "testParam={{testParam}}",
-        requestBody: "{\"email\":\"{{[user].[email]}}\",\"queryCode\":{{testParam}},\"userRef\":\"{{userRef}}\"}",
-        bodyType: "form"
-      }, {
-        "testParam" : "1234",
-        "userRef" : "{{[user].[firstName]}}"
-      })
+
+      const res = await previewPost(
+        datasource,
+        {
+          path: "www.google.com",
+          queryString: "testParam={{testParam}}",
+          requestBody:
+            '{"email":"{{[user].[email]}}","queryCode":{{testParam}},"userRef":"{{userRef}}"}',
+          bodyType: "form",
+        },
+        {
+          testParam: "1234",
+          userRef: "{{[user].[firstName]}}",
+        }
+      )
 
       const parsedRequest = JSON.parse(res.body.extra.raw)
 
@@ -511,28 +556,34 @@ describe("/queries", () => {
       const userRef = parsedRequest.opts.body._streams[7]
       expect(userRef).toEqual(userDetails.firstName)
 
-      expect(res.body.rows[0].url).toEqual("http://www.google.com?testParam=1234")
+      expect(res.body.rows[0].url).toEqual(
+        "http://www.google.com?testParam=1234"
+      )
     })
 
     it("should bind the current user the request body - encoded", async () => {
       const userDetails = config.getUserDetails()
       const datasource = await config.restDatasource()
-  
-      const res = await previewPost(datasource, {
-        path: "www.google.com",
-        queryString: "testParam={{testParam}}",
-        requestBody: "{\"email\":\"{{[user].[email]}}\",\"queryCode\":{{testParam}},\"userRef\":\"{{userRef}}\"}",
-        bodyType: "encoded"
-      }, {
-        "testParam" : "1234",
-        "userRef" : "{{[user].[firstName]}}"
-      })
+
+      const res = await previewPost(
+        datasource,
+        {
+          path: "www.google.com",
+          queryString: "testParam={{testParam}}",
+          requestBody:
+            '{"email":"{{[user].[email]}}","queryCode":{{testParam}},"userRef":"{{userRef}}"}',
+          bodyType: "encoded",
+        },
+        {
+          testParam: "1234",
+          userRef: "{{[user].[firstName]}}",
+        }
+      )
       const parsedRequest = JSON.parse(res.body.extra.raw)
-      
+
       expect(parsedRequest.opts.body.email).toEqual(userDetails.email)
       expect(parsedRequest.opts.body.queryCode).toEqual("1234")
       expect(parsedRequest.opts.body.userRef).toEqual(userDetails.firstName)
     })
-
-  });
+  })
 })
diff --git a/packages/server/src/api/routes/tests/role.spec.js b/packages/server/src/api/routes/tests/role.spec.js
index d133a69d64..a653b573b2 100644
--- a/packages/server/src/api/routes/tests/role.spec.js
+++ b/packages/server/src/api/routes/tests/role.spec.js
@@ -170,7 +170,7 @@ describe("/roles", () => {
         .get("/api/roles/accessible")
         .set({
           ...config.defaultHeaders(),
-          "x-budibase-role": "CUSTOM_ROLE"
+          "x-budibase-role": "CUSTOM_ROLE",
         })
         .expect(200)
       expect(res.body.length).toBe(3)
diff --git a/packages/server/src/api/routes/tests/routing.spec.js b/packages/server/src/api/routes/tests/routing.spec.js
index 4076f4879c..5bdd4ee852 100644
--- a/packages/server/src/api/routes/tests/routing.spec.js
+++ b/packages/server/src/api/routes/tests/routing.spec.js
@@ -37,19 +37,23 @@ describe("/routing", () => {
       await runInProd(async () => {
         return request
           .get(`/api/routing/client`)
-          .set(await config.roleHeaders({
-            roleId: BUILTIN_ROLE_IDS.BASIC,
-            prodApp: false
-          }))
+          .set(
+            await config.roleHeaders({
+              roleId: BUILTIN_ROLE_IDS.BASIC,
+              prodApp: false,
+            })
+          )
           .expect(302)
       })
     })
     it("returns the correct routing for basic user", async () => {
       const res = await request
         .get(`/api/routing/client`)
-        .set(await config.roleHeaders({
-          roleId: BUILTIN_ROLE_IDS.BASIC
-        }))
+        .set(
+          await config.roleHeaders({
+            roleId: BUILTIN_ROLE_IDS.BASIC,
+          })
+        )
         .expect("Content-Type", /json/)
         .expect(200)
       expect(res.body.routes).toBeDefined()
@@ -57,18 +61,20 @@ describe("/routing", () => {
         subpaths: {
           [route]: {
             screenId: basic._id,
-            roleId: basic.routing.roleId
-          }
-        }
+            roleId: basic.routing.roleId,
+          },
+        },
       })
     })
 
     it("returns the correct routing for power user", async () => {
       const res = await request
         .get(`/api/routing/client`)
-        .set(await config.roleHeaders({
-          roleId: BUILTIN_ROLE_IDS.POWER
-        }))
+        .set(
+          await config.roleHeaders({
+            roleId: BUILTIN_ROLE_IDS.POWER,
+          })
+        )
         .expect("Content-Type", /json/)
         .expect(200)
       expect(res.body.routes).toBeDefined()
@@ -76,9 +82,9 @@ describe("/routing", () => {
         subpaths: {
           [route]: {
             screenId: power._id,
-            roleId: power.routing.roleId
-          }
-        }
+            roleId: power.routing.roleId,
+          },
+        },
       })
     })
   })
@@ -87,10 +93,12 @@ describe("/routing", () => {
     it("should fetch all routes for builder", async () => {
       const res = await request
         .get(`/api/routing`)
-        .set(await config.roleHeaders({
-          roleId: BUILTIN_ROLE_IDS.POWER,
-          builder: true,
-        }))
+        .set(
+          await config.roleHeaders({
+            roleId: BUILTIN_ROLE_IDS.POWER,
+            builder: true,
+          })
+        )
         .expect(200)
         .expect("Content-Type", /json/)
       expect(res.body.routes).toBeDefined()
@@ -108,4 +116,4 @@ describe("/routing", () => {
       })
     })
   })
-})
\ No newline at end of file
+})
diff --git a/packages/server/src/api/routes/tests/row.spec.ts b/packages/server/src/api/routes/tests/row.spec.ts
index 060f6e46c1..de49441f3a 100644
--- a/packages/server/src/api/routes/tests/row.spec.ts
+++ b/packages/server/src/api/routes/tests/row.spec.ts
@@ -426,7 +426,7 @@ describe.each([
         const saved = (await loadRow(id, table._id!)).body
 
         expect(saved.stringUndefined).toBe(undefined)
-        expect(saved.stringNull).toBe("")
+        expect(saved.stringNull).toBe(null)
         expect(saved.stringString).toBe("i am a string")
         expect(saved.numberEmptyString).toBe(null)
         expect(saved.numberNull).toBe(null)
diff --git a/packages/server/src/api/routes/tests/screen.spec.js b/packages/server/src/api/routes/tests/screen.spec.js
index a3748d6a79..481baac703 100644
--- a/packages/server/src/api/routes/tests/screen.spec.js
+++ b/packages/server/src/api/routes/tests/screen.spec.js
@@ -36,7 +36,7 @@ describe("/screens", () => {
   })
 
   describe("save", () => {
-    const saveScreen = async (screen) => {
+    const saveScreen = async screen => {
       const res = await request
         .post(`/api/screens`)
         .send(screen)
@@ -100,4 +100,4 @@ describe("/screens", () => {
       })
     })
   })
-})
\ No newline at end of file
+})
diff --git a/packages/server/src/api/routes/tests/templates.spec.js b/packages/server/src/api/routes/tests/templates.spec.js
index 3cb22fd2d3..1406a75c59 100644
--- a/packages/server/src/api/routes/tests/templates.spec.js
+++ b/packages/server/src/api/routes/tests/templates.spec.js
@@ -21,4 +21,4 @@ describe("/templates", () => {
       expect(Array.isArray(res.body)).toEqual(true)
     })
   })
-})
\ No newline at end of file
+})
diff --git a/packages/server/src/api/routes/tests/utilities/TestFunctions.ts b/packages/server/src/api/routes/tests/utilities/TestFunctions.ts
index 78afbe8c60..53e90396aa 100644
--- a/packages/server/src/api/routes/tests/utilities/TestFunctions.ts
+++ b/packages/server/src/api/routes/tests/utilities/TestFunctions.ts
@@ -1,9 +1,8 @@
 import * as rowController from "../../../controllers/row"
 import * as appController from "../../../controllers/application"
 import { AppStatus } from "../../../../db/utils"
-import { roles, tenancy, context } from "@budibase/backend-core"
+import { roles, tenancy, context, db } from "@budibase/backend-core"
 import env from "../../../../environment"
-import { db } from "@budibase/backend-core"
 import Nano from "@budibase/nano"
 
 class Request {
diff --git a/packages/server/src/api/routes/tests/utilities/index.ts b/packages/server/src/api/routes/tests/utilities/index.ts
index bf69b91e3b..33d371a376 100644
--- a/packages/server/src/api/routes/tests/utilities/index.ts
+++ b/packages/server/src/api/routes/tests/utilities/index.ts
@@ -1,6 +1,7 @@
 import TestConfig from "../../../../tests/utilities/TestConfiguration"
 import env from "../../../../environment"
 import supertest from "supertest"
+
 export * as structures from "../../../../tests/utilities/structures"
 
 function user() {
diff --git a/packages/server/src/api/routes/tests/view.spec.js b/packages/server/src/api/routes/tests/view.spec.js
index e633279058..92ff097899 100644
--- a/packages/server/src/api/routes/tests/view.spec.js
+++ b/packages/server/src/api/routes/tests/view.spec.js
@@ -31,18 +31,18 @@ describe("/views", () => {
   beforeAll(async () => {
     await config.init()
   })
-  
-  beforeEach(async() => {
+
+  beforeEach(async () => {
     table = await config.createTable(priceTable())
   })
 
-  const saveView = async (view) => {
+  const saveView = async view => {
     const viewToSave = {
       name: "TestView",
       field: "Price",
       calculation: "stats",
       tableId: table._id,
-      ...view
+      ...view,
     }
     return request
       .post(`/api/views`)
@@ -53,7 +53,6 @@ describe("/views", () => {
   }
 
   describe("create", () => {
-
     it("returns a success message when the view is successfully created", async () => {
       const res = await saveView()
       expect(res.body.tableId).toBe(table._id)
@@ -81,11 +80,13 @@ describe("/views", () => {
 
       const res = await saveView({
         calculation: null,
-        filters: [{
-          value: "1",
-          condition: "EQUALS",
-          key: "price"
-        }],
+        filters: [
+          {
+            value: "1",
+            condition: "EQUALS",
+            key: "price",
+          },
+        ],
       })
 
       expect(res.body.tableId).toBe(table._id)
@@ -199,18 +200,26 @@ describe("/views", () => {
     })
 
     it("updates a view filter", async () => {
-      await saveView({ filters: [{
-        value: "1",
-        condition: "EQUALS",
-        key: "price"
-      }] })
+      await saveView({
+        filters: [
+          {
+            value: "1",
+            condition: "EQUALS",
+            key: "price",
+          },
+        ],
+      })
       jest.clearAllMocks()
 
-      await saveView({ filters: [{
-        value: "2",
-        condition: "EQUALS",
-        key: "price"
-      }] })
+      await saveView({
+        filters: [
+          {
+            value: "2",
+            condition: "EQUALS",
+            key: "price",
+          },
+        ],
+      })
 
       expect(events.view.created).not.toBeCalled()
       expect(events.view.updated).toBeCalledTimes(1)
@@ -223,11 +232,15 @@ describe("/views", () => {
     })
 
     it("deletes a view filter", async () => {
-      await saveView({ filters: [{
-        value: "1",
-        condition: "EQUALS",
-        key: "price"
-      }] })
+      await saveView({
+        filters: [
+          {
+            value: "1",
+            condition: "EQUALS",
+            key: "price",
+          },
+        ],
+      })
       jest.clearAllMocks()
 
       await saveView({ filters: [] })
@@ -344,7 +357,6 @@ describe("/views", () => {
   })
 
   describe("exportView", () => {
-
     beforeEach(() => {
       jest.clearAllMocks()
     })
@@ -362,14 +374,14 @@ describe("/views", () => {
         .expect(200)
     }
 
-    const assertJsonExport = (res) => {
+    const assertJsonExport = res => {
       const rows = JSON.parse(res.text)
       expect(rows.length).toBe(1)
       expect(rows[0].name).toBe("test-name")
       expect(rows[0].description).toBe("ùúûü")
     }
 
-    const assertCSVExport = (res) => {
+    const assertCSVExport = res => {
       expect(res.text).toBe(`"name","description"\n"test-name","ùúûü"`)
     }
 
diff --git a/packages/server/src/api/routes/tests/webhook.spec.ts b/packages/server/src/api/routes/tests/webhook.spec.ts
index 118bfca95f..38f84852b4 100644
--- a/packages/server/src/api/routes/tests/webhook.spec.ts
+++ b/packages/server/src/api/routes/tests/webhook.spec.ts
@@ -2,6 +2,7 @@ import { Webhook } from "@budibase/types"
 import * as setup from "./utilities"
 import { checkBuilderEndpoint } from "./utilities/TestFunctions"
 import { mocks } from "@budibase/backend-core/tests"
+
 const { basicWebhook, basicAutomation, collectAutomation } = setup.structures
 
 describe("/webhooks", () => {
diff --git a/packages/server/src/api/routes/user.ts b/packages/server/src/api/routes/user.ts
index 24f33140a6..a43ebcbf35 100644
--- a/packages/server/src/api/routes/user.ts
+++ b/packages/server/src/api/routes/user.ts
@@ -2,6 +2,7 @@ import Router from "@koa/router"
 import * as controller from "../controllers/user"
 import authorized from "../../middleware/authorized"
 import { permissions } from "@budibase/backend-core"
+
 const { PermissionType, PermissionLevel } = permissions
 
 const router: Router = new Router()
diff --git a/packages/server/src/app.ts b/packages/server/src/app.ts
index 66172b7bd0..4c0068be89 100644
--- a/packages/server/src/app.ts
+++ b/packages/server/src/app.ts
@@ -3,9 +3,11 @@ if (process.env.DD_APM_ENABLED) {
 }
 
 import * as db from "./db"
+
 db.init()
 import { ServiceType } from "@budibase/types"
 import { env as coreEnv } from "@budibase/backend-core"
+
 coreEnv._set("SERVICE_TYPE", ServiceType.APPS)
 import { apiEnabled } from "./features"
 import createKoaApp from "./koa"
diff --git a/packages/server/src/automations/tests/bash.spec.js b/packages/server/src/automations/tests/bash.spec.js
index a8695c7460..d2f3bb8031 100644
--- a/packages/server/src/automations/tests/bash.spec.js
+++ b/packages/server/src/automations/tests/bash.spec.js
@@ -1,34 +1,33 @@
 const setup = require("./utilities")
 
 describe("test the bash action", () => {
-    let config = setup.getConfig()
+  let config = setup.getConfig()
 
-    beforeAll(async () => {
-        await config.init()
-    })
-    afterAll(setup.afterAll)
+  beforeAll(async () => {
+    await config.init()
+  })
+  afterAll(setup.afterAll)
 
-    it("should be able to execute a script", async () => {
+  it("should be able to execute a script", async () => {
+    let res = await setup.runStep(
+      "EXECUTE_BASH",
+      (inputs = {
+        code: "echo 'test'",
+      })
+    )
+    expect(res.stdout).toEqual("test\n")
+    expect(res.success).toEqual(true)
+  })
 
-        let res = await setup.runStep("EXECUTE_BASH",
-            inputs = {
-                code: "echo 'test'"
-            }
-
-        )
-        expect(res.stdout).toEqual("test\n")
-        expect(res.success).toEqual(true)
-    })
-
-    it("should handle a null value", async () => {
-
-        let res = await setup.runStep("EXECUTE_BASH",
-            inputs = {
-                code: null
-            }
-
-
-        )
-        expect(res.stdout).toEqual("Budibase bash automation failed: Invalid inputs")
-    })
+  it("should handle a null value", async () => {
+    let res = await setup.runStep(
+      "EXECUTE_BASH",
+      (inputs = {
+        code: null,
+      })
+    )
+    expect(res.stdout).toEqual(
+      "Budibase bash automation failed: Invalid inputs"
+    )
+  })
 })
diff --git a/packages/server/src/automations/tests/delay.spec.js b/packages/server/src/automations/tests/delay.spec.js
index ad67c74606..5f6e0fd164 100644
--- a/packages/server/src/automations/tests/delay.spec.js
+++ b/packages/server/src/automations/tests/delay.spec.js
@@ -1,7 +1,7 @@
 const setup = require("./utilities")
 
 // need real Date for this test
-const tk = require('timekeeper');
+const tk = require("timekeeper")
 tk.reset()
 
 describe("test the delay logic", () => {
diff --git a/packages/server/src/automations/tests/discord.spec.js b/packages/server/src/automations/tests/discord.spec.js
index d91c46094a..ccae42d073 100644
--- a/packages/server/src/automations/tests/discord.spec.js
+++ b/packages/server/src/automations/tests/discord.spec.js
@@ -4,24 +4,23 @@ const fetch = require("node-fetch")
 jest.mock("node-fetch")
 
 describe("test the outgoing webhook action", () => {
-    let inputs
-    let config = setup.getConfig()
+  let inputs
+  let config = setup.getConfig()
 
-    beforeAll(async () => {
-        await config.init()
-        inputs = {
-            username: "joe_bloggs",
-            url: "http://www.test.com",
-        }
-    })
+  beforeAll(async () => {
+    await config.init()
+    inputs = {
+      username: "joe_bloggs",
+      url: "http://www.test.com",
+    }
+  })
 
-    afterAll(setup.afterAll)
-
-    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.method).toEqual("post")
-        expect(res.success).toEqual(true)
-    })
+  afterAll(setup.afterAll)
 
+  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.method).toEqual("post")
+    expect(res.success).toEqual(true)
+  })
 })
diff --git a/packages/server/src/automations/tests/executeQuery.spec.js b/packages/server/src/automations/tests/executeQuery.spec.js
index ae2ca1dfd8..3b747f2ba3 100644
--- a/packages/server/src/automations/tests/executeQuery.spec.js
+++ b/packages/server/src/automations/tests/executeQuery.spec.js
@@ -1,48 +1,47 @@
 const setup = require("./utilities")
 
 describe("test the execute query action", () => {
-    let config = setup.getConfig()
+  let config = setup.getConfig()
 
-    beforeAll(async () => {
-        await config.init()
+  beforeAll(async () => {
+    await config.init()
 
-        await config.createDatasource()
-        query = await config.createQuery()
+    await config.createDatasource()
+    query = await config.createQuery()
+  })
 
-    })
+  afterAll(setup.afterAll)
 
-    afterAll(setup.afterAll)
-
-    it("should be able to execute a query", async () => {
-        let res = await setup.runStep(setup.actions.EXECUTE_QUERY.stepId,
-            inputs = {
-                query: { queryId: query._id }
-            }
-        )
-        expect(res.response).toEqual([{ a: 'string', b: 1 }])
-        expect(res.success).toEqual(true)
-    })
-
-    it("should handle a null query value", async () => {
-        let res = await setup.runStep(setup.actions.EXECUTE_QUERY.stepId,
-            inputs = {
-                query: null
-            }
-        )
-        expect(res.response.message).toEqual("Invalid inputs")
-        expect(res.success).toEqual(false)
-    })
-
-
-    it("should handle an error executing a query", async () => {
-        let res = await setup.runStep(setup.actions.EXECUTE_QUERY.stepId,
-            inputs = {
-                query: { queryId: "wrong_id" }
-            }
-        )
-        expect(res.response).toEqual('Error: missing')
-        expect(res.success).toEqual(false)
-    })
+  it("should be able to execute a query", async () => {
+    let res = await setup.runStep(
+      setup.actions.EXECUTE_QUERY.stepId,
+      (inputs = {
+        query: { queryId: query._id },
+      })
+    )
+    expect(res.response).toEqual([{ a: "string", b: 1 }])
+    expect(res.success).toEqual(true)
+  })
 
+  it("should handle a null query value", async () => {
+    let res = await setup.runStep(
+      setup.actions.EXECUTE_QUERY.stepId,
+      (inputs = {
+        query: null,
+      })
+    )
+    expect(res.response.message).toEqual("Invalid inputs")
+    expect(res.success).toEqual(false)
+  })
 
+  it("should handle an error executing a query", async () => {
+    let res = await setup.runStep(
+      setup.actions.EXECUTE_QUERY.stepId,
+      (inputs = {
+        query: { queryId: "wrong_id" },
+      })
+    )
+    expect(res.response).toEqual("Error: missing")
+    expect(res.success).toEqual(false)
+  })
 })
diff --git a/packages/server/src/automations/tests/executeScript.spec.js b/packages/server/src/automations/tests/executeScript.spec.js
index b9aedb8e31..5aac8400cd 100644
--- a/packages/server/src/automations/tests/executeScript.spec.js
+++ b/packages/server/src/automations/tests/executeScript.spec.js
@@ -1,48 +1,43 @@
 const setup = require("./utilities")
 
 describe("test the execute script action", () => {
-    let config = setup.getConfig()
+  let config = setup.getConfig()
 
-    beforeAll(async () => {
-        await config.init()
-    })
-    afterAll(setup.afterAll)
+  beforeAll(async () => {
+    await config.init()
+  })
+  afterAll(setup.afterAll)
 
-    it("should be able to execute a script", async () => {
+  it("should be able to execute a script", async () => {
+    let res = await setup.runStep(
+      setup.actions.EXECUTE_SCRIPT.stepId,
+      (inputs = {
+        code: "return 1 + 1",
+      })
+    )
+    expect(res.value).toEqual(2)
+    expect(res.success).toEqual(true)
+  })
 
-        let res = await setup.runStep(setup.actions.EXECUTE_SCRIPT.stepId,
-            inputs = {
-                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
-            }
-
-
-        )
-        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(setup.actions.EXECUTE_SCRIPT.stepId,
-            inputs = {
-                code: "return something.map(x => x.name)"
-            }
-
-        )
-        expect(res.response).toEqual("ReferenceError: something is not defined")
-        expect(res.success).toEqual(false)
-    })
+  it("should handle a null value", async () => {
+    let res = await setup.runStep(
+      setup.actions.EXECUTE_SCRIPT.stepId,
+      (inputs = {
+        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(
+      setup.actions.EXECUTE_SCRIPT.stepId,
+      (inputs = {
+        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/openai.spec.ts b/packages/server/src/automations/tests/openai.spec.ts
index 88cb63b95b..bd73827cce 100644
--- a/packages/server/src/automations/tests/openai.spec.ts
+++ b/packages/server/src/automations/tests/openai.spec.ts
@@ -1,4 +1,5 @@
 const setup = require("./utilities")
+
 import environment from "../../environment"
 import openai from "openai"
 
diff --git a/packages/server/src/automations/tests/outgoingWebhook.spec.js b/packages/server/src/automations/tests/outgoingWebhook.spec.js
index c31ed850e7..4bc51d0989 100644
--- a/packages/server/src/automations/tests/outgoingWebhook.spec.js
+++ b/packages/server/src/automations/tests/outgoingWebhook.spec.js
@@ -21,7 +21,10 @@ describe("test the outgoing webhook action", () => {
   afterAll(setup.afterAll)
 
   it("should be able to run the action", async () => {
-    const res = await setup.runStep(setup.actions.OUTGOING_WEBHOOK.stepId, inputs)
+    const res = await setup.runStep(
+      setup.actions.OUTGOING_WEBHOOK.stepId,
+      inputs
+    )
     expect(res.success).toEqual(true)
     expect(res.response.url).toEqual("http://www.test.com")
     expect(res.response.method).toEqual("POST")
@@ -31,9 +34,8 @@ describe("test the outgoing webhook action", () => {
   it("should return an error if something goes wrong in fetch", async () => {
     const res = await setup.runStep(setup.actions.OUTGOING_WEBHOOK.stepId, {
       requestMethod: "GET",
-      url: "www.invalid.com"
+      url: "www.invalid.com",
     })
     expect(res.success).toEqual(false)
   })
-
 })
diff --git a/packages/server/src/automations/tests/serverLog.spec.js b/packages/server/src/automations/tests/serverLog.spec.js
index 8b5ce2e64f..8869c07a4b 100644
--- a/packages/server/src/automations/tests/serverLog.spec.js
+++ b/packages/server/src/automations/tests/serverLog.spec.js
@@ -1,22 +1,19 @@
 const setup = require("./utilities")
 
 describe("test the server log action", () => {
-    let config = setup.getConfig()
+  let config = setup.getConfig()
 
-    beforeAll(async () => {
-        await config.init()
-        inputs = {
-            text: "log message",
-        }
-    })
-    afterAll(setup.afterAll)
+  beforeAll(async () => {
+    await config.init()
+    inputs = {
+      text: "log message",
+    }
+  })
+  afterAll(setup.afterAll)
 
-    it("should be able to log the text", async () => {
-
-        let res = await setup.runStep(setup.actions.SERVER_LOG.stepId,
-            inputs
-        )
-        expect(res.message).toEqual(`App ${config.getAppId()} - ${inputs.text}`)
-        expect(res.success).toEqual(true)
-    })
+  it("should be able to log the text", async () => {
+    let res = await setup.runStep(setup.actions.SERVER_LOG.stepId, inputs)
+    expect(res.message).toEqual(`App ${config.getAppId()} - ${inputs.text}`)
+    expect(res.success).toEqual(true)
+  })
 })
diff --git a/packages/server/src/automations/triggers.ts b/packages/server/src/automations/triggers.ts
index ac977bbefb..17a33e4394 100644
--- a/packages/server/src/automations/triggers.ts
+++ b/packages/server/src/automations/triggers.ts
@@ -1,8 +1,7 @@
 import emitter from "../events/index"
-import { getAutomationParams } from "../db/utils"
+import { getAutomationParams, isDevAppID } from "../db/utils"
 import { coerce } from "../utilities/rowProcessor"
 import { definitions } from "./triggerInfo"
-import { isDevAppID } from "../db/utils"
 // need this to call directly, so we can get a response
 import { automationQueue } from "./bullboard"
 import { checkTestFlag } from "../utilities/redis"
diff --git a/packages/server/src/db/inMemoryView.ts b/packages/server/src/db/inMemoryView.ts
index 724bc725ce..73e5c622eb 100644
--- a/packages/server/src/db/inMemoryView.ts
+++ b/packages/server/src/db/inMemoryView.ts
@@ -4,6 +4,7 @@ import { Row, Document, DBView } from "@budibase/types"
 // bypass the main application db config
 // use in memory pouchdb directly
 import { db as dbCore } from "@budibase/backend-core"
+
 const Pouch = dbCore.getPouch({ inMemory: true })
 
 export async function runView(
diff --git a/packages/server/src/db/tests/linkController.spec.js b/packages/server/src/db/tests/linkController.spec.js
index 5caf35f61a..313cfee837 100644
--- a/packages/server/src/db/tests/linkController.spec.js
+++ b/packages/server/src/db/tests/linkController.spec.js
@@ -1,5 +1,9 @@
 const TestConfig = require("../../tests/utilities/TestConfiguration")
-const { basicRow, basicLinkedRow, basicTable } = require("../../tests/utilities/structures")
+const {
+  basicRow,
+  basicLinkedRow,
+  basicTable,
+} = require("../../tests/utilities/structures")
 const LinkController = require("../linkedRows/LinkController").default
 const { context } = require("@budibase/backend-core")
 const { RelationshipType } = require("../../constants")
@@ -16,7 +20,10 @@ describe("test the link controller", () => {
 
   beforeEach(async () => {
     const { _id } = await config.createTable()
-    table2 = await config.createLinkedTable(RelationshipType.MANY_TO_MANY, ["link", "link2"])
+    table2 = await config.createLinkedTable(RelationshipType.MANY_TO_MANY, [
+      "link",
+      "link2",
+    ])
     // update table after creating link
     table1 = await config.getTable(_id)
   })
@@ -41,15 +48,23 @@ describe("test the link controller", () => {
 
   async function createLinkedRow(linkField = "link", t1 = table1, t2 = table2) {
     const row = await config.createRow(basicRow(t2._id))
-    const { _id } = await config.createRow(basicLinkedRow(t1._id, row._id, linkField))
+    const { _id } = await config.createRow(
+      basicLinkedRow(t1._id, row._id, linkField)
+    )
     return config.getRow(t1._id, _id)
   }
 
   it("should be able to confirm if two table schemas are equal", async () => {
     const controller = await createLinkController(table1)
-    let equal = controller.areLinkSchemasEqual(table2.schema.link, table2.schema.link)
+    let equal = controller.areLinkSchemasEqual(
+      table2.schema.link,
+      table2.schema.link
+    )
     expect(equal).toEqual(true)
-    equal = controller.areLinkSchemasEqual(table1.schema.link, table2.schema.link)
+    equal = controller.areLinkSchemasEqual(
+      table1.schema.link,
+      table2.schema.link
+    )
     expect(equal).toEqual(false)
   })
 
@@ -57,17 +72,42 @@ describe("test the link controller", () => {
     const controller = await createLinkController(table1)
     // empty case
     let output = controller.handleRelationshipType({}, {})
-    expect(output.linkedField.relationshipType).toEqual(RelationshipType.MANY_TO_MANY)
-    expect(output.linkerField.relationshipType).toEqual(RelationshipType.MANY_TO_MANY)
-    output = controller.handleRelationshipType({ relationshipType: RelationshipType.MANY_TO_MANY }, {})
-    expect(output.linkedField.relationshipType).toEqual(RelationshipType.MANY_TO_MANY)
-    expect(output.linkerField.relationshipType).toEqual(RelationshipType.MANY_TO_MANY)
-    output = controller.handleRelationshipType({ relationshipType: RelationshipType.MANY_TO_ONE }, {})
-    expect(output.linkedField.relationshipType).toEqual(RelationshipType.ONE_TO_MANY)
-    expect(output.linkerField.relationshipType).toEqual(RelationshipType.MANY_TO_ONE)
-    output = controller.handleRelationshipType({ relationshipType: RelationshipType.ONE_TO_MANY }, {})
-    expect(output.linkedField.relationshipType).toEqual(RelationshipType.MANY_TO_ONE)
-    expect(output.linkerField.relationshipType).toEqual(RelationshipType.ONE_TO_MANY)
+    expect(output.linkedField.relationshipType).toEqual(
+      RelationshipType.MANY_TO_MANY
+    )
+    expect(output.linkerField.relationshipType).toEqual(
+      RelationshipType.MANY_TO_MANY
+    )
+    output = controller.handleRelationshipType(
+      { relationshipType: RelationshipType.MANY_TO_MANY },
+      {}
+    )
+    expect(output.linkedField.relationshipType).toEqual(
+      RelationshipType.MANY_TO_MANY
+    )
+    expect(output.linkerField.relationshipType).toEqual(
+      RelationshipType.MANY_TO_MANY
+    )
+    output = controller.handleRelationshipType(
+      { relationshipType: RelationshipType.MANY_TO_ONE },
+      {}
+    )
+    expect(output.linkedField.relationshipType).toEqual(
+      RelationshipType.ONE_TO_MANY
+    )
+    expect(output.linkerField.relationshipType).toEqual(
+      RelationshipType.MANY_TO_ONE
+    )
+    output = controller.handleRelationshipType(
+      { relationshipType: RelationshipType.ONE_TO_MANY },
+      {}
+    )
+    expect(output.linkedField.relationshipType).toEqual(
+      RelationshipType.MANY_TO_ONE
+    )
+    expect(output.linkerField.relationshipType).toEqual(
+      RelationshipType.ONE_TO_MANY
+    )
   })
 
   it("should be able to delete a row", async () => {
@@ -100,7 +140,7 @@ describe("test the link controller", () => {
   it("should throw an error when validating a table which is invalid", async () => {
     const controller = await createLinkController(table1)
     const copyTable = {
-      ...table1
+      ...table1,
     }
     copyTable.schema.otherTableLink = {
       type: "link",
@@ -114,7 +154,9 @@ describe("test the link controller", () => {
       error = err
     }
     expect(error).toBeDefined()
-    expect(error.message).toEqual("Cannot re-use the linked column name for a linked table.")
+    expect(error.message).toEqual(
+      "Cannot re-use the linked column name for a linked table."
+    )
   })
 
   it("should be able to remove a link when saving/updating the row", async () => {
@@ -183,7 +225,10 @@ describe("test the link controller", () => {
 
   it("shouldn't allow one to many having many relationships against it", async () => {
     const firstTable = await config.createTable()
-    const { _id } = await config.createLinkedTable(RelationshipType.MANY_TO_ONE, ["link"])
+    const { _id } = await config.createLinkedTable(
+      RelationshipType.MANY_TO_ONE,
+      ["link"]
+    )
     const linkTable = await config.getTable(_id)
     // an initial row to link around
     const row = await createLinkedRow("link", linkTable, firstTable)
diff --git a/packages/server/src/db/tests/linkTests.spec.js b/packages/server/src/db/tests/linkTests.spec.js
index 19a0eb88d3..7b3fedb5a9 100644
--- a/packages/server/src/db/tests/linkTests.spec.js
+++ b/packages/server/src/db/tests/linkTests.spec.js
@@ -45,7 +45,9 @@ describe("test link functionality", () => {
     })
 
     it("should get the field from the link", () => {
-      expect(linkUtils.getRelatedTableForField(link, "otherLink")).toBe("tableID")
+      expect(linkUtils.getRelatedTableForField(link, "otherLink")).toBe(
+        "tableID"
+      )
     })
   })
 
@@ -62,4 +64,4 @@ describe("test link functionality", () => {
       })
     })
   })
-})
\ No newline at end of file
+})
diff --git a/packages/server/src/db/utils.ts b/packages/server/src/db/utils.ts
index a5569f8166..1712563085 100644
--- a/packages/server/src/db/utils.ts
+++ b/packages/server/src/db/utils.ts
@@ -9,6 +9,7 @@ import {
   DatabaseQueryOpts,
 } from "@budibase/types"
 import { FieldTypes } from "../constants"
+
 export { DocumentType, VirtualDocumentType } from "@budibase/types"
 
 type Optional = string | null
diff --git a/packages/server/src/db/views/staticViews.ts b/packages/server/src/db/views/staticViews.ts
index 126198f9dc..5b1b66d8e3 100644
--- a/packages/server/src/db/views/staticViews.ts
+++ b/packages/server/src/db/views/staticViews.ts
@@ -1,6 +1,7 @@
 import { context } from "@budibase/backend-core"
 import { DocumentType, SEPARATOR, ViewName } from "../utils"
 import { LinkDocument, Row, SearchIndex } from "@budibase/types"
+
 const SCREEN_PREFIX = DocumentType.SCREEN + SEPARATOR
 
 /**************************************************
diff --git a/packages/server/src/definitions/common.ts b/packages/server/src/definitions/common.ts
index 33eefefdc8..56c6af49c9 100644
--- a/packages/server/src/definitions/common.ts
+++ b/packages/server/src/definitions/common.ts
@@ -1,4 +1,5 @@
 import { Document } from "@budibase/types"
+
 export {
   Query,
   Datasource,
diff --git a/packages/server/src/environment.ts b/packages/server/src/environment.ts
index c126a61c22..e7eea5f0b6 100644
--- a/packages/server/src/environment.ts
+++ b/packages/server/src/environment.ts
@@ -1,5 +1,6 @@
 import { env as coreEnv } from "@budibase/backend-core"
 import { ServiceType } from "@budibase/types"
+
 coreEnv._set("SERVICE_TYPE", ServiceType.APPS)
 import { join } from "path"
 
@@ -32,6 +33,7 @@ const environment = {
   REDIS_PASSWORD: process.env.REDIS_PASSWORD,
   REDIS_CLUSTERED: process.env.REDIS_CLUSTERED,
   HTTP_MIGRATIONS: process.env.HTTP_MIGRATIONS,
+  CLUSTER_MODE: process.env.CLUSTER_MODE,
   API_REQ_LIMIT_PER_SEC: process.env.API_REQ_LIMIT_PER_SEC,
   GOOGLE_CLIENT_ID: process.env.GOOGLE_CLIENT_ID,
   GOOGLE_CLIENT_SECRET: process.env.GOOGLE_CLIENT_SECRET,
diff --git a/packages/server/src/integrations/base/sql.ts b/packages/server/src/integrations/base/sql.ts
index b24be1987b..29c8416b34 100644
--- a/packages/server/src/integrations/base/sql.ts
+++ b/packages/server/src/integrations/base/sql.ts
@@ -1,7 +1,7 @@
 import { Knex, knex } from "knex"
 import { db as dbCore } from "@budibase/backend-core"
 import { QueryOptions } from "../../definitions/datasource"
-import { isIsoDateString, SqlClient } from "../utils"
+import { isIsoDateString, SqlClient, isValidFilter } from "../utils"
 import SqlTableQueryBuilder from "./sqlTable"
 import {
   Operation,
@@ -11,7 +11,6 @@ import {
   SortDirection,
 } from "@budibase/types"
 import environment from "../../environment"
-import { isValidFilter } from "../utils"
 
 const envLimit = environment.SQL_MAX_ROWS
   ? parseInt(environment.SQL_MAX_ROWS)
diff --git a/packages/server/src/integrations/microsoftSqlServer.ts b/packages/server/src/integrations/microsoftSqlServer.ts
index c615e5ba48..7f25df5ed4 100644
--- a/packages/server/src/integrations/microsoftSqlServer.ts
+++ b/packages/server/src/integrations/microsoftSqlServer.ts
@@ -26,6 +26,7 @@ import Sql from "./base/sql"
 import { MSSQLTablesResponse, MSSQLColumn } from "./base/types"
 import { getReadableErrorMessage } from "./base/errorMapping"
 import sqlServer from "mssql"
+
 const DEFAULT_SCHEMA = "dbo"
 
 import { ConfidentialClientApplication } from "@azure/msal-node"
diff --git a/packages/server/src/integrations/oracle.ts b/packages/server/src/integrations/oracle.ts
index c6a871e41f..846aadc242 100644
--- a/packages/server/src/integrations/oracle.ts
+++ b/packages/server/src/integrations/oracle.ts
@@ -30,6 +30,7 @@ import {
   Result,
 } from "oracledb"
 import { OracleTable, OracleColumn, OracleColumnsResponse } from "./base/types"
+
 let oracledb: any
 try {
   oracledb = require("oracledb")
diff --git a/packages/server/src/integrations/tests/airtable.spec.ts b/packages/server/src/integrations/tests/airtable.spec.ts
index 26a389456f..eeb3d65046 100644
--- a/packages/server/src/integrations/tests/airtable.spec.ts
+++ b/packages/server/src/integrations/tests/airtable.spec.ts
@@ -1,4 +1,5 @@
 import { default as AirtableIntegration } from "../airtable"
+
 jest.mock("airtable")
 
 class TestConfiguration {
diff --git a/packages/server/src/integrations/tests/arangodb.spec.ts b/packages/server/src/integrations/tests/arangodb.spec.ts
index 401b2ec707..c7339299dd 100644
--- a/packages/server/src/integrations/tests/arangodb.spec.ts
+++ b/packages/server/src/integrations/tests/arangodb.spec.ts
@@ -1,4 +1,5 @@
 import { default as ArangoDBIntegration } from "../arangodb"
+
 jest.mock("arangojs")
 
 class TestConfiguration {
diff --git a/packages/server/src/integrations/tests/dynamodb.spec.ts b/packages/server/src/integrations/tests/dynamodb.spec.ts
index d245875173..a7a2767469 100644
--- a/packages/server/src/integrations/tests/dynamodb.spec.ts
+++ b/packages/server/src/integrations/tests/dynamodb.spec.ts
@@ -1,4 +1,5 @@
 import { default as DynamoDBIntegration } from "../dynamodb"
+
 jest.mock("aws-sdk")
 
 class TestConfiguration {
diff --git a/packages/server/src/integrations/tests/elasticsearch.spec.ts b/packages/server/src/integrations/tests/elasticsearch.spec.ts
index c839b9b2d4..e21e8dec69 100644
--- a/packages/server/src/integrations/tests/elasticsearch.spec.ts
+++ b/packages/server/src/integrations/tests/elasticsearch.spec.ts
@@ -1,4 +1,5 @@
 import { default as ElasticSearchIntegration } from "../elasticsearch"
+
 jest.mock("@elastic/elasticsearch")
 
 class TestConfiguration {
diff --git a/packages/server/src/integrations/tests/firebase.spec.ts b/packages/server/src/integrations/tests/firebase.spec.ts
index befbb80ccb..f2cea8898f 100644
--- a/packages/server/src/integrations/tests/firebase.spec.ts
+++ b/packages/server/src/integrations/tests/firebase.spec.ts
@@ -1,4 +1,5 @@
 import { default as FirebaseIntegration } from "../firebase"
+
 jest.mock("@google-cloud/firestore")
 
 class TestConfiguration {
diff --git a/packages/server/src/integrations/tests/microsoftSqlServer.spec.ts b/packages/server/src/integrations/tests/microsoftSqlServer.spec.ts
index 8484e759a9..eaaa79f7c9 100644
--- a/packages/server/src/integrations/tests/microsoftSqlServer.spec.ts
+++ b/packages/server/src/integrations/tests/microsoftSqlServer.spec.ts
@@ -1,4 +1,5 @@
 import { default as MSSQLIntegration } from "../microsoftSqlServer"
+
 jest.mock("mssql")
 
 class TestConfiguration {
diff --git a/packages/server/src/integrations/tests/mongo.spec.ts b/packages/server/src/integrations/tests/mongo.spec.ts
index b941d7ae66..51ec839db2 100644
--- a/packages/server/src/integrations/tests/mongo.spec.ts
+++ b/packages/server/src/integrations/tests/mongo.spec.ts
@@ -1,5 +1,7 @@
 const mongo = require("mongodb")
+
 import { default as MongoDBIntegration } from "../mongodb"
+
 jest.mock("mongodb")
 
 class TestConfiguration {
diff --git a/packages/server/src/integrations/tests/mysql.spec.ts b/packages/server/src/integrations/tests/mysql.spec.ts
index c3c3b8343e..7d45a06735 100644
--- a/packages/server/src/integrations/tests/mysql.spec.ts
+++ b/packages/server/src/integrations/tests/mysql.spec.ts
@@ -1,4 +1,5 @@
 import { default as MySQLIntegration, bindingTypeCoerce } from "../mysql"
+
 jest.mock("mysql2")
 
 class TestConfiguration {
diff --git a/packages/server/src/integrations/tests/oracle.spec.ts b/packages/server/src/integrations/tests/oracle.spec.ts
index 57dad48820..8c05a881d4 100644
--- a/packages/server/src/integrations/tests/oracle.spec.ts
+++ b/packages/server/src/integrations/tests/oracle.spec.ts
@@ -1,5 +1,7 @@
 const oracledb = require("oracledb")
+
 import { default as OracleIntegration } from "../oracle"
+
 jest.mock("oracledb")
 
 class TestConfiguration {
diff --git a/packages/server/src/integrations/tests/postgres.spec.ts b/packages/server/src/integrations/tests/postgres.spec.ts
index a6be3aa623..1acdff6bcf 100644
--- a/packages/server/src/integrations/tests/postgres.spec.ts
+++ b/packages/server/src/integrations/tests/postgres.spec.ts
@@ -1,5 +1,7 @@
 const pg = require("pg")
+
 import { default as PostgresIntegration } from "../postgres"
+
 jest.mock("pg")
 
 class TestConfiguration {
diff --git a/packages/server/src/integrations/tests/redis.spec.ts b/packages/server/src/integrations/tests/redis.spec.ts
index 942da99530..bec0e53bc3 100644
--- a/packages/server/src/integrations/tests/redis.spec.ts
+++ b/packages/server/src/integrations/tests/redis.spec.ts
@@ -1,4 +1,5 @@
 const Redis = require("ioredis-mock")
+
 import { default as RedisIntegration } from "../redis"
 
 class TestConfiguration {
diff --git a/packages/server/src/integrations/tests/rest.spec.ts b/packages/server/src/integrations/tests/rest.spec.ts
index 3295405ce2..98c57580a3 100644
--- a/packages/server/src/integrations/tests/rest.spec.ts
+++ b/packages/server/src/integrations/tests/rest.spec.ts
@@ -16,6 +16,7 @@ jest.mock("node-fetch", () => {
 import fetch from "node-fetch"
 import { default as RestIntegration } from "../rest"
 import { RestAuthType } from "@budibase/types"
+
 const FormData = require("form-data")
 const { URLSearchParams } = require("url")
 
diff --git a/packages/server/src/integrations/tests/s3.spec.ts b/packages/server/src/integrations/tests/s3.spec.ts
index 35107adefe..b4b2ad76e7 100644
--- a/packages/server/src/integrations/tests/s3.spec.ts
+++ b/packages/server/src/integrations/tests/s3.spec.ts
@@ -1,5 +1,7 @@
 const AWS = require("aws-sdk")
+
 import { default as S3Integration } from "../s3"
+
 jest.mock("aws-sdk")
 
 class TestConfiguration {
diff --git a/packages/server/src/koa.ts b/packages/server/src/koa.ts
index fa5cf1d051..b331d87120 100644
--- a/packages/server/src/koa.ts
+++ b/packages/server/src/koa.ts
@@ -1,6 +1,5 @@
 import env from "./environment"
-import { ExtendableContext } from "koa"
-import Koa from "koa"
+import Koa, { ExtendableContext } from "koa"
 import koaBody from "koa-body"
 import http from "http"
 import * as api from "./api"
diff --git a/packages/server/src/middleware/tests/currentapp.spec.js b/packages/server/src/middleware/tests/currentapp.spec.js
index b80800fd96..22e47b0a6e 100644
--- a/packages/server/src/middleware/tests/currentapp.spec.js
+++ b/packages/server/src/middleware/tests/currentapp.spec.js
@@ -9,11 +9,11 @@ function mockWorker() {
       return {
         _id: "us_uuid1",
         roles: {
-          "app_test": "BASIC",
+          app_test: "BASIC",
         },
         roleId: "BASIC",
       }
-    }
+    },
   }))
 }
 
@@ -109,7 +109,7 @@ class TestConfiguration {
       path: "",
       cookies: {
         set: jest.fn(),
-      }
+      },
     }
   }
 
diff --git a/packages/server/src/middleware/tests/resourceId.spec.js b/packages/server/src/middleware/tests/resourceId.spec.js
index 56d89cfede..759aa46f00 100644
--- a/packages/server/src/middleware/tests/resourceId.spec.js
+++ b/packages/server/src/middleware/tests/resourceId.spec.js
@@ -3,7 +3,7 @@ const {
   paramSubResource,
   bodyResource,
   bodySubResource,
-  ResourceIdGetter
+  ResourceIdGetter,
 } = require("../resourceId")
 
 class TestConfiguration {
@@ -41,7 +41,7 @@ describe("resourceId middleware", () => {
   it("generates a resourceId middleware for context query parameters", () => {
     const config = new TestConfiguration(paramResource("main"))
     config.setParams({
-      main: "test"
+      main: "test",
     })
 
     config.executeMiddleware()
@@ -53,7 +53,7 @@ describe("resourceId middleware", () => {
     const config = new TestConfiguration(paramSubResource("main", "sub"))
     config.setParams({
       main: "main",
-      sub: "test"
+      sub: "test",
     })
 
     config.executeMiddleware()
@@ -65,7 +65,7 @@ describe("resourceId middleware", () => {
   it("generates a resourceId middleware for context request body", () => {
     const config = new TestConfiguration(bodyResource("main"))
     config.setBody({
-      main: "test"
+      main: "test",
     })
 
     config.executeMiddleware()
@@ -77,7 +77,7 @@ describe("resourceId middleware", () => {
     const config = new TestConfiguration(bodySubResource("main", "sub"))
     config.setBody({
       main: "main",
-      sub: "test"
+      sub: "test",
     })
 
     config.executeMiddleware()
@@ -94,7 +94,7 @@ describe("resourceId middleware", () => {
     let config = new TestConfiguration(middleware)
     config.setBody({
       custom: "test",
-      customSub: "subtest"
+      customSub: "subtest",
     })
 
     config.executeMiddleware()
@@ -102,4 +102,4 @@ describe("resourceId middleware", () => {
     expect(config.ctx.resourceId).toEqual("test")
     expect(config.ctx.subResourceId).toEqual("subtest")
   })
-})
\ No newline at end of file
+})
diff --git a/packages/server/src/middleware/tests/selfhost.spec.js b/packages/server/src/middleware/tests/selfhost.spec.js
index 70ed981ac3..03372e9783 100644
--- a/packages/server/src/middleware/tests/selfhost.spec.js
+++ b/packages/server/src/middleware/tests/selfhost.spec.js
@@ -10,7 +10,7 @@ class TestConfiguration {
 
     this.ctx = {
       next: this.next,
-      throw: this.throw
+      throw: this.throw,
     }
   }
 
@@ -35,7 +35,7 @@ describe("Self host middleware", () => {
   })
 
   it("calls next() when SELF_HOSTED env var is set", async () => {
-    env.SELF_HOSTED = 1 
+    env.SELF_HOSTED = 1
 
     await config.executeMiddleware()
     expect(config.next).toHaveBeenCalled()
diff --git a/packages/server/src/migrations/functions/backfill/global.ts b/packages/server/src/migrations/functions/backfill/global.ts
index e3a96b77dc..a56c92492b 100644
--- a/packages/server/src/migrations/functions/backfill/global.ts
+++ b/packages/server/src/migrations/functions/backfill/global.ts
@@ -8,8 +8,8 @@ import {
   accounts,
   db as dbUtils,
 } from "@budibase/backend-core"
-import { QuotaUsage } from "@budibase/types"
 import {
+  QuotaUsage,
   CloudAccount,
   App,
   TenantBackfillSucceededEvent,
diff --git a/packages/server/src/migrations/functions/tests/appUrls.spec.js b/packages/server/src/migrations/functions/tests/appUrls.spec.js
index f60dff855c..7a2f324552 100644
--- a/packages/server/src/migrations/functions/tests/appUrls.spec.js
+++ b/packages/server/src/migrations/functions/tests/appUrls.spec.js
@@ -10,7 +10,7 @@ describe("run", () => {
     await config.init()
   })
 
-  afterAll(config.end)  
+  afterAll(config.end)
 
   it("runs successfully", async () => {
     const app = await config.createApp("testApp")
diff --git a/packages/server/src/migrations/functions/tests/userEmailViewCasing.spec.js b/packages/server/src/migrations/functions/tests/userEmailViewCasing.spec.js
index 15ddcfd1ef..f0da25893c 100644
--- a/packages/server/src/migrations/functions/tests/userEmailViewCasing.spec.js
+++ b/packages/server/src/migrations/functions/tests/userEmailViewCasing.spec.js
@@ -4,8 +4,8 @@ jest.mock("@budibase/backend-core", () => {
     ...core,
     db: {
       ...core.db,
-      createNewUserEmailView: jest.fn()
-    }
+      createNewUserEmailView: jest.fn(),
+    },
   }
 })
 const { context, db: dbCore } = require("@budibase/backend-core")
@@ -16,19 +16,19 @@ const TestConfig = require("../../../tests/utilities/TestConfiguration")
 const migration = require("../userEmailViewCasing")
 
 describe("run", () => {
-    let config = new TestConfig(false)
+  let config = new TestConfig(false)
 
-    beforeAll(async () => {
-      await config.init()
-    })
-
-    afterAll(config.end)
-
-    it("runs successfully", async () => {
-      await config.doInTenant(async () => {
-        const globalDb = context.getGlobalDB()
-        await migration.run(globalDb)
-        expect(dbCore.createNewUserEmailView).toHaveBeenCalledTimes(1)
-      })
+  beforeAll(async () => {
+    await config.init()
+  })
+
+  afterAll(config.end)
+
+  it("runs successfully", async () => {
+    await config.doInTenant(async () => {
+      const globalDb = context.getGlobalDB()
+      await migration.run(globalDb)
+      expect(dbCore.createNewUserEmailView).toHaveBeenCalledTimes(1)
     })
+  })
 })
diff --git a/packages/server/src/migrations/tests/index.spec.ts b/packages/server/src/migrations/tests/index.spec.ts
index d83e3cf31e..c01040593a 100644
--- a/packages/server/src/migrations/tests/index.spec.ts
+++ b/packages/server/src/migrations/tests/index.spec.ts
@@ -12,6 +12,7 @@ import * as helpers from "./helpers"
 
 import tk from "timekeeper"
 import { View } from "@budibase/types"
+
 const timestamp = new Date().toISOString()
 tk.freeze(timestamp)
 
diff --git a/packages/server/src/sdk/app/backups/exports.ts b/packages/server/src/sdk/app/backups/exports.ts
index c349dcb927..65708e6ba2 100644
--- a/packages/server/src/sdk/app/backups/exports.ts
+++ b/packages/server/src/sdk/app/backups/exports.ts
@@ -14,6 +14,7 @@ import { join } from "path"
 import env from "../../../environment"
 
 const uuid = require("uuid/v4")
+
 import tar from "tar"
 
 const MemoryStream = require("memorystream")
diff --git a/packages/server/src/sdk/app/backups/imports.ts b/packages/server/src/sdk/app/backups/imports.ts
index 5b481acdc3..1e229d283a 100644
--- a/packages/server/src/sdk/app/backups/imports.ts
+++ b/packages/server/src/sdk/app/backups/imports.ts
@@ -1,5 +1,11 @@
 import { db as dbCore, encryption, objectStore } from "@budibase/backend-core"
-import { Database, Row } from "@budibase/types"
+import {
+  Database,
+  Row,
+  Automation,
+  AutomationTriggerStepId,
+  RowAttachment,
+} from "@budibase/types"
 import { getAutomationParams, TABLE_ROW_PREFIX } from "../../../db/utils"
 import { budibaseTempDir } from "../../../utilities/budibaseDir"
 import { DB_EXPORT_FILE, GLOBAL_DB_EXPORT_FILE } from "./constants"
@@ -8,11 +14,7 @@ import { ObjectStoreBuckets } from "../../../constants"
 import { join } from "path"
 import fs from "fs"
 import sdk from "../../"
-import {
-  Automation,
-  AutomationTriggerStepId,
-  RowAttachment,
-} from "@budibase/types"
+
 const uuid = require("uuid/v4")
 const tar = require("tar")
 
diff --git a/packages/server/src/sdk/app/links/links.ts b/packages/server/src/sdk/app/links/links.ts
index fda07568f9..5d3420341f 100644
--- a/packages/server/src/sdk/app/links/links.ts
+++ b/packages/server/src/sdk/app/links/links.ts
@@ -1,5 +1,5 @@
-import { context } from "@budibase/backend-core"
-import { isTableId } from "@budibase/backend-core/src/docIds"
+import { context, docIds } from "@budibase/backend-core"
+
 import {
   DatabaseQueryOpts,
   LinkDocument,
@@ -8,7 +8,7 @@ import {
 import { ViewName, getQueryIndex } from "../../../../src/db/utils"
 
 export async function fetch(tableId: string): Promise<LinkDocumentValue[]> {
-  if (!isTableId(tableId)) {
+  if (!docIds.isTableId(tableId)) {
     throw new Error(`Invalid tableId: ${tableId}`)
   }
 
@@ -24,7 +24,7 @@ export async function fetch(tableId: string): Promise<LinkDocumentValue[]> {
 export async function fetchWithDocument(
   tableId: string
 ): Promise<LinkDocument[]> {
-  if (!isTableId(tableId)) {
+  if (!docIds.isTableId(tableId)) {
     throw new Error(`Invalid tableId: ${tableId}`)
   }
 
diff --git a/packages/server/src/sdk/app/rows/search.ts b/packages/server/src/sdk/app/rows/search.ts
index 36ef538d8b..4b71179839 100644
--- a/packages/server/src/sdk/app/rows/search.ts
+++ b/packages/server/src/sdk/app/rows/search.ts
@@ -9,6 +9,7 @@ import { isExternalTableID } from "../../../integrations/utils"
 import * as internal from "./search/internal"
 import * as external from "./search/external"
 import { Format } from "../../../api/controllers/view/exporters"
+
 export { isValidFilter, removeEmptyFilters } from "../../../integrations/utils"
 
 export interface ViewParams {
diff --git a/packages/server/src/sdk/app/tables/migration.ts b/packages/server/src/sdk/app/tables/migration.ts
index 718223dbeb..e282251bfb 100644
--- a/packages/server/src/sdk/app/tables/migration.ts
+++ b/packages/server/src/sdk/app/tables/migration.ts
@@ -17,7 +17,6 @@ import sdk from "../../../sdk"
 import { isExternalTableID } from "../../../integrations/utils"
 import { EventType, updateLinks } from "../../../db/linkedRows"
 import { cloneDeep } from "lodash"
-import { isInternalColumnName } from "@budibase/backend-core/src/db"
 
 export interface MigrationResult {
   tablesUpdated: Table[]
@@ -36,7 +35,7 @@ export async function migrate(
     throw new BadRequestError(`Column name cannot be empty`)
   }
 
-  if (isInternalColumnName(newColumn.name)) {
+  if (dbCore.isInternalColumnName(newColumn.name)) {
     throw new BadRequestError(`Column name cannot be a reserved column name`)
   }
 
diff --git a/packages/server/src/sdk/app/tables/update.ts b/packages/server/src/sdk/app/tables/update.ts
index 5c762e628b..cfbf7e1e1d 100644
--- a/packages/server/src/sdk/app/tables/update.ts
+++ b/packages/server/src/sdk/app/tables/update.ts
@@ -8,6 +8,7 @@ import { DocumentInsertResponse } from "@budibase/nano"
 import * as external from "./external"
 import * as internal from "./internal"
 import { cloneDeep } from "lodash"
+
 export * as external from "./external"
 export * as internal from "./internal"
 
diff --git a/packages/server/src/startup.ts b/packages/server/src/startup.ts
index b4a287d2d4..9144ff2b36 100644
--- a/packages/server/src/startup.ts
+++ b/packages/server/src/startup.ts
@@ -1,11 +1,13 @@
 import env from "./environment"
 import * as redis from "./utilities/redis"
+import { generateApiKey, getChecklist } from "./utilities/workerRequests"
 import {
-  createAdminUser,
-  generateApiKey,
-  getChecklist,
-} from "./utilities/workerRequests"
-import { events, installation, logging, tenancy } from "@budibase/backend-core"
+  events,
+  installation,
+  logging,
+  tenancy,
+  users,
+} from "@budibase/backend-core"
 import fs from "fs"
 import { watch } from "./watch"
 import * as automations from "./automations"
@@ -58,7 +60,7 @@ export async function startup(app?: any, server?: any) {
     return
   }
   STARTUP_RAN = true
-  if (server) {
+  if (server && !env.CLUSTER_MODE) {
     console.log(`Budibase running on ${JSON.stringify(server.address())}`)
     env._set("PORT", server.address().port)
   }
@@ -110,34 +112,37 @@ export async function startup(app?: any, server?: any) {
   // check and create admin user if required
   // this must be run after the api has been initialised due to
   // the app user sync
+  const bbAdminEmail = env.BB_ADMIN_USER_EMAIL,
+    bbAdminPassword = env.BB_ADMIN_USER_PASSWORD
   if (
     env.SELF_HOSTED &&
     !env.MULTI_TENANCY &&
-    env.BB_ADMIN_USER_EMAIL &&
-    env.BB_ADMIN_USER_PASSWORD
+    bbAdminEmail &&
+    bbAdminPassword
   ) {
-    const checklist = await getChecklist()
-    if (!checklist?.adminUser?.checked) {
-      try {
-        const tenantId = tenancy.getTenantId()
-        const user = await createAdminUser(
-          env.BB_ADMIN_USER_EMAIL,
-          env.BB_ADMIN_USER_PASSWORD,
-          tenantId
-        )
-        // Need to set up an API key for automated integration tests
-        if (env.isTest()) {
-          await generateApiKey(user._id)
-        }
+    const tenantId = tenancy.getTenantId()
+    await tenancy.doInTenant(tenantId, async () => {
+      const exists = await users.doesUserExist(bbAdminEmail)
+      const checklist = await getChecklist()
+      if (!checklist?.adminUser?.checked || !exists) {
+        try {
+          const user = await users.UserDB.createAdminUser(
+            bbAdminEmail,
+            bbAdminPassword,
+            tenantId,
+            { hashPassword: true, requirePassword: true }
+          )
+          // Need to set up an API key for automated integration tests
+          if (env.isTest()) {
+            await generateApiKey(user._id!)
+          }
 
-        console.log(
-          "Admin account automatically created for",
-          env.BB_ADMIN_USER_EMAIL
-        )
-      } catch (e) {
-        logging.logAlert("Error creating initial admin user. Exiting.", e)
-        shutdown(server)
+          console.log("Admin account automatically created for", bbAdminEmail)
+        } catch (e) {
+          logging.logAlert("Error creating initial admin user. Exiting.", e)
+          shutdown(server)
+        }
       }
-    }
+    })
   }
 }
diff --git a/packages/server/src/tests/utilities/structures.ts b/packages/server/src/tests/utilities/structures.ts
index b680c6ff19..83be8b6d58 100644
--- a/packages/server/src/tests/utilities/structures.ts
+++ b/packages/server/src/tests/utilities/structures.ts
@@ -22,6 +22,7 @@ import {
   INTERNAL_TABLE_SOURCE_ID,
   TableSourceType,
 } from "@budibase/types"
+
 const { BUILTIN_ROLE_IDS } = roles
 
 export function basicTable(): Table {
diff --git a/packages/server/src/threads/query.ts b/packages/server/src/threads/query.ts
index 3d68895753..fe85015b41 100644
--- a/packages/server/src/threads/query.ts
+++ b/packages/server/src/threads/query.ts
@@ -1,4 +1,5 @@
 import { default as threadUtils } from "./utils"
+
 threadUtils.threadSetup()
 import { WorkerCallback, QueryEvent, QueryVariable } from "./definitions"
 import ScriptRunner from "../utilities/scriptRunner"
@@ -8,11 +9,10 @@ import { context, cache, auth } from "@budibase/backend-core"
 import { getGlobalIDFromUserMetadataID } from "../db/utils"
 import sdk from "../sdk"
 import { cloneDeep } from "lodash/fp"
-import { SourceName } from "@budibase/types"
+import { SourceName, Query } from "@budibase/types"
 
 import { isSQL } from "../integrations/utils"
 import { interpolateSQL } from "../integrations/queries/sql"
-import { Query } from "@budibase/types"
 
 class QueryRunner {
   datasource: any
diff --git a/packages/server/src/utilities/fileSystem/filesystem.ts b/packages/server/src/utilities/fileSystem/filesystem.ts
index e7f6611e87..be656f54d1 100644
--- a/packages/server/src/utilities/fileSystem/filesystem.ts
+++ b/packages/server/src/utilities/fileSystem/filesystem.ts
@@ -1,14 +1,13 @@
-import { PathLike } from "fs"
-import fs from "fs"
+import fs, { PathLike } from "fs"
 import { budibaseTempDir } from "../budibaseDir"
 import { resolve, join } from "path"
 import env from "../../environment"
 import tar from "tar"
-import environment from "../../environment"
+
 const uuid = require("uuid/v4")
 
 export const TOP_LEVEL_PATH =
-  environment.TOP_LEVEL_PATH || resolve(join(__dirname, "..", "..", ".."))
+  env.TOP_LEVEL_PATH || resolve(join(__dirname, "..", "..", ".."))
 
 /**
  * Upon first startup of instance there may not be everything we need in tmp directory, set it up.
diff --git a/packages/server/src/utilities/index.ts b/packages/server/src/utilities/index.ts
index 551299a88e..ce6f2345ca 100644
--- a/packages/server/src/utilities/index.ts
+++ b/packages/server/src/utilities/index.ts
@@ -3,6 +3,7 @@ import { context } from "@budibase/backend-core"
 import { generateMetadataID } from "../db/utils"
 import { Document } from "@budibase/types"
 import stream from "stream"
+
 const Readable = stream.Readable
 
 export function wait(ms: number) {
diff --git a/packages/server/src/utilities/rowProcessor/index.ts b/packages/server/src/utilities/rowProcessor/index.ts
index 0e53422a4f..293e74312e 100644
--- a/packages/server/src/utilities/rowProcessor/index.ts
+++ b/packages/server/src/utilities/rowProcessor/index.ts
@@ -1,7 +1,10 @@
 import * as linkRows from "../../db/linkedRows"
-import { FieldTypes, AutoFieldSubTypes } from "../../constants"
+import {
+  FieldTypes,
+  AutoFieldSubTypes,
+  ObjectStoreBuckets,
+} from "../../constants"
 import { processFormulas, fixAutoColumnSubType } from "./utils"
-import { ObjectStoreBuckets } from "../../constants"
 import {
   context,
   db as dbCore,
@@ -17,6 +20,7 @@ import {
   processOutputBBReferences,
 } from "./bbReferenceProcessor"
 import { isExternalTableID } from "../../integrations/utils"
+
 export * from "./utils"
 
 type AutoColumnProcessingOpts = {
diff --git a/packages/server/src/utilities/rowProcessor/map.ts b/packages/server/src/utilities/rowProcessor/map.ts
index dd1f9a272a..cbddcaf427 100644
--- a/packages/server/src/utilities/rowProcessor/map.ts
+++ b/packages/server/src/utilities/rowProcessor/map.ts
@@ -46,23 +46,23 @@ export const TYPE_TRANSFORM_MAP: any = {
     parse: parseArrayString,
   },
   [FieldTypes.STRING]: {
-    "": "",
-    [null]: "",
+    "": null,
+    [null]: null,
     [undefined]: undefined,
   },
   [FieldTypes.BARCODEQR]: {
-    "": "",
-    [null]: "",
+    "": null,
+    [null]: null,
     [undefined]: undefined,
   },
   [FieldTypes.FORMULA]: {
-    "": "",
-    [null]: "",
+    "": null,
+    [null]: null,
     [undefined]: undefined,
   },
   [FieldTypes.LONGFORM]: {
-    "": "",
-    [null]: "",
+    "": null,
+    [null]: null,
     [undefined]: undefined,
   },
   [FieldTypes.NUMBER]: {
@@ -71,6 +71,11 @@ export const TYPE_TRANSFORM_MAP: any = {
     [undefined]: undefined,
     parse: n => parseFloat(n),
   },
+  [FieldTypes.BIGINT]: {
+    "": null,
+    [null]: null,
+    [undefined]: undefined,
+  },
   [FieldTypes.DATETIME]: {
     "": null,
     [undefined]: undefined,
diff --git a/packages/server/src/utilities/scriptRunner.ts b/packages/server/src/utilities/scriptRunner.ts
index a39641ec99..fee0215d2e 100644
--- a/packages/server/src/utilities/scriptRunner.ts
+++ b/packages/server/src/utilities/scriptRunner.ts
@@ -1,5 +1,6 @@
 import fetch from "node-fetch"
 import { VM, VMScript } from "vm2"
+
 const JS_TIMEOUT_MS = 1000
 
 class ScriptRunner {
diff --git a/packages/server/src/utilities/workerRequests.ts b/packages/server/src/utilities/workerRequests.ts
index fa9fde7297..56ceff226c 100644
--- a/packages/server/src/utilities/workerRequests.ts
+++ b/packages/server/src/utilities/workerRequests.ts
@@ -155,19 +155,9 @@ export async function readGlobalUser(ctx: Ctx): Promise<User> {
   return checkResponse(response, "get user", { ctx })
 }
 
-export async function createAdminUser(
-  email: string,
-  password: string,
-  tenantId: string
-) {
-  const response = await fetch(
-    checkSlashesInUrl(env.WORKER_URL + "/api/global/users/init"),
-    request(undefined, { method: "POST", body: { email, password, tenantId } })
-  )
-  return checkResponse(response, "create admin user")
-}
-
-export async function getChecklist() {
+export async function getChecklist(): Promise<{
+  adminUser: { checked: boolean }
+}> {
   const response = await fetch(
     checkSlashesInUrl(env.WORKER_URL + "/api/global/configs/checklist"),
     request(undefined, { method: "GET" })
diff --git a/packages/server/src/websockets/websocket.ts b/packages/server/src/websockets/websocket.ts
index 1dba108d24..2861757de1 100644
--- a/packages/server/src/websockets/websocket.ts
+++ b/packages/server/src/websockets/websocket.ts
@@ -1,10 +1,9 @@
-import { Server } from "socket.io"
+import { Server, Socket } from "socket.io"
 import http from "http"
 import Koa from "koa"
 import { userAgent } from "koa-useragent"
 import { auth, Header, redis } from "@budibase/backend-core"
 import { createAdapter } from "@socket.io/redis-adapter"
-import { Socket } from "socket.io"
 import { getSocketPubSubClients } from "../utilities/redis"
 import { SocketEvent, SocketSessionTTL } from "@budibase/shared-core"
 import { SocketSession } from "@budibase/types"
diff --git a/packages/shared-core/src/constants.ts b/packages/shared-core/src/constants.ts
index e7c6feb20a..0787b8bed1 100644
--- a/packages/shared-core/src/constants.ts
+++ b/packages/shared-core/src/constants.ts
@@ -96,45 +96,61 @@ export enum BuilderSocketEvent {
 export const SocketSessionTTL = 60
 export const ValidQueryNameRegex = /^[^()]*$/
 export const ValidColumnNameRegex = /^[_a-zA-Z0-9\s]*$/g
-export const ValidFileExtensions = [
-  "avif",
-  "css",
-  "csv",
-  "docx",
-  "drawio",
-  "editorconfig",
-  "edl",
-  "enc",
-  "export",
-  "geojson",
-  "gif",
-  "htm",
-  "html",
-  "ics",
-  "iqy",
-  "jfif",
-  "jpeg",
-  "jpg",
-  "json",
-  "log",
-  "md",
-  "mid",
-  "odt",
-  "pdf",
-  "png",
-  "ris",
-  "rtf",
-  "svg",
-  "tex",
-  "toml",
-  "twig",
-  "txt",
-  "url",
-  "wav",
-  "webp",
-  "xls",
-  "xlsx",
-  "xml",
-  "yaml",
-  "yml",
+
+export const InvalidFileExtensions = [
+  "7z",
+  "action",
+  "apk",
+  "app",
+  "bat",
+  "bin",
+  "cab",
+  "cmd",
+  "com",
+  "command",
+  "cpl",
+  "csh",
+  "ex_",
+  "exe",
+  "gadget",
+  "inf1",
+  "ins",
+  "inx",
+  "ipa",
+  "isu",
+  "job",
+  "js",
+  "jse",
+  "ksh",
+  "lnk",
+  "msc",
+  "msi",
+  "msp",
+  "mst",
+  "osx",
+  "out",
+  "paf",
+  "php",
+  "pif",
+  "prg",
+  "ps1",
+  "reg",
+  "rgs",
+  "run",
+  "scr",
+  "sct",
+  "shb",
+  "shs",
+  "tar",
+  "u3p",
+  "vb",
+  "vbe",
+  "vbs",
+  "vbscript",
+  "wasm",
+  "workflow",
+  "ws",
+  "wsf",
+  "wsh",
+  "zip",
 ]
diff --git a/packages/shared-core/src/filters.ts b/packages/shared-core/src/filters.ts
index 1839a53525..564e8a52c9 100644
--- a/packages/shared-core/src/filters.ts
+++ b/packages/shared-core/src/filters.ts
@@ -9,6 +9,7 @@ import {
   SortDirection,
   SortType,
 } from "@budibase/types"
+import dayjs from "dayjs"
 import { OperatorOptions, SqlNumberTypeRangeMap } from "./constants"
 import { deepGet } from "./helpers"
 
@@ -302,12 +303,19 @@ export const runLuceneQuery = (docs: any[], query?: SearchQuery) => {
       docValue: string | number | null,
       testValue: { low: number; high: number }
     ) => {
-      return (
-        docValue == null ||
-        docValue === "" ||
-        +docValue < testValue.low ||
-        +docValue > testValue.high
-      )
+      if (docValue == null || docValue === "") {
+        return true
+      }
+      if (!isNaN(+docValue)) {
+        return +docValue < testValue.low || +docValue > testValue.high
+      }
+      if (dayjs(docValue).isValid()) {
+        return (
+          new Date(docValue).getTime() < new Date(testValue.low).getTime() ||
+          new Date(docValue).getTime() > new Date(testValue.high).getTime()
+        )
+      }
+      throw "Cannot perform range filter - invalid type."
     }
   )
 
diff --git a/packages/shared-core/src/tests/filters.test.ts b/packages/shared-core/src/tests/filters.test.ts
new file mode 100644
index 0000000000..6f488cffbd
--- /dev/null
+++ b/packages/shared-core/src/tests/filters.test.ts
@@ -0,0 +1,174 @@
+import { SearchQuery, SearchQueryOperators } from "@budibase/types"
+import { runLuceneQuery } from "../filters"
+import { expect, describe, it } from "vitest"
+
+describe("runLuceneQuery", () => {
+  const docs = [
+    {
+      order_id: 1,
+      customer_id: 259,
+      order_status: 4,
+      order_date: "2016-01-01T00:00:00.000Z",
+      required_date: "2016-01-03T00:00:00.000Z",
+      shipped_date: "2016-01-03T00:00:00.000Z",
+      store_id: 1,
+      staff_id: 2,
+      description: "Large box",
+      label: undefined,
+    },
+    {
+      order_id: 2,
+      customer_id: 1212,
+      order_status: 4,
+      order_date: "2016-01-05T00:00:00.000Z",
+      required_date: "2016-01-04T00:00:00.000Z",
+      shipped_date: "2016-01-03T00:00:00.000Z",
+      store_id: 2,
+      staff_id: 6,
+      description: "Small box",
+      label: "FRAGILE",
+    },
+    {
+      order_id: 3,
+      customer_id: 523,
+      order_status: 5,
+      order_date: "2016-01-12T00:00:00.000Z",
+      required_date: "2016-01-05T00:00:00.000Z",
+      shipped_date: "2016-01-03T00:00:00.000Z",
+      store_id: 2,
+      staff_id: 7,
+      description: "Heavy box",
+      label: "HEAVY",
+    },
+  ]
+
+  function buildQuery(
+    filterKey: string,
+    value: { [key: string]: any }
+  ): SearchQuery {
+    const query: SearchQuery = {
+      string: {},
+      fuzzy: {},
+      range: {},
+      equal: {},
+      notEqual: {},
+      empty: {},
+      notEmpty: {},
+      contains: {},
+      notContains: {},
+      oneOf: {},
+      containsAny: {},
+    }
+    query[filterKey as SearchQueryOperators] = value
+    return query
+  }
+
+  it("should return input docs if no search query is provided", () => {
+    expect(runLuceneQuery(docs)).toBe(docs)
+  })
+
+  it("should return matching rows for equal filter", () => {
+    const query = buildQuery("equal", {
+      order_status: 4,
+    })
+    expect(runLuceneQuery(docs, query).map(row => row.order_id)).toEqual([1, 2])
+  })
+
+  it("should return matching row for notEqual filter", () => {
+    const query = buildQuery("notEqual", {
+      order_status: 4,
+    })
+    expect(runLuceneQuery(docs, query).map(row => row.order_id)).toEqual([3])
+  })
+
+  it("should return starts with matching rows for fuzzy and string filters", () => {
+    expect(
+      runLuceneQuery(
+        docs,
+        buildQuery("fuzzy", {
+          description: "sm",
+        })
+      ).map(row => row.description)
+    ).toEqual(["Small box"])
+    expect(
+      runLuceneQuery(
+        docs,
+        buildQuery("string", {
+          description: "SM",
+        })
+      ).map(row => row.description)
+    ).toEqual(["Small box"])
+  })
+
+  it("should return rows within a range filter", () => {
+    const query = buildQuery("range", {
+      customer_id: {
+        low: 500,
+        high: 1000,
+      },
+    })
+    expect(runLuceneQuery(docs, query).map(row => row.order_id)).toEqual([3])
+  })
+
+  it("should return rows with numeric strings within a range filter", () => {
+    const query = buildQuery("range", {
+      customer_id: {
+        low: "500",
+        high: "1000",
+      },
+    })
+    expect(runLuceneQuery(docs, query).map(row => row.order_id)).toEqual([3])
+  })
+
+  it("should return rows with ISO date strings within a range filter", () => {
+    const query = buildQuery("range", {
+      order_date: {
+        low: "2016-01-04T00:00:00.000Z",
+        high: "2016-01-11T00:00:00.000Z",
+      },
+    })
+    expect(runLuceneQuery(docs, query).map(row => row.order_id)).toEqual([2])
+  })
+
+  it("should throw an error is an invalid doc value is passed into a range filter", async () => {
+    const query = buildQuery("range", {
+      order_date: {
+        low: "2016-01-04T00:00:00.000Z",
+        high: "2016-01-11T00:00:00.000Z",
+      },
+    })
+    expect(() =>
+      runLuceneQuery(
+        [
+          {
+            order_id: 4,
+            customer_id: 1758,
+            order_status: 5,
+            order_date: "INVALID",
+            required_date: "2017-03-05T00:00:00.000Z",
+            shipped_date: "2017-03-03T00:00:00.000Z",
+            store_id: 2,
+            staff_id: 7,
+            description: undefined,
+            label: "",
+          },
+        ],
+        query
+      )
+    ).toThrowError("Cannot perform range filter - invalid type.")
+  })
+
+  it("should return rows with matches on empty filter", () => {
+    const query = buildQuery("empty", {
+      label: null,
+    })
+    expect(runLuceneQuery(docs, query).map(row => row.order_id)).toEqual([1])
+  })
+
+  it("should return rows with matches on notEmpty filter", () => {
+    const query = buildQuery("notEmpty", {
+      label: null,
+    })
+    expect(runLuceneQuery(docs, query).map(row => row.order_id)).toEqual([2, 3])
+  })
+})
diff --git a/packages/shared-core/src/utils.ts b/packages/shared-core/src/utils.ts
index 46a6585f89..c775010909 100644
--- a/packages/shared-core/src/utils.ts
+++ b/packages/shared-core/src/utils.ts
@@ -1,3 +1,5 @@
+import * as Constants from "./constants"
+
 export function unreachable(
   value: never,
   message = `No such case in exhaustive switch: ${value}`
@@ -43,3 +45,15 @@ export async function parallelForeach<T>(
 
   await Promise.all(promises)
 }
+
+export function filterValueToLabel() {
+  return Object.keys(Constants.OperatorOptions).reduce(
+    (acc: { [key: string]: string }, key: string) => {
+      const ops: { [key: string]: any } = Constants.OperatorOptions
+      const op: { [key: string]: string } = ops[key]
+      acc[op["value"]] = op.label
+      return acc
+    },
+    {}
+  )
+}
diff --git a/packages/shared-core/tsconfig.build.json b/packages/shared-core/tsconfig.build.json
index 1969c286b1..8a7f0ea216 100644
--- a/packages/shared-core/tsconfig.build.json
+++ b/packages/shared-core/tsconfig.build.json
@@ -24,6 +24,7 @@
     "dist",
     "**/*.spec.ts",
     "**/*.spec.js",
-    "__mocks__"
+    "__mocks__",
+    "src/tests"
   ]
 }
diff --git a/packages/string-templates/.eslintrc b/packages/string-templates/.eslintrc
deleted file mode 100644
index 3431bf04fb..0000000000
--- a/packages/string-templates/.eslintrc
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "globals": {
-    "emit": true,
-    "key": true
-  },
-  "env": {
-    "node": true
-  },
-  "extends": ["eslint:recommended"],
-  "rules": {
-  }
-}
\ No newline at end of file
diff --git a/packages/string-templates/scripts/gen-collection-info.js b/packages/string-templates/scripts/gen-collection-info.js
index 1dbb20e5cf..91cb79e05d 100644
--- a/packages/string-templates/scripts/gen-collection-info.js
+++ b/packages/string-templates/scripts/gen-collection-info.js
@@ -10,6 +10,7 @@ const marked = require("marked")
  * https://github.com/budibase/handlebars-helpers
  */
 const { join } = require("path")
+
 const DIRECTORY = join(__dirname, "..", "..", "..")
 const COLLECTIONS = [
   "math",
diff --git a/packages/string-templates/test/basic.spec.js b/packages/string-templates/test/basic.spec.js
index 3346a81ddd..a5054bf489 100644
--- a/packages/string-templates/test/basic.spec.js
+++ b/packages/string-templates/test/basic.spec.js
@@ -86,11 +86,11 @@ describe("Test that the object processing works correctly", () => {
   })
 
   it("check objects get converted to string JSON automatically", async () => {
-    const row = {a: 1}
+    const row = { a: 1 }
     const output = await processString("{{ trigger.row }}", {
       trigger: {
         row,
-      }
+      },
     })
     expect(JSON.parse(output)).toEqual(row)
   })
@@ -108,9 +108,9 @@ describe("Test that the object processing works correctly", () => {
 
 describe("check returning objects", () => {
   it("should handle an array of objects", async () => {
-    const json = [{a: 1},{a: 2}]
+    const json = [{ a: 1 }, { a: 2 }]
     const output = await processString("{{ testing }}", {
-      testing: json
+      testing: json,
     })
     expect(output).toEqual(JSON.stringify(json))
   })
@@ -164,9 +164,12 @@ describe("check manifest", () => {
 describe("check full stops that are safe", () => {
   it("should allow using an escaped full stop", async () => {
     const data = {
-      "c53a4a604fa754d33baaafd5bca4d3658-YXuUBqt5vI": { "persons.firstname": "1" }
+      "c53a4a604fa754d33baaafd5bca4d3658-YXuUBqt5vI": {
+        "persons.firstname": "1",
+      },
     }
-    const template = "{{ [c53a4a604fa754d33baaafd5bca4d3658-YXuUBqt5vI].[persons.firstname] }}"
+    const template =
+      "{{ [c53a4a604fa754d33baaafd5bca4d3658-YXuUBqt5vI].[persons.firstname] }}"
     const output = await processString(template, data)
     expect(output).toEqual("1")
   })
@@ -195,7 +198,9 @@ describe("check that disabling escaping function works", () => {
   })
 
   it("should work for two statements", () => {
-    expect(disableEscaping("{{ name }} welcome to {{ platform }}")).toEqual("{{{ name }}} welcome to {{{ platform }}}")
+    expect(disableEscaping("{{ name }} welcome to {{ platform }}")).toEqual(
+      "{{{ name }}} welcome to {{{ platform }}}"
+    )
   })
 
   it("shouldn't convert triple braces", () => {
@@ -203,11 +208,15 @@ describe("check that disabling escaping function works", () => {
   })
 
   it("should work with a combination", () => {
-    expect(disableEscaping("{{ name }} welcome to {{{ platform }}}")).toEqual("{{{ name }}} welcome to {{{ platform }}}")
+    expect(disableEscaping("{{ name }} welcome to {{{ platform }}}")).toEqual(
+      "{{{ name }}} welcome to {{{ platform }}}"
+    )
   })
 
   it("should work with multiple escaped", () => {
-    expect(disableEscaping("{{ name }} welcome to {{ name }}")).toEqual("{{{ name }}} welcome to {{{ name }}}")
+    expect(disableEscaping("{{ name }} welcome to {{ name }}")).toEqual(
+      "{{{ name }}} welcome to {{{ name }}}"
+    )
   })
 })
 
@@ -217,13 +226,20 @@ describe("check find hbs blocks function", () => {
   })
 
   it("should find two", () => {
-    expect(findHBSBlocks("{{ hello }} there {{{ name }}}")).toEqual(["{{ hello }}", "{{{ name }}}"])
+    expect(findHBSBlocks("{{ hello }} there {{{ name }}}")).toEqual([
+      "{{ hello }}",
+      "{{{ name }}}",
+    ])
   })
 })
 
 describe("should leave HBS blocks if not found using option", () => {
   it("should replace one, leave one", async () => {
-    const output = await processString("{{ a }}, {{ b }}", { b: 1 }, { onlyFound: true })
+    const output = await processString(
+      "{{ a }}, {{ b }}",
+      { b: 1 },
+      { onlyFound: true }
+    )
     expect(output).toBe("{{ a }}, 1")
   })
 })
diff --git a/packages/string-templates/test/escapes.spec.js b/packages/string-templates/test/escapes.spec.js
index a14e78d2f2..d27ca64240 100644
--- a/packages/string-templates/test/escapes.spec.js
+++ b/packages/string-templates/test/escapes.spec.js
@@ -68,11 +68,11 @@ describe("attempt some complex problems", () => {
 describe("check behaviour with newlines", () => {
   const context = {
     binding: `Hello
-      there`
+      there`,
   }
   it("should escape new line to \\n with double brace", async () => {
     const hbs = JSON.stringify({
-      body: "{{ binding }}"
+      body: "{{ binding }}",
     })
     const output = await processString(hbs, context, { escapeNewlines: true })
     expect(JSON.parse(output).body).toBe(context.binding)
@@ -80,7 +80,7 @@ describe("check behaviour with newlines", () => {
 
   it("should work the same with triple brace", async () => {
     const hbs = JSON.stringify({
-      body: "{{{ binding }}}"
+      body: "{{{ binding }}}",
     })
     const output = await processString(hbs, context, { escapeNewlines: true })
     expect(JSON.parse(output).body).toBe(context.binding)
@@ -88,9 +88,12 @@ describe("check behaviour with newlines", () => {
 
   it("should still work with helpers disabled", async () => {
     const hbs = JSON.stringify({
-      body: "{{ binding }}"
+      body: "{{ binding }}",
+    })
+    const output = await processString(hbs, context, {
+      escapeNewlines: true,
+      noHelpers: true,
     })
-    const output = await processString(hbs, context, { escapeNewlines: true, noHelpers: true })
     expect(JSON.parse(output).body).toBe(context.binding)
   })
 })
diff --git a/packages/string-templates/test/hbsToJs.spec.js b/packages/string-templates/test/hbsToJs.spec.js
index 63bd80db81..8a74cae526 100644
--- a/packages/string-templates/test/hbsToJs.spec.js
+++ b/packages/string-templates/test/hbsToJs.spec.js
@@ -1,6 +1,4 @@
-const {
-  convertToJS
-} = require("../src/index.cjs")
+const { convertToJS } = require("../src/index.cjs")
 
 function checkLines(response, lines) {
   const toCheck = response.split("\n")
@@ -18,25 +16,19 @@ describe("Test that the string processing works correctly", () => {
 
   it("basic example with square brackets", () => {
     const response = convertToJS("{{ [query] }}")
-    checkLines(response, [
-      "const var1 = $(\"[query]\");",
-      "return `${var1}`;",
-    ])
+    checkLines(response, ['const var1 = $("[query]");', "return `${var1}`;"])
   })
 
   it("handle properties", () => {
     const response = convertToJS("{{ [query].id }}")
-    checkLines(response, [
-      "const var1 = $(\"[query].id\");",
-      "return `${var1}`;",
-    ])
+    checkLines(response, ['const var1 = $("[query].id");', "return `${var1}`;"])
   })
 
   it("should convert some basic HBS strings", () => {
     const response = convertToJS("Hello {{ name }}, welcome to {{ company }}!")
     checkLines(response, [
-      "const var1 = $(\"name\");",
-      "const var2 = $(\"company\");",
+      'const var1 = $("name");',
+      'const var2 = $("company");',
       "return `Hello ${var1}, welcome to ${var2}`;",
     ])
   })
@@ -44,7 +36,7 @@ describe("Test that the string processing works correctly", () => {
   it("should handle many square brackets in helpers", () => {
     const response = convertToJS("Hello {{ avg [user].[_id] [user].[_rev] }}")
     checkLines(response, [
-      "const var1 = helpers.avg($(\"[user].[_id]\"), $(\"[user].[_rev]\"));",
+      'const var1 = helpers.avg($("[user].[_id]"), $("[user].[_rev]"));',
       "return `Hello ${var1}`;",
     ])
   })
@@ -61,7 +53,7 @@ describe("Test that the string processing works correctly", () => {
     const response = convertToJS("{{equalsLength '[1,2,3]' 3}}")
     checkLines(response, [
       "const var1 = helpers.equalsLength('[1,2,3]', 3);",
-      "return `${var1}`;"
+      "return `${var1}`;",
     ])
   })
 
@@ -84,23 +76,27 @@ describe("Test that the string processing works correctly", () => {
   it("should handle a helper block", () => {
     const response = convertToJS("This is the average: {{ avg array }}")
     checkLines(response, [
-      "const var1 = helpers.avg($(\"array\"));",
+      'const var1 = helpers.avg($("array"));',
       "return `This is the average: ${var1}`;",
     ])
   })
 
   it("should handle multi-variable helper", () => {
-    const response = convertToJS("This is the average: {{ join ( avg val1 val2 val3 ) }}")
+    const response = convertToJS(
+      "This is the average: {{ join ( avg val1 val2 val3 ) }}"
+    )
     checkLines(response, [
-      "const var1 = helpers.join(helpers.avg($(\"val1\"), $(\"val2\"), $(\"val3\")));",
+      'const var1 = helpers.join(helpers.avg($("val1"), $("val2"), $("val3")));',
       "return `This is the average: ${var1}`;",
     ])
   })
 
   it("should handle a complex statement", () => {
-    const response = convertToJS("This is the average: {{ join ( avg val1 val2 val3 ) val4 }}")
+    const response = convertToJS(
+      "This is the average: {{ join ( avg val1 val2 val3 ) val4 }}"
+    )
     checkLines(response, [
-      "const var1 = helpers.join(helpers.avg($(\"val1\"), $(\"val2\"), $(\"val3\")), $(\"val4\"));",
+      'const var1 = helpers.join(helpers.avg($("val1"), $("val2"), $("val3")), $("val4"));',
       "return `This is the average: ${var1}`;",
     ])
   })
@@ -108,7 +104,7 @@ describe("Test that the string processing works correctly", () => {
   it("should handle square brackets", () => {
     const response = convertToJS("This is: {{ [val thing] }}")
     checkLines(response, [
-      "const var1 = $(\"[val thing]\");",
+      'const var1 = $("[val thing]");',
       "return `This is: ${var1}`;",
     ])
   })
@@ -116,17 +112,19 @@ describe("Test that the string processing works correctly", () => {
   it("should handle square brackets with properties", () => {
     const response = convertToJS("{{ [user].[_id] }}")
     checkLines(response, [
-      "const var1 = $(\"[user].[_id]\");",
+      'const var1 = $("[user].[_id]");',
       "return `${var1}`;",
     ])
   })
 
   it("should handle multiple complex statements", () => {
-    const response = convertToJS("average: {{ avg ( abs val1 ) val2 }} add: {{ add 1 2 }}")
+    const response = convertToJS(
+      "average: {{ avg ( abs val1 ) val2 }} add: {{ add 1 2 }}"
+    )
     checkLines(response, [
-      "const var1 = helpers.avg(helpers.abs($(\"val1\")), $(\"val2\"));",
+      'const var1 = helpers.avg(helpers.abs($("val1")), $("val2"));',
       "const var2 = helpers.add(1, 2);",
       "return `average: ${var1} add: ${var2}`;",
     ])
   })
-})
\ No newline at end of file
+})
diff --git a/packages/string-templates/test/helpers.spec.js b/packages/string-templates/test/helpers.spec.js
index a587ca60dd..c047947fbf 100644
--- a/packages/string-templates/test/helpers.spec.js
+++ b/packages/string-templates/test/helpers.spec.js
@@ -266,10 +266,7 @@ describe("test the string helpers", () => {
   })
 
   it("should allow use of the ellipsis helper", async () => {
-    const output = await processString(
-      "{{ ellipsis \"adfasdfasdfasf\" 7 }}",
-      {},
-    )
+    const output = await processString('{{ ellipsis "adfasdfasdfasf" 7 }}', {})
     expect(output).toBe("adfasdf…")
   })
 })
diff --git a/packages/string-templates/test/javascript.spec.js b/packages/string-templates/test/javascript.spec.js
index 4ec7c48b1e..bbc1cce246 100644
--- a/packages/string-templates/test/javascript.spec.js
+++ b/packages/string-templates/test/javascript.spec.js
@@ -140,4 +140,4 @@ describe("check JS helpers", () => {
     const output = processJS(`return helpers.toInt(4.3)`)
     expect(output).toBe(4)
   })
-})
\ No newline at end of file
+})
diff --git a/packages/types/src/api/web/user.ts b/packages/types/src/api/web/user.ts
index 3a5bd16bdf..0de42622e6 100644
--- a/packages/types/src/api/web/user.ts
+++ b/packages/types/src/api/web/user.ts
@@ -10,6 +10,7 @@ export interface SaveUserResponse {
 export interface UserDetails {
   _id: string
   email: string
+  password?: string
 }
 
 export interface BulkUserRequest {
@@ -49,6 +50,7 @@ export type InviteUsersRequest = InviteUserRequest[]
 export interface InviteUsersResponse {
   successful: { email: string }[]
   unsuccessful: { email: string; reason: string }[]
+  created?: boolean
 }
 
 export interface SearchUsersRequest {
diff --git a/packages/worker/__mocks__/node-fetch.ts b/packages/worker/__mocks__/node-fetch.ts
index 113833a0b6..27c9b507a4 100644
--- a/packages/worker/__mocks__/node-fetch.ts
+++ b/packages/worker/__mocks__/node-fetch.ts
@@ -1,4 +1,5 @@
 import fs from "fs"
+
 module FetchMock {
   const fetch = jest.requireActual("node-fetch")
 
diff --git a/packages/worker/src/api/controllers/global/self.ts b/packages/worker/src/api/controllers/global/self.ts
index 47dbef964e..d14aecd1a7 100644
--- a/packages/worker/src/api/controllers/global/self.ts
+++ b/packages/worker/src/api/controllers/global/self.ts
@@ -10,6 +10,7 @@ import {
 import env from "../../../environment"
 import { groups } from "@budibase/pro"
 import { UpdateSelfRequest, UpdateSelfResponse, UserCtx } from "@budibase/types"
+
 const { newid } = utils
 
 function newTestApiKey() {
diff --git a/packages/worker/src/api/controllers/global/users.ts b/packages/worker/src/api/controllers/global/users.ts
index de1a605890..58979ec799 100644
--- a/packages/worker/src/api/controllers/global/users.ts
+++ b/packages/worker/src/api/controllers/global/users.ts
@@ -1,8 +1,3 @@
-import {
-  checkInviteCode,
-  getInviteCodes,
-  updateInviteCode,
-} from "../../../utilities/redis"
 import * as userSdk from "../../../sdk/users"
 import env from "../../../environment"
 import {
@@ -16,6 +11,7 @@ import {
   Ctx,
   InviteUserRequest,
   InviteUsersRequest,
+  InviteUsersResponse,
   MigrationType,
   SaveUserResponse,
   SearchUsersRequest,
@@ -124,28 +120,17 @@ export const adminUser = async (
       )
     }
 
-    const user: User = {
-      email: email,
-      password: password,
-      createdAt: Date.now(),
-      roles: {},
-      builder: {
-        global: true,
-      },
-      admin: {
-        global: true,
-      },
-      tenantId,
-      ssoId,
-    }
     try {
-      // always bust checklist beforehand, if an error occurs but can proceed, don't get
-      // stuck in a cycle
-      await cache.bustCache(cache.CacheKey.CHECKLIST)
-      const finalUser = await userSdk.db.save(user, {
-        hashPassword,
-        requirePassword,
-      })
+      const finalUser = await userSdk.db.createAdminUser(
+        email,
+        password,
+        tenantId,
+        {
+          ssoId,
+          hashPassword,
+          requirePassword,
+        }
+      )
 
       // events
       let account: CloudAccount | undefined
@@ -249,59 +234,35 @@ export const tenantUserLookup = async (ctx: any) => {
 /* 
   Encapsulate the app user onboarding flows here.
 */
-export const onboardUsers = async (ctx: Ctx<InviteUsersRequest>) => {
-  const request = ctx.request.body
-  const isBulkCreate = "create" in request
-
-  const emailConfigured = await isEmailConfigured()
-
-  let onboardingResponse
-
-  if (isBulkCreate) {
-    // @ts-ignore
-    const { users, groups, roles } = request.create
-    const assignUsers = users.map((user: User) => (user.roles = roles))
-    onboardingResponse = await userSdk.db.bulkCreate(assignUsers, groups)
-    ctx.body = onboardingResponse
-  } else if (emailConfigured) {
-    onboardingResponse = await inviteMultiple(ctx)
-  } else if (!emailConfigured) {
-    const inviteRequest = ctx.request.body
-
-    let createdPasswords: any = {}
-
-    const users: User[] = inviteRequest.map(invite => {
-      let password = Math.random().toString(36).substring(2, 22)
-
-      // Temp password to be passed to the user.
-      createdPasswords[invite.email] = password
-
-      return {
-        email: invite.email,
-        password,
-        forceResetPassword: true,
-        roles: invite.userInfo.apps,
-        admin: invite.userInfo.admin,
-        builder: invite.userInfo.builder,
-        tenantId: tenancy.getTenantId(),
-      }
-    })
-    let bulkCreateReponse = await userSdk.db.bulkCreate(users, [])
-
-    // Apply temporary credentials
-    ctx.body = {
-      ...bulkCreateReponse,
-      successful: bulkCreateReponse?.successful.map(user => {
-        return {
-          ...user,
-          password: createdPasswords[user.email],
-        }
-      }),
-      created: true,
-    }
-  } else {
-    ctx.throw(400, "User onboarding failed")
+export const onboardUsers = async (
+  ctx: Ctx<InviteUsersRequest, InviteUsersResponse>
+) => {
+  if (await isEmailConfigured()) {
+    await inviteMultiple(ctx)
+    return
   }
+
+  let createdPasswords: Record<string, string> = {}
+  const users: User[] = ctx.request.body.map(invite => {
+    let password = Math.random().toString(36).substring(2, 22)
+    createdPasswords[invite.email] = password
+
+    return {
+      email: invite.email,
+      password,
+      forceResetPassword: true,
+      roles: invite.userInfo.apps,
+      admin: invite.userInfo.admin,
+      builder: invite.userInfo.builder,
+      tenantId: tenancy.getTenantId(),
+    }
+  })
+
+  let resp = await userSdk.db.bulkCreate(users)
+  for (const user of resp.successful) {
+    user.password = createdPasswords[user.email]
+  }
+  ctx.body = { ...resp, created: true }
 }
 
 export const invite = async (ctx: Ctx<InviteUserRequest>) => {
@@ -328,18 +289,18 @@ export const invite = async (ctx: Ctx<InviteUserRequest>) => {
 }
 
 export const inviteMultiple = async (ctx: Ctx<InviteUsersRequest>) => {
-  const request = ctx.request.body
-  ctx.body = await userSdk.invite(request)
+  ctx.body = await userSdk.invite(ctx.request.body)
 }
 
 export const checkInvite = async (ctx: any) => {
   const { code } = ctx.params
   let invite
   try {
-    invite = await checkInviteCode(code, false)
+    invite = await cache.invite.getCode(code)
   } catch (e) {
     console.warn("Error getting invite from code", e)
     ctx.throw(400, "There was a problem with the invite")
+    return
   }
   ctx.body = {
     email: invite.email,
@@ -347,14 +308,12 @@ export const checkInvite = async (ctx: any) => {
 }
 
 export const getUserInvites = async (ctx: any) => {
-  let invites
   try {
     // Restricted to the currently authenticated tenant
-    invites = await getInviteCodes()
+    ctx.body = await cache.invite.getInviteCodes()
   } catch (e) {
     ctx.throw(400, "There was a problem fetching invites")
   }
-  ctx.body = invites
 }
 
 export const updateInvite = async (ctx: any) => {
@@ -365,12 +324,10 @@ export const updateInvite = async (ctx: any) => {
 
   let invite
   try {
-    invite = await checkInviteCode(code, false)
-    if (!invite) {
-      throw new Error("The invite could not be retrieved")
-    }
+    invite = await cache.invite.getCode(code)
   } catch (e) {
     ctx.throw(400, "There was a problem with the invite")
+    return
   }
 
   let updated = {
@@ -395,7 +352,7 @@ export const updateInvite = async (ctx: any) => {
     }
   }
 
-  await updateInviteCode(code, updated)
+  await cache.invite.updateCode(code, updated)
   ctx.body = { ...invite }
 }
 
@@ -405,7 +362,8 @@ export const inviteAccept = async (
   const { inviteCode, password, firstName, lastName } = ctx.request.body
   try {
     // info is an extension of the user object that was stored by global
-    const { email, info }: any = await checkInviteCode(inviteCode)
+    const { email, info }: any = await cache.invite.getCode(inviteCode)
+    await cache.invite.deleteCode(inviteCode)
     const user = await tenancy.doInTenant(info.tenantId, async () => {
       let request: any = {
         firstName,
diff --git a/packages/worker/src/api/index.ts b/packages/worker/src/api/index.ts
index 2a3133af3f..d7aef0b274 100644
--- a/packages/worker/src/api/index.ts
+++ b/packages/worker/src/api/index.ts
@@ -1,5 +1,7 @@
 import Router from "@koa/router"
+
 const compress = require("koa-compress")
+
 import zlib from "zlib"
 import { routes } from "./routes"
 import { middleware as pro } from "@budibase/pro"
diff --git a/packages/worker/src/api/routes/global/templates.ts b/packages/worker/src/api/routes/global/templates.ts
index 051ee5d702..477758c717 100644
--- a/packages/worker/src/api/routes/global/templates.ts
+++ b/packages/worker/src/api/routes/global/templates.ts
@@ -3,6 +3,7 @@ import * as controller from "../../controllers/global/templates"
 import { TemplatePurpose, TemplateType } from "../../../constants"
 import { auth as authCore } from "@budibase/backend-core"
 import Joi from "joi"
+
 const { adminOnly, joiValidator } = authCore
 
 const router: Router = new Router()
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 d40b82e742..59b6fe5869 100644
--- a/packages/worker/src/api/routes/global/tests/auth.spec.ts
+++ b/packages/worker/src/api/routes/global/tests/auth.spec.ts
@@ -7,6 +7,7 @@ import {
   structures,
   generator,
 } from "../../../../tests"
+
 const sendMailMock = mocks.email.mock()
 import { events, constants } from "@budibase/backend-core"
 import { Response } from "superagent"
diff --git a/packages/worker/src/api/routes/global/tests/configs.spec.ts b/packages/worker/src/api/routes/global/tests/configs.spec.ts
index 0a2073598a..4d9f28d2cb 100644
--- a/packages/worker/src/api/routes/global/tests/configs.spec.ts
+++ b/packages/worker/src/api/routes/global/tests/configs.spec.ts
@@ -1,6 +1,7 @@
 // mock the email system
 jest.mock("nodemailer")
 import { TestConfiguration, structures, mocks } from "../../../../tests"
+
 mocks.email.mock()
 import { events } from "@budibase/backend-core"
 import { GetPublicSettingsResponse, Config, ConfigType } from "@budibase/types"
diff --git a/packages/worker/src/api/routes/global/tests/email.spec.ts b/packages/worker/src/api/routes/global/tests/email.spec.ts
index 9e65cda3c5..49d7c3bbeb 100644
--- a/packages/worker/src/api/routes/global/tests/email.spec.ts
+++ b/packages/worker/src/api/routes/global/tests/email.spec.ts
@@ -1,5 +1,6 @@
 jest.mock("nodemailer")
 import { TestConfiguration, mocks } from "../../../../tests"
+
 const sendMailMock = mocks.email.mock()
 import { EmailTemplatePurpose } from "../../../../constants"
 
diff --git a/packages/worker/src/api/routes/global/tests/license.spec.ts b/packages/worker/src/api/routes/global/tests/license.spec.ts
index 26e3b3dfb5..e08292c061 100644
--- a/packages/worker/src/api/routes/global/tests/license.spec.ts
+++ b/packages/worker/src/api/routes/global/tests/license.spec.ts
@@ -1,4 +1,5 @@
 import { TestConfiguration, mocks, structures } from "../../../../tests"
+
 const licensing = mocks.pro.licensing
 const quotas = mocks.pro.quotas
 
diff --git a/packages/worker/src/api/routes/global/tests/realEmail.spec.ts b/packages/worker/src/api/routes/global/tests/realEmail.spec.ts
index 8ad7363c85..544c2651dc 100644
--- a/packages/worker/src/api/routes/global/tests/realEmail.spec.ts
+++ b/packages/worker/src/api/routes/global/tests/realEmail.spec.ts
@@ -1,6 +1,7 @@
 jest.unmock("node-fetch")
 import { TestConfiguration } from "../../../../tests"
 import { EmailTemplatePurpose } from "../../../../constants"
+
 const nodemailer = require("nodemailer")
 const fetch = require("node-fetch")
 
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 846b98a7ae..a85933255a 100644
--- a/packages/worker/src/api/routes/global/tests/users.spec.ts
+++ b/packages/worker/src/api/routes/global/tests/users.spec.ts
@@ -1,11 +1,12 @@
 import { InviteUsersResponse, User } from "@budibase/types"
 
-jest.mock("nodemailer")
 import { TestConfiguration, mocks, structures } from "../../../../tests"
-const sendMailMock = mocks.email.mock()
 import { events, tenancy, accounts as _accounts } from "@budibase/backend-core"
 import * as userSdk from "../../../../sdk/users"
 
+jest.mock("nodemailer")
+const sendMailMock = mocks.email.mock()
+
 const accounts = jest.mocked(_accounts)
 
 describe("/api/global/users", () => {
@@ -54,6 +55,24 @@ describe("/api/global/users", () => {
       expect(events.user.invited).toBeCalledTimes(0)
     })
 
+    it("should not invite the same user twice", async () => {
+      const email = structures.users.newEmail()
+      await config.api.users.sendUserInvite(sendMailMock, email)
+
+      jest.clearAllMocks()
+
+      const { code, res } = await config.api.users.sendUserInvite(
+        sendMailMock,
+        email,
+        400
+      )
+
+      expect(res.body.message).toBe(`Unavailable`)
+      expect(sendMailMock).toHaveBeenCalledTimes(0)
+      expect(code).toBeUndefined()
+      expect(events.user.invited).toBeCalledTimes(0)
+    })
+
     it("should be able to create new user from invite", async () => {
       const email = structures.users.newEmail()
       const { code } = await config.api.users.sendUserInvite(
@@ -101,6 +120,23 @@ describe("/api/global/users", () => {
       expect(sendMailMock).toHaveBeenCalledTimes(0)
       expect(events.user.invited).toBeCalledTimes(0)
     })
+
+    it("should not be able to generate an invitation for user that has already been invited", async () => {
+      const email = structures.users.newEmail()
+      await config.api.users.sendUserInvite(sendMailMock, email)
+
+      jest.clearAllMocks()
+
+      const request = [{ email: email, userInfo: {} }]
+      const res = await config.api.users.sendMultiUserInvite(request)
+
+      const body = res.body as InviteUsersResponse
+      expect(body.successful.length).toBe(0)
+      expect(body.unsuccessful.length).toBe(1)
+      expect(body.unsuccessful[0].reason).toBe("Unavailable")
+      expect(sendMailMock).toHaveBeenCalledTimes(0)
+      expect(events.user.invited).toBeCalledTimes(0)
+    })
   })
 
   describe("POST /api/global/users/bulk", () => {
@@ -633,4 +669,25 @@ describe("/api/global/users", () => {
       expect(response.body.message).toBe("Unable to delete self.")
     })
   })
+
+  describe("POST /api/global/users/onboard", () => {
+    it("should successfully onboard a user", async () => {
+      const response = await config.api.users.onboardUser([
+        { email: structures.users.newEmail(), userInfo: {} },
+      ])
+      expect(response.successful.length).toBe(1)
+      expect(response.unsuccessful.length).toBe(0)
+    })
+
+    it("should not onboard a user who has been invited", async () => {
+      const email = structures.users.newEmail()
+      await config.api.users.sendUserInvite(sendMailMock, email)
+
+      const response = await config.api.users.onboardUser([
+        { email, userInfo: {} },
+      ])
+      expect(response.successful.length).toBe(0)
+      expect(response.unsuccessful.length).toBe(1)
+    })
+  })
 })
diff --git a/packages/worker/src/api/routes/system/tests/status.spec.ts b/packages/worker/src/api/routes/system/tests/status.spec.ts
index 48a0fc005d..e2011dc79a 100644
--- a/packages/worker/src/api/routes/system/tests/status.spec.ts
+++ b/packages/worker/src/api/routes/system/tests/status.spec.ts
@@ -1,6 +1,7 @@
 import { HealthStatusResponse } from "@budibase/types"
 import { TestConfiguration } from "../../../../tests"
 import { accounts as _accounts } from "@budibase/backend-core"
+
 const accounts = jest.mocked(_accounts)
 
 describe("/api/system/status", () => {
diff --git a/packages/worker/src/index.ts b/packages/worker/src/index.ts
index 4b1d11ecf7..3da9a42065 100644
--- a/packages/worker/src/index.ts
+++ b/packages/worker/src/index.ts
@@ -16,15 +16,16 @@ import {
   queue,
   env as coreEnv,
   timers,
+  redis,
 } from "@budibase/backend-core"
+
 db.init()
-import Koa from "koa"
 import koaBody from "koa-body"
 import http from "http"
 import api from "./api"
-import * as redis from "./utilities/redis"
 
 const koaSession = require("koa-session")
+
 import { userAgent } from "koa-useragent"
 
 import destroyable from "server-destroy"
@@ -40,7 +41,7 @@ if (coreEnv.ENABLE_SSO_MAINTENANCE_MODE) {
 // this will setup http and https proxies form env variables
 bootstrap()
 
-const app: Application = new Koa()
+const app: Application = new Application()
 
 app.keys = ["secret", "key"]
 
@@ -72,8 +73,8 @@ server.on("close", async () => {
   shuttingDown = true
   console.log("Server Closed")
   timers.cleanup()
-  await redis.shutdown()
-  await events.shutdown()
+  events.shutdown()
+  await redis.clients.shutdown()
   await queue.shutdown()
   if (!env.isTest()) {
     process.exit(errCode)
@@ -88,7 +89,7 @@ const shutdown = () => {
 export default server.listen(parseInt(env.PORT || "4002"), async () => {
   console.log(`Worker running on ${JSON.stringify(server.address())}`)
   await initPro()
-  await redis.init()
+  await redis.clients.init()
   // configure events to use the pro audit log write
   // can't integrate directly into backend-core due to cyclic issues
   await events.processors.init(proSdk.auditLogs.write)
diff --git a/packages/worker/src/sdk/auth/auth.ts b/packages/worker/src/sdk/auth/auth.ts
index d989113c3d..1f9da8a260 100644
--- a/packages/worker/src/sdk/auth/auth.ts
+++ b/packages/worker/src/sdk/auth/auth.ts
@@ -6,12 +6,12 @@ import {
   sessions,
   tenancy,
   utils as coreUtils,
+  cache,
 } from "@budibase/backend-core"
 import { PlatformLogoutOpts, User } from "@budibase/types"
 import jwt from "jsonwebtoken"
 import * as userSdk from "../users"
 import * as emails from "../../utilities/email"
-import * as redis from "../../utilities/redis"
 import { EmailTemplatePurpose } from "../../constants"
 
 // LOGIN / LOGOUT
@@ -73,7 +73,7 @@ export const reset = async (email: string) => {
  * Perform the user password update if the provided reset code is valid.
  */
 export const resetUpdate = async (resetCode: string, password: string) => {
-  const { userId } = await redis.checkResetPasswordCode(resetCode)
+  const { userId } = await cache.passwordReset.getCode(resetCode)
 
   let user = await userSdk.db.getUser(userId)
   user.password = password
diff --git a/packages/worker/src/sdk/users/users.ts b/packages/worker/src/sdk/users/users.ts
index 230a8fa146..9dc1bac0e9 100644
--- a/packages/worker/src/sdk/users/users.ts
+++ b/packages/worker/src/sdk/users/users.ts
@@ -1,5 +1,9 @@
 import { events, tenancy, users as usersCore } from "@budibase/backend-core"
-import { InviteUsersRequest, InviteUsersResponse } from "@budibase/types"
+import {
+  InviteUserRequest,
+  InviteUsersRequest,
+  InviteUsersResponse,
+} from "@budibase/types"
 import { sendEmail } from "../../utilities/email"
 import { EmailTemplatePurpose } from "../../constants"
 
@@ -14,11 +18,13 @@ export async function invite(
   const matchedEmails = await usersCore.searchExistingEmails(
     users.map(u => u.email)
   )
-  const newUsers = []
+  const newUsers: InviteUserRequest[] = []
 
   // separate duplicates from new users
   for (let user of users) {
     if (matchedEmails.includes(user.email)) {
+      // This "Unavailable" is load bearing. The tests and frontend both check for it
+      // specifically
       response.unsuccessful.push({ email: user.email, reason: "Unavailable" })
     } else {
       newUsers.push(user)
diff --git a/packages/worker/src/tests/TestConfiguration.ts b/packages/worker/src/tests/TestConfiguration.ts
index d4fcbeebd6..289f31079a 100644
--- a/packages/worker/src/tests/TestConfiguration.ts
+++ b/packages/worker/src/tests/TestConfiguration.ts
@@ -7,10 +7,13 @@ mocks.licenses.init(mocks.pro)
 mocks.licenses.useUnlimited()
 
 import * as dbConfig from "../db"
+
 dbConfig.init()
 import env from "../environment"
 import * as controllers from "./controllers"
+
 const supertest = require("supertest")
+
 import { Config } from "../constants"
 import {
   users,
diff --git a/packages/worker/src/tests/api/users.ts b/packages/worker/src/tests/api/users.ts
index ca25e2f9ca..5ecd1447ca 100644
--- a/packages/worker/src/tests/api/users.ts
+++ b/packages/worker/src/tests/api/users.ts
@@ -5,6 +5,7 @@ import {
   User,
   CreateAdminUserRequest,
   SearchQuery,
+  InviteUsersResponse,
 } from "@budibase/types"
 import structures from "../structures"
 import { generator } from "@budibase/backend-core/tests"
@@ -176,4 +177,24 @@ export class UserAPI extends TestAPI {
       .expect("Content-Type", /json/)
       .expect(200)
   }
+
+  onboardUser = async (
+    req: InviteUsersRequest
+  ): Promise<InviteUsersResponse> => {
+    const resp = await this.request
+      .post(`/api/global/users/onboard`)
+      .send(req)
+      .set(this.config.defaultHeaders())
+      .expect("Content-Type", /json/)
+
+    if (resp.status !== 200) {
+      throw new Error(
+        `request failed with status ${resp.status} and body ${JSON.stringify(
+          resp.body
+        )}`
+      )
+    }
+
+    return resp.body as InviteUsersResponse
+  }
 }
diff --git a/packages/worker/src/tests/jestSetup.ts b/packages/worker/src/tests/jestSetup.ts
index 17bcb7dfb4..0f933bd562 100644
--- a/packages/worker/src/tests/jestSetup.ts
+++ b/packages/worker/src/tests/jestSetup.ts
@@ -8,6 +8,7 @@ mocks.fetch.enable()
 // mock all dates to 2020-01-01T00:00:00.000Z
 // use tk.reset() to use real dates in individual tests
 const tk = require("timekeeper")
+
 tk.freeze(mocks.date.MOCK_DATE)
 
 if (!process.env.CI) {
diff --git a/packages/worker/src/tests/mocks/index.ts b/packages/worker/src/tests/mocks/index.ts
index 917e5f9ffc..977b83c8a4 100644
--- a/packages/worker/src/tests/mocks/index.ts
+++ b/packages/worker/src/tests/mocks/index.ts
@@ -2,6 +2,7 @@ import * as email from "./email"
 import { mocks } from "@budibase/backend-core/tests"
 
 import * as _pro from "@budibase/pro"
+
 const pro = jest.mocked(_pro, { shallow: false })
 
 export default {
diff --git a/packages/worker/src/utilities/email.ts b/packages/worker/src/utilities/email.ts
index c5b1d9d8ab..27f2876eda 100644
--- a/packages/worker/src/utilities/email.ts
+++ b/packages/worker/src/utilities/email.ts
@@ -3,10 +3,10 @@ import { EmailTemplatePurpose, TemplateType } from "../constants"
 import { getTemplateByPurpose, EmailTemplates } from "../constants/templates"
 import { getSettingsTemplateContext } from "./templates"
 import { processString } from "@budibase/string-templates"
-import { getResetPasswordCode, getInviteCode } from "./redis"
 import { User, SendEmailOpts, SMTPInnerConfig } from "@budibase/types"
-import { configs } from "@budibase/backend-core"
+import { configs, cache } from "@budibase/backend-core"
 import ical from "ical-generator"
+
 const nodemailer = require("nodemailer")
 
 const TEST_MODE = env.ENABLE_EMAIL_TEST_MODE && env.isDev()
@@ -61,9 +61,9 @@ async function getLinkCode(
 ) {
   switch (purpose) {
     case EmailTemplatePurpose.PASSWORD_RECOVERY:
-      return getResetPasswordCode(user._id!, info)
+      return cache.passwordReset.createCode(user._id!, info)
     case EmailTemplatePurpose.INVITATION:
-      return getInviteCode(email, info)
+      return cache.invite.createCode(email, info)
     default:
       return null
   }
diff --git a/packages/worker/src/utilities/redis.ts b/packages/worker/src/utilities/redis.ts
deleted file mode 100644
index 993cdf97ce..0000000000
--- a/packages/worker/src/utilities/redis.ts
+++ /dev/null
@@ -1,150 +0,0 @@
-import { redis, utils, tenancy } from "@budibase/backend-core"
-import env from "../environment"
-
-function getExpirySecondsForDB(db: string) {
-  switch (db) {
-    case redis.utils.Databases.PW_RESETS:
-      // a hour
-      return 3600
-    case redis.utils.Databases.INVITATIONS:
-      // a week
-      return 604800
-  }
-}
-
-let pwResetClient: any, invitationClient: any
-
-function getClient(db: string) {
-  switch (db) {
-    case redis.utils.Databases.PW_RESETS:
-      return pwResetClient
-    case redis.utils.Databases.INVITATIONS:
-      return invitationClient
-  }
-}
-
-async function writeACode(db: string, value: any) {
-  const client = await getClient(db)
-  const code = utils.newid()
-  await client.store(code, value, getExpirySecondsForDB(db))
-  return code
-}
-
-async function updateACode(db: string, code: string, value: any) {
-  const client = await getClient(db)
-  await client.store(code, value, getExpirySecondsForDB(db))
-}
-
-/**
- * Given an invite code and invite body, allow the update an existing/valid invite in redis
- * @param inviteCode The invite code for an invite in redis
- * @param value The body of the updated user invitation
- */
-export async function updateInviteCode(inviteCode: string, value: string) {
-  await updateACode(redis.utils.Databases.INVITATIONS, inviteCode, value)
-}
-
-async function getACode(db: string, code: string, deleteCode = true) {
-  const client = await getClient(db)
-  const value = await client.get(code)
-  if (!value) {
-    throw new Error("Invalid code.")
-  }
-  if (deleteCode) {
-    await client.delete(code)
-  }
-  return value
-}
-
-export async function init() {
-  pwResetClient = new redis.Client(redis.utils.Databases.PW_RESETS)
-  invitationClient = new redis.Client(redis.utils.Databases.INVITATIONS)
-  await pwResetClient.init()
-  await invitationClient.init()
-}
-
-/**
- * make sure redis connection is closed.
- */
-export async function shutdown() {
-  if (pwResetClient) await pwResetClient.finish()
-  if (invitationClient) await invitationClient.finish()
-  // shutdown core clients
-  await redis.clients.shutdown()
-  console.log("Redis shutdown")
-}
-
-/**
- * Given a user ID this will store a code (that is returned) for an hour in redis.
- * The user can then return this code for resetting their password (through their reset link).
- * @param userId the ID of the user which is to be reset.
- * @param info Info about the user/the reset process.
- * @return returns the code that was stored to redis.
- */
-export async function getResetPasswordCode(userId: string, info: any) {
-  return writeACode(redis.utils.Databases.PW_RESETS, { userId, info })
-}
-
-/**
- * Given a reset code this will lookup to redis, check if the code is valid and delete if required.
- * @param resetCode The code provided via the email link.
- * @param deleteCode If the code is used/finished with this will delete it - defaults to true.
- * @return returns the user ID if it is found
- */
-export async function checkResetPasswordCode(
-  resetCode: string,
-  deleteCode = true
-) {
-  try {
-    return getACode(redis.utils.Databases.PW_RESETS, resetCode, deleteCode)
-  } catch (err) {
-    throw "Provided information is not valid, cannot reset password - please try again."
-  }
-}
-
-/**
- * Generates an invitation code and writes it to redis - which can later be checked for user creation.
- * @param email the email address which the code is being sent to (for use later).
- * @param info Information to be carried along with the invitation.
- * @return returns the code that was stored to redis.
- */
-export async function getInviteCode(email: string, info: any) {
-  return writeACode(redis.utils.Databases.INVITATIONS, { email, info })
-}
-
-/**
- * Checks that the provided invite code is valid - will return the email address of user that was invited.
- * @param inviteCode the invite code that was provided as part of the link.
- * @param deleteCode whether or not the code should be deleted after retrieval - defaults to true.
- * @return If the code is valid then an email address will be returned.
- */
-export async function checkInviteCode(
-  inviteCode: string,
-  deleteCode: boolean = true
-) {
-  try {
-    return getACode(redis.utils.Databases.INVITATIONS, inviteCode, deleteCode)
-  } catch (err) {
-    throw "Invitation is not valid or has expired, please request a new one."
-  }
-}
-
-/** 
-  Get all currently available user invitations for the current tenant.
-**/
-export async function getInviteCodes() {
-  const client = await getClient(redis.utils.Databases.INVITATIONS)
-  const invites: any[] = await client.scan()
-
-  const results = invites.map(invite => {
-    return {
-      ...invite.value,
-      code: invite.key,
-    }
-  })
-  if (!env.MULTI_TENANCY) {
-    return results
-  }
-  const tenantId = tenancy.getTenantId()
-  return results.filter(invite => tenantId === invite.info.tenantId)
-}
diff --git a/qa-core/src/account-api/api/AccountInternalAPIClient.ts b/qa-core/src/account-api/api/AccountInternalAPIClient.ts
index e04a371c97..9c5fbec3af 100644
--- a/qa-core/src/account-api/api/AccountInternalAPIClient.ts
+++ b/qa-core/src/account-api/api/AccountInternalAPIClient.ts
@@ -1,6 +1,5 @@
-import { Response } from "node-fetch"
+import fetch, { Response, HeadersInit } from "node-fetch"
 import env from "../../environment"
-import fetch, { HeadersInit } from "node-fetch"
 import { State } from "../../types"
 import { Header } from "@budibase/backend-core"
 
diff --git a/qa-core/src/account-api/api/apis/LicenseAPI.ts b/qa-core/src/account-api/api/apis/LicenseAPI.ts
index a9b0a35269..8f6e705e5f 100644
--- a/qa-core/src/account-api/api/apis/LicenseAPI.ts
+++ b/qa-core/src/account-api/api/apis/LicenseAPI.ts
@@ -9,6 +9,7 @@ import {
 import { Response } from "node-fetch"
 import BaseAPI from "./BaseAPI"
 import { APIRequestOpts } from "../../../types"
+
 export default class LicenseAPI extends BaseAPI {
   client: AccountInternalAPIClient
   constructor(client: AccountInternalAPIClient) {
diff --git a/qa-core/src/account-api/tests/licensing/license.manage.spec.ts b/qa-core/src/account-api/tests/licensing/license.manage.spec.ts
index 9cad980038..bda0476c2b 100644
--- a/qa-core/src/account-api/tests/licensing/license.manage.spec.ts
+++ b/qa-core/src/account-api/tests/licensing/license.manage.spec.ts
@@ -1,6 +1,7 @@
 import TestConfiguration from "../../config/TestConfiguration"
 import * as fixtures from "../../fixtures"
 import { Hosting, PlanType } from "@budibase/types"
+
 const stripe = require("stripe")(process.env.STRIPE_SECRET_KEY)
 
 describe("license management", () => {
diff --git a/qa-core/src/internal-api/fixtures/screens.ts b/qa-core/src/internal-api/fixtures/screens.ts
index d07b3bd3ba..c28a5ed86f 100644
--- a/qa-core/src/internal-api/fixtures/screens.ts
+++ b/qa-core/src/internal-api/fixtures/screens.ts
@@ -1,5 +1,6 @@
 import { generator } from "../../shared"
 import { ScreenRequest } from "../../types"
+
 const randomId = generator.guid()
 
 export const generateScreen = (roleId: string): ScreenRequest => ({
diff --git a/qa-core/src/public-api/api/apis/RowAPI.ts b/qa-core/src/public-api/api/apis/RowAPI.ts
index 68649db5a3..8f8e78f365 100644
--- a/qa-core/src/public-api/api/apis/RowAPI.ts
+++ b/qa-core/src/public-api/api/apis/RowAPI.ts
@@ -1,12 +1,7 @@
-import {
-  CreateRowParams,
-  Row,
-  SearchInputParams,
-} from "@budibase/server/api/controllers/public/mapping/types"
+import { CreateRowParams, Row, SearchInputParams, State } from "../../../types"
 import { HeadersInit, Response } from "node-fetch"
 import BudibasePublicAPIClient from "../BudibasePublicAPIClient"
 import * as fixtures from "../../fixtures"
-import { State } from "../../../types"
 
 export default class RowAPI {
   client: BudibasePublicAPIClient
diff --git a/qa-core/src/public-api/api/apis/TableAPI.ts b/qa-core/src/public-api/api/apis/TableAPI.ts
index b7bafb2b67..4849953211 100644
--- a/qa-core/src/public-api/api/apis/TableAPI.ts
+++ b/qa-core/src/public-api/api/apis/TableAPI.ts
@@ -1,8 +1,4 @@
-import {
-  Table,
-  SearchInputParams,
-  CreateTableParams,
-} from "@budibase/server/api/controllers/public/mapping/types"
+import { Table, SearchInputParams, CreateTableParams } from "../../../types"
 import { HeadersInit, Response } from "node-fetch"
 import { generateTable } from "../../fixtures/tables"
 import BudibasePublicAPIClient from "../BudibasePublicAPIClient"
diff --git a/qa-core/src/public-api/api/apis/UserAPI.ts b/qa-core/src/public-api/api/apis/UserAPI.ts
index 7676a0fdd6..589bec1d40 100644
--- a/qa-core/src/public-api/api/apis/UserAPI.ts
+++ b/qa-core/src/public-api/api/apis/UserAPI.ts
@@ -1,8 +1,4 @@
-import {
-  CreateUserParams,
-  SearchInputParams,
-  User,
-} from "@budibase/server/api/controllers/public/mapping/types"
+import { CreateUserParams, SearchInputParams, User } from "../../../types"
 import { Response } from "node-fetch"
 import BudibasePublicAPIClient from "../BudibasePublicAPIClient"
 import * as fixtures from "../../fixtures"
diff --git a/qa-core/src/public-api/fixtures/users.ts b/qa-core/src/public-api/fixtures/users.ts
index 14c525fc0f..e20c464b34 100644
--- a/qa-core/src/public-api/fixtures/users.ts
+++ b/qa-core/src/public-api/fixtures/users.ts
@@ -1,7 +1,4 @@
-import {
-  CreateUserParams,
-  User,
-} from "@budibase/server/api/controllers/public/mapping/types"
+import { CreateUserParams, User } from "../../types"
 import { generator } from "../../shared"
 
 export const generateUser = (
diff --git a/qa-core/src/types/appPackage.ts b/qa-core/src/types/appPackage.ts
index 0285565dea..817a4b7414 100644
--- a/qa-core/src/types/appPackage.ts
+++ b/qa-core/src/types/appPackage.ts
@@ -1,6 +1,5 @@
-import { Application } from "@budibase/server/api/controllers/public/mapping/types"
-import { Layout } from "@budibase/types"
-import { Screen } from "@budibase/types"
+import { Application } from "../types"
+import { Layout, Screen } from "@budibase/types"
 // Create type for getAppPackage response
 export interface AppPackageResponse {
   application: Partial<Application>
diff --git a/qa-core/yarn.lock b/qa-core/yarn.lock
index d2cde27530..1de9d75e60 100644
--- a/qa-core/yarn.lock
+++ b/qa-core/yarn.lock
@@ -983,10 +983,10 @@
     expect "^29.0.0"
     pretty-format "^29.0.0"
 
-"@types/node-fetch@2.6.2":
-  version "2.6.2"
-  resolved "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.6.2.tgz"
-  integrity sha512-DHqhlq5jeESLy19TYhLakJ07kNumXWjcDdxXsLUMJZ6ue8VZJj4kLPQVE/2mdHh3xZziNF1xppu5lwmS53HR+A==
+"@types/node-fetch@2.6.4":
+  version "2.6.4"
+  resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.6.4.tgz#1bc3a26de814f6bf466b25aeb1473fa1afe6a660"
+  integrity sha512-1ZX9fcN4Rvkvgv4E6PAY5WXUFWFcRWxZa3EW83UjycOB9ljJCedb2CupIP4RZMEwF/M3eTcCihbBRgwtGbg5Rg==
   dependencies:
     "@types/node" "*"
     form-data "^3.0.0"
@@ -3587,18 +3587,18 @@ node-duration@^1.0.4:
   resolved "https://registry.npmjs.org/node-duration/-/node-duration-1.0.4.tgz"
   integrity sha512-eUXYNSY7DL53vqfTosggWkvyIW3bhAcqBDIlolgNYlZhianXTrCL50rlUJWD1eRqkIxMppXTfiFbp+9SjpPrgA==
 
-node-fetch@2, node-fetch@2.6.7, node-fetch@^2.6.7:
+node-fetch@2.6.0:
+  version "2.6.0"
+  resolved "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.0.tgz"
+  integrity sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA==
+
+node-fetch@2.6.7, node-fetch@^2.6.7:
   version "2.6.7"
   resolved "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz"
   integrity sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==
   dependencies:
     whatwg-url "^5.0.0"
 
-node-fetch@2.6.0:
-  version "2.6.0"
-  resolved "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.0.tgz"
-  integrity sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA==
-
 node-gyp-build-optional-packages@5.0.7:
   version "5.0.7"
   resolved "https://registry.npmjs.org/node-gyp-build-optional-packages/-/node-gyp-build-optional-packages-5.0.7.tgz"
@@ -4893,10 +4893,10 @@ type-is@^1.6.16, type-is@^1.6.18:
     media-typer "0.3.0"
     mime-types "~2.1.24"
 
-typescript@4.7.3:
-  version "4.7.3"
-  resolved "https://registry.npmjs.org/typescript/-/typescript-4.7.3.tgz"
-  integrity sha512-WOkT3XYvrpXx4vMMqlD+8R8R37fZkjyLGlxavMc4iB8lrl8L0DeTcHbYgw/v0N/z9wAFsgBhcsF0ruoySS22mA==
+typescript@5.2.2:
+  version "5.2.2"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.2.2.tgz#5ebb5e5a5b75f085f22bc3f8460fba308310fa78"
+  integrity sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==
 
 uid2@0.0.x:
   version "0.0.4"
diff --git a/scripts/syncProPackage.js b/scripts/syncProPackage.js
index 46a55c291b..14ee222ce7 100755
--- a/scripts/syncProPackage.js
+++ b/scripts/syncProPackage.js
@@ -5,14 +5,7 @@ const { execSync } = require("child_process")
 let version = "0.0.0"
 const localPro = fs.existsSync("packages/pro/src")
 if (!localPro) {
-  const branchName = execSync("git rev-parse --abbrev-ref HEAD")
-    .toString()
-    .trim()
-  if (branchName === "master") {
-    version = "latest"
-  } else {
-    version = "develop"
-  }
+  version = "latest"
 }
 
 // Get the list of workspaces with mismatched dependencies
diff --git a/yarn.lock b/yarn.lock
index f573046394..700c3f9456 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6799,6 +6799,14 @@ array-back@^6.2.0, array-back@^6.2.2:
   resolved "https://registry.yarnpkg.com/array-back/-/array-back-6.2.2.tgz#f567d99e9af88a6d3d2f9dfcc21db6f9ba9fd157"
   integrity sha512-gUAZ7HPyb4SJczXAMUXMGAvI976JoK3qEx9v1FTmeYuJj0IBiaKttG1ydtGKdkfqWkIkouke7nG8ufGy77+Cvw==
 
+array-buffer-byte-length@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/array-buffer-byte-length/-/array-buffer-byte-length-1.0.0.tgz#fabe8bc193fea865f317fe7807085ee0dee5aead"
+  integrity sha512-LPuwb2P+NrQw3XhxGc36+XSvuBPopovXYTR9Ew++Du9Yb/bx5AzBfrIsBoj0EZUifjQU+sHL21sseZ3jerWO/A==
+  dependencies:
+    call-bind "^1.0.2"
+    is-array-buffer "^3.0.1"
+
 array-differ@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/array-differ/-/array-differ-3.0.0.tgz#3cbb3d0f316810eafcc47624734237d6aee4ae6b"
@@ -6809,6 +6817,17 @@ array-ify@^1.0.0:
   resolved "https://registry.yarnpkg.com/array-ify/-/array-ify-1.0.0.tgz#9e528762b4a9066ad163a6962a364418e9626ece"
   integrity sha512-c5AMf34bKdvPhQ7tBGhqkgKNUzMr4WUs+WDtC2ZUGOUncbxKMTvqxYctiseW3+L4bA8ec+GcZ6/A/FW4m8ukng==
 
+array-includes@^3.1.7:
+  version "3.1.7"
+  resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.7.tgz#8cd2e01b26f7a3086cbc87271593fe921c62abda"
+  integrity sha512-dlcsNBIiWhPkHdOEEKnehA+RNUWDc4UqFtnIXU4uuYDPtA4LDkr7qip2p0VvFAEXNDr0yWZ9PJyIRiGjRLQzwQ==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.2.0"
+    es-abstract "^1.22.1"
+    get-intrinsic "^1.2.1"
+    is-string "^1.0.7"
+
 array-sort@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/array-sort/-/array-sort-1.0.0.tgz#e4c05356453f56f53512a7d1d6123f2c54c0a88a"
@@ -6833,6 +6852,50 @@ array-unique@^0.3.2:
   resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
   integrity sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ==
 
+array.prototype.findlastindex@^1.2.3:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.3.tgz#b37598438f97b579166940814e2c0493a4f50207"
+  integrity sha512-LzLoiOMAxvy+Gd3BAq3B7VeIgPdo+Q8hthvKtXybMvRV0jrXfJM/t8mw7nNlpEcVlVUnCnM2KSX4XU5HmpodOA==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.2.0"
+    es-abstract "^1.22.1"
+    es-shim-unscopables "^1.0.0"
+    get-intrinsic "^1.2.1"
+
+array.prototype.flat@^1.3.2:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.3.2.tgz#1476217df8cff17d72ee8f3ba06738db5b387d18"
+  integrity sha512-djYB+Zx2vLewY8RWlNCUdHjDXs2XOgm602S9E7P/UpHgfeHL00cRiIF+IN/G/aUJ7kGPb6yO/ErDI5V2s8iycA==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.2.0"
+    es-abstract "^1.22.1"
+    es-shim-unscopables "^1.0.0"
+
+array.prototype.flatmap@^1.3.2:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.3.2.tgz#c9a7c6831db8e719d6ce639190146c24bbd3e527"
+  integrity sha512-Ewyx0c9PmpcsByhSW4r+9zDU7sGjFc86qf/kKtuSCRdhfbk0SNLLkaT5qvcHnRGgc5NP/ly/y+qkXkqONX54CQ==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.2.0"
+    es-abstract "^1.22.1"
+    es-shim-unscopables "^1.0.0"
+
+arraybuffer.prototype.slice@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.2.tgz#98bd561953e3e74bb34938e77647179dfe6e9f12"
+  integrity sha512-yMBKppFur/fbHu9/6USUe03bZ4knMYiwFBcyiaXB8Go0qNehwX6inYPzK9U0NeQvGxKthcmHcaR8P5MStSRBAw==
+  dependencies:
+    array-buffer-byte-length "^1.0.0"
+    call-bind "^1.0.2"
+    define-properties "^1.2.0"
+    es-abstract "^1.22.1"
+    get-intrinsic "^1.2.1"
+    is-array-buffer "^3.0.2"
+    is-shared-array-buffer "^1.0.2"
+
 arrify@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
@@ -7727,6 +7790,15 @@ call-bind@^1.0.0, call-bind@^1.0.2:
     function-bind "^1.1.1"
     get-intrinsic "^1.0.2"
 
+call-bind@^1.0.4, call-bind@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.5.tgz#6fa2b7845ce0ea49bf4d8b9ef64727a2c2e2e513"
+  integrity sha512-C3nQxfFZxFRVoJoGKKI8y3MOEo129NQ+FgQ08iye+Mk4zNZZGdjfs06bVTr+DBSlA66Q2VEcMki/cUCP4SercQ==
+  dependencies:
+    function-bind "^1.1.2"
+    get-intrinsic "^1.2.1"
+    set-function-length "^1.1.1"
+
 call-me-maybe@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/call-me-maybe/-/call-me-maybe-1.0.1.tgz#26d208ea89e37b5cbde60250a15f031c16a4d66b"
@@ -9087,6 +9159,15 @@ deferred-leveldown@~5.3.0:
     abstract-leveldown "~6.2.1"
     inherits "^2.0.3"
 
+define-data-property@^1.0.1, define-data-property@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/define-data-property/-/define-data-property-1.1.1.tgz#c35f7cd0ab09883480d12ac5cb213715587800b3"
+  integrity sha512-E7uGkTzkk1d0ByLeSc6ZsFS79Axg+m1P/VsgYsxHgiuc3tFSj+MjMIwe90FC4lOAZzNBdY7kkO2P2wKdsQ1vgQ==
+  dependencies:
+    get-intrinsic "^1.2.1"
+    gopd "^1.0.1"
+    has-property-descriptors "^1.0.0"
+
 define-lazy-prop@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz#3f7ae421129bcaaac9bc74905c98a0009ec9ee7f"
@@ -9100,6 +9181,15 @@ define-properties@^1.1.3, define-properties@^1.1.4:
     has-property-descriptors "^1.0.0"
     object-keys "^1.1.1"
 
+define-properties@^1.2.0:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.2.1.tgz#10781cc616eb951a80a034bafcaa7377f6af2b6c"
+  integrity sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==
+  dependencies:
+    define-data-property "^1.0.1"
+    has-property-descriptors "^1.0.0"
+    object-keys "^1.1.1"
+
 define-property@^0.2.5:
   version "0.2.5"
   resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116"
@@ -9465,6 +9555,13 @@ doctrine@3.0.0, doctrine@^3.0.0:
   dependencies:
     esutils "^2.0.2"
 
+doctrine@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d"
+  integrity sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==
+  dependencies:
+    esutils "^2.0.2"
+
 dom-accessibility-api@^0.5.6, dom-accessibility-api@^0.5.9:
   version "0.5.16"
   resolved "https://registry.yarnpkg.com/dom-accessibility-api/-/dom-accessibility-api-0.5.16.tgz#5a7429e6066eb3664d911e33fb0e45de8eb08453"
@@ -9890,6 +9987,51 @@ es-abstract@^1.17.5, es-abstract@^1.19.0, es-abstract@^1.20.4:
     unbox-primitive "^1.0.2"
     which-typed-array "^1.1.9"
 
+es-abstract@^1.22.1:
+  version "1.22.3"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.22.3.tgz#48e79f5573198de6dee3589195727f4f74bc4f32"
+  integrity sha512-eiiY8HQeYfYH2Con2berK+To6GrK2RxbPawDkGq4UiCQQfZHb6wX9qQqkbpPqaxQFcl8d9QzZqo0tGE0VcrdwA==
+  dependencies:
+    array-buffer-byte-length "^1.0.0"
+    arraybuffer.prototype.slice "^1.0.2"
+    available-typed-arrays "^1.0.5"
+    call-bind "^1.0.5"
+    es-set-tostringtag "^2.0.1"
+    es-to-primitive "^1.2.1"
+    function.prototype.name "^1.1.6"
+    get-intrinsic "^1.2.2"
+    get-symbol-description "^1.0.0"
+    globalthis "^1.0.3"
+    gopd "^1.0.1"
+    has-property-descriptors "^1.0.0"
+    has-proto "^1.0.1"
+    has-symbols "^1.0.3"
+    hasown "^2.0.0"
+    internal-slot "^1.0.5"
+    is-array-buffer "^3.0.2"
+    is-callable "^1.2.7"
+    is-negative-zero "^2.0.2"
+    is-regex "^1.1.4"
+    is-shared-array-buffer "^1.0.2"
+    is-string "^1.0.7"
+    is-typed-array "^1.1.12"
+    is-weakref "^1.0.2"
+    object-inspect "^1.13.1"
+    object-keys "^1.1.1"
+    object.assign "^4.1.4"
+    regexp.prototype.flags "^1.5.1"
+    safe-array-concat "^1.0.1"
+    safe-regex-test "^1.0.0"
+    string.prototype.trim "^1.2.8"
+    string.prototype.trimend "^1.0.7"
+    string.prototype.trimstart "^1.0.7"
+    typed-array-buffer "^1.0.0"
+    typed-array-byte-length "^1.0.0"
+    typed-array-byte-offset "^1.0.0"
+    typed-array-length "^1.0.4"
+    unbox-primitive "^1.0.2"
+    which-typed-array "^1.1.13"
+
 es-aggregate-error@^1.0.8:
   version "1.0.9"
   resolved "https://registry.yarnpkg.com/es-aggregate-error/-/es-aggregate-error-1.0.9.tgz#b50925cdf78c8a634bd766704f6f7825902be3d9"
@@ -9932,6 +10074,13 @@ es-set-tostringtag@^2.0.1:
     has "^1.0.3"
     has-tostringtag "^1.0.0"
 
+es-shim-unscopables@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/es-shim-unscopables/-/es-shim-unscopables-1.0.2.tgz#1f6942e71ecc7835ed1c8a83006d8771a63a3763"
+  integrity sha512-J3yBRXCzDu4ULnQwxyToo/OjdMx6akgVC7K6few0a7F/0wLtmKKN7I73AH5T2836UuXRqN7Qg+IIUw/+YJksRw==
+  dependencies:
+    hasown "^2.0.0"
+
 es-to-primitive@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a"
@@ -10141,6 +10290,50 @@ escodegen@^2.0.0:
   optionalDependencies:
     source-map "~0.6.1"
 
+eslint-import-resolver-node@^0.3.9:
+  version "0.3.9"
+  resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.9.tgz#d4eaac52b8a2e7c3cd1903eb00f7e053356118ac"
+  integrity sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==
+  dependencies:
+    debug "^3.2.7"
+    is-core-module "^2.13.0"
+    resolve "^1.22.4"
+
+eslint-module-utils@^2.8.0:
+  version "2.8.0"
+  resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.8.0.tgz#e439fee65fc33f6bba630ff621efc38ec0375c49"
+  integrity sha512-aWajIYfsqCKRDgUfjEXNN/JlrzauMuSEy5sbd7WXbtW3EH6A6MpwEh42c7qD+MqQo9QMJ6fWLAeIJynx0g6OAw==
+  dependencies:
+    debug "^3.2.7"
+
+eslint-plugin-import@^2.29.0:
+  version "2.29.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.29.0.tgz#8133232e4329ee344f2f612885ac3073b0b7e155"
+  integrity sha512-QPOO5NO6Odv5lpoTkddtutccQjysJuFxoPS7fAHO+9m9udNHvTCPSAMW9zGAYj8lAIdr40I8yPCdUYrncXtrwg==
+  dependencies:
+    array-includes "^3.1.7"
+    array.prototype.findlastindex "^1.2.3"
+    array.prototype.flat "^1.3.2"
+    array.prototype.flatmap "^1.3.2"
+    debug "^3.2.7"
+    doctrine "^2.1.0"
+    eslint-import-resolver-node "^0.3.9"
+    eslint-module-utils "^2.8.0"
+    hasown "^2.0.0"
+    is-core-module "^2.13.1"
+    is-glob "^4.0.3"
+    minimatch "^3.1.2"
+    object.fromentries "^2.0.7"
+    object.groupby "^1.0.1"
+    object.values "^1.1.7"
+    semver "^6.3.1"
+    tsconfig-paths "^3.14.2"
+
+eslint-plugin-local-rules@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-local-rules/-/eslint-plugin-local-rules-2.0.0.tgz#cda95d7616cc0e2609d76c347c187ca2be1e252e"
+  integrity sha512-sWueme0kUcP0JC1+6OBDQ9edBDVFJR92WJHSRbhiRExlenMEuUisdaVBPR+ItFBFXo2Pdw6FD2UfGZWkz8e93g==
+
 eslint-plugin-svelte@^2.32.2:
   version "2.32.2"
   resolved "https://registry.yarnpkg.com/eslint-plugin-svelte/-/eslint-plugin-svelte-2.32.2.tgz#d8f1352b55967445ee8d57aaee55f99712696a30"
@@ -11068,6 +11261,11 @@ function-bind@^1.1.1:
   resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
   integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
 
+function-bind@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.2.tgz#2c02d864d97f3ea6c8830c464cbd11ab6eab7a1c"
+  integrity sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==
+
 function.prototype.name@^1.1.5:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.5.tgz#cce0505fe1ffb80503e6f9e46cc64e46a12a9621"
@@ -11078,6 +11276,16 @@ function.prototype.name@^1.1.5:
     es-abstract "^1.19.0"
     functions-have-names "^1.2.2"
 
+function.prototype.name@^1.1.6:
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.6.tgz#cdf315b7d90ee77a4c6ee216c3c3362da07533fd"
+  integrity sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.2.0"
+    es-abstract "^1.22.1"
+    functions-have-names "^1.2.3"
+
 functional-red-black-tree@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"
@@ -11234,6 +11442,16 @@ get-intrinsic@^1.0.2, get-intrinsic@^1.1.1, get-intrinsic@^1.1.3, get-intrinsic@
     has "^1.0.3"
     has-symbols "^1.0.3"
 
+get-intrinsic@^1.2.1, get-intrinsic@^1.2.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.2.tgz#281b7622971123e1ef4b3c90fd7539306da93f3b"
+  integrity sha512-0gSo4ml/0j98Y3lngkFEot/zhiCeWsbYIlZ+uZOVgzLyLaUw7wxUL+nCTP0XJvJg1AXulJRI3UJi8GsbDuxdGA==
+  dependencies:
+    function-bind "^1.1.2"
+    has-proto "^1.0.1"
+    has-symbols "^1.0.3"
+    hasown "^2.0.0"
+
 get-object@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/get-object/-/get-object-0.2.0.tgz#d92ff7d5190c64530cda0543dac63a3d47fe8c0c"
@@ -11937,6 +12155,13 @@ hash.js@^1.0.0, hash.js@^1.0.3:
     inherits "^2.0.3"
     minimalistic-assert "^1.0.1"
 
+hasown@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/hasown/-/hasown-2.0.0.tgz#f4c513d454a57b7c7e1650778de226b11700546c"
+  integrity sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA==
+  dependencies:
+    function-bind "^1.1.2"
+
 help-me@^4.0.1:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/help-me/-/help-me-4.2.0.tgz#50712bfd799ff1854ae1d312c36eafcea85b0563"
@@ -12407,6 +12632,15 @@ internal-slot@^1.0.4:
     has "^1.0.3"
     side-channel "^1.0.4"
 
+internal-slot@^1.0.5:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.6.tgz#37e756098c4911c5e912b8edbf71ed3aa116f930"
+  integrity sha512-Xj6dv+PsbtwyPpEflsejS+oIZxmMlV44zAhG479uYu89MsjcYOhCFnNyKrkJrihbsiasQyY0afoCl/9BLR65bg==
+  dependencies:
+    get-intrinsic "^1.2.2"
+    hasown "^2.0.0"
+    side-channel "^1.0.4"
+
 interpret@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/interpret/-/interpret-2.2.0.tgz#1a78a0b5965c40a5416d007ad6f50ad27c417df9"
@@ -12508,7 +12742,7 @@ is-arguments@^1.1.1:
     call-bind "^1.0.2"
     has-tostringtag "^1.0.0"
 
-is-array-buffer@^3.0.1:
+is-array-buffer@^3.0.1, is-array-buffer@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/is-array-buffer/-/is-array-buffer-3.0.2.tgz#f2653ced8412081638ecb0ebbd0c41c6e0aecbbe"
   integrity sha512-y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w==
@@ -12585,6 +12819,13 @@ is-core-module@2.9.0, is-core-module@^2.5.0, is-core-module@^2.8.1, is-core-modu
   dependencies:
     has "^1.0.3"
 
+is-core-module@^2.13.0, is-core-module@^2.13.1:
+  version "2.13.1"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.13.1.tgz#ad0d7532c6fea9da1ebdc82742d74525c6273384"
+  integrity sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==
+  dependencies:
+    hasown "^2.0.0"
+
 is-data-descriptor@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56"
@@ -12935,6 +13176,13 @@ is-typed-array@^1.1.10, is-typed-array@^1.1.9:
     gopd "^1.0.1"
     has-tostringtag "^1.0.0"
 
+is-typed-array@^1.1.12:
+  version "1.1.12"
+  resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.12.tgz#d0bab5686ef4a76f7a73097b95470ab199c57d4a"
+  integrity sha512-Z14TF2JNG8Lss5/HMqt0//T9JeHXttXy5pH/DBU4vi98ozO2btxzq9MwYDZYnKwU8nRsz/+GVFVRDq3DkVuSPg==
+  dependencies:
+    which-typed-array "^1.1.11"
+
 is-typedarray@^1.0.0, is-typedarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
@@ -13794,10 +14042,10 @@ json-stringify-safe@^5.0.1, json-stringify-safe@~5.0.1:
   resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
   integrity sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==
 
-json5@^1.0.1:
+json5@^1.0.1, json5@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.2.tgz#63d98d60f21b313b77c4d6da18bfa69d80e1d593"
-  integrity "sha1-Y9mNYPIbMTt3xNbaGL+mnYDh1ZM= sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA=="
+  integrity sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==
   dependencies:
     minimist "^1.2.0"
 
@@ -16298,6 +16546,11 @@ object-inspect@^1.12.2, object-inspect@^1.9.0:
   resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.3.tgz#ba62dffd67ee256c8c086dfae69e016cd1f198b9"
   integrity sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==
 
+object-inspect@^1.13.1:
+  version "1.13.1"
+  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.13.1.tgz#b96c6109324ccfef6b12216a956ca4dc2ff94bc2"
+  integrity sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==
+
 object-is@^1.1.5:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.1.5.tgz#b9deeaa5fc7f1846a0faecdceec138e5778f53ac"
@@ -16349,6 +16602,25 @@ object.assign@^4.1.4:
     has-symbols "^1.0.3"
     object-keys "^1.1.1"
 
+object.fromentries@^2.0.7:
+  version "2.0.7"
+  resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.7.tgz#71e95f441e9a0ea6baf682ecaaf37fa2a8d7e616"
+  integrity sha512-UPbPHML6sL8PI/mOqPwsH4G6iyXcCGzLin8KvEPenOZN5lpCNBZZQ+V62vdjB1mQHrmqGQt5/OJzemUA+KJmEA==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.2.0"
+    es-abstract "^1.22.1"
+
+object.groupby@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/object.groupby/-/object.groupby-1.0.1.tgz#d41d9f3c8d6c778d9cbac86b4ee9f5af103152ee"
+  integrity sha512-HqaQtqLnp/8Bn4GL16cj+CUYbnpe1bh0TtEaWvybszDG4tgxCJuRpV8VGuvNaI1fAnI4lUJzDG55MXcOH4JZcQ==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.2.0"
+    es-abstract "^1.22.1"
+    get-intrinsic "^1.2.1"
+
 object.pick@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747"
@@ -16356,6 +16628,15 @@ object.pick@^1.3.0:
   dependencies:
     isobject "^3.0.1"
 
+object.values@^1.1.7:
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.7.tgz#617ed13272e7e1071b43973aa1655d9291b8442a"
+  integrity sha512-aU6xnDFYT3x17e/f0IiiwlGPTy2jzMySGfUB4fq6z7CV8l85CWHDk5ErhyhpfDHhrOMwGFhSQkhMGHaIotA6Ng==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.2.0"
+    es-abstract "^1.22.1"
+
 octal@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/octal/-/octal-1.0.0.tgz#63e7162a68efbeb9e213588d58e989d1e5c4530b"
@@ -18668,6 +18949,15 @@ regexp.prototype.flags@^1.4.3:
     define-properties "^1.1.3"
     functions-have-names "^1.2.2"
 
+regexp.prototype.flags@^1.5.1:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.5.1.tgz#90ce989138db209f81492edd734183ce99f9677e"
+  integrity sha512-sy6TXMN+hnP/wMy+ISxg3krXx7BAtWVO4UouuCN/ziM9UEne0euamVNafDfvC83bRNr95y0V5iijeDQFUNpvrg==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.2.0"
+    set-function-name "^2.0.0"
+
 regexparam@2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/regexparam/-/regexparam-2.0.1.tgz#c912f5dae371e3798100b3c9ce22b7414d0889fa"
@@ -18879,6 +19169,15 @@ resolve@^1.10.0, resolve@^1.11.1, resolve@^1.14.2, resolve@^1.17.0, resolve@^1.1
     path-parse "^1.0.7"
     supports-preserve-symlinks-flag "^1.0.0"
 
+resolve@^1.22.4:
+  version "1.22.8"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.8.tgz#b6c87a9f2aa06dfab52e3d70ac8cde321fa5a48d"
+  integrity sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==
+  dependencies:
+    is-core-module "^2.13.0"
+    path-parse "^1.0.7"
+    supports-preserve-symlinks-flag "^1.0.0"
+
 responselike@1.0.2, responselike@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/responselike/-/responselike-1.0.2.tgz#918720ef3b631c5642be068f15ade5a46f4ba1e7"
@@ -19153,6 +19452,16 @@ rxjs@^7.5.5:
   dependencies:
     tslib "^2.1.0"
 
+safe-array-concat@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/safe-array-concat/-/safe-array-concat-1.0.1.tgz#91686a63ce3adbea14d61b14c99572a8ff84754c"
+  integrity sha512-6XbUAseYE2KtOuGueyeobCySj9L4+66Tn6KQMOPQJrAJEowYKW/YR/MGJZl7FdydUdaFu4LYyDZjxf4/Nmo23Q==
+  dependencies:
+    call-bind "^1.0.2"
+    get-intrinsic "^1.2.1"
+    has-symbols "^1.0.3"
+    isarray "^2.0.5"
+
 safe-buffer@5.2.1, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@^5.2.0, safe-buffer@~5.2.0:
   version "5.2.1"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
@@ -19334,6 +19643,11 @@ semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.2.0, semver@^6.3.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
   integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
 
+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"
@@ -19387,6 +19701,25 @@ set-blocking@^2.0.0, set-blocking@~2.0.0:
   resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
   integrity sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==
 
+set-function-length@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/set-function-length/-/set-function-length-1.1.1.tgz#4bc39fafb0307224a33e106a7d35ca1218d659ed"
+  integrity sha512-VoaqjbBJKiWtg4yRcKBQ7g7wnGnLV3M8oLvVWwOk2PdYY6PEFegR1vezXR0tw6fZGF9csVakIRjrJiy2veSBFQ==
+  dependencies:
+    define-data-property "^1.1.1"
+    get-intrinsic "^1.2.1"
+    gopd "^1.0.1"
+    has-property-descriptors "^1.0.0"
+
+set-function-name@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/set-function-name/-/set-function-name-2.0.1.tgz#12ce38b7954310b9f61faa12701620a0c882793a"
+  integrity sha512-tMNCiqYVkXIZgc2Hnoy2IvC/f8ezc5koaRFkCjrpWzGpCd3qbZXPzVy9MAZzK1ch/X0jvSkojys3oqJN0qCmdA==
+  dependencies:
+    define-data-property "^1.0.1"
+    functions-have-names "^1.2.3"
+    has-property-descriptors "^1.0.0"
+
 set-value@^2.0.0, set-value@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.1.tgz#a18d40530e6f07de4228c7defe4227af8cad005b"
@@ -20109,6 +20442,15 @@ string.prototype.startswith@^1.0.0:
     define-properties "^1.1.3"
     es-abstract "^1.17.5"
 
+string.prototype.trim@^1.2.8:
+  version "1.2.8"
+  resolved "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.2.8.tgz#f9ac6f8af4bd55ddfa8895e6aea92a96395393bd"
+  integrity sha512-lfjY4HcixfQXOfaqCvcBuOIapyaroTXhbkfJN3gcB1OtyupngWK4sEET9Knd0cXd28kTUqu/kHoV4HKSJdnjiQ==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.2.0"
+    es-abstract "^1.22.1"
+
 string.prototype.trimend@^1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz#c4a27fa026d979d79c04f17397f250a462944533"
@@ -20118,6 +20460,15 @@ string.prototype.trimend@^1.0.6:
     define-properties "^1.1.4"
     es-abstract "^1.20.4"
 
+string.prototype.trimend@^1.0.7:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.7.tgz#1bb3afc5008661d73e2dc015cd4853732d6c471e"
+  integrity sha512-Ni79DqeB72ZFq1uH/L6zJ+DKZTkOtPIHovb3YZHQViE+HDouuU4mBrLOLDn5Dde3RF8qw5qVETEjhu9locMLvA==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.2.0"
+    es-abstract "^1.22.1"
+
 string.prototype.trimstart@^1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz#e90ab66aa8e4007d92ef591bbf3cd422c56bdcf4"
@@ -20127,6 +20478,15 @@ string.prototype.trimstart@^1.0.6:
     define-properties "^1.1.4"
     es-abstract "^1.20.4"
 
+string.prototype.trimstart@^1.0.7:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.7.tgz#d4cdb44b83a4737ffbac2d406e405d43d0184298"
+  integrity sha512-NGhtDFu3jCEm7B4Fy0DpLewdJQOZcQ0rGbwQ/+stjnrp2i+rlKeCvos9hOIeCmqwratM47OBxY7uFZzjxHXmrg==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.2.0"
+    es-abstract "^1.22.1"
+
 string_decoder@^1.1.1:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e"
@@ -21079,6 +21439,16 @@ tsconfig-paths@^3.10.1:
     minimist "^1.2.6"
     strip-bom "^3.0.0"
 
+tsconfig-paths@^3.14.2:
+  version "3.14.2"
+  resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.14.2.tgz#6e32f1f79412decd261f92d633a9dc1cfa99f088"
+  integrity sha512-o/9iXgCYc5L/JxCHPe3Hvh8Q/2xm5Z+p18PESBU6Ff33695QnCHBEjcytY2q19ua7Mbl/DavtBOLq+oG0RCL+g==
+  dependencies:
+    "@types/json5" "^0.0.29"
+    json5 "^1.0.2"
+    minimist "^1.2.6"
+    strip-bom "^3.0.0"
+
 tsconfig-paths@^4.1.2, tsconfig-paths@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-4.2.0.tgz#ef78e19039133446d244beac0fd6a1632e2d107c"
@@ -21203,6 +21573,36 @@ type-is@^1.6.14, type-is@^1.6.16, type-is@^1.6.18:
     media-typer "0.3.0"
     mime-types "~2.1.24"
 
+typed-array-buffer@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/typed-array-buffer/-/typed-array-buffer-1.0.0.tgz#18de3e7ed7974b0a729d3feecb94338d1472cd60"
+  integrity sha512-Y8KTSIglk9OZEr8zywiIHG/kmQ7KWyjseXs1CbSo8vC42w7hg2HgYTxSWwP0+is7bWDc1H+Fo026CpHFwm8tkw==
+  dependencies:
+    call-bind "^1.0.2"
+    get-intrinsic "^1.2.1"
+    is-typed-array "^1.1.10"
+
+typed-array-byte-length@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/typed-array-byte-length/-/typed-array-byte-length-1.0.0.tgz#d787a24a995711611fb2b87a4052799517b230d0"
+  integrity sha512-Or/+kvLxNpeQ9DtSydonMxCx+9ZXOswtwJn17SNLvhptaXYDJvkFFP5zbfU/uLmvnBJlI4yrnXRxpdWH/M5tNA==
+  dependencies:
+    call-bind "^1.0.2"
+    for-each "^0.3.3"
+    has-proto "^1.0.1"
+    is-typed-array "^1.1.10"
+
+typed-array-byte-offset@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/typed-array-byte-offset/-/typed-array-byte-offset-1.0.0.tgz#cbbe89b51fdef9cd6aaf07ad4707340abbc4ea0b"
+  integrity sha512-RD97prjEt9EL8YgAgpOkf3O4IF9lhJFr9g0htQkm0rchFp/Vx7LW5Q8fSXXub7BXAODyUQohRMyOc3faCPd0hg==
+  dependencies:
+    available-typed-arrays "^1.0.5"
+    call-bind "^1.0.2"
+    for-each "^0.3.3"
+    has-proto "^1.0.1"
+    is-typed-array "^1.1.10"
+
 typed-array-length@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/typed-array-length/-/typed-array-length-1.0.4.tgz#89d83785e5c4098bec72e08b319651f0eac9c1bb"
@@ -21978,6 +22378,17 @@ which-module@^2.0.0:
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
   integrity sha512-B+enWhmw6cjfVC7kS8Pj9pCrKSc5txArRyaYGe088shv/FGWH+0Rjx/xPgtsWfsUtS27FkP697E4DDhgrgoc0Q==
 
+which-typed-array@^1.1.11, which-typed-array@^1.1.13:
+  version "1.1.13"
+  resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.13.tgz#870cd5be06ddb616f504e7b039c4c24898184d36"
+  integrity sha512-P5Nra0qjSncduVPEAr7xhoF5guty49ArDTwzJ/yNuPIbZppyRxFQsRCWrocxIY+CnMVG+qfbU2FmDKyvSGClow==
+  dependencies:
+    available-typed-arrays "^1.0.5"
+    call-bind "^1.0.4"
+    for-each "^0.3.3"
+    gopd "^1.0.1"
+    has-tostringtag "^1.0.0"
+
 which-typed-array@^1.1.9:
   version "1.1.9"
   resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.9.tgz#307cf898025848cf995e795e8423c7f337efbde6"