diff --git a/.eslintrc.json b/.eslintrc.json
index a94ea87704..4e6a169dae 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -27,9 +27,8 @@
       "extends": "plugin:svelte/recommended",
       "parser": "svelte-eslint-parser",
       "parserOptions": {
-        "parser": "@babel/eslint-parser",
+        "parser": "@typescript-eslint/parser",
         "ecmaVersion": 2019,
-        "sourceType": "module",
         "allowImportExportEverywhere": true
       }
     },
diff --git a/.github/workflows/readme-openapi.yml b/.github/workflows/readme-openapi.yml
new file mode 100644
index 0000000000..14e9887dd6
--- /dev/null
+++ b/.github/workflows/readme-openapi.yml
@@ -0,0 +1,28 @@
+name: ReadMe GitHub Action 🦉
+
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  rdme-openapi:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out repo
+        uses: actions/checkout@v3
+
+      - name: Use Node.js 20.x
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20.x
+          cache: yarn
+      - run: yarn --frozen-lockfile
+
+      - name: update specs
+        run: cd packages/server && yarn specs
+
+      - name: Run `openapi` command
+        uses: readmeio/rdme@v8
+        with:
+          rdme: openapi specs/openapi.yaml --key=${{ secrets.README_API_KEY }} --id=6728a74f5918b50036c61841
diff --git a/charts/budibase/templates/secrets.yaml b/charts/budibase/templates/secrets.yaml
index a44d2c0d9b..20701d4125 100644
--- a/charts/budibase/templates/secrets.yaml
+++ b/charts/budibase/templates/secrets.yaml
@@ -12,12 +12,12 @@ metadata:
 type: Opaque
 data:
   {{- if $existingSecret }}
-  internalApiKey: {{ index $existingSecret.data "internalApiKey" }}
-  jwtSecret: {{ index $existingSecret.data "jwtSecret" }}
-  objectStoreAccess: {{ index $existingSecret.data "objectStoreAccess" }}
-  objectStoreSecret: {{ index $existingSecret.data "objectStoreSecret" }}
-  bbEncryptionKey: {{ index $existingSecret.data "bbEncryptionKey" }}
-  apiEncryptionKey: {{ index $existingSecret.data "apiEncryptionKey" }}
+  internalApiKey: {{ index $existingSecret.data "internalApiKey" | quote }}
+  jwtSecret: {{ index $existingSecret.data "jwtSecret" | quote }}
+  objectStoreAccess: {{ index $existingSecret.data "objectStoreAccess" | quote }}
+  objectStoreSecret: {{ index $existingSecret.data "objectStoreSecret" | quote }}
+  bbEncryptionKey: {{ index $existingSecret.data "bbEncryptionKey" | quote }}
+  apiEncryptionKey: {{ index $existingSecret.data "apiEncryptionKey" | quote }}
   {{- else }}
   internalApiKey: {{ template "budibase.defaultsecret" .Values.globals.internalApiKey }}
   jwtSecret: {{ template "budibase.defaultsecret" .Values.globals.jwtSecret }}
diff --git a/lerna.json b/lerna.json
index a1006702cc..be6673e7ae 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,6 +1,6 @@
 {
   "$schema": "node_modules/lerna/schemas/lerna-schema.json",
-  "version": "3.2.11",
+  "version": "3.2.14",
   "npmClient": "yarn",
   "concurrency": 20,
   "command": {
diff --git a/package.json b/package.json
index 860447fc57..e354f36d2a 100644
--- a/package.json
+++ b/package.json
@@ -25,11 +25,12 @@
     "prettier": "2.8.8",
     "prettier-plugin-svelte": "^2.3.0",
     "proper-lockfile": "^4.1.2",
-    "svelte": "^4.2.10",
+    "svelte": "4.2.19",
     "svelte-eslint-parser": "^0.33.1",
     "typescript": "5.5.2",
     "typescript-eslint": "^7.3.1",
-    "yargs": "^17.7.2"
+    "yargs": "^17.7.2",
+    "cross-spawn": "7.0.6"
   },
   "scripts": {
     "get-past-client-version": "node scripts/getPastClientVersion.js",
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index 8f91d1e55d..a4381b4200 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -40,7 +40,7 @@
     "bcryptjs": "2.4.3",
     "bull": "4.10.1",
     "correlation-id": "4.0.0",
-    "dd-trace": "5.23.0",
+    "dd-trace": "5.26.0",
     "dotenv": "16.0.1",
     "google-auth-library": "^8.0.1",
     "google-spreadsheet": "npm:@budibase/google-spreadsheet@4.1.5",
diff --git a/packages/backend-core/src/db/couch/DatabaseImpl.ts b/packages/backend-core/src/db/couch/DatabaseImpl.ts
index 83b9b69d0b..371f3dc997 100644
--- a/packages/backend-core/src/db/couch/DatabaseImpl.ts
+++ b/packages/backend-core/src/db/couch/DatabaseImpl.ts
@@ -190,7 +190,7 @@ export class DatabaseImpl implements Database {
     }
   }
 
-  private async performCall<T>(call: DBCallback<T>): Promise<any> {
+  private async performCall<T>(call: DBCallback<T>): Promise<T> {
     const db = this.getDb()
     const fnc = await call(db)
     try {
@@ -467,7 +467,7 @@ export class DatabaseImpl implements Database {
     } catch (err: any) {
       // didn't exist, don't worry
       if (err.statusCode === 404) {
-        return
+        return { ok: true }
       } else {
         throw new CouchDBError(err.message, err)
       }
diff --git a/packages/backend-core/src/db/instrumentation.ts b/packages/backend-core/src/db/instrumentation.ts
index e08bfc0362..0c0056d6ed 100644
--- a/packages/backend-core/src/db/instrumentation.ts
+++ b/packages/backend-core/src/db/instrumentation.ts
@@ -27,7 +27,7 @@ export class DDInstrumentedDatabase implements Database {
 
   exists(docId?: string): Promise<boolean> {
     return tracer.trace("db.exists", span => {
-      span?.addTags({ db_name: this.name, doc_id: docId })
+      span.addTags({ db_name: this.name, doc_id: docId })
       if (docId) {
         return this.db.exists(docId)
       }
@@ -37,15 +37,17 @@ export class DDInstrumentedDatabase implements Database {
 
   get<T extends Document>(id?: string | undefined): Promise<T> {
     return tracer.trace("db.get", span => {
-      span?.addTags({ db_name: this.name, doc_id: id })
+      span.addTags({ db_name: this.name, doc_id: id })
       return this.db.get(id)
     })
   }
 
   tryGet<T extends Document>(id?: string | undefined): Promise<T | undefined> {
-    return tracer.trace("db.tryGet", span => {
-      span?.addTags({ db_name: this.name, doc_id: id })
-      return this.db.tryGet(id)
+    return tracer.trace("db.tryGet", async span => {
+      span.addTags({ db_name: this.name, doc_id: id })
+      const doc = await this.db.tryGet<T>(id)
+      span.addTags({ doc_found: doc !== undefined })
+      return doc
     })
   }
 
@@ -53,13 +55,15 @@ export class DDInstrumentedDatabase implements Database {
     ids: string[],
     opts?: { allowMissing?: boolean | undefined } | undefined
   ): Promise<T[]> {
-    return tracer.trace("db.getMultiple", span => {
-      span?.addTags({
+    return tracer.trace("db.getMultiple", async span => {
+      span.addTags({
         db_name: this.name,
         num_docs: ids.length,
         allow_missing: opts?.allowMissing,
       })
-      return this.db.getMultiple(ids, opts)
+      const docs = await this.db.getMultiple<T>(ids, opts)
+      span.addTags({ num_docs_found: docs.length })
+      return docs
     })
   }
 
@@ -69,12 +73,14 @@ export class DDInstrumentedDatabase implements Database {
     idOrDoc: string | Document,
     rev?: string
   ): Promise<DocumentDestroyResponse> {
-    return tracer.trace("db.remove", span => {
-      span?.addTags({ db_name: this.name, doc_id: idOrDoc })
+    return tracer.trace("db.remove", async span => {
+      span.addTags({ db_name: this.name, doc_id: idOrDoc, rev })
       const isDocument = typeof idOrDoc === "object"
       const id = isDocument ? idOrDoc._id! : idOrDoc
       rev = isDocument ? idOrDoc._rev : rev
-      return this.db.remove(id, rev)
+      const resp = await this.db.remove(id, rev)
+      span.addTags({ ok: resp.ok })
+      return resp
     })
   }
 
@@ -83,7 +89,11 @@ export class DDInstrumentedDatabase implements Database {
     opts?: { silenceErrors?: boolean }
   ): Promise<void> {
     return tracer.trace("db.bulkRemove", span => {
-      span?.addTags({ db_name: this.name, num_docs: documents.length })
+      span.addTags({
+        db_name: this.name,
+        num_docs: documents.length,
+        silence_errors: opts?.silenceErrors,
+      })
       return this.db.bulkRemove(documents, opts)
     })
   }
@@ -92,15 +102,21 @@ export class DDInstrumentedDatabase implements Database {
     document: AnyDocument,
     opts?: DatabasePutOpts | undefined
   ): Promise<DocumentInsertResponse> {
-    return tracer.trace("db.put", span => {
-      span?.addTags({ db_name: this.name, doc_id: document._id })
-      return this.db.put(document, opts)
+    return tracer.trace("db.put", async span => {
+      span.addTags({
+        db_name: this.name,
+        doc_id: document._id,
+        force: opts?.force,
+      })
+      const resp = await this.db.put(document, opts)
+      span.addTags({ ok: resp.ok })
+      return resp
     })
   }
 
   bulkDocs(documents: AnyDocument[]): Promise<DocumentBulkResponse[]> {
     return tracer.trace("db.bulkDocs", span => {
-      span?.addTags({ db_name: this.name, num_docs: documents.length })
+      span.addTags({ db_name: this.name, num_docs: documents.length })
       return this.db.bulkDocs(documents)
     })
   }
@@ -108,9 +124,15 @@ export class DDInstrumentedDatabase implements Database {
   allDocs<T extends Document | RowValue>(
     params: DatabaseQueryOpts
   ): Promise<AllDocsResponse<T>> {
-    return tracer.trace("db.allDocs", span => {
-      span?.addTags({ db_name: this.name })
-      return this.db.allDocs(params)
+    return tracer.trace("db.allDocs", async span => {
+      span.addTags({ db_name: this.name, ...params })
+      const resp = await this.db.allDocs<T>(params)
+      span.addTags({
+        total_rows: resp.total_rows,
+        rows_length: resp.rows.length,
+        offset: resp.offset,
+      })
+      return resp
     })
   }
 
@@ -118,57 +140,75 @@ export class DDInstrumentedDatabase implements Database {
     viewName: string,
     params: DatabaseQueryOpts
   ): Promise<AllDocsResponse<T>> {
-    return tracer.trace("db.query", span => {
-      span?.addTags({ db_name: this.name, view_name: viewName })
-      return this.db.query(viewName, params)
+    return tracer.trace("db.query", async span => {
+      span.addTags({ db_name: this.name, view_name: viewName, ...params })
+      const resp = await this.db.query<T>(viewName, params)
+      span.addTags({
+        total_rows: resp.total_rows,
+        rows_length: resp.rows.length,
+        offset: resp.offset,
+      })
+      return resp
     })
   }
 
-  destroy(): Promise<void | OkResponse> {
-    return tracer.trace("db.destroy", span => {
-      span?.addTags({ db_name: this.name })
-      return this.db.destroy()
+  destroy(): Promise<OkResponse> {
+    return tracer.trace("db.destroy", async span => {
+      span.addTags({ db_name: this.name })
+      const resp = await this.db.destroy()
+      span.addTags({ ok: resp.ok })
+      return resp
     })
   }
 
-  compact(): Promise<void | OkResponse> {
-    return tracer.trace("db.compact", span => {
-      span?.addTags({ db_name: this.name })
-      return this.db.compact()
+  compact(): Promise<OkResponse> {
+    return tracer.trace("db.compact", async span => {
+      span.addTags({ db_name: this.name })
+      const resp = await this.db.compact()
+      span.addTags({ ok: resp.ok })
+      return resp
     })
   }
 
   dump(stream: Writable, opts?: DatabaseDumpOpts | undefined): Promise<any> {
     return tracer.trace("db.dump", span => {
-      span?.addTags({ db_name: this.name })
+      span.addTags({
+        db_name: this.name,
+        batch_limit: opts?.batch_limit,
+        batch_size: opts?.batch_size,
+        style: opts?.style,
+        timeout: opts?.timeout,
+        num_doc_ids: opts?.doc_ids?.length,
+        view: opts?.view,
+      })
       return this.db.dump(stream, opts)
     })
   }
 
   load(...args: any[]): Promise<any> {
     return tracer.trace("db.load", span => {
-      span?.addTags({ db_name: this.name })
+      span.addTags({ db_name: this.name, num_args: args.length })
       return this.db.load(...args)
     })
   }
 
   createIndex(...args: any[]): Promise<any> {
     return tracer.trace("db.createIndex", span => {
-      span?.addTags({ db_name: this.name })
+      span.addTags({ db_name: this.name, num_args: args.length })
       return this.db.createIndex(...args)
     })
   }
 
   deleteIndex(...args: any[]): Promise<any> {
     return tracer.trace("db.deleteIndex", span => {
-      span?.addTags({ db_name: this.name })
+      span.addTags({ db_name: this.name, num_args: args.length })
       return this.db.deleteIndex(...args)
     })
   }
 
   getIndexes(...args: any[]): Promise<any> {
     return tracer.trace("db.getIndexes", span => {
-      span?.addTags({ db_name: this.name })
+      span.addTags({ db_name: this.name, num_args: args.length })
       return this.db.getIndexes(...args)
     })
   }
@@ -177,22 +217,27 @@ export class DDInstrumentedDatabase implements Database {
     sql: string,
     parameters?: SqlQueryBinding
   ): Promise<T[]> {
-    return tracer.trace("db.sql", span => {
-      span?.addTags({ db_name: this.name })
-      return this.db.sql(sql, parameters)
+    return tracer.trace("db.sql", async span => {
+      span.addTags({ db_name: this.name, num_bindings: parameters?.length })
+      const resp = await this.db.sql<T>(sql, parameters)
+      span.addTags({ num_rows: resp.length })
+      return resp
     })
   }
 
   sqlPurgeDocument(docIds: string[] | string): Promise<void> {
     return tracer.trace("db.sqlPurgeDocument", span => {
-      span?.addTags({ db_name: this.name })
+      span.addTags({
+        db_name: this.name,
+        num_docs: Array.isArray(docIds) ? docIds.length : 1,
+      })
       return this.db.sqlPurgeDocument(docIds)
     })
   }
 
   sqlDiskCleanup(): Promise<void> {
     return tracer.trace("db.sqlDiskCleanup", span => {
-      span?.addTags({ db_name: this.name })
+      span.addTags({ db_name: this.name })
       return this.db.sqlDiskCleanup()
     })
   }
diff --git a/packages/backend-core/tests/core/utilities/structures/licenses.ts b/packages/backend-core/tests/core/utilities/structures/licenses.ts
index b4d209a7ee..77f6d57b09 100644
--- a/packages/backend-core/tests/core/utilities/structures/licenses.ts
+++ b/packages/backend-core/tests/core/utilities/structures/licenses.ts
@@ -22,7 +22,6 @@ export function price(): PurchasedPrice {
     currency: "usd",
     duration: PriceDuration.MONTHLY,
     priceId: "price_123",
-    dayPasses: undefined,
     isPerUser: true,
   }
 }
@@ -50,11 +49,6 @@ export function quotas(): Quotas {
           value: 1,
           triggers: [],
         },
-        dayPasses: {
-          name: "Queries",
-          value: 1,
-          triggers: [],
-        },
         budibaseAICredits: {
           name: "Budibase AI Credits",
           value: 1,
diff --git a/packages/backend-core/tests/core/utilities/structures/quotas.ts b/packages/backend-core/tests/core/utilities/structures/quotas.ts
index 58817e4831..83c3a8a766 100644
--- a/packages/backend-core/tests/core/utilities/structures/quotas.ts
+++ b/packages/backend-core/tests/core/utilities/structures/quotas.ts
@@ -15,7 +15,6 @@ export const usage = (users: number = 0, creators: number = 0): QuotaUsage => {
     monthly: {
       "01-2023": {
         automations: 0,
-        dayPasses: 0,
         queries: 0,
         budibaseAICredits: 0,
         triggers: {},
@@ -45,14 +44,12 @@ export const usage = (users: number = 0, creators: number = 0): QuotaUsage => {
       },
       "02-2023": {
         automations: 0,
-        dayPasses: 0,
         queries: 0,
         budibaseAICredits: 0,
         triggers: {},
       },
       current: {
         automations: 0,
-        dayPasses: 0,
         queries: 0,
         budibaseAICredits: 0,
         triggers: {},
diff --git a/packages/bbui/src/Button/Button.svelte b/packages/bbui/src/Button/Button.svelte
index 0a8917c3c1..77653d0c42 100644
--- a/packages/bbui/src/Button/Button.svelte
+++ b/packages/bbui/src/Button/Button.svelte
@@ -3,7 +3,7 @@
   import AbsTooltip from "../Tooltip/AbsTooltip.svelte"
   import { createEventDispatcher } from "svelte"
 
-  export let type
+  export let type = undefined
   export let disabled = false
   export let size = "M"
   export let cta = false
@@ -16,8 +16,8 @@
   export let active = false
   export let tooltip = undefined
   export let newStyles = true
-  export let id
-  export let ref
+  export let id = undefined
+  export let ref = undefined
   export let reverse = false
 
   const dispatch = createEventDispatcher()
diff --git a/packages/bbui/src/Form/Core/DateRangePicker.svelte b/packages/bbui/src/Form/Core/DateRangePicker.svelte
index 9084942ba7..72180a98d6 100644
--- a/packages/bbui/src/Form/Core/DateRangePicker.svelte
+++ b/packages/bbui/src/Form/Core/DateRangePicker.svelte
@@ -2,13 +2,6 @@
   import CoreDatePicker from "./DatePicker/DatePicker.svelte"
   import Icon from "../../Icon/Icon.svelte"
 
-  export let value = null
-  export let disabled = false
-  export let readonly = false
-  export let error = null
-  export let appendTo = undefined
-  export let ignoreTimezones = false
-
   let fromDate
   let toDate
 </script>
diff --git a/packages/bbui/src/Form/Search.svelte b/packages/bbui/src/Form/Search.svelte
index 2fbda275eb..a085986d3e 100644
--- a/packages/bbui/src/Form/Search.svelte
+++ b/packages/bbui/src/Form/Search.svelte
@@ -10,7 +10,7 @@
   export let disabled = false
   export let updateOnChange = true
   export let quiet = false
-  export let inputRef
+  export let inputRef = undefined
   export let helpText = null
 
   const dispatch = createEventDispatcher()
diff --git a/packages/bbui/src/Form/Select.svelte b/packages/bbui/src/Form/Select.svelte
index 260090c7b7..0e67a1f532 100644
--- a/packages/bbui/src/Form/Select.svelte
+++ b/packages/bbui/src/Form/Select.svelte
@@ -17,18 +17,18 @@
   export let getOptionIcon = option => option?.icon
   export let getOptionColour = option => option?.colour
   export let useOptionIconImage = false
-  export let isOptionEnabled
+  export let isOptionEnabled = undefined
   export let quiet = false
   export let autoWidth = false
   export let sort = false
   export let tooltip = ""
   export let autocomplete = false
-  export let customPopoverHeight
-  export let align
+  export let customPopoverHeight = undefined
+  export let align = undefined
   export let footer = null
   export let tag = null
   export let helpText = null
-  export let compare
+  export let compare = undefined
   export let onOptionMouseenter = () => {}
   export let onOptionMouseleave = () => {}
 
diff --git a/packages/bbui/src/Table/Table.svelte b/packages/bbui/src/Table/Table.svelte
index 3916bec738..228838e477 100644
--- a/packages/bbui/src/Table/Table.svelte
+++ b/packages/bbui/src/Table/Table.svelte
@@ -43,7 +43,7 @@
   export let showHeaderBorder = true
   export let placeholderText = "No rows found"
   export let snippets = []
-  export let defaultSortColumn
+  export let defaultSortColumn = undefined
   export let defaultSortOrder = "Ascending"
 
   const dispatch = createEventDispatcher()
diff --git a/packages/bbui/src/Typography/Heading.svelte b/packages/bbui/src/Typography/Heading.svelte
index 50522fffc3..90d53fb208 100644
--- a/packages/bbui/src/Typography/Heading.svelte
+++ b/packages/bbui/src/Typography/Heading.svelte
@@ -1,9 +1,9 @@
-<script>
+<script lang="ts">
   import "@spectrum-css/typography/dist/index-vars.css"
 
   // Sizes
   export let size = "M"
-  export let textAlign
+  export let textAlign = undefined
   export let noPadding = false
   export let weight = "default" // light, heavy, default
 </script>
diff --git a/packages/builder/.gitignore b/packages/builder/.gitignore
index abc5671984..41411ea16c 100644
--- a/packages/builder/.gitignore
+++ b/packages/builder/.gitignore
@@ -6,4 +6,4 @@ release/
 dist/
 routify
 .routify/
-svelte.config.js
\ No newline at end of file
+.rollup.cache
\ No newline at end of file
diff --git a/packages/builder/package.json b/packages/builder/package.json
index 46e454f5b9..c98e817486 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -4,13 +4,14 @@
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
-    "build": "routify -b && vite build --emptyOutDir",
+    "build": "routify -b && NODE_OPTIONS=\"--max_old_space_size=4096\" vite build --emptyOutDir",
     "start": "routify -c rollup",
     "dev": "routify -c dev:vite",
     "dev:vite": "vite --host 0.0.0.0",
     "rollup": "rollup -c -w",
     "test": "vitest run",
-    "test:watch": "vitest"
+    "test:watch": "vitest",
+    "check:types": "yarn svelte-check"
   },
   "jest": {
     "globals": {
@@ -88,6 +89,7 @@
     "@babel/plugin-transform-runtime": "^7.13.10",
     "@babel/preset-env": "^7.13.12",
     "@rollup/plugin-replace": "^5.0.3",
+    "@rollup/plugin-typescript": "8.3.0",
     "@roxi/routify": "2.18.12",
     "@sveltejs/vite-plugin-svelte": "1.4.0",
     "@testing-library/jest-dom": "6.4.2",
@@ -97,6 +99,7 @@
     "jest": "29.7.0",
     "jsdom": "^21.1.1",
     "resize-observer-polyfill": "^1.5.1",
+    "svelte-check": "^4.1.0",
     "svelte-jester": "^1.3.2",
     "vite": "^4.5.0",
     "vite-plugin-static-copy": "^0.17.0",
diff --git a/packages/builder/src/api.js b/packages/builder/src/api.ts
similarity index 87%
rename from packages/builder/src/api.js
rename to packages/builder/src/api.ts
index 6441b4ff48..5d1a0beaeb 100644
--- a/packages/builder/src/api.js
+++ b/packages/builder/src/api.ts
@@ -8,7 +8,7 @@ import { get } from "svelte/store"
 import { auth, navigation } from "./stores/portal"
 
 export const API = createAPIClient({
-  attachHeaders: headers => {
+  attachHeaders: (headers: Record<string, string>) => {
     // Attach app ID header from store
     let appId = get(appStore).appId
     if (appId) {
@@ -16,13 +16,13 @@ export const API = createAPIClient({
     }
 
     // Add csrf token if authenticated
-    const user = get(auth).user
+    const user: any = get(auth).user
     if (user?.csrfToken) {
       headers["x-csrf-token"] = user.csrfToken
     }
   },
 
-  onError: error => {
+  onError: (error: any) => {
     const { url, message, status, method, handled } = error || {}
 
     // Log any errors that we haven't manually handled
@@ -45,14 +45,14 @@ export const API = createAPIClient({
       }
     }
   },
-  onMigrationDetected: appId => {
+  onMigrationDetected: (appId: string) => {
     const updatingUrl = `/builder/app/updating/${appId}`
 
     if (window.location.pathname === updatingUrl) {
       return
     }
 
-    get(navigation).goto(
+    get(navigation)?.goto(
       `${updatingUrl}?returnUrl=${encodeURIComponent(window.location.pathname)}`
     )
   },
diff --git a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte
index b16533c2ca..b901d21a6d 100644
--- a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte
+++ b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte
@@ -114,7 +114,7 @@
   $: schemaFields = search.getFields(
     $tables.list,
     Object.values(schema || {}),
-    { allowLinks: true }
+    { allowLinks: false }
   )
   $: queryLimit = tableId?.includes("datasource") ? "∞" : "1000"
   $: isTrigger = $memoBlock?.type === AutomationStepType.TRIGGER
diff --git a/packages/builder/src/components/portal/licensing/DayPassWarningModal.svelte b/packages/builder/src/components/portal/licensing/DayPassWarningModal.svelte
deleted file mode 100644
index 341e427bf0..0000000000
--- a/packages/builder/src/components/portal/licensing/DayPassWarningModal.svelte
+++ /dev/null
@@ -1,81 +0,0 @@
-<script>
-  import { Modal, ModalContent, Body, TooltipWrapper } from "@budibase/bbui"
-  import { licensing, auth, admin } from "stores/portal"
-
-  export let onDismiss = () => {}
-  export let onShow = () => {}
-
-  let dayPassModal
-
-  $: accountUrl = $admin.accountPortalUrl
-  $: upgradeUrl = `${accountUrl}/portal/upgrade`
-
-  $: daysRemaining = $licensing.quotaResetDaysRemaining
-  $: quotaResetDate = $licensing.quotaResetDate
-  $: dayPassesUsed =
-    $licensing.usageMetrics?.dayPasses > 100
-      ? 100
-      : $licensing.usageMetrics?.dayPasses
-  $: dayPassesTitle =
-    dayPassesUsed >= 100
-      ? "You have run out of Day Passes"
-      : "You are almost out of Day Passes"
-  $: dayPassesBody =
-    dayPassesUsed >= 100
-      ? "Upgrade your account to bring your apps back online."
-      : "Upgrade your account to prevent your apps from going offline."
-
-  export function show() {
-    dayPassModal.show()
-  }
-
-  export function hide() {
-    dayPassModal.hide()
-  }
-</script>
-
-<Modal bind:this={dayPassModal} on:show={onShow} on:hide={onDismiss}>
-  {#if $auth.user.accountPortalAccess}
-    <ModalContent
-      title={dayPassesTitle}
-      size="M"
-      confirmText="Upgrade"
-      onConfirm={() => {
-        window.location.href = upgradeUrl
-      }}
-    >
-      <Body>
-        You have used <span class="daypass_percent">{dayPassesUsed}%</span> of
-        your plans Day Passes with {daysRemaining} day{daysRemaining == 1
-          ? ""
-          : "s"} remaining.
-        <span class="tooltip">
-          <TooltipWrapper tooltip={quotaResetDate} size="S" />
-        </span>
-      </Body>
-      <Body>{dayPassesBody}</Body>
-    </ModalContent>
-  {:else}
-    <ModalContent title={dayPassesTitle} size="M" showCancelButton={false}>
-      <Body>
-        You have used <span class="daypass_percent">{dayPassesUsed}%</span> of
-        your plans Day Passes with {daysRemaining} day{daysRemaining == 1
-          ? ""
-          : "s"} remaining.
-        <span class="tooltip">
-          <TooltipWrapper tooltip={quotaResetDate} size="S" />
-        </span>
-      </Body>
-      <Body>Please contact your account holder to upgrade.</Body>
-    </ModalContent>
-  {/if}
-</Modal>
-
-<style>
-  .tooltip {
-    display: inline-block;
-  }
-  .tooltip :global(.icon-container) {
-    margin: 0px;
-  }
-</style>
diff --git a/packages/builder/src/components/portal/licensing/LicensingOverlays.svelte b/packages/builder/src/components/portal/licensing/LicensingOverlays.svelte
index ab80418b6e..e2c52e3448 100644
--- a/packages/builder/src/components/portal/licensing/LicensingOverlays.svelte
+++ b/packages/builder/src/components/portal/licensing/LicensingOverlays.svelte
@@ -1,7 +1,6 @@
 <script>
   import { licensing, auth, temporalStore } from "stores/portal"
   import { onMount } from "svelte"
-  import DayPassWarningModal from "./DayPassWarningModal.svelte"
   import PaymentFailedModal from "./PaymentFailedModal.svelte"
   import AccountDowngradedModal from "./AccountDowngradedModal.svelte"
   import { ExpiringKeys } from "./constants"
@@ -12,7 +11,6 @@
 
   let queuedBanners = []
   let queuedModals = []
-  let dayPassModal
   let paymentFailedModal
   let accountDowngradeModal
   let userLoaded = false
@@ -26,18 +24,6 @@
     }
 
     const dismissableModals = [
-      {
-        key: ExpiringKeys.LICENSING_DAYPASS_WARNING_MODAL,
-        criteria: () => {
-          return $licensing?.usageMetrics?.dayPasses >= 90
-        },
-        action: () => {
-          dayPassModal.show()
-        },
-        cache: () => {
-          defaultCacheFn(ExpiringKeys.LICENSING_DAYPASS_WARNING_MODAL)
-        },
-      },
       {
         key: ExpiringKeys.LICENSING_PAYMENT_FAILED,
         criteria: () => {
@@ -102,7 +88,6 @@
   })
 </script>
 
-<DayPassWarningModal bind:this={dayPassModal} onDismiss={showNextModal} />
 <PaymentFailedModal bind:this={paymentFailedModal} onDismiss={showNextModal} />
 <AccountDowngradedModal
   bind:this={accountDowngradeModal}
diff --git a/packages/builder/src/components/portal/licensing/constants.js b/packages/builder/src/components/portal/licensing/constants.js
index de240adbbe..6e4463adb9 100644
--- a/packages/builder/src/components/portal/licensing/constants.js
+++ b/packages/builder/src/components/portal/licensing/constants.js
@@ -1,6 +1,4 @@
 export const ExpiringKeys = {
-  LICENSING_DAYPASS_WARNING_MODAL: "licensing_daypass_warning_90_modal",
-  LICENSING_DAYPASS_WARNING_BANNER: "licensing_daypass_warning_90_banner",
   LICENSING_PAYMENT_FAILED: "licensing_payment_failed",
   LICENSING_ACCOUNT_DOWNGRADED_MODAL: "licensing_account_downgraded_modal",
   LICENSING_APP_LIMIT_MODAL: "licensing_app_limit_modal",
diff --git a/packages/builder/src/components/portal/licensing/licensingBanners.js b/packages/builder/src/components/portal/licensing/licensingBanners.js
index 34b22c934b..a9f3d21ffc 100644
--- a/packages/builder/src/components/portal/licensing/licensingBanners.js
+++ b/packages/builder/src/components/portal/licensing/licensingBanners.js
@@ -84,45 +84,6 @@ const buildUsageInfoBanner = (
       }
 }
 
-const buildDayPassBanner = () => {
-  const appAuth = get(auth)
-  const appLicensing = get(licensing)
-  if (get(licensing)?.usageMetrics["dayPasses"] >= 100) {
-    return {
-      key: "max_dayPasses",
-      type: BANNER_TYPES.NEGATIVE,
-      criteria: () => {
-        return true
-      },
-      message: `Your apps are currently offline. You have exceeded your plans limit for Day Passes. ${
-        appAuth.user.accountPortalAccess
-          ? ""
-          : "Please contact your account holder to upgrade."
-      }`,
-      ...upgradeAction(),
-      showCloseButton: false,
-    }
-  }
-
-  return buildUsageInfoBanner(
-    "dayPasses",
-    "Day Passes",
-    ExpiringKeys.LICENSING_DAYPASS_WARNING_BANNER,
-    90,
-    `You have used ${
-      appLicensing?.usageMetrics["dayPasses"]
-    }% of your monthly usage of Day Passes with ${
-      appLicensing?.quotaResetDaysRemaining
-    } day${
-      get(licensing).quotaResetDaysRemaining == 1 ? "" : "s"
-    } remaining. All apps will be taken offline if this limit is reached. ${
-      appAuth.user.accountPortalAccess
-        ? ""
-        : "Please contact your account holder to upgrade."
-    }`
-  )
-}
-
 const buildPaymentFailedBanner = () => {
   return {
     key: "payment_Failed",
@@ -166,7 +127,6 @@ const buildUsersAboveLimitBanner = EXPIRY_KEY => {
 export const getBanners = () => {
   return [
     buildPaymentFailedBanner(),
-    buildDayPassBanner(ExpiringKeys.LICENSING_DAYPASS_WARNING_BANNER),
     buildUsageInfoBanner(
       "rows",
       "Rows",
diff --git a/packages/builder/src/constants/index.js b/packages/builder/src/constants/index.js
index 0d51f57c3e..3498183c8e 100644
--- a/packages/builder/src/constants/index.js
+++ b/packages/builder/src/constants/index.js
@@ -68,7 +68,6 @@ export const OnboardingType = {
 
 export const PlanModel = {
   PER_USER: "perUser",
-  DAY_PASS: "dayPass",
 }
 
 export const ChangelogURL = "https://docs.budibase.com/changelog"
diff --git a/packages/builder/src/dataBinding.js b/packages/builder/src/dataBinding.js
index 8adc27ee59..c89221f163 100644
--- a/packages/builder/src/dataBinding.js
+++ b/packages/builder/src/dataBinding.js
@@ -1141,10 +1141,11 @@ export const buildFormSchema = (component, asset) => {
   const fieldSetting = settings.find(
     setting => setting.key === "field" && setting.type.startsWith("field/")
   )
-  if (fieldSetting && component.field) {
+  if (fieldSetting) {
     const type = fieldSetting.type.split("field/")[1]
-    if (type) {
-      schema[component.field] = { type }
+    const key = component.field || component._instanceName
+    if (type && key) {
+      schema[key] = { type }
     }
   }
   component._children?.forEach(child => {
diff --git a/packages/builder/src/index.d.ts b/packages/builder/src/index.d.ts
new file mode 100644
index 0000000000..1cbad4f12c
--- /dev/null
+++ b/packages/builder/src/index.d.ts
@@ -0,0 +1,8 @@
+declare module "api" {
+  const API: {
+    getPlugins: () => Promise<any>
+    createPlugin: (plugin: object) => Promise<any>
+    uploadPlugin: (plugin: FormData) => Promise<any>
+    deletePlugin: (id: string) => Promise<void>
+  }
+}
diff --git a/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/index.svelte b/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/index.svelte
index b723788695..3757ed7dee 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/index.svelte
@@ -117,7 +117,4 @@
     align-items: center;
     margin-bottom: 12px;
   }
-
-  .tabs {
-  }
 </style>
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ComponentList/DNDPositionIndicator.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ComponentList/DNDPositionIndicator.svelte
index 4612440a2c..45185d8e2d 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ComponentList/DNDPositionIndicator.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ComponentList/DNDPositionIndicator.svelte
@@ -50,8 +50,6 @@
     border-radius: 4px;
     pointer-events: none;
   }
-  .indicator.above {
-  }
   .indicator.below {
     margin-top: 32px;
   }
diff --git a/packages/builder/src/pages/builder/apps/index.svelte b/packages/builder/src/pages/builder/apps/index.svelte
index 095bf2023b..632478748d 100644
--- a/packages/builder/src/pages/builder/apps/index.svelte
+++ b/packages/builder/src/pages/builder/apps/index.svelte
@@ -136,7 +136,7 @@
             </Body>
           </Layout>
           <Divider />
-          {#if $licensing.usageMetrics?.dayPasses >= 100 || $licensing.errUserLimit}
+          {#if $licensing.errUserLimit}
             <div>
               <Layout gap="S" justifyItems="center">
                 <img class="spaceman" alt="spaceman" src={Spaceman} />
diff --git a/packages/builder/src/pages/builder/portal/account/usage.svelte b/packages/builder/src/pages/builder/portal/account/usage.svelte
index 7a1b1f8e14..cb0f5ea512 100644
--- a/packages/builder/src/pages/builder/portal/account/usage.svelte
+++ b/packages/builder/src/pages/builder/portal/account/usage.svelte
@@ -28,7 +28,7 @@
   const upgradeUrl = `${$admin.accountPortalUrl}/portal/upgrade`
   const manageUrl = `${$admin.accountPortalUrl}/portal/billing`
 
-  const WARN_USAGE = ["Queries", "Automations", "Rows", "Day Passes", "Users"]
+  const WARN_USAGE = ["Queries", "Automations", "Rows", "Users"]
   const oneDayInSeconds = 86400
 
   const EXCLUDE_QUOTAS = {
@@ -36,9 +36,6 @@
     Users: license => {
       return license.plan.model !== PlanModel.PER_USER
     },
-    "Day Passes": license => {
-      return license.plan.model !== PlanModel.DAY_PASS
-    },
   }
 
   function excludeQuota(name) {
diff --git a/packages/builder/src/pages/builder/portal/plugins/index.svelte b/packages/builder/src/pages/builder/portal/plugins/index.svelte
index d8dd4eae11..e16da42e10 100644
--- a/packages/builder/src/pages/builder/portal/plugins/index.svelte
+++ b/packages/builder/src/pages/builder/portal/plugins/index.svelte
@@ -1,4 +1,4 @@
-<script>
+<script lang="ts">
   import {
     Layout,
     Heading,
@@ -42,23 +42,25 @@
     { column: "edit", component: EditPluginRenderer },
   ]
 
-  let modal
-  let searchTerm = ""
-  let filter = "all"
+  let modal: any
+  let searchTerm: any = ""
+  let filter: any = "all"
   let filterOptions = [
     { label: "All plugins", value: "all" },
     { label: "Components", value: "component" },
   ]
 
+  const searchPlaceholder: any = "Search"
+
   if (!$admin.cloud) {
     filterOptions.push({ label: "Datasources", value: "datasource" })
   }
 
   $: filteredPlugins = $plugins
-    .filter(plugin => {
+    .filter((plugin: any) => {
       return filter === "all" || plugin.schema.type === filter
     })
-    .filter(plugin => {
+    .filter((plugin: any) => {
       return (
         !searchTerm ||
         plugin?.name?.toLowerCase().includes(searchTerm.toLowerCase())
@@ -85,8 +87,8 @@
           <Button
             on:click={() =>
               window
-                .open("https://github.com/Budibase/plugins", "_blank")
-                .focus()}
+                ?.open("https://github.com/Budibase/plugins", "_blank")
+                ?.focus()}
             secondary
           >
             GitHub repo
@@ -98,12 +100,12 @@
           <div class="select">
             <Select
               bind:value={filter}
-              placeholder={null}
+              placeholder={undefined}
               options={filterOptions}
               autoWidth
             />
           </div>
-          <Search bind:value={searchTerm} placeholder="Search" />
+          <Search bind:value={searchTerm} placeholder={searchPlaceholder} />
         </div>
       {/if}
     </div>
diff --git a/packages/builder/src/stores/builder/automations.js b/packages/builder/src/stores/builder/automations.js
index 8f54f85ef5..b7d55ee2d4 100644
--- a/packages/builder/src/stores/builder/automations.js
+++ b/packages/builder/src/stores/builder/automations.js
@@ -16,6 +16,7 @@ import {
   AutomationTriggerStepId,
   AutomationEventType,
   AutomationStepType,
+  AutomationActionStepId,
 } from "@budibase/types"
 import { ActionStepID } from "constants/backend/automations"
 import { FIELDS } from "constants/backend"
@@ -466,9 +467,13 @@ const automationActions = store => ({
       .getPathSteps(block.pathTo, automation)
       .slice(0, -1)
 
+    // Current step will always be the last step of the path
+    const currentBlock = store.actions
+      .getPathSteps(block.pathTo, automation)
+      .at(-1)
+
     // Extract all outputs from all previous steps as available bindingsx§x
     let bindings = []
-
     const addBinding = (name, value, icon, idx, isLoopBlock, bindingName) => {
       if (!name) return
       const runtimeBinding = determineRuntimeBinding(
@@ -519,9 +524,24 @@ const automationActions = store => ({
         runtimeName = `loop.${name}`
       } else if (idx === 0) {
         runtimeName = `trigger.${name}`
+      } else if (
+        currentBlock?.stepId === AutomationActionStepId.EXECUTE_SCRIPT
+      ) {
+        const stepId = pathSteps[idx].id
+        if (!stepId) {
+          notifications.error("Error generating binding: Step ID not found.")
+          return null
+        }
+        runtimeName = `steps["${stepId}"].${name}`
       } else {
-        runtimeName = `steps.${pathSteps[idx]?.id}.${name}`
+        const stepId = pathSteps[idx].id
+        if (!stepId) {
+          notifications.error("Error generating binding: Step ID not found.")
+          return null
+        }
+        runtimeName = `steps.${stepId}.${name}`
       }
+
       return runtimeName
     }
 
@@ -637,7 +657,6 @@ const automationActions = store => ({
           console.error("Loop block missing.")
         }
       }
-
       Object.entries(schema).forEach(([name, value]) => {
         addBinding(name, value, icon, blockIdx, isLoopBlock, bindingName)
       })
diff --git a/packages/builder/src/stores/portal/navigation.js b/packages/builder/src/stores/portal/navigation.ts
similarity index 69%
rename from packages/builder/src/stores/portal/navigation.js
rename to packages/builder/src/stores/portal/navigation.ts
index 67a06eff53..2b230622f6 100644
--- a/packages/builder/src/stores/portal/navigation.js
+++ b/packages/builder/src/stores/portal/navigation.ts
@@ -1,13 +1,20 @@
 import { writable } from "svelte/store"
 
+type GotoFuncType = (path: string) => void
+
+interface Store {
+  initialisated: boolean
+  goto: GotoFuncType
+}
+
 export function createNavigationStore() {
-  const store = writable({
+  const store = writable<Store>({
     initialisated: false,
-    goto: undefined,
+    goto: undefined as any,
   })
   const { set, subscribe } = store
 
-  const init = gotoFunc => {
+  const init = (gotoFunc: GotoFuncType) => {
     if (typeof gotoFunc !== "function") {
       throw new Error(
         `gotoFunc must be a function, found a "${typeof gotoFunc}" instead`
diff --git a/packages/builder/src/stores/portal/plugins.js b/packages/builder/src/stores/portal/plugins.ts
similarity index 81%
rename from packages/builder/src/stores/portal/plugins.js
rename to packages/builder/src/stores/portal/plugins.ts
index e259f9aa6d..15110a852b 100644
--- a/packages/builder/src/stores/portal/plugins.js
+++ b/packages/builder/src/stores/portal/plugins.ts
@@ -1,16 +1,21 @@
 import { writable } from "svelte/store"
+import { PluginSource } from "constants/index"
+
 import { API } from "api"
-import { PluginSource } from "constants"
+
+interface Plugin {
+  _id: string
+}
 
 export function createPluginsStore() {
-  const { subscribe, set, update } = writable([])
+  const { subscribe, set, update } = writable<Plugin[]>([])
 
   async function load() {
     const plugins = await API.getPlugins()
     set(plugins)
   }
 
-  async function deletePlugin(pluginId) {
+  async function deletePlugin(pluginId: string) {
     await API.deletePlugin(pluginId)
     update(state => {
       state = state.filter(existing => existing._id !== pluginId)
@@ -18,8 +23,8 @@ export function createPluginsStore() {
     })
   }
 
-  async function createPlugin(source, url, auth = null) {
-    let pluginData = {
+  async function createPlugin(source: string, url: string, auth = null) {
+    let pluginData: any = {
       source,
       url,
     }
@@ -46,7 +51,7 @@ export function createPluginsStore() {
     })
   }
 
-  async function uploadPlugin(file) {
+  async function uploadPlugin(file: File) {
     if (!file) {
       return
     }
diff --git a/packages/builder/svelte.config.js b/packages/builder/svelte.config.js
new file mode 100644
index 0000000000..7d908c15d5
--- /dev/null
+++ b/packages/builder/svelte.config.js
@@ -0,0 +1,7 @@
+const { vitePreprocess } = require("@sveltejs/vite-plugin-svelte")
+
+const config = {
+  preprocess: vitePreprocess(),
+}
+
+module.exports = config
diff --git a/packages/builder/tsconfig.build.json b/packages/builder/tsconfig.build.json
index 6a5ba315a1..ca1316f83c 100644
--- a/packages/builder/tsconfig.build.json
+++ b/packages/builder/tsconfig.build.json
@@ -9,15 +9,9 @@
     "noImplicitAny": true,
     "esModuleInterop": true,
     "resolveJsonModule": true,
-    "incremental": true
+    "incremental": true,
+    "skipLibCheck": true
   },
-  "include": [
-    "./src/**/*"
-  ],
-  "exclude": [
-    "node_modules",
-    "**/*.json",
-    "**/*.spec.ts",
-    "**/*.spec.js"
-  ]
+  "include": ["./src/**/*"],
+  "exclude": ["node_modules", "**/*.json", "**/*.spec.ts", "**/*.spec.js"]
 }
diff --git a/packages/builder/vite.config.mjs b/packages/builder/vite.config.mjs
index f5ff388952..ccc5729d28 100644
--- a/packages/builder/vite.config.mjs
+++ b/packages/builder/vite.config.mjs
@@ -3,6 +3,7 @@ import replace from "@rollup/plugin-replace"
 import { defineConfig, loadEnv } from "vite"
 import { viteStaticCopy } from "vite-plugin-static-copy"
 import path from "path"
+import typescript from "@rollup/plugin-typescript"
 
 const ignoredWarnings = [
   "unused-export-let",
@@ -35,7 +36,7 @@ export default defineConfig(({ mode }) => {
     // Copy fonts to an additional path so that svelte's automatic
     // prefixing of the base URL path can still resolve assets
     copyFonts("builder/fonts"),
-]
+  ]
 
   return {
     test: {
@@ -61,6 +62,7 @@ export default defineConfig(({ mode }) => {
       sourcemap: !isProduction,
     },
     plugins: [
+      typescript({ outDir: "../server/builder/dist" }),
       svelte({
         hot: !isProduction,
         emitCss: true,
diff --git a/packages/client/manifest.json b/packages/client/manifest.json
index 393c08a282..6dd1b71b75 100644
--- a/packages/client/manifest.json
+++ b/packages/client/manifest.json
@@ -3096,7 +3096,6 @@
     "name": "Text Field",
     "icon": "Text",
     "styles": ["size"],
-    "requiredAncestors": ["form"],
     "editable": true,
     "size": {
       "width": 400,
@@ -3106,8 +3105,7 @@
       {
         "type": "field/string",
         "label": "Field",
-        "key": "field",
-        "required": true
+        "key": "field"
       },
       {
         "type": "text",
@@ -3226,13 +3224,22 @@
           }
         ]
       }
-    ]
+    ],
+    "context": {
+      "type": "static",
+      "values": [
+        {
+          "label": "Value",
+          "key": "value",
+          "type": "string"
+        }
+      ]
+    }
   },
   "numberfield": {
     "name": "Number Field",
     "icon": "123",
     "styles": ["size"],
-    "requiredAncestors": ["form"],
     "editable": true,
     "size": {
       "width": 400,
@@ -3242,8 +3249,7 @@
       {
         "type": "field/number",
         "label": "Field",
-        "key": "field",
-        "required": true
+        "key": "field"
       },
       {
         "type": "text",
@@ -3328,13 +3334,22 @@
           }
         ]
       }
-    ]
+    ],
+    "context": {
+      "type": "static",
+      "values": [
+        {
+          "label": "Value",
+          "key": "value",
+          "type": "number"
+        }
+      ]
+    }
   },
   "bigintfield": {
     "name": "BigInt Field",
     "icon": "TagBold",
     "styles": ["size"],
-    "requiredAncestors": ["form"],
     "editable": true,
     "size": {
       "width": 400,
@@ -3344,8 +3359,7 @@
       {
         "type": "field/bigint",
         "label": "Field",
-        "key": "field",
-        "required": true
+        "key": "field"
       },
       {
         "type": "text",
@@ -3414,13 +3428,22 @@
           }
         ]
       }
-    ]
+    ],
+    "context": {
+      "type": "static",
+      "values": [
+        {
+          "label": "Value",
+          "key": "value",
+          "type": "number"
+        }
+      ]
+    }
   },
   "passwordfield": {
     "name": "Password Field",
     "icon": "LockClosed",
     "styles": ["size"],
-    "requiredAncestors": ["form"],
     "editable": true,
     "size": {
       "width": 400,
@@ -3430,8 +3453,7 @@
       {
         "type": "field/string",
         "label": "Field",
-        "key": "field",
-        "required": true
+        "key": "field"
       },
       {
         "type": "text",
@@ -3500,13 +3522,22 @@
           }
         ]
       }
-    ]
+    ],
+    "context": {
+      "type": "static",
+      "values": [
+        {
+          "label": "Value",
+          "key": "value",
+          "type": "string"
+        }
+      ]
+    }
   },
   "optionsfield": {
     "name": "Options Picker",
     "icon": "Menu",
     "styles": ["size"],
-    "requiredAncestors": ["form"],
     "editable": true,
     "size": {
       "width": 400,
@@ -3516,8 +3547,7 @@
       {
         "type": "field/options",
         "label": "Field",
-        "key": "field",
-        "required": true
+        "key": "field"
       },
       {
         "type": "text",
@@ -3714,13 +3744,22 @@
           }
         ]
       }
-    ]
+    ],
+    "context": {
+      "type": "static",
+      "values": [
+        {
+          "label": "Value",
+          "key": "value",
+          "type": "string"
+        }
+      ]
+    }
   },
   "multifieldselect": {
     "name": "Multi-select Picker",
     "icon": "ViewList",
     "styles": ["size"],
-    "requiredAncestors": ["form"],
     "editable": true,
     "size": {
       "width": 400,
@@ -3730,8 +3769,7 @@
       {
         "type": "field/array",
         "label": "Field",
-        "key": "field",
-        "required": true
+        "key": "field"
       },
       {
         "type": "text",
@@ -3922,13 +3960,22 @@
           }
         ]
       }
-    ]
+    ],
+    "context": {
+      "type": "static",
+      "values": [
+        {
+          "label": "Value",
+          "key": "value",
+          "type": "array"
+        }
+      ]
+    }
   },
   "booleanfield": {
     "name": "Checkbox",
     "icon": "SelectBox",
     "editable": true,
-    "requiredAncestors": ["form"],
     "size": {
       "width": 400,
       "height": 60
@@ -3937,8 +3984,7 @@
       {
         "type": "field/boolean",
         "label": "Field",
-        "key": "field",
-        "required": true
+        "key": "field"
       },
       {
         "type": "text",
@@ -4047,13 +4093,22 @@
           }
         ]
       }
-    ]
+    ],
+    "context": {
+      "type": "static",
+      "values": [
+        {
+          "label": "Value",
+          "key": "value",
+          "type": "boolean"
+        }
+      ]
+    }
   },
   "longformfield": {
     "name": "Long Form Field",
     "icon": "TextAlignLeft",
     "styles": ["size"],
-    "requiredAncestors": ["form"],
     "editable": true,
     "size": {
       "width": 400,
@@ -4063,8 +4118,7 @@
       {
         "type": "field/longform",
         "label": "Field",
-        "key": "field",
-        "required": true
+        "key": "field"
       },
       {
         "type": "text",
@@ -4171,13 +4225,22 @@
           }
         ]
       }
-    ]
+    ],
+    "context": {
+      "type": "static",
+      "values": [
+        {
+          "label": "Value",
+          "key": "value",
+          "type": "string"
+        }
+      ]
+    }
   },
   "datetimefield": {
     "name": "Date Picker",
     "icon": "Date",
     "styles": ["size"],
-    "requiredAncestors": ["form"],
     "editable": true,
     "size": {
       "width": 400,
@@ -4187,8 +4250,7 @@
       {
         "type": "field/datetime",
         "label": "Field",
-        "key": "field",
-        "required": true
+        "key": "field"
       },
       {
         "type": "text",
@@ -4291,7 +4353,17 @@
           }
         ]
       }
-    ]
+    ],
+    "context": {
+      "type": "static",
+      "values": [
+        {
+          "label": "Value",
+          "key": "value",
+          "type": "datetime"
+        }
+      ]
+    }
   },
   "codescanner": {
     "name": "Barcode/QR Scanner",
@@ -4305,8 +4377,7 @@
       {
         "type": "field/barcodeqr",
         "label": "Field",
-        "key": "field",
-        "required": true
+        "key": "field"
       },
       {
         "type": "text",
@@ -4451,7 +4522,17 @@
           }
         ]
       }
-    ]
+    ],
+    "context": {
+      "type": "static",
+      "values": [
+        {
+          "label": "Value",
+          "key": "value",
+          "type": "string"
+        }
+      ]
+    }
   },
   "signaturesinglefield": {
     "name": "Signature",
@@ -4924,7 +5005,6 @@
     "icon": "Brackets",
     "styles": ["size"],
     "editable": true,
-    "requiredAncestors": ["form"],
     "size": {
       "width": 400,
       "height": 100
@@ -4933,8 +5013,7 @@
       {
         "type": "field/json",
         "label": "Field",
-        "key": "field",
-        "required": true
+        "key": "field"
       },
       {
         "type": "text",
@@ -5014,7 +5093,17 @@
           }
         ]
       }
-    ]
+    ],
+    "context": {
+      "type": "static",
+      "values": [
+        {
+          "label": "Value",
+          "key": "value",
+          "type": "string"
+        }
+      ]
+    }
   },
   "s3upload": {
     "name": "S3 File Upload",
@@ -5029,8 +5118,7 @@
       {
         "type": "field/s3",
         "label": "Field",
-        "key": "field",
-        "required": true
+        "key": "field"
       },
       {
         "type": "text",
@@ -5075,7 +5163,17 @@
         "label": "Validation",
         "key": "validation"
       }
-    ]
+    ],
+    "context": {
+      "type": "static",
+      "values": [
+        {
+          "label": "Value",
+          "key": "value",
+          "type": "array"
+        }
+      ]
+    }
   },
   "dataprovider": {
     "name": "Data Provider",
@@ -7643,7 +7741,6 @@
     "name": "User List Field",
     "icon": "UserGroup",
     "styles": ["size"],
-    "requiredAncestors": ["form"],
     "editable": true,
     "size": {
       "width": 400,
@@ -7653,8 +7750,7 @@
       {
         "type": "field/bb_reference",
         "label": "Field",
-        "key": "field",
-        "required": true
+        "key": "field"
       },
       {
         "type": "text",
@@ -7744,14 +7840,23 @@
           }
         ]
       }
-    ]
+    ],
+    "context": {
+      "type": "static",
+      "values": [
+        {
+          "label": "Value",
+          "key": "value",
+          "type": "array"
+        }
+      ]
+    }
   },
   "bbreferencesinglefield": {
     "devComment": "As bb reference is only used for user subtype for now, we are using user for icon and labels",
     "name": "User Field",
     "icon": "User",
     "styles": ["size"],
-    "requiredAncestors": ["form"],
     "editable": true,
     "size": {
       "width": 400,
@@ -7761,8 +7866,7 @@
       {
         "type": "field/bb_reference_single",
         "label": "Field",
-        "key": "field",
-        "required": true
+        "key": "field"
       },
       {
         "type": "text",
@@ -7852,6 +7956,16 @@
           }
         ]
       }
-    ]
+    ],
+    "context": {
+      "type": "static",
+      "values": [
+        {
+          "label": "Value",
+          "key": "value",
+          "type": "string"
+        }
+      ]
+    }
   }
 }
diff --git a/packages/client/package.json b/packages/client/package.json
index fb9851e0a1..073869415d 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -15,8 +15,8 @@
     "./manifest.json": "./manifest.json"
   },
   "scripts": {
-    "build": "rollup -c",
-    "dev": "rollup -cw"
+    "build": "vite build",
+    "dev": "vite build --watch"
   },
   "dependencies": {
     "@budibase/bbui": "0.0.0",
@@ -36,19 +36,9 @@
     "svelte-spa-router": "^4.0.1"
   },
   "devDependencies": {
-    "@rollup/plugin-alias": "^5.1.0",
-    "@rollup/plugin-commonjs": "^25.0.7",
-    "@rollup/plugin-image": "^3.0.3",
-    "@rollup/plugin-node-resolve": "^15.2.3",
-    "postcss": "^8.4.35",
-    "rollup": "^4.9.6",
-    "rollup-plugin-json": "^4.0.0",
-    "rollup-plugin-polyfill-node": "^0.13.0",
-    "rollup-plugin-postcss": "^4.0.2",
-    "rollup-plugin-svelte": "^7.1.6",
-    "rollup-plugin-svg": "^2.0.0",
-    "rollup-plugin-terser": "^7.0.2",
-    "rollup-plugin-visualizer": "^5.12.0"
+    "@sveltejs/vite-plugin-svelte": "1.4.0",
+    "vite": "^4.5.0",
+    "vite-plugin-css-injected-by-js": "3.5.2"
   },
   "resolutions": {
     "loader-utils": "1.4.1"
diff --git a/packages/client/rollup.config.js b/packages/client/rollup.config.js
deleted file mode 100644
index 9839414f7e..0000000000
--- a/packages/client/rollup.config.js
+++ /dev/null
@@ -1,117 +0,0 @@
-import commonjs from "@rollup/plugin-commonjs"
-import resolve from "@rollup/plugin-node-resolve"
-import alias from "@rollup/plugin-alias"
-import svelte from "rollup-plugin-svelte"
-import { terser } from "rollup-plugin-terser"
-import postcss from "rollup-plugin-postcss"
-import svg from "rollup-plugin-svg"
-import image from "@rollup/plugin-image"
-import json from "rollup-plugin-json"
-import nodePolyfills from "rollup-plugin-polyfill-node"
-import path from "path"
-import { visualizer } from "rollup-plugin-visualizer"
-
-const production = !process.env.ROLLUP_WATCH
-const ignoredWarnings = [
-  "unused-export-let",
-  "css-unused-selector",
-  "module-script-reactive-declaration",
-  "a11y-no-onchange",
-  "a11y-click-events-have-key-events",
-]
-
-const devPaths = production
-  ? []
-  : [
-      {
-        find: "@budibase/shared-core",
-        replacement: path.resolve("../shared-core/dist/index"),
-      },
-      {
-        find: "@budibase/types",
-        replacement: path.resolve("../types/dist/index"),
-      },
-    ]
-
-export default {
-  input: "src/index.js",
-  output: [
-    {
-      sourcemap: false,
-      format: "iife",
-      file: `./dist/budibase-client.js`,
-    },
-  ],
-  onwarn(warning, warn) {
-    if (
-      warning.code === "THIS_IS_UNDEFINED" ||
-      warning.code === "CIRCULAR_DEPENDENCY" ||
-      warning.code === "EVAL"
-    ) {
-      return
-    }
-    warn(warning)
-  },
-  plugins: [
-    alias({
-      entries: [
-        {
-          find: "manifest.json",
-          replacement: path.resolve("./manifest.json"),
-        },
-        {
-          find: "api",
-          replacement: path.resolve("./src/api"),
-        },
-        {
-          find: "components",
-          replacement: path.resolve("./src/components"),
-        },
-        {
-          find: "stores",
-          replacement: path.resolve("./src/stores"),
-        },
-        {
-          find: "utils",
-          replacement: path.resolve("./src/utils"),
-        },
-        {
-          find: "constants",
-          replacement: path.resolve("./src/constants"),
-        },
-        {
-          find: "sdk",
-          replacement: path.resolve("./src/sdk"),
-        },
-        ...devPaths,
-      ],
-    }),
-    svelte({
-      emitCss: true,
-      onwarn: (warning, handler) => {
-        // Ignore some warnings
-        if (!ignoredWarnings.includes(warning.code)) {
-          handler(warning)
-        }
-      },
-    }),
-    postcss(),
-    commonjs(),
-    nodePolyfills(),
-    resolve({
-      preferBuiltins: true,
-      browser: true,
-      dedupe: ["svelte", "svelte/internal"],
-    }),
-    svg(),
-    image({
-      exclude: "**/*.svg",
-    }),
-    json(),
-    production && terser(),
-    !production && visualizer(),
-  ],
-  watch: {
-    clearScreen: false,
-  },
-}
diff --git a/packages/client/src/components/app/charts/AreaChart.svelte b/packages/client/src/components/app/charts/AreaChart.svelte
index 051601b245..556e0a61d4 100644
--- a/packages/client/src/components/app/charts/AreaChart.svelte
+++ b/packages/client/src/components/app/charts/AreaChart.svelte
@@ -18,8 +18,6 @@
   export let palette
   export let c1, c2, c3, c4, c5
 
-  // Area specific props
-  export let area
   export let stacked
   export let gradient
 
diff --git a/packages/client/src/components/app/forms/Field.svelte b/packages/client/src/components/app/forms/Field.svelte
index 9210b6ea8f..5fccb5d881 100644
--- a/packages/client/src/components/app/forms/Field.svelte
+++ b/packages/client/src/components/app/forms/Field.svelte
@@ -1,7 +1,10 @@
 <script>
-  import Placeholder from "../Placeholder.svelte"
   import { getContext, onDestroy } from "svelte"
+  import { writable } from "svelte/store"
   import { Icon } from "@budibase/bbui"
+  import { memo } from "@budibase/frontend-core"
+  import Placeholder from "../Placeholder.svelte"
+  import InnerForm from "./InnerForm.svelte"
 
   export let label
   export let field
@@ -20,26 +23,39 @@
   const formContext = getContext("form")
   const formStepContext = getContext("form-step")
   const fieldGroupContext = getContext("field-group")
-  const { styleable, builderStore } = getContext("sdk")
+  const { styleable, builderStore, Provider } = getContext("sdk")
   const component = getContext("component")
 
   // Register field with form
   const formApi = formContext?.formApi
   const labelPos = fieldGroupContext?.labelPosition || "above"
 
+  let formField
   let touched = false
   let labelNode
 
-  $: formStep = formStepContext ? $formStepContext || 1 : 1
-  $: formField = formApi?.registerField(
-    field,
+  // Memoize values required to register the field to avoid loops
+  const formStep = formStepContext || writable(1)
+  const fieldInfo = memo({
+    field: field || $component.name,
     type,
     defaultValue,
     disabled,
     readonly,
     validation,
-    formStep
-  )
+    formStep: $formStep || 1,
+  })
+  $: fieldInfo.set({
+    field: field || $component.name,
+    type,
+    defaultValue,
+    disabled,
+    readonly,
+    validation,
+    formStep: $formStep || 1,
+  })
+  $: registerField($fieldInfo)
+
   $: schemaType =
     fieldSchema?.type !== "formula" && fieldSchema?.type !== "bigint"
       ? fieldSchema?.type
@@ -58,6 +74,18 @@
   // Determine label class from position
   $: labelClass = labelPos === "above" ? "" : `spectrum-FieldLabel--${labelPos}`
 
+  const registerField = info => {
+    formField = formApi?.registerField(
+      info.field,
+      info.type,
+      info.defaultValue,
+      info.disabled,
+      info.readonly,
+      info.validation,
+      info.formStep
+    )
+  }
+
   const updateLabel = e => {
     if (touched) {
       builderStore.actions.updateProp("label", e.target.textContent)
@@ -71,52 +99,65 @@
   })
 </script>
 
-<div
-  class="spectrum-Form-item"
-  class:span-2={span === 2}
-  class:span-3={span === 3}
-  class:span-6={span === 6 || !span}
-  use:styleable={$component.styles}
-  class:above={labelPos === "above"}
->
-  {#key $component.editing}
-    <label
-      bind:this={labelNode}
-      contenteditable={$component.editing}
-      on:blur={$component.editing ? updateLabel : null}
-      on:input={() => (touched = true)}
-      class:hidden={!label}
-      class:readonly
-      for={fieldState?.fieldId}
-      class={`spectrum-FieldLabel spectrum-FieldLabel--sizeM spectrum-Form-itemLabel ${labelClass}`}
+<Provider data={{ value: fieldState?.value }}>
+  {#if !formContext}
+    <InnerForm
+      {disabled}
+      {readonly}
+      currentStep={writable(1)}
+      provideContext={false}
     >
-      {label || " "}
-    </label>
-  {/key}
-  <div class="spectrum-Form-itemField">
-    {#if !formContext}
-      <Placeholder text="Form components need to be wrapped in a form" />
-    {:else if !fieldState}
-      <Placeholder />
-    {:else if schemaType && schemaType !== type && !["options", "longform"].includes(type)}
-      <Placeholder
-        text="This Field setting is the wrong data type for this component"
-      />
-    {:else}
-      <slot />
-      {#if fieldState.error}
-        <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>
-</div>
+      <svelte:self {...$$props} bind:fieldState bind:fieldApi bind:fieldSchema>
+        <slot />
+      </svelte:self>
+    </InnerForm>
+  {:else}
+    <div
+      class="spectrum-Form-item"
+      class:span-2={span === 2}
+      class:span-3={span === 3}
+      class:span-6={span === 6 || !span}
+      use:styleable={$component.styles}
+      class:above={labelPos === "above"}
+    >
+      {#key $component.editing}
+        <label
+          bind:this={labelNode}
+          contenteditable={$component.editing}
+          on:blur={$component.editing ? updateLabel : null}
+          on:input={() => (touched = true)}
+          class:hidden={!label}
+          class:readonly
+          for={fieldState?.fieldId}
+          class={`spectrum-FieldLabel spectrum-FieldLabel--sizeM spectrum-Form-itemLabel ${labelClass}`}
+        >
+          {label || " "}
+        </label>
+      {/key}
+      <div class="spectrum-Form-itemField">
+        {#if !fieldState}
+          <Placeholder />
+        {:else if schemaType && schemaType !== type && !["options", "longform"].includes(type)}
+          <Placeholder
+            text="This Field setting is the wrong data type for this component"
+          />
+        {:else}
+          <slot />
+          {#if fieldState.error}
+            <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>
+    </div>
+  {/if}
+</Provider>
 
 <style>
   :global(.form-block .spectrum-Form-item.span-2) {
diff --git a/packages/client/src/components/app/forms/Form.svelte b/packages/client/src/components/app/forms/Form.svelte
index f470297d78..dec779503f 100644
--- a/packages/client/src/components/app/forms/Form.svelte
+++ b/packages/client/src/components/app/forms/Form.svelte
@@ -5,7 +5,6 @@
   import { writable } from "svelte/store"
 
   export let dataSource
-  export let theme
   export let size
   export let disabled = false
   export let readonly = false
@@ -113,11 +112,9 @@
   {#key resetKey}
     <InnerForm
       {dataSource}
-      {theme}
       {size}
       {disabled}
       {readonly}
-      {actionType}
       {schema}
       {definition}
       {initialValues}
diff --git a/packages/client/src/components/app/forms/InnerForm.svelte b/packages/client/src/components/app/forms/InnerForm.svelte
index 91a444aa6a..fcf5379713 100644
--- a/packages/client/src/components/app/forms/InnerForm.svelte
+++ b/packages/client/src/components/app/forms/InnerForm.svelte
@@ -14,6 +14,10 @@
   export let disableSchemaValidation = false
   export let editAutoColumns = false
 
+  // For internal use only, to disable context when being used with standalone
+  // fields
+  export let provideContext = true
+
   // We export this store so that when we remount the inner form we can still
   // persist what step we're on
   export let currentStep
@@ -442,8 +446,14 @@
   ]
 </script>
 
-<Provider {actions} data={dataContext}>
+{#if provideContext}
+  <Provider {actions} data={dataContext}>
+    <div use:styleable={$component.styles} class={size}>
+      <slot />
+    </div>
+  </Provider>
+{:else}
   <div use:styleable={$component.styles} class={size}>
     <slot />
   </div>
-</Provider>
+{/if}
diff --git a/packages/client/src/index.js b/packages/client/src/index.js
index de6d1bdc12..9cef52bb1e 100644
--- a/packages/client/src/index.js
+++ b/packages/client/src/index.js
@@ -10,7 +10,7 @@ import {
   eventStore,
   hoverStore,
 } from "./stores"
-import loadSpectrumIcons from "@budibase/bbui/spectrum-icons-rollup.js"
+import loadSpectrumIcons from "@budibase/bbui/spectrum-icons-vite.js"
 import { get } from "svelte/store"
 import { initWebsocket } from "./websocket.js"
 
diff --git a/packages/client/tsconfig.json b/packages/client/tsconfig.json
index 81f1657f48..740b129738 100644
--- a/packages/client/tsconfig.json
+++ b/packages/client/tsconfig.json
@@ -3,6 +3,10 @@
     "allowJs": true,
     "strict": true,
     "outDir": "dist",
+    "allowSyntheticDefaultImports": true,
+    "target": "ESNext",
+    "moduleResolution": "bundler",
+    "resolveJsonModule": true,
     "paths": {
       "@budibase/*": [
         "../*/src/index.ts",
@@ -12,6 +16,5 @@
       ],
       "*": ["./src/*"]
     }
-  },
-  "include": ["src/**/*"]
+  }
 }
diff --git a/packages/client/vite.config.mjs b/packages/client/vite.config.mjs
new file mode 100644
index 0000000000..9c623b709f
--- /dev/null
+++ b/packages/client/vite.config.mjs
@@ -0,0 +1,89 @@
+import { svelte } from "@sveltejs/vite-plugin-svelte"
+import { defineConfig } from "vite"
+import path from "path"
+import cssInjectedByJsPlugin from "vite-plugin-css-injected-by-js"
+
+const ignoredWarnings = [
+  "unused-export-let",
+  "css-unused-selector",
+  "module-script-reactive-declaration",
+  "a11y-no-onchange",
+  "a11y-click-events-have-key-events",
+]
+
+export default defineConfig(({ mode }) => {
+  const isProduction = mode === "production"
+
+  return {
+    server: {
+      open: false,
+    },
+    build: {
+      lib: {
+        entry: "src/index.js",
+        formats: ["iife"],
+        outDir: "dist",
+        name: "budibase_client",
+        fileName: () => "budibase-client.js",
+        minify: isProduction,
+      },
+    },
+    plugins: [
+      svelte({
+        emitCss: true,
+        onwarn: (warning, handler) => {
+          // Ignore some warnings
+          if (!ignoredWarnings.includes(warning.code)) {
+            handler(warning)
+          }
+        },
+      }),
+      cssInjectedByJsPlugin(),
+    ],
+    resolve: {
+      dedupe: ["svelte", "svelte/internal"],
+      alias: [
+        {
+          find: "manifest.json",
+          replacement: path.resolve("./manifest.json"),
+        },
+        {
+          find: "api",
+          replacement: path.resolve("./src/api"),
+        },
+        {
+          find: "components",
+          replacement: path.resolve("./src/components"),
+        },
+        {
+          find: "stores",
+          replacement: path.resolve("./src/stores"),
+        },
+        {
+          find: "utils",
+          replacement: path.resolve("./src/utils"),
+        },
+        {
+          find: "constants",
+          replacement: path.resolve("./src/constants"),
+        },
+        {
+          find: "sdk",
+          replacement: path.resolve("./src/sdk"),
+        },
+        {
+          find: "@budibase/types",
+          replacement: path.resolve("../types/src"),
+        },
+        {
+          find: "@budibase/shared-core",
+          replacement: path.resolve("../shared-core/src"),
+        },
+        {
+          find: "@budibase/bbui",
+          replacement: path.resolve("../bbui/src"),
+        },
+      ],
+    },
+  }
+})
diff --git a/packages/pro b/packages/pro
index 4facf6a44e..e8ef2205de 160000
--- a/packages/pro
+++ b/packages/pro
@@ -1 +1 @@
-Subproject commit 4facf6a44ee52a405794845f71584168b9db652c
+Subproject commit e8ef2205de8bca5adcf18d07573096086aa9a606
diff --git a/packages/server/package.json b/packages/server/package.json
index e68fbdaa0e..63d7ed3a9a 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -63,6 +63,7 @@
     "@bull-board/koa": "5.10.2",
     "@elastic/elasticsearch": "7.10.0",
     "@google-cloud/firestore": "7.8.0",
+    "@koa/cors": "5.0.0",
     "@koa/router": "13.1.0",
     "@socket.io/redis-adapter": "^8.2.1",
     "@types/xml2js": "^0.4.14",
@@ -80,8 +81,8 @@
     "cookies": "0.8.0",
     "csvtojson": "2.0.10",
     "curlconverter": "3.21.0",
-    "dd-trace": "5.23.0",
     "dayjs": "^1.10.8",
+    "dd-trace": "5.26.0",
     "dotenv": "8.2.0",
     "form-data": "4.0.0",
     "global-agent": "3.0.0",
@@ -142,6 +143,7 @@
     "@types/jest": "29.5.5",
     "@types/koa": "2.13.4",
     "@types/koa-send": "^4.1.6",
+    "@types/koa__cors": "5.0.0",
     "@types/koa__router": "12.0.4",
     "@types/lodash": "4.14.200",
     "@types/mssql": "9.1.5",
@@ -174,7 +176,7 @@
     "tsconfig-paths": "4.0.0",
     "typescript": "5.5.2",
     "update-dotenv": "1.1.1",
-    "yargs": "13.2.4",
+    "yargs": "^13.2.4",
     "zod": "^3.23.8"
   },
   "nx": {
diff --git a/packages/server/specs/openapi.json b/packages/server/specs/openapi.json
index f3091a1fc7..9d356b9931 100644
--- a/packages/server/specs/openapi.json
+++ b/packages/server/specs/openapi.json
@@ -32,6 +32,15 @@
           "type": "string"
         }
       },
+      "viewId": {
+        "in": "path",
+        "name": "viewId",
+        "required": true,
+        "description": "The ID of the view which this request is targeting.",
+        "schema": {
+          "type": "string"
+        }
+      },
       "rowId": {
         "in": "path",
         "name": "rowId",
@@ -47,7 +56,7 @@
         "required": true,
         "description": "The ID of the app which this request is targeting.",
         "schema": {
-          "default": "{{ appId }}",
+          "default": "{{appId}}",
           "type": "string"
         }
       },
@@ -57,7 +66,7 @@
         "required": true,
         "description": "The ID of the app which this request is targeting.",
         "schema": {
-          "default": "{{ appId }}",
+          "default": "{{appId}}",
           "type": "string"
         }
       },
@@ -423,6 +432,110 @@
       },
       "metrics": {
         "value": "# HELP budibase_os_uptime Time in seconds that the host operating system has been up.\n# TYPE budibase_os_uptime counter\nbudibase_os_uptime 54958\n# HELP budibase_os_free_mem Bytes of memory free for usage on the host operating system.\n# TYPE budibase_os_free_mem gauge\nbudibase_os_free_mem 804507648\n# HELP budibase_os_total_mem Total bytes of memory on the host operating system.\n# TYPE budibase_os_total_mem gauge\nbudibase_os_total_mem 16742404096\n# HELP budibase_os_used_mem Total bytes of memory in use on the host operating system.\n# TYPE budibase_os_used_mem gauge\nbudibase_os_used_mem 15937896448\n# HELP budibase_os_load1 Host operating system load average.\n# TYPE budibase_os_load1 gauge\nbudibase_os_load1 1.91\n# HELP budibase_os_load5 Host operating system load average.\n# TYPE budibase_os_load5 gauge\nbudibase_os_load5 1.75\n# HELP budibase_os_load15 Host operating system load average.\n# TYPE budibase_os_load15 gauge\nbudibase_os_load15 1.56\n# HELP budibase_tenant_user_count The number of users created.\n# TYPE budibase_tenant_user_count gauge\nbudibase_tenant_user_count 1\n# HELP budibase_tenant_app_count The number of apps created by a user.\n# TYPE budibase_tenant_app_count gauge\nbudibase_tenant_app_count 2\n# HELP budibase_tenant_production_app_count The number of apps a user has published.\n# TYPE budibase_tenant_production_app_count gauge\nbudibase_tenant_production_app_count 1\n# HELP budibase_tenant_dev_app_count The number of apps a user has unpublished in development.\n# TYPE budibase_tenant_dev_app_count gauge\nbudibase_tenant_dev_app_count 1\n# HELP budibase_tenant_db_count The number of couchdb databases including global tables such as _users.\n# TYPE budibase_tenant_db_count gauge\nbudibase_tenant_db_count 3\n# HELP budibase_quota_usage_apps The number of apps created.\n# TYPE budibase_quota_usage_apps gauge\nbudibase_quota_usage_apps 1\n# HELP budibase_quota_limit_apps The limit on the number of apps that can be created.\n# TYPE budibase_quota_limit_apps gauge\nbudibase_quota_limit_apps 9007199254740991\n# HELP budibase_quota_usage_rows The number of database rows used from the quota.\n# TYPE budibase_quota_usage_rows gauge\nbudibase_quota_usage_rows 0\n# HELP budibase_quota_limit_rows The limit on the number of rows that can be created.\n# TYPE budibase_quota_limit_rows gauge\nbudibase_quota_limit_rows 9007199254740991\n# HELP budibase_quota_usage_plugins The number of plugins in use.\n# TYPE budibase_quota_usage_plugins gauge\nbudibase_quota_usage_plugins 0\n# HELP budibase_quota_limit_plugins The limit on the number of plugins that can be created.\n# TYPE budibase_quota_limit_plugins gauge\nbudibase_quota_limit_plugins 9007199254740991\n# HELP budibase_quota_usage_user_groups The number of user groups created.\n# TYPE budibase_quota_usage_user_groups gauge\nbudibase_quota_usage_user_groups 0\n# HELP budibase_quota_limit_user_groups The limit on the number of user groups that can be created.\n# TYPE budibase_quota_limit_user_groups gauge\nbudibase_quota_limit_user_groups 9007199254740991\n# HELP budibase_quota_usage_queries The number of queries used in the current month.\n# TYPE budibase_quota_usage_queries gauge\nbudibase_quota_usage_queries 0\n# HELP budibase_quota_limit_queries The limit on the number of queries for the current month.\n# TYPE budibase_quota_limit_queries gauge\nbudibase_quota_limit_queries 9007199254740991\n# HELP budibase_quota_usage_automations The number of automations used in the current month.\n# TYPE budibase_quota_usage_automations gauge\nbudibase_quota_usage_automations 0\n# HELP budibase_quota_limit_automations The limit on the number of automations that can be created.\n# TYPE budibase_quota_limit_automations gauge\nbudibase_quota_limit_automations 9007199254740991\n"
+      },
+      "view": {
+        "value": {
+          "data": {
+            "name": "peopleView",
+            "tableId": "ta_896a325f7e8147d2a2cda93c5d236511",
+            "schema": {
+              "name": {
+                "visible": true,
+                "readonly": false,
+                "order": 1,
+                "width": 300
+              },
+              "age": {
+                "visible": true,
+                "readonly": true,
+                "order": 2,
+                "width": 200
+              },
+              "salary": {
+                "visible": false,
+                "readonly": false
+              }
+            },
+            "query": {
+              "logicalOperator": "all",
+              "onEmptyFilter": "none",
+              "groups": [
+                {
+                  "logicalOperator": "any",
+                  "filters": [
+                    {
+                      "operator": "string",
+                      "field": "name",
+                      "value": "John"
+                    },
+                    {
+                      "operator": "range",
+                      "field": "age",
+                      "value": {
+                        "low": 18,
+                        "high": 100
+                      }
+                    }
+                  ]
+                }
+              ]
+            },
+            "primaryDisplay": "name"
+          }
+        }
+      },
+      "views": {
+        "value": {
+          "data": [
+            {
+              "name": "peopleView",
+              "tableId": "ta_896a325f7e8147d2a2cda93c5d236511",
+              "schema": {
+                "name": {
+                  "visible": true,
+                  "readonly": false,
+                  "order": 1,
+                  "width": 300
+                },
+                "age": {
+                  "visible": true,
+                  "readonly": true,
+                  "order": 2,
+                  "width": 200
+                },
+                "salary": {
+                  "visible": false,
+                  "readonly": false
+                }
+              },
+              "query": {
+                "logicalOperator": "all",
+                "onEmptyFilter": "none",
+                "groups": [
+                  {
+                    "logicalOperator": "any",
+                    "filters": [
+                      {
+                        "operator": "string",
+                        "field": "name",
+                        "value": "John"
+                      },
+                      {
+                        "operator": "range",
+                        "field": "age",
+                        "value": {
+                          "low": 18,
+                          "high": 100
+                        }
+                      }
+                    ]
+                  }
+                ]
+              },
+              "primaryDisplay": "name"
+            }
+          ]
+        }
       }
     },
     "securitySchemes": {
@@ -831,8 +944,7 @@
                       "type": "string",
                       "enum": [
                         "static",
-                        "dynamic",
-                        "ai"
+                        "dynamic"
                       ],
                       "description": "Defines whether this is a static or dynamic formula."
                     }
@@ -1042,8 +1154,7 @@
                           "type": "string",
                           "enum": [
                             "static",
-                            "dynamic",
-                            "ai"
+                            "dynamic"
                           ],
                           "description": "Defines whether this is a static or dynamic formula."
                         }
@@ -1264,8 +1375,7 @@
                             "type": "string",
                             "enum": [
                               "static",
-                              "dynamic",
-                              "ai"
+                              "dynamic"
                             ],
                             "description": "Defines whether this is a static or dynamic formula."
                           }
@@ -2024,6 +2134,869 @@
         "required": [
           "data"
         ]
+      },
+      "view": {
+        "description": "The view to be created/updated.",
+        "type": "object",
+        "required": [
+          "name",
+          "schema",
+          "tableId"
+        ],
+        "properties": {
+          "name": {
+            "description": "The name of the view.",
+            "type": "string"
+          },
+          "tableId": {
+            "description": "The ID of the table this view is based on.",
+            "type": "string"
+          },
+          "type": {
+            "description": "The type of view - standard (empty value) or calculation.",
+            "type": "string",
+            "enum": [
+              "calculation"
+            ]
+          },
+          "primaryDisplay": {
+            "type": "string",
+            "description": "A column used to display rows from this view - usually used when rendered in tables."
+          },
+          "query": {
+            "description": "Search parameters for view",
+            "type": "object",
+            "properties": {
+              "logicalOperator": {
+                "description": "When using groups this defines whether all of the filters must match, or only one of them.",
+                "type": "string",
+                "enum": [
+                  "all",
+                  "any"
+                ]
+              },
+              "onEmptyFilter": {
+                "description": "If no filters match, should the view return all rows, or no rows.",
+                "type": "string",
+                "enum": [
+                  "all",
+                  "none"
+                ]
+              },
+              "groups": {
+                "description": "A grouping of filters to be applied.",
+                "type": "array",
+                "items": {
+                  "type": "object",
+                  "properties": {
+                    "logicalOperator": {
+                      "description": "When using groups this defines whether all of the filters must match, or only one of them.",
+                      "type": "string",
+                      "enum": [
+                        "all",
+                        "any"
+                      ]
+                    },
+                    "filters": {
+                      "description": "A list of filters to apply",
+                      "type": "array",
+                      "items": {
+                        "type": "object",
+                        "properties": {
+                          "operator": {
+                            "type": "string",
+                            "description": "The type of search operation which is being performed.",
+                            "enum": [
+                              "equal",
+                              "notEqual",
+                              "empty",
+                              "notEmpty",
+                              "fuzzy",
+                              "string",
+                              "contains",
+                              "notContains",
+                              "containsAny",
+                              "oneOf",
+                              "range"
+                            ]
+                          },
+                          "field": {
+                            "type": "string",
+                            "description": "The field in the view to perform the search on."
+                          },
+                          "value": {
+                            "description": "The value to search for - the type will depend on the operator in use.",
+                            "oneOf": [
+                              {
+                                "type": "string"
+                              },
+                              {
+                                "type": "number"
+                              },
+                              {
+                                "type": "boolean"
+                              },
+                              {
+                                "type": "object"
+                              },
+                              {
+                                "type": "array"
+                              }
+                            ]
+                          }
+                        }
+                      }
+                    },
+                    "groups": {
+                      "description": "A grouping of filters to be applied.",
+                      "type": "array",
+                      "items": {
+                        "type": "object",
+                        "properties": {
+                          "logicalOperator": {
+                            "description": "When using groups this defines whether all of the filters must match, or only one of them.",
+                            "type": "string",
+                            "enum": [
+                              "all",
+                              "any"
+                            ]
+                          },
+                          "filters": {
+                            "description": "A list of filters to apply",
+                            "type": "array",
+                            "items": {
+                              "type": "object",
+                              "properties": {
+                                "operator": {
+                                  "type": "string",
+                                  "description": "The type of search operation which is being performed.",
+                                  "enum": [
+                                    "equal",
+                                    "notEqual",
+                                    "empty",
+                                    "notEmpty",
+                                    "fuzzy",
+                                    "string",
+                                    "contains",
+                                    "notContains",
+                                    "containsAny",
+                                    "oneOf",
+                                    "range"
+                                  ]
+                                },
+                                "field": {
+                                  "type": "string",
+                                  "description": "The field in the view to perform the search on."
+                                },
+                                "value": {
+                                  "description": "The value to search for - the type will depend on the operator in use.",
+                                  "oneOf": [
+                                    {
+                                      "type": "string"
+                                    },
+                                    {
+                                      "type": "number"
+                                    },
+                                    {
+                                      "type": "boolean"
+                                    },
+                                    {
+                                      "type": "object"
+                                    },
+                                    {
+                                      "type": "array"
+                                    }
+                                  ]
+                                }
+                              }
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          },
+          "sort": {
+            "type": "object",
+            "required": [
+              "field"
+            ],
+            "properties": {
+              "field": {
+                "type": "string",
+                "description": "The field from the table/view schema to sort on."
+              },
+              "order": {
+                "type": "string",
+                "description": "The order in which to sort.",
+                "enum": [
+                  "ascending",
+                  "descending"
+                ]
+              },
+              "type": {
+                "type": "string",
+                "description": "The type of sort to perform (by number, or by alphabetically).",
+                "enum": [
+                  "string",
+                  "number"
+                ]
+              }
+            }
+          },
+          "schema": {
+            "type": "object",
+            "additionalProperties": {
+              "oneOf": [
+                {
+                  "type": "object",
+                  "properties": {
+                    "visible": {
+                      "type": "boolean",
+                      "description": "Defines whether the column is visible or not - rows retrieved/updated through this view will not be able to access it."
+                    },
+                    "readonly": {
+                      "type": "boolean",
+                      "description": "When used in combination with 'visible: true' the column will be visible in row responses but cannot be updated."
+                    },
+                    "order": {
+                      "type": "integer",
+                      "description": "A number defining where the column shows up in tables, lowest being first."
+                    },
+                    "width": {
+                      "type": "integer",
+                      "description": "A width for the column, defined in pixels - this affects rendering in tables."
+                    },
+                    "column": {
+                      "type": "array",
+                      "description": "If this is a relationship column, we can set the columns we wish to include",
+                      "items": {
+                        "type": "object",
+                        "properties": {
+                          "readonly": {
+                            "type": "boolean"
+                          }
+                        }
+                      }
+                    }
+                  }
+                },
+                {
+                  "type": "object",
+                  "properties": {
+                    "calculationType": {
+                      "type": "string",
+                      "description": "This column should be built from a calculation, specifying a type and field. It is important to note when a calculation is configured all non-calculation columns will be used for grouping.",
+                      "enum": [
+                        "sum",
+                        "avg",
+                        "count",
+                        "min",
+                        "max"
+                      ]
+                    },
+                    "field": {
+                      "type": "string",
+                      "description": "The field from the table to perform the calculation on."
+                    },
+                    "distinct": {
+                      "type": "boolean",
+                      "description": "Can be used in tandem with the count calculation type, to count unique entries."
+                    }
+                  }
+                }
+              ]
+            }
+          }
+        }
+      },
+      "viewOutput": {
+        "type": "object",
+        "properties": {
+          "data": {
+            "description": "The view to be created/updated.",
+            "type": "object",
+            "required": [
+              "name",
+              "schema",
+              "tableId",
+              "id"
+            ],
+            "properties": {
+              "name": {
+                "description": "The name of the view.",
+                "type": "string"
+              },
+              "tableId": {
+                "description": "The ID of the table this view is based on.",
+                "type": "string"
+              },
+              "type": {
+                "description": "The type of view - standard (empty value) or calculation.",
+                "type": "string",
+                "enum": [
+                  "calculation"
+                ]
+              },
+              "primaryDisplay": {
+                "type": "string",
+                "description": "A column used to display rows from this view - usually used when rendered in tables."
+              },
+              "query": {
+                "description": "Search parameters for view",
+                "type": "object",
+                "properties": {
+                  "logicalOperator": {
+                    "description": "When using groups this defines whether all of the filters must match, or only one of them.",
+                    "type": "string",
+                    "enum": [
+                      "all",
+                      "any"
+                    ]
+                  },
+                  "onEmptyFilter": {
+                    "description": "If no filters match, should the view return all rows, or no rows.",
+                    "type": "string",
+                    "enum": [
+                      "all",
+                      "none"
+                    ]
+                  },
+                  "groups": {
+                    "description": "A grouping of filters to be applied.",
+                    "type": "array",
+                    "items": {
+                      "type": "object",
+                      "properties": {
+                        "logicalOperator": {
+                          "description": "When using groups this defines whether all of the filters must match, or only one of them.",
+                          "type": "string",
+                          "enum": [
+                            "all",
+                            "any"
+                          ]
+                        },
+                        "filters": {
+                          "description": "A list of filters to apply",
+                          "type": "array",
+                          "items": {
+                            "type": "object",
+                            "properties": {
+                              "operator": {
+                                "type": "string",
+                                "description": "The type of search operation which is being performed.",
+                                "enum": [
+                                  "equal",
+                                  "notEqual",
+                                  "empty",
+                                  "notEmpty",
+                                  "fuzzy",
+                                  "string",
+                                  "contains",
+                                  "notContains",
+                                  "containsAny",
+                                  "oneOf",
+                                  "range"
+                                ]
+                              },
+                              "field": {
+                                "type": "string",
+                                "description": "The field in the view to perform the search on."
+                              },
+                              "value": {
+                                "description": "The value to search for - the type will depend on the operator in use.",
+                                "oneOf": [
+                                  {
+                                    "type": "string"
+                                  },
+                                  {
+                                    "type": "number"
+                                  },
+                                  {
+                                    "type": "boolean"
+                                  },
+                                  {
+                                    "type": "object"
+                                  },
+                                  {
+                                    "type": "array"
+                                  }
+                                ]
+                              }
+                            }
+                          }
+                        },
+                        "groups": {
+                          "description": "A grouping of filters to be applied.",
+                          "type": "array",
+                          "items": {
+                            "type": "object",
+                            "properties": {
+                              "logicalOperator": {
+                                "description": "When using groups this defines whether all of the filters must match, or only one of them.",
+                                "type": "string",
+                                "enum": [
+                                  "all",
+                                  "any"
+                                ]
+                              },
+                              "filters": {
+                                "description": "A list of filters to apply",
+                                "type": "array",
+                                "items": {
+                                  "type": "object",
+                                  "properties": {
+                                    "operator": {
+                                      "type": "string",
+                                      "description": "The type of search operation which is being performed.",
+                                      "enum": [
+                                        "equal",
+                                        "notEqual",
+                                        "empty",
+                                        "notEmpty",
+                                        "fuzzy",
+                                        "string",
+                                        "contains",
+                                        "notContains",
+                                        "containsAny",
+                                        "oneOf",
+                                        "range"
+                                      ]
+                                    },
+                                    "field": {
+                                      "type": "string",
+                                      "description": "The field in the view to perform the search on."
+                                    },
+                                    "value": {
+                                      "description": "The value to search for - the type will depend on the operator in use.",
+                                      "oneOf": [
+                                        {
+                                          "type": "string"
+                                        },
+                                        {
+                                          "type": "number"
+                                        },
+                                        {
+                                          "type": "boolean"
+                                        },
+                                        {
+                                          "type": "object"
+                                        },
+                                        {
+                                          "type": "array"
+                                        }
+                                      ]
+                                    }
+                                  }
+                                }
+                              }
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                }
+              },
+              "sort": {
+                "type": "object",
+                "required": [
+                  "field"
+                ],
+                "properties": {
+                  "field": {
+                    "type": "string",
+                    "description": "The field from the table/view schema to sort on."
+                  },
+                  "order": {
+                    "type": "string",
+                    "description": "The order in which to sort.",
+                    "enum": [
+                      "ascending",
+                      "descending"
+                    ]
+                  },
+                  "type": {
+                    "type": "string",
+                    "description": "The type of sort to perform (by number, or by alphabetically).",
+                    "enum": [
+                      "string",
+                      "number"
+                    ]
+                  }
+                }
+              },
+              "schema": {
+                "type": "object",
+                "additionalProperties": {
+                  "oneOf": [
+                    {
+                      "type": "object",
+                      "properties": {
+                        "visible": {
+                          "type": "boolean",
+                          "description": "Defines whether the column is visible or not - rows retrieved/updated through this view will not be able to access it."
+                        },
+                        "readonly": {
+                          "type": "boolean",
+                          "description": "When used in combination with 'visible: true' the column will be visible in row responses but cannot be updated."
+                        },
+                        "order": {
+                          "type": "integer",
+                          "description": "A number defining where the column shows up in tables, lowest being first."
+                        },
+                        "width": {
+                          "type": "integer",
+                          "description": "A width for the column, defined in pixels - this affects rendering in tables."
+                        },
+                        "column": {
+                          "type": "array",
+                          "description": "If this is a relationship column, we can set the columns we wish to include",
+                          "items": {
+                            "type": "object",
+                            "properties": {
+                              "readonly": {
+                                "type": "boolean"
+                              }
+                            }
+                          }
+                        }
+                      }
+                    },
+                    {
+                      "type": "object",
+                      "properties": {
+                        "calculationType": {
+                          "type": "string",
+                          "description": "This column should be built from a calculation, specifying a type and field. It is important to note when a calculation is configured all non-calculation columns will be used for grouping.",
+                          "enum": [
+                            "sum",
+                            "avg",
+                            "count",
+                            "min",
+                            "max"
+                          ]
+                        },
+                        "field": {
+                          "type": "string",
+                          "description": "The field from the table to perform the calculation on."
+                        },
+                        "distinct": {
+                          "type": "boolean",
+                          "description": "Can be used in tandem with the count calculation type, to count unique entries."
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              "id": {
+                "description": "The ID of the view.",
+                "type": "string"
+              }
+            }
+          }
+        },
+        "required": [
+          "data"
+        ]
+      },
+      "viewSearch": {
+        "type": "object",
+        "properties": {
+          "data": {
+            "type": "array",
+            "items": {
+              "description": "The view to be created/updated.",
+              "type": "object",
+              "required": [
+                "name",
+                "schema",
+                "tableId",
+                "id"
+              ],
+              "properties": {
+                "name": {
+                  "description": "The name of the view.",
+                  "type": "string"
+                },
+                "tableId": {
+                  "description": "The ID of the table this view is based on.",
+                  "type": "string"
+                },
+                "type": {
+                  "description": "The type of view - standard (empty value) or calculation.",
+                  "type": "string",
+                  "enum": [
+                    "calculation"
+                  ]
+                },
+                "primaryDisplay": {
+                  "type": "string",
+                  "description": "A column used to display rows from this view - usually used when rendered in tables."
+                },
+                "query": {
+                  "description": "Search parameters for view",
+                  "type": "object",
+                  "properties": {
+                    "logicalOperator": {
+                      "description": "When using groups this defines whether all of the filters must match, or only one of them.",
+                      "type": "string",
+                      "enum": [
+                        "all",
+                        "any"
+                      ]
+                    },
+                    "onEmptyFilter": {
+                      "description": "If no filters match, should the view return all rows, or no rows.",
+                      "type": "string",
+                      "enum": [
+                        "all",
+                        "none"
+                      ]
+                    },
+                    "groups": {
+                      "description": "A grouping of filters to be applied.",
+                      "type": "array",
+                      "items": {
+                        "type": "object",
+                        "properties": {
+                          "logicalOperator": {
+                            "description": "When using groups this defines whether all of the filters must match, or only one of them.",
+                            "type": "string",
+                            "enum": [
+                              "all",
+                              "any"
+                            ]
+                          },
+                          "filters": {
+                            "description": "A list of filters to apply",
+                            "type": "array",
+                            "items": {
+                              "type": "object",
+                              "properties": {
+                                "operator": {
+                                  "type": "string",
+                                  "description": "The type of search operation which is being performed.",
+                                  "enum": [
+                                    "equal",
+                                    "notEqual",
+                                    "empty",
+                                    "notEmpty",
+                                    "fuzzy",
+                                    "string",
+                                    "contains",
+                                    "notContains",
+                                    "containsAny",
+                                    "oneOf",
+                                    "range"
+                                  ]
+                                },
+                                "field": {
+                                  "type": "string",
+                                  "description": "The field in the view to perform the search on."
+                                },
+                                "value": {
+                                  "description": "The value to search for - the type will depend on the operator in use.",
+                                  "oneOf": [
+                                    {
+                                      "type": "string"
+                                    },
+                                    {
+                                      "type": "number"
+                                    },
+                                    {
+                                      "type": "boolean"
+                                    },
+                                    {
+                                      "type": "object"
+                                    },
+                                    {
+                                      "type": "array"
+                                    }
+                                  ]
+                                }
+                              }
+                            }
+                          },
+                          "groups": {
+                            "description": "A grouping of filters to be applied.",
+                            "type": "array",
+                            "items": {
+                              "type": "object",
+                              "properties": {
+                                "logicalOperator": {
+                                  "description": "When using groups this defines whether all of the filters must match, or only one of them.",
+                                  "type": "string",
+                                  "enum": [
+                                    "all",
+                                    "any"
+                                  ]
+                                },
+                                "filters": {
+                                  "description": "A list of filters to apply",
+                                  "type": "array",
+                                  "items": {
+                                    "type": "object",
+                                    "properties": {
+                                      "operator": {
+                                        "type": "string",
+                                        "description": "The type of search operation which is being performed.",
+                                        "enum": [
+                                          "equal",
+                                          "notEqual",
+                                          "empty",
+                                          "notEmpty",
+                                          "fuzzy",
+                                          "string",
+                                          "contains",
+                                          "notContains",
+                                          "containsAny",
+                                          "oneOf",
+                                          "range"
+                                        ]
+                                      },
+                                      "field": {
+                                        "type": "string",
+                                        "description": "The field in the view to perform the search on."
+                                      },
+                                      "value": {
+                                        "description": "The value to search for - the type will depend on the operator in use.",
+                                        "oneOf": [
+                                          {
+                                            "type": "string"
+                                          },
+                                          {
+                                            "type": "number"
+                                          },
+                                          {
+                                            "type": "boolean"
+                                          },
+                                          {
+                                            "type": "object"
+                                          },
+                                          {
+                                            "type": "array"
+                                          }
+                                        ]
+                                      }
+                                    }
+                                  }
+                                }
+                              }
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                },
+                "sort": {
+                  "type": "object",
+                  "required": [
+                    "field"
+                  ],
+                  "properties": {
+                    "field": {
+                      "type": "string",
+                      "description": "The field from the table/view schema to sort on."
+                    },
+                    "order": {
+                      "type": "string",
+                      "description": "The order in which to sort.",
+                      "enum": [
+                        "ascending",
+                        "descending"
+                      ]
+                    },
+                    "type": {
+                      "type": "string",
+                      "description": "The type of sort to perform (by number, or by alphabetically).",
+                      "enum": [
+                        "string",
+                        "number"
+                      ]
+                    }
+                  }
+                },
+                "schema": {
+                  "type": "object",
+                  "additionalProperties": {
+                    "oneOf": [
+                      {
+                        "type": "object",
+                        "properties": {
+                          "visible": {
+                            "type": "boolean",
+                            "description": "Defines whether the column is visible or not - rows retrieved/updated through this view will not be able to access it."
+                          },
+                          "readonly": {
+                            "type": "boolean",
+                            "description": "When used in combination with 'visible: true' the column will be visible in row responses but cannot be updated."
+                          },
+                          "order": {
+                            "type": "integer",
+                            "description": "A number defining where the column shows up in tables, lowest being first."
+                          },
+                          "width": {
+                            "type": "integer",
+                            "description": "A width for the column, defined in pixels - this affects rendering in tables."
+                          },
+                          "column": {
+                            "type": "array",
+                            "description": "If this is a relationship column, we can set the columns we wish to include",
+                            "items": {
+                              "type": "object",
+                              "properties": {
+                                "readonly": {
+                                  "type": "boolean"
+                                }
+                              }
+                            }
+                          }
+                        }
+                      },
+                      {
+                        "type": "object",
+                        "properties": {
+                          "calculationType": {
+                            "type": "string",
+                            "description": "This column should be built from a calculation, specifying a type and field. It is important to note when a calculation is configured all non-calculation columns will be used for grouping.",
+                            "enum": [
+                              "sum",
+                              "avg",
+                              "count",
+                              "min",
+                              "max"
+                            ]
+                          },
+                          "field": {
+                            "type": "string",
+                            "description": "The field from the table to perform the calculation on."
+                          },
+                          "distinct": {
+                            "type": "boolean",
+                            "description": "Can be used in tandem with the count calculation type, to count unique entries."
+                          }
+                        }
+                      }
+                    ]
+                  }
+                },
+                "id": {
+                  "description": "The ID of the view.",
+                  "type": "string"
+                }
+              }
+            }
+          }
+        },
+        "required": [
+          "data"
+        ]
       }
     }
   },
@@ -2741,6 +3714,50 @@
         }
       }
     },
+    "/views/{viewId}/rows/search": {
+      "post": {
+        "operationId": "rowViewSearch",
+        "summary": "Search for rows in a view",
+        "tags": [
+          "rows"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/viewId"
+          },
+          {
+            "$ref": "#/components/parameters/appId"
+          }
+        ],
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/rowSearch"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "The response will contain an array of rows that match the search parameters.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/searchOutput"
+                },
+                "examples": {
+                  "search": {
+                    "$ref": "#/components/examples/rows"
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
     "/tables": {
       "post": {
         "operationId": "tableCreate",
@@ -3115,6 +4132,209 @@
           }
         }
       }
+    },
+    "/views": {
+      "post": {
+        "operationId": "viewCreate",
+        "summary": "Create a view",
+        "description": "Create a view, this can be against an internal or external table.",
+        "tags": [
+          "views"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/appId"
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/view"
+              },
+              "examples": {
+                "view": {
+                  "$ref": "#/components/examples/view"
+                }
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Returns the created view, including the ID which has been generated for it.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/viewOutput"
+                },
+                "examples": {
+                  "view": {
+                    "$ref": "#/components/examples/view"
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/views/{viewId}": {
+      "put": {
+        "operationId": "viewUpdate",
+        "summary": "Update a view",
+        "description": "Update a view, this can be against an internal or external table.",
+        "tags": [
+          "views"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/viewId"
+          },
+          {
+            "$ref": "#/components/parameters/appId"
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/view"
+              },
+              "examples": {
+                "view": {
+                  "$ref": "#/components/examples/view"
+                }
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Returns the updated view.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/viewOutput"
+                },
+                "examples": {
+                  "view": {
+                    "$ref": "#/components/examples/view"
+                  }
+                }
+              }
+            }
+          }
+        }
+      },
+      "delete": {
+        "operationId": "viewDestroy",
+        "summary": "Delete a view",
+        "description": "Delete a view, this can be against an internal or external table.",
+        "tags": [
+          "views"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/viewId"
+          },
+          {
+            "$ref": "#/components/parameters/appId"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Returns the deleted view.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/viewOutput"
+                },
+                "examples": {
+                  "view": {
+                    "$ref": "#/components/examples/view"
+                  }
+                }
+              }
+            }
+          }
+        }
+      },
+      "get": {
+        "operationId": "viewGetById",
+        "summary": "Retrieve a view",
+        "description": "Lookup a view, this could be internal or external.",
+        "tags": [
+          "views"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/viewId"
+          },
+          {
+            "$ref": "#/components/parameters/appId"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Returns the retrieved view.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/viewOutput"
+                },
+                "examples": {
+                  "view": {
+                    "$ref": "#/components/examples/view"
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/views/search": {
+      "post": {
+        "operationId": "viewSearch",
+        "summary": "Search for views",
+        "description": "Based on view properties (currently only name) search for views.",
+        "tags": [
+          "views"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/appId"
+          }
+        ],
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/nameSearch"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Returns the found views, based on the search parameters.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/viewSearch"
+                },
+                "examples": {
+                  "views": {
+                    "$ref": "#/components/examples/views"
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
     }
   },
   "tags": []
diff --git a/packages/server/specs/openapi.yaml b/packages/server/specs/openapi.yaml
index 1e9b9921cf..9ad242f24c 100644
--- a/packages/server/specs/openapi.yaml
+++ b/packages/server/specs/openapi.yaml
@@ -23,6 +23,13 @@ components:
       description: The ID of the table which this request is targeting.
       schema:
         type: string
+    viewId:
+      in: path
+      name: viewId
+      required: true
+      description: The ID of the view which this request is targeting.
+      schema:
+        type: string
     rowId:
       in: path
       name: rowId
@@ -36,7 +43,7 @@ components:
       required: true
       description: The ID of the app which this request is targeting.
       schema:
-        default: "{{ appId }}"
+        default: "{{appId}}"
         type: string
     appIdUrl:
       in: path
@@ -44,7 +51,7 @@ components:
       required: true
       description: The ID of the app which this request is targeting.
       schema:
-        default: "{{ appId }}"
+        default: "{{appId}}"
         type: string
     queryId:
       in: path
@@ -442,6 +449,74 @@ components:
         # TYPE budibase_quota_limit_automations gauge
 
         budibase_quota_limit_automations 9007199254740991
+    view:
+      value:
+        data:
+          name: peopleView
+          tableId: ta_896a325f7e8147d2a2cda93c5d236511
+          schema:
+            name:
+              visible: true
+              readonly: false
+              order: 1
+              width: 300
+            age:
+              visible: true
+              readonly: true
+              order: 2
+              width: 200
+            salary:
+              visible: false
+              readonly: false
+          query:
+            logicalOperator: all
+            onEmptyFilter: none
+            groups:
+              - logicalOperator: any
+                filters:
+                  - operator: string
+                    field: name
+                    value: John
+                  - operator: range
+                    field: age
+                    value:
+                      low: 18
+                      high: 100
+          primaryDisplay: name
+    views:
+      value:
+        data:
+          - name: peopleView
+            tableId: ta_896a325f7e8147d2a2cda93c5d236511
+            schema:
+              name:
+                visible: true
+                readonly: false
+                order: 1
+                width: 300
+              age:
+                visible: true
+                readonly: true
+                order: 2
+                width: 200
+              salary:
+                visible: false
+                readonly: false
+            query:
+              logicalOperator: all
+              onEmptyFilter: none
+              groups:
+                - logicalOperator: any
+                  filters:
+                    - operator: string
+                      field: name
+                      value: John
+                    - operator: range
+                      field: age
+                      value:
+                        low: 18
+                        high: 100
+            primaryDisplay: name
   securitySchemes:
     ApiKeyAuth:
       type: apiKey
@@ -761,7 +836,6 @@ components:
                     enum:
                       - static
                       - dynamic
-                      - ai
                     description: Defines whether this is a static or dynamic formula.
               - type: object
                 properties:
@@ -931,7 +1005,6 @@ components:
                         enum:
                           - static
                           - dynamic
-                          - ai
                         description: Defines whether this is a static or dynamic formula.
                   - type: object
                     properties:
@@ -1108,7 +1181,6 @@ components:
                           enum:
                             - static
                             - dynamic
-                            - ai
                           description: Defines whether this is a static or dynamic formula.
                     - type: object
                       properties:
@@ -1704,6 +1776,641 @@ components:
             - userIds
       required:
         - data
+    view:
+      description: The view to be created/updated.
+      type: object
+      required:
+        - name
+        - schema
+        - tableId
+      properties:
+        name:
+          description: The name of the view.
+          type: string
+        tableId:
+          description: The ID of the table this view is based on.
+          type: string
+        type:
+          description: The type of view - standard (empty value) or calculation.
+          type: string
+          enum:
+            - calculation
+        primaryDisplay:
+          type: string
+          description: A column used to display rows from this view - usually used when
+            rendered in tables.
+        query:
+          description: Search parameters for view
+          type: object
+          properties:
+            logicalOperator:
+              description: When using groups this defines whether all of the filters must
+                match, or only one of them.
+              type: string
+              enum:
+                - all
+                - any
+            onEmptyFilter:
+              description: If no filters match, should the view return all rows, or no rows.
+              type: string
+              enum:
+                - all
+                - none
+            groups:
+              description: A grouping of filters to be applied.
+              type: array
+              items:
+                type: object
+                properties:
+                  logicalOperator:
+                    description: When using groups this defines whether all of the filters must
+                      match, or only one of them.
+                    type: string
+                    enum:
+                      - all
+                      - any
+                  filters:
+                    description: A list of filters to apply
+                    type: array
+                    items:
+                      type: object
+                      properties:
+                        operator:
+                          type: string
+                          description: The type of search operation which is being performed.
+                          enum:
+                            - equal
+                            - notEqual
+                            - empty
+                            - notEmpty
+                            - fuzzy
+                            - string
+                            - contains
+                            - notContains
+                            - containsAny
+                            - oneOf
+                            - range
+                        field:
+                          type: string
+                          description: The field in the view to perform the search on.
+                        value:
+                          description: The value to search for - the type will depend on the operator in
+                            use.
+                          oneOf:
+                            - type: string
+                            - type: number
+                            - type: boolean
+                            - type: object
+                            - type: array
+                  groups:
+                    description: A grouping of filters to be applied.
+                    type: array
+                    items:
+                      type: object
+                      properties:
+                        logicalOperator:
+                          description: When using groups this defines whether all of the filters must
+                            match, or only one of them.
+                          type: string
+                          enum:
+                            - all
+                            - any
+                        filters:
+                          description: A list of filters to apply
+                          type: array
+                          items:
+                            type: object
+                            properties:
+                              operator:
+                                type: string
+                                description: The type of search operation which is being performed.
+                                enum:
+                                  - equal
+                                  - notEqual
+                                  - empty
+                                  - notEmpty
+                                  - fuzzy
+                                  - string
+                                  - contains
+                                  - notContains
+                                  - containsAny
+                                  - oneOf
+                                  - range
+                              field:
+                                type: string
+                                description: The field in the view to perform the search on.
+                              value:
+                                description: The value to search for - the type will depend on the operator in
+                                  use.
+                                oneOf:
+                                  - type: string
+                                  - type: number
+                                  - type: boolean
+                                  - type: object
+                                  - type: array
+        sort:
+          type: object
+          required:
+            - field
+          properties:
+            field:
+              type: string
+              description: The field from the table/view schema to sort on.
+            order:
+              type: string
+              description: The order in which to sort.
+              enum:
+                - ascending
+                - descending
+            type:
+              type: string
+              description: The type of sort to perform (by number, or by alphabetically).
+              enum:
+                - string
+                - number
+        schema:
+          type: object
+          additionalProperties:
+            oneOf:
+              - type: object
+                properties:
+                  visible:
+                    type: boolean
+                    description: Defines whether the column is visible or not - rows
+                      retrieved/updated through this view will not be able to
+                      access it.
+                  readonly:
+                    type: boolean
+                    description: "When used in combination with 'visible: true' the column will be
+                      visible in row responses but cannot be updated."
+                  order:
+                    type: integer
+                    description: A number defining where the column shows up in tables, lowest being
+                      first.
+                  width:
+                    type: integer
+                    description: A width for the column, defined in pixels - this affects rendering
+                      in tables.
+                  column:
+                    type: array
+                    description: If this is a relationship column, we can set the columns we wish to
+                      include
+                    items:
+                      type: object
+                      properties:
+                        readonly:
+                          type: boolean
+              - type: object
+                properties:
+                  calculationType:
+                    type: string
+                    description: This column should be built from a calculation, specifying a type
+                      and field. It is important to note when a calculation is
+                      configured all non-calculation columns will be used for
+                      grouping.
+                    enum:
+                      - sum
+                      - avg
+                      - count
+                      - min
+                      - max
+                  field:
+                    type: string
+                    description: The field from the table to perform the calculation on.
+                  distinct:
+                    type: boolean
+                    description: Can be used in tandem with the count calculation type, to count
+                      unique entries.
+    viewOutput:
+      type: object
+      properties:
+        data:
+          description: The view to be created/updated.
+          type: object
+          required:
+            - name
+            - schema
+            - tableId
+            - id
+          properties:
+            name:
+              description: The name of the view.
+              type: string
+            tableId:
+              description: The ID of the table this view is based on.
+              type: string
+            type:
+              description: The type of view - standard (empty value) or calculation.
+              type: string
+              enum:
+                - calculation
+            primaryDisplay:
+              type: string
+              description: A column used to display rows from this view - usually used when
+                rendered in tables.
+            query:
+              description: Search parameters for view
+              type: object
+              properties:
+                logicalOperator:
+                  description: When using groups this defines whether all of the filters must
+                    match, or only one of them.
+                  type: string
+                  enum:
+                    - all
+                    - any
+                onEmptyFilter:
+                  description: If no filters match, should the view return all rows, or no rows.
+                  type: string
+                  enum:
+                    - all
+                    - none
+                groups:
+                  description: A grouping of filters to be applied.
+                  type: array
+                  items:
+                    type: object
+                    properties:
+                      logicalOperator:
+                        description: When using groups this defines whether all of the filters must
+                          match, or only one of them.
+                        type: string
+                        enum:
+                          - all
+                          - any
+                      filters:
+                        description: A list of filters to apply
+                        type: array
+                        items:
+                          type: object
+                          properties:
+                            operator:
+                              type: string
+                              description: The type of search operation which is being performed.
+                              enum:
+                                - equal
+                                - notEqual
+                                - empty
+                                - notEmpty
+                                - fuzzy
+                                - string
+                                - contains
+                                - notContains
+                                - containsAny
+                                - oneOf
+                                - range
+                            field:
+                              type: string
+                              description: The field in the view to perform the search on.
+                            value:
+                              description: The value to search for - the type will depend on the operator in
+                                use.
+                              oneOf:
+                                - type: string
+                                - type: number
+                                - type: boolean
+                                - type: object
+                                - type: array
+                      groups:
+                        description: A grouping of filters to be applied.
+                        type: array
+                        items:
+                          type: object
+                          properties:
+                            logicalOperator:
+                              description: When using groups this defines whether all of the filters must
+                                match, or only one of them.
+                              type: string
+                              enum:
+                                - all
+                                - any
+                            filters:
+                              description: A list of filters to apply
+                              type: array
+                              items:
+                                type: object
+                                properties:
+                                  operator:
+                                    type: string
+                                    description: The type of search operation which is being performed.
+                                    enum:
+                                      - equal
+                                      - notEqual
+                                      - empty
+                                      - notEmpty
+                                      - fuzzy
+                                      - string
+                                      - contains
+                                      - notContains
+                                      - containsAny
+                                      - oneOf
+                                      - range
+                                  field:
+                                    type: string
+                                    description: The field in the view to perform the search on.
+                                  value:
+                                    description: The value to search for - the type will depend on the operator in
+                                      use.
+                                    oneOf:
+                                      - type: string
+                                      - type: number
+                                      - type: boolean
+                                      - type: object
+                                      - type: array
+            sort:
+              type: object
+              required:
+                - field
+              properties:
+                field:
+                  type: string
+                  description: The field from the table/view schema to sort on.
+                order:
+                  type: string
+                  description: The order in which to sort.
+                  enum:
+                    - ascending
+                    - descending
+                type:
+                  type: string
+                  description: The type of sort to perform (by number, or by alphabetically).
+                  enum:
+                    - string
+                    - number
+            schema:
+              type: object
+              additionalProperties:
+                oneOf:
+                  - type: object
+                    properties:
+                      visible:
+                        type: boolean
+                        description: Defines whether the column is visible or not - rows
+                          retrieved/updated through this view will not be able
+                          to access it.
+                      readonly:
+                        type: boolean
+                        description: "When used in combination with 'visible: true' the column will be
+                          visible in row responses but cannot be updated."
+                      order:
+                        type: integer
+                        description: A number defining where the column shows up in tables, lowest being
+                          first.
+                      width:
+                        type: integer
+                        description: A width for the column, defined in pixels - this affects rendering
+                          in tables.
+                      column:
+                        type: array
+                        description: If this is a relationship column, we can set the columns we wish to
+                          include
+                        items:
+                          type: object
+                          properties:
+                            readonly:
+                              type: boolean
+                  - type: object
+                    properties:
+                      calculationType:
+                        type: string
+                        description: This column should be built from a calculation, specifying a type
+                          and field. It is important to note when a calculation
+                          is configured all non-calculation columns will be used
+                          for grouping.
+                        enum:
+                          - sum
+                          - avg
+                          - count
+                          - min
+                          - max
+                      field:
+                        type: string
+                        description: The field from the table to perform the calculation on.
+                      distinct:
+                        type: boolean
+                        description: Can be used in tandem with the count calculation type, to count
+                          unique entries.
+            id:
+              description: The ID of the view.
+              type: string
+      required:
+        - data
+    viewSearch:
+      type: object
+      properties:
+        data:
+          type: array
+          items:
+            description: The view to be created/updated.
+            type: object
+            required:
+              - name
+              - schema
+              - tableId
+              - id
+            properties:
+              name:
+                description: The name of the view.
+                type: string
+              tableId:
+                description: The ID of the table this view is based on.
+                type: string
+              type:
+                description: The type of view - standard (empty value) or calculation.
+                type: string
+                enum:
+                  - calculation
+              primaryDisplay:
+                type: string
+                description: A column used to display rows from this view - usually used when
+                  rendered in tables.
+              query:
+                description: Search parameters for view
+                type: object
+                properties:
+                  logicalOperator:
+                    description: When using groups this defines whether all of the filters must
+                      match, or only one of them.
+                    type: string
+                    enum:
+                      - all
+                      - any
+                  onEmptyFilter:
+                    description: If no filters match, should the view return all rows, or no rows.
+                    type: string
+                    enum:
+                      - all
+                      - none
+                  groups:
+                    description: A grouping of filters to be applied.
+                    type: array
+                    items:
+                      type: object
+                      properties:
+                        logicalOperator:
+                          description: When using groups this defines whether all of the filters must
+                            match, or only one of them.
+                          type: string
+                          enum:
+                            - all
+                            - any
+                        filters:
+                          description: A list of filters to apply
+                          type: array
+                          items:
+                            type: object
+                            properties:
+                              operator:
+                                type: string
+                                description: The type of search operation which is being performed.
+                                enum:
+                                  - equal
+                                  - notEqual
+                                  - empty
+                                  - notEmpty
+                                  - fuzzy
+                                  - string
+                                  - contains
+                                  - notContains
+                                  - containsAny
+                                  - oneOf
+                                  - range
+                              field:
+                                type: string
+                                description: The field in the view to perform the search on.
+                              value:
+                                description: The value to search for - the type will depend on the operator in
+                                  use.
+                                oneOf:
+                                  - type: string
+                                  - type: number
+                                  - type: boolean
+                                  - type: object
+                                  - type: array
+                        groups:
+                          description: A grouping of filters to be applied.
+                          type: array
+                          items:
+                            type: object
+                            properties:
+                              logicalOperator:
+                                description: When using groups this defines whether all of the filters must
+                                  match, or only one of them.
+                                type: string
+                                enum:
+                                  - all
+                                  - any
+                              filters:
+                                description: A list of filters to apply
+                                type: array
+                                items:
+                                  type: object
+                                  properties:
+                                    operator:
+                                      type: string
+                                      description: The type of search operation which is being performed.
+                                      enum:
+                                        - equal
+                                        - notEqual
+                                        - empty
+                                        - notEmpty
+                                        - fuzzy
+                                        - string
+                                        - contains
+                                        - notContains
+                                        - containsAny
+                                        - oneOf
+                                        - range
+                                    field:
+                                      type: string
+                                      description: The field in the view to perform the search on.
+                                    value:
+                                      description: The value to search for - the type will depend on the operator in
+                                        use.
+                                      oneOf:
+                                        - type: string
+                                        - type: number
+                                        - type: boolean
+                                        - type: object
+                                        - type: array
+              sort:
+                type: object
+                required:
+                  - field
+                properties:
+                  field:
+                    type: string
+                    description: The field from the table/view schema to sort on.
+                  order:
+                    type: string
+                    description: The order in which to sort.
+                    enum:
+                      - ascending
+                      - descending
+                  type:
+                    type: string
+                    description: The type of sort to perform (by number, or by alphabetically).
+                    enum:
+                      - string
+                      - number
+              schema:
+                type: object
+                additionalProperties:
+                  oneOf:
+                    - type: object
+                      properties:
+                        visible:
+                          type: boolean
+                          description: Defines whether the column is visible or not - rows
+                            retrieved/updated through this view will not be able
+                            to access it.
+                        readonly:
+                          type: boolean
+                          description: "When used in combination with 'visible: true' the column will be
+                            visible in row responses but cannot be updated."
+                        order:
+                          type: integer
+                          description: A number defining where the column shows up in tables, lowest being
+                            first.
+                        width:
+                          type: integer
+                          description: A width for the column, defined in pixels - this affects rendering
+                            in tables.
+                        column:
+                          type: array
+                          description: If this is a relationship column, we can set the columns we wish to
+                            include
+                          items:
+                            type: object
+                            properties:
+                              readonly:
+                                type: boolean
+                    - type: object
+                      properties:
+                        calculationType:
+                          type: string
+                          description: This column should be built from a calculation, specifying a type
+                            and field. It is important to note when a
+                            calculation is configured all non-calculation
+                            columns will be used for grouping.
+                          enum:
+                            - sum
+                            - avg
+                            - count
+                            - min
+                            - max
+                        field:
+                          type: string
+                          description: The field from the table to perform the calculation on.
+                        distinct:
+                          type: boolean
+                          description: Can be used in tandem with the count calculation type, to count
+                            unique entries.
+              id:
+                description: The ID of the view.
+                type: string
+      required:
+        - data
 security:
   - ApiKeyAuth: []
 paths:
@@ -2136,6 +2843,32 @@ paths:
               examples:
                 search:
                   $ref: "#/components/examples/rows"
+  "/views/{viewId}/rows/search":
+    post:
+      operationId: rowViewSearch
+      summary: Search for rows in a view
+      tags:
+        - rows
+      parameters:
+        - $ref: "#/components/parameters/viewId"
+        - $ref: "#/components/parameters/appId"
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: "#/components/schemas/rowSearch"
+      responses:
+        "200":
+          description: The response will contain an array of rows that match the search
+            parameters.
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/searchOutput"
+              examples:
+                search:
+                  $ref: "#/components/examples/rows"
   /tables:
     post:
       operationId: tableCreate
@@ -2359,4 +3092,123 @@ paths:
               examples:
                 users:
                   $ref: "#/components/examples/users"
+  /views:
+    post:
+      operationId: viewCreate
+      summary: Create a view
+      description: Create a view, this can be against an internal or external table.
+      tags:
+        - views
+      parameters:
+        - $ref: "#/components/parameters/appId"
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: "#/components/schemas/view"
+            examples:
+              view:
+                $ref: "#/components/examples/view"
+      responses:
+        "200":
+          description: Returns the created view, including the ID which has been generated
+            for it.
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/viewOutput"
+              examples:
+                view:
+                  $ref: "#/components/examples/view"
+  "/views/{viewId}":
+    put:
+      operationId: viewUpdate
+      summary: Update a view
+      description: Update a view, this can be against an internal or external table.
+      tags:
+        - views
+      parameters:
+        - $ref: "#/components/parameters/viewId"
+        - $ref: "#/components/parameters/appId"
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: "#/components/schemas/view"
+            examples:
+              view:
+                $ref: "#/components/examples/view"
+      responses:
+        "200":
+          description: Returns the updated view.
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/viewOutput"
+              examples:
+                view:
+                  $ref: "#/components/examples/view"
+    delete:
+      operationId: viewDestroy
+      summary: Delete a view
+      description: Delete a view, this can be against an internal or external table.
+      tags:
+        - views
+      parameters:
+        - $ref: "#/components/parameters/viewId"
+        - $ref: "#/components/parameters/appId"
+      responses:
+        "200":
+          description: Returns the deleted view.
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/viewOutput"
+              examples:
+                view:
+                  $ref: "#/components/examples/view"
+    get:
+      operationId: viewGetById
+      summary: Retrieve a view
+      description: Lookup a view, this could be internal or external.
+      tags:
+        - views
+      parameters:
+        - $ref: "#/components/parameters/viewId"
+        - $ref: "#/components/parameters/appId"
+      responses:
+        "200":
+          description: Returns the retrieved view.
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/viewOutput"
+              examples:
+                view:
+                  $ref: "#/components/examples/view"
+  /views/search:
+    post:
+      operationId: viewSearch
+      summary: Search for views
+      description: Based on view properties (currently only name) search for views.
+      tags:
+        - views
+      parameters:
+        - $ref: "#/components/parameters/appId"
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: "#/components/schemas/nameSearch"
+      responses:
+        "200":
+          description: Returns the found views, based on the search parameters.
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/viewSearch"
+              examples:
+                views:
+                  $ref: "#/components/examples/views"
 tags: []
diff --git a/packages/server/specs/parameters.ts b/packages/server/specs/parameters.ts
index 2726ca5064..b3fb274567 100644
--- a/packages/server/specs/parameters.ts
+++ b/packages/server/specs/parameters.ts
@@ -8,6 +8,16 @@ export const tableId = {
   },
 }
 
+export const viewId = {
+  in: "path",
+  name: "viewId",
+  required: true,
+  description: "The ID of the view which this request is targeting.",
+  schema: {
+    type: "string",
+  },
+}
+
 export const rowId = {
   in: "path",
   name: "rowId",
diff --git a/packages/server/specs/resources/index.ts b/packages/server/specs/resources/index.ts
index 49508e2e4f..0d32f2a007 100644
--- a/packages/server/specs/resources/index.ts
+++ b/packages/server/specs/resources/index.ts
@@ -6,6 +6,7 @@ import user from "./user"
 import metrics from "./metrics"
 import misc from "./misc"
 import roles from "./roles"
+import view from "./view"
 
 export const examples = {
   ...application.getExamples(),
@@ -16,6 +17,7 @@ export const examples = {
   ...misc.getExamples(),
   ...metrics.getExamples(),
   ...roles.getExamples(),
+  ...view.getExamples(),
 }
 
 export const schemas = {
@@ -26,4 +28,5 @@ export const schemas = {
   ...user.getSchemas(),
   ...misc.getSchemas(),
   ...roles.getSchemas(),
+  ...view.getSchemas(),
 }
diff --git a/packages/server/specs/resources/misc.ts b/packages/server/specs/resources/misc.ts
index f56dff3301..8f77d2b22a 100644
--- a/packages/server/specs/resources/misc.ts
+++ b/packages/server/specs/resources/misc.ts
@@ -1,99 +1,101 @@
 import { object } from "./utils"
 import Resource from "./utils/Resource"
 
+export const searchSchema = {
+  type: "object",
+  properties: {
+    allOr: {
+      type: "boolean",
+      description:
+        "Specifies that a row should be returned if it satisfies any of the specified options, rather than requiring it to fulfill all the search parameters. This defaults to false, meaning AND logic will be used.",
+    },
+    string: {
+      type: "object",
+      example: {
+        columnName1: "value",
+        columnName2: "value",
+      },
+      description:
+        "A map of field name to the string to search for, this will look for rows that have a value starting with the string value.",
+      additionalProperties: {
+        type: "string",
+        description: "The value to search for in the column.",
+      },
+    },
+    fuzzy: {
+      type: "object",
+      description:
+        "Searches for a sub-string within a string column, e.g. searching for 'dib' will match 'Budibase'.",
+    },
+    range: {
+      type: "object",
+      description:
+        'Searches within a range, the format of this must be in the format of an object with a "low" and "high" property.',
+      example: {
+        columnName1: {
+          low: 10,
+          high: 20,
+        },
+      },
+    },
+    equal: {
+      type: "object",
+      description:
+        "Searches for rows that have a column value that is exactly the value set.",
+    },
+    notEqual: {
+      type: "object",
+      description:
+        "Searches for any row which does not contain the specified column value.",
+    },
+    empty: {
+      type: "object",
+      description:
+        "Searches for rows which do not contain the specified column. The object should simply contain keys of the column names, these can map to any value.",
+      example: {
+        columnName1: "",
+      },
+    },
+    notEmpty: {
+      type: "object",
+      description: "Searches for rows which have the specified column.",
+    },
+    oneOf: {
+      type: "object",
+      description:
+        "Searches for rows which have a column value that is any of the specified values. The format of this must be columnName -> [value1, value2].",
+    },
+    contains: {
+      type: "object",
+      description:
+        "Searches for a value, or set of values in array column types (such as a multi-select). If an array of search options is provided then it must match all.",
+      example: {
+        arrayColumn: ["a", "b"],
+      },
+    },
+    notContains: {
+      type: "object",
+      description:
+        "The logical inverse of contains. Only works on array column types. If an array of values is passed, the row must not match any of them to be returned in the response.",
+      example: {
+        arrayColumn: ["a", "b"],
+      },
+    },
+    containsAny: {
+      type: "object",
+      description:
+        "As with the contains search, only works on array column types and searches for any of the provided values when given an array.",
+      example: {
+        arrayColumn: ["a", "b"],
+      },
+    },
+  },
+}
+
 export default new Resource().setSchemas({
   rowSearch: object(
     {
-      query: {
-        type: "object",
-        properties: {
-          allOr: {
-            type: "boolean",
-            description:
-              "Specifies that a row should be returned if it satisfies any of the specified options, rather than requiring it to fulfill all the search parameters. This defaults to false, meaning AND logic will be used.",
-          },
-          string: {
-            type: "object",
-            example: {
-              columnName1: "value",
-              columnName2: "value",
-            },
-            description:
-              "A map of field name to the string to search for, this will look for rows that have a value starting with the string value.",
-            additionalProperties: {
-              type: "string",
-              description: "The value to search for in the column.",
-            },
-          },
-          fuzzy: {
-            type: "object",
-            description:
-              "Searches for a sub-string within a string column, e.g. searching for 'dib' will match 'Budibase'.",
-          },
-          range: {
-            type: "object",
-            description:
-              'Searches within a range, the format of this must be in the format of an object with a "low" and "high" property.',
-            example: {
-              columnName1: {
-                low: 10,
-                high: 20,
-              },
-            },
-          },
-          equal: {
-            type: "object",
-            description:
-              "Searches for rows that have a column value that is exactly the value set.",
-          },
-          notEqual: {
-            type: "object",
-            description:
-              "Searches for any row which does not contain the specified column value.",
-          },
-          empty: {
-            type: "object",
-            description:
-              "Searches for rows which do not contain the specified column. The object should simply contain keys of the column names, these can map to any value.",
-            example: {
-              columnName1: "",
-            },
-          },
-          notEmpty: {
-            type: "object",
-            description: "Searches for rows which have the specified column.",
-          },
-          oneOf: {
-            type: "object",
-            description:
-              "Searches for rows which have a column value that is any of the specified values. The format of this must be columnName -> [value1, value2].",
-          },
-          contains: {
-            type: "object",
-            description:
-              "Searches for a value, or set of values in array column types (such as a multi-select). If an array of search options is provided then it must match all.",
-            example: {
-              arrayColumn: ["a", "b"],
-            },
-          },
-          notContains: {
-            type: "object",
-            description:
-              "The logical inverse of contains. Only works on array column types. If an array of values is passed, the row must not match any of them to be returned in the response.",
-            example: {
-              arrayColumn: ["a", "b"],
-            },
-          },
-          containsAny: {
-            type: "object",
-            description:
-              "As with the contains search, only works on array column types and searches for any of the provided values when given an array.",
-            example: {
-              arrayColumn: ["a", "b"],
-            },
-          },
-        },
-      },
+      query: searchSchema,
       paginate: {
         type: "boolean",
         description: "Enables pagination, by default this is disabled.",
diff --git a/packages/server/specs/resources/view.ts b/packages/server/specs/resources/view.ts
new file mode 100644
index 0000000000..5becd67a37
--- /dev/null
+++ b/packages/server/specs/resources/view.ts
@@ -0,0 +1,273 @@
+import { object } from "./utils"
+import Resource from "./utils/Resource"
+import {
+  ArrayOperator,
+  BasicOperator,
+  CalculationType,
+  RangeOperator,
+  SortOrder,
+  SortType,
+} from "@budibase/types"
+import { cloneDeep } from "lodash"
+
+const view = {
+  name: "peopleView",
+  tableId: "ta_896a325f7e8147d2a2cda93c5d236511",
+  schema: {
+    name: {
+      visible: true,
+      readonly: false,
+      order: 1,
+      width: 300,
+    },
+    age: {
+      visible: true,
+      readonly: true,
+      order: 2,
+      width: 200,
+    },
+    salary: {
+      visible: false,
+      readonly: false,
+    },
+  },
+  query: {
+    logicalOperator: "all",
+    onEmptyFilter: "none",
+    groups: [
+      {
+        logicalOperator: "any",
+        filters: [
+          { operator: "string", field: "name", value: "John" },
+          { operator: "range", field: "age", value: { low: 18, high: 100 } },
+        ],
+      },
+    ],
+  },
+  primaryDisplay: "name",
+}
+
+const baseColumnDef = {
+  visible: {
+    type: "boolean",
+    description:
+      "Defines whether the column is visible or not - rows retrieved/updated through this view will not be able to access it.",
+  },
+  readonly: {
+    type: "boolean",
+    description:
+      "When used in combination with 'visible: true' the column will be visible in row responses but cannot be updated.",
+  },
+  order: {
+    type: "integer",
+    description:
+      "A number defining where the column shows up in tables, lowest being first.",
+  },
+  width: {
+    type: "integer",
+    description:
+      "A width for the column, defined in pixels - this affects rendering in tables.",
+  },
+  column: {
+    type: "array",
+    description:
+      "If this is a relationship column, we can set the columns we wish to include",
+    items: {
+      type: "object",
+      properties: {
+        readonly: {
+          type: "boolean",
+        },
+      },
+    },
+  },
+}
+
+const logicalOperator = {
+  description:
+    "When using groups this defines whether all of the filters must match, or only one of them.",
+  type: "string",
+  enum: ["all", "any"],
+}
+
+const filterGroup = {
+  description: "A grouping of filters to be applied.",
+  type: "array",
+  items: {
+    type: "object",
+    properties: {
+      logicalOperator,
+      filters: {
+        description: "A list of filters to apply",
+        type: "array",
+        items: {
+          type: "object",
+          properties: {
+            operator: {
+              type: "string",
+              description:
+                "The type of search operation which is being performed.",
+              enum: [
+                ...Object.values(BasicOperator),
+                ...Object.values(ArrayOperator),
+                ...Object.values(RangeOperator),
+              ],
+            },
+            field: {
+              type: "string",
+              description: "The field in the view to perform the search on.",
+            },
+            value: {
+              description:
+                "The value to search for - the type will depend on the operator in use.",
+              oneOf: [
+                { type: "string" },
+                { type: "number" },
+                { type: "boolean" },
+                { type: "object" },
+                { type: "array" },
+              ],
+            },
+          },
+        },
+      },
+    },
+  },
+}
+
+// have to clone to avoid constantly recursive structure - we can't represent this easily
+const layeredFilterGroup: any = cloneDeep(filterGroup)
+layeredFilterGroup.items.properties.groups = filterGroup
+
+const viewQuerySchema = {
+  description: "Search parameters for view",
+  type: "object",
+  properties: {
+    logicalOperator,
+    onEmptyFilter: {
+      description:
+        "If no filters match, should the view return all rows, or no rows.",
+      type: "string",
+      enum: ["all", "none"],
+    },
+    groups: layeredFilterGroup,
+  },
+}
+
+const viewSchema = {
+  description: "The view to be created/updated.",
+  type: "object",
+  required: ["name", "schema", "tableId"],
+  properties: {
+    name: {
+      description: "The name of the view.",
+      type: "string",
+    },
+    tableId: {
+      description: "The ID of the table this view is based on.",
+      type: "string",
+    },
+    type: {
+      description: "The type of view - standard (empty value) or calculation.",
+      type: "string",
+      enum: ["calculation"],
+    },
+    primaryDisplay: {
+      type: "string",
+      description:
+        "A column used to display rows from this view - usually used when rendered in tables.",
+    },
+    query: viewQuerySchema,
+    sort: {
+      type: "object",
+      required: ["field"],
+      properties: {
+        field: {
+          type: "string",
+          description: "The field from the table/view schema to sort on.",
+        },
+        order: {
+          type: "string",
+          description: "The order in which to sort.",
+          enum: Object.values(SortOrder),
+        },
+        type: {
+          type: "string",
+          description:
+            "The type of sort to perform (by number, or by alphabetically).",
+          enum: Object.values(SortType),
+        },
+      },
+    },
+    schema: {
+      type: "object",
+      additionalProperties: {
+        oneOf: [
+          {
+            type: "object",
+            properties: baseColumnDef,
+          },
+          {
+            type: "object",
+            properties: {
+              calculationType: {
+                type: "string",
+                description:
+                  "This column should be built from a calculation, specifying a type and field. It is important to note when a calculation is configured all non-calculation columns will be used for grouping.",
+                enum: Object.values(CalculationType),
+              },
+              field: {
+                type: "string",
+                description:
+                  "The field from the table to perform the calculation on.",
+              },
+              distinct: {
+                type: "boolean",
+                description:
+                  "Can be used in tandem with the count calculation type, to count unique entries.",
+              },
+            },
+          },
+        ],
+      },
+    },
+  },
+}
+
+const viewOutputSchema = {
+  ...viewSchema,
+  properties: {
+    ...viewSchema.properties,
+    id: {
+      description: "The ID of the view.",
+      type: "string",
+    },
+  },
+  required: [...viewSchema.required, "id"],
+}
+
+export default new Resource()
+  .setExamples({
+    view: {
+      value: {
+        data: view,
+      },
+    },
+    views: {
+      value: {
+        data: [view],
+      },
+    },
+  })
+  .setSchemas({
+    view: viewSchema,
+    viewOutput: object({
+      data: viewOutputSchema,
+    }),
+    viewSearch: object({
+      data: {
+        type: "array",
+        items: viewOutputSchema,
+      },
+    }),
+  })
diff --git a/packages/server/src/api/controllers/public/mapping/applications.ts b/packages/server/src/api/controllers/public/mapping/applications.ts
index 0b729fc610..74c55e1c7b 100644
--- a/packages/server/src/api/controllers/public/mapping/applications.ts
+++ b/packages/server/src/api/controllers/public/mapping/applications.ts
@@ -1,6 +1,7 @@
 import { Application } from "./types"
+import { RequiredKeys } from "@budibase/types"
 
-function application(body: any): Application {
+function application(body: any): RequiredKeys<Application> {
   let app = body?.application ? body.application : body
   return {
     _id: app.appId,
diff --git a/packages/server/src/api/controllers/public/mapping/index.ts b/packages/server/src/api/controllers/public/mapping/index.ts
index 0cdcfbbe4b..b765f4bd76 100644
--- a/packages/server/src/api/controllers/public/mapping/index.ts
+++ b/packages/server/src/api/controllers/public/mapping/index.ts
@@ -3,6 +3,7 @@ import applications from "./applications"
 import users from "./users"
 import rows from "./rows"
 import queries from "./queries"
+import views from "./views"
 
 export default {
   ...tables,
@@ -10,4 +11,5 @@ export default {
   ...users,
   ...rows,
   ...queries,
+  ...views,
 }
diff --git a/packages/server/src/api/controllers/public/mapping/queries.ts b/packages/server/src/api/controllers/public/mapping/queries.ts
index 481b5f18c4..d0857453f6 100644
--- a/packages/server/src/api/controllers/public/mapping/queries.ts
+++ b/packages/server/src/api/controllers/public/mapping/queries.ts
@@ -1,6 +1,7 @@
 import { Query, ExecuteQuery } from "./types"
+import { RequiredKeys } from "@budibase/types"
 
-function query(body: any): Query {
+function query(body: any): RequiredKeys<Query> {
   return {
     _id: body._id,
     datasourceId: body.datasourceId,
diff --git a/packages/server/src/api/controllers/public/mapping/rows.ts b/packages/server/src/api/controllers/public/mapping/rows.ts
index c1cba43718..69f376bebf 100644
--- a/packages/server/src/api/controllers/public/mapping/rows.ts
+++ b/packages/server/src/api/controllers/public/mapping/rows.ts
@@ -1,6 +1,7 @@
 import { Row, RowSearch } from "./types"
+import { RequiredKeys } from "@budibase/types"
 
-function row(body: any): Row {
+function row(body: any): RequiredKeys<Row> {
   delete body._rev
   // have to input everything, since structure unknown
   return {
diff --git a/packages/server/src/api/controllers/public/mapping/tables.ts b/packages/server/src/api/controllers/public/mapping/tables.ts
index 72ed9f1a9a..857feb82ca 100644
--- a/packages/server/src/api/controllers/public/mapping/tables.ts
+++ b/packages/server/src/api/controllers/public/mapping/tables.ts
@@ -1,6 +1,7 @@
 import { Table } from "./types"
+import { RequiredKeys } from "@budibase/types"
 
-function table(body: any): Table {
+function table(body: any): RequiredKeys<Table> {
   return {
     _id: body._id,
     name: body.name,
diff --git a/packages/server/src/api/controllers/public/mapping/types.ts b/packages/server/src/api/controllers/public/mapping/types.ts
index 9fea9b7213..6cbcfddb92 100644
--- a/packages/server/src/api/controllers/public/mapping/types.ts
+++ b/packages/server/src/api/controllers/public/mapping/types.ts
@@ -9,6 +9,9 @@ export type CreateApplicationParams = components["schemas"]["application"]
 export type Table = components["schemas"]["tableOutput"]["data"]
 export type CreateTableParams = components["schemas"]["table"]
 
+export type View = components["schemas"]["viewOutput"]["data"]
+export type CreateViewParams = components["schemas"]["view"]
+
 export type Row = components["schemas"]["rowOutput"]["data"]
 export type RowSearch = components["schemas"]["searchOutput"]
 export type CreateRowParams = components["schemas"]["row"]
diff --git a/packages/server/src/api/controllers/public/mapping/users.ts b/packages/server/src/api/controllers/public/mapping/users.ts
index 2a158bede9..232c81cec0 100644
--- a/packages/server/src/api/controllers/public/mapping/users.ts
+++ b/packages/server/src/api/controllers/public/mapping/users.ts
@@ -1,6 +1,7 @@
 import { User } from "./types"
+import { RequiredKeys } from "@budibase/types"
 
-function user(body: any): User {
+function user(body: any): RequiredKeys<User> {
   return {
     _id: body._id,
     email: body.email,
diff --git a/packages/server/src/api/controllers/public/mapping/views.ts b/packages/server/src/api/controllers/public/mapping/views.ts
new file mode 100644
index 0000000000..9ee1fe42d5
--- /dev/null
+++ b/packages/server/src/api/controllers/public/mapping/views.ts
@@ -0,0 +1,32 @@
+import { View } from "./types"
+import { ViewV2, Ctx, RequiredKeys } from "@budibase/types"
+import { dataFilters } from "@budibase/shared-core"
+
+function view(body: ViewV2): RequiredKeys<View> {
+  return {
+    id: body.id,
+    tableId: body.tableId,
+    type: body.type,
+    name: body.name,
+    schema: body.schema!,
+    primaryDisplay: body.primaryDisplay,
+    query: dataFilters.buildQuery(body.query),
+    sort: body.sort,
+  }
+}
+
+function mapView(ctx: Ctx<{ data: ViewV2 }>): { data: View } {
+  return {
+    data: view(ctx.body.data),
+  }
+}
+
+function mapViews(ctx: Ctx<{ data: ViewV2[] }>): { data: View[] } {
+  const views = ctx.body.data.map((body: ViewV2) => view(body))
+  return { data: views }
+}
+
+export default {
+  mapView,
+  mapViews,
+}
diff --git a/packages/server/src/api/controllers/public/rows.ts b/packages/server/src/api/controllers/public/rows.ts
index 16403b06c9..3c9cbf0ddd 100644
--- a/packages/server/src/api/controllers/public/rows.ts
+++ b/packages/server/src/api/controllers/public/rows.ts
@@ -22,13 +22,13 @@ export function fixRow(row: Row, params: any) {
   return row
 }
 
-export async function search(ctx: UserCtx, next: Next) {
+function buildSearchRequestBody(ctx: UserCtx) {
   let { sort, paginate, bookmark, limit, query } = ctx.request.body
   // update the body to the correct format of the internal search
   if (!sort) {
     sort = {}
   }
-  ctx.request.body = {
+  return {
     sort: sort.column,
     sortType: sort.type,
     sortOrder: sort.order,
@@ -37,10 +37,23 @@ export async function search(ctx: UserCtx, next: Next) {
     limit,
     query,
   }
+}
+
+export async function search(ctx: UserCtx, next: Next) {
+  ctx.request.body = buildSearchRequestBody(ctx)
   await rowController.search(ctx)
   await next()
 }
 
+export async function viewSearch(ctx: UserCtx, next: Next) {
+  ctx.request.body = buildSearchRequestBody(ctx)
+  ctx.params = {
+    viewId: ctx.params.viewId,
+  }
+  await rowController.views.searchView(ctx)
+  await next()
+}
+
 export async function create(ctx: UserCtx, next: Next) {
   ctx.request.body = fixRow(ctx.request.body, ctx.params)
   await rowController.save(ctx)
@@ -79,4 +92,5 @@ export default {
   update,
   destroy,
   search,
+  viewSearch,
 }
diff --git a/packages/server/src/api/controllers/public/views.ts b/packages/server/src/api/controllers/public/views.ts
new file mode 100644
index 0000000000..5b08f39e36
--- /dev/null
+++ b/packages/server/src/api/controllers/public/views.ts
@@ -0,0 +1,95 @@
+import { search as stringSearch } from "./utils"
+import * as controller from "../view"
+import { ViewV2, UserCtx, UISearchFilter, PublicAPIView } from "@budibase/types"
+import { Next } from "koa"
+import { merge } from "lodash"
+
+function viewRequest(view: PublicAPIView, params?: { viewId: string }) {
+  const viewV2: ViewV2 = view
+  if (!viewV2) {
+    return viewV2
+  }
+  if (params?.viewId) {
+    viewV2.id = params.viewId
+  }
+  if (!view.query) {
+    viewV2.query = {}
+  } else {
+    // public API only has one form of query
+    viewV2.queryUI = viewV2.query as UISearchFilter
+  }
+  viewV2.version = 2
+  return viewV2
+}
+
+function viewResponse(view: ViewV2): PublicAPIView {
+  // remove our internal structure - always un-necessary
+  delete view.query
+  return {
+    ...view,
+    query: view.queryUI,
+  }
+}
+
+function viewsResponse(views: ViewV2[]): PublicAPIView[] {
+  return views.map(viewResponse)
+}
+
+export async function search(ctx: UserCtx, next: Next) {
+  const { name } = ctx.request.body
+  await controller.v2.fetch(ctx)
+  ctx.body.data = viewsResponse(stringSearch(ctx.body.data, name))
+  await next()
+}
+
+export async function create(ctx: UserCtx, next: Next) {
+  ctx = merge(ctx, {
+    request: {
+      body: viewRequest(ctx.request.body),
+    },
+  })
+  await controller.v2.create(ctx)
+  ctx.body.data = viewResponse(ctx.body.data)
+  await next()
+}
+
+export async function read(ctx: UserCtx, next: Next) {
+  ctx = merge(ctx, {
+    params: {
+      viewId: ctx.params.viewId,
+    },
+  })
+  await controller.v2.get(ctx)
+  ctx.body.data = viewResponse(ctx.body.data)
+  await next()
+}
+
+export async function update(ctx: UserCtx, next: Next) {
+  const viewId = ctx.params.viewId
+  ctx = merge(ctx, {
+    request: {
+      body: {
+        data: viewRequest(ctx.request.body, { viewId }),
+      },
+    },
+    params: {
+      viewId,
+    },
+  })
+  await controller.v2.update(ctx)
+  ctx.body.data = viewResponse(ctx.body.data)
+  await next()
+}
+
+export async function destroy(ctx: UserCtx, next: Next) {
+  await controller.v2.remove(ctx)
+  await next()
+}
+
+export default {
+  create,
+  read,
+  update,
+  destroy,
+  search,
+}
diff --git a/packages/server/src/api/controllers/row/views.ts b/packages/server/src/api/controllers/row/views.ts
index 58bd40b529..eb010fee98 100644
--- a/packages/server/src/api/controllers/row/views.ts
+++ b/packages/server/src/api/controllers/row/views.ts
@@ -51,6 +51,7 @@ export async function searchView(
   result.rows.forEach(r => (r._viewId = view.id))
   ctx.body = result
 }
+
 function getSortOptions(request: SearchViewRowRequest, view: ViewV2) {
   if (request.sort) {
     return {
diff --git a/packages/server/src/api/controllers/view/viewsV2.ts b/packages/server/src/api/controllers/view/viewsV2.ts
index 753125e0f6..986764a697 100644
--- a/packages/server/src/api/controllers/view/viewsV2.ts
+++ b/packages/server/src/api/controllers/view/viewsV2.ts
@@ -12,6 +12,7 @@ import {
   RelationSchemaField,
   ViewFieldMetadata,
   CalculationType,
+  ViewFetchResponseEnriched,
   CountDistinctCalculationFieldMetadata,
   CountCalculationFieldMetadata,
 } from "@budibase/types"
@@ -125,6 +126,12 @@ export async function get(ctx: Ctx<void, ViewResponseEnriched>) {
   }
 }
 
+export async function fetch(ctx: Ctx<void, ViewFetchResponseEnriched>) {
+  ctx.body = {
+    data: await sdk.views.getAllEnriched(),
+  }
+}
+
 export async function create(ctx: Ctx<CreateViewRequest, ViewResponse>) {
   const view = ctx.request.body
   const { tableId } = view
diff --git a/packages/server/src/api/routes/public/index.ts b/packages/server/src/api/routes/public/index.ts
index b665e83f6f..531192811c 100644
--- a/packages/server/src/api/routes/public/index.ts
+++ b/packages/server/src/api/routes/public/index.ts
@@ -4,19 +4,21 @@ import queryEndpoints from "./queries"
 import tableEndpoints from "./tables"
 import rowEndpoints from "./rows"
 import userEndpoints from "./users"
+import viewEndpoints from "./views"
 import roleEndpoints from "./roles"
 import authorized from "../../../middleware/authorized"
 import publicApi from "../../../middleware/publicApi"
 import { paramResource, paramSubResource } from "../../../middleware/resourceId"
-import { PermissionType, PermissionLevel } from "@budibase/types"
+import { PermissionLevel, PermissionType } from "@budibase/types"
 import { CtxFn } from "./utils/Endpoint"
 import mapperMiddleware from "./middleware/mapper"
 import env from "../../../environment"
+import { middleware, redis } from "@budibase/backend-core"
+import { SelectableDatabase } from "@budibase/backend-core/src/redis/utils"
+import cors from "@koa/cors"
 // below imports don't have declaration files
 const Router = require("@koa/router")
 const { RateLimit, Stores } = require("koa2-ratelimit")
-import { middleware, redis } from "@budibase/backend-core"
-import { SelectableDatabase } from "@budibase/backend-core/src/redis/utils"
 
 interface KoaRateLimitOptions {
   socket: {
@@ -81,6 +83,7 @@ const publicRouter = new Router({
 if (limiter && !env.isDev()) {
   publicRouter.use(limiter)
 }
+publicRouter.use(cors())
 
 function addMiddleware(
   endpoints: any,
@@ -149,6 +152,7 @@ applyAdminRoutes(metricEndpoints)
 applyAdminRoutes(roleEndpoints)
 applyRoutes(appEndpoints, PermissionType.APP, "appId")
 applyRoutes(tableEndpoints, PermissionType.TABLE, "tableId")
+applyRoutes(viewEndpoints, PermissionType.VIEW, "viewId")
 applyRoutes(userEndpoints, PermissionType.USER, "userId")
 applyRoutes(queryEndpoints, PermissionType.QUERY, "queryId")
 // needs to be applied last for routing purposes, don't override other endpoints
diff --git a/packages/server/src/api/routes/public/middleware/mapper.ts b/packages/server/src/api/routes/public/middleware/mapper.ts
index 03feb6cc5c..9d0cae5d61 100644
--- a/packages/server/src/api/routes/public/middleware/mapper.ts
+++ b/packages/server/src/api/routes/public/middleware/mapper.ts
@@ -1,9 +1,10 @@
 import { Ctx } from "@budibase/types"
 import mapping from "../../../controllers/public/mapping"
 
-enum Resources {
+enum Resource {
   APPLICATION = "applications",
   TABLES = "tables",
+  VIEWS = "views",
   ROWS = "rows",
   USERS = "users",
   QUERIES = "queries",
@@ -15,7 +16,7 @@ function isAttachment(ctx: Ctx) {
 }
 
 function isArrayResponse(ctx: Ctx) {
-  return ctx.url.endsWith(Resources.SEARCH) || Array.isArray(ctx.body)
+  return ctx.url.endsWith(Resource.SEARCH) || Array.isArray(ctx.body)
 }
 
 function noResponse(ctx: Ctx) {
@@ -38,6 +39,14 @@ function processTables(ctx: Ctx) {
   }
 }
 
+function processViews(ctx: Ctx) {
+  if (isArrayResponse(ctx)) {
+    return mapping.mapViews(ctx)
+  } else {
+    return mapping.mapView(ctx)
+  }
+}
+
 function processRows(ctx: Ctx) {
   if (isArrayResponse(ctx)) {
     return mapping.mapRowSearch(ctx)
@@ -71,20 +80,27 @@ export default async (ctx: Ctx, next: any) => {
   let body = {}
 
   switch (urlParts[0]) {
-    case Resources.APPLICATION:
+    case Resource.APPLICATION:
       body = processApplications(ctx)
       break
-    case Resources.TABLES:
-      if (urlParts[2] === Resources.ROWS) {
+    case Resource.TABLES:
+      if (urlParts[2] === Resource.ROWS) {
         body = processRows(ctx)
       } else {
         body = processTables(ctx)
       }
       break
-    case Resources.USERS:
+    case Resource.VIEWS:
+      if (urlParts[2] === Resource.ROWS) {
+        body = processRows(ctx)
+      } else {
+        body = processViews(ctx)
+      }
+      break
+    case Resource.USERS:
       body = processUsers(ctx)
       break
-    case Resources.QUERIES:
+    case Resource.QUERIES:
       body = processQueries(ctx)
       break
   }
diff --git a/packages/server/src/api/routes/public/rows.ts b/packages/server/src/api/routes/public/rows.ts
index 80ad6d6434..2fb81d4601 100644
--- a/packages/server/src/api/routes/public/rows.ts
+++ b/packages/server/src/api/routes/public/rows.ts
@@ -1,4 +1,4 @@
-import controller from "../../controllers/public/rows"
+import controller, { viewSearch } from "../../controllers/public/rows"
 import Endpoint from "./utils/Endpoint"
 import { externalSearchValidator } from "../utils/validators"
 
@@ -168,4 +168,40 @@ read.push(
   ).addMiddleware(externalSearchValidator())
 )
 
+/**
+ * @openapi
+ * /views/{viewId}/rows/search:
+ *   post:
+ *     operationId: rowViewSearch
+ *     summary: Search for rows in a view
+ *     tags:
+ *       - rows
+ *     parameters:
+ *       - $ref: '#/components/parameters/viewId'
+ *       - $ref: '#/components/parameters/appId'
+ *     requestBody:
+ *       required: true
+ *       content:
+ *         application/json:
+ *           schema:
+ *             $ref: '#/components/schemas/rowSearch'
+ *     responses:
+ *       200:
+ *         description: The response will contain an array of rows that match the search parameters.
+ *         content:
+ *           application/json:
+ *             schema:
+ *               $ref: '#/components/schemas/searchOutput'
+ *             examples:
+ *               search:
+ *                 $ref: '#/components/examples/rows'
+ */
+read.push(
+  new Endpoint(
+    "post",
+    "/views/:viewId/rows/search",
+    controller.viewSearch
+  ).addMiddleware(externalSearchValidator())
+)
+
 export default { read, write }
diff --git a/packages/server/src/api/routes/public/tests/Request.ts b/packages/server/src/api/routes/public/tests/Request.ts
index 92a4996124..3dfa11c0b3 100644
--- a/packages/server/src/api/routes/public/tests/Request.ts
+++ b/packages/server/src/api/routes/public/tests/Request.ts
@@ -1,13 +1,24 @@
-import { User, Table, SearchFilters, Row } from "@budibase/types"
+import {
+  User,
+  Table,
+  SearchFilters,
+  Row,
+  ViewV2Schema,
+  ViewV2,
+  ViewV2Type,
+  PublicAPIView,
+} from "@budibase/types"
 import { HttpMethod, MakeRequestResponse, generateMakeRequest } from "./utils"
 import TestConfiguration from "../../../../tests/utilities/TestConfiguration"
-import { Expectations } from "../../../../tests/utilities/api/base"
 
 type RequestOpts = { internal?: boolean; appId?: string }
 
+type Response<T> = { data: T }
+
 export interface PublicAPIExpectations {
   status?: number
   body?: Record<string, any>
+  headers?: Record<string, string>
 }
 
 export class PublicAPIRequest {
@@ -15,6 +26,7 @@ export class PublicAPIRequest {
   private appId: string | undefined
 
   tables: PublicTableAPI
+  views: PublicViewAPI
   rows: PublicRowAPI
   apiKey: string
 
@@ -28,6 +40,7 @@ export class PublicAPIRequest {
     this.appId = appId
     this.tables = new PublicTableAPI(this)
     this.rows = new PublicRowAPI(this)
+    this.views = new PublicViewAPI(this)
   }
 
   static async init(config: TestConfiguration, user: User, opts?: RequestOpts) {
@@ -59,6 +72,12 @@ export class PublicAPIRequest {
     if (expectations?.body) {
       expect(res.body).toEqual(expectations?.body)
     }
+    if (expectations?.headers) {
+      for (let [header, value] of Object.entries(expectations.headers)) {
+        const found = res.headers[header]
+        expect(found?.toLowerCase()).toEqual(value)
+      }
+    }
     return res.body
   }
 }
@@ -73,9 +92,16 @@ export class PublicTableAPI {
   async create(
     table: Table,
     expectations?: PublicAPIExpectations
-  ): Promise<{ data: Table }> {
+  ): Promise<Response<Table>> {
     return this.request.send("post", "/tables", table, expectations)
   }
+
+  async search(
+    name: string,
+    expectations?: PublicAPIExpectations
+  ): Promise<Response<Table[]>> {
+    return this.request.send("post", "/tables/search", { name }, expectations)
+  }
 }
 
 export class PublicRowAPI {
@@ -85,11 +111,24 @@ export class PublicRowAPI {
     this.request = request
   }
 
+  async create(
+    tableId: string,
+    row: Row,
+    expectations?: PublicAPIExpectations
+  ): Promise<Response<Row>> {
+    return this.request.send(
+      "post",
+      `/tables/${tableId}/rows`,
+      row,
+      expectations
+    )
+  }
+
   async search(
     tableId: string,
     query: SearchFilters,
     expectations?: PublicAPIExpectations
-  ): Promise<{ data: Row[] }> {
+  ): Promise<Response<Row[]>> {
     return this.request.send(
       "post",
       `/tables/${tableId}/rows/search`,
@@ -99,4 +138,75 @@ export class PublicRowAPI {
       expectations
     )
   }
+
+  async viewSearch(
+    viewId: string,
+    query: SearchFilters,
+    expectations?: PublicAPIExpectations
+  ): Promise<Response<Row[]>> {
+    return this.request.send(
+      "post",
+      `/views/${viewId}/rows/search`,
+      {
+        query,
+      },
+      expectations
+    )
+  }
+}
+
+export class PublicViewAPI {
+  request: PublicAPIRequest
+
+  constructor(request: PublicAPIRequest) {
+    this.request = request
+  }
+
+  async create(
+    view: Omit<PublicAPIView, "id" | "version">,
+    expectations?: PublicAPIExpectations
+  ): Promise<Response<PublicAPIView>> {
+    return this.request.send("post", "/views", view, expectations)
+  }
+
+  async update(
+    viewId: string,
+    view: Omit<PublicAPIView, "id" | "version">,
+    expectations?: PublicAPIExpectations
+  ): Promise<Response<PublicAPIView>> {
+    return this.request.send("put", `/views/${viewId}`, view, expectations)
+  }
+
+  async destroy(
+    viewId: string,
+    expectations?: PublicAPIExpectations
+  ): Promise<void> {
+    return this.request.send(
+      "delete",
+      `/views/${viewId}`,
+      undefined,
+      expectations
+    )
+  }
+
+  async find(
+    viewId: string,
+    expectations?: PublicAPIExpectations
+  ): Promise<Response<PublicAPIView>> {
+    return this.request.send("get", `/views/${viewId}`, undefined, expectations)
+  }
+
+  async search(
+    viewName: string,
+    expectations?: PublicAPIExpectations
+  ): Promise<Response<PublicAPIView[]>> {
+    return this.request.send(
+      "post",
+      "/views/search",
+      {
+        name: viewName,
+      },
+      expectations
+    )
+  }
 }
diff --git a/packages/server/src/api/routes/public/tests/cors.spec.ts b/packages/server/src/api/routes/public/tests/cors.spec.ts
new file mode 100644
index 0000000000..1a5895575d
--- /dev/null
+++ b/packages/server/src/api/routes/public/tests/cors.spec.ts
@@ -0,0 +1,21 @@
+import * as setup from "../../tests/utilities"
+import { PublicAPIRequest } from "./Request"
+
+describe("check public API security", () => {
+  const config = setup.getConfig()
+  let request: PublicAPIRequest
+
+  beforeAll(async () => {
+    await config.init()
+    request = await PublicAPIRequest.init(config, await config.globalUser())
+  })
+
+  it("should have Access-Control-Allow-Origin set to *", async () => {
+    await request.tables.search("", {
+      status: 200,
+      headers: {
+        "access-control-allow-origin": "*",
+      },
+    })
+  })
+})
diff --git a/packages/server/src/api/routes/public/tests/views.spec.ts b/packages/server/src/api/routes/public/tests/views.spec.ts
new file mode 100644
index 0000000000..1cbc383f7e
--- /dev/null
+++ b/packages/server/src/api/routes/public/tests/views.spec.ts
@@ -0,0 +1,95 @@
+import * as setup from "../../tests/utilities"
+import { basicTable } from "../../../../tests/utilities/structures"
+import { BasicOperator, Table, UILogicalOperator } from "@budibase/types"
+import { PublicAPIRequest } from "./Request"
+import { generator } from "@budibase/backend-core/tests"
+
+describe("check public API security", () => {
+  const config = setup.getConfig()
+  let request: PublicAPIRequest, table: Table
+
+  beforeAll(async () => {
+    await config.init()
+    request = await PublicAPIRequest.init(config, await config.globalUser())
+    table = (await request.tables.create(basicTable())).data
+  })
+
+  function baseView() {
+    return {
+      name: generator.word(),
+      tableId: table._id!,
+      query: {},
+      schema: {
+        name: {
+          readonly: true,
+          visible: true,
+        },
+      },
+    }
+  }
+
+  it("should be able to create a view", async () => {
+    await request.views.create(baseView(), { status: 201 })
+  })
+
+  it("should be able to update a view", async () => {
+    const view = await request.views.create(baseView(), { status: 201 })
+    const response = await request.views.update(view.data.id, {
+      ...view.data,
+      name: "new name",
+    })
+  })
+
+  it("should be able to search views", async () => {
+    const viewName = "view to search for"
+    const view = await request.views.create(
+      {
+        ...baseView(),
+        name: viewName,
+      },
+      { status: 201 }
+    )
+    const results = await request.views.search(viewName, {
+      status: 200,
+    })
+    expect(results.data.length).toEqual(1)
+    expect(results.data[0].id).toEqual(view.data.id)
+  })
+
+  it("should be able to delete a view", async () => {
+    const view = await request.views.create(baseView(), { status: 201 })
+    const result = await request.views.destroy(view.data.id, { status: 204 })
+    expect(result).toBeDefined()
+  })
+
+  it("should be able to search rows through a view", async () => {
+    const row1 = await request.rows.create(
+      table._id!,
+      { name: "hello world" },
+      { status: 200 }
+    )
+    await request.rows.create(table._id!, { name: "foo bar" }, { status: 200 })
+    const response = await request.views.create(
+      {
+        ...baseView(),
+        query: {
+          logicalOperator: UILogicalOperator.ANY,
+          groups: [
+            {
+              filters: [
+                {
+                  operator: BasicOperator.STRING,
+                  field: "name",
+                  value: "hello",
+                },
+              ],
+            },
+          ],
+        },
+      },
+      { status: 201 }
+    )
+    const results = await request.rows.viewSearch(response.data.id, {})
+    expect(results.data.length).toEqual(1)
+  })
+})
diff --git a/packages/server/src/api/routes/public/views.ts b/packages/server/src/api/routes/public/views.ts
new file mode 100644
index 0000000000..139d79be1f
--- /dev/null
+++ b/packages/server/src/api/routes/public/views.ts
@@ -0,0 +1,165 @@
+import controller from "../../controllers/public/views"
+import Endpoint from "./utils/Endpoint"
+import { viewValidator, nameValidator } from "../utils/validators"
+
+const read = [],
+  write = []
+
+/**
+ * @openapi
+ * /views:
+ *   post:
+ *     operationId: viewCreate
+ *     summary: Create a view
+ *     description: Create a view, this can be against an internal or external table.
+ *     tags:
+ *       - views
+ *     parameters:
+ *       - $ref: '#/components/parameters/appId'
+ *     requestBody:
+ *       content:
+ *         application/json:
+ *           schema:
+ *             $ref: '#/components/schemas/view'
+ *           examples:
+ *             view:
+ *               $ref: '#/components/examples/view'
+ *     responses:
+ *       200:
+ *         description: Returns the created view, including the ID which has been generated for it.
+ *         content:
+ *           application/json:
+ *             schema:
+ *               $ref: '#/components/schemas/viewOutput'
+ *             examples:
+ *               view:
+ *                 $ref: '#/components/examples/view'
+ */
+write.push(
+  new Endpoint("post", "/views", controller.create).addMiddleware(
+    viewValidator()
+  )
+)
+
+/**
+ * @openapi
+ * /views/{viewId}:
+ *   put:
+ *     operationId: viewUpdate
+ *     summary: Update a view
+ *     description: Update a view, this can be against an internal or external table.
+ *     tags:
+ *       - views
+ *     parameters:
+ *       - $ref: '#/components/parameters/viewId'
+ *       - $ref: '#/components/parameters/appId'
+ *     requestBody:
+ *       content:
+ *         application/json:
+ *           schema:
+ *             $ref: '#/components/schemas/view'
+ *           examples:
+ *             view:
+ *               $ref: '#/components/examples/view'
+ *     responses:
+ *       200:
+ *         description: Returns the updated view.
+ *         content:
+ *           application/json:
+ *             schema:
+ *               $ref: '#/components/schemas/viewOutput'
+ *             examples:
+ *               view:
+ *                 $ref: '#/components/examples/view'
+ */
+write.push(
+  new Endpoint("put", "/views/:viewId", controller.update).addMiddleware(
+    viewValidator()
+  )
+)
+
+/**
+ * @openapi
+ * /views/{viewId}:
+ *   delete:
+ *     operationId: viewDestroy
+ *     summary: Delete a view
+ *     description: Delete a view, this can be against an internal or external table.
+ *     tags:
+ *       - views
+ *     parameters:
+ *       - $ref: '#/components/parameters/viewId'
+ *       - $ref: '#/components/parameters/appId'
+ *     responses:
+ *       200:
+ *         description: Returns the deleted view.
+ *         content:
+ *           application/json:
+ *             schema:
+ *               $ref: '#/components/schemas/viewOutput'
+ *             examples:
+ *               view:
+ *                 $ref: '#/components/examples/view'
+ */
+write.push(new Endpoint("delete", "/views/:viewId", controller.destroy))
+
+/**
+ * @openapi
+ * /views/{viewId}:
+ *   get:
+ *     operationId: viewGetById
+ *     summary: Retrieve a view
+ *     description: Lookup a view, this could be internal or external.
+ *     tags:
+ *       - views
+ *     parameters:
+ *       - $ref: '#/components/parameters/viewId'
+ *       - $ref: '#/components/parameters/appId'
+ *     responses:
+ *       200:
+ *         description: Returns the retrieved view.
+ *         content:
+ *           application/json:
+ *             schema:
+ *               $ref: '#/components/schemas/viewOutput'
+ *             examples:
+ *               view:
+ *                 $ref: '#/components/examples/view'
+ */
+read.push(new Endpoint("get", "/views/:viewId", controller.read))
+
+/**
+ * @openapi
+ * /views/search:
+ *   post:
+ *     operationId: viewSearch
+ *     summary: Search for views
+ *     description: Based on view properties (currently only name) search for views.
+ *     tags:
+ *       - views
+ *     parameters:
+ *       - $ref: '#/components/parameters/appId'
+ *     requestBody:
+ *       required: true
+ *       content:
+ *         application/json:
+ *           schema:
+ *             $ref: '#/components/schemas/nameSearch'
+ *     responses:
+ *       200:
+ *         description: Returns the found views, based on the search parameters.
+ *         content:
+ *           application/json:
+ *             schema:
+ *               $ref: '#/components/schemas/viewSearch'
+ *             examples:
+ *               views:
+ *                 $ref: '#/components/examples/views'
+ */
+read.push(
+  new Endpoint("post", "/views/search", controller.search).addMiddleware(
+    nameValidator()
+  )
+)
+
+export default { read, write }
diff --git a/packages/server/src/api/routes/tests/viewV2.spec.ts b/packages/server/src/api/routes/tests/viewV2.spec.ts
index 6e82395e19..23ae7c79d3 100644
--- a/packages/server/src/api/routes/tests/viewV2.spec.ts
+++ b/packages/server/src/api/routes/tests/viewV2.spec.ts
@@ -2592,6 +2592,33 @@ if (descriptions.length) {
           })
         })
 
+        describe("fetch", () => {
+          let view: ViewV2, view2: ViewV2
+          let table: Table, table2: Table
+          beforeEach(async () => {
+            table = await config.api.table.save(saveTableRequest())
+            table2 = await config.api.table.save(saveTableRequest())
+            view = await config.api.viewV2.create({
+              tableId: table._id!,
+              name: generator.guid(),
+              schema: {},
+            })
+            view2 = await config.api.viewV2.create({
+              tableId: table2._id!,
+              name: generator.guid(),
+              schema: {},
+            })
+          })
+
+          it("should be able to list views", async () => {
+            const response = await config.api.viewV2.fetch({
+              status: 200,
+            })
+            expect(response.data.find(v => v.id === view.id)).toBeDefined()
+            expect(response.data.find(v => v.id === view2.id)).toBeDefined()
+          })
+        })
+
         describe("destroy", () => {
           const getRowUsage = async () => {
             const { total } = await config.doInContext(undefined, () =>
diff --git a/packages/server/src/api/routes/utils/validators.ts b/packages/server/src/api/routes/utils/validators.ts
index 0343cc186c..3bee4f88ce 100644
--- a/packages/server/src/api/routes/utils/validators.ts
+++ b/packages/server/src/api/routes/utils/validators.ts
@@ -9,6 +9,13 @@ import {
   Table,
   WebhookActionType,
   BuiltinPermissionID,
+  ViewV2Type,
+  SortOrder,
+  SortType,
+  UILogicalOperator,
+  BasicOperator,
+  ArrayOperator,
+  RangeOperator,
 } from "@budibase/types"
 import Joi, { CustomValidator } from "joi"
 import { ValidSnippetNameRegex, helpers } from "@budibase/shared-core"
@@ -66,6 +73,66 @@ export function tableValidator() {
   )
 }
 
+function searchUIFilterValidator() {
+  const logicalOperator = Joi.string().valid(
+    ...Object.values(UILogicalOperator)
+  )
+  const operators = [
+    ...Object.values(BasicOperator),
+    ...Object.values(ArrayOperator),
+    ...Object.values(RangeOperator),
+  ]
+  const filters = Joi.array().items(
+    Joi.object({
+      operator: Joi.string()
+        .valid(...operators)
+        .required(),
+      field: Joi.string().required(),
+      // could do with better validation of value based on operator
+      value: Joi.any().required(),
+    })
+  )
+  return Joi.object({
+    logicalOperator,
+    onEmptyFilter: Joi.string().valid(...Object.values(EmptyFilterOption)),
+    groups: Joi.array().items(
+      Joi.object({
+        logicalOperator,
+        filters,
+        groups: Joi.array().items(
+          Joi.object({
+            filters,
+            logicalOperator,
+          })
+        ),
+      })
+    ),
+  })
+}
+
+export function viewValidator() {
+  return auth.joiValidator.body(
+    Joi.object({
+      id: OPTIONAL_STRING,
+      tableId: Joi.string().required(),
+      name: Joi.string().required(),
+      type: Joi.string().optional().valid(null, ViewV2Type.CALCULATION),
+      primaryDisplay: OPTIONAL_STRING,
+      schema: Joi.object().required(),
+      query: searchUIFilterValidator().optional(),
+      sort: Joi.object({
+        field: Joi.string().required(),
+        order: Joi.string()
+          .optional()
+          .valid(...Object.values(SortOrder)),
+        type: Joi.string()
+          .optional()
+          .valid(...Object.values(SortType)),
+      }).optional(),
+    })
+  )
+}
+
 export function nameValidator() {
   return auth.joiValidator.body(
     Joi.object({
@@ -91,8 +158,7 @@ export function datasourceValidator() {
   )
 }
 
-function filterObject(opts?: { unknown: boolean }) {
-  const { unknown = true } = opts || {}
+function searchFiltersValidator() {
   const conditionalFilteringObject = () =>
     Joi.object({
       conditions: Joi.array().items(Joi.link("#schema")).required(),
@@ -119,7 +185,14 @@ function filterObject(opts?: { unknown: boolean }) {
     fuzzyOr: Joi.forbidden(),
     documentType: Joi.forbidden(),
   }
-  return Joi.object(filtersValidators).unknown(unknown).id("schema")
+
+  return Joi.object(filtersValidators)
+}
+
+function filterObject(opts?: { unknown: boolean }) {
+  const { unknown = true } = opts || {}
+
+  return searchFiltersValidator().unknown(unknown).id("schema")
 }
 
 export function internalSearchValidator() {
diff --git a/packages/server/src/api/routes/view.ts b/packages/server/src/api/routes/view.ts
index 807d8e2f28..92e5f02a18 100644
--- a/packages/server/src/api/routes/view.ts
+++ b/packages/server/src/api/routes/view.ts
@@ -8,6 +8,11 @@ import { permissions } from "@budibase/backend-core"
 const router: Router = new Router()
 
 router
+  .get(
+    "/api/v2/views",
+    authorized(permissions.BUILDER),
+    viewController.v2.fetch
+  )
   .get(
     "/api/v2/views/:viewId",
     authorizedResource(
diff --git a/packages/server/src/automations/steps/serverLog.ts b/packages/server/src/automations/steps/serverLog.ts
index ffc517c05e..d0702ab3eb 100644
--- a/packages/server/src/automations/steps/serverLog.ts
+++ b/packages/server/src/automations/steps/serverLog.ts
@@ -61,6 +61,9 @@ export async function run({
   inputs: ServerLogStepInputs
   appId: string
 }): Promise<ServerLogStepOutputs> {
+  if (typeof inputs.text !== "string") {
+    inputs.text = JSON.stringify(inputs.text)
+  }
   const message = `App ${appId} - ${inputs.text}`
   console.log(message)
   return {
diff --git a/packages/server/src/automations/tests/createRow.spec.ts b/packages/server/src/automations/tests/createRow.spec.ts
index bcf9845669..bd78de2217 100644
--- a/packages/server/src/automations/tests/createRow.spec.ts
+++ b/packages/server/src/automations/tests/createRow.spec.ts
@@ -1,6 +1,7 @@
 import * as setup from "./utilities"
 import { basicTableWithAttachmentField } from "../../tests/utilities/structures"
 import { objectStore } from "@budibase/backend-core"
+import { createAutomationBuilder } from "./utilities/AutomationTestBuilder"
 
 async function uploadTestFile(filename: string) {
   let bucket = "testbucket"
@@ -13,6 +14,7 @@ async function uploadTestFile(filename: string) {
 
   return presignedUrl
 }
+
 describe("test the create row action", () => {
   let table: any
   let row: any
@@ -31,30 +33,78 @@ describe("test the create row action", () => {
   afterAll(setup.afterAll)
 
   it("should be able to run the action", async () => {
-    const res = await setup.runStep(config, setup.actions.CREATE_ROW.stepId, {
-      row,
+    const result = await createAutomationBuilder({
+      name: "Test Create Row Flow",
+      appId: config.getAppId(),
+      config,
     })
-    expect(res.id).toBeDefined()
-    expect(res.revision).toBeDefined()
-    expect(res.success).toEqual(true)
-    const gottenRow = await config.api.row.get(table._id, res.id)
+      .appAction({ fields: { status: "new" } })
+      .serverLog({ text: "Starting create row flow" }, { stepName: "StartLog" })
+      .createRow({ row }, { stepName: "CreateRow" })
+      .serverLog(
+        { text: "Row created with ID: {{ stepsByName.CreateRow.row._id }}" },
+        { stepName: "CreationLog" }
+      )
+      .run()
+
+    expect(result.steps[1].outputs.success).toBeDefined()
+    expect(result.steps[1].outputs.id).toBeDefined()
+    expect(result.steps[1].outputs.revision).toBeDefined()
+    const gottenRow = await config.api.row.get(
+      table._id,
+      result.steps[1].outputs.id
+    )
     expect(gottenRow.name).toEqual("test")
     expect(gottenRow.description).toEqual("test")
+    expect(result.steps[2].outputs.message).toContain(
+      "Row created with ID: " + result.steps[1].outputs.id
+    )
   })
 
   it("should return an error (not throw) when bad info provided", async () => {
-    const res = await setup.runStep(config, setup.actions.CREATE_ROW.stepId, {
-      row: {
-        tableId: "invalid",
-        invalid: "invalid",
-      },
+    const result = await createAutomationBuilder({
+      name: "Test Create Row Error Flow",
+      appId: config.getAppId(),
+      config,
     })
-    expect(res.success).toEqual(false)
+      .appAction({ fields: { status: "error" } })
+      .serverLog({ text: "Starting error test flow" }, { stepName: "StartLog" })
+      .createRow(
+        {
+          row: {
+            tableId: "invalid",
+            invalid: "invalid",
+          },
+        },
+        { stepName: "CreateRow" }
+      )
+      .run()
+
+    expect(result.steps[1].outputs.success).toEqual(false)
   })
 
   it("should check invalid inputs return an error", async () => {
-    const res = await setup.runStep(config, setup.actions.CREATE_ROW.stepId, {})
-    expect(res.success).toEqual(false)
+    const result = await createAutomationBuilder({
+      name: "Test Create Row Invalid Flow",
+      appId: config.getAppId(),
+      config,
+    })
+      .appAction({ fields: { status: "invalid" } })
+      .serverLog({ text: "Testing invalid input" }, { stepName: "StartLog" })
+      .createRow({ row: {} }, { stepName: "CreateRow" })
+      .filter({
+        field: "{{ stepsByName.CreateRow.success }}",
+        condition: "equal",
+        value: true,
+      })
+      .serverLog(
+        { text: "This log should not appear" },
+        { stepName: "SkippedLog" }
+      )
+      .run()
+
+    expect(result.steps[1].outputs.success).toEqual(false)
+    expect(result.steps.length).toBeLessThan(4)
   })
 
   it("should check that an attachment field is sent to storage and parsed", async () => {
@@ -76,13 +126,33 @@ describe("test the create row action", () => {
     ]
 
     attachmentRow.file_attachment = attachmentObject
-    const res = await setup.runStep(config, setup.actions.CREATE_ROW.stepId, {
-      row: attachmentRow,
+    const result = await createAutomationBuilder({
+      name: "Test Create Row Attachment Flow",
+      appId: config.getAppId(),
+      config,
     })
+      .appAction({ fields: { type: "attachment" } })
+      .serverLog(
+        { text: "Processing attachment upload" },
+        { stepName: "StartLog" }
+      )
+      .createRow({ row: attachmentRow }, { stepName: "CreateRow" })
+      .filter({
+        field: "{{ stepsByName.CreateRow.success }}",
+        condition: "equal",
+        value: true,
+      })
+      .serverLog(
+        {
+          text: "Attachment uploaded with key: {{ stepsByName.CreateRow.row.file_attachment.0.key }}",
+        },
+        { stepName: "UploadLog" }
+      )
+      .run()
 
-    expect(res.success).toEqual(true)
-    expect(res.row.file_attachment[0]).toHaveProperty("key")
-    let s3Key = res.row.file_attachment[0].key
+    expect(result.steps[1].outputs.success).toEqual(true)
+    expect(result.steps[1].outputs.row.file_attachment[0]).toHaveProperty("key")
+    let s3Key = result.steps[1].outputs.row.file_attachment[0].key
 
     const client = objectStore.ObjectStore(objectStore.ObjectStoreBuckets.APPS)
 
@@ -111,13 +181,53 @@ describe("test the create row action", () => {
     }
 
     attachmentRow.single_file_attachment = attachmentObject
-    const res = await setup.runStep(config, setup.actions.CREATE_ROW.stepId, {
-      row: attachmentRow,
+    const result = await createAutomationBuilder({
+      name: "Test Create Row Single Attachment Flow",
+      appId: config.getAppId(),
+      config,
     })
+      .appAction({ fields: { type: "single-attachment" } })
+      .serverLog(
+        { text: "Processing single attachment" },
+        { stepName: "StartLog" }
+      )
+      .createRow({ row: attachmentRow }, { stepName: "CreateRow" })
+      .branch({
+        success: {
+          steps: stepBuilder =>
+            stepBuilder
+              .serverLog(
+                { text: "Single attachment processed" },
+                { stepName: "ProcessLog" }
+              )
+              .serverLog(
+                {
+                  text: "File key: {{ stepsByName.CreateRow.row.single_file_attachment.key }}",
+                },
+                { stepName: "KeyLog" }
+              ),
+          condition: {
+            equal: { "{{ stepsByName.CreateRow.success }}": true },
+          },
+        },
+        error: {
+          steps: stepBuilder =>
+            stepBuilder.serverLog(
+              { text: "Failed to process attachment" },
+              { stepName: "ErrorLog" }
+            ),
+          condition: {
+            equal: { "{{ stepsByName.CreateRow.success }}": false },
+          },
+        },
+      })
+      .run()
 
-    expect(res.success).toEqual(true)
-    expect(res.row.single_file_attachment).toHaveProperty("key")
-    let s3Key = res.row.single_file_attachment.key
+    expect(result.steps[1].outputs.success).toEqual(true)
+    expect(result.steps[1].outputs.row.single_file_attachment).toHaveProperty(
+      "key"
+    )
+    let s3Key = result.steps[1].outputs.row.single_file_attachment.key
 
     const client = objectStore.ObjectStore(objectStore.ObjectStoreBuckets.APPS)
 
@@ -146,13 +256,50 @@ describe("test the create row action", () => {
     }
 
     attachmentRow.single_file_attachment = attachmentObject
-    const res = await setup.runStep(config, setup.actions.CREATE_ROW.stepId, {
-      row: attachmentRow,
+    const result = await createAutomationBuilder({
+      name: "Test Create Row Invalid Attachment Flow",
+      appId: config.getAppId(),
+      config,
     })
+      .appAction({ fields: { type: "invalid-attachment" } })
+      .serverLog(
+        { text: "Testing invalid attachment keys" },
+        { stepName: "StartLog" }
+      )
+      .createRow({ row: attachmentRow }, { stepName: "CreateRow" })
+      .branch({
+        success: {
+          steps: stepBuilder =>
+            stepBuilder.serverLog(
+              { text: "Unexpected success" },
+              { stepName: "UnexpectedLog" }
+            ),
+          condition: {
+            equal: { "{{ stepsByName.CreateRow.success }}": true },
+          },
+        },
+        error: {
+          steps: stepBuilder =>
+            stepBuilder
+              .serverLog(
+                { text: "Expected error occurred" },
+                { stepName: "ErrorLog" }
+              )
+              .serverLog(
+                { text: "Error: {{ stepsByName.CreateRow.response }}" },
+                { stepName: "ErrorDetailsLog" }
+              ),
+          condition: {
+            equal: { "{{ stepsByName.CreateRow.success }}": false },
+          },
+        },
+      })
+      .run()
 
-    expect(res.success).toEqual(false)
-    expect(res.response).toEqual(
+    expect(result.steps[1].outputs.success).toEqual(false)
+    expect(result.steps[1].outputs.response).toEqual(
       'Error: Attachments must have both "url" and "filename" keys. You have provided: wrongKey, anotherWrongKey'
     )
+    expect(result.steps[2].outputs.status).toEqual("No branch condition met")
   })
 })
diff --git a/packages/server/src/automations/tests/deleteRow.spec.ts b/packages/server/src/automations/tests/deleteRow.spec.ts
index dd13aa49c1..cabf590421 100644
--- a/packages/server/src/automations/tests/deleteRow.spec.ts
+++ b/packages/server/src/automations/tests/deleteRow.spec.ts
@@ -1,52 +1,65 @@
+import { createAutomationBuilder } from "./utilities/AutomationTestBuilder"
 import * as setup from "./utilities"
 
 describe("test the delete row action", () => {
-  let table: any
-  let row: any
-  let inputs: any
-  let config = setup.getConfig()
+  let table: any,
+    row: any,
+    config = setup.getConfig()
 
-  beforeEach(async () => {
+  beforeAll(async () => {
     await config.init()
     table = await config.createTable()
     row = await config.createRow()
-    inputs = {
-      tableId: table._id,
-      id: row._id,
-      revision: row._rev,
-    }
   })
 
   afterAll(setup.afterAll)
 
-  it("should be able to run the action", async () => {
-    const res = await setup.runStep(
-      config,
-      setup.actions.DELETE_ROW.stepId,
-      inputs
-    )
-    expect(res.success).toEqual(true)
-    expect(res.response).toBeDefined()
-    expect(res.row._id).toEqual(row._id)
-  })
+  it("should be able to run the delete row action", async () => {
+    const builder = createAutomationBuilder({
+      name: "Delete Row Automation",
+    })
 
-  it("check usage quota attempts", async () => {
-    await setup.runInProd(async () => {
-      await setup.runStep(config, setup.actions.DELETE_ROW.stepId, inputs)
+    await builder
+      .appAction({ fields: {} })
+      .deleteRow({
+        tableId: table._id,
+        id: row._id,
+        revision: row._rev,
+      })
+      .run()
+
+    await config.api.row.get(table._id, row._id, {
+      status: 404,
     })
   })
 
   it("should check invalid inputs return an error", async () => {
-    const res = await setup.runStep(config, setup.actions.DELETE_ROW.stepId, {})
-    expect(res.success).toEqual(false)
+    const builder = createAutomationBuilder({
+      name: "Invalid Inputs Automation",
+    })
+
+    const results = await builder
+      .appAction({ fields: {} })
+      .deleteRow({ tableId: "", id: "", revision: "" })
+      .run()
+
+    expect(results.steps[0].outputs.success).toEqual(false)
   })
 
   it("should return an error when table doesn't exist", async () => {
-    const res = await setup.runStep(config, setup.actions.DELETE_ROW.stepId, {
-      tableId: "invalid",
-      id: "invalid",
-      revision: "invalid",
+    const builder = createAutomationBuilder({
+      name: "Nonexistent Table Automation",
     })
-    expect(res.success).toEqual(false)
+
+    const results = await builder
+      .appAction({ fields: {} })
+      .deleteRow({
+        tableId: "invalid",
+        id: "invalid",
+        revision: "invalid",
+      })
+      .run()
+
+    expect(results.steps[0].outputs.success).toEqual(false)
   })
 })
diff --git a/packages/server/src/automations/tests/executeScript.spec.ts b/packages/server/src/automations/tests/executeScript.spec.ts
index fa30e642bc..f5845093bc 100644
--- a/packages/server/src/automations/tests/executeScript.spec.ts
+++ b/packages/server/src/automations/tests/executeScript.spec.ts
@@ -1,50 +1,123 @@
-import { getConfig, afterAll as _afterAll, runStep, actions } from "./utilities"
+import { createAutomationBuilder } from "./utilities/AutomationTestBuilder"
+import * as automation from "../index"
+import * as setup from "./utilities"
+import { Table } from "@budibase/types"
 
-describe("test the execute script action", () => {
-  let config = getConfig()
+describe("Execute Script Automations", () => {
+  let config = setup.getConfig(),
+    table: Table
 
-  beforeAll(async () => {
+  beforeEach(async () => {
+    await automation.init()
     await config.init()
+    table = await config.createTable()
+    await config.createRow()
   })
-  afterAll(_afterAll)
 
-  it("should be able to execute a script", async () => {
-    const res = await runStep(config, actions.EXECUTE_SCRIPT.stepId, {
-      code: "return 1 + 1",
+  afterAll(setup.afterAll)
+
+  it("should execute a basic script and return the result", async () => {
+    const builder = createAutomationBuilder({
+      name: "Basic Script Execution",
     })
-    expect(res.value).toEqual(2)
-    expect(res.success).toEqual(true)
+
+    const results = await builder
+      .appAction({ fields: {} })
+      .executeScript({ code: "return 2 + 2" })
+      .run()
+
+    expect(results.steps[0].outputs.value).toEqual(4)
   })
 
-  it("should handle a null value", async () => {
-    const res = await runStep(config, actions.EXECUTE_SCRIPT.stepId, {
-      code: null,
+  it("should access bindings from previous steps", async () => {
+    const builder = createAutomationBuilder({
+      name: "Access Bindings",
     })
-    expect(res.response.message).toEqual("Invalid inputs")
-    expect(res.success).toEqual(false)
+
+    const results = await builder
+      .appAction({ fields: { data: [1, 2, 3] } })
+      .executeScript(
+        {
+          code: "return trigger.fields.data.map(x => x * 2)",
+        },
+        { stepId: "binding-script-step" }
+      )
+      .run()
+
+    expect(results.steps[0].outputs.value).toEqual([2, 4, 6])
   })
 
-  it("should be able to get a value from context", async () => {
-    const res = await runStep(
-      config,
-      actions.EXECUTE_SCRIPT.stepId,
-      {
-        code: "return steps.map(d => d.value)",
-      },
-      {
-        steps: [{ value: 0 }, { value: 1 }],
-      }
+  it("should handle script execution errors gracefully", async () => {
+    const builder = createAutomationBuilder({
+      name: "Handle Script Errors",
+    })
+
+    const results = await builder
+      .appAction({ fields: {} })
+      .executeScript({ code: "return nonexistentVariable.map(x => x)" })
+      .run()
+
+    expect(results.steps[0].outputs.response).toContain(
+      "ReferenceError: nonexistentVariable is not defined"
     )
-    expect(res.value).toEqual([0, 1])
-    expect(res.response).toBeUndefined()
-    expect(res.success).toEqual(true)
+    expect(results.steps[0].outputs.success).toEqual(false)
   })
 
-  it("should be able to handle an error gracefully", async () => {
-    const res = await runStep(config, actions.EXECUTE_SCRIPT.stepId, {
-      code: "return something.map(x => x.name)",
+  it("should handle conditional logic in scripts", async () => {
+    const builder = createAutomationBuilder({
+      name: "Conditional Script Logic",
     })
-    expect(res.response).toEqual("ReferenceError: something is not defined")
-    expect(res.success).toEqual(false)
+
+    const results = await builder
+      .appAction({ fields: { value: 10 } })
+      .executeScript({
+        code: `
+            if (trigger.fields.value > 5) {
+              return "Value is greater than 5";
+            } else {
+              return "Value is 5 or less";
+            }
+          `,
+      })
+      .run()
+
+    expect(results.steps[0].outputs.value).toEqual("Value is greater than 5")
+  })
+
+  it("should use multiple steps and validate script execution", async () => {
+    const builder = createAutomationBuilder({
+      name: "Multi-Step Script Execution",
+    })
+
+    const results = await builder
+      .appAction({ fields: {} })
+      .serverLog(
+        { text: "Starting multi-step automation" },
+        { stepId: "start-log-step" }
+      )
+      .createRow(
+        { row: { name: "Test Row", value: 42, tableId: table._id } },
+        { stepId: "abc123" }
+      )
+      .executeScript(
+        {
+          code: `
+            const createdRow = steps['abc123'];
+            return createdRow.row.value * 2;
+          `,
+        },
+        { stepId: "ScriptingStep1" }
+      )
+      .serverLog({
+        text: `Final result is {{ steps.ScriptingStep1.value }}`,
+      })
+      .run()
+
+    expect(results.steps[0].outputs.message).toContain(
+      "Starting multi-step automation"
+    )
+    expect(results.steps[1].outputs.row.value).toEqual(42)
+    expect(results.steps[2].outputs.value).toEqual(84)
+    expect(results.steps[3].outputs.message).toContain("Final result is 84")
   })
 })
diff --git a/packages/server/src/automations/tests/updateRow.spec.ts b/packages/server/src/automations/tests/updateRow.spec.ts
index 457bf60533..45f78826f6 100644
--- a/packages/server/src/automations/tests/updateRow.spec.ts
+++ b/packages/server/src/automations/tests/updateRow.spec.ts
@@ -8,58 +8,83 @@ import {
   Table,
   TableSourceType,
 } from "@budibase/types"
+import { createAutomationBuilder } from "./utilities/AutomationTestBuilder"
 
 import * as setup from "./utilities"
 import * as uuid from "uuid"
 
 describe("test the update row action", () => {
-  let table: Table, row: Row, inputs: any
-  let config = setup.getConfig()
+  let table: Table,
+    row: Row,
+    config = setup.getConfig()
 
   beforeAll(async () => {
     await config.init()
     table = await config.createTable()
     row = await config.createRow()
-    inputs = {
-      rowId: row._id,
-      row: {
-        ...row,
-        name: "Updated name",
-        // put a falsy option in to be removed
-        description: "",
-      },
-    }
   })
 
   afterAll(setup.afterAll)
 
-  it("should be able to run the action", async () => {
-    const res = await setup.runStep(
-      config,
-      setup.actions.UPDATE_ROW.stepId,
-      inputs
+  it("should be able to run the update row action", async () => {
+    const builder = createAutomationBuilder({
+      name: "Update Row Automation",
+    })
+
+    const results = await builder
+      .appAction({ fields: {} })
+      .updateRow({
+        rowId: row._id!,
+        row: {
+          ...row,
+          name: "Updated name",
+          description: "",
+        },
+        meta: {},
+      })
+      .run()
+
+    expect(results.steps[0].outputs.success).toEqual(true)
+    const updatedRow = await config.api.row.get(
+      table._id!,
+      results.steps[0].outputs.id
     )
-    expect(res.success).toEqual(true)
-    const updatedRow = await config.api.row.get(table._id!, res.id)
     expect(updatedRow.name).toEqual("Updated name")
     expect(updatedRow.description).not.toEqual("")
   })
 
   it("should check invalid inputs return an error", async () => {
-    const res = await setup.runStep(config, setup.actions.UPDATE_ROW.stepId, {})
-    expect(res.success).toEqual(false)
+    const builder = createAutomationBuilder({
+      name: "Invalid Inputs Automation",
+    })
+
+    const results = await builder
+      .appAction({ fields: {} })
+      .updateRow({ meta: {}, row: {}, rowId: "" })
+      .run()
+
+    expect(results.steps[0].outputs.success).toEqual(false)
   })
 
   it("should return an error when table doesn't exist", async () => {
-    const res = await setup.runStep(config, setup.actions.UPDATE_ROW.stepId, {
-      row: { _id: "invalid" },
-      rowId: "invalid",
+    const builder = createAutomationBuilder({
+      name: "Nonexistent Table Automation",
     })
-    expect(res.success).toEqual(false)
+
+    const results = await builder
+      .appAction({ fields: {} })
+      .updateRow({
+        row: { _id: "invalid" },
+        rowId: "invalid",
+        meta: {},
+      })
+      .run()
+
+    expect(results.steps[0].outputs.success).toEqual(false)
   })
 
   it("should not overwrite links if those links are not set", async () => {
-    let linkField: FieldSchema = {
+    const linkField: FieldSchema = {
       type: FieldType.LINK,
       name: "",
       fieldName: "",
@@ -71,7 +96,7 @@ describe("test the update row action", () => {
       tableId: InternalTable.USER_METADATA,
     }
 
-    let table = await config.api.table.save({
+    const table = await config.api.table.save({
       name: uuid.v4(),
       type: "table",
       sourceType: TableSourceType.INTERNAL,
@@ -82,23 +107,22 @@ describe("test the update row action", () => {
       },
     })
 
-    let user1 = await config.createUser()
-    let user2 = await config.createUser()
+    const user1 = await config.createUser()
+    const user2 = await config.createUser()
 
-    let row = await config.api.row.save(table._id!, {
+    const row = await config.api.row.save(table._id!, {
       user1: [{ _id: user1._id }],
       user2: [{ _id: user2._id }],
     })
 
-    let getResp = await config.api.row.get(table._id!, row._id!)
-    expect(getResp.user1[0]._id).toEqual(user1._id)
-    expect(getResp.user2[0]._id).toEqual(user2._id)
+    const builder = createAutomationBuilder({
+      name: "Link Preservation Automation",
+    })
 
-    let stepResp = await setup.runStep(
-      config,
-      setup.actions.UPDATE_ROW.stepId,
-      {
-        rowId: row._id,
+    const results = await builder
+      .appAction({ fields: {} })
+      .updateRow({
+        rowId: row._id!,
         row: {
           _id: row._id,
           _rev: row._rev,
@@ -106,17 +130,19 @@ describe("test the update row action", () => {
           user1: [user2._id],
           user2: "",
         },
-      }
-    )
-    expect(stepResp.success).toEqual(true)
+        meta: {},
+      })
+      .run()
 
-    getResp = await config.api.row.get(table._id!, row._id!)
+    expect(results.steps[0].outputs.success).toEqual(true)
+
+    const getResp = await config.api.row.get(table._id!, row._id!)
     expect(getResp.user1[0]._id).toEqual(user2._id)
     expect(getResp.user2[0]._id).toEqual(user2._id)
   })
 
-  it("should overwrite links if those links are not set and we ask it do", async () => {
-    let linkField: FieldSchema = {
+  it("should overwrite links if those links are not set and we ask it to", async () => {
+    const linkField: FieldSchema = {
       type: FieldType.LINK,
       name: "",
       fieldName: "",
@@ -128,7 +154,7 @@ describe("test the update row action", () => {
       tableId: InternalTable.USER_METADATA,
     }
 
-    let table = await config.api.table.save({
+    const table = await config.api.table.save({
       name: uuid.v4(),
       type: "table",
       sourceType: TableSourceType.INTERNAL,
@@ -139,23 +165,22 @@ describe("test the update row action", () => {
       },
     })
 
-    let user1 = await config.createUser()
-    let user2 = await config.createUser()
+    const user1 = await config.createUser()
+    const user2 = await config.createUser()
 
-    let row = await config.api.row.save(table._id!, {
+    const row = await config.api.row.save(table._id!, {
       user1: [{ _id: user1._id }],
       user2: [{ _id: user2._id }],
     })
 
-    let getResp = await config.api.row.get(table._id!, row._id!)
-    expect(getResp.user1[0]._id).toEqual(user1._id)
-    expect(getResp.user2[0]._id).toEqual(user2._id)
+    const builder = createAutomationBuilder({
+      name: "Link Overwrite Automation",
+    })
 
-    let stepResp = await setup.runStep(
-      config,
-      setup.actions.UPDATE_ROW.stepId,
-      {
-        rowId: row._id,
+    const results = await builder
+      .appAction({ fields: {} })
+      .updateRow({
+        rowId: row._id!,
         row: {
           _id: row._id,
           _rev: row._rev,
@@ -170,11 +195,12 @@ describe("test the update row action", () => {
             },
           },
         },
-      }
-    )
-    expect(stepResp.success).toEqual(true)
+      })
+      .run()
 
-    getResp = await config.api.row.get(table._id!, row._id!)
+    expect(results.steps[0].outputs.success).toEqual(true)
+
+    const getResp = await config.api.row.get(table._id!, row._id!)
     expect(getResp.user1[0]._id).toEqual(user2._id)
     expect(getResp.user2).toBeUndefined()
   })
diff --git a/packages/server/src/automations/tests/utilities/AutomationTestBuilder.ts b/packages/server/src/automations/tests/utilities/AutomationTestBuilder.ts
index 76832d6a9a..78830adf2c 100644
--- a/packages/server/src/automations/tests/utilities/AutomationTestBuilder.ts
+++ b/packages/server/src/automations/tests/utilities/AutomationTestBuilder.ts
@@ -34,6 +34,7 @@ import {
   SearchFilters,
   Branch,
   FilterStepInputs,
+  ExecuteScriptStepInputs,
 } from "@budibase/types"
 import TestConfiguration from "../../../tests/utilities/TestConfiguration"
 import * as setup from "../utilities"
@@ -201,6 +202,18 @@ class BaseStepBuilder {
     )
   }
 
+  executeScript(
+    input: ExecuteScriptStepInputs,
+    opts?: { stepName?: string; stepId?: string }
+  ): this {
+    return this.step(
+      AutomationActionStepId.EXECUTE_SCRIPT,
+      BUILTIN_ACTION_DEFINITIONS.EXECUTE_SCRIPT,
+      input,
+      opts
+    )
+  }
+
   filter(input: FilterStepInputs): this {
     return this.step(
       AutomationActionStepId.FILTER,
diff --git a/packages/server/src/definitions/openapi.ts b/packages/server/src/definitions/openapi.ts
index 4479c89d9d..b82229130b 100644
--- a/packages/server/src/definitions/openapi.ts
+++ b/packages/server/src/definitions/openapi.ts
@@ -65,6 +65,9 @@ export interface paths {
   "/tables/{tableId}/rows/search": {
     post: operations["rowSearch"];
   };
+  "/views/{viewId}/rows/search": {
+    post: operations["rowViewSearch"];
+  };
   "/tables": {
     /** Create a table, this could be internal or external. */
     post: operations["tableCreate"];
@@ -93,6 +96,22 @@ export interface paths {
     /** Based on user properties (currently only name) search for users. */
     post: operations["userSearch"];
   };
+  "/views": {
+    /** Create a view, this can be against an internal or external table. */
+    post: operations["viewCreate"];
+  };
+  "/views/{viewId}": {
+    /** Lookup a view, this could be internal or external. */
+    get: operations["viewGetById"];
+    /** Update a view, this can be against an internal or external table. */
+    put: operations["viewUpdate"];
+    /** Delete a view, this can be against an internal or external table. */
+    delete: operations["viewDestroy"];
+  };
+  "/views/search": {
+    /** Based on view properties (currently only name) search for views. */
+    post: operations["viewSearch"];
+  };
 }
 
 export interface components {
@@ -813,10 +832,442 @@ export interface components {
         userIds: string[];
       };
     };
+    /** @description The view to be created/updated. */
+    view: {
+      /** @description The name of the view. */
+      name: string;
+      /** @description The ID of the table this view is based on. */
+      tableId: string;
+      /**
+       * @description The type of view - standard (empty value) or calculation.
+       * @enum {string}
+       */
+      type?: "calculation";
+      /** @description A column used to display rows from this view - usually used when rendered in tables. */
+      primaryDisplay?: string;
+      /** @description Search parameters for view */
+      query?: {
+        /**
+         * @description When using groups this defines whether all of the filters must match, or only one of them.
+         * @enum {string}
+         */
+        logicalOperator?: "all" | "any";
+        /**
+         * @description If no filters match, should the view return all rows, or no rows.
+         * @enum {string}
+         */
+        onEmptyFilter?: "all" | "none";
+        /** @description A grouping of filters to be applied. */
+        groups?: {
+          /**
+           * @description When using groups this defines whether all of the filters must match, or only one of them.
+           * @enum {string}
+           */
+          logicalOperator?: "all" | "any";
+          /** @description A list of filters to apply */
+          filters?: {
+            /**
+             * @description The type of search operation which is being performed.
+             * @enum {string}
+             */
+            operator?:
+              | "equal"
+              | "notEqual"
+              | "empty"
+              | "notEmpty"
+              | "fuzzy"
+              | "string"
+              | "contains"
+              | "notContains"
+              | "containsAny"
+              | "oneOf"
+              | "range";
+            /** @description The field in the view to perform the search on. */
+            field?: string;
+            /** @description The value to search for - the type will depend on the operator in use. */
+            value?:
+              | string
+              | number
+              | boolean
+              | { [key: string]: unknown }
+              | unknown[];
+          }[];
+          /** @description A grouping of filters to be applied. */
+          groups?: {
+            /**
+             * @description When using groups this defines whether all of the filters must match, or only one of them.
+             * @enum {string}
+             */
+            logicalOperator?: "all" | "any";
+            /** @description A list of filters to apply */
+            filters?: {
+              /**
+               * @description The type of search operation which is being performed.
+               * @enum {string}
+               */
+              operator?:
+                | "equal"
+                | "notEqual"
+                | "empty"
+                | "notEmpty"
+                | "fuzzy"
+                | "string"
+                | "contains"
+                | "notContains"
+                | "containsAny"
+                | "oneOf"
+                | "range";
+              /** @description The field in the view to perform the search on. */
+              field?: string;
+              /** @description The value to search for - the type will depend on the operator in use. */
+              value?:
+                | string
+                | number
+                | boolean
+                | { [key: string]: unknown }
+                | unknown[];
+            }[];
+          }[];
+        }[];
+      };
+      sort?: {
+        /** @description The field from the table/view schema to sort on. */
+        field: string;
+        /**
+         * @description The order in which to sort.
+         * @enum {string}
+         */
+        order?: "ascending" | "descending";
+        /**
+         * @description The type of sort to perform (by number, or by alphabetically).
+         * @enum {string}
+         */
+        type?: "string" | "number";
+      };
+      schema: {
+        [key: string]:
+          | {
+              /** @description Defines whether the column is visible or not - rows retrieved/updated through this view will not be able to access it. */
+              visible?: boolean;
+              /** @description When used in combination with 'visible: true' the column will be visible in row responses but cannot be updated. */
+              readonly?: boolean;
+              /** @description A number defining where the column shows up in tables, lowest being first. */
+              order?: number;
+              /** @description A width for the column, defined in pixels - this affects rendering in tables. */
+              width?: number;
+              /** @description If this is a relationship column, we can set the columns we wish to include */
+              column?: {
+                readonly?: boolean;
+              }[];
+            }
+          | {
+              /**
+               * @description This column should be built from a calculation, specifying a type and field. It is important to note when a calculation is configured all non-calculation columns will be used for grouping.
+               * @enum {string}
+               */
+              calculationType?: "sum" | "avg" | "count" | "min" | "max";
+              /** @description The field from the table to perform the calculation on. */
+              field?: string;
+              /** @description Can be used in tandem with the count calculation type, to count unique entries. */
+              distinct?: boolean;
+            };
+      };
+    };
+    viewOutput: {
+      /** @description The view to be created/updated. */
+      data: {
+        /** @description The name of the view. */
+        name: string;
+        /** @description The ID of the table this view is based on. */
+        tableId: string;
+        /**
+         * @description The type of view - standard (empty value) or calculation.
+         * @enum {string}
+         */
+        type?: "calculation";
+        /** @description A column used to display rows from this view - usually used when rendered in tables. */
+        primaryDisplay?: string;
+        /** @description Search parameters for view */
+        query?: {
+          /**
+           * @description When using groups this defines whether all of the filters must match, or only one of them.
+           * @enum {string}
+           */
+          logicalOperator?: "all" | "any";
+          /**
+           * @description If no filters match, should the view return all rows, or no rows.
+           * @enum {string}
+           */
+          onEmptyFilter?: "all" | "none";
+          /** @description A grouping of filters to be applied. */
+          groups?: {
+            /**
+             * @description When using groups this defines whether all of the filters must match, or only one of them.
+             * @enum {string}
+             */
+            logicalOperator?: "all" | "any";
+            /** @description A list of filters to apply */
+            filters?: {
+              /**
+               * @description The type of search operation which is being performed.
+               * @enum {string}
+               */
+              operator?:
+                | "equal"
+                | "notEqual"
+                | "empty"
+                | "notEmpty"
+                | "fuzzy"
+                | "string"
+                | "contains"
+                | "notContains"
+                | "containsAny"
+                | "oneOf"
+                | "range";
+              /** @description The field in the view to perform the search on. */
+              field?: string;
+              /** @description The value to search for - the type will depend on the operator in use. */
+              value?:
+                | string
+                | number
+                | boolean
+                | { [key: string]: unknown }
+                | unknown[];
+            }[];
+            /** @description A grouping of filters to be applied. */
+            groups?: {
+              /**
+               * @description When using groups this defines whether all of the filters must match, or only one of them.
+               * @enum {string}
+               */
+              logicalOperator?: "all" | "any";
+              /** @description A list of filters to apply */
+              filters?: {
+                /**
+                 * @description The type of search operation which is being performed.
+                 * @enum {string}
+                 */
+                operator?:
+                  | "equal"
+                  | "notEqual"
+                  | "empty"
+                  | "notEmpty"
+                  | "fuzzy"
+                  | "string"
+                  | "contains"
+                  | "notContains"
+                  | "containsAny"
+                  | "oneOf"
+                  | "range";
+                /** @description The field in the view to perform the search on. */
+                field?: string;
+                /** @description The value to search for - the type will depend on the operator in use. */
+                value?:
+                  | string
+                  | number
+                  | boolean
+                  | { [key: string]: unknown }
+                  | unknown[];
+              }[];
+            }[];
+          }[];
+        };
+        sort?: {
+          /** @description The field from the table/view schema to sort on. */
+          field: string;
+          /**
+           * @description The order in which to sort.
+           * @enum {string}
+           */
+          order?: "ascending" | "descending";
+          /**
+           * @description The type of sort to perform (by number, or by alphabetically).
+           * @enum {string}
+           */
+          type?: "string" | "number";
+        };
+        schema: {
+          [key: string]:
+            | {
+                /** @description Defines whether the column is visible or not - rows retrieved/updated through this view will not be able to access it. */
+                visible?: boolean;
+                /** @description When used in combination with 'visible: true' the column will be visible in row responses but cannot be updated. */
+                readonly?: boolean;
+                /** @description A number defining where the column shows up in tables, lowest being first. */
+                order?: number;
+                /** @description A width for the column, defined in pixels - this affects rendering in tables. */
+                width?: number;
+                /** @description If this is a relationship column, we can set the columns we wish to include */
+                column?: {
+                  readonly?: boolean;
+                }[];
+              }
+            | {
+                /**
+                 * @description This column should be built from a calculation, specifying a type and field. It is important to note when a calculation is configured all non-calculation columns will be used for grouping.
+                 * @enum {string}
+                 */
+                calculationType?: "sum" | "avg" | "count" | "min" | "max";
+                /** @description The field from the table to perform the calculation on. */
+                field?: string;
+                /** @description Can be used in tandem with the count calculation type, to count unique entries. */
+                distinct?: boolean;
+              };
+        };
+        /** @description The ID of the view. */
+        id: string;
+      };
+    };
+    viewSearch: {
+      data: {
+        /** @description The name of the view. */
+        name: string;
+        /** @description The ID of the table this view is based on. */
+        tableId: string;
+        /**
+         * @description The type of view - standard (empty value) or calculation.
+         * @enum {string}
+         */
+        type?: "calculation";
+        /** @description A column used to display rows from this view - usually used when rendered in tables. */
+        primaryDisplay?: string;
+        /** @description Search parameters for view */
+        query?: {
+          /**
+           * @description When using groups this defines whether all of the filters must match, or only one of them.
+           * @enum {string}
+           */
+          logicalOperator?: "all" | "any";
+          /**
+           * @description If no filters match, should the view return all rows, or no rows.
+           * @enum {string}
+           */
+          onEmptyFilter?: "all" | "none";
+          /** @description A grouping of filters to be applied. */
+          groups?: {
+            /**
+             * @description When using groups this defines whether all of the filters must match, or only one of them.
+             * @enum {string}
+             */
+            logicalOperator?: "all" | "any";
+            /** @description A list of filters to apply */
+            filters?: {
+              /**
+               * @description The type of search operation which is being performed.
+               * @enum {string}
+               */
+              operator?:
+                | "equal"
+                | "notEqual"
+                | "empty"
+                | "notEmpty"
+                | "fuzzy"
+                | "string"
+                | "contains"
+                | "notContains"
+                | "containsAny"
+                | "oneOf"
+                | "range";
+              /** @description The field in the view to perform the search on. */
+              field?: string;
+              /** @description The value to search for - the type will depend on the operator in use. */
+              value?:
+                | string
+                | number
+                | boolean
+                | { [key: string]: unknown }
+                | unknown[];
+            }[];
+            /** @description A grouping of filters to be applied. */
+            groups?: {
+              /**
+               * @description When using groups this defines whether all of the filters must match, or only one of them.
+               * @enum {string}
+               */
+              logicalOperator?: "all" | "any";
+              /** @description A list of filters to apply */
+              filters?: {
+                /**
+                 * @description The type of search operation which is being performed.
+                 * @enum {string}
+                 */
+                operator?:
+                  | "equal"
+                  | "notEqual"
+                  | "empty"
+                  | "notEmpty"
+                  | "fuzzy"
+                  | "string"
+                  | "contains"
+                  | "notContains"
+                  | "containsAny"
+                  | "oneOf"
+                  | "range";
+                /** @description The field in the view to perform the search on. */
+                field?: string;
+                /** @description The value to search for - the type will depend on the operator in use. */
+                value?:
+                  | string
+                  | number
+                  | boolean
+                  | { [key: string]: unknown }
+                  | unknown[];
+              }[];
+            }[];
+          }[];
+        };
+        sort?: {
+          /** @description The field from the table/view schema to sort on. */
+          field: string;
+          /**
+           * @description The order in which to sort.
+           * @enum {string}
+           */
+          order?: "ascending" | "descending";
+          /**
+           * @description The type of sort to perform (by number, or by alphabetically).
+           * @enum {string}
+           */
+          type?: "string" | "number";
+        };
+        schema: {
+          [key: string]:
+            | {
+                /** @description Defines whether the column is visible or not - rows retrieved/updated through this view will not be able to access it. */
+                visible?: boolean;
+                /** @description When used in combination with 'visible: true' the column will be visible in row responses but cannot be updated. */
+                readonly?: boolean;
+                /** @description A number defining where the column shows up in tables, lowest being first. */
+                order?: number;
+                /** @description A width for the column, defined in pixels - this affects rendering in tables. */
+                width?: number;
+                /** @description If this is a relationship column, we can set the columns we wish to include */
+                column?: {
+                  readonly?: boolean;
+                }[];
+              }
+            | {
+                /**
+                 * @description This column should be built from a calculation, specifying a type and field. It is important to note when a calculation is configured all non-calculation columns will be used for grouping.
+                 * @enum {string}
+                 */
+                calculationType?: "sum" | "avg" | "count" | "min" | "max";
+                /** @description The field from the table to perform the calculation on. */
+                field?: string;
+                /** @description Can be used in tandem with the count calculation type, to count unique entries. */
+                distinct?: boolean;
+              };
+        };
+        /** @description The ID of the view. */
+        id: string;
+      }[];
+    };
   };
   parameters: {
     /** @description The ID of the table which this request is targeting. */
     tableId: string;
+    /** @description The ID of the view which this request is targeting. */
+    viewId: string;
     /** @description The ID of the row which this request is targeting. */
     rowId: string;
     /** @description The ID of the app which this request is targeting. */
@@ -1213,6 +1664,31 @@ export interface operations {
       };
     };
   };
+  rowViewSearch: {
+    parameters: {
+      path: {
+        /** The ID of the view which this request is targeting. */
+        viewId: components["parameters"]["viewId"];
+      };
+      header: {
+        /** The ID of the app which this request is targeting. */
+        "x-budibase-app-id": components["parameters"]["appId"];
+      };
+    };
+    responses: {
+      /** The response will contain an array of rows that match the search parameters. */
+      200: {
+        content: {
+          "application/json": components["schemas"]["searchOutput"];
+        };
+      };
+    };
+    requestBody: {
+      content: {
+        "application/json": components["schemas"]["rowSearch"];
+      };
+    };
+  };
   /** Create a table, this could be internal or external. */
   tableCreate: {
     parameters: {
@@ -1409,6 +1885,118 @@ export interface operations {
       };
     };
   };
+  /** Create a view, this can be against an internal or external table. */
+  viewCreate: {
+    parameters: {
+      header: {
+        /** The ID of the app which this request is targeting. */
+        "x-budibase-app-id": components["parameters"]["appId"];
+      };
+    };
+    responses: {
+      /** Returns the created view, including the ID which has been generated for it. */
+      200: {
+        content: {
+          "application/json": components["schemas"]["viewOutput"];
+        };
+      };
+    };
+    requestBody: {
+      content: {
+        "application/json": components["schemas"]["view"];
+      };
+    };
+  };
+  /** Lookup a view, this could be internal or external. */
+  viewGetById: {
+    parameters: {
+      path: {
+        /** The ID of the view which this request is targeting. */
+        viewId: components["parameters"]["viewId"];
+      };
+      header: {
+        /** The ID of the app which this request is targeting. */
+        "x-budibase-app-id": components["parameters"]["appId"];
+      };
+    };
+    responses: {
+      /** Returns the retrieved view. */
+      200: {
+        content: {
+          "application/json": components["schemas"]["viewOutput"];
+        };
+      };
+    };
+  };
+  /** Update a view, this can be against an internal or external table. */
+  viewUpdate: {
+    parameters: {
+      path: {
+        /** The ID of the view which this request is targeting. */
+        viewId: components["parameters"]["viewId"];
+      };
+      header: {
+        /** The ID of the app which this request is targeting. */
+        "x-budibase-app-id": components["parameters"]["appId"];
+      };
+    };
+    responses: {
+      /** Returns the updated view. */
+      200: {
+        content: {
+          "application/json": components["schemas"]["viewOutput"];
+        };
+      };
+    };
+    requestBody: {
+      content: {
+        "application/json": components["schemas"]["view"];
+      };
+    };
+  };
+  /** Delete a view, this can be against an internal or external table. */
+  viewDestroy: {
+    parameters: {
+      path: {
+        /** The ID of the view which this request is targeting. */
+        viewId: components["parameters"]["viewId"];
+      };
+      header: {
+        /** The ID of the app which this request is targeting. */
+        "x-budibase-app-id": components["parameters"]["appId"];
+      };
+    };
+    responses: {
+      /** Returns the deleted view. */
+      200: {
+        content: {
+          "application/json": components["schemas"]["viewOutput"];
+        };
+      };
+    };
+  };
+  /** Based on view properties (currently only name) search for views. */
+  viewSearch: {
+    parameters: {
+      header: {
+        /** The ID of the app which this request is targeting. */
+        "x-budibase-app-id": components["parameters"]["appId"];
+      };
+    };
+    responses: {
+      /** Returns the found views, based on the search parameters. */
+      200: {
+        content: {
+          "application/json": components["schemas"]["viewSearch"];
+        };
+      };
+    };
+    requestBody: {
+      content: {
+        "application/json": components["schemas"]["nameSearch"];
+      };
+    };
+  };
 }
 
 export interface external {}
diff --git a/packages/server/src/middleware/publicApi.ts b/packages/server/src/middleware/publicApi.ts
index e3897d1a49..da10dd3539 100644
--- a/packages/server/src/middleware/publicApi.ts
+++ b/packages/server/src/middleware/publicApi.ts
@@ -1,8 +1,8 @@
 import { constants, utils } from "@budibase/backend-core"
-import { BBContext } from "@budibase/types"
+import { Ctx } from "@budibase/types"
 
 export default function ({ requiresAppId }: { requiresAppId?: boolean } = {}) {
-  return async (ctx: BBContext, next: any) => {
+  return async (ctx: Ctx, next: any) => {
     const appId = await utils.getAppIdFromCtx(ctx)
     if (requiresAppId && !appId) {
       ctx.throw(
diff --git a/packages/server/src/sdk/app/tables/getters.ts b/packages/server/src/sdk/app/tables/getters.ts
index c59298faf1..1ad82b8e42 100644
--- a/packages/server/src/sdk/app/tables/getters.ts
+++ b/packages/server/src/sdk/app/tables/getters.ts
@@ -78,8 +78,11 @@ export async function getAllInternalTables(db?: Database): Promise<Table[]> {
 }
 
 async function getAllExternalTables(): Promise<Table[]> {
+  // this is all datasources, we'll need to filter out internal
   const datasources = await sdk.datasources.fetch({ enriched: true })
-  const allEntities = datasources.map(datasource => datasource.entities)
+  const allEntities = datasources
+    .filter(datasource => datasource._id !== INTERNAL_TABLE_SOURCE_ID)
+    .map(datasource => datasource.entities)
   let final: Table[] = []
   for (let entities of allEntities) {
     if (entities) {
diff --git a/packages/server/src/sdk/app/views/index.ts b/packages/server/src/sdk/app/views/index.ts
index 9c111ff079..58537c96ad 100644
--- a/packages/server/src/sdk/app/views/index.ts
+++ b/packages/server/src/sdk/app/views/index.ts
@@ -26,6 +26,7 @@ import { isExternalTableID } from "../../../integrations/utils"
 import * as internal from "./internal"
 import * as external from "./external"
 import sdk from "../../../sdk"
+import { ensureQueryUISet } from "./utils"
 
 function pickApi(tableId: any) {
   if (isExternalTableID(tableId)) {
@@ -44,6 +45,24 @@ export async function getEnriched(viewId: string): Promise<ViewV2Enriched> {
   return pickApi(tableId).getEnriched(viewId)
 }
 
+export async function getAllEnriched(): Promise<ViewV2Enriched[]> {
+  const tables = await sdk.tables.getAllTables()
+  let views: ViewV2Enriched[] = []
+  for (let table of tables) {
+    if (!table.views || Object.keys(table.views).length === 0) {
+      continue
+    }
+    const v2Views = Object.values(table.views).filter(isV2)
+    const enrichedViews = await Promise.all(
+      v2Views.map(view =>
+        enrichSchema(ensureQueryUISet(view), table.schema, tables)
+      )
+    )
+    views = views.concat(enrichedViews)
+  }
+  return views
+}
+
 export async function getTable(view: string | ViewV2): Promise<Table> {
   const viewId = typeof view === "string" ? view : view.id
   const cached = context.getTableForView(viewId)
@@ -333,13 +352,19 @@ export function allowedFields(
 
 export async function enrichSchema(
   view: ViewV2,
-  tableSchema: TableSchema
+  tableSchema: TableSchema,
+  tables?: Table[]
 ): Promise<ViewV2Enriched> {
   async function populateRelTableSchema(
     tableId: string,
     viewFields: Record<string, RelationSchemaField>
   ) {
-    const relTable = await sdk.tables.getTable(tableId)
+    let relTable = tables
+      ? tables?.find(t => t._id === tableId)
+      : await sdk.tables.getTable(tableId)
+    if (!relTable) {
+      throw new Error("Cannot enrich relationship, table not found")
+    }
     const result: Record<string, ViewV2ColumnEnriched> = {}
     for (const relTableFieldName of Object.keys(relTable.schema)) {
       const relTableField = relTable.schema[relTableFieldName]
diff --git a/packages/server/src/tests/utilities/api/viewV2.ts b/packages/server/src/tests/utilities/api/viewV2.ts
index 9741240f27..7cc57673a0 100644
--- a/packages/server/src/tests/utilities/api/viewV2.ts
+++ b/packages/server/src/tests/utilities/api/viewV2.ts
@@ -5,6 +5,7 @@ import {
   SearchViewRowRequest,
   PaginatedSearchRowResponse,
   ViewResponseEnriched,
+  ViewFetchResponseEnriched,
 } from "@budibase/types"
 import { Expectations, TestAPI } from "./base"
 
@@ -49,6 +50,12 @@ export class ViewV2API extends TestAPI {
       .data
   }
 
+  fetch = async (expectations?: Expectations) => {
+    return await this._get<ViewFetchResponseEnriched>(`/api/v2/views`, {
+      expectations,
+    })
+  }
+
   search = async (
     viewId: string,
     params?: SearchViewRowRequest,
diff --git a/packages/server/src/threads/automation.ts b/packages/server/src/threads/automation.ts
index 91bf4a211f..33e11a6ac0 100644
--- a/packages/server/src/threads/automation.ts
+++ b/packages/server/src/threads/automation.ts
@@ -385,7 +385,7 @@ class Orchestrator {
     stepIdx: number,
     pathIdx?: number
   ): Promise<number> {
-    await processObject(loopStep.inputs, this.processContext(this.context))
+    await processObject(loopStep.inputs, this.mergeContexts(this.context))
     const iterations = getLoopIterations(loopStep)
     let stepToLoopIndex = stepIdx + 1
     let pathStepIdx = (pathIdx || stepIdx) + 1
@@ -573,14 +573,14 @@ class Orchestrator {
           for (const [field, value] of Object.entries(filters[filterKey])) {
             const fromContext = processStringSync(
               field,
-              this.processContext(this.context)
+              this.mergeContexts(this.context)
             )
             toFilter[field] = fromContext
 
             if (typeof value === "string" && findHBSBlocks(value).length > 0) {
               const processedVal = processStringSync(
                 value,
-                this.processContext(this.context)
+                this.mergeContexts(this.context)
               )
 
               filters[filterKey][field] = processedVal
@@ -637,7 +637,7 @@ class Orchestrator {
         const stepFn = await this.getStepFunctionality(step.stepId)
         let inputs = await processObject(
           originalStepInput,
-          this.processContext(this.context)
+          this.mergeContexts(this.context)
         )
         inputs = automationUtils.cleanInputValues(inputs, step.schema.inputs)
 
@@ -645,7 +645,7 @@ class Orchestrator {
           inputs: inputs,
           appId: this.appId,
           emitter: this.emitter,
-          context: this.context,
+          context: this.mergeContexts(this.context),
         })
         this.handleStepOutput(step, outputs, loopIteration)
       }
@@ -665,8 +665,8 @@ class Orchestrator {
     return null
   }
 
-  private processContext(context: AutomationContext) {
-    const processContext = {
+  private mergeContexts(context: AutomationContext) {
+    const mergeContexts = {
       ...context,
       steps: {
         ...context.steps,
@@ -674,7 +674,7 @@ class Orchestrator {
         ...context.stepsByName,
       },
     }
-    return processContext
+    return mergeContexts
   }
 
   private handleStepOutput(
diff --git a/packages/types/src/api/web/app/view.ts b/packages/types/src/api/web/app/view.ts
index a6be5e2986..2560f7507f 100644
--- a/packages/types/src/api/web/app/view.ts
+++ b/packages/types/src/api/web/app/view.ts
@@ -9,6 +9,10 @@ export interface ViewResponseEnriched {
   data: ViewV2Enriched
 }
 
+export interface ViewFetchResponseEnriched {
+  data: ViewV2Enriched[]
+}
+
 export interface CreateViewRequest extends Omit<ViewV2, "version" | "id"> {}
 
 export interface UpdateViewRequest extends ViewV2 {}
diff --git a/packages/types/src/documents/app/view.ts b/packages/types/src/documents/app/view.ts
index 1212031f24..1170284b15 100644
--- a/packages/types/src/documents/app/view.ts
+++ b/packages/types/src/documents/app/view.ts
@@ -101,6 +101,10 @@ export interface ViewV2 {
   schema?: ViewV2Schema
 }
 
+export interface PublicAPIView extends Omit<ViewV2, "query" | "queryUI"> {
+  query?: UISearchFilter
+}
+
 export type ViewV2Schema = Record<string, ViewFieldMetadata>
 
 export type ViewSchema = ViewCountOrSumSchema | ViewStatisticsSchema
diff --git a/packages/types/src/documents/global/quotas.ts b/packages/types/src/documents/global/quotas.ts
index 4726dabf0d..a24fc8f9b0 100644
--- a/packages/types/src/documents/global/quotas.ts
+++ b/packages/types/src/documents/global/quotas.ts
@@ -44,7 +44,6 @@ export interface StaticUsage {
 export interface MonthlyUsage {
   [MonthlyQuotaName.QUERIES]: number
   [MonthlyQuotaName.AUTOMATIONS]: number
-  [MonthlyQuotaName.DAY_PASSES]: number
   [MonthlyQuotaName.BUDIBASE_AI_CREDITS]: number
   triggers: {
     [key in MonthlyQuotaName]?: QuotaTriggers
diff --git a/packages/types/src/documents/global/user.ts b/packages/types/src/documents/global/user.ts
index 1b242886b5..529223e88d 100644
--- a/packages/types/src/documents/global/user.ts
+++ b/packages/types/src/documents/global/user.ts
@@ -62,7 +62,6 @@ export interface User extends Document {
   password?: string
   status?: UserStatus
   createdAt?: number // override the default createdAt behaviour - users sdk historically set this to Date.now()
-  dayPassRecordedAt?: string
   userGroups?: string[]
   onboardedAt?: string
   freeTrialConfirmedAt?: string
diff --git a/packages/types/src/documents/pouch.ts b/packages/types/src/documents/pouch.ts
index 6ff851a515..c2ac1599ee 100644
--- a/packages/types/src/documents/pouch.ts
+++ b/packages/types/src/documents/pouch.ts
@@ -8,7 +8,7 @@ export interface RowValue {
 export interface RowResponse<T extends Document | RowValue> {
   id: string
   key: string
-  error: string
+  error?: string
   value: T
   doc?: T
 }
diff --git a/packages/types/src/sdk/db.ts b/packages/types/src/sdk/db.ts
index 9797715329..9feecbdb2b 100644
--- a/packages/types/src/sdk/db.ts
+++ b/packages/types/src/sdk/db.ts
@@ -163,8 +163,8 @@ export interface Database {
     viewName: string,
     params: DatabaseQueryOpts
   ): Promise<AllDocsResponse<T>>
-  destroy(): Promise<Nano.OkResponse | void>
-  compact(): Promise<Nano.OkResponse | void>
+  destroy(): Promise<Nano.OkResponse>
+  compact(): Promise<Nano.OkResponse>
   // these are all PouchDB related functions that are rarely used - in future
   // should be replaced by better typed/non-pouch implemented methods
   dump(stream: Writable, opts?: DatabaseDumpOpts): Promise<any>
diff --git a/packages/types/src/sdk/licensing/plan.ts b/packages/types/src/sdk/licensing/plan.ts
index af682cbad1..8cdd72dd5d 100644
--- a/packages/types/src/sdk/licensing/plan.ts
+++ b/packages/types/src/sdk/licensing/plan.ts
@@ -38,7 +38,6 @@ export interface AvailablePrice {
 export enum PlanModel {
   PER_USER = "perUser",
   PER_CREATOR_PER_USER = "per_creator_per_user",
-  DAY_PASS = "dayPass",
 }
 
 export interface PurchasedPlan {
@@ -49,7 +48,6 @@ export interface PurchasedPlan {
 }
 
 export interface PurchasedPrice extends AvailablePrice {
-  dayPasses: number | undefined
   /** @deprecated - now at the plan level via model */
   isPerUser: boolean
 }
diff --git a/packages/types/src/sdk/licensing/quota.ts b/packages/types/src/sdk/licensing/quota.ts
index 75fc18e8e6..ed541d2974 100644
--- a/packages/types/src/sdk/licensing/quota.ts
+++ b/packages/types/src/sdk/licensing/quota.ts
@@ -23,7 +23,6 @@ export enum StaticQuotaName {
 export enum MonthlyQuotaName {
   QUERIES = "queries",
   AUTOMATIONS = "automations",
-  DAY_PASSES = "dayPasses",
   BUDIBASE_AI_CREDITS = "budibaseAICredits",
 }
 
@@ -63,7 +62,6 @@ export type PlanQuotas = { [key in PlanType]: Quotas | undefined }
 export type MonthlyQuotas = {
   [MonthlyQuotaName.QUERIES]: Quota
   [MonthlyQuotaName.AUTOMATIONS]: Quota
-  [MonthlyQuotaName.DAY_PASSES]: Quota
   [MonthlyQuotaName.BUDIBASE_AI_CREDITS]: Quota
 }
 
diff --git a/packages/worker/package.json b/packages/worker/package.json
index 85eae6c88a..36c88a9a49 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -50,8 +50,9 @@
     "bcrypt": "5.1.0",
     "bcryptjs": "2.4.3",
     "bull": "4.10.1",
-    "dd-trace": "5.23.0",
+    "dd-trace": "5.26.0",
     "dotenv": "8.6.0",
+    "email-validator": "^2.0.4",
     "global-agent": "3.0.0",
     "ical-generator": "4.1.0",
     "joi": "17.6.0",
diff --git a/packages/worker/src/api/controllers/global/users.ts b/packages/worker/src/api/controllers/global/users.ts
index f415698fc0..2479a50d9e 100644
--- a/packages/worker/src/api/controllers/global/users.ts
+++ b/packages/worker/src/api/controllers/global/users.ts
@@ -40,6 +40,7 @@ import {
 import { checkAnyUserExists } from "../../../utilities/users"
 import { isEmailConfigured } from "../../../utilities/email"
 import { BpmStatusKey, BpmStatusValue, utils } from "@budibase/shared-core"
+import emailValidator from "email-validator"
 import crypto from "crypto"
 
 const MAX_USERS_UPLOAD_LIMIT = 1000
@@ -300,6 +301,10 @@ export const find = async (ctx: any) => {
 
 export const tenantUserLookup = async (ctx: any) => {
   const id = ctx.params.id
+  // is email, check its valid
+  if (id.includes("@") && !emailValidator.validate(id)) {
+    ctx.throw(400, `${id} is not a valid email address to lookup.`)
+  }
   const user = await userSdk.core.getFirstPlatformUser(id)
   if (user) {
     ctx.body = user
diff --git a/packages/worker/src/api/routes/global/tests/self.spec.ts b/packages/worker/src/api/routes/global/tests/self.spec.ts
index 277c11b081..bf34f14aa0 100644
--- a/packages/worker/src/api/routes/global/tests/self.spec.ts
+++ b/packages/worker/src/api/routes/global/tests/self.spec.ts
@@ -1,5 +1,5 @@
 jest.mock("nodemailer")
-import { TestConfiguration, mocks } from "../../../../tests"
+import { TestConfiguration } from "../../../../tests"
 import { events } from "@budibase/backend-core"
 
 describe("/api/global/self", () => {
@@ -39,7 +39,6 @@ describe("/api/global/self", () => {
       const dbUser = (await config.getUser(user.email))!
 
       user._rev = dbUser._rev
-      user.dayPassRecordedAt = mocks.date.MOCK_DATE.toISOString()
       expect(res.body._id).toBe(user._id)
       expect(events.user.updated).toHaveBeenCalledTimes(1)
       expect(events.user.updated).toHaveBeenCalledWith(dbUser)
@@ -62,7 +61,6 @@ describe("/api/global/self", () => {
     const dbUser = (await config.getUser(user.email))!
 
     user._rev = dbUser._rev
-    user.dayPassRecordedAt = mocks.date.MOCK_DATE.toISOString()
     expect(dbUser.onboardedAt).toBe("2023-03-07T14:10:54.869Z")
     expect(dbUser.freeTrialConfirmedAt).toBe("2024-03-17T14:10:54.869Z")
     expect(res.body._id).toBe(user._id)
diff --git a/yarn.lock b/yarn.lock
index 0e7f680619..ceebc9ebdf 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2196,7 +2196,7 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@3.2.7":
+"@budibase/backend-core@3.2.14":
   version "0.0.0"
   dependencies:
     "@budibase/nano" "10.1.5"
@@ -2210,7 +2210,7 @@
     bcryptjs "2.4.3"
     bull "4.10.1"
     correlation-id "4.0.0"
-    dd-trace "5.23.0"
+    dd-trace "5.26.0"
     dotenv "16.0.1"
     google-auth-library "^8.0.1"
     google-spreadsheet "npm:@budibase/google-spreadsheet@4.1.5"
@@ -2280,18 +2280,18 @@
     through2 "^2.0.0"
 
 "@budibase/pro@npm:@budibase/pro@latest":
-  version "3.2.7"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-3.2.7.tgz#4dfc48f3e2ba3a3b235872e54c3de4de54ea7941"
-  integrity sha512-GRRaf1qSqQfoodjvKjBDvNOVHZrcSXF7so6Y9Xv/MiRTjDES5nmhIT5rL/PQ1+Mb+sPytYmMaJ2mlTtwqSQZgQ==
+  version "3.2.14"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-3.2.14.tgz#2ea1ef4372803304ac3a06ce77620ce54a09dd02"
+  integrity sha512-ski7NeXOdDIjC0vapo+hxr8/VnbDhmOLF5TdvoLBgviMk7ij2rNPI2dNs+6kQuVXAEVJPD6bJ4Ke0z2d5YcYrQ==
   dependencies:
     "@anthropic-ai/sdk" "^0.27.3"
-    "@budibase/backend-core" "3.2.7"
-    "@budibase/shared-core" "3.2.7"
-    "@budibase/string-templates" "3.2.7"
-    "@budibase/types" "3.2.7"
-    "@koa/router" "8.0.8"
+    "@budibase/backend-core" "3.2.14"
+    "@budibase/shared-core" "3.2.14"
+    "@budibase/string-templates" "3.2.14"
+    "@budibase/types" "3.2.14"
+    "@koa/router" "13.1.0"
     bull "4.10.1"
-    dd-trace "5.2.0"
+    dd-trace "5.26.0"
     joi "17.6.0"
     jsonwebtoken "9.0.2"
     lru-cache "^7.14.1"
@@ -2301,13 +2301,13 @@
     scim-patch "^0.8.1"
     scim2-parse-filter "^0.2.8"
 
-"@budibase/shared-core@3.2.7":
+"@budibase/shared-core@3.2.14":
   version "0.0.0"
   dependencies:
     "@budibase/types" "0.0.0"
     cron-validate "1.4.5"
 
-"@budibase/string-templates@3.2.7":
+"@budibase/string-templates@3.2.14":
   version "0.0.0"
   dependencies:
     "@budibase/handlebars-helpers" "^0.13.2"
@@ -2315,7 +2315,7 @@
     handlebars "^4.7.8"
     lodash.clonedeep "^4.5.0"
 
-"@budibase/types@3.2.7":
+"@budibase/types@3.2.14":
   version "0.0.0"
   dependencies:
     scim-patch "^0.8.1"
@@ -2478,12 +2478,10 @@
   resolved "https://registry.yarnpkg.com/@dagrejs/graphlib/-/graphlib-2.2.4.tgz#d77bfa9ff49e2307c0c6e6b8b26b5dd3c05816c4"
   integrity sha512-mepCf/e9+SKYy1d02/UkvSy6+6MoyXhVxP8lLDfA7BPE1X1d4dR0sZznmbM8/XVJ1GPM+Svnx7Xj6ZweByWUkw==
 
-"@datadog/native-appsec@7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@datadog/native-appsec/-/native-appsec-7.0.0.tgz#a380174dd49aef2d9bb613a0ec8ead6dc7822095"
-  integrity sha512-bywstWFW2hWxzPuS0+mFMVHHL0geulx5yQFtsjfszaH2LTAgk2D+Rt40MKbAoZ8q3tRw2dy6aYQ7svO3ca8jpA==
-  dependencies:
-    node-gyp-build "^3.9.0"
+"@datadog/libdatadog@^0.2.2":
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/@datadog/libdatadog/-/libdatadog-0.2.2.tgz#ac02c76ac9a38250dca740727c7cdf00244ce3d3"
+  integrity sha512-rTWo96mEPTY5UbtGoFj8/wY0uKSViJhsPg/Z6aoFWBFXQ8b45Ix2e/yvf92AAwrhG+gPLTxEqTXh3kef2dP8Ow==
 
 "@datadog/native-appsec@8.1.1":
   version "8.1.1"
@@ -2492,13 +2490,12 @@
   dependencies:
     node-gyp-build "^3.9.0"
 
-"@datadog/native-iast-rewriter@2.2.2":
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/@datadog/native-iast-rewriter/-/native-iast-rewriter-2.2.2.tgz#3f7feaf6be1af4c83ad063065b8ed509bbaf11cb"
-  integrity sha512-13ZBhJpjZ/tiV6rYfyAf/ITye9cyd3x12M/2NKhD4Ivev4N4uKBREAjpArOtzKtPXZ5b6oXwVV4ofT1SHoYyzA==
+"@datadog/native-appsec@8.3.0":
+  version "8.3.0"
+  resolved "https://registry.yarnpkg.com/@datadog/native-appsec/-/native-appsec-8.3.0.tgz#91afd89d18d386be4da8a1b0e04500f2f8b5eb66"
+  integrity sha512-RYHbSJ/MwJcJaLzaCaZvUyNLUKFbMshayIiv4ckpFpQJDiq1T8t9iM2k7008s75g1vRuXfsRNX7MaLn4aoFuWA==
   dependencies:
-    lru-cache "^7.14.0"
-    node-gyp-build "^4.5.0"
+    node-gyp-build "^3.9.0"
 
 "@datadog/native-iast-rewriter@2.4.1":
   version "2.4.1"
@@ -2508,12 +2505,13 @@
     lru-cache "^7.14.0"
     node-gyp-build "^4.5.0"
 
-"@datadog/native-iast-taint-tracking@1.6.4":
-  version "1.6.4"
-  resolved "https://registry.yarnpkg.com/@datadog/native-iast-taint-tracking/-/native-iast-taint-tracking-1.6.4.tgz#16c21ad7c36a53420c0d3c5a3720731809cc7e98"
-  integrity sha512-Owxk7hQ4Dxwv4zJAoMjRga0IvE6lhvxnNc8pJCHsemCWBXchjr/9bqg05Zy5JnMbKUWn4XuZeJD6RFZpRa8bfw==
+"@datadog/native-iast-rewriter@2.5.0":
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/@datadog/native-iast-rewriter/-/native-iast-rewriter-2.5.0.tgz#b613defe86e78168f750d1f1662d4ffb3cf002e6"
+  integrity sha512-WRu34A3Wwp6oafX8KWNAbedtDaaJO+nzfYQht7pcJKjyC2ggfPeF7SoP+eDo9wTn4/nQwEOscSR4hkJqTRlpXQ==
   dependencies:
-    node-gyp-build "^3.9.0"
+    lru-cache "^7.14.0"
+    node-gyp-build "^4.5.0"
 
 "@datadog/native-iast-taint-tracking@3.1.0":
   version "3.1.0"
@@ -2522,6 +2520,13 @@
   dependencies:
     node-gyp-build "^3.9.0"
 
+"@datadog/native-iast-taint-tracking@3.2.0":
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/@datadog/native-iast-taint-tracking/-/native-iast-taint-tracking-3.2.0.tgz#9fb6823d82f934e12c06ea1baa7399ca80deb2ec"
+  integrity sha512-Mc6FzCoyvU5yXLMsMS9yKnEqJMWoImAukJXolNWCTm+JQYCMf2yMsJ8pBAm7KyZKliamM9rCn7h7Tr2H3lXwjA==
+  dependencies:
+    node-gyp-build "^3.9.0"
+
 "@datadog/native-metrics@^2.0.0":
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/@datadog/native-metrics/-/native-metrics-2.0.0.tgz#65bf03313ee419956361e097551db36173e85712"
@@ -2530,16 +2535,13 @@
     node-addon-api "^6.1.0"
     node-gyp-build "^3.9.0"
 
-"@datadog/pprof@5.0.0":
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/@datadog/pprof/-/pprof-5.0.0.tgz#0c0aaf06def6d2bc4b2d353ec7b264dadbfbefab"
-  integrity sha512-vhNan4SBuNWLpexunDJQ+hNbRAgWdk2qy5Iyh7Nn94uSSHXigAJMAvu4jwMKKQKFfchtobOkWT8GQUWW3tgpFg==
+"@datadog/native-metrics@^3.0.1":
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/@datadog/native-metrics/-/native-metrics-3.0.1.tgz#dc276c93785c0377a048e316f23b7c8ff3acfa84"
+  integrity sha512-0GuMyYyXf+Qpb/F+Fcekz58f2mO37lit9U3jMbWY/m8kac44gCPABzL5q3gWbdH+hWgqYfQoEYsdNDGSrKfwoQ==
   dependencies:
-    delay "^5.0.0"
-    node-gyp-build "<4.0"
-    p-limit "^3.1.0"
-    pprof-format "^2.0.7"
-    source-map "^0.7.4"
+    node-addon-api "^6.1.0"
+    node-gyp-build "^3.9.0"
 
 "@datadog/pprof@5.3.0":
   version "5.3.0"
@@ -2552,6 +2554,17 @@
     pprof-format "^2.1.0"
     source-map "^0.7.4"
 
+"@datadog/pprof@5.4.1":
+  version "5.4.1"
+  resolved "https://registry.yarnpkg.com/@datadog/pprof/-/pprof-5.4.1.tgz#08c9bcf5d8efb2eeafdfc9f5bb5402f79fb41266"
+  integrity sha512-IvpL96e/cuh8ugP5O8Czdup7XQOLHeIDgM5pac5W7Lc1YzGe5zTtebKFpitvb1CPw1YY+1qFx0pWGgKP2kOfHg==
+  dependencies:
+    delay "^5.0.0"
+    node-gyp-build "<4.0"
+    p-limit "^3.1.0"
+    pprof-format "^2.1.0"
+    source-map "^0.7.4"
+
 "@datadog/sketches-js@^2.1.0":
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/@datadog/sketches-js/-/sketches-js-2.1.0.tgz#8c7e8028a5fc22ad102fa542b0a446c956830455"
@@ -2880,6 +2893,11 @@
     wrap-ansi "^8.1.0"
     wrap-ansi-cjs "npm:wrap-ansi@^7.0.0"
 
+"@isaacs/ttlcache@^1.4.1":
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/@isaacs/ttlcache/-/ttlcache-1.4.1.tgz#21fb23db34e9b6220c6ba023a0118a2dd3461ea2"
+  integrity sha512-RQgQ4uQ+pLbqXfOmieB91ejmLwvSgv9nLx6sT6sD83s7umBypgg+OIBOBbEUiJXrfpnp9j0mRhYYdzp9uqq3lA==
+
 "@istanbuljs/load-nyc-config@^1.0.0":
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz#fd3db1d59ecf7cf121e80650bb86712f9b55eced"
@@ -3462,6 +3480,13 @@
   resolved "https://registry.yarnpkg.com/@jsep-plugin/regex/-/regex-1.0.4.tgz#cb2fc423220fa71c609323b9ba7f7d344a755fcc"
   integrity sha512-q7qL4Mgjs1vByCaTnDFcBnV9HS7GVPJX5vyVoCgZHNSC9rjwIlmbXG5sUuorR5ndfHAIlJ8pVStxvjXHbNvtUg==
 
+"@koa/cors@5.0.0":
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/@koa/cors/-/cors-5.0.0.tgz#0029b5f057fa0d0ae0e37dd2c89ece315a0daffd"
+  integrity sha512-x/iUDjcS90W69PryLDIMgFyV21YLTnG9zOpPXS7Bkt2b8AsY3zZsIpOLBkYr9fBcF3HbkKaER5hOBZLfpLgYNw==
+  dependencies:
+    vary "^1.1.2"
+
 "@koa/router@13.1.0":
   version "13.1.0"
   resolved "https://registry.yarnpkg.com/@koa/router/-/router-13.1.0.tgz#43f4c554444ea4f4a148a5735a9525c6d16fd1b5"
@@ -3471,18 +3496,6 @@
     koa-compose "^4.1.0"
     path-to-regexp "^6.3.0"
 
-"@koa/router@8.0.8":
-  version "8.0.8"
-  resolved "https://registry.yarnpkg.com/@koa/router/-/router-8.0.8.tgz#95f32d11373d03d89dcb63fabe9ac6f471095236"
-  integrity sha512-FnT93N4NUehnXr+juupDmG2yfi0JnWdCmNEuIXpCG4TtG+9xvtrLambBH3RclycopVUOEYAim2lydiNBI7IRVg==
-  dependencies:
-    debug "^4.1.1"
-    http-errors "^1.7.3"
-    koa-compose "^4.1.0"
-    methods "^1.1.2"
-    path-to-regexp "1.x"
-    urijs "^1.19.2"
-
 "@lerna/child-process@7.4.2":
   version "7.4.2"
   resolved "https://registry.yarnpkg.com/@lerna/child-process/-/child-process-7.4.2.tgz#a2fd013ac2150dc288270d3e0d0b850c06bec511"
@@ -3946,7 +3959,7 @@
   resolved "https://registry.yarnpkg.com/@opentelemetry/api/-/api-1.8.0.tgz#5aa7abb48f23f693068ed2999ae627d2f7d902ec"
   integrity sha512-I/s6F7yKUDdtMsoBWXJe8Qz40Tui5vsuKCWJEWVL+5q9sSWRzzx6v2KeNsOBEwd94j0eWkpWCH4yB6rZg9Mf0w==
 
-"@opentelemetry/api@^1.0.0", "@opentelemetry/api@^1.0.1":
+"@opentelemetry/api@^1.0.1":
   version "1.9.0"
   resolved "https://registry.yarnpkg.com/@opentelemetry/api/-/api-1.9.0.tgz#d03eba68273dc0f7509e2a3d5cba21eae10379fe"
   integrity sha512-3giAOQvZiH5F9bMlMiv8+GSPMeqg0dbaeo58/0SlA9sxSqZhnUtxzX9/2FzyhS9sWQf5S0GJE0AKBrFqjpeYcg==
@@ -4063,13 +4076,6 @@
   resolved "https://registry.yarnpkg.com/@redis/time-series/-/time-series-1.0.4.tgz#af85eb080f6934580e4d3b58046026b6c2b18717"
   integrity sha512-ThUIgo2U/g7cCuZavucQTQzA9g9JbDDY2f64u3AbAoz/8vE2lt2U37LamDUVChhaDA3IRT9R6VvJwqnUfTJzng==
 
-"@rollup/plugin-alias@^5.1.0":
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/@rollup/plugin-alias/-/plugin-alias-5.1.0.tgz#99a94accc4ff9a3483be5baeedd5d7da3b597e93"
-  integrity sha512-lpA3RZ9PdIG7qqhEfv79tBffNaoDuukFDrmhLqg9ifv99u/ehn+lOg30x2zmhf8AQqQUZaMk/B9fZraQ6/acDQ==
-  dependencies:
-    slash "^4.0.0"
-
 "@rollup/plugin-commonjs@16.0.0", "@rollup/plugin-commonjs@^16.0.0":
   version "16.0.0"
   resolved "https://registry.yarnpkg.com/@rollup/plugin-commonjs/-/plugin-commonjs-16.0.0.tgz#169004d56cd0f0a1d0f35915d31a036b0efe281f"
@@ -4108,14 +4114,6 @@
     is-reference "1.2.1"
     magic-string "^0.30.3"
 
-"@rollup/plugin-image@^3.0.3":
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/@rollup/plugin-image/-/plugin-image-3.0.3.tgz#025b557180bae20f2349ff5130ef2114169feaac"
-  integrity sha512-qXWQwsXpvD4trSb8PeFPFajp8JLpRtqqOeNYRUKnEQNHm7e5UP7fuSRcbjQAJ7wDZBbnJvSdY5ujNBQd9B1iFg==
-  dependencies:
-    "@rollup/pluginutils" "^5.0.1"
-    mini-svg-data-uri "^1.4.4"
-
 "@rollup/plugin-inject@^5.0.4", "@rollup/plugin-inject@^5.0.5":
   version "5.0.5"
   resolved "https://registry.yarnpkg.com/@rollup/plugin-inject/-/plugin-inject-5.0.5.tgz#616f3a73fe075765f91c5bec90176608bed277a3"
@@ -5744,6 +5742,13 @@
     "@types/koa-compose" "*"
     "@types/node" "*"
 
+"@types/koa__cors@5.0.0":
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/@types/koa__cors/-/koa__cors-5.0.0.tgz#74567a045b599266e2cd3940cef96cedecc2ef1f"
+  integrity sha512-LCk/n25Obq5qlernGOK/2LUwa/2YJb2lxHUkkvYFDOpLXlVI6tKcdfCHRBQnOY4LwH6el5WOLs6PD/a8Uzau6g==
+  dependencies:
+    "@types/koa" "*"
+
 "@types/koa__router@12.0.4":
   version "12.0.4"
   resolved "https://registry.yarnpkg.com/@types/koa__router/-/koa__router-12.0.4.tgz#a1f9afec9dc7e7d9fa1252d1938c44b403e19a28"
@@ -8206,6 +8211,13 @@ chokidar@3.5.3, chokidar@^3.5.2, chokidar@^3.5.3:
   optionalDependencies:
     fsevents "~2.3.2"
 
+chokidar@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-4.0.1.tgz#4a6dff66798fb0f72a94f616abbd7e1a19f31d41"
+  integrity sha512-n8enUVCED/KVRQlab1hr3MVpcVMvxtZjmEa956u+4YijlmQED223XMSYj2tLuKvr4jcCTzNNMpQDUer72MMmzA==
+  dependencies:
+    readdirp "^4.0.1"
+
 chownr@^1.1.1:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b"
@@ -8966,16 +8978,14 @@ cron-validate@1.4.5:
   dependencies:
     yup "0.32.9"
 
-cross-spawn@^6.0.0:
-  version "6.0.5"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
-  integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==
+cross-spawn@7.0.6:
+  version "7.0.6"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.6.tgz#8a58fe78f00dcd70c370451759dfbfaf03e8ee9f"
+  integrity sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==
   dependencies:
-    nice-try "^1.0.4"
-    path-key "^2.0.1"
-    semver "^5.5.0"
-    shebang-command "^1.2.0"
-    which "^1.2.9"
+    path-key "^3.1.0"
+    shebang-command "^2.0.0"
+    which "^2.0.1"
 
 cross-spawn@^7.0.0, cross-spawn@^7.0.2, cross-spawn@^7.0.3:
   version "7.0.3"
@@ -9296,48 +9306,11 @@ dayjs@^1.10.8:
   resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.13.tgz#92430b0139055c3ebb60150aa13e860a4b5a366c"
   integrity sha512-oaMBel6gjolK862uaPQOVTA7q3TZhuSvuMQAAglQDOWYO9A91IrAOUJEyKVlqJlHE0vq5p5UXxzdPfMH/x6xNg==
 
-dc-polyfill@^0.1.2, dc-polyfill@^0.1.4:
+dc-polyfill@^0.1.4:
   version "0.1.6"
   resolved "https://registry.yarnpkg.com/dc-polyfill/-/dc-polyfill-0.1.6.tgz#c2940fa68ffb24a7bf127cc6cfdd15b39f0e7f02"
   integrity sha512-UV33cugmCC49a5uWAApM+6Ev9ZdvIUMTrtCO9fj96TPGOQiea54oeO3tiEVdVeo3J9N2UdJEmbS4zOkkEA35uQ==
 
-dd-trace@5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/dd-trace/-/dd-trace-5.2.0.tgz#6ca2d76ece95f08d98468d7782c22f24192afa53"
-  integrity sha512-Z5ql3ZKzVW3DPstHPkTPcIPvKljHNtzTYY/WuZRlgT4XK7rMaN0j5nA8LlUh7m+tOPWs05IiKngbYVZjsqhRgA==
-  dependencies:
-    "@datadog/native-appsec" "7.0.0"
-    "@datadog/native-iast-rewriter" "2.2.2"
-    "@datadog/native-iast-taint-tracking" "1.6.4"
-    "@datadog/native-metrics" "^2.0.0"
-    "@datadog/pprof" "5.0.0"
-    "@datadog/sketches-js" "^2.1.0"
-    "@opentelemetry/api" "^1.0.0"
-    "@opentelemetry/core" "^1.14.0"
-    crypto-randomuuid "^1.0.0"
-    dc-polyfill "^0.1.2"
-    ignore "^5.2.4"
-    import-in-the-middle "^1.7.3"
-    int64-buffer "^0.1.9"
-    ipaddr.js "^2.1.0"
-    istanbul-lib-coverage "3.2.0"
-    jest-docblock "^29.7.0"
-    koalas "^1.0.2"
-    limiter "1.1.5"
-    lodash.sortby "^4.7.0"
-    lru-cache "^7.14.0"
-    methods "^1.1.2"
-    module-details-from-path "^1.0.3"
-    msgpack-lite "^0.1.26"
-    node-abort-controller "^3.1.1"
-    opentracing ">=0.12.1"
-    path-to-regexp "^0.1.2"
-    pprof-format "^2.0.7"
-    protobufjs "^7.2.5"
-    retry "^0.13.1"
-    semver "^7.5.4"
-    tlhunter-sorted-set "^0.1.0"
-
 dd-trace@5.23.0:
   version "5.23.0"
   resolved "https://registry.yarnpkg.com/dd-trace/-/dd-trace-5.23.0.tgz#a0c11863406de440a6675648caf06e1d07d67ba8"
@@ -9375,6 +9348,44 @@ dd-trace@5.23.0:
     shell-quote "^1.8.1"
     tlhunter-sorted-set "^0.1.0"
 
+dd-trace@5.26.0:
+  version "5.26.0"
+  resolved "https://registry.yarnpkg.com/dd-trace/-/dd-trace-5.26.0.tgz#cc55061f66742bf01d0d7dc9f75c0e4937c82f40"
+  integrity sha512-AQ4usxrbAG41f7CKUUe7fayZgfrh24D0L0vNzcU2mMJOmqQ3bXeDz9uSHkF3aFY8Epcsegrep3ifjRC0/zOxTw==
+  dependencies:
+    "@datadog/libdatadog" "^0.2.2"
+    "@datadog/native-appsec" "8.3.0"
+    "@datadog/native-iast-rewriter" "2.5.0"
+    "@datadog/native-iast-taint-tracking" "3.2.0"
+    "@datadog/native-metrics" "^3.0.1"
+    "@datadog/pprof" "5.4.1"
+    "@datadog/sketches-js" "^2.1.0"
+    "@isaacs/ttlcache" "^1.4.1"
+    "@opentelemetry/api" ">=1.0.0 <1.9.0"
+    "@opentelemetry/core" "^1.14.0"
+    crypto-randomuuid "^1.0.0"
+    dc-polyfill "^0.1.4"
+    ignore "^5.2.4"
+    import-in-the-middle "1.11.2"
+    int64-buffer "^0.1.9"
+    istanbul-lib-coverage "3.2.0"
+    jest-docblock "^29.7.0"
+    koalas "^1.0.2"
+    limiter "1.1.5"
+    lodash.sortby "^4.7.0"
+    lru-cache "^7.14.0"
+    module-details-from-path "^1.0.3"
+    msgpack-lite "^0.1.26"
+    opentracing ">=0.12.1"
+    path-to-regexp "^0.1.10"
+    pprof-format "^2.1.0"
+    protobufjs "^7.2.5"
+    retry "^0.13.1"
+    rfdc "^1.3.1"
+    semver "^7.5.4"
+    shell-quote "^1.8.1"
+    tlhunter-sorted-set "^0.1.0"
+
 debug@4, debug@^4.0.0, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.3, debug@^4.3.4, debug@~4.3.1, debug@~4.3.2, debug@~4.3.4:
   version "4.3.6"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.6.tgz#2ab2c38fbaffebf8aa95fdfe6d88438c7a13c52b"
@@ -10230,6 +10241,11 @@ elliptic@^6.5.3, elliptic@^6.5.5:
     minimalistic-assert "^1.0.1"
     minimalistic-crypto-utils "^1.0.1"
 
+email-validator@^2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/email-validator/-/email-validator-2.0.4.tgz#b8dfaa5d0dae28f1b03c95881d904d4e40bfe7ed"
+  integrity sha512-gYCwo7kh5S3IDyZPLZf6hSS0MnZT8QmJFqYvbqlDZSbwdZlY6QZWxJ4i/6UhITOJ4XzyI647Bm2MXKCLqnJ4nQ==
+
 emittery@^0.13.1:
   version "0.13.1"
   resolved "https://registry.yarnpkg.com/emittery/-/emittery-0.13.1.tgz#c04b8c3457490e0847ae51fced3af52d338e3dad"
@@ -10844,11 +10860,6 @@ estraverse@^5.1.0, estraverse@^5.2.0:
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123"
   integrity sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==
 
-estree-walker@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-0.2.1.tgz#bdafe8095383d8414d5dc2ecf4c9173b6db9412e"
-  integrity sha512-6/I1dwNKk0N9iGOU3ydzAAurz4NPo/ttxZNCqgIVbWFvWyzWBSNonRrJ5CpjDuyBfmM7ENN7WCzUi9aT/UPXXQ==
-
 estree-walker@^0.5.2:
   version "0.5.2"
   resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-0.5.2.tgz#d3850be7529c9580d815600b53126515e146dd39"
@@ -10929,19 +10940,6 @@ execa@5.0.0:
     signal-exit "^3.0.3"
     strip-final-newline "^2.0.0"
 
-execa@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/execa/-/execa-1.0.0.tgz#c6236a5bb4df6d6f15e88e7f017798216749ddd8"
-  integrity sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==
-  dependencies:
-    cross-spawn "^6.0.0"
-    get-stream "^4.0.0"
-    is-stream "^1.1.0"
-    npm-run-path "^2.0.0"
-    p-finally "^1.0.0"
-    signal-exit "^3.0.0"
-    strip-eof "^1.0.0"
-
 execa@^5.0.0:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/execa/-/execa-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd"
@@ -11142,6 +11140,11 @@ fd-slicer@~1.1.0:
   dependencies:
     pend "~1.2.0"
 
+fdir@^6.2.0:
+  version "6.4.2"
+  resolved "https://registry.yarnpkg.com/fdir/-/fdir-6.4.2.tgz#ddaa7ce1831b161bc3657bb99cb36e1622702689"
+  integrity sha512-KnhMXsKSPZlAhp7+IjUkRZKPb4fUyccpDrdFXbi4QL1qkmFh9kVY09Yox+n4MaOb3lHZ1Tv829C3oaaXoMYPDQ==
+
 fecha@^4.2.0:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/fecha/-/fecha-4.2.3.tgz#4d9ccdbc61e8629b259fdca67e65891448d569fd"
@@ -11751,7 +11754,7 @@ get-stream@^2.2.0:
     object-assign "^4.0.1"
     pinkie-promise "^2.0.0"
 
-get-stream@^4.0.0, get-stream@^4.1.0:
+get-stream@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5"
   integrity sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==
@@ -12589,11 +12592,6 @@ husky@^8.0.3:
   resolved "https://registry.yarnpkg.com/husky/-/husky-8.0.3.tgz#4936d7212e46d1dea28fef29bb3a108872cd9184"
   integrity sha512-+dQSyqPh4x1hlO1swXBiNb2HzTDN1I2IGLQx1GrBuiqFJfoMrnZWwVmatvSiO+Iz8fBUnf+lekwNo4c2LlXItg==
 
-husky@^9.1.4:
-  version "9.1.7"
-  resolved "https://registry.yarnpkg.com/husky/-/husky-9.1.7.tgz#d46a38035d101b46a70456a850ff4201344c0b2d"
-  integrity sha512-5gs5ytaNjBrh5Ow3zrvdUUY+0VxIuWVL4i9irt6friV+BqdCfmV11CQTWMiBYWHbXhco+J1kHfTOUkePhCDvMA==
-
 ical-generator@4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/ical-generator/-/ical-generator-4.1.0.tgz#2a336c951864c5583a2aa715d16f2edcdfd2d90b"
@@ -12710,7 +12708,7 @@ import-from@^3.0.0:
   dependencies:
     resolve-from "^5.0.0"
 
-import-in-the-middle@1.11.2, import-in-the-middle@^1.7.3:
+import-in-the-middle@1.11.2:
   version "1.11.2"
   resolved "https://registry.yarnpkg.com/import-in-the-middle/-/import-in-the-middle-1.11.2.tgz#dd848e72b63ca6cd7c34df8b8d97fc9baee6174f"
   integrity sha512-gK6Rr6EykBcc6cVWRSBR5TWf8nn6hZMYSRYqCcHa0l0d1fPK7JSYo6+Mlmck76jIX9aL/IZ71c06U2VpFwl1zA==
@@ -12871,11 +12869,6 @@ into-stream@^3.1.0:
     from2 "^2.1.1"
     p-is-promise "^1.1.0"
 
-invert-kv@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-2.0.0.tgz#7393f5afa59ec9ff5f67a27620d11c226e3eec02"
-  integrity sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==
-
 ioredis-mock@8.9.0:
   version "8.9.0"
   resolved "https://registry.yarnpkg.com/ioredis-mock/-/ioredis-mock-8.9.0.tgz#5d694c4b81d3835e4291e0b527f947e260981779"
@@ -12924,11 +12917,6 @@ ip@^2.0.0:
   resolved "https://registry.yarnpkg.com/ip/-/ip-2.0.0.tgz#4cf4ab182fee2314c75ede1276f8c80b479936da"
   integrity sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ==
 
-ipaddr.js@^2.1.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-2.2.0.tgz#d33fa7bac284f4de7af949638c9d68157c6b92e8"
-  integrity sha512-Ag3wB2o37wslZS19hZqorUnrnzSkpOVy+IiiDEiTqNubEYpYuHWIf6K4psgN2ZWKExS4xhVCrRVfb/wfW8fWJA==
-
 is-arguments@^1.0.4, is-arguments@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.1.1.tgz#15b3f88fda01f2a97fec84ca761a560f123efa9b"
@@ -14586,13 +14574,6 @@ lazystream@^1.0.0:
   dependencies:
     readable-stream "^2.0.5"
 
-lcid@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/lcid/-/lcid-2.0.0.tgz#6ef5d2df60e52f82eb228a4c373e8d1f397253cf"
-  integrity sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==
-  dependencies:
-    invert-kv "^2.0.0"
-
 leaflet@^1.7.1:
   version "1.9.3"
   resolved "https://registry.yarnpkg.com/leaflet/-/leaflet-1.9.3.tgz#52ec436954964e2d3d39e0d433da4b2500d74414"
@@ -15418,13 +15399,6 @@ makeerror@1.0.12:
   dependencies:
     tmpl "1.0.5"
 
-map-age-cleaner@^0.1.1:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz#7d583a7306434c055fe474b0f45078e6e1b4b92a"
-  integrity sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==
-  dependencies:
-    p-defer "^1.0.0"
-
 map-obj@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d"
@@ -15471,15 +15445,6 @@ media-typer@0.3.0:
   resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
   integrity sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==
 
-mem@^4.0.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/mem/-/mem-4.3.0.tgz#461af497bc4ae09608cdb2e60eefb69bff744178"
-  integrity sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==
-  dependencies:
-    map-age-cleaner "^0.1.1"
-    mimic-fn "^2.0.0"
-    p-is-promise "^2.0.0"
-
 memdown@1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/memdown/-/memdown-1.4.1.tgz#b4e4e192174664ffbae41361aa500f3119efe215"
@@ -15590,7 +15555,7 @@ mime@^1.3.4:
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
   integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==
 
-mimic-fn@^2.0.0, mimic-fn@^2.1.0:
+mimic-fn@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
   integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
@@ -15617,11 +15582,6 @@ min-indent@^1.0.0:
   resolved "https://registry.yarnpkg.com/min-indent/-/min-indent-1.0.1.tgz#a63f681673b30571fbe8bc25686ae746eefa9869"
   integrity sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==
 
-mini-svg-data-uri@^1.4.4:
-  version "1.4.4"
-  resolved "https://registry.yarnpkg.com/mini-svg-data-uri/-/mini-svg-data-uri-1.4.4.tgz#8ab0aabcdf8c29ad5693ca595af19dd2ead09939"
-  integrity sha512-r9deDe9p5FJUPZAk3A59wGH7Ii9YrjjWw0jmw/liSbHl2CHiyXj6FcDXDu2K3TjVAXqiJdaw3xxwlZZr9E6nHg==
-
 minimalistic-assert@^1.0.0, minimalistic-assert@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7"
@@ -15632,7 +15592,7 @@ minimalistic-crypto-utils@^1.0.1:
   resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
   integrity sha512-JIYlbt6g8i5jKfJ3xz7rF0LXmv2TkDxBLUkiBeZ7bAx4GnnNMr8xFpGnOxn6GhTEHx3SjRrZEoU+j04prX1ktg==
 
-"minimatch@2 || 3", minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2:
+"minimatch@2 || 3", minimatch@^3.0.3, minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
   integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
@@ -15869,6 +15829,11 @@ mongodb@6.7.0:
     bson "^6.7.0"
     mongodb-connection-string-url "^3.0.0"
 
+mri@^1.1.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/mri/-/mri-1.2.0.tgz#6721480fec2a11a4889861115a48b6cbe7cc8f0b"
+  integrity sha512-tzzskb3bG8LvYGFF/mDTpq3jpI6Q9wc3LEmBaghu+DdCssd1FakN7Bc0hVNmEyGq1bq3RgfkCb3cmQLpNPOroA==
+
 ms@2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
@@ -16046,11 +16011,6 @@ neo-async@^2.6.2:
   resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f"
   integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==
 
-nice-try@^1.0.4:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
-  integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==
-
 nock@13.5.4, nock@^13.5.4:
   version "13.5.4"
   resolved "https://registry.yarnpkg.com/nock/-/nock-13.5.4.tgz#8918f0addc70a63736170fef7106a9721e0dc479"
@@ -16076,7 +16036,7 @@ node-abi@^3.3.0:
   dependencies:
     semver "^7.3.5"
 
-node-abort-controller@^3.0.1, node-abort-controller@^3.1.1:
+node-abort-controller@^3.0.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/node-abort-controller/-/node-abort-controller-3.1.1.tgz#a94377e964a9a37ac3976d848cb5c765833b8548"
   integrity sha512-AGK2yQKIjRuqnc6VkX2Xj5d+QW8xZ87pa1UK6yA6ouUyuxfHuMP6umE5QK7UmTeOAymo+Zx1Fxiuw9rVx8taHQ==
@@ -16393,13 +16353,6 @@ npm-registry-fetch@^14.0.0, npm-registry-fetch@^14.0.3, npm-registry-fetch@^14.0
     npm-package-arg "^10.0.0"
     proc-log "^3.0.0"
 
-npm-run-path@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
-  integrity sha512-lJxZYlT4DW/bRUtFh1MQIWqmLwQfAxnqWG4HhEdjMlkrJYnJn0Jrr2u3mgxqaWsdiBc76TYkTG/mhrnYTuzfHw==
-  dependencies:
-    path-key "^2.0.0"
-
 npm-run-path@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea"
@@ -16818,15 +16771,6 @@ oracledb@6.5.1:
   resolved "https://registry.yarnpkg.com/oracledb/-/oracledb-6.5.1.tgz#814d985035acdb1a6470b1152af0ca3767569ede"
   integrity sha512-JzoSGei1wnvmqgKnAZK1W650mzHTZXx+7hClV4mwsbY/ZjUtrpnojNJMYJ2jkOhj7XG5oJPfXc4GqDKaNzkxqg==
 
-os-locale@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-3.1.0.tgz#a802a6ee17f24c10483ab9935719cef4ed16bf1a"
-  integrity sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==
-  dependencies:
-    execa "^1.0.0"
-    lcid "^2.0.0"
-    mem "^4.0.0"
-
 os-tmpdir@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
@@ -16842,11 +16786,6 @@ p-cancelable@^1.0.0:
   resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-1.1.0.tgz#d078d15a3af409220c886f1d9a0ca2e441ab26cc"
   integrity sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw==
 
-p-defer@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/p-defer/-/p-defer-1.0.0.tgz#9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c"
-  integrity sha512-wB3wfAxZpk2AzOfUMJNL+d36xothRSyj8EXOa4f6GMqYDN9BJaaSISbsk+wS9abmnebVw95C2Kb5t85UmpCxuw==
-
 p-event@^2.1.0:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/p-event/-/p-event-2.3.1.tgz#596279ef169ab2c3e0cae88c1cfbb08079993ef6"
@@ -16864,11 +16803,6 @@ p-is-promise@^1.1.0:
   resolved "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-1.1.0.tgz#9c9456989e9f6588017b0434d56097675c3da05e"
   integrity sha512-zL7VE4JVS2IFSkR2GQKDSPEVxkoH43/p7oEnwpdCndKYJO0HVeRB7fA8TJwuLOTBREtK0ea8eHaxdwcpob5dmg==
 
-p-is-promise@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-2.1.0.tgz#918cebaea248a62cf7ffab8e3bca8c5f882fc42e"
-  integrity sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg==
-
 p-limit@^1.1.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.3.0.tgz#b86bd5f0c25690911c7590fcbfc2010d54b3ccb8"
@@ -17229,11 +17163,6 @@ path-is-absolute@1.0.1, path-is-absolute@^1.0.0:
   resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
   integrity sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==
 
-path-key@^2.0.0, path-key@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
-  integrity sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==
-
 path-key@^3.0.0, path-key@^3.1.0:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"
@@ -17260,14 +17189,7 @@ path-scurry@^1.11.1, path-scurry@^1.6.1:
     lru-cache "^10.2.0"
     minipass "^5.0.0 || ^6.0.2 || ^7.0.0"
 
-path-to-regexp@1.x:
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-1.9.0.tgz#5dc0753acbf8521ca2e0f137b4578b917b10cf24"
-  integrity sha512-xIp7/apCFJuUHdDLWe8O1HIkb0kQrOMb/0u6FXQjemHn/ii5LrIzU6bdECnsiTF/GjZkMEKg1xdiZwNqDYlZ6g==
-  dependencies:
-    isarray "0.0.1"
-
-path-to-regexp@^0.1.10, path-to-regexp@^0.1.2:
+path-to-regexp@^0.1.10:
   version "0.1.11"
   resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.11.tgz#a527e662c89efc4646dbfa8100bf3e847e495761"
   integrity sha512-c0t+KCuUkO/YDLPG4WWzEwx3J5F/GHXsD1h/SNZfySqAIKe/BaP95x8fWtOfRJokpS5yYHRJjMtYlXD8jxnpbw==
@@ -17890,7 +17812,7 @@ postcss-values-parser@^6.0.2:
     is-url-superb "^4.0.0"
     quote-unquote "^1.0.0"
 
-postcss@^8.1.7, postcss@^8.2.9, postcss@^8.3.11, postcss@^8.4.12, postcss@^8.4.27, postcss@^8.4.29, postcss@^8.4.35, postcss@^8.4.5:
+postcss@^8.1.7, postcss@^8.2.9, postcss@^8.3.11, postcss@^8.4.12, postcss@^8.4.27, postcss@^8.4.29, postcss@^8.4.5:
   version "8.4.41"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.41.tgz#d6104d3ba272d882fe18fc07d15dc2da62fa2681"
   integrity sha512-TesUflQ0WKZqAvg52PWL6kHgLKP6xB6heTOdoYM0Wt2UHyxNa4K25EZZMgKns3BH1RLVbZCREPpLY0rhnNoHVQ==
@@ -18194,7 +18116,7 @@ pouchdb@9.0.0:
     uuid "8.3.2"
     vuvuzela "1.0.3"
 
-pprof-format@^2.0.7, pprof-format@^2.1.0:
+pprof-format@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/pprof-format/-/pprof-format-2.1.0.tgz#acc8d7773bcf4faf0a3d3df11bceefba7ac06664"
   integrity sha512-0+G5bHH0RNr8E5hoZo/zJYsL92MhkZjwrHp3O2IxmY8RJL9ooKeuZ8Tm0ZNBw5sGZ9TiM71sthTjWoR2Vf5/xw==
@@ -18823,6 +18745,11 @@ readdirp@^3.6.0, readdirp@~3.6.0:
   dependencies:
     picomatch "^2.2.1"
 
+readdirp@^4.0.1:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-4.0.2.tgz#388fccb8b75665da3abffe2d8f8ed59fe74c230a"
+  integrity sha512-yDMz9g+VaZkqBYS/ozoBJwaBhTbZo3UNYQHNRw1D3UFQB8oHB4uS/tAODO+ZLjGWmUbKnIlOWO+aaIiAxrUWHA==
+
 readline-sync@^1.4.9:
   version "1.4.10"
   resolved "https://registry.yarnpkg.com/readline-sync/-/readline-sync-1.4.10.tgz#41df7fbb4b6312d673011594145705bf56d8873b"
@@ -19206,13 +19133,6 @@ rollup-plugin-inject-process-env@^1.3.1:
   dependencies:
     magic-string "^0.25.7"
 
-rollup-plugin-json@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/rollup-plugin-json/-/rollup-plugin-json-4.0.0.tgz#a18da0a4b30bf5ca1ee76ddb1422afbb84ae2b9e"
-  integrity sha512-hgb8N7Cgfw5SZAkb3jf0QXii6QX/FOkiIq2M7BAQIEydjHvTyxXHQiIzZaTFgx1GK0cRCHOCBHIyEkkLdWKxow==
-  dependencies:
-    rollup-pluginutils "^2.5.0"
-
 rollup-plugin-node-builtins@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/rollup-plugin-node-builtins/-/rollup-plugin-node-builtins-2.1.2.tgz#24a1fed4a43257b6b64371d8abc6ce1ab14597e9"
@@ -19253,7 +19173,7 @@ rollup-plugin-polyfill-node@^0.13.0:
   dependencies:
     "@rollup/plugin-inject" "^5.0.4"
 
-rollup-plugin-postcss@^4.0.0, rollup-plugin-postcss@^4.0.2:
+rollup-plugin-postcss@^4.0.0:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/rollup-plugin-postcss/-/rollup-plugin-postcss-4.0.2.tgz#15e9462f39475059b368ce0e49c800fa4b1f7050"
   integrity sha512-05EaY6zvZdmvPUDi3uCcAQoESDcYnv8ogJJQRp6V5kZ6J6P7uAVJlrTZcaaA20wTH527YTnKfkAoPxWI/jPp4w==
@@ -19272,7 +19192,7 @@ rollup-plugin-postcss@^4.0.0, rollup-plugin-postcss@^4.0.2:
     safe-identifier "^0.4.2"
     style-inject "^0.3.0"
 
-rollup-plugin-svelte@^7.1.0, rollup-plugin-svelte@^7.1.6:
+rollup-plugin-svelte@^7.1.0:
   version "7.1.6"
   resolved "https://registry.yarnpkg.com/rollup-plugin-svelte/-/rollup-plugin-svelte-7.1.6.tgz#44a4ea6c6e8ed976824d9fd40c78d048515e5838"
   integrity sha512-nVFRBpGWI2qUY1OcSiEEA/kjCY2+vAjO9BI8SzA7NRrh2GTunLd6w2EYmnMt/atgdg8GvcNjLsmZmbQs/u4SQA==
@@ -19280,13 +19200,6 @@ rollup-plugin-svelte@^7.1.0, rollup-plugin-svelte@^7.1.6:
     "@rollup/pluginutils" "^4.1.0"
     resolve.exports "^2.0.0"
 
-rollup-plugin-svg@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/rollup-plugin-svg/-/rollup-plugin-svg-2.0.0.tgz#ce11b55e915d5b2190328c4e6632bd6b4fe12ee9"
-  integrity sha512-DmE7dSQHo1SC5L2uH2qul3Mjyd5oV6U1aVVkyvTLX/mUsRink7f1b1zaIm+32GEBA6EHu8H/JJi3DdWqM53ySQ==
-  dependencies:
-    rollup-pluginutils "^1.3.1"
-
 rollup-plugin-terser@^7.0.2:
   version "7.0.2"
   resolved "https://registry.yarnpkg.com/rollup-plugin-terser/-/rollup-plugin-terser-7.0.2.tgz#e8fbba4869981b2dc35ae7e8a502d5c6c04d324d"
@@ -19297,30 +19210,12 @@ rollup-plugin-terser@^7.0.2:
     serialize-javascript "^4.0.0"
     terser "^5.0.0"
 
-rollup-plugin-visualizer@^5.12.0:
-  version "5.12.0"
-  resolved "https://registry.yarnpkg.com/rollup-plugin-visualizer/-/rollup-plugin-visualizer-5.12.0.tgz#661542191ce78ee4f378995297260d0c1efb1302"
-  integrity sha512-8/NU9jXcHRs7Nnj07PF2o4gjxmm9lXIrZ8r175bT9dK8qoLlvKTwRMArRCMgpMGlq8CTLugRvEmyMeMXIU2pNQ==
-  dependencies:
-    open "^8.4.0"
-    picomatch "^2.3.1"
-    source-map "^0.7.4"
-    yargs "^17.5.1"
-
 rollup-plugin-web-worker-loader@^1.6.1:
   version "1.6.1"
   resolved "https://registry.yarnpkg.com/rollup-plugin-web-worker-loader/-/rollup-plugin-web-worker-loader-1.6.1.tgz#9d7a27575b64b0780fe4e8b3bc87470d217e485f"
   integrity sha512-4QywQSz1NXFHKdyiou16mH3ijpcfLtLGOrAqvAqu1Gx+P8+zj+3gwC2BSL/VW1d+LW4nIHC8F7d7OXhs9UdR2A==
 
-rollup-pluginutils@^1.3.1:
-  version "1.5.2"
-  resolved "https://registry.yarnpkg.com/rollup-pluginutils/-/rollup-pluginutils-1.5.2.tgz#1e156e778f94b7255bfa1b3d0178be8f5c552408"
-  integrity sha512-SjdWWWO/CUoMpDy8RUbZ/pSpG68YHmhk5ROKNIoi2En9bJ8bTt3IhYi254RWiTclQmL7Awmrq+rZFOhZkJAHmQ==
-  dependencies:
-    estree-walker "^0.2.1"
-    minimatch "^3.0.2"
-
-rollup-pluginutils@^2.3.1, rollup-pluginutils@^2.5.0, rollup-pluginutils@^2.8.1, rollup-pluginutils@^2.8.2:
+rollup-pluginutils@^2.3.1, rollup-pluginutils@^2.8.1, rollup-pluginutils@^2.8.2:
   version "2.8.2"
   resolved "https://registry.yarnpkg.com/rollup-pluginutils/-/rollup-pluginutils-2.8.2.tgz#72f2af0748b592364dbd3389e600e5a9444a351e"
   integrity sha512-EEp9NhnUkwY8aif6bxgovPHMoMoNr2FulJziTndpt5H9RdwC47GSGuII9XxpSdzVGM0GWrNPHV6ie1LTNJPaLQ==
@@ -19407,6 +19302,13 @@ rxjs@^7.5.5:
   dependencies:
     tslib "^2.1.0"
 
+sade@^1.7.4:
+  version "1.8.1"
+  resolved "https://registry.yarnpkg.com/sade/-/sade-1.8.1.tgz#0a78e81d658d394887be57d2a409bf703a3b2701"
+  integrity sha512-xal3CZX1Xlo/k4ApwCFrHVACi9fBqJ7V+mwhBsuf/1IOKbBy098Fex+Wa/5QMubw09pSZ/u8EY8PWgevJsXp1A==
+  dependencies:
+    mri "^1.1.0"
+
 safe-array-concat@^1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/safe-array-concat/-/safe-array-concat-1.1.2.tgz#81d77ee0c4e8b863635227c721278dd524c20edb"
@@ -19552,7 +19454,7 @@ semver-diff@^3.1.1:
   dependencies:
     semver "^6.3.0"
 
-"semver@2 || 3 || 4 || 5", semver@7.5.3, semver@^5.5.0, semver@^5.6.0, semver@^5.7.1, semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.2.0, semver@^6.3.0, semver@^6.3.1, semver@^7.0.0, semver@^7.1.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8, semver@^7.5.3, semver@^7.5.4, semver@^7.6.0, semver@~2.3.1:
+"semver@2 || 3 || 4 || 5", semver@7.5.3, semver@^5.6.0, semver@^5.7.1, semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.2.0, semver@^6.3.0, semver@^6.3.1, semver@^7.0.0, semver@^7.1.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8, semver@^7.5.3, semver@^7.5.4, semver@^7.6.0, semver@~2.3.1:
   version "7.5.3"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.3.tgz#161ce8c2c6b4b3bdca6caadc9fa3317a4c4fe88e"
   integrity sha512-QBlUtyVk/5EeHbi7X0fw6liDZc7BBmEaSYn01fMU1OUYbf6GPsbTtd8WmnqbI20SeycoHSeiybkE/q1Q+qlThQ==
@@ -19647,13 +19549,6 @@ shallow-clone@^3.0.0:
   dependencies:
     kind-of "^6.0.2"
 
-shebang-command@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
-  integrity sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==
-  dependencies:
-    shebang-regex "^1.0.0"
-
 shebang-command@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea"
@@ -19661,11 +19556,6 @@ shebang-command@^2.0.0:
   dependencies:
     shebang-regex "^3.0.0"
 
-shebang-regex@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
-  integrity sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ==
-
 shebang-regex@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"
@@ -19771,11 +19661,6 @@ slash@3.0.0, slash@^3.0.0:
   resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
   integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==
 
-slash@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/slash/-/slash-4.0.0.tgz#2422372176c4c6c5addb5e2ada885af984b396a7"
-  integrity sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==
-
 slice-ansi@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-5.0.0.tgz#b73063c57aa96f9cd881654b15294d95d285c42a"
@@ -20395,11 +20280,6 @@ strip-dirs@^2.0.0:
   dependencies:
     is-natural-number "^4.0.1"
 
-strip-eof@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
-  integrity sha512-7FCwGGmx8mD5xQd3RPUvnSpUXHM3BWuzjtpD4TXsfcZ9EL4azvVVUscFYwD9nx8Kh+uCBC00XBtAykoMHwTh8Q==
-
 strip-final-newline@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad"
@@ -20569,6 +20449,17 @@ supports-preserve-symlinks-flag@^1.0.0:
   resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09"
   integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==
 
+svelte-check@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/svelte-check/-/svelte-check-4.1.0.tgz#4389c1c88aa24f3d06fe0df94f9075a55017256d"
+  integrity sha512-AflEZYqI578KuDZcpcorPSf597LStxlkN7XqXi38u09zlHODVKd7c+7OuubGzbhgGRUqNTdQCZ+Ga96iRXEf2g==
+  dependencies:
+    "@jridgewell/trace-mapping" "^0.3.25"
+    chokidar "^4.0.1"
+    fdir "^6.2.0"
+    picocolors "^1.0.0"
+    sade "^1.7.4"
+
 svelte-dnd-action@^0.9.8:
   version "0.9.22"
   resolved "https://registry.yarnpkg.com/svelte-dnd-action/-/svelte-dnd-action-0.9.22.tgz#003eee9dddb31d8c782f6832aec8b1507fff194d"
@@ -20612,6 +20503,26 @@ svelte-spa-router@^4.0.1:
   dependencies:
     regexparam "2.0.2"
 
+svelte@4.2.19:
+  version "4.2.19"
+  resolved "https://registry.yarnpkg.com/svelte/-/svelte-4.2.19.tgz#4e6e84a8818e2cd04ae0255fcf395bc211e61d4c"
+  integrity sha512-IY1rnGr6izd10B0A8LqsBfmlT5OILVuZ7XsI0vdGPEvuonFV7NYEUK4dAkm9Zg2q0Um92kYjTpS1CAP3Nh/KWw==
+  dependencies:
+    "@ampproject/remapping" "^2.2.1"
+    "@jridgewell/sourcemap-codec" "^1.4.15"
+    "@jridgewell/trace-mapping" "^0.3.18"
+    "@types/estree" "^1.0.1"
+    acorn "^8.9.0"
+    aria-query "^5.3.0"
+    axobject-query "^4.0.0"
+    code-red "^1.0.3"
+    css-tree "^2.3.1"
+    estree-walker "^3.0.3"
+    is-reference "^3.0.1"
+    locate-character "^3.0.0"
+    magic-string "^0.30.4"
+    periscopic "^3.1.0"
+
 svelte@^4.2.10:
   version "4.2.12"
   resolved "https://registry.yarnpkg.com/svelte/-/svelte-4.2.12.tgz#13d98d2274d24d3ad216c8fdc801511171c70bb1"
@@ -21645,11 +21556,6 @@ uri-js@^4.2.2:
   dependencies:
     punycode "^2.1.0"
 
-urijs@^1.19.2:
-  version "1.19.11"
-  resolved "https://registry.yarnpkg.com/urijs/-/urijs-1.19.11.tgz#204b0d6b605ae80bea54bea39280cdb7c9f923cc"
-  integrity sha512-HXgFDgDommxn5/bIv0cnQZsPhHDA90NPHD6+c/v21U5+Sx5hoP8+dP9IZXBU1gIfvdRfhG8cel9QNPeionfcCQ==
-
 url-parse-lax@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-3.0.0.tgz#16b5cafc07dbe3676c1b1999177823d6503acb0c"
@@ -21825,6 +21731,11 @@ vite-node@0.29.8:
     picocolors "^1.0.0"
     vite "^3.0.0 || ^4.0.0"
 
+vite-plugin-css-injected-by-js@3.5.2:
+  version "3.5.2"
+  resolved "https://registry.yarnpkg.com/vite-plugin-css-injected-by-js/-/vite-plugin-css-injected-by-js-3.5.2.tgz#1f75d16ad5c05b6b49bf18018099a189ec2e46ad"
+  integrity sha512-2MpU/Y+SCZyWUB6ua3HbJCrgnF0KACAsmzOQt1UvRVJCGF6S8xdA3ZUhWcWdM9ivG4I5az8PnQmwwrkC2CAQrQ==
+
 vite-plugin-static-copy@^0.17.0:
   version "0.17.0"
   resolved "https://registry.yarnpkg.com/vite-plugin-static-copy/-/vite-plugin-static-copy-0.17.0.tgz#e45527da186c4a3818d09635797b6fc7cc9e035f"
@@ -22068,7 +21979,7 @@ which-typed-array@^1.1.13, which-typed-array@^1.1.14, which-typed-array@^1.1.15,
     gopd "^1.0.1"
     has-tostringtag "^1.0.2"
 
-which@^1.2.14, which@^1.2.9:
+which@^1.2.14:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
   integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
@@ -22419,7 +22330,7 @@ yargs-parser@21.1.1, yargs-parser@>=21.1.1, yargs-parser@^21.0.0, yargs-parser@^
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35"
   integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==
 
-yargs-parser@^13.1.0:
+yargs-parser@^13.1.2:
   version "13.1.2"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.2.tgz#130f09702ebaeef2650d54ce6e3e5706f7a4fb38"
   integrity sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==
@@ -22432,23 +22343,6 @@ yargs-parser@^20.2.2, yargs-parser@^20.2.3:
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee"
   integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==
 
-yargs@13.2.4:
-  version "13.2.4"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.2.4.tgz#0b562b794016eb9651b98bd37acf364aa5d6dc83"
-  integrity sha512-HG/DWAJa1PAnHT9JAhNa8AbAv3FPaiLzioSjCcmuXXhP8MlpHO5vwls4g4j6n30Z74GVQj8Xa62dWVx1QCGklg==
-  dependencies:
-    cliui "^5.0.0"
-    find-up "^3.0.0"
-    get-caller-file "^2.0.1"
-    os-locale "^3.1.0"
-    require-directory "^2.1.1"
-    require-main-filename "^2.0.0"
-    set-blocking "^2.0.0"
-    string-width "^3.0.0"
-    which-module "^2.0.0"
-    y18n "^4.0.0"
-    yargs-parser "^13.1.0"
-
 yargs@16.2.0, yargs@^16.1.0, yargs@^16.2.0:
   version "16.2.0"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66"
@@ -22462,7 +22356,23 @@ yargs@16.2.0, yargs@^16.1.0, yargs@^16.2.0:
     y18n "^5.0.5"
     yargs-parser "^20.2.2"
 
-yargs@^17.3.1, yargs@^17.5.1, yargs@^17.6.2, yargs@^17.7.2:
+yargs@^13.2.4:
+  version "13.3.2"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.3.2.tgz#ad7ffefec1aa59565ac915f82dccb38a9c31a2dd"
+  integrity sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==
+  dependencies:
+    cliui "^5.0.0"
+    find-up "^3.0.0"
+    get-caller-file "^2.0.1"
+    require-directory "^2.1.1"
+    require-main-filename "^2.0.0"
+    set-blocking "^2.0.0"
+    string-width "^3.0.0"
+    which-module "^2.0.0"
+    y18n "^4.0.0"
+    yargs-parser "^13.1.2"
+
+yargs@^17.3.1, yargs@^17.6.2, yargs@^17.7.2:
   version "17.7.2"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.7.2.tgz#991df39aca675a192b816e1e0363f9d75d2aa269"
   integrity sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==