From 2498e591566084687357c59eb0a5ab28b06ad4fc Mon Sep 17 00:00:00 2001
From: Carlos Valente <carlosvalente@pm.me>
Date: Fri, 6 Jun 2025 21:08:30 +0200
Subject: [PATCH] refactor: migrate custom fields to transactions

refactor: extract functions to api domain

refactor: strict custom field parsing

refactor: remove rundown cache utilities

refactor: directory restructure
---
 apps/client/src/common/api/customFields.ts    |  10 +-
 .../custom-fields/CustomFieldEntry.tsx        |   6 +-
 .../custom-fields/CustomFields.tsx            |  10 +-
 .../rundown/event-editor/EventEditor.tsx      |   5 +-
 .../__tests__/automation.dao.test.ts          |  39 +-
 .../__tests__/automation.utils.test.ts        |  54 +-
 .../automation/automation.controller.ts       |   7 +-
 .../src/api-data/automation/automation.dao.ts |  17 +-
 .../api-data/automation/automation.parser.ts  |   2 +-
 .../api-data/automation/automation.utils.ts   |  24 +-
 .../__tests__/customFields.parser.test.ts}    |  99 +---
 .../custom-fields/customFields.controller.ts  |  49 --
 .../custom-fields/customFields.parser.ts      |  64 +++
 .../custom-fields/customFields.router.ts      |  47 +-
 .../custom-fields/customFields.validation.ts  |  16 +-
 .../api-data/db/__tests__/db.parser.test.ts   |  56 +++
 apps/server/src/api-data/db/db.middleware.ts  |   3 +-
 apps/server/src/api-data/db/db.parser.ts      |  49 ++
 .../excel/__tests__/excel.parser.test.ts}     | 451 ++++++-----------
 .../excel/__tests__/mockData.ts}              |   0
 .../src/api-data/excel/excel.middleware.ts    |   3 +-
 .../excel/excel.parser.ts}                    | 170 +++----
 .../src/api-data/excel/excel.service.ts       |   7 +-
 apps/server/src/api-data/index.ts             |   2 +-
 .../__tests__/projectData.parser.test.ts      |  10 +
 .../projectData.controller.ts}                |   2 +-
 .../projectData.dao.ts}                       |   1 +
 .../project-data/projectData.parser.ts        |  27 +
 .../projectData.router.ts}                    |   4 +-
 .../projectData.validation.ts}                |   0
 .../rundown/__mocks__/rundown.mocks.ts        |  12 +-
 .../rundown/__tests__/rundown.dao.test.ts     | 171 ++++++-
 .../rundown/__tests__/rundown.parser.test.ts  |  95 +++-
 .../rundown/__tests__/rundown.utils.test.ts   |  86 +++-
 .../src/api-data/rundown/rundown.dao.ts       | 230 +++++++--
 .../src/api-data/rundown/rundown.parser.ts    | 223 ++++++++-
 .../src/api-data/rundown/rundown.service.ts   | 134 ++++-
 .../src/api-data/rundown/rundown.types.ts     |  14 +-
 .../src/api-data/rundown/rundown.utils.ts     |  60 ++-
 .../__tests__/settings.parser.test.ts         |  22 +
 .../src/api-data/settings/settings.parser.ts  |  25 +
 .../src/api-data/sheets/sheets.controller.ts  |  14 +-
 .../src/api-data/sheets/sheets.middleware.ts  |   3 +-
 .../__tests__/urlPresets.parser.test.ts       |  47 ++
 .../api-data/url-presets/urlPresets.parser.ts |  30 ++
 .../__tests__/viewSettings.parser.ts          |  10 +
 .../view-settings/viewSettings.parser.ts      |  25 +
 .../__tests__/DataProvider.utils.test.ts      |  84 ----
 apps/server/src/models/demoProject.ts         |  66 +--
 .../project-service/ProjectService.ts         |  18 +-
 .../rundown-service/RundownService.ts         |  74 ---
 .../__mocks__/rundown.mocks.ts                |  54 --
 .../__tests__/rundownCache.test.ts            | 127 -----
 .../__tests__/rundownCache.utils.test.ts      | 188 -------
 .../__tests__/rundownUtils.test.ts            |  24 -
 .../services/rundown-service/rundownCache.ts  | 462 ------------------
 .../rundown-service/rundownCache.utils.ts     | 251 ----------
 .../services/rundown-service/rundownUtils.ts  | 188 -------
 .../runtime-service/RuntimeService.ts         | 122 +++--
 .../runtime-service/rundownService.utils.ts   |  96 +++-
 .../services/sheet-service/SheetService.ts    |  25 +-
 apps/server/src/stores/runtimeState.ts        |  12 +-
 .../src/utils/__tests__/parserUtils.test.ts   |  38 +-
 .../src/utils/__tests__/varUtils.test.ts      |  11 -
 apps/server/src/utils/fileManagement.ts       |  11 +-
 apps/server/src/utils/generateCrashReport.ts  |   6 +-
 apps/server/src/utils/parserFunctions.ts      | 164 -------
 apps/server/src/utils/parserUtils.ts          |  13 +-
 apps/server/src/utils/varUtils.ts             |   3 -
 .../src/definitions/core/CustomFields.type.ts |   8 +-
 packages/types/src/index.ts                   |   2 +-
 packages/utils/index.ts                       |   3 +-
 .../customFieldLabelToKey.ts                  |  21 -
 .../src/customField-utils/customFieldUtils.ts |  19 +
 packages/utils/src/rundown/rundown.utils.ts   |  15 +
 75 files changed, 2060 insertions(+), 2480 deletions(-)
 rename apps/server/src/{utils/__tests__/parserFunctions.test.ts => api-data/custom-fields/__tests__/customFields.parser.test.ts} (61%)
 delete mode 100644 apps/server/src/api-data/custom-fields/customFields.controller.ts
 create mode 100644 apps/server/src/api-data/custom-fields/customFields.parser.ts
 create mode 100644 apps/server/src/api-data/db/__tests__/db.parser.test.ts
 create mode 100644 apps/server/src/api-data/db/db.parser.ts
 rename apps/server/src/{utils/__tests__/parser.test.ts => api-data/excel/__tests__/excel.parser.test.ts} (74%)
 rename apps/server/src/{utils/__tests__/parser.mock-data.ts => api-data/excel/__tests__/mockData.ts} (100%)
 rename apps/server/src/{utils/parser.ts => api-data/excel/excel.parser.ts} (78%)
 create mode 100644 apps/server/src/api-data/project-data/__tests__/projectData.parser.test.ts
 rename apps/server/src/api-data/{project/project.controller.ts => project-data/projectData.controller.ts} (96%)
 rename apps/server/src/api-data/{project/project.dao.ts => project-data/projectData.dao.ts} (99%)
 create mode 100644 apps/server/src/api-data/project-data/projectData.parser.ts
 rename apps/server/src/api-data/{project/project.router.ts => project-data/projectData.router.ts} (70%)
 rename apps/server/src/api-data/{project/project.validation.ts => project-data/projectData.validation.ts} (100%)
 create mode 100644 apps/server/src/api-data/settings/__tests__/settings.parser.test.ts
 create mode 100644 apps/server/src/api-data/settings/settings.parser.ts
 create mode 100644 apps/server/src/api-data/url-presets/__tests__/urlPresets.parser.test.ts
 create mode 100644 apps/server/src/api-data/url-presets/urlPresets.parser.ts
 create mode 100644 apps/server/src/api-data/view-settings/__tests__/viewSettings.parser.ts
 create mode 100644 apps/server/src/api-data/view-settings/viewSettings.parser.ts
 delete mode 100644 apps/server/src/services/rundown-service/RundownService.ts
 delete mode 100644 apps/server/src/services/rundown-service/__mocks__/rundown.mocks.ts
 delete mode 100644 apps/server/src/services/rundown-service/__tests__/rundownCache.test.ts
 delete mode 100644 apps/server/src/services/rundown-service/__tests__/rundownCache.utils.test.ts
 delete mode 100644 apps/server/src/services/rundown-service/__tests__/rundownUtils.test.ts
 delete mode 100644 apps/server/src/services/rundown-service/rundownCache.ts
 delete mode 100644 apps/server/src/services/rundown-service/rundownCache.utils.ts
 delete mode 100644 apps/server/src/services/rundown-service/rundownUtils.ts
 delete mode 100644 apps/server/src/utils/__tests__/varUtils.test.ts
 delete mode 100644 apps/server/src/utils/parserFunctions.ts
 delete mode 100644 apps/server/src/utils/varUtils.ts
 delete mode 100644 packages/utils/src/customField-utils/customFieldLabelToKey.ts
 create mode 100644 packages/utils/src/customField-utils/customFieldUtils.ts
 create mode 100644 packages/utils/src/rundown/rundown.utils.ts

diff --git a/apps/client/src/common/api/customFields.ts b/apps/client/src/common/api/customFields.ts
index ff60290ed..02ce4d15e 100644
--- a/apps/client/src/common/api/customFields.ts
+++ b/apps/client/src/common/api/customFields.ts
@@ -1,5 +1,5 @@
 import axios from 'axios';
-import { CustomField, CustomFieldLabel, CustomFields } from 'ontime-types';
+import { CustomField, CustomFieldKey, CustomFields } from 'ontime-types';
 
 import { apiEntryUrl } from './constants';
 
@@ -24,15 +24,15 @@ export async function postCustomField(newField: CustomField): Promise<CustomFiel
 /**
  * Edits single custom field
  */
-export async function editCustomField(label: CustomFieldLabel, newField: CustomField): Promise<CustomFields> {
-  const res = await axios.put(`${customFieldsPath}/${label}`, { ...newField });
+export async function editCustomField(key: CustomFieldKey, newField: CustomField): Promise<CustomFields> {
+  const res = await axios.put(`${customFieldsPath}/${key}`, { ...newField });
   return res.data;
 }
 
 /**
  * Deletes single custom field
  */
-export async function deleteCustomField(label: CustomFieldLabel): Promise<CustomFields> {
-  const res = await axios.delete(`${customFieldsPath}/${label}`);
+export async function deleteCustomField(key: CustomFieldKey): Promise<CustomFields> {
+  const res = await axios.delete(`${customFieldsPath}/${key}`);
   return res.data;
 }
diff --git a/apps/client/src/features/app-settings/panel/feature-settings-panel/custom-fields/CustomFieldEntry.tsx b/apps/client/src/features/app-settings/panel/feature-settings-panel/custom-fields/CustomFieldEntry.tsx
index b99435319..351beadec 100644
--- a/apps/client/src/features/app-settings/panel/feature-settings-panel/custom-fields/CustomFieldEntry.tsx
+++ b/apps/client/src/features/app-settings/panel/feature-settings-panel/custom-fields/CustomFieldEntry.tsx
@@ -1,7 +1,7 @@
 import { useState } from 'react';
 import { IoPencil, IoTrash } from 'react-icons/io5';
 import { IconButton } from '@chakra-ui/react';
-import { CustomField, CustomFieldLabel } from 'ontime-types';
+import { CustomField, CustomFieldKey } from 'ontime-types';
 
 import CopyTag from '../../../../../common/components/copy-tag/CopyTag';
 import Swatch from '../../../../../common/components/input/colour-input/Swatch';
@@ -17,8 +17,8 @@ interface CustomFieldEntryProps {
   label: string;
   fieldKey: string;
   type: 'string' | 'image';
-  onEdit: (label: CustomFieldLabel, patch: CustomField) => Promise<void>;
-  onDelete: (label: CustomFieldLabel) => Promise<void>;
+  onEdit: (key: CustomFieldKey, patch: CustomField) => Promise<void>;
+  onDelete: (key: CustomFieldKey) => Promise<void>;
 }
 
 export default function CustomFieldEntry(props: CustomFieldEntryProps) {
diff --git a/apps/client/src/features/app-settings/panel/feature-settings-panel/custom-fields/CustomFields.tsx b/apps/client/src/features/app-settings/panel/feature-settings-panel/custom-fields/CustomFields.tsx
index 151ff95bd..243a2d6f0 100644
--- a/apps/client/src/features/app-settings/panel/feature-settings-panel/custom-fields/CustomFields.tsx
+++ b/apps/client/src/features/app-settings/panel/feature-settings-panel/custom-fields/CustomFields.tsx
@@ -1,7 +1,7 @@
 import { useState } from 'react';
 import { IoAdd } from 'react-icons/io5';
 import { Button } from '@chakra-ui/react';
-import { CustomField, CustomFieldLabel } from 'ontime-types';
+import { CustomField, CustomFieldKey } from 'ontime-types';
 
 import { deleteCustomField, editCustomField, postCustomField } from '../../../../../common/api/customFields';
 import Info from '../../../../../common/components/info/Info';
@@ -31,14 +31,14 @@ export default function CustomFields() {
     setIsAdding(false);
   };
 
-  const handleEditField = async (label: CustomFieldLabel, customField: CustomField) => {
-    await editCustomField(label, customField);
+  const handleEditField = async (key: CustomFieldKey, customField: CustomField) => {
+    await editCustomField(key, customField);
     refetch();
   };
 
-  const handleDelete = async (label: string) => {
+  const handleDelete = async (key: CustomFieldKey) => {
     try {
-      await deleteCustomField(label);
+      await deleteCustomField(key);
       refetch();
     } catch (_error) {
       /** we do not handle errors here */
diff --git a/apps/client/src/features/rundown/event-editor/EventEditor.tsx b/apps/client/src/features/rundown/event-editor/EventEditor.tsx
index a04ab0418..867d4a016 100644
--- a/apps/client/src/features/rundown/event-editor/EventEditor.tsx
+++ b/apps/client/src/features/rundown/event-editor/EventEditor.tsx
@@ -1,5 +1,5 @@
 import { useCallback } from 'react';
-import { CustomFieldLabel, OntimeEvent } from 'ontime-types';
+import { OntimeEvent } from 'ontime-types';
 
 import AppLink from '../../../common/components/link/app-link/AppLink';
 import { useEntryActions } from '../../../common/hooks/useEntryAction';
@@ -14,7 +14,8 @@ import EventEditorEmpty from './EventEditorEmpty';
 
 import style from './EventEditor.module.scss';
 
-export type EditorUpdateFields = 'cue' | 'title' | 'note' | 'colour' | CustomFieldLabel;
+// any of the titles + custom field labels
+export type EditorUpdateFields = 'cue' | 'title' | 'note' | 'colour' | string;
 
 interface EventEditorProps {
   event: OntimeEvent;
diff --git a/apps/server/src/api-data/automation/__tests__/automation.dao.test.ts b/apps/server/src/api-data/automation/__tests__/automation.dao.test.ts
index 20d869444..d5e497be5 100644
--- a/apps/server/src/api-data/automation/__tests__/automation.dao.test.ts
+++ b/apps/server/src/api-data/automation/__tests__/automation.dao.test.ts
@@ -1,4 +1,6 @@
-import { TriggerDTO, TimerLifeCycle, AutomationDTO, Automation } from 'ontime-types';
+import { TriggerDTO, TimerLifeCycle, AutomationDTO, Automation, EntryId } from 'ontime-types';
+
+import { makeRundown } from '../../rundown/__mocks__/rundown.mocks.js';
 
 import {
   addTrigger,
@@ -12,6 +14,7 @@ import {
   getAutomationTriggers,
   getAutomations,
 } from '../automation.dao.js';
+
 import { makeOSCAction, makeHTTPAction } from './testUtils.js';
 
 beforeAll(() => {
@@ -186,11 +189,9 @@ describe('editAutomation()', async () => {
 });
 
 describe('deleteAutomation()', () => {
-  // saving the ID of the added automation
-  let firstAutomation: Automation;
   beforeEach(async () => {
     await deleteAll();
-    firstAutomation = await addAutomation({
+    await addAutomation({
       title: 'test-osc',
       filterRule: 'all',
       filters: [],
@@ -198,35 +199,15 @@ describe('deleteAutomation()', () => {
     });
   });
 
-  it('should remove m automation from the list', async () => {
+  it('should remove an automation from the list', async () => {
     const automations = getAutomations();
     expect(Object.keys(automations).length).toEqual(1);
 
-    await deleteAutomation(Object.keys(automations)[0]);
+    const rundown = makeRundown({});
+    const timedEventOrder: EntryId[] = [];
+
+    await deleteAutomation(rundown, timedEventOrder, Object.keys(automations)[0]);
     const removed = getAutomations();
     expect(Object.keys(removed).length).toEqual(0);
   });
-
-  it('should not remove an automation which is in use', async () => {
-    const automations = getAutomations();
-    await addTrigger({
-      title: 'test-automation',
-      trigger: TimerLifeCycle.onLoad,
-      automationId: firstAutomation.id,
-    });
-
-    const automationKeys = Object.keys(automations);
-    const automationId = automationKeys[0];
-    expect(automationId).toEqual(firstAutomation.id);
-    expect(automationKeys.length).toEqual(1);
-    expect(automations[automationId]).toMatchObject({
-      id: automationId,
-      title: 'test-osc',
-      filterRule: 'all',
-      filters: expect.any(Array),
-      outputs: expect.any(Array),
-    });
-
-    await expect(deleteAutomation(automationId)).rejects.toThrowError();
-  });
 });
diff --git a/apps/server/src/api-data/automation/__tests__/automation.utils.test.ts b/apps/server/src/api-data/automation/__tests__/automation.utils.test.ts
index 6c7ad2b71..7dc03a253 100644
--- a/apps/server/src/api-data/automation/__tests__/automation.utils.test.ts
+++ b/apps/server/src/api-data/automation/__tests__/automation.utils.test.ts
@@ -1,4 +1,6 @@
-import { parseTemplateNested, stringToOSCArgs } from '../automation.utils.js';
+import { TimerLifeCycle } from 'ontime-types';
+import { makeOntimeEvent, makeRundown } from '../../rundown/__mocks__/rundown.mocks.js';
+import { isAutomationUsed, parseTemplateNested, stringToOSCArgs } from '../automation.utils.js';
 
 describe('parseTemplateNested()', () => {
   it('parses string with a single-level variable name', () => {
@@ -245,3 +247,53 @@ describe('test stringToOSCArgs()', () => {
     expect(stringToOSCArgs(test)).toStrictEqual(expected);
   });
 });
+
+describe('isAutomationUsed()', () => {
+  it('returns the first event which uses an automation', () => {
+    const rundown = makeRundown({
+      entries: {
+        '1': makeOntimeEvent({
+          id: '1',
+          triggers: [
+            {
+              id: 'trigger-1',
+              title: 'Trigger 1',
+              trigger: TimerLifeCycle.onClock,
+              automationId: 'test-automation',
+            },
+          ],
+        }),
+      },
+    });
+
+    const timedEventOrder = ['1'];
+    const automationId = 'test-automation';
+
+    const result = isAutomationUsed(rundown, timedEventOrder, automationId);
+    expect(result).toBe('1');
+  });
+
+  it('returns returns undefined if there are no matches', () => {
+    const rundown = makeRundown({
+      entries: {
+        '1': makeOntimeEvent({
+          id: '1',
+          triggers: [
+            {
+              id: 'trigger-1',
+              title: 'Trigger 1',
+              trigger: TimerLifeCycle.onClock,
+              automationId: 'test-automation',
+            },
+          ],
+        }),
+      },
+    });
+
+    const timedEventOrder = ['1'];
+    const automationId = 'does-not-exist';
+
+    const result = isAutomationUsed(rundown, timedEventOrder, automationId);
+    expect(result).toBeUndefined();
+  });
+});
diff --git a/apps/server/src/api-data/automation/automation.controller.ts b/apps/server/src/api-data/automation/automation.controller.ts
index 4d121c523..b7790ffe5 100644
--- a/apps/server/src/api-data/automation/automation.controller.ts
+++ b/apps/server/src/api-data/automation/automation.controller.ts
@@ -5,6 +5,8 @@ import type { Request, Response } from 'express';
 
 import { oscServer } from '../../adapters/OscAdapter.js';
 
+import { getCurrentRundown, getRundownMetadata } from '../rundown/rundown.dao.js';
+
 import * as automationDao from './automation.dao.js';
 import * as automationService from './automation.service.js';
 import { parseOutput } from './automation.validation.js';
@@ -106,7 +108,10 @@ export async function editAutomation(req: Request, res: Response<Automation | Er
 
 export async function deleteAutomation(req: Request, res: Response<void | ErrorResponse>) {
   try {
-    await automationDao.deleteAutomation(req.params.id);
+    const rundown = getCurrentRundown();
+    const { timedEventOrder } = getRundownMetadata();
+
+    await automationDao.deleteAutomation(rundown, timedEventOrder, req.params.id);
     res.status(204).send();
   } catch (error) {
     const message = getErrorMessage(error);
diff --git a/apps/server/src/api-data/automation/automation.dao.ts b/apps/server/src/api-data/automation/automation.dao.ts
index a2ddadf41..e882675cc 100644
--- a/apps/server/src/api-data/automation/automation.dao.ts
+++ b/apps/server/src/api-data/automation/automation.dao.ts
@@ -2,14 +2,17 @@ import type {
   Automation,
   AutomationDTO,
   AutomationSettings,
+  EntryId,
   NormalisedAutomation,
+  Rundown,
   Trigger,
   TriggerDTO,
 } from 'ontime-types';
 import { deleteAtIndex, generateId } from 'ontime-utils';
 
 import { getDataProvider } from '../../classes/data-provider/DataProvider.js';
-import { getTimedEvents } from '../../services/rundown-service/rundownUtils.js';
+
+import { isAutomationUsed } from './automation.utils.js';
 
 /**
  * Gets a copy of the stored automation settings
@@ -133,7 +136,7 @@ export async function editAutomation(id: string, newAutomation: AutomationDTO):
 /**
  * Deletes a automation given its ID
  */
-export async function deleteAutomation(id: string): Promise<void> {
+export async function deleteAutomation(rundown: Rundown, timedEventOrder: EntryId[], id: string): Promise<void> {
   const automations = getAutomations();
   // ignore request if automation does not exist
   if (!Object.hasOwn(automations, id)) {
@@ -149,13 +152,9 @@ export async function deleteAutomation(id: string): Promise<void> {
   }
 
   // prevent deleting a automation that is in use in events
-  const events = getTimedEvents().filter(
-    (event) => event.triggers && event.triggers.some((trigger) => trigger.automationId === id),
-  );
-  if (events.length) {
-    throw new Error(
-      `Unable to delete automation used in event: ${events[0].id}${events.length > 1 ? ` and ${events.length - 1} more` : ''}`,
-    );
+  const isInUse = isAutomationUsed(rundown, timedEventOrder, id);
+  if (isInUse) {
+    throw new Error(`Unable to delete automation used in event with ID ${isInUse}`);
   }
 
   delete automations[id];
diff --git a/apps/server/src/api-data/automation/automation.parser.ts b/apps/server/src/api-data/automation/automation.parser.ts
index 27fb635c5..9d56217df 100644
--- a/apps/server/src/api-data/automation/automation.parser.ts
+++ b/apps/server/src/api-data/automation/automation.parser.ts
@@ -1,7 +1,7 @@
 import { DatabaseModel, AutomationSettings, NormalisedAutomation, Trigger } from 'ontime-types';
 
 import { dbModel } from '../../models/dataModel.js';
-import type { ErrorEmitter } from '../../utils/parser.js';
+import type { ErrorEmitter } from '../../utils/parserUtils.js';
 
 interface LegacyData extends Partial<DatabaseModel> {
   http?: unknown;
diff --git a/apps/server/src/api-data/automation/automation.utils.ts b/apps/server/src/api-data/automation/automation.utils.ts
index 188d50c9d..fddc54eca 100644
--- a/apps/server/src/api-data/automation/automation.utils.ts
+++ b/apps/server/src/api-data/automation/automation.utils.ts
@@ -1,4 +1,4 @@
-import { FilterRule, MaybeNumber, OntimeAction } from 'ontime-types';
+import { EntryId, FilterRule, isOntimeEvent, MaybeNumber, OntimeAction, Rundown } from 'ontime-types';
 import { millisToString, removeLeadingZero, splitWhitespace, getPropertyFromPath } from 'ontime-utils';
 import type { OscArgOrArrayInput, OscArgInput } from 'osc-min';
 
@@ -195,3 +195,25 @@ export function isBooleanEquals(a: boolean, b: string): boolean {
   }
   return false;
 }
+
+/**
+ * Checks is an automation is used in a rundown
+ * TODO(v4): this currently only checks the current rundown, we will need to check all rundowns in the future
+ */
+export function isAutomationUsed(
+  rundown: Rundown,
+  timedEventOrder: EntryId[],
+  automationId: string,
+): EntryId | undefined {
+  for (let i = 0; i < timedEventOrder.length; i++) {
+    const eventId = timedEventOrder[i];
+    const event = rundown.entries[eventId];
+    if (isOntimeEvent(event) && event.triggers) {
+      for (const trigger of event.triggers) {
+        if (trigger.automationId === automationId) {
+          return eventId;
+        }
+      }
+    }
+  }
+}
diff --git a/apps/server/src/utils/__tests__/parserFunctions.test.ts b/apps/server/src/api-data/custom-fields/__tests__/customFields.parser.test.ts
similarity index 61%
rename from apps/server/src/utils/__tests__/parserFunctions.test.ts
rename to apps/server/src/api-data/custom-fields/__tests__/customFields.parser.test.ts
index ba3437684..c88ed5ccb 100644
--- a/apps/server/src/utils/__tests__/parserFunctions.test.ts
+++ b/apps/server/src/api-data/custom-fields/__tests__/customFields.parser.test.ts
@@ -1,101 +1,6 @@
-import { CustomFields, Settings, URLPreset } from 'ontime-types';
+import { CustomFields } from 'ontime-types';
 
-import {
-  parseCustomFields,
-  parseProject,
-  parseSettings,
-  parseUrlPresets,
-  parseViewSettings,
-  sanitiseCustomFields,
-} from '../parserFunctions.js';
-
-describe('parseProject()', () => {
-  it('returns an a base model if nothing is given', () => {
-    const errorEmitter = vi.fn();
-    const result = parseProject({}, errorEmitter);
-    expect(result).toBeTypeOf('object');
-    expect(errorEmitter).toHaveBeenCalledOnce();
-  });
-
-  it('test migration with adding the logo field v3.8.0', () => {
-    const errorEmitter = vi.fn();
-    const result = parseProject(
-      {
-        //@ts-expect-error -- checking migration when the logo field is added
-        project: {
-          title: 'title',
-          description: 'description',
-          publicUrl: 'publicUrl',
-          publicInfo: 'publicInfo',
-          backstageUrl: 'backstageUrl',
-          backstageInfo: 'backstageInfo',
-          custom: [],
-        },
-      },
-      errorEmitter,
-    );
-    expect(result).toStrictEqual({
-      title: 'title',
-      description: 'description',
-      publicUrl: 'publicUrl',
-      publicInfo: 'publicInfo',
-      backstageUrl: 'backstageUrl',
-      backstageInfo: 'backstageInfo',
-      projectLogo: null,
-      custom: [],
-    });
-  });
-});
-
-describe('parseSettings()', () => {
-  it('throws if settings object does not exist', () => {
-    expect(() => parseSettings({})).toThrow();
-  });
-
-  it('returns an a base model as long as we have the app version', () => {
-    const result = parseSettings({ settings: { version: '1' } as Settings });
-    expect(result).toBeTypeOf('object');
-    expect(result).toMatchObject({
-      version: expect.any(String),
-      serverPort: 4001,
-      editorKey: null,
-      operatorKey: null,
-      timeFormat: '24',
-      language: 'en',
-    });
-  });
-});
-
-describe('parseViewSettings()', () => {
-  it('returns an a base model if nothing is given', () => {
-    const errorEmitter = vi.fn();
-    const result = parseViewSettings({}, errorEmitter);
-    expect(result).toBeTypeOf('object');
-    expect(errorEmitter).toHaveBeenCalledOnce();
-  });
-});
-
-describe('parseUrlPresets()', () => {
-  it('returns an a base model if nothing is given', () => {
-    const errorEmitter = vi.fn();
-    const result = parseUrlPresets({}, errorEmitter);
-    expect(result).toBeTypeOf('object');
-    expect(errorEmitter).toHaveBeenCalledOnce();
-  });
-
-  it('parses data, skipping invalid results', () => {
-    const errorEmitter = vi.fn();
-    const urlPresets = [{ enabled: true, alias: 'alias', pathAndParams: 'ss' }] as URLPreset[];
-    const result = parseUrlPresets({ urlPresets }, errorEmitter);
-    expect(result.length).toEqual(1);
-    expect(result.at(0)).toMatchObject({
-      enabled: true,
-      alias: 'alias',
-      pathAndParams: 'ss',
-    });
-    expect(errorEmitter).not.toHaveBeenCalled();
-  });
-});
+import { parseCustomFields, sanitiseCustomFields } from '../customFields.parser.js';
 
 describe('parseCustomFields()', () => {
   it('returns an a base model if nothing is given', () => {
diff --git a/apps/server/src/api-data/custom-fields/customFields.controller.ts b/apps/server/src/api-data/custom-fields/customFields.controller.ts
deleted file mode 100644
index aaf6d6b67..000000000
--- a/apps/server/src/api-data/custom-fields/customFields.controller.ts
+++ /dev/null
@@ -1,49 +0,0 @@
-import { CustomField, CustomFields, ErrorResponse } from 'ontime-types';
-
-import type { Request, Response } from 'express';
-
-import { getErrorMessage } from 'ontime-utils';
-
-import { createCustomField, editCustomField, removeCustomField } from '../../services/rundown-service/rundownCache.js';
-
-import { getProjectCustomFields } from '../rundown/rundown.dao.js';
-
-export async function getCustomFields(_req: Request, res: Response<CustomFields>) {
-  const customFields = getProjectCustomFields();
-  res.json(customFields);
-}
-
-export async function postCustomField(req: Request, res: Response<CustomFields | ErrorResponse>) {
-  try {
-    const newField = req.body as CustomField;
-    const allFields = await createCustomField(newField);
-    res.status(201).send(allFields);
-  } catch (error) {
-    const message = getErrorMessage(error);
-    res.status(400).send({ message });
-  }
-}
-
-export async function putCustomField(req: Request, res: Response<CustomFields | ErrorResponse>) {
-  try {
-    const oldLabel = req.params.label;
-    const { colour, type, label } = req.body;
-    const newFields = await editCustomField(oldLabel, { label, colour, type });
-    res.status(200).send(newFields);
-  } catch (error) {
-    const message = getErrorMessage(error);
-    res.status(400).send({ message });
-  }
-}
-
-// Expects { label: <label> }
-export async function deleteCustomField(req: Request, res: Response<CustomFields | ErrorResponse>) {
-  try {
-    const fieldToDelete = req.params.label;
-    await removeCustomField(fieldToDelete);
-    res.sendStatus(204);
-  } catch (error) {
-    const message = getErrorMessage(error);
-    res.status(400).send({ message });
-  }
-}
diff --git a/apps/server/src/api-data/custom-fields/customFields.parser.ts b/apps/server/src/api-data/custom-fields/customFields.parser.ts
new file mode 100644
index 000000000..6f9d568ba
--- /dev/null
+++ b/apps/server/src/api-data/custom-fields/customFields.parser.ts
@@ -0,0 +1,64 @@
+import { DatabaseModel, CustomFields, CustomField } from 'ontime-types';
+import { isAlphanumericWithSpace, customFieldLabelToKey } from 'ontime-utils';
+
+import type { ErrorEmitter } from '../../utils/parserUtils.js';
+
+/**
+ * Parse customFields entry
+ */
+export function parseCustomFields(data: Partial<DatabaseModel>, emitError?: ErrorEmitter): CustomFields {
+  if (typeof data.customFields !== 'object') {
+    emitError?.('No data found to import');
+    return {};
+  }
+  console.log('Found Custom Fields, importing...');
+
+  const customFields = sanitiseCustomFields(data.customFields);
+
+  if (Object.keys(customFields).length !== Object.keys(data.customFields).length) {
+    emitError?.('Skipped invalid custom fields');
+  }
+  return customFields;
+}
+
+export function sanitiseCustomFields(data: object): CustomFields {
+  const newCustomFields: CustomFields = {};
+
+  for (const [_originalKey, field] of Object.entries(data)) {
+    if (!isValidField(field)) {
+      continue;
+    }
+
+    if (!isAlphanumericWithSpace(field.label)) {
+      continue;
+    }
+
+    // the key is always made from the label
+    const key = customFieldLabelToKey(field.label);
+
+    if (key in newCustomFields) {
+      continue;
+    }
+
+    newCustomFields[key] = {
+      type: field.type,
+      colour: field.colour,
+      label: field.label,
+    };
+  }
+
+  function isValidField(data: unknown): data is CustomField {
+    return (
+      typeof data === 'object' &&
+      data !== null &&
+      'label' in data &&
+      data.label !== '' &&
+      'colour' in data &&
+      typeof data.colour === 'string' &&
+      'type' in data &&
+      (data.type === 'string' || data.type === 'image')
+    );
+  }
+
+  return newCustomFields;
+}
diff --git a/apps/server/src/api-data/custom-fields/customFields.router.ts b/apps/server/src/api-data/custom-fields/customFields.router.ts
index 70d739314..452c0c930 100644
--- a/apps/server/src/api-data/custom-fields/customFields.router.ts
+++ b/apps/server/src/api-data/custom-fields/customFields.router.ts
@@ -1,14 +1,49 @@
-import express from 'express';
+import { CustomField, CustomFields, ErrorResponse } from 'ontime-types';
+import { getErrorMessage } from 'ontime-utils';
+
+import express from 'express';
+import type { Request, Response } from 'express';
+
+import { getProjectCustomFields } from '../rundown/rundown.dao.js';
+import { createCustomField, editCustomField, deleteCustomField } from '../rundown/rundown.service.js';
 
-import { deleteCustomField, getCustomFields, postCustomField, putCustomField } from './customFields.controller.js';
 import { validateCustomField, validateDeleteCustomField, validateEditCustomField } from './customFields.validation.js';
 
 export const router = express.Router();
 
-router.get('/', getCustomFields);
+router.get('/', async (_req: Request, res: Response<CustomFields>) => {
+  const customFields = getProjectCustomFields();
+  res.json(customFields);
+});
 
-router.post('/', validateCustomField, postCustomField);
+router.post('/', validateCustomField, async (req: Request, res: Response<CustomFields | ErrorResponse>) => {
+  try {
+    const newFields = await createCustomField(req.body as CustomField);
+    res.status(201).send(newFields);
+  } catch (error) {
+    const message = getErrorMessage(error);
+    res.status(400).send({ message });
+  }
+});
 
-router.put('/:label', validateEditCustomField, putCustomField);
+router.put('/:key', validateEditCustomField, async (req: Request, res: Response<CustomFields | ErrorResponse>) => {
+  try {
+    const currentKey = req.params.key;
+    const { colour, type, label } = req.body;
+    const newFields = await editCustomField(currentKey, { label, colour, type });
+    res.status(200).send(newFields);
+  } catch (error) {
+    const message = getErrorMessage(error);
+    res.status(400).send({ message });
+  }
+});
 
-router.delete('/:label', validateDeleteCustomField, deleteCustomField);
+router.delete('/:key', validateDeleteCustomField, async (req: Request, res: Response<CustomFields | ErrorResponse>) => {
+  try {
+    const customFields = await deleteCustomField(req.params.key);
+    res.status(200).send(customFields);
+  } catch (error) {
+    const message = getErrorMessage(error);
+    res.status(400).send({ message });
+  }
+});
diff --git a/apps/server/src/api-data/custom-fields/customFields.validation.ts b/apps/server/src/api-data/custom-fields/customFields.validation.ts
index 17bde8246..7b2b0734a 100644
--- a/apps/server/src/api-data/custom-fields/customFields.validation.ts
+++ b/apps/server/src/api-data/custom-fields/customFields.validation.ts
@@ -5,14 +5,14 @@ import { body, param, validationResult } from 'express-validator';
 
 export const validateCustomField = [
   body('label')
-    .exists()
     .isString()
     .trim()
+    .notEmpty()
     .custom((value) => {
       return isAlphanumericWithSpace(value);
     }),
-  body('type').exists().isIn(['string', 'image']),
-  body('colour').exists().isString().trim(),
+  body('type').isIn(['string', 'image']),
+  body('colour').isString().trim(),
 
   (req: Request, res: Response, next: NextFunction) => {
     const errors = validationResult(req);
@@ -22,16 +22,16 @@ export const validateCustomField = [
 ];
 
 export const validateEditCustomField = [
-  param('label').exists().isString().trim(),
+  param('key').isString().trim().notEmpty(),
   body('label')
-    .exists()
     .isString()
     .trim()
+    .notEmpty()
     .custom((value) => {
       return isAlphanumericWithSpace(value);
     }),
-  body('type').exists().isIn(['string', 'image']),
-  body('colour').exists().isString().trim(),
+  body('type').isIn(['string', 'image']),
+  body('colour').isString().trim(),
 
   (req: Request, res: Response, next: NextFunction) => {
     const errors = validationResult(req);
@@ -41,7 +41,7 @@ export const validateEditCustomField = [
 ];
 
 export const validateDeleteCustomField = [
-  param('label').exists().isString(),
+  param('key').isString().notEmpty(),
 
   (req: Request, res: Response, next: NextFunction) => {
     const errors = validationResult(req);
diff --git a/apps/server/src/api-data/db/__tests__/db.parser.test.ts b/apps/server/src/api-data/db/__tests__/db.parser.test.ts
new file mode 100644
index 000000000..eb58659b9
--- /dev/null
+++ b/apps/server/src/api-data/db/__tests__/db.parser.test.ts
@@ -0,0 +1,56 @@
+/* eslint-disable no-console --  we are mocking the console */
+
+import { demoDb } from '../../../models/demoProject.js';
+
+import { parseDatabaseModel } from '../db.parser.js';
+
+// mock data provider
+beforeAll(() => {
+  vi.mock('../../classes/data-provider/DataProvider.js', () => {
+    return {
+      getDataProvider: vi.fn().mockImplementation(() => {
+        return {
+          setRundown: vi.fn().mockImplementation((newData) => newData),
+          setCustomFields: vi.fn().mockImplementation((newData) => newData),
+        };
+      }),
+    };
+  });
+});
+
+describe('test parseDatabaseModel() with demo project (valid)', () => {
+  const filteredDemoProject = structuredClone(demoDb);
+  const { data } = parseDatabaseModel(filteredDemoProject);
+
+  it('has 17 events with 12 top level events', () => {
+    expect(data.rundowns.default.order.length).toBe(12);
+    expect(Object.keys(data.rundowns.default.entries).length).toBe(17);
+  });
+
+  it('is the same as the demo project since all data is valid', () => {
+    // @ts-expect-error -- its ok
+    delete filteredDemoProject.settings.version;
+    // @ts-expect-error -- its ok
+    delete data.settings.version;
+    expect(data).toMatchObject(filteredDemoProject);
+  });
+});
+
+describe('test parseDatabaseModel() edge cases', () => {
+  it('skips unknown app and version settings', () => {
+    console.log = vi.fn();
+    const testData = {
+      settings: {
+        osc_port: 8888,
+      },
+    };
+
+    // @ts-expect-error -- we know this is wrong, testing imports outside domain
+    expect(() => parseDatabaseModel(testData)).toThrow();
+  });
+
+  it('fails with invalid JSON', () => {
+    // @ts-expect-error -- we know this is wrong, testing imports outside domain
+    expect(() => parseDatabaseModel('some random dataset')).toThrow();
+  });
+});
diff --git a/apps/server/src/api-data/db/db.middleware.ts b/apps/server/src/api-data/db/db.middleware.ts
index 4c9db3fbc..9253daf06 100644
--- a/apps/server/src/api-data/db/db.middleware.ts
+++ b/apps/server/src/api-data/db/db.middleware.ts
@@ -1,11 +1,10 @@
 import type { Request } from 'express';
 import multer, { type FileFilterCallback } from 'multer';
 
-import { JSON_MIME } from '../../utils/parser.js';
 import { storage } from '../../utils/upload.js';
 
 const filterProjectFile = (_req: Request, file: Express.Multer.File, cb: FileFilterCallback) => {
-  if (file.mimetype.includes(JSON_MIME)) {
+  if (file.mimetype.includes('application/json')) {
     cb(null, true);
   } else {
     cb(null, false);
diff --git a/apps/server/src/api-data/db/db.parser.ts b/apps/server/src/api-data/db/db.parser.ts
new file mode 100644
index 000000000..18267e516
--- /dev/null
+++ b/apps/server/src/api-data/db/db.parser.ts
@@ -0,0 +1,49 @@
+import { DatabaseModel, LogOrigin } from 'ontime-types';
+
+import { logger } from '../../classes/Logger.js';
+
+import { parseAutomationSettings } from '../automation/automation.parser.js';
+import { parseProjectData } from '../project-data/projectData.parser.js';
+import { parseRundowns } from '../rundown/rundown.parser.js';
+import { parseSettings } from '../settings/settings.parser.js';
+import { parseUrlPresets } from '../url-presets/urlPresets.parser.js';
+import { parseViewSettings } from '../view-settings/viewSettings.parser.js';
+import { parseCustomFields } from '../custom-fields/customFields.parser.js';
+
+type ParsingError = {
+  context: string;
+  message: string;
+};
+
+/**
+ * @description handles parsing of ontime project file
+ * @param {object} jsonData - project file to be parsed
+ * @returns {object} - parsed object
+ */
+export function parseDatabaseModel(jsonData: Partial<DatabaseModel>): { data: DatabaseModel; errors: ParsingError[] } {
+  // we need to parse settings first to make sure the data is ours
+  // this may throw
+  const settings = parseSettings(jsonData);
+
+  const errors: ParsingError[] = [];
+  const makeEmitError = (context: string) => (message: string) => {
+    logger.error(LogOrigin.Server, `Error parsing ${context}: ${message}`);
+    errors.push({ context, message });
+  };
+
+  // we need to parse the custom fields first so they can be used in validating events
+  const customFields = parseCustomFields(jsonData, makeEmitError('Custom Fields'));
+  const rundowns = parseRundowns(jsonData, customFields, makeEmitError('Rundowns'));
+
+  const data: DatabaseModel = {
+    rundowns,
+    project: parseProjectData(jsonData, makeEmitError('Project')),
+    settings,
+    viewSettings: parseViewSettings(jsonData, makeEmitError('View Settings')),
+    urlPresets: parseUrlPresets(jsonData, makeEmitError('URL Presets')),
+    customFields,
+    automation: parseAutomationSettings(jsonData),
+  };
+
+  return { data, errors };
+}
diff --git a/apps/server/src/utils/__tests__/parser.test.ts b/apps/server/src/api-data/excel/__tests__/excel.parser.test.ts
similarity index 74%
rename from apps/server/src/utils/__tests__/parser.test.ts
rename to apps/server/src/api-data/excel/__tests__/excel.parser.test.ts
index ccd7fc4c2..dfdd74d28 100644
--- a/apps/server/src/utils/__tests__/parser.test.ts
+++ b/apps/server/src/api-data/excel/__tests__/excel.parser.test.ts
@@ -1,294 +1,9 @@
-/* eslint-disable no-console -- we are mocking the console */
-import { vi } from 'vitest';
+import { CustomFields, OntimeEvent, SupportedEntry, TimerType } from 'ontime-types';
+import { defaultImportMap, ImportMap, MILLIS_PER_MINUTE } from 'ontime-utils';
 
-import { CustomFields, DatabaseModel, OntimeEvent, SupportedEntry, TimerType } from 'ontime-types';
-import { ImportMap, MILLIS_PER_MINUTE } from 'ontime-utils';
+import { getCustomFieldData, parseExcel } from '../excel.parser.js';
 
-import { dbModel } from '../../models/dataModel.js';
-import { demoDb } from '../../models/demoProject.js';
-
-import { getCustomFieldData, parseExcel, parseDatabaseModel } from '../parser.js';
-import { makeString } from '../parserUtils.js';
-import { parseUrlPresets, parseViewSettings } from '../parserFunctions.js';
-
-import { dataFromExcelTemplate } from './parser.mock-data.js';
-
-// mock data provider
-beforeAll(() => {
-  vi.mock('../../classes/data-provider/DataProvider.js', () => {
-    return {
-      getDataProvider: vi.fn().mockImplementation(() => {
-        return {
-          setRundown: vi.fn().mockImplementation((newData) => newData),
-          setCustomFields: vi.fn().mockImplementation((newData) => newData),
-        };
-      }),
-    };
-  });
-});
-
-describe('test parseDatabaseModel() with demo project (valid)', () => {
-  const filteredDemoProject = structuredClone(demoDb);
-  const { data } = parseDatabaseModel(filteredDemoProject);
-
-  it('has 17 events with 12 top level events', () => {
-    expect(data.rundowns.default.order.length).toBe(12);
-    expect(Object.keys(data.rundowns.default.entries).length).toBe(17);
-  });
-
-  it('is the same as the demo project since all data is valid', () => {
-    // @ts-expect-error -- its ok
-    delete filteredDemoProject.settings.version;
-    // @ts-expect-error -- its ok
-    delete data.settings.version;
-    expect(data).toMatchObject(filteredDemoProject);
-  });
-});
-
-describe('test parseDatabaseModel() edge cases', () => {
-  it('skips unknown app and version settings', () => {
-    console.log = vi.fn();
-    const testData = {
-      settings: {
-        osc_port: 8888,
-      },
-    };
-
-    // @ts-expect-error -- we know this is wrong, testing imports outside domain
-    expect(() => parseDatabaseModel(testData)).toThrow();
-  });
-
-  it('fails with invalid JSON', () => {
-    // @ts-expect-error -- we know this is wrong, testing imports outside domain
-    expect(() => parseDatabaseModel('some random dataset')).toThrow();
-  });
-});
-
-describe('test aliases import', () => {
-  it('imports a well defined urlPreset', () => {
-    const testData = {
-      rundown: [],
-      settings: {
-        version: '2.0.0',
-      },
-      urlPresets: [
-        {
-          enabled: false,
-          alias: 'testalias',
-          pathAndParams: 'testpathAndParams',
-        },
-      ],
-    } as unknown as DatabaseModel;
-
-    const parsed = parseUrlPresets(testData);
-    expect(parsed.length).toBe(1);
-
-    // generates missing id
-    expect(parsed[0].alias).toBeDefined();
-  });
-});
-
-describe('test views import', () => {
-  it('imports data from file', () => {
-    const testData = {
-      rundown: [],
-      settings: {
-        version: '2.0.0',
-      },
-      viewSettings: {
-        normalColor: '#ffffffcc',
-        warningColor: '#FFAB33',
-        dangerColor: '#ED3333',
-        endMessage: '',
-        overrideStyles: false,
-        // known error: properties do not exist
-        notAthing: true,
-      },
-      // known error: views does not exist
-      views: {
-        overrideStyles: true,
-      },
-    };
-    const expectedParsedViewSettings = {
-      normalColor: '#ffffffcc',
-      warningColor: '#FFAB33',
-      dangerColor: '#ED3333',
-      freezeEnd: false,
-      endMessage: '',
-      overrideStyles: false,
-    };
-    // @ts-expect-error -- we know the above is incorrect
-    const parsed = parseViewSettings(testData);
-    expect(parsed).toStrictEqual(expectedParsedViewSettings);
-  });
-
-  it('imports defaults to model', () => {
-    const testData = {
-      rundown: [],
-      settings: {
-        version: '2.0.0',
-      },
-    } as unknown as DatabaseModel;
-    const parsed = parseViewSettings(testData);
-    expect(parsed).toStrictEqual(dbModel.viewSettings);
-  });
-});
-
-describe('makeString()', () => {
-  it('converts variables to string', () => {
-    const cases = [
-      {
-        val: 2,
-        expected: '2',
-      },
-      {
-        val: 2.22222222,
-        expected: '2.22222222',
-      },
-      {
-        val: ['testing'],
-        expected: 'testing',
-      },
-      {
-        val: ' testing    ',
-        expected: 'testing',
-      },
-      {
-        val: { doing: 'testing' },
-        expected: 'fallback',
-      },
-      {
-        val: undefined,
-        expected: 'fallback',
-      },
-    ];
-
-    cases.forEach(({ val, expected }) => {
-      const converted = makeString(val, 'fallback');
-      expect(converted).toBe(expected);
-    });
-  });
-});
-
-describe('getCustomFieldData()', () => {
-  it('generates a list of keys from the given import map', () => {
-    const importMap = {
-      worksheet: 'event schedule',
-      timeStart: 'time start',
-      linkStart: 'link start',
-      timeEnd: 'time end',
-      duration: 'duration',
-      cue: 'cue',
-      title: 'title',
-      countToEnd: 'count to end',
-      isPublic: 'public',
-      skip: 'skip',
-      note: 'notes',
-      colour: 'colour',
-      endAction: 'end action',
-      timerType: 'timer type',
-      timeWarning: 'warning time',
-      timeDanger: 'danger time',
-      custom: {
-        lighting: 'lx',
-        sound: 'sound',
-        video: 'av',
-      },
-      entryId: 'id',
-    } as ImportMap;
-
-    const result = getCustomFieldData(importMap, {});
-    expect(result.customFields).toStrictEqual({
-      lighting: {
-        type: 'string',
-        colour: '',
-        label: 'lighting',
-      },
-      sound: {
-        type: 'string',
-        colour: '',
-        label: 'sound',
-      },
-      video: {
-        type: 'string',
-        colour: '',
-        label: 'video',
-      },
-    });
-
-    // it is an inverted record of <importKey, ontimeKey>
-    expect(result.customFieldImportKeys).toStrictEqual({
-      lx: 'lighting',
-      sound: 'sound',
-      av: 'video',
-    });
-  });
-  it('keeps colour information from existing fields', () => {
-    const importMap = {
-      worksheet: 'event schedule',
-      timeStart: 'time start',
-      linkStart: 'link start',
-      timeEnd: 'time end',
-      duration: 'duration',
-      cue: 'cue',
-      title: 'title',
-      countToEnd: 'count to end',
-      isPublic: 'public',
-      skip: 'skip',
-      note: 'notes',
-      colour: 'colour',
-      endAction: 'end action',
-      timerType: 'timer type',
-      timeWarning: 'warning time',
-      timeDanger: 'danger time',
-      custom: {
-        lighting: 'lx',
-        sound: 'sound',
-        video: 'av',
-        ontime_label: 'excel label',
-      },
-      entryId: 'id',
-    } as ImportMap;
-
-    const customFields: CustomFields = {
-      lighting: { label: 'lx', type: 'string', colour: 'red' },
-      sound: { label: 'sound', type: 'string', colour: 'green' },
-      ontime_key: { label: 'ontime_label', type: 'string', colour: 'blue' },
-    };
-
-    const result = getCustomFieldData(importMap, customFields);
-    expect(result.customFields).toStrictEqual({
-      lighting: {
-        type: 'string',
-        colour: 'red',
-        label: 'lighting',
-      },
-      sound: {
-        type: 'string',
-        colour: 'green',
-        label: 'sound',
-      },
-      video: {
-        type: 'string',
-        colour: '',
-        label: 'video',
-      },
-      ontime_key: {
-        type: 'string',
-        colour: 'blue',
-        label: 'ontime_label',
-      },
-    });
-
-    // it is an inverted record of <importKey, ontimeKey>
-    expect(result.customFieldImportKeys).toStrictEqual({
-      lx: 'lighting',
-      sound: 'sound',
-      av: 'video',
-      'excel label': 'ontime_key',
-    });
-  });
-});
+import { dataFromExcelTemplate } from './mockData.js';
 
 describe('parseExcel()', () => {
   it('parses the example file', () => {
@@ -707,3 +422,161 @@ describe('parseExcel()', () => {
     });
   });
 });
+
+describe('getCustomFieldData()', () => {
+  it('generates a list of keys from the given import map', () => {
+    const importMap = {
+      worksheet: 'event schedule',
+      timeStart: 'time start',
+      linkStart: 'link start',
+      timeEnd: 'time end',
+      duration: 'duration',
+      cue: 'cue',
+      title: 'title',
+      countToEnd: 'count to end',
+      isPublic: 'public',
+      skip: 'skip',
+      note: 'notes',
+      colour: 'colour',
+      endAction: 'end action',
+      timerType: 'timer type',
+      timeWarning: 'warning time',
+      timeDanger: 'danger time',
+      custom: {
+        lighting: 'lx',
+        sound: 'sound',
+        video: 'av',
+      },
+      entryId: 'id',
+    } as ImportMap;
+
+    const result = getCustomFieldData(importMap, {});
+    expect(result.mergedCustomFields).toStrictEqual({
+      lighting: {
+        type: 'string',
+        colour: '',
+        label: 'lighting',
+      },
+      sound: {
+        type: 'string',
+        colour: '',
+        label: 'sound',
+      },
+      video: {
+        type: 'string',
+        colour: '',
+        label: 'video',
+      },
+    });
+
+    // it is an inverted record of <importKey, ontimeKey>
+    expect(result.customFieldImportKeys).toStrictEqual({
+      lx: 'lighting',
+      sound: 'sound',
+      av: 'video',
+    });
+  });
+
+  it('keeps colour information from existing fields', () => {
+    const importMap = {
+      worksheet: 'event schedule',
+      timeStart: 'time start',
+      linkStart: 'link start',
+      timeEnd: 'time end',
+      duration: 'duration',
+      cue: 'cue',
+      title: 'title',
+      countToEnd: 'count to end',
+      isPublic: 'public',
+      skip: 'skip',
+      note: 'notes',
+      colour: 'colour',
+      endAction: 'end action',
+      timerType: 'timer type',
+      timeWarning: 'warning time',
+      timeDanger: 'danger time',
+      custom: {
+        lighting: 'lx',
+        sound: 'sound',
+        video: 'av',
+        'ontime key': 'excel label',
+      },
+      entryId: 'id',
+    } as ImportMap;
+
+    const existingCustomFields: CustomFields = {
+      lighting: { label: 'lighting', type: 'string', colour: 'red' },
+      sound: { label: 'sound', type: 'string', colour: 'green' },
+      ontime_key: { label: 'ontime key', type: 'string', colour: 'blue' },
+    };
+
+    const result = getCustomFieldData(importMap, existingCustomFields);
+    expect(result.mergedCustomFields).toStrictEqual({
+      lighting: {
+        type: 'string',
+        colour: 'red',
+        label: 'lighting',
+      },
+      sound: {
+        type: 'string',
+        colour: 'green',
+        label: 'sound',
+      },
+      video: {
+        type: 'string',
+        colour: '',
+        label: 'video',
+      },
+      ontime_key: {
+        type: 'string',
+        colour: 'blue',
+        label: 'ontime key',
+      },
+    });
+
+    // it is an inverted record of <importKey, ontimeKey>
+    expect(result.customFieldImportKeys).toStrictEqual({
+      lx: 'lighting',
+      sound: 'sound',
+      av: 'video',
+      'excel label': 'ontime_key',
+    });
+  });
+
+  it('lowercases the keys in the import map', () => {
+    const importMap: ImportMap = {
+      ...defaultImportMap,
+      custom: {
+        Lighting: 'Lx',
+        Sound: 'sound',
+        video: 'av',
+      },
+    };
+
+    const result = getCustomFieldData(importMap, {});
+    expect(result.mergedCustomFields).toStrictEqual({
+      Lighting: {
+        type: 'string',
+        colour: '',
+        label: 'Lighting',
+      },
+      Sound: {
+        type: 'string',
+        colour: '',
+        label: 'Sound',
+      },
+      video: {
+        type: 'string',
+        colour: '',
+        label: 'video',
+      },
+    });
+
+    // notice that the keys excel keys are lowercased
+    expect(result.customFieldImportKeys).toStrictEqual({
+      lx: 'Lighting',
+      sound: 'Sound',
+      av: 'video',
+    });
+  });
+});
diff --git a/apps/server/src/utils/__tests__/parser.mock-data.ts b/apps/server/src/api-data/excel/__tests__/mockData.ts
similarity index 100%
rename from apps/server/src/utils/__tests__/parser.mock-data.ts
rename to apps/server/src/api-data/excel/__tests__/mockData.ts
diff --git a/apps/server/src/api-data/excel/excel.middleware.ts b/apps/server/src/api-data/excel/excel.middleware.ts
index 68f252b31..cee4c605b 100644
--- a/apps/server/src/api-data/excel/excel.middleware.ts
+++ b/apps/server/src/api-data/excel/excel.middleware.ts
@@ -1,9 +1,10 @@
 import type { Request } from 'express';
 import multer, { type FileFilterCallback } from 'multer';
 
-import { EXCEL_MIME } from '../../utils/parser.js';
 import { storage } from '../../utils/upload.js';
 
+export const EXCEL_MIME = 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet';
+
 const filterExcel = (_req: Request, file: Express.Multer.File, cb: FileFilterCallback) => {
   if (file.mimetype.includes(EXCEL_MIME)) {
     cb(null, true);
diff --git a/apps/server/src/utils/parser.ts b/apps/server/src/api-data/excel/excel.parser.ts
similarity index 78%
rename from apps/server/src/utils/parser.ts
rename to apps/server/src/api-data/excel/excel.parser.ts
index e60c0fd74..e515dbeae 100644
--- a/apps/server/src/utils/parser.ts
+++ b/apps/server/src/api-data/excel/excel.parser.ts
@@ -1,80 +1,30 @@
-import {
-  customFieldLabelToKey,
-  customKeyFromLabel,
-  defaultImportMap,
-  generateId,
-  type ImportMap,
-  isKnownTimerType,
-  validateEndAction,
-  validateTimerType,
-} from 'ontime-utils';
 import {
   CustomFields,
-  DatabaseModel,
-  EntryCustomFields,
-  isOntimeBlock,
-  LogOrigin,
-  OntimeBlock,
-  OntimeEvent,
   Rundown,
+  OntimeEvent,
+  OntimeBlock,
+  EntryCustomFields,
   SupportedEntry,
+  isOntimeBlock,
   TimerType,
+  CustomFieldKey,
 } from 'ontime-types';
+import {
+  ImportMap,
+  defaultImportMap,
+  generateId,
+  isKnownTimerType,
+  validateTimerType,
+  validateEndAction,
+  customFieldLabelToKey,
+  isAlphanumericWithSpace,
+} from 'ontime-utils';
 
 import { Merge } from 'ts-essentials';
 
-import { parseAutomationSettings } from '../api-data/automation/automation.parser.js';
-import { parseRundowns } from '../api-data/rundown/rundown.parser.js';
-import { logger } from '../classes/Logger.js';
-
-import { makeString } from './parserUtils.js';
-import { parseProject, parseSettings, parseUrlPresets, parseViewSettings } from './parserFunctions.js';
-import { parseExcelDate } from './time.js';
-import { is } from './is.js';
-
-export type ErrorEmitter = (message: string) => void;
-export const EXCEL_MIME = 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet';
-export const JSON_MIME = 'application/json';
-
-function parseBooleanString(value: unknown): boolean {
-  if (typeof value === 'boolean') {
-    return value;
-  }
-
-  // falsy values would be nullish or empty string
-  if (!value || typeof value !== 'string') {
-    return false;
-  }
-  return value.toLowerCase() !== 'false';
-}
-
-export function getCustomFieldData(
-  importMap: ImportMap,
-  existingCustomFields: CustomFields,
-): {
-  customFields: CustomFields;
-  customFieldImportKeys: Record<keyof CustomFields, string>;
-} {
-  const customFields = {};
-  const customFieldImportKeys: Record<string, string> = {};
-
-  for (const ontimeLabel in importMap.custom) {
-    const ontimeKey = customKeyFromLabel(ontimeLabel, existingCustomFields) ?? customFieldLabelToKey(ontimeLabel);
-    if (!ontimeKey) {
-      continue;
-    }
-    const importLabel = importMap.custom[ontimeLabel].toLowerCase();
-
-    // @ts-expect-error -- we are sure that the key exists
-    customFields[ontimeKey] = {
-      type: 'string',
-      colour: ontimeKey in existingCustomFields ? existingCustomFields[ontimeKey].colour : '',
-      label: ontimeLabel,
-    };
-    customFieldImportKeys[importLabel] = ontimeKey;
-  }
-  return { customFields, customFieldImportKeys };
-}
+import { is } from '../../utils/is.js';
+import { makeString } from '../../utils/parserUtils.js';
+import { parseExcelDate } from '../../utils/time.js';
 
 /**
  * @description Excel array parser
@@ -102,7 +52,7 @@ export const parseExcel = (
     }
   }
 
-  const { customFields, customFieldImportKeys } = getCustomFieldData(importMap, existingCustomFields);
+  const { mergedCustomFields, customFieldImportKeys } = getCustomFieldData(importMap, existingCustomFields);
   const rundown: Rundown = {
     id: generateId(),
     title: sheetName,
@@ -331,44 +281,68 @@ export const parseExcel = (
 
   return {
     rundown,
-    customFields,
+    customFields: mergedCustomFields,
     rundownMetadata,
   };
 };
 
-type ParsingError = {
-  context: string;
-  message: string;
-};
+/**
+ * Utility function infers a boolean from a string value
+ */
+function parseBooleanString(value: unknown): boolean {
+  if (typeof value === 'boolean') {
+    return value;
+  }
+
+  // falsy values would be nullish or empty string
+  if (!value || typeof value !== 'string') {
+    return false;
+  }
+  return value.toLowerCase() !== 'false';
+}
 
 /**
- * @description handles parsing of ontime project file
- * @param {object} jsonData - project file to be parsed
- * @returns {object} - parsed object
+ * Receives an import map which contains custom field labels and a custom fields object
+ * the result importkeys is an inverted record of <importKey, ontimeKey>
+ * We need this function since, when importing from sheets, the user gives us custom field labels, not keys
+ * @returns the new custom fields, and a map of excel column names to ontime keys
+ * @private exported for testing
  */
-export function parseDatabaseModel(jsonData: Partial<DatabaseModel>): { data: DatabaseModel; errors: ParsingError[] } {
-  // we need to parse settings first to make sure the data is ours
-  // this may throw
-  const settings = parseSettings(jsonData);
+export function getCustomFieldData(
+  importMap: ImportMap,
+  existingCustomFields: CustomFields,
+): {
+  mergedCustomFields: CustomFields;
+  customFieldImportKeys: Record<keyof CustomFields, string>;
+} {
+  const mergedCustomFields: CustomFields = {};
+  /**
+   * A map of import keys to ontime keys
+   * Map<excel column name, ontime key>
+   */
+  const customFieldImportKeys: Record<string, CustomFieldKey> = {};
 
-  const errors: ParsingError[] = [];
-  const makeEmitError = (context: string) => (message: string) => {
-    logger.error(LogOrigin.Server, `Error parsing ${context}: ${message}`);
-    errors.push({ context, message });
-  };
+  for (const ontimeLabel in importMap.custom) {
+    // if the label is not valid, we skip the import
+    if (!isAlphanumericWithSpace(ontimeLabel)) {
+      continue;
+    }
 
-  // we need to parse the custom fields first so they can be used in validating events
-  const { rundowns, customFields } = parseRundowns(jsonData, makeEmitError('Rundown'));
+    // generate a key for the custom field
+    const keyInCustomFields = customFieldLabelToKey(ontimeLabel);
+    // we lower case the excel key to make it easier to match
+    const columnNameInExcel = importMap.custom[ontimeLabel].toLowerCase();
+    const maybeExistingColour = existingCustomFields[keyInCustomFields]?.colour ?? '';
 
-  const data: DatabaseModel = {
-    rundowns,
-    project: parseProject(jsonData, makeEmitError('Project')),
-    settings,
-    viewSettings: parseViewSettings(jsonData, makeEmitError('View Settings')),
-    urlPresets: parseUrlPresets(jsonData, makeEmitError('URL Presets')),
-    customFields,
-    automation: parseAutomationSettings(jsonData),
-  };
+    // 1. add the custom field to the merged custom fields
+    mergedCustomFields[keyInCustomFields] = {
+      type: 'string', // we currently only support string custom fields
+      colour: maybeExistingColour,
+      label: ontimeLabel,
+    };
 
-  return { data, errors };
+    // 2. add the column to the import keys
+    customFieldImportKeys[columnNameInExcel] = keyInCustomFields;
+  }
+  return { mergedCustomFields, customFieldImportKeys };
 }
diff --git a/apps/server/src/api-data/excel/excel.service.ts b/apps/server/src/api-data/excel/excel.service.ts
index 275f82561..2519b0599 100644
--- a/apps/server/src/api-data/excel/excel.service.ts
+++ b/apps/server/src/api-data/excel/excel.service.ts
@@ -11,12 +11,13 @@ import { existsSync } from 'fs';
 import xlsx from 'xlsx';
 import type { WorkBook } from 'xlsx';
 
-import { parseExcel } from '../../utils/parser.js';
-import { parseCustomFields } from '../../utils/parserFunctions.js';
-import { deleteFile } from '../../utils/parserUtils.js';
+import { deleteFile } from '../../utils/fileManagement.js';
 
 import { parseRundown } from '../rundown/rundown.parser.js';
 import { getProjectCustomFields } from '../rundown/rundown.dao.js';
+import { parseCustomFields } from '../custom-fields/customFields.parser.js';
+
+import { parseExcel } from './excel.parser.js';
 
 let excelData: WorkBook = xlsx.utils.book_new();
 
diff --git a/apps/server/src/api-data/index.ts b/apps/server/src/api-data/index.ts
index 7f79c497d..ac62b6ca1 100644
--- a/apps/server/src/api-data/index.ts
+++ b/apps/server/src/api-data/index.ts
@@ -4,7 +4,7 @@ import { router as automationsRouter } from './automation/automation.router.js';
 import { router as urlPresetsRouter } from './url-presets/urlPresets.router.js';
 import { router as customFieldsRouter } from './custom-fields/customFields.router.js';
 import { router as dbRouter } from './db/db.router.js';
-import { router as projectRouter } from './project/project.router.js';
+import { router as projectRouter } from './project-data/projectData.router.js';
 import { router as rundownRouter } from './rundown/rundown.router.js';
 import { router as settingsRouter } from './settings/settings.router.js';
 import { router as sheetsRouter } from './sheets/sheets.router.js';
diff --git a/apps/server/src/api-data/project-data/__tests__/projectData.parser.test.ts b/apps/server/src/api-data/project-data/__tests__/projectData.parser.test.ts
new file mode 100644
index 000000000..6fe4c1242
--- /dev/null
+++ b/apps/server/src/api-data/project-data/__tests__/projectData.parser.test.ts
@@ -0,0 +1,10 @@
+import { parseProjectData } from '../projectData.parser.js';
+
+describe('parseProjectData()', () => {
+  it('returns an a base model if nothing is given', () => {
+    const errorEmitter = vi.fn();
+    const result = parseProjectData({}, errorEmitter);
+    expect(result).toBeTypeOf('object');
+    expect(errorEmitter).toHaveBeenCalledOnce();
+  });
+});
diff --git a/apps/server/src/api-data/project/project.controller.ts b/apps/server/src/api-data/project-data/projectData.controller.ts
similarity index 96%
rename from apps/server/src/api-data/project/project.controller.ts
rename to apps/server/src/api-data/project-data/projectData.controller.ts
index c70b6523d..c66bc6cd9 100644
--- a/apps/server/src/api-data/project/project.controller.ts
+++ b/apps/server/src/api-data/project-data/projectData.controller.ts
@@ -6,7 +6,7 @@ import type { Request, Response } from 'express';
 import { removeUndefined } from '../../utils/parserUtils.js';
 import { failEmptyObjects } from '../../utils/routerUtils.js';
 import { editCurrentProjectData } from '../../services/project-service/ProjectService.js';
-import * as projectDao from './project.dao.js';
+import * as projectDao from './projectData.dao.js';
 
 export function getProjectData(_req: Request, res: Response<ProjectData>) {
   res.json(projectDao.getProjectData());
diff --git a/apps/server/src/api-data/project/project.dao.ts b/apps/server/src/api-data/project-data/projectData.dao.ts
similarity index 99%
rename from apps/server/src/api-data/project/project.dao.ts
rename to apps/server/src/api-data/project-data/projectData.dao.ts
index 6a06885b5..ee05557df 100644
--- a/apps/server/src/api-data/project/project.dao.ts
+++ b/apps/server/src/api-data/project-data/projectData.dao.ts
@@ -1,4 +1,5 @@
 import { ProjectData } from 'ontime-types';
+
 import { getDataProvider } from '../../classes/data-provider/DataProvider.js';
 
 /**
diff --git a/apps/server/src/api-data/project-data/projectData.parser.ts b/apps/server/src/api-data/project-data/projectData.parser.ts
new file mode 100644
index 000000000..380702679
--- /dev/null
+++ b/apps/server/src/api-data/project-data/projectData.parser.ts
@@ -0,0 +1,27 @@
+import { DatabaseModel, ProjectData } from 'ontime-types';
+
+import { dbModel } from '../../models/dataModel.js';
+import { ErrorEmitter } from '../../utils/parserUtils.js';
+
+/**
+ * Parse event portion of an entry
+ */
+export function parseProjectData(data: Partial<DatabaseModel>, emitError?: ErrorEmitter): ProjectData {
+  if (!data.project) {
+    emitError?.('No data found to import');
+    return { ...dbModel.project };
+  }
+
+  console.log('Found project data, importing...');
+
+  return {
+    title: data.project.title ?? dbModel.project.title,
+    description: data.project.description ?? dbModel.project.description,
+    publicUrl: data.project.publicUrl ?? dbModel.project.publicUrl,
+    publicInfo: data.project.publicInfo ?? dbModel.project.publicInfo,
+    backstageUrl: data.project.backstageUrl ?? dbModel.project.backstageUrl,
+    backstageInfo: data.project.backstageInfo ?? dbModel.project.backstageInfo,
+    projectLogo: data.project.projectLogo ?? dbModel.project.projectLogo,
+    custom: data.project.custom ?? dbModel.project.custom,
+  };
+}
diff --git a/apps/server/src/api-data/project/project.router.ts b/apps/server/src/api-data/project-data/projectData.router.ts
similarity index 70%
rename from apps/server/src/api-data/project/project.router.ts
rename to apps/server/src/api-data/project-data/projectData.router.ts
index 5c725e96c..513b79a94 100644
--- a/apps/server/src/api-data/project/project.router.ts
+++ b/apps/server/src/api-data/project-data/projectData.router.ts
@@ -1,7 +1,7 @@
 import express from 'express';
 
-import { getProjectData, postProjectData } from './project.controller.js';
-import { projectSanitiser } from './project.validation.js';
+import { getProjectData, postProjectData } from './projectData.controller.js';
+import { projectSanitiser } from './projectData.validation.js';
 import { uploadImageFile } from '../db/db.middleware.js';
 import { postProjectLogo } from '../db/db.controller.js';
 
diff --git a/apps/server/src/api-data/project/project.validation.ts b/apps/server/src/api-data/project-data/projectData.validation.ts
similarity index 100%
rename from apps/server/src/api-data/project/project.validation.ts
rename to apps/server/src/api-data/project-data/projectData.validation.ts
diff --git a/apps/server/src/api-data/rundown/__mocks__/rundown.mocks.ts b/apps/server/src/api-data/rundown/__mocks__/rundown.mocks.ts
index 4598c3c23..6530aba0c 100644
--- a/apps/server/src/api-data/rundown/__mocks__/rundown.mocks.ts
+++ b/apps/server/src/api-data/rundown/__mocks__/rundown.mocks.ts
@@ -1,4 +1,5 @@
-import { SupportedEntry, OntimeEvent, OntimeDelay, OntimeBlock, Rundown } from 'ontime-types';
+import { SupportedEntry, OntimeEvent, OntimeDelay, OntimeBlock, Rundown, CustomField } from 'ontime-types';
+
 import { defaultRundown } from '../../../models/dataModel.js';
 
 const baseEvent = {
@@ -46,6 +47,15 @@ export function makeRundown(patch: Partial<Rundown>): Rundown {
   };
 }
 
+export function makeCustomField(patch: Partial<CustomField>): CustomField {
+  return {
+    type: 'string',
+    colour: '#000000',
+    label: 'Custom Field',
+    ...patch,
+  };
+}
+
 /**
  * Utility to generate a rundown of OntimeEvents form partial objects
  */
diff --git a/apps/server/src/api-data/rundown/__tests__/rundown.dao.test.ts b/apps/server/src/api-data/rundown/__tests__/rundown.dao.test.ts
index 8373f2fa9..b95c0e0aa 100644
--- a/apps/server/src/api-data/rundown/__tests__/rundown.dao.test.ts
+++ b/apps/server/src/api-data/rundown/__tests__/rundown.dao.test.ts
@@ -1,18 +1,35 @@
 import { CustomFields, OntimeBlock, OntimeDelay, OntimeEvent, SupportedEntry, TimeStrategy } from 'ontime-types';
 import { dayInMs, MILLIS_PER_HOUR, MILLIS_PER_MINUTE } from 'ontime-utils';
 
-import { makeOntimeEvent, makeRundown, makeOntimeBlock, makeOntimeDelay } from '../__mocks__/rundown.mocks.js';
+import {
+  makeOntimeEvent,
+  makeRundown,
+  makeOntimeBlock,
+  makeOntimeDelay,
+  makeCustomField,
+} from '../__mocks__/rundown.mocks.js';
 
-import { createTransaction, processRundown, rundownCache, rundownMutation } from '../rundown.dao.js';
+import {
+  createTransaction,
+  customFieldMutation,
+  processRundown,
+  rundownCache,
+  rundownMutation,
+} from '../rundown.dao.js';
 import { demoDb } from '../../../models/demoProject.js';
-import { ProcessedRundownMetadata } from '../../../services/rundown-service/rundownCache.utils.js';
+import type { AssignedMap } from '../rundown.types.js';
+import { type ProcessedRundownMetadata } from '../rundown.parser.js';
+
+const setRundownMock = vi.fn();
+const setCustomFieldsMock = vi.fn();
 
 beforeAll(() => {
   vi.mock('../../../classes/data-provider/DataProvider.js', () => {
     return {
       getDataProvider: vi.fn().mockImplementation(() => {
         return {
-          setRundown: vi.fn().mockImplementation(() => undefined),
+          setRundown: setRundownMock,
+          setCustomFields: setCustomFieldsMock,
         };
       }),
     };
@@ -24,17 +41,39 @@ afterAll(() => {
 });
 
 describe('createTransaction', () => {
-  it('should return a snapshot of the cached rundown and an commit function', () => {
-    const { rundown, commit } = createTransaction();
+  beforeEach(() => {
+    vi.useFakeTimers({ shouldAdvanceTime: true });
+  });
+
+  afterEach(() => {
+    vi.runOnlyPendingTimers();
+    vi.useRealTimers();
+  });
+
+  it('should return a snapshot of the cached data and an commit function', () => {
+    const { rundown, customFields, commit } = createTransaction({ mutableRundown: true, mutableCustomFields: true });
     expect(rundown).toBeDefined();
+    expect(customFields).toBeDefined();
     expect(typeof commit).toBe('function');
   });
 
-  it('should return the updated rundown after commit is called and update the db', () => {
-    const { rundown, commit } = createTransaction();
+  it('should return the updated data after commit is called and writes are scheduled', () => {
+    const { rundown, customFields, commit } = createTransaction({ mutableRundown: true, mutableCustomFields: true });
     rundown.title = 'Another Title';
+    customFields['newField'] = {
+      label: 'New Field',
+      type: 'string',
+      colour: 'blue',
+    };
+
     const updated = commit();
+    vi.runAllTimers();
+
     expect(updated.rundown.title).toBe('Another Title');
+    expect(updated.customFields).toHaveProperty('newField');
+
+    expect(setRundownMock).toHaveBeenCalledOnce();
+    expect(setCustomFieldsMock).toHaveBeenCalledOnce();
   });
 });
 
@@ -1568,3 +1607,119 @@ describe('rundownMutation.ungroup()', () => {
     });
   });
 });
+
+describe('customFieldMutation.add()', () => {
+  it('adds a custom field given object', () => {
+    const customFields = {
+      one: makeCustomField({ label: 'one' }),
+    };
+
+    customFieldMutation.add(customFields, 'two', makeCustomField({ label: 'two' }));
+
+    expect(customFields).toMatchObject({
+      one: { label: 'one' },
+      two: { label: 'two' },
+    });
+  });
+});
+
+describe('customFieldMutation.edit()', () => {
+  it('changes properties of an existing custom field', () => {
+    const customFields = {
+      one: makeCustomField({ label: 'one', colour: 'blue' }),
+    };
+
+    customFieldMutation.edit(customFields, 'one', customFields.one, { colour: 'red' });
+
+    expect(customFields).toMatchObject({
+      one: { label: 'one', colour: 'red' },
+    });
+  });
+
+  it('changing the label makes a new key', () => {
+    const customFields = {
+      one: makeCustomField({ label: 'one', colour: 'blue' }),
+    };
+
+    const { oldKey, newKey } = customFieldMutation.edit(customFields, 'one', customFields.one, {
+      label: 'two',
+      colour: 'red',
+    });
+
+    expect(oldKey).toBe('one');
+    expect(newKey).not.toEqual(oldKey);
+
+    expect(customFields).toMatchObject({
+      [oldKey]: { label: 'one', colour: 'blue' },
+      [newKey]: { label: 'two', colour: 'red' },
+    });
+  });
+});
+
+describe('customFieldMutation.remove()', () => {
+  it('deletes a custom field from the object', () => {
+    const customFields = {
+      one: makeCustomField({ label: 'one', colour: 'blue' }),
+    };
+
+    customFieldMutation.remove(customFields, 'one');
+
+    expect(customFields).not.toHaveProperty('one');
+  });
+});
+
+describe('customFieldMutation.renameUsages()', () => {
+  it('renames all custom field entries in a given rundown', () => {
+    const rundown = makeRundown({
+      order: ['1', '2', '3'],
+      entries: {
+        '1': makeOntimeEvent({ id: '1', custom: { one: 'value1' } }),
+        '2': makeOntimeEvent({ id: '2', custom: { one: 'value2' } }),
+        '3': makeOntimeEvent({ id: '3', custom: { two: 'value3' } }),
+      },
+    });
+
+    const assigned: AssignedMap = {
+      one: ['1', '2'],
+      two: ['3'],
+    };
+
+    customFieldMutation.renameUsages(rundown, assigned, 'one', 'new-one');
+    expect(rundown.entries).toMatchObject({
+      '1': { id: '1', custom: { 'new-one': 'value1' } },
+      '2': { id: '2', custom: { 'new-one': 'value2' } },
+      '3': { id: '3', custom: { two: 'value3' } },
+    });
+
+    expect(assigned).toStrictEqual({
+      'new-one': ['1', '2'],
+      two: ['3'],
+    });
+  });
+});
+
+describe('customFieldMutation.removeUsages()', () => {
+  it('deletes all custom field entries in a given rundown', () => {
+    const rundown = makeRundown({
+      order: ['1', '2', '3'],
+      entries: {
+        '1': makeOntimeEvent({ id: '1', custom: { one: 'value1' } }),
+        '2': makeOntimeEvent({ id: '2', custom: { one: 'value2' } }),
+        '3': makeOntimeEvent({ id: '3', custom: { two: 'value3' } }),
+      },
+    });
+
+    const assigned: AssignedMap = {
+      one: ['1', '2'],
+      two: ['3'],
+    };
+
+    customFieldMutation.removeUsages(rundown, assigned, 'one');
+    expect((rundown.entries['1'] as OntimeEvent).custom).not.toHaveProperty('one');
+    expect((rundown.entries['2'] as OntimeEvent).custom).not.toHaveProperty('one');
+
+    expect(assigned).toStrictEqual({
+      two: ['3'],
+    });
+  });
+});
diff --git a/apps/server/src/api-data/rundown/__tests__/rundown.parser.test.ts b/apps/server/src/api-data/rundown/__tests__/rundown.parser.test.ts
index abb672e34..1930bbeea 100644
--- a/apps/server/src/api-data/rundown/__tests__/rundown.parser.test.ts
+++ b/apps/server/src/api-data/rundown/__tests__/rundown.parser.test.ts
@@ -1,19 +1,18 @@
-import { SupportedEntry, OntimeEvent, OntimeBlock, Rundown } from 'ontime-types';
+import { SupportedEntry, OntimeEvent, OntimeBlock, Rundown, CustomFields } from 'ontime-types';
 
 import { defaultRundown } from '../../../models/dataModel.js';
 import { makeOntimeBlock, makeOntimeEvent } from '../__mocks__/rundown.mocks.js';
 
-import { parseRundowns, parseRundown } from '../rundown.parser.js';
+import { parseRundowns, parseRundown, handleCustomField, addToCustomAssignment } from '../rundown.parser.js';
 
 describe('parseRundowns()', () => {
   it('returns a default project rundown if nothing is given', () => {
     const errorEmitter = vi.fn();
-    const result = parseRundowns({}, errorEmitter);
-    expect(result.customFields).toEqual({});
-    expect(result.rundowns).toStrictEqual({ default: defaultRundown });
+    const result = parseRundowns({}, {}, errorEmitter);
+    expect(result).toStrictEqual({ default: defaultRundown });
     // one for not having custom fields
     // one for not having a rundown
-    expect(errorEmitter).toHaveBeenCalledTimes(2);
+    expect(errorEmitter).toHaveBeenCalledTimes(1);
   });
 
   it('ensures the rundown IDs are consistent', () => {
@@ -27,14 +26,14 @@ describe('parseRundowns()', () => {
           '3': r2,
         },
       },
+      {},
       errorEmitter,
     );
-    expect(result.rundowns).toMatchObject({
+    expect(result).toMatchObject({
       '1': r1,
       '2': r2,
     });
-    // one for not having a rundown
-    expect(errorEmitter).toHaveBeenCalledTimes(1);
+    expect(errorEmitter).toHaveBeenCalledTimes(0);
   });
 });
 
@@ -183,6 +182,37 @@ describe('parseRundown()', () => {
     expect(Object.keys(parsedRundown.entries).length).toEqual(2);
   });
 
+  it('parses customFields', () => {
+    const rundown = {
+      id: 'test',
+      title: '',
+      order: ['1', '2'],
+      flatOrder: ['1', '2'],
+      entries: {
+        '1': makeOntimeEvent({ id: '1', custom: { lighting: 'on' } }),
+        '2': makeOntimeEvent({ id: '2', custom: { sound: 'loud' } }),
+      },
+      revision: 1,
+    } as Rundown;
+
+    const customFields: CustomFields = {
+      lighting: {
+        type: 'string',
+        colour: 'red',
+        label: 'lighting',
+      },
+      sound: {
+        type: 'string',
+        colour: 'red',
+        label: 'sound',
+      },
+    };
+
+    const parsedRundown = parseRundown(rundown, customFields);
+    expect((parsedRundown.entries['1'] as OntimeEvent).custom).toStrictEqual({ lighting: 'on' });
+    expect((parsedRundown.entries['2'] as OntimeEvent).custom).toStrictEqual({ sound: 'loud' });
+  });
+
   it('parses events nested in blocks', () => {
     const rundown = {
       id: 'test',
@@ -203,3 +233,50 @@ describe('parseRundown()', () => {
     expect(Object.keys(parsedRundown.entries).length).toEqual(3);
   });
 });
+
+describe('addToCustomAssignment()', () => {
+  it('adds given entry to assignedCustomFields', () => {
+    const assignedCustomFields = {};
+
+    addToCustomAssignment('label1', 'eventId 1', assignedCustomFields);
+    expect(assignedCustomFields).toStrictEqual({ label1: ['eventId 1'] });
+
+    addToCustomAssignment('label1', 'eventId 2', assignedCustomFields);
+    expect(assignedCustomFields).toStrictEqual({ label1: ['eventId 1', 'eventId 2'] });
+  });
+});
+
+describe('handleCustomField()', () => {
+  it('creates a map of where custom fields are used', () => {
+    const customFields = {
+      lighting: {
+        type: 'string',
+        colour: 'red',
+        label: 'lighting',
+      },
+      sound: {
+        type: 'string',
+        colour: 'red',
+        label: 'sound',
+      },
+    } as CustomFields;
+
+    const event = makeOntimeEvent({
+      type: SupportedEntry.Event,
+      id: '2',
+      timeStart: 0,
+      linkStart: true,
+      custom: {
+        lighting: 'on',
+      },
+    });
+    const assignedCustomFields = {};
+
+    const result = handleCustomField(customFields, event, assignedCustomFields);
+    expect(result).toBeUndefined();
+    expect(assignedCustomFields).toStrictEqual({ lighting: ['2'] });
+    expect(event.custom).toStrictEqual({
+      lighting: 'on',
+    });
+  });
+});
diff --git a/apps/server/src/api-data/rundown/__tests__/rundown.utils.test.ts b/apps/server/src/api-data/rundown/__tests__/rundown.utils.test.ts
index fa2d59cbf..496b71092 100644
--- a/apps/server/src/api-data/rundown/__tests__/rundown.utils.test.ts
+++ b/apps/server/src/api-data/rundown/__tests__/rundown.utils.test.ts
@@ -1,8 +1,10 @@
 import { TimeStrategy, EndAction, TimerType, OntimeEvent } from 'ontime-types';
+import { MILLIS_PER_HOUR } from 'ontime-utils';
 
 import { assertType } from 'vitest';
 
-import { createEvent, deleteById, doesInvalidateMetadata, hasChanges } from '../rundown.utils.js';
+import { calculateDayOffset, createEvent, deleteById, doesInvalidateMetadata, getInsertAfterId, hasChanges } from '../rundown.utils.js';
+import { makeRundown } from '../__mocks__/rundown.mocks.js';
 
 describe('test event validator', () => {
   it('validates a good object', () => {
@@ -130,7 +132,7 @@ describe('hasChanges()', () => {
   });
 });
 
-describe('deleteById', () => {
+describe('deleteById()', () => {
   it('should delete the first instance of the specified ID from the array', () => {
     const array = ['id1', 'id2', 'id3', 'id4'];
     const result = deleteById(array, 'id2');
@@ -156,3 +158,83 @@ describe('deleteById', () => {
     expect(result).toStrictEqual(['id1', 'id2', 'id3']);
   });
 });
+
+describe('calculateDayOffset()', () => {
+  it('returns 0 if there is no previous event', () => {
+    expect(calculateDayOffset({ timeStart: 0 }, null)).toBe(0);
+  });
+
+  it('returns 0 if the previous event duration is 0', () => {
+    expect(calculateDayOffset({ timeStart: 0 }, { timeStart: 0, duration: 0 })).toBe(0);
+  });
+
+  it('returns 0 if event starts after previous', () => {
+    expect(calculateDayOffset({ timeStart: 11 }, { timeStart: 10, duration: 2 })).toBe(0);
+  });
+
+  it('returns 1 if event starts before previous', () => {
+    expect(calculateDayOffset({ timeStart: 9 }, { timeStart: 10, duration: 2 })).toBe(1);
+  });
+
+  it('returns 1 if event starts at the same time as one before', () => {
+    expect(calculateDayOffset({ timeStart: 10 }, { timeStart: 10, duration: 2 })).toBe(1);
+  });
+
+  it('should account for an event that crossed midnight and there is a overlap', () => {
+    expect(
+      calculateDayOffset(
+        { timeStart: MILLIS_PER_HOUR }, // starts at 01:00:00
+        { timeStart: 20 * MILLIS_PER_HOUR, duration: 6 * MILLIS_PER_HOUR }, // ends at 02:00:00
+      ),
+    ).toBe(1);
+  });
+
+  it('should account for an event that crossed midnight and there is a gap', () => {
+    expect(
+      calculateDayOffset(
+        { timeStart: 2 * MILLIS_PER_HOUR }, // starts at 02:00:00
+        { timeStart: 23 * MILLIS_PER_HOUR, duration: 2 * MILLIS_PER_HOUR }, // ends at 01:00:00
+      ),
+    ).toBe(1);
+  });
+
+  it('should account for an event that crossed midnight with no overlaps or gaps', () => {
+    expect(
+      calculateDayOffset(
+        { timeStart: 2 * MILLIS_PER_HOUR }, // starts at 02:00:00
+        { timeStart: 20 * MILLIS_PER_HOUR, duration: 6 * MILLIS_PER_HOUR }, // ends at 02:00:00
+      ),
+    ).toBe(1);
+  });
+
+  it('should account for an event that finishes exactly at midnight', () => {
+    expect(
+      calculateDayOffset(
+        { timeStart: 2 * MILLIS_PER_HOUR }, // starts at 02:00:00
+        { timeStart: 23 * MILLIS_PER_HOUR, duration: 6 * MILLIS_PER_HOUR }, // ends at 24:00:00
+      ),
+    ).toBe(1);
+  });
+});
+
+describe('getInsertAfterId()', () => {
+  const rundown = makeRundown({
+    flatOrder: ['a', 'b', 'c', 'd'],
+  });
+
+  it('returns afterId if provided', () => {
+    expect(getInsertAfterId(rundown, 'b')).toBe('b');
+  });
+
+  it('returns the previous id before beforeId if provided', () => {
+    expect(getInsertAfterId(rundown, undefined, 'c')).toBe('b');
+  });
+
+  it('returns undefined if neither afterId nor beforeId is provided', () => {
+    expect(getInsertAfterId(rundown)).toBeNull();
+  });
+
+  it('returns undefined if beforeId is not found', () => {
+    expect(getInsertAfterId(rundown, undefined, 'z')).toBeNull();
+  });
+});
diff --git a/apps/server/src/api-data/rundown/rundown.dao.ts b/apps/server/src/api-data/rundown/rundown.dao.ts
index c279480dc..9dfafdacb 100644
--- a/apps/server/src/api-data/rundown/rundown.dao.ts
+++ b/apps/server/src/api-data/rundown/rundown.dao.ts
@@ -11,6 +11,8 @@
  */
 
 import {
+  CustomField,
+  CustomFieldKey,
   CustomFields,
   EntryId,
   isOntimeBlock,
@@ -23,13 +25,11 @@ import {
   PatchWithId,
   Rundown,
 } from 'ontime-types';
-import { insertAtIndex } from 'ontime-utils';
+import { customFieldLabelToKey, insertAtIndex } from 'ontime-utils';
 
-import { makeRundownMetadata, ProcessedRundownMetadata } from '../../services/rundown-service/rundownCache.utils.js';
-import { customFieldChangelog } from '../../services/rundown-service/rundownCache.js';
 import { getDataProvider } from '../../classes/data-provider/DataProvider.js';
 
-import type { RundownMetadata } from './rundown.types.js';
+import type { AssignedMap, CustomFieldsMetadata, RundownMetadata } from './rundown.types.js';
 import {
   applyPatchToEntry,
   cloneBlock,
@@ -39,6 +39,7 @@ import {
   doesInvalidateMetadata,
   getUniqueId,
 } from './rundown.utils.js';
+import { makeRundownMetadata, ProcessedRundownMetadata } from './rundown.parser.js';
 
 /**
  * The currently loaded rundown in cache
@@ -62,8 +63,15 @@ let rundownMetadata: RundownMetadata = {
   playableEventOrder: [],
   timedEventOrder: [],
   flatEntryOrder: [],
+};
 
-  assignedCustomFields: {},
+const customFieldsMetadata: CustomFieldsMetadata = {
+  /**
+   * Keep track of which custom fields are used.
+   * This will be handy for when we delete custom fields
+   * since we can clear the custom fields from every event where they are used
+   */
+  assigned: {},
 };
 
 /**
@@ -73,47 +81,103 @@ let rundownMetadata: RundownMetadata = {
 let projectCustomFields: CustomFields = {};
 
 export const getCurrentRundown = (): Readonly<Rundown> => cachedRundown;
+export const getRundownMetadata = (): Readonly<RundownMetadata> => rundownMetadata;
 export const getProjectCustomFields = (): Readonly<CustomFields> => projectCustomFields;
+export const getEntryWithId = (entryId: EntryId): OntimeEntry | undefined => cachedRundown.entries[entryId];
 
-export function createTransaction() {
-  const rundown = structuredClone(cachedRundown);
-  const customFields = projectCustomFields;
+type Transaction = {
+  customFields: CustomFields;
+  customFieldsMetadata: Readonly<CustomFieldsMetadata>;
+  rundown: Rundown;
+  rundownMetadata: Readonly<RundownMetadata>;
 
+  commit: (shouldProcess?: boolean) => {
+    rundown: Readonly<Rundown>;
+    rundownMetadata: Readonly<RundownMetadata>;
+    customFields: Readonly<CustomFields>;
+    revision: Readonly<number>;
+  };
+};
+
+type TransactionOptions = {
+  mutableRundown?: boolean;
+  mutableCustomFields?: boolean;
+};
+
+export function createTransaction(options: TransactionOptions): Transaction {
+  const rundown = options.mutableRundown ? structuredClone(cachedRundown) : cachedRundown;
+  const customFields = options.mutableCustomFields ? structuredClone(projectCustomFields) : projectCustomFields;
+
+  /**
+   * Applies a mutated rundown to the cache
+   * @param shouldProcess - whether the rundown should be processed after the commit
+   *                        Some edit mutations, and custom field changes do not require processing
+   */
   function commit(shouldProcess: boolean = true) {
-    // schedule a database update
-    setImmediate(async () => {
-      await getDataProvider().setRundown(cachedRundown.id, cachedRundown);
-    });
+    // if the rundown is mutable we persist the changes
+    if (options.mutableRundown) {
+      // schedule a database update
+      setImmediate(async () => {
+        await getDataProvider().setRundown(cachedRundown.id, cachedRundown);
+      });
 
-    const revision = rundown.revision + 1;
-    cachedRundown.revision = revision;
+      // increment the revision number
+      cachedRundown.revision = cachedRundown.revision + 1;
 
-    /**
-     * Some mutations do not require processing the rundown
-     * We simply increment the revision and return the rundown
-     */
-    if (!shouldProcess) {
-      cachedRundown.entries = rundown.entries;
-      cachedRundown.order = rundown.order;
-      cachedRundown.flatOrder = rundown.flatOrder;
-      return { rundown, rundownMetadata, customFields: projectCustomFields, revision: cachedRundown.revision };
+      /**
+       * Some mutations do not require processing the rundown
+       * We simply increment the revision and return the rundown
+       */
+      if (!shouldProcess) {
+        cachedRundown.title = rundown.title;
+        cachedRundown.entries = rundown.entries;
+        cachedRundown.order = rundown.order;
+        cachedRundown.flatOrder = rundown.flatOrder;
+        return {
+          rundown: cachedRundown,
+          rundownMetadata, // metadata doesnt change as long as we dont process the rundown
+          customFields: projectCustomFields,
+          revision: cachedRundown.revision,
+        };
+      }
+
+      const processedData = processRundown(rundown, projectCustomFields);
+      // update the cache values
+      // eslint-disable-next-line @typescript-eslint/no-unused-vars -- we are not interested in the iteration data
+      const { previousEvent, latestEvent, previousEntry, entries, order, assignedCustomFields, ...metadata } =
+        processedData;
+
+      cachedRundown.title = rundown.title;
+      cachedRundown.entries = entries;
+      cachedRundown.order = order;
+      cachedRundown.flatOrder = metadata.flatEntryOrder; // TODO: remove in favour of the metadata flatEntryOrder
+      customFieldsMetadata.assigned = assignedCustomFields;
+      rundownMetadata = metadata;
     }
 
-    const processedData = processRundown(rundown, projectCustomFields);
-    // update the cache values
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars -- we are not interested in the iteration data
-    const { previousEvent, latestEvent, previousEntry, entries, order, ...metadata } = processedData;
-    cachedRundown.entries = entries;
-    cachedRundown.order = order;
-    cachedRundown.flatOrder = metadata.flatEntryOrder; // TODO: remove in favour of the metadata flatEntryOrder
-    rundownMetadata = metadata;
+    // if the customFields are mutable we persist the changes
+    if (options.mutableCustomFields) {
+      // schedule a database update
+      setImmediate(async () => {
+        await getDataProvider().setCustomFields(projectCustomFields);
+      });
 
-    return { rundown, rundownMetadata, customFields: projectCustomFields, revision: cachedRundown.revision };
+      projectCustomFields = customFields;
+    }
+
+    return {
+      rundown: cachedRundown,
+      rundownMetadata,
+      customFields: projectCustomFields,
+      revision: cachedRundown.revision,
+    };
   }
 
   return {
     customFields,
+    customFieldsMetadata,
     rundown,
+    rundownMetadata,
     commit,
   };
 }
@@ -329,7 +393,7 @@ function applyDelay(rundown: Rundown, delay: OntimeDelay) {
 /**
  * Swaps the data between two events
  * The schedule and metadata are preserved
- * TODO: this logic is for now duplcate of Ontime-Utils.swapEventData
+ * TODO: this logic is for now duplicate of Ontime-Utils.swapEventData
  */
 function swap(rundown: Rundown, eventFrom: OntimeEvent, eventTo: OntimeEvent) {
   rundown.entries[eventFrom.id] = {
@@ -484,6 +548,100 @@ export const rundownMutation = {
   ungroup,
 };
 
+/**
+ * Adds a new custom field to the object and returns it
+ */
+function customFieldAdd(customFields: CustomFields, key: CustomFieldKey, newCustomField: CustomField): CustomFields {
+  customFields[key] = {
+    label: newCustomField.label,
+    type: newCustomField.type,
+    colour: newCustomField.colour,
+  };
+
+  return { [key]: newCustomField };
+}
+
+/**
+ * Edits an existing custom field
+ */
+function customFieldEdit(
+  customFields: CustomFields,
+  key: CustomFieldKey,
+  existingField: CustomField,
+  newField: Partial<CustomField>,
+): { oldKey: CustomFieldKey; newKey: CustomFieldKey } {
+  // calculate the key in case it has changed
+  const newKey = newField?.label ? customFieldLabelToKey(newField.label ?? key) : key;
+
+  // patch the new field and replace the reference in the object
+  customFields[newKey] = { ...existingField, ...newField };
+
+  return { oldKey: key, newKey };
+}
+
+/**
+ * Removes a custom field from the object
+ */
+function customFieldRemove(customFields: CustomFields, key: CustomFieldKey) {
+  delete customFields[key];
+}
+
+/**
+ * Renames a custom field key in all the rundown entries that use it
+ */
+function customFieldRenameUsages(
+  rundown: Rundown,
+  assigned: AssignedMap,
+  oldKey: CustomFieldKey,
+  newKey: CustomFieldKey,
+) {
+  const usages = assigned[oldKey];
+
+  // iterate through all the entries that use the custom field
+  for (let i = 0; i < usages.length; i++) {
+    const entryId = usages[i];
+    const entry = rundown.entries[entryId] as OntimeEvent;
+
+    // copy the data a new key and delete the old key
+    entry.custom[newKey] = entry.custom[oldKey];
+    delete entry.custom[oldKey];
+  }
+
+  // update assignment
+  assigned[newKey] = [...assigned[oldKey]];
+  delete assigned[oldKey];
+}
+
+/**
+ * Deletes data for a custom field from all the entries that use it
+ */
+function customFieldRemoveUsages(rundown: Rundown, assigned: AssignedMap, key: CustomFieldKey) {
+  const usages = assigned[key];
+  if (!usages) {
+    return;
+  }
+
+  // iterate through all the entries that use the custom field
+  for (let i = 0; i < usages.length; i++) {
+    const entryId = usages[i];
+    const entry = rundown.entries[entryId] as OntimeEvent;
+
+    // delete the custom field entry
+    delete entry.custom[key];
+  }
+
+  // update assignment
+  delete assigned[key];
+}
+
+export const customFieldMutation = {
+  add: customFieldAdd,
+  edit: customFieldEdit,
+  remove: customFieldRemove,
+  renameUsages: customFieldRenameUsages,
+  removeUsages: customFieldRemoveUsages,
+};
+
 /**
  * Expose function to add an initial rundown to the system
  */
@@ -498,11 +656,13 @@ export function init(initialRundown: Readonly<Rundown>, initialCustomFields: Rea
   projectCustomFields = customFields;
 
   // eslint-disable-next-line @typescript-eslint/no-unused-vars -- we are not interested in the iteration data
-  const { previousEvent, latestEvent, previousEntry, entries, order, ...metadata } = processedData;
+  const { previousEvent, latestEvent, previousEntry, entries, order, assignedCustomFields, ...metadata } =
+    processedData;
   cachedRundown.entries = entries;
   cachedRundown.order = order;
   cachedRundown.flatOrder = metadata.flatEntryOrder; // TODO: remove in favour of the metadata flatEntryOrder
   cachedRundown.revision = rundown.revision;
+  customFieldsMetadata.assigned = assignedCustomFields;
   rundownMetadata = metadata;
 
   // defer writing to the database
@@ -533,7 +693,7 @@ export function processRundown(
   initialRundown: Readonly<Rundown>,
   customFields: Readonly<CustomFields>,
 ): ProcessedRundownMetadata {
-  const { process, getMetadata } = makeRundownMetadata(customFields, customFieldChangelog);
+  const { process, getMetadata } = makeRundownMetadata(customFields);
 
   for (let i = 0; i < initialRundown.order.length; i++) {
     // we assign a reference to the current entry, this will be mutated in place
diff --git a/apps/server/src/api-data/rundown/rundown.parser.ts b/apps/server/src/api-data/rundown/rundown.parser.ts
index 70e4fe8d4..5b949abc9 100644
--- a/apps/server/src/api-data/rundown/rundown.parser.ts
+++ b/apps/server/src/api-data/rundown/rundown.parser.ts
@@ -9,15 +9,21 @@ import {
   isOntimeEvent,
   isOntimeDelay,
   isOntimeBlock,
+  CustomFieldKey,
+  EntryId,
+  OntimeEntry,
+  PlayableEvent,
+  RundownEntries,
+  isPlayableEvent,
 } from 'ontime-types';
-import { isObjectEmpty, generateId } from 'ontime-utils';
+import { isObjectEmpty, generateId, getLinkedTimes, getTimeFrom, isNewLatest } from 'ontime-utils';
 
 import { defaultRundown } from '../../models/dataModel.js';
 import { delay as delayDef, block as blockDef } from '../../models/eventsDefinition.js';
-import { ErrorEmitter } from '../../utils/parser.js';
-import { parseCustomFields } from '../../utils/parserFunctions.js';
+import type { ErrorEmitter } from '../../utils/parserUtils.js';
 
-import { createEvent } from './rundown.utils.js';
+import { calculateDayOffset, createEvent } from './rundown.utils.js';
+import { RundownMetadata } from './rundown.types.js';
 
 /**
  * Parse a rundowns object along with the project custom fields
@@ -25,21 +31,16 @@ import { createEvent } from './rundown.utils.js';
  */
 export function parseRundowns(
   data: Partial<DatabaseModel>,
+  parsedCustomFields: Readonly<CustomFields>,
   emitError?: ErrorEmitter,
-): { customFields: CustomFields; rundowns: ProjectRundowns } {
-  // check custom fields first
-  const parsedCustomFields = parseCustomFields(data, emitError);
-
+): ProjectRundowns {
   // ensure there is always a rundown to import
   // this is important since the rest of the app assumes this exist
   if (!data.rundowns || isObjectEmpty(data.rundowns)) {
     emitError?.('No data found to import');
     return {
-      customFields: parsedCustomFields,
-      rundowns: {
-        default: {
-          ...defaultRundown,
-        },
+      [defaultRundown.id]: {
+        ...defaultRundown,
       },
     };
   }
@@ -55,7 +56,7 @@ export function parseRundowns(
     parsedRundowns[parsedRundown.id] = parsedRundown;
   }
 
-  return { customFields: parsedCustomFields, rundowns: parsedRundowns };
+  return parsedRundowns;
 }
 
 /**
@@ -81,7 +82,7 @@ export function parseRundown(
     const entryId = rundown.order[i];
     const event = rundown.entries[entryId];
 
-    if (event === undefined) {
+    if (!event) {
       emitError?.('Could not find referenced event, skipping');
       continue;
     }
@@ -170,3 +171,195 @@ export function parseRundown(
   console.log(`Imported rundown ${parsedRundown.title} with ${parsedRundown.order.length} entries`);
   return parsedRundown;
 }
+
+/**
+ * Utility function to add an entry, mutates given assignedCustomFields in place
+ * @param label
+ * @param eventId
+ */
+export function addToCustomAssignment(
+  key: CustomFieldKey,
+  eventId: EntryId,
+  assignedCustomFields: Record<string, string[]>,
+) {
+  if (!Array.isArray(assignedCustomFields[key])) {
+    assignedCustomFields[key] = [];
+  }
+  assignedCustomFields[key].push(eventId);
+}
+
+/**
+ * Keeps track of which custom fields are assigned to which events
+ * Mutates the given assignedCustomFields in place
+ * If a field is referenced but is not in the customFields map, it is deleted
+ */
+export function handleCustomField(
+  customFields: CustomFields,
+  event: OntimeEvent,
+  assignedCustomFields: Record<CustomFieldKey, EntryId[]>,
+) {
+  for (const field in event.custom) {
+    if (field in customFields) {
+      // add field to assignment map
+      addToCustomAssignment(field, event.id, assignedCustomFields);
+    } else {
+      // delete data if it is not declared in project level custom fields
+      delete event.custom[field];
+    }
+  }
+}
+
+export type ProcessedRundownMetadata = RundownMetadata & {
+  entries: RundownEntries;
+  order: EntryId[];
+  previousEvent: PlayableEvent | null; // The playableEvent from the previous iteration
+  latestEvent: PlayableEvent | null; // The playableEvent most forwards in time processed so far
+  previousEntry: OntimeEntry | null; // The entry processed in the previous iteration
+  assignedCustomFields: Record<CustomFieldKey, string[]>; // Custom fields assigned to events
+};
+
+/**
+ * Factory function to create a rundown metadata processor
+ * @returns {process, getMetadata} process() - processes entries in order | getMetadata() -> returns the current metadata
+ */
+export function makeRundownMetadata(customFields: CustomFields) {
+  let rundownMeta: ProcessedRundownMetadata = {
+    totalDelay: 0,
+    totalDuration: 0,
+    totalDays: 0,
+    firstStart: null,
+    lastEnd: null,
+
+    assignedCustomFields: {},
+    playableEventOrder: [],
+    timedEventOrder: [],
+    flatEntryOrder: [],
+
+    entries: {},
+    order: [],
+    previousEvent: null,
+    latestEvent: null,
+    previousEntry: null,
+  };
+
+  function process<T extends OntimeEntry>(
+    entry: T,
+    childOfBlock: EntryId | null,
+  ): { processedData: ProcessedRundownMetadata; processedEntry: T } {
+    const data = processEntry(rundownMeta, customFields, entry, childOfBlock);
+    rundownMeta = data.processedData;
+    return data;
+  }
+
+  function getMetadata(): ProcessedRundownMetadata {
+    return rundownMeta;
+  }
+
+  return { process, getMetadata };
+}
+
+/**
+ * Processes a single entry and updates the rundown metadata
+ */
+function processEntry<T extends OntimeEntry>(
+  rundownMetadata: ProcessedRundownMetadata,
+  customFields: CustomFields,
+  entry: T,
+  childOfBlock: EntryId | null,
+): { processedData: ProcessedRundownMetadata; processedEntry: T } {
+  const processedData = { ...rundownMetadata };
+  const currentEntry = structuredClone(entry);
+  processedData.flatEntryOrder.push(currentEntry.id);
+
+  if (isOntimeEvent(currentEntry)) {
+    processedData.timedEventOrder.push(currentEntry.id);
+
+    /**
+     * 1.Checks that link can be established (ie, events exist and are valid)
+     * and populates the time data from link
+     * The linked event is always the previous playable event
+     * If no previous event exists, the link is removed
+     */
+    if (currentEntry.linkStart) {
+      if (processedData.previousEvent) {
+        const timePatch = getLinkedTimes(currentEntry, processedData.previousEvent);
+        currentEntry.timeStart = timePatch.timeStart;
+        currentEntry.timeEnd = timePatch.timeEnd;
+        currentEntry.duration = timePatch.duration;
+      } else {
+        currentEntry.linkStart = false;
+      }
+    }
+
+    // 2. handle custom fields - mutates currentEntry
+    handleCustomField(customFields, currentEntry, processedData.assignedCustomFields);
+
+    processedData.totalDays += calculateDayOffset(currentEntry, processedData.previousEvent);
+    currentEntry.dayOffset = processedData.totalDays;
+    currentEntry.delay = 0; // this means we dont calculate delays or gaps for skipped events
+    currentEntry.gap = 0; // this means we dont calculate delays or gaps for skipped events
+    currentEntry.parent = childOfBlock;
+
+    // update rundown metadata, it only concerns playable events
+    if (isPlayableEvent(currentEntry)) {
+      processedData.playableEventOrder.push(currentEntry.id);
+
+      // first start is always the first event
+      if (processedData.firstStart === null) {
+        processedData.firstStart = currentEntry.timeStart;
+      }
+
+      currentEntry.gap = getTimeFrom(currentEntry, processedData.latestEvent);
+
+      if (currentEntry.gap === 0) {
+        // event starts on previous finish, we add its duration
+        processedData.totalDuration += currentEntry.duration;
+      } else if (currentEntry.gap > 0) {
+        // event has a gap, we add the gap and the duration
+        processedData.totalDuration += currentEntry.gap + currentEntry.duration;
+      } else if (currentEntry.gap < 0) {
+        // there is an overlap, we remove the overlap from the duration
+        // ensuring that the sum is not negative (ie: fully overlapped events)
+        // NOTE: we add the gap since it is a negative number
+        processedData.totalDuration += Math.max(currentEntry.duration + currentEntry.gap, 0);
+      }
+
+      // remove eventual gaps from the accumulated delay
+      // we only affect positive delays (time forwards)
+      if (processedData.totalDelay > 0 && currentEntry.gap > 0) {
+        let correctedDelay = 0;
+        // we need to separate the delay that is accumulated from one that may exist after the gap
+        if (isOntimeDelay(processedData.previousEntry)) {
+          correctedDelay = processedData.previousEntry.duration;
+          processedData.totalDelay -= correctedDelay;
+        }
+        processedData.totalDelay = Math.max(processedData.totalDelay - currentEntry.gap, 0);
+        processedData.totalDelay += correctedDelay;
+      }
+
+      // current event delay is the current accumulated delay
+      currentEntry.delay = processedData.totalDelay;
+
+      // assign data for next iteration
+      processedData.previousEvent = currentEntry;
+
+      // lastEntry is the event with the latest end time
+      if (isNewLatest(currentEntry, processedData.latestEvent)) {
+        processedData.latestEvent = currentEntry;
+        processedData.lastEnd = currentEntry.timeEnd;
+      }
+    }
+  } else if (isOntimeDelay(currentEntry)) {
+    // !!! this must happen after handling the links
+    processedData.totalDelay += currentEntry.duration;
+    currentEntry.parent = childOfBlock;
+  }
+
+  if (!childOfBlock) {
+    processedData.order.push(currentEntry.id);
+  }
+  processedData.entries[currentEntry.id] = currentEntry;
+  processedData.previousEntry = currentEntry;
+
+  return { processedData, processedEntry: currentEntry };
+}
diff --git a/apps/server/src/api-data/rundown/rundown.service.ts b/apps/server/src/api-data/rundown/rundown.service.ts
index f40ba1c82..f86a47026 100644
--- a/apps/server/src/api-data/rundown/rundown.service.ts
+++ b/apps/server/src/api-data/rundown/rundown.service.ts
@@ -1,4 +1,6 @@
 import {
+  CustomField,
+  CustomFieldKey,
   CustomFields,
   EntryId,
   EventPostPayload,
@@ -9,21 +11,21 @@ import {
   PatchWithId,
   Rundown,
 } from 'ontime-types';
+import { customFieldLabelToKey } from 'ontime-utils';
 
-import { getPreviousId } from '../../services/rundown-service/rundownUtils.js';
 import { updateRundownData } from '../../stores/runtimeState.js';
 import { sendRefetch } from '../../adapters/websocketAux.js';
 import { runtimeService } from '../../services/runtime-service/RuntimeService.js';
 
-import { createTransaction, rundownCache, rundownMutation } from './rundown.dao.js';
-import { RundownMetadata } from './rundown.types.js';
-import { generateEvent, hasChanges } from './rundown.utils.js';
+import { createTransaction, customFieldMutation, rundownCache, rundownMutation } from './rundown.dao.js';
+import type { RundownMetadata } from './rundown.types.js';
+import { generateEvent, getInsertAfterId, hasChanges } from './rundown.utils.js';
 
 /**
  * creates a new entry with given data
  */
 export async function addEntry(eventData: EventPostPayload): Promise<OntimeEntry> {
-  const { rundown, commit } = createTransaction();
+  const { rundown, commit } = createTransaction({ mutableRundown: true, mutableCustomFields: false });
 
   // we allow the user to provide an ID, but make sure it is unique
   if (eventData?.id && Object.hasOwn(rundown.entries, eventData.id)) {
@@ -41,7 +43,7 @@ export async function addEntry(eventData: EventPostPayload): Promise<OntimeEntry
   }
 
   // normalise the position of the event in the rundown order
-  const afterId = getPreviousId(rundown, eventData?.after, eventData?.before);
+  const afterId = getInsertAfterId(rundown, eventData?.after, eventData?.before);
 
   // generate a fully formed entry from the patch
   const newEntry = generateEvent(rundown, eventData, afterId);
@@ -66,7 +68,7 @@ export async function addEntry(eventData: EventPostPayload): Promise<OntimeEntry
  * Applies a patch to an entry in the rundown
  */
 export async function editEntry(patch: PatchWithId): Promise<OntimeEntry> {
-  const { rundown, commit } = createTransaction();
+  const { rundown, commit } = createTransaction({ mutableRundown: true, mutableCustomFields: false });
   const currentEntry = rundown.entries[patch.id];
 
   /**
@@ -115,7 +117,7 @@ export async function editEntry(patch: PatchWithId): Promise<OntimeEntry> {
  * Applies a patch to several entries in the rundown
  */
 export async function batchEditEntries(ids: EntryId[], patch: Partial<OntimeEntry>): Promise<Rundown> {
-  const { rundown, commit } = createTransaction();
+  const { rundown, commit } = createTransaction({ mutableRundown: true, mutableCustomFields: false });
 
   /**
    * We can do some validation globally, but mostly we will validate each entry individually
@@ -179,7 +181,7 @@ export async function batchEditEntries(ids: EntryId[], patch: Partial<OntimeEntr
  * Deletes a known entry from the current rundown
  */
 export async function deleteEntries(entryIds: EntryId[]): Promise<Rundown> {
-  const { rundown, commit } = createTransaction();
+  const { rundown, commit } = createTransaction({ mutableRundown: true, mutableCustomFields: false });
 
   for (let i = 0; i < entryIds.length; i++) {
     const entry = rundown.entries[entryIds[i]];
@@ -207,7 +209,7 @@ export async function deleteEntries(entryIds: EntryId[]): Promise<Rundown> {
  * Deletes all entries from the current rundown
  */
 export async function deleteAllEntries(): Promise<Rundown> {
-  const { rundown, commit } = createTransaction();
+  const { rundown, commit } = createTransaction({ mutableRundown: true, mutableCustomFields: false });
 
   rundownMutation.removeAll(rundown);
 
@@ -231,7 +233,7 @@ export async function deleteAllEntries(): Promise<Rundown> {
  * @throws if entryId or destinationId not found
  */
 export function reorderEntry(entryId: EntryId, destinationId: EntryId, order: 'before' | 'after' | 'insert') {
-  const { rundown, commit } = createTransaction();
+  const { rundown, commit } = createTransaction({ mutableRundown: true, mutableCustomFields: false });
 
   // check that both entries exist
   const eventFrom = rundown.entries[entryId];
@@ -262,7 +264,7 @@ export function reorderEntry(entryId: EntryId, destinationId: EntryId, order: 'b
  * The applied delay is deleted
  */
 export async function applyDelay(delayId: EntryId): Promise<Rundown> {
-  const { rundown, commit } = createTransaction();
+  const { rundown, commit } = createTransaction({ mutableRundown: true, mutableCustomFields: false });
 
   // check that delay exists
   const delay = rundown.entries[delayId];
@@ -292,7 +294,7 @@ export async function applyDelay(delayId: EntryId): Promise<Rundown> {
  * Swaps the data between two events in the rundown
  */
 export async function swapEvents(fromId: EntryId, toId: EntryId): Promise<Rundown> {
-  const { rundown, commit } = createTransaction();
+  const { rundown, commit } = createTransaction({ mutableRundown: true, mutableCustomFields: false });
   const eventFrom = rundown.entries[fromId];
   const eventTo = rundown.entries[toId];
 
@@ -326,7 +328,7 @@ export async function swapEvents(fromId: EntryId, toId: EntryId): Promise<Rundow
  * @throws if the entry to clone does not exist
  */
 export async function cloneEntry(entryId: EntryId): Promise<Rundown> {
-  const { rundown, commit } = createTransaction();
+  const { rundown, commit } = createTransaction({ mutableRundown: true, mutableCustomFields: false });
   const originalEntry = rundown.entries[entryId];
 
   if (!originalEntry) {
@@ -359,7 +361,7 @@ export async function cloneEntry(entryId: EntryId): Promise<Rundown> {
  * Groups a list of entries into a new block
  */
 export async function groupEntries(entryIds: EntryId[]): Promise<Rundown> {
-  const { rundown, commit } = createTransaction();
+  const { rundown, commit } = createTransaction({ mutableRundown: true, mutableCustomFields: false });
 
   rundownMutation.group(rundown, entryIds);
   const { rundown: rundownResult, rundownMetadata, revision } = commit();
@@ -380,7 +382,7 @@ export async function groupEntries(entryIds: EntryId[]): Promise<Rundown> {
  * Deletes a block and moves all its children to the top level
  */
 export async function ungroupEntries(blockId: EntryId): Promise<Rundown> {
-  const { rundown, commit } = createTransaction();
+  const { rundown, commit } = createTransaction({ mutableRundown: true, mutableCustomFields: false });
 
   const block = rundown.entries[blockId];
   if (!block || !isOntimeBlock(block)) {
@@ -402,6 +404,106 @@ export async function ungroupEntries(blockId: EntryId): Promise<Rundown> {
   return rundownResult;
 }
 
+/**
+ * Adds a new custom field to the project
+ * @throws if the label is missing or invalid
+ */
+export async function createCustomField(customField: CustomField): Promise<CustomFields> {
+  const key = customFieldLabelToKey(customField.label);
+
+  if (!key) {
+    throw new Error('Unable to convert label to a valid key');
+  }
+
+  const { customFields, commit } = createTransaction({ mutableRundown: false, mutableCustomFields: true });
+
+  // check if label already exists
+  if (Object.hasOwn(customFields, key)) {
+    throw new Error('Label already exists');
+  }
+
+  customFieldMutation.add(customFields, key, customField);
+
+  // Adding a custom field has no immediate implications on the rundown
+  const { customFields: resultCustomFields } = commit(false);
+
+  // TODO: notify clients to refetch the custom fields
+
+  return resultCustomFields;
+}
+
+/**
+ * Edits an existing custom field
+ * In practice users can only change the label and the colour of the field
+ * @throws if the field does not exist
+ * @throws if the field type is changed
+ * @throws if the label is missing or invalid
+ * @throws if the new label already exists
+ */
+export async function editCustomField(key: CustomFieldKey, newField: Partial<CustomField>): Promise<CustomFields> {
+  const { customFields, customFieldsMetadata, rundown, commit } = createTransaction({
+    mutableRundown: true,
+    mutableCustomFields: true,
+  });
+
+  if (!(key in customFields)) {
+    throw new Error('Could not find label');
+  }
+
+  const existingField = customFields[key];
+  // if user provides a type, it must be the same from before
+  if (newField.type && existingField.type !== newField.type) {
+    throw new Error('Change of field type is not allowed');
+  }
+
+  const { oldKey, newKey } = customFieldMutation.edit(customFields, key, existingField, newField);
+
+  // if key has changed we remove the old reference
+  if (oldKey !== newKey && oldKey in customFieldsMetadata.assigned) {
+    customFieldMutation.renameUsages(rundown, customFieldsMetadata.assigned, oldKey, newKey);
+  }
+
+  // the custom fields have been removed and there is no processing to be done
+  const { rundownMetadata, revision, customFields: resultCustomFields } = commit(false);
+
+  // schedule the side effects
+  setImmediate(() => {
+    // TODO: notify clients to refetch the custom fields
+    notifyChanges(rundownMetadata, revision, { timer: true, external: true });
+  });
+
+  return resultCustomFields;
+}
+
+/**
+ * Deletes an existing custom field
+ */
+export async function deleteCustomField(key: CustomFieldKey): Promise<CustomFields> {
+  const { customFields, customFieldsMetadata, rundown, commit } = createTransaction({
+    mutableRundown: true,
+    mutableCustomFields: true,
+  });
+  if (!(key in customFields)) {
+    return customFields;
+  }
+
+  customFieldMutation.remove(customFields, key);
+  if (key in customFieldsMetadata.assigned) {
+    customFieldMutation.removeUsages(rundown, customFieldsMetadata.assigned, key);
+  }
+
+  // the custom fields have been removed and there is no processing to be done
+  const { rundownMetadata, revision, customFields: resultCustomFields } = commit(false);
+
+  // schedule the side effects
+  setImmediate(() => {
+    // TODO: notify clients to refetch the custom fields
+    notifyChanges(rundownMetadata, revision, { timer: true, external: true });
+  });
+
+  return resultCustomFields;
+}
+
 /**
  * Forces update in the store
  * Called when we make changes to the rundown object
diff --git a/apps/server/src/api-data/rundown/rundown.types.ts b/apps/server/src/api-data/rundown/rundown.types.ts
index 16b8930d1..cd2adcd22 100644
--- a/apps/server/src/api-data/rundown/rundown.types.ts
+++ b/apps/server/src/api-data/rundown/rundown.types.ts
@@ -1,4 +1,4 @@
-import { CustomFieldLabel, EntryId, MaybeNumber } from 'ontime-types';
+import { CustomFieldKey, EntryId, MaybeNumber } from 'ontime-types';
 
 export type RundownMetadata = {
   totalDelay: number;
@@ -10,11 +10,9 @@ export type RundownMetadata = {
   playableEventOrder: EntryId[]; // flat order of playable events
   timedEventOrder: EntryId[]; // flat order of timed events
   flatEntryOrder: EntryId[]; // flat order of entries
-
-  /**
-   * Keep track of which custom fields are used.
-   * This will be handy for when we delete custom fields
-   * since we can clear the custom fields from every event where they are used
-   */
-  assignedCustomFields: Record<CustomFieldLabel, string[]>;
+};
+
+export type AssignedMap = Record<CustomFieldKey, EntryId[]>;
+export type CustomFieldsMetadata = {
+  assigned: AssignedMap;
 };
diff --git a/apps/server/src/api-data/rundown/rundown.utils.ts b/apps/server/src/api-data/rundown/rundown.utils.ts
index 31f8a8e2d..c47eb44b1 100644
--- a/apps/server/src/api-data/rundown/rundown.utils.ts
+++ b/apps/server/src/api-data/rundown/rundown.utils.ts
@@ -12,7 +12,14 @@ import {
   SupportedEntry,
   TimeStrategy,
 } from 'ontime-types';
-import { generateId, getCueCandidate, validateEndAction, validateTimerType, validateTimes } from 'ontime-utils';
+import {
+  dayInMs,
+  generateId,
+  getCueCandidate,
+  validateEndAction,
+  validateTimerType,
+  validateTimes,
+} from 'ontime-utils';
 
 import { event as eventDef, block as blockDef, delay as delayDef } from '../../models/eventsDefinition.js';
 import { makeString } from '../../utils/parserUtils.js';
@@ -300,3 +307,54 @@ export function cloneEntry<T extends OntimeEntry>(entry: T, newId: EntryId): T {
   }
   throw new Error(`Unsupported entry type for cloning: ${entry}`);
 }
+
+/**
+ * Utility for calculating if the current events should have a day offset
+ * @param current the current event under test
+ * @param previous the previous event
+ * @returns 0 or 1 for easy accumulation with the total days
+ */
+export function calculateDayOffset(
+  current: Pick<OntimeEvent, 'timeStart'>,
+  previous: Pick<OntimeEvent, 'timeStart' | 'duration'> | null,
+) {
+  // if there is no previous there can't be a day offset
+  if (!previous) {
+    return 0;
+  }
+
+  // if the previous events duration is zero it will push the current event to next day
+  if (previous.duration === 0) {
+    return 0;
+  }
+
+  // if the previous event crossed midnight then the current event is in the next day
+  if (previous.timeStart + previous.duration >= dayInMs) {
+    return 1;
+  }
+
+  // if the current events starts at the same time or before the previous event then it is the next day
+  if (current.timeStart <= previous.timeStart) {
+    return 1;
+  }
+
+  return 0;
+}
+
+/**
+ * Receives an insertion order and returns the reference to an event ID
+ * after which we will insert the new event
+ */
+export function getInsertAfterId(rundown: Rundown, afterId?: EntryId, beforeId?: EntryId): EntryId | null {
+  if (afterId) {
+    return afterId;
+  }
+
+  if (beforeId) {
+    const atIndex = rundown.flatOrder.findIndex((id) => id === beforeId);
+    if (atIndex < 1) return null;
+    return rundown.flatOrder[atIndex - 1];
+  }
+
+  return null;
+}
diff --git a/apps/server/src/api-data/settings/__tests__/settings.parser.test.ts b/apps/server/src/api-data/settings/__tests__/settings.parser.test.ts
new file mode 100644
index 000000000..c247b30ed
--- /dev/null
+++ b/apps/server/src/api-data/settings/__tests__/settings.parser.test.ts
@@ -0,0 +1,22 @@
+import { Settings } from 'ontime-types';
+
+import { parseSettings } from '../settings.parser.js';
+
+describe('parseSettings()', () => {
+  it('throws if settings object does not exist', () => {
+    expect(() => parseSettings({})).toThrow();
+  });
+
+  it('returns an a base model as long as we have the app version', () => {
+    const result = parseSettings({ settings: { version: '1' } as Settings });
+    expect(result).toBeTypeOf('object');
+    expect(result).toMatchObject({
+      version: expect.any(String),
+      serverPort: 4001,
+      editorKey: null,
+      operatorKey: null,
+      timeFormat: '24',
+      language: 'en',
+    });
+  });
+});
diff --git a/apps/server/src/api-data/settings/settings.parser.ts b/apps/server/src/api-data/settings/settings.parser.ts
new file mode 100644
index 000000000..3aabac0fd
--- /dev/null
+++ b/apps/server/src/api-data/settings/settings.parser.ts
@@ -0,0 +1,25 @@
+import { DatabaseModel, Settings } from 'ontime-types';
+
+import { dbModel } from '../../models/dataModel.js';
+
+/**
+ * Parse settings portion of a project file
+ */
+export function parseSettings(data: Partial<DatabaseModel>): Settings {
+  // skip if file definition is missing
+  // TODO: skip parsing if the version is not correct
+  if (!data.settings || data.settings?.version == null) {
+    throw new Error('ERROR: unable to parse settings, missing or incorrect version');
+  }
+
+  console.log('Found settings, importing...');
+
+  return {
+    version: dbModel.settings.version,
+    serverPort: data.settings.serverPort ?? dbModel.settings.serverPort,
+    editorKey: data.settings.editorKey ?? null,
+    operatorKey: data.settings.operatorKey ?? null,
+    timeFormat: data.settings.timeFormat ?? '24',
+    language: data.settings.language ?? 'en',
+  };
+}
diff --git a/apps/server/src/api-data/sheets/sheets.controller.ts b/apps/server/src/api-data/sheets/sheets.controller.ts
index 59a86636e..df5d1a442 100644
--- a/apps/server/src/api-data/sheets/sheets.controller.ts
+++ b/apps/server/src/api-data/sheets/sheets.controller.ts
@@ -3,12 +3,12 @@
  * Google Sheets
  */
 
+import type { AuthenticationStatus, CustomFields, ErrorResponse, Rundown } from 'ontime-types';
+import { getErrorMessage } from 'ontime-utils';
+
 import { Request, Response } from 'express';
 import { readFileSync } from 'fs';
 
-import type { AuthenticationStatus, CustomFields, ErrorResponse, Rundown } from 'ontime-types';
-
-import { deleteFile } from '../../utils/parserUtils.js';
 import {
   revoke,
   handleClientSecret,
@@ -18,7 +18,7 @@ import {
   upload,
   getWorksheetOptions,
 } from '../../services/sheet-service/SheetService.js';
-import { getErrorMessage } from 'ontime-utils';
+import { deleteFile } from '../../utils/fileManagement.js';
 
 export async function requestConnection(
   req: Request,
@@ -40,11 +40,7 @@ export async function requestConnection(
   }
 
   // delete uploaded file after parsing
-  try {
-    await deleteFile(filePath);
-  } catch (_error) {
-    /** we dont handle failure here */
-  }
+  await deleteFile(filePath);
 }
 
 export async function verifyAuthentication(
diff --git a/apps/server/src/api-data/sheets/sheets.middleware.ts b/apps/server/src/api-data/sheets/sheets.middleware.ts
index 79504e84c..062e42dc7 100644
--- a/apps/server/src/api-data/sheets/sheets.middleware.ts
+++ b/apps/server/src/api-data/sheets/sheets.middleware.ts
@@ -1,11 +1,10 @@
 import { Request } from 'express';
 import multer, { FileFilterCallback } from 'multer';
 
-import { JSON_MIME } from '../../utils/parser.js';
 import { storage } from '../../utils/upload.js';
 
 const filterClientSecret = (_req: Request, file: Express.Multer.File, cb: FileFilterCallback) => {
-  if (file.mimetype.includes(JSON_MIME)) {
+  if (file.mimetype.includes('application/json')) {
     cb(null, true);
   } else {
     cb(null, false);
diff --git a/apps/server/src/api-data/url-presets/__tests__/urlPresets.parser.test.ts b/apps/server/src/api-data/url-presets/__tests__/urlPresets.parser.test.ts
new file mode 100644
index 000000000..071938140
--- /dev/null
+++ b/apps/server/src/api-data/url-presets/__tests__/urlPresets.parser.test.ts
@@ -0,0 +1,47 @@
+import { DatabaseModel, URLPreset } from 'ontime-types';
+
+import { parseUrlPresets } from '../urlPresets.parser.js';
+
+describe('parseUrlPresets()', () => {
+  it('returns an a base model if nothing is given', () => {
+    const errorEmitter = vi.fn();
+    const result = parseUrlPresets({}, errorEmitter);
+    expect(result).toBeTypeOf('object');
+    expect(errorEmitter).toHaveBeenCalledOnce();
+  });
+
+  it('parses data, skipping invalid results', () => {
+    const errorEmitter = vi.fn();
+    const urlPresets = [{ enabled: true, alias: 'alias', pathAndParams: 'ss' }] as URLPreset[];
+    const result = parseUrlPresets({ urlPresets }, errorEmitter);
+    expect(result.length).toEqual(1);
+    expect(result.at(0)).toMatchObject({
+      enabled: true,
+      alias: 'alias',
+      pathAndParams: 'ss',
+    });
+    expect(errorEmitter).not.toHaveBeenCalled();
+  });
+
+  it('imports a well defined urlPreset', () => {
+    const testData = {
+      rundown: [],
+      settings: {
+        version: '2.0.0',
+      },
+      urlPresets: [
+        {
+          enabled: false,
+          alias: 'testalias',
+          pathAndParams: 'testpathAndParams',
+        },
+      ],
+    } as unknown as DatabaseModel;
+
+    const parsed = parseUrlPresets(testData);
+    expect(parsed.length).toBe(1);
+
+    // generates missing id
+    expect(parsed[0].alias).toBeDefined();
+  });
+});
diff --git a/apps/server/src/api-data/url-presets/urlPresets.parser.ts b/apps/server/src/api-data/url-presets/urlPresets.parser.ts
new file mode 100644
index 000000000..d43ee1bca
--- /dev/null
+++ b/apps/server/src/api-data/url-presets/urlPresets.parser.ts
@@ -0,0 +1,30 @@
+import { DatabaseModel, URLPreset } from 'ontime-types';
+
+import { ErrorEmitter } from '../../utils/parserUtils.js';
+
+/**
+ * Parse URL preset portion of a project file
+ */
+export function parseUrlPresets(data: Partial<DatabaseModel>, emitError?: ErrorEmitter): URLPreset[] {
+  if (!data.urlPresets) {
+    emitError?.('No data found to import');
+    return [];
+  }
+
+  console.log('Found URL presets, importing...');
+
+  const newPresets: URLPreset[] = [];
+
+  for (const preset of data.urlPresets) {
+    const newPreset = {
+      enabled: preset.enabled ?? false,
+      alias: preset.alias ?? '',
+      pathAndParams: preset.pathAndParams ?? '',
+    };
+    newPresets.push(newPreset);
+  }
+
+  console.log(`Uploaded ${newPresets.length} preset(s)`);
+
+  return newPresets;
+}
diff --git a/apps/server/src/api-data/view-settings/__tests__/viewSettings.parser.ts b/apps/server/src/api-data/view-settings/__tests__/viewSettings.parser.ts
new file mode 100644
index 000000000..7447a9754
--- /dev/null
+++ b/apps/server/src/api-data/view-settings/__tests__/viewSettings.parser.ts
@@ -0,0 +1,10 @@
+import { parseViewSettings } from '../viewSettings.parser.js';
+
+describe('parseViewSettings()', () => {
+  it('returns an a base model if nothing is given', () => {
+    const errorEmitter = vi.fn();
+    const result = parseViewSettings({}, errorEmitter);
+    expect(result).toBeTypeOf('object');
+    expect(errorEmitter).toHaveBeenCalledOnce();
+  });
+});
diff --git a/apps/server/src/api-data/view-settings/viewSettings.parser.ts b/apps/server/src/api-data/view-settings/viewSettings.parser.ts
new file mode 100644
index 000000000..a022e92de
--- /dev/null
+++ b/apps/server/src/api-data/view-settings/viewSettings.parser.ts
@@ -0,0 +1,25 @@
+import { DatabaseModel, ViewSettings } from 'ontime-types';
+
+import { dbModel } from '../../models/dataModel.js';
+import { ErrorEmitter } from '../../utils/parserUtils.js';
+
+/**
+ * Parse viewSettings portion of a project file
+ */
+export function parseViewSettings(data: Partial<DatabaseModel>, emitError?: ErrorEmitter): ViewSettings {
+  if (!data.viewSettings) {
+    emitError?.('No data found to import');
+    return { ...dbModel.viewSettings };
+  }
+
+  console.log('Found view settings, importing...');
+
+  return {
+    dangerColor: data.viewSettings.dangerColor ?? dbModel.viewSettings.dangerColor,
+    endMessage: data.viewSettings.endMessage ?? dbModel.viewSettings.endMessage,
+    freezeEnd: data.viewSettings.freezeEnd ?? dbModel.viewSettings.freezeEnd,
+    normalColor: data.viewSettings.normalColor ?? dbModel.viewSettings.normalColor,
+    overrideStyles: data.viewSettings.overrideStyles ?? dbModel.viewSettings.overrideStyles,
+    warningColor: data.viewSettings.warningColor ?? dbModel.viewSettings.warningColor,
+  };
+}
diff --git a/apps/server/src/classes/data-provider/__tests__/DataProvider.utils.test.ts b/apps/server/src/classes/data-provider/__tests__/DataProvider.utils.test.ts
index 272308926..fc2d2dd2b 100644
--- a/apps/server/src/classes/data-provider/__tests__/DataProvider.utils.test.ts
+++ b/apps/server/src/classes/data-provider/__tests__/DataProvider.utils.test.ts
@@ -6,54 +6,6 @@ import { makeOntimeEvent, makeRundown } from '../../../api-data/rundown/__mocks_
 import { safeMerge } from '../DataProvider.utils.js';
 
 describe('safeMerge', () => {
-  const existing = {
-    rundown: [],
-    project: {
-      title: 'existing title',
-      description: 'existing description',
-      publicUrl: 'existing public URL',
-      backstageUrl: 'existing backstageUrl',
-      publicInfo: 'existing backstageInfo',
-      backstageInfo: 'existing backstageInfo',
-      projectLogo: null,
-      custom: [
-        {
-          title: 'existing custom title',
-          value: 'existing custom value',
-        },
-      ],
-    },
-    settings: {
-      app: 'ontime',
-      version: '2.0.0',
-      serverPort: 4001,
-      editorKey: null,
-      operatorKey: null,
-      timeFormat: '24',
-      language: 'en',
-    },
-    viewSettings: {
-      overrideStyles: false,
-      freezeEnd: false,
-      endMessage: 'existing endMessage',
-      normalColor: '#ffffffcc',
-      warningColor: '#FFAB33',
-      dangerColor: '#ED3333',
-    },
-    urlPresets: [],
-    customFields: {
-      lighting: { type: 'string', label: 'lighting', colour: 'red' },
-      vfx: { type: 'string', label: 'vfx', colour: 'blue' },
-    },
-    automation: {
-      enabledAutomations: false,
-      enabledOscIn: false,
-      oscPortIn: 8000,
-      triggers: [],
-      automations: {},
-    },
-  } as DatabaseModel;
-
   it('returns existing data if new data is not provided', () => {
     const mergedData = safeMerge(demoDb, {});
     expect(mergedData).toEqual(demoDb);
@@ -137,42 +89,6 @@ describe('safeMerge', () => {
   });
 
   it('should merge the urlPresets key when present', () => {
-    const existingData = {
-      rundown: [],
-      project: {
-        title: '',
-        description: '',
-        publicUrl: '',
-        publicInfo: '',
-        backstageUrl: '',
-        backstageInfo: '',
-        projectLogo: null,
-        custom: [],
-      },
-      settings: {
-        app: 'ontime',
-        version: '2.0.0',
-        serverPort: 4001,
-        operatorKey: null,
-        editorKey: null,
-        timeFormat: '24',
-        language: 'en',
-      },
-      viewSettings: {
-        overrideStyles: false,
-        endMessage: '',
-      } as ViewSettings,
-      urlPresets: [],
-      customFields: {},
-      automation: {
-        enabledAutomations: false,
-        enabledOscIn: false,
-        oscPortIn: 8000,
-        triggers: [],
-        automations: {},
-      },
-    } as DatabaseModel;
-
     const newData = {
       urlPresets: [
         { enabled: true, alias: 'alias1', pathAndParams: '' },
diff --git a/apps/server/src/models/demoProject.ts b/apps/server/src/models/demoProject.ts
index 31da2f092..d115cdf80 100644
--- a/apps/server/src/models/demoProject.ts
+++ b/apps/server/src/models/demoProject.ts
@@ -53,8 +53,8 @@ export const demoDb: DatabaseModel = {
           duration: 0,
           isFirstLinked: false,
           custom: {
-            song: 'Sekret',
-            artist: 'Ronela Hajati',
+            Song: 'Sekret',
+            Artist: 'Ronela Hajati',
           },
         },
         '32d31': {
@@ -82,8 +82,8 @@ export const demoDb: DatabaseModel = {
           timeWarning: 500000,
           timeDanger: 100000,
           custom: {
-            song: 'Sekret',
-            artist: 'Ronela Hajati',
+            Song: 'Sekret',
+            Artist: 'Ronela Hajati',
           },
         },
         '21cd2': {
@@ -111,8 +111,8 @@ export const demoDb: DatabaseModel = {
           timeWarning: 500000,
           timeDanger: 100000,
           custom: {
-            song: 'Eat Your Salad',
-            artist: 'Citi Zeni',
+            Song: 'Eat Your Salad',
+            Artist: 'Citi Zeni',
           },
         },
         '0b371': {
@@ -140,8 +140,8 @@ export const demoDb: DatabaseModel = {
           timeWarning: 500000,
           timeDanger: 100000,
           custom: {
-            song: 'Sentimentai',
-            artist: 'Monika Liu',
+            Song: 'Sentimentai',
+            Artist: 'Monika Liu',
           },
         },
         '3cd28': {
@@ -169,8 +169,8 @@ export const demoDb: DatabaseModel = {
           timeWarning: 500000,
           timeDanger: 100000,
           custom: {
-            song: 'Boys Do Cry',
-            artist: 'Marius Bear',
+            Song: 'Boys Do Cry',
+            Artist: 'Marius Bear',
           },
         },
         e457f: {
@@ -198,9 +198,9 @@ export const demoDb: DatabaseModel = {
           timeWarning: 500000,
           timeDanger: 100000,
           custom: {
-            song: 'Disko',
-            artist: 'LPS',
-          },
+            Song: 'Disko',
+            Artist: 'LPS',
+          }
         },
         /// <----- BLOCK
         '01e85': {
@@ -244,8 +244,8 @@ export const demoDb: DatabaseModel = {
           timeWarning: 500000,
           timeDanger: 100000,
           custom: {
-            song: 'Stefania',
-            artist: 'Kalush Orchestra',
+            Song: 'Stefania',
+            Artist: 'Kalush Orchestra',
           },
         },
         b7737: {
@@ -273,8 +273,8 @@ export const demoDb: DatabaseModel = {
           timeWarning: 500000,
           timeDanger: 100000,
           custom: {
-            song: 'Intention',
-            artist: 'Intelligent Music Project',
+            Song: 'Intention',
+            Artist: 'Intelligent Music Project',
           },
         },
         d3a80: {
@@ -302,8 +302,8 @@ export const demoDb: DatabaseModel = {
           timeWarning: 500000,
           timeDanger: 100000,
           custom: {
-            song: 'De Diepte',
-            artist: 'S10',
+            Song: 'De Diepte',
+            Artist: 'S10',
           },
         },
         '8276c': {
@@ -331,8 +331,8 @@ export const demoDb: DatabaseModel = {
           timeWarning: 500000,
           timeDanger: 100000,
           custom: {
-            song: 'Trenuletul',
-            artist: 'Zdob si Zdub',
+            Song: 'Trenuletul',
+            Artist: 'Zdob si Zdub',
           },
         },
         '2340b': {
@@ -360,8 +360,8 @@ export const demoDb: DatabaseModel = {
           timeWarning: 500000,
           timeDanger: 100000,
           custom: {
-            song: 'Saudade Saudade',
-            artist: 'Maro',
+            Song: 'Saudade Saudade',
+            Artist: 'Maro',
           },
         },
         /// <----- BLOCK
@@ -406,8 +406,8 @@ export const demoDb: DatabaseModel = {
           timeWarning: 500000,
           timeDanger: 100000,
           custom: {
-            song: 'Guilty Pleasure',
-            artist: 'Mia Dimsic',
+            Song: 'Guilty Pleasure',
+            Artist: 'Mia Dimsic',
           },
         },
         '5e965': {
@@ -435,8 +435,8 @@ export const demoDb: DatabaseModel = {
           timeWarning: 500000,
           timeDanger: 100000,
           custom: {
-            song: 'The Show',
-            artist: 'Reddi',
+            Song: 'The Show',
+            Artist: 'Reddi',
           },
         },
         bab4a: {
@@ -464,8 +464,8 @@ export const demoDb: DatabaseModel = {
           timeWarning: 500000,
           timeDanger: 100000,
           custom: {
-            song: 'Halo',
-            artist: 'LUM!X & Pia Maria',
+            Song: 'Halo',
+            Artist: 'LUM!X & Pia Maria',
           },
         },
         d3eb1: {
@@ -493,8 +493,8 @@ export const demoDb: DatabaseModel = {
           timeWarning: 500000,
           timeDanger: 100000,
           custom: {
-            song: 'Die Together',
-            artist: 'Amanda Tenfjord',
+            Song: 'Die Together',
+            Artist: 'Amanda Tenfjord',
           },
         },
       },
@@ -528,12 +528,12 @@ export const demoDb: DatabaseModel = {
     warningColor: '#FFAB33',
   },
   customFields: {
-    song: {
+    Song: {
       label: 'Song',
       type: 'string',
       colour: '#339E4E',
     },
-    artist: {
+    Artist: {
       label: 'Artist',
       type: 'string',
       colour: '#3E75E8',
diff --git a/apps/server/src/services/project-service/ProjectService.ts b/apps/server/src/services/project-service/ProjectService.ts
index 6aaed5c43..79f5f91e3 100644
--- a/apps/server/src/services/project-service/ProjectService.ts
+++ b/apps/server/src/services/project-service/ProjectService.ts
@@ -1,5 +1,5 @@
 import { DatabaseModel, LogOrigin, ProjectData, ProjectFileListResponse } from 'ontime-types';
-import { getErrorMessage } from 'ontime-utils';
+import { getErrorMessage, getFirstRundown } from 'ontime-utils';
 
 import { join } from 'path';
 import { copyFile } from 'fs/promises';
@@ -8,6 +8,7 @@ import { logger } from '../../classes/Logger.js';
 import { publicDir } from '../../setup/index.js';
 import {
   appendToName,
+  deleteFile,
   dockerSafeRename,
   ensureDirectory,
   ensureJsonExtension,
@@ -16,14 +17,14 @@ import {
   removeFileExtension,
 } from '../../utils/fileManagement.js';
 import { dbModel } from '../../models/dataModel.js';
-import { deleteFile } from '../../utils/parserUtils.js';
-import { parseDatabaseModel } from '../../utils/parser.js';
 import { parseRundowns } from '../../api-data/rundown/rundown.parser.js';
 import { demoDb } from '../../models/demoProject.js';
 import { config } from '../../setup/config.js';
 import { getDataProvider, initPersistence } from '../../classes/data-provider/DataProvider.js';
 import { safeMerge } from '../../classes/data-provider/DataProvider.utils.js';
 import { initRundown } from '../../api-data/rundown/rundown.service.js';
+import { parseDatabaseModel } from '../../api-data/db/db.parser.js';
+import { parseCustomFields } from '../../api-data/custom-fields/customFields.parser.js';
 
 import {
   getLastLoadedProject,
@@ -31,7 +32,6 @@ import {
   setLastLoadedProject,
 } from '../app-state-service/AppStateService.js';
 import { runtimeService } from '../runtime-service/RuntimeService.js';
-import { getFirstRundown } from '../rundown-service/rundownUtils.js';
 
 import {
   copyCorruptFile,
@@ -93,6 +93,7 @@ async function loadProject(projectData: DatabaseModel, fileName: string) {
 
   // load the first rundown in the project
   const firstRundown = getFirstRundown(projectData.rundowns);
+
   await initRundown(firstRundown, projectData.customFields);
 
   // persist the project selection
@@ -296,13 +297,16 @@ export async function patchCurrentProject(data: Partial<DatabaseModel>) {
 
   // ... but rundown and custom fields need to be checked
   if (rundowns != null) {
-    const result = parseRundowns(data);
+    const customFields = parseCustomFields(data);
+    const result = parseRundowns(data, customFields);
+
     /**
      * The user may have multiple rundowns
      * We currently ignore all other rundowns
      */
-    const firstRundown = getFirstRundown(result.rundowns);
-    await initRundown(firstRundown, result.customFields);
+    const firstRundown = getFirstRundown(result);
+
+    await initRundown(firstRundown, customFields);
   }
 
   const updatedData = await getDataProvider().getData();
diff --git a/apps/server/src/services/rundown-service/RundownService.ts b/apps/server/src/services/rundown-service/RundownService.ts
deleted file mode 100644
index 8138cf18b..000000000
--- a/apps/server/src/services/rundown-service/RundownService.ts
+++ /dev/null
@@ -1,74 +0,0 @@
-import { CustomFields, Rundown } from 'ontime-types';
-
-import { RefetchTargets, sendRefetch } from '../../adapters/websocketAux.js';
-import { updateRundownData } from '../../stores/runtimeState.js';
-import { runtimeService } from '../runtime-service/RuntimeService.js';
-
-import * as cache from './rundownCache.js';
-
-/**
- * Forces update in the store
- * Called when we make changes to the rundown object
- */
-function updateRuntimeOnChange() {
-  const { timedEventsOrder } = cache.getEventOrder();
-  const numEvents = timedEventsOrder.length;
-  const metadata = cache.getMetadata();
-
-  // schedule an update for the end of the event loop
-  setImmediate(() =>
-    updateRundownData({
-      numEvents,
-      ...metadata,
-    }),
-  );
-}
-
-type NotifyChangesOptions = {
-  timer?: boolean | string[]; // whether to notify the timer, could be a yes / no or an array of affected IDs
-  external?: boolean; // whether to notify external services
-  reload?: boolean; // major change, clients should consider refetching everything
-};
-
-/**
- * Notify services of changes in the rundown
- */
-function notifyChanges(options: NotifyChangesOptions) {
-  if (options.timer) {
-    const { playableEventsOrder } = cache.getEventOrder();
-
-    if (playableEventsOrder.length === 0) {
-      runtimeService.stop();
-    } else {
-      // notify timer service of changed events
-      // timer can be true or an array of changed IDs
-      const affected = Array.isArray(options.timer) ? options.timer : undefined;
-      runtimeService.notifyOfChangedEvents(affected);
-    }
-  }
-
-  if (options.external) {
-    // advice socket subscribers of change
-    const payload = {
-      target: RefetchTargets.Rundown,
-      changes: Array.isArray(options.timer) ? options.timer : undefined,
-      reload: options.reload,
-      revision: cache.getMetadata().revision,
-    };
-    sendRefetch(payload);
-  }
-}
-
-/**
- * Sets a new rundown in the cache
- * and marks it as the currently loaded one
- */
-export async function initRundown(rundown: Readonly<Rundown>, customFields: Readonly<CustomFields>) {
-  await cache.init(rundown, customFields);
-
-  // notify runtime that rundown has changed
-  updateRuntimeOnChange();
-
-  // notify timer of change
-  notifyChanges({ timer: true, external: true, reload: true });
-}
diff --git a/apps/server/src/services/rundown-service/__mocks__/rundown.mocks.ts b/apps/server/src/services/rundown-service/__mocks__/rundown.mocks.ts
deleted file mode 100644
index 4598c3c23..000000000
--- a/apps/server/src/services/rundown-service/__mocks__/rundown.mocks.ts
+++ /dev/null
@@ -1,54 +0,0 @@
-import { SupportedEntry, OntimeEvent, OntimeDelay, OntimeBlock, Rundown } from 'ontime-types';
-import { defaultRundown } from '../../../models/dataModel.js';
-
-const baseEvent = {
-  type: SupportedEntry.Event,
-  skip: false,
-  revision: 1,
-};
-
-const baseBlock = {
-  type: SupportedEntry.Block,
-  events: [],
-};
-
-/**
- * Utility to create a Ontime event
- */
-export function makeOntimeEvent(patch: Partial<OntimeEvent>): OntimeEvent {
-  return {
-    ...baseEvent,
-    ...patch,
-  } as OntimeEvent;
-}
-
-/**
- * Utility to create a delay event
- */
-export function makeOntimeDelay(patch: Partial<OntimeDelay>): OntimeDelay {
-  return { id: 'delay', type: SupportedEntry.Delay, duration: 0, ...patch } as OntimeDelay;
-}
-
-/**
- * Utility to create a block event
- */
-export function makeOntimeBlock(patch: Partial<OntimeBlock>): OntimeBlock {
-  return { id: 'block', ...baseBlock, ...patch } as OntimeBlock;
-}
-
-/**
- * Utility to create a rundown object
- */
-export function makeRundown(patch: Partial<Rundown>): Rundown {
-  return {
-    ...defaultRundown,
-    ...patch,
-  };
-}
-
-/**
- * Utility to generate a rundown of OntimeEvents form partial objects
- */
-export function prepareTimedEvents(events: Partial<OntimeEvent>[]): OntimeEvent[] {
-  return events.map(makeOntimeEvent);
-}
diff --git a/apps/server/src/services/rundown-service/__tests__/rundownCache.test.ts b/apps/server/src/services/rundown-service/__tests__/rundownCache.test.ts
deleted file mode 100644
index 29bd078a9..000000000
--- a/apps/server/src/services/rundown-service/__tests__/rundownCache.test.ts
+++ /dev/null
@@ -1,127 +0,0 @@
-import { createCustomField, editCustomField, removeCustomField, customFieldChangelog } from '../rundownCache.js';
-
-beforeAll(() => {
-  vi.mock('../../../classes/data-provider/DataProvider.js', () => {
-    return {
-      getDataProvider: vi.fn().mockImplementation(() => {
-        return {
-          setCustomFields: vi.fn().mockImplementation((newData) => newData),
-          setRundown: vi.fn().mockImplementation((newData) => newData),
-        };
-      }),
-    };
-  });
-});
-
-describe('custom fields flow', () => {
-  describe('createCustomField()', () => {
-    it('creates a field from given parameters', () => {
-      const expected = {
-        Lighting: {
-          label: 'Lighting',
-          type: 'string',
-          colour: 'blue',
-        },
-      };
-
-      const customField = createCustomField({ label: 'Lighting', type: 'string', colour: 'blue' });
-      expect(customField).toStrictEqual(expected);
-    });
-  });
-
-  describe('editCustomField()', () => {
-    it('edits a field with a given label', () => {
-      createCustomField({ label: 'Sound', type: 'string', colour: 'blue' });
-
-      const expected = {
-        Lighting: {
-          label: 'Lighting',
-          type: 'string',
-          colour: 'blue',
-        },
-        Sound: {
-          label: 'Sound',
-          type: 'string',
-          colour: 'green',
-        },
-      };
-
-      const customField = editCustomField('Sound', { label: 'Sound', type: 'string', colour: 'green' });
-      expect(customFieldChangelog).toStrictEqual({});
-      expect(customField).toStrictEqual(expected);
-    });
-
-    it('renames a field to a new label', () => {
-      const created = createCustomField({ label: 'Video', type: 'string', colour: 'red' });
-
-      const expected = {
-        Lighting: {
-          label: 'Lighting',
-          type: 'string',
-          colour: 'blue',
-        },
-        Sound: {
-          label: 'Sound',
-          type: 'string',
-          colour: 'green',
-        },
-        Video: {
-          label: 'Video',
-          type: 'string',
-          colour: 'red',
-        },
-      };
-
-      expect(created).toStrictEqual(expected);
-
-      const expectedAfter = {
-        Lighting: {
-          label: 'Lighting',
-          type: 'string',
-          colour: 'blue',
-        },
-        Sound: {
-          label: 'Sound',
-          type: 'string',
-          colour: 'green',
-        },
-        AV: {
-          label: 'AV',
-          type: 'string',
-          colour: 'red',
-        },
-      };
-
-      // We need to flush all scheduled tasks for the generate function to settle
-      vi.useFakeTimers();
-      const customField = editCustomField('Video', { label: 'AV', type: 'string', colour: 'red' });
-      expect(customField).toStrictEqual(expectedAfter);
-      expect(customFieldChangelog).toStrictEqual({ Video: 'AV' });
-      editCustomField('AV', { label: 'Video' });
-      vi.runAllTimers();
-      expect(customFieldChangelog).toStrictEqual({});
-      vi.useRealTimers();
-    });
-  });
-
-  describe('removeCustomField()', () => {
-    it('deletes a field with a given label', () => {
-      const expected = {
-        Lighting: {
-          label: 'Lighting',
-          type: 'string',
-          colour: 'blue',
-        },
-        Video: {
-          label: 'Video',
-          type: 'string',
-          colour: 'red',
-        },
-      };
-
-      const customField = removeCustomField('Sound');
-
-      expect(customField).toStrictEqual(expected);
-    });
-  });
-});
diff --git a/apps/server/src/services/rundown-service/__tests__/rundownCache.utils.test.ts b/apps/server/src/services/rundown-service/__tests__/rundownCache.utils.test.ts
deleted file mode 100644
index 9586d22d1..000000000
--- a/apps/server/src/services/rundown-service/__tests__/rundownCache.utils.test.ts
+++ /dev/null
@@ -1,188 +0,0 @@
-import { CustomFields, SupportedEntry } from 'ontime-types';
-import { addToCustomAssignment, calculateDayOffset, handleCustomField } from '../rundownCache.utils.js';
-import { MILLIS_PER_HOUR } from 'ontime-utils';
-import { makeOntimeEvent } from '../__mocks__/rundown.mocks.js';
-
-describe('addToCustomAssignment()', () => {
-  it('adds given entry to assignedCustomFields', () => {
-    const assignedCustomFields = {};
-
-    addToCustomAssignment('label1', 'eventId 1', assignedCustomFields);
-    expect(assignedCustomFields).toStrictEqual({ label1: ['eventId 1'] });
-
-    addToCustomAssignment('label1', 'eventId 2', assignedCustomFields);
-    expect(assignedCustomFields).toStrictEqual({ label1: ['eventId 1', 'eventId 2'] });
-  });
-});
-
-describe('handleCustomField()', () => {
-  it('creates a map of where custom fields are used', () => {
-    const customFields = {
-      lighting: {
-        type: 'string',
-        colour: 'red',
-        label: 'lighting',
-      },
-      sound: {
-        type: 'string',
-        colour: 'red',
-        label: 'sound',
-      },
-    } as CustomFields;
-    const customFieldChangelog = {};
-
-    const event = makeOntimeEvent({
-      type: SupportedEntry.Event,
-      id: '2',
-      timeStart: 0,
-      linkStart: true,
-      custom: {
-        lighting: 'on',
-      },
-    });
-    const assignedCustomFields = {};
-
-    const result = handleCustomField(customFields, customFieldChangelog, event, assignedCustomFields);
-    expect(result).toBeUndefined();
-    expect(assignedCustomFields).toStrictEqual({ lighting: ['2'] });
-    expect(event.custom).toStrictEqual({
-      lighting: 'on',
-    });
-  });
-
-  it('renames a field if in changelog', () => {
-    const customFields = {
-      lighting: {
-        type: 'string',
-        colour: 'red',
-        label: 'lighting',
-      },
-      video: {
-        type: 'string',
-        colour: 'red',
-        label: 'video',
-      },
-    } as CustomFields;
-
-    const customFieldChangelog = { sound: 'video' };
-
-    const event = makeOntimeEvent({
-      type: SupportedEntry.Event,
-      id: '2',
-      timeStart: 0,
-      linkStart: true,
-      custom: {
-        sound: 'on',
-      },
-    });
-    const assignedCustomFields = {};
-
-    const result = handleCustomField(customFields, customFieldChangelog, event, assignedCustomFields);
-    expect(result).toBeUndefined();
-    expect(assignedCustomFields).toStrictEqual({ video: ['2'] });
-    expect(event.custom).toStrictEqual({
-      video: 'on',
-    });
-  });
-
-  it('processes all fields', () => {
-    const customFields = {
-      field1: {
-        type: 'string',
-        colour: 'red',
-        label: 'field1',
-      },
-      field2: {
-        type: 'string',
-        colour: 'red',
-        label: 'field2',
-      },
-    } as CustomFields;
-
-    const customFieldChangelog = { field1: 'newField1' };
-
-    const mutableEvent = makeOntimeEvent({
-      type: SupportedEntry.Event,
-      id: 'event1',
-      custom: {
-        field1: 'value1',
-        field2: 'value2',
-      },
-    });
-
-    const assignedCustomFields = {};
-
-    handleCustomField(customFields, customFieldChangelog, mutableEvent, assignedCustomFields);
-
-    // Check that field1 has been renamed to newField1 and the value reassigned
-    expect(mutableEvent.custom['newField1']).toStrictEqual('value1');
-    expect(mutableEvent.custom['field1']).toBeUndefined();
-
-    // Check that field2 has been processed
-    expect(mutableEvent.custom['field2']).toStrictEqual('value2');
-
-    // Check that assignedCustomFields has been updated correctly
-    expect(assignedCustomFields).toStrictEqual({
-      newField1: ['event1'],
-      field2: ['event1'],
-    });
-  });
-});
-
-describe('calculateDayOffset', () => {
-  it('returns 0 if there is no previous event', () => {
-    expect(calculateDayOffset({ timeStart: 0 }, null)).toBe(0);
-  });
-
-  it('returns 0 if the previous event duration is 0', () => {
-    expect(calculateDayOffset({ timeStart: 0 }, { timeStart: 0, duration: 0 })).toBe(0);
-  });
-
-  it('returns 0 if event starts after previous', () => {
-    expect(calculateDayOffset({ timeStart: 11 }, { timeStart: 10, duration: 2 })).toBe(0);
-  });
-
-  it('returns 1 if event starts before previous', () => {
-    expect(calculateDayOffset({ timeStart: 9 }, { timeStart: 10, duration: 2 })).toBe(1);
-  });
-
-  it('returns 1 if event starts at the same time as one before', () => {
-    expect(calculateDayOffset({ timeStart: 10 }, { timeStart: 10, duration: 2 })).toBe(1);
-  });
-
-  it('should account for an event that crossed midnight and there is a overlap', () => {
-    expect(
-      calculateDayOffset(
-        { timeStart: MILLIS_PER_HOUR }, // starts at 01:00:00
-        { timeStart: 20 * MILLIS_PER_HOUR, duration: 6 * MILLIS_PER_HOUR }, // ends at 02:00:00
-      ),
-    ).toBe(1);
-  });
-
-  it('should account for an event that crossed midnight and there is a gap', () => {
-    expect(
-      calculateDayOffset(
-        { timeStart: 2 * MILLIS_PER_HOUR }, // starts at 02:00:00
-        { timeStart: 23 * MILLIS_PER_HOUR, duration: 2 * MILLIS_PER_HOUR }, // ends at 01:00:00
-      ),
-    ).toBe(1);
-  });
-
-  it('should account for an event that crossed midnight with no overlaps or gaps', () => {
-    expect(
-      calculateDayOffset(
-        { timeStart: 2 * MILLIS_PER_HOUR }, // starts at 02:00:00
-        { timeStart: 20 * MILLIS_PER_HOUR, duration: 6 * MILLIS_PER_HOUR }, // ends at 02:00:00
-      ),
-    ).toBe(1);
-  });
-
-  it('should account for an event that finishes exactly at midnight', () => {
-    expect(
-      calculateDayOffset(
-        { timeStart: 2 * MILLIS_PER_HOUR }, // starts at 02:00:00
-        { timeStart: 23 * MILLIS_PER_HOUR, duration: 6 * MILLIS_PER_HOUR }, // ends at 24:00:00
-      ),
-    ).toBe(1);
-  });
-});
diff --git a/apps/server/src/services/rundown-service/__tests__/rundownUtils.test.ts b/apps/server/src/services/rundown-service/__tests__/rundownUtils.test.ts
deleted file mode 100644
index 242631c01..000000000
--- a/apps/server/src/services/rundown-service/__tests__/rundownUtils.test.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { makeRundown } from '../../../api-data/rundown/__mocks__/rundown.mocks.js';
-import { getPreviousId } from '../rundownUtils.js';
-
-describe('getPreviousId', () => {
-  const rundown = makeRundown({
-    flatOrder: ['a', 'b', 'c', 'd'],
-  });
-
-  it('returns afterId if provided', () => {
-    expect(getPreviousId(rundown, 'b')).toBe('b');
-  });
-
-  it('returns the previous id before beforeId if provided', () => {
-    expect(getPreviousId(rundown, undefined, 'c')).toBe('b');
-  });
-
-  it('returns undefined if neither afterId nor beforeId is provided', () => {
-    expect(getPreviousId(rundown)).toBeNull();
-  });
-
-  it('returns undefined if beforeId is not found', () => {
-    expect(getPreviousId(rundown, undefined, 'z')).toBeNull();
-  });
-});
diff --git a/apps/server/src/services/rundown-service/rundownCache.ts b/apps/server/src/services/rundown-service/rundownCache.ts
deleted file mode 100644
index d48a6895f..000000000
--- a/apps/server/src/services/rundown-service/rundownCache.ts
+++ /dev/null
@@ -1,462 +0,0 @@
-import {
-  CustomField,
-  CustomFieldLabel,
-  CustomFields,
-  EntryId,
-  isOntimeBlock,
-  isOntimeEvent,
-  isPlayableEvent,
-  OntimeBlock,
-  OntimeEntry,
-  Rundown,
-  RundownEntries,
-} from 'ontime-types';
-import { generateId, insertAtIndex, customFieldLabelToKey } from 'ontime-utils';
-
-import { getDataProvider } from '../../classes/data-provider/DataProvider.js';
-
-import type { RundownMetadata } from '../../api-data/rundown/rundown.types.js';
-import { makeRundownMetadata, type ProcessedRundownMetadata } from './rundownCache.utils.js';
-
-let currentRundownId: EntryId = '';
-let currentRundown: Rundown = {
-  id: '',
-  title: '',
-  order: [],
-  flatOrder: [],
-  entries: {},
-  revision: 0,
-};
-let projectCustomFields: CustomFields = {};
-let rundownMetadata: RundownMetadata = {
-  totalDelay: 0,
-  totalDuration: 0,
-  totalDays: 0,
-  firstStart: null,
-  lastEnd: null,
-
-  playableEventOrder: [],
-  timedEventOrder: [],
-  flatEntryOrder: [],
-
-  assignedCustomFields: {},
-};
-
-/**
- * Get the cached rundown without triggering regeneration
- */
-export const getCurrentRundown = (): Rundown => currentRundown;
-export const getCustomFields = (): CustomFields => projectCustomFields;
-
-/**
- * all mutating functions will set this value if there is a need for re-generation
- * but will only be cleared by the generate function
- */
-let isStale = true;
-
-/** Allows safely setting the stale state without accidentally clearing it */
-function setIsStale() {
-  isStale = true;
-}
-
-/**
- * Object that contains reference of renamed custom fields
- * Used to rename the custom fields in the events
- * @private exported only to simplify testing
- * @example
- * {
- *  oldLabel: newLabel
- *  lighting: lx
- * }
- */
-export let customFieldChangelog: Record<string, string> = {};
-
-/**
- * Receives a rundown which will be processed and used as the new current rundown
- */
-export async function init(initialRundown: Readonly<Rundown>, customFields: Readonly<CustomFields>) {
-  // we clone this objects since we use mutating logic in the cache
-  currentRundown = structuredClone(initialRundown);
-  currentRundownId = initialRundown.id;
-  projectCustomFields = structuredClone(customFields);
-
-  updateCache();
-
-  currentRundownId;
-}
-
-/**
- * Utility generate cache
- * @private should not be called outside of `rundownCache.ts`, exported for testing
- */
-export function generate(
-  initialRundown: Readonly<Rundown>,
-  customFields: Readonly<CustomFields>,
-): ProcessedRundownMetadata {
-  const { process, getMetadata } = makeRundownMetadata(customFields, customFieldChangelog);
-
-  for (let i = 0; i < initialRundown.order.length; i++) {
-    // we assign a reference to the current entry, this will be mutated in place
-    const currentEntryId = initialRundown.order[i];
-    const currentEntry = initialRundown.entries[currentEntryId];
-    if (!currentEntry) {
-      continue;
-    }
-    const { processedEntry } = process(currentEntry, null);
-
-    // if the event is a block, we process the nested entries
-    // the code here is a copy of the processing of top level events
-    if (isOntimeBlock(processedEntry)) {
-      let totalBlockDuration = 0;
-      let blockStartTime = null;
-      let blockEndTime = null;
-      let isFirstLinked = false;
-      const blockEvents: EntryId[] = [];
-
-      // check if the block contains events
-      for (let i = 0; i < processedEntry.events.length; i++) {
-        const nestedEntryId = processedEntry.events[i];
-        const nestedEntry = initialRundown.entries[nestedEntryId];
-
-        if (!nestedEntry) {
-          continue;
-        }
-
-        blockEvents.push(nestedEntry.id);
-        const { processedData: processedNestedData, processedEntry: processedNestedEntry } = process(
-          nestedEntry,
-          processedEntry.id,
-        );
-
-        // we dont extract metadata of skipped events,
-        // if this is not a playable event there is  nothing else to do
-        if (!isOntimeEvent(processedNestedEntry) || !isPlayableEvent(processedNestedEntry)) {
-          continue;
-        }
-
-        // first start is always the first event
-        if (blockStartTime === null) {
-          blockStartTime = processedNestedEntry.timeStart;
-          isFirstLinked = Boolean(processedNestedEntry.linkStart);
-        }
-
-        // lastEntry is the event with the latest end time
-        blockEndTime = processedNestedData.lastEnd;
-        totalBlockDuration += processedNestedEntry.duration;
-      }
-
-      // update block metadata
-      processedEntry.duration = totalBlockDuration;
-      processedEntry.startTime = blockStartTime;
-      processedEntry.endTime = blockEndTime;
-      processedEntry.isFirstLinked = isFirstLinked;
-      processedEntry.events = blockEvents;
-    }
-  }
-
-  return getMetadata();
-}
-
-/**
- * Runs the generate function in the currently loaded rundown and updates caches
- */
-export function updateCache() {
-  // The stale state can only be cleared inside updateCache()
-  function clearIsStale() {
-    isStale = false;
-  }
-  const processedData = generate(currentRundown, projectCustomFields);
-
-  // update the cache values
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars -- we are not interested in the iteration data
-  const { previousEvent, latestEvent, ...metadata } = processedData;
-  currentRundown.entries = metadata.entries;
-  currentRundown.order = metadata.order;
-  currentRundown.flatOrder = metadata.flatEntryOrder;
-  rundownMetadata = metadata;
-  clearIsStale();
-  customFieldChangelog = {};
-}
-
-/**
- * Whether a given ID is exists in the current rundown
- */
-export function hasId(id: EntryId): boolean {
-  return Object.hasOwn(currentRundown.entries, id);
-}
-
-/** Returns an ID guaranteed to be unique */
-export function getUniqueId(): string {
-  if (isStale) {
-    updateCache();
-  }
-  let id = '';
-  do {
-    id = generateId();
-  } while (hasId(id));
-  return id;
-}
-
-/** Returns index of an entry with a given id */
-export function getIndexOf(entryId: EntryId) {
-  if (isStale) {
-    updateCache();
-  }
-  return currentRundown.order.indexOf(entryId);
-}
-
-/** Returns id of an entry at a given index */
-export function getIdOf(index: number) {
-  if (isStale) {
-    updateCache();
-  }
-  return currentRundown.order.at(index);
-}
-
-type RundownCache = {
-  id: string;
-  title: string;
-  order: EntryId[];
-  entries: RundownEntries;
-  revision: number;
-  totalDelay: number;
-  totalDuration: number;
-};
-
-/**
- * Returns the full rundown cache.
- * Will triggering regeneration if data is stale.
- */
-export function get(): Readonly<RundownCache> {
-  if (isStale) {
-    updateCache();
-  }
-  return {
-    id: currentRundown.id,
-    title: currentRundown.title,
-    entries: currentRundown.entries,
-    order: currentRundown.order,
-    revision: currentRundown.revision,
-    totalDelay: rundownMetadata.totalDelay,
-    totalDuration: rundownMetadata.totalDuration,
-  };
-}
-
-/**
- * Returns calculated metadata from rundown
- * Will triggering regeneration if data is stale.
- */
-export function getMetadata(): Readonly<RundownMetadata & { revision: number }> {
-  if (isStale) {
-    updateCache();
-  }
-
-  return {
-    ...rundownMetadata,
-    revision: currentRundown.revision,
-  };
-}
-
-export type RundownOrder = {
-  order: EntryId[];
-  flatOrder: EntryId[];
-  timedEventsOrder: EntryId[];
-  playableEventsOrder: EntryId[];
-};
-
-/**
- * Exposes the order of events
- */
-export function getEventOrder(): Readonly<RundownOrder> {
-  if (isStale) {
-    updateCache();
-  }
-  return {
-    order: currentRundown.order,
-    flatOrder: currentRundown.flatOrder,
-    timedEventsOrder: rundownMetadata.timedEventOrder,
-    playableEventsOrder: rundownMetadata.playableEventOrder,
-  };
-}
-
-type CommonParams = { rundown: Rundown };
-type MutationParams<T> = T & CommonParams;
-type MutatingReturn = {
-  newRundown: Rundown;
-  newEvent?: OntimeEntry;
-  changeList?: EntryId[];
-  didMutate: boolean;
-};
-type MutatingFn<T extends object> = (params: MutationParams<T>) => MutatingReturn;
-
-/**
- * Decorators injects data into mutation
- * ensures order of operations when performing mutations
- */
-export function mutateCache<T extends object>(mutation: MutatingFn<T>) {
-  function scopedMutation(params: T) {
-    // we work on a copy of the rundown
-    const rundownCopy = structuredClone(currentRundown);
-    const { newEvent, newRundown, changeList, didMutate } = mutation({ ...params, rundown: rundownCopy });
-
-    // early return without calling side effects
-    if (!didMutate) {
-      return { newEvent, newRundown, changeList, didMutate };
-    }
-
-    newRundown.revision += 1;
-    currentRundown = newRundown;
-
-    // schedule a non priority cache update
-    setImmediate(() => {
-      get();
-    });
-
-    // defer writing to the database
-    setImmediate(async () => {
-      await getDataProvider().setRundown(currentRundownId, currentRundown);
-    });
-
-    return { newEvent, newRundown, didMutate };
-  }
-
-  return scopedMutation;
-}
-
-type AddArgs = MutationParams<{ afterId?: string; parent: EntryId | null; entry: OntimeEntry }>;
-/**
- * Add entry to rundown, handles the following cases:
- * - 1. add entry in block, after a given entry
- * - 2. add entry in block, at the beginning
- * - 3. add entry to the rundown, after a given entry
- * - 4. add entry to the rundown, at the beginning
- */
-export function add({ rundown, afterId, parent, entry }: AddArgs): Required<MutatingReturn> {
-  if (parent) {
-    const parentBlock = rundown.entries[parent] as OntimeBlock;
-    if (afterId) {
-      const atEventsIndex = parentBlock.events.indexOf(afterId) + 1;
-      const atFlatIndex = rundown.flatOrder.indexOf(afterId) + 1;
-      parentBlock.events = insertAtIndex(atEventsIndex, entry.id, parentBlock.events);
-      rundown.flatOrder = insertAtIndex(atFlatIndex, entry.id, rundown.flatOrder);
-    } else {
-      parentBlock.events = insertAtIndex(0, entry.id, parentBlock.events);
-      const atFlatIndex = rundown.flatOrder.indexOf(parent) + 1;
-      rundown.flatOrder = insertAtIndex(atFlatIndex, entry.id, rundown.flatOrder);
-    }
-  } else {
-    if (afterId) {
-      const atOrderIndex = rundown.order.indexOf(afterId) + 1;
-      const atFlatIndex = rundown.flatOrder.indexOf(afterId) + 1;
-      rundown.order = insertAtIndex(atOrderIndex, entry.id, rundown.order);
-      rundown.flatOrder = insertAtIndex(atFlatIndex, entry.id, rundown.flatOrder);
-    } else {
-      rundown.order = insertAtIndex(0, entry.id, rundown.order);
-      rundown.flatOrder = insertAtIndex(0, entry.id, rundown.flatOrder);
-    }
-  }
-
-  // either way, we insert the entry into the rundown
-  rundown.entries[entry.id] = entry;
-  setIsStale();
-  return { newRundown: rundown, changeList: [], newEvent: entry, didMutate: true };
-}
-
-/**
- * Utility for invalidating service cache if a custom field is used
- */
-function invalidateIfUsed(label: CustomFieldLabel) {
-  // if the field was in use, we mark the cache as stale
-  if (label in rundownMetadata.assignedCustomFields) {
-    setIsStale();
-  }
-  // ... and schedule a cache update
-  // schedule a non priority cache update
-  setImmediate(async () => {
-    updateCache();
-    await getDataProvider().setRundown(currentRundownId, currentRundown);
-  });
-}
-
-/**
- * Utility for scheduling a non priority custom field persist
- */
-function scheduleCustomFieldPersist() {
-  setImmediate(async () => {
-    await getDataProvider().setCustomFields(projectCustomFields);
-  });
-}
-
-/**
- * Sanitises and creates a custom field in the database
- */
-export function createCustomField(field: CustomField): CustomFields {
-  const { label, type, colour } = field;
-  const key = customFieldLabelToKey(label);
-
-  if (key === null) {
-    throw new Error('Unable to convert label to a valid key');
-  }
-
-  // check if label already exists
-  const alreadyExists = Object.hasOwn(projectCustomFields, key);
-
-  if (alreadyExists) {
-    throw new Error('Label already exists');
-  }
-
-  // update object and persist
-  projectCustomFields[key] = { label, type, colour };
-
-  scheduleCustomFieldPersist();
-
-  return projectCustomFields;
-}
-
-/**
- * Edits an existing custom field in the database
- */
-export function editCustomField(key: string, newField: Partial<CustomField>): CustomFields {
-  if (!(key in projectCustomFields)) {
-    throw new Error('Could not find label');
-  }
-
-  const existingField = projectCustomFields[key];
-  if (newField.type !== undefined && existingField.type !== newField.type) {
-    throw new Error('Change of field type is not allowed');
-  }
-
-  if (newField.label === undefined) {
-    throw new Error('Missing label');
-  }
-
-  const newKey = customFieldLabelToKey(newField.label);
-  if (newKey === null) {
-    throw new Error('Unable to convert label to a valid key');
-  }
-  projectCustomFields[newKey] = { ...existingField, ...newField };
-
-  if (key !== newKey) {
-    delete projectCustomFields[key];
-    customFieldChangelog[key] = newKey;
-  }
-
-  scheduleCustomFieldPersist();
-  invalidateIfUsed(key);
-
-  return projectCustomFields;
-}
-
-/**
- * Deletes a custom field from the database
- */
-export function removeCustomField(label: string): CustomFields {
-  if (label in projectCustomFields) {
-    delete projectCustomFields[label];
-  }
-
-  scheduleCustomFieldPersist();
-  invalidateIfUsed(label);
-
-  return projectCustomFields;
-}
diff --git a/apps/server/src/services/rundown-service/rundownCache.utils.ts b/apps/server/src/services/rundown-service/rundownCache.utils.ts
deleted file mode 100644
index 073a39f8f..000000000
--- a/apps/server/src/services/rundown-service/rundownCache.utils.ts
+++ /dev/null
@@ -1,251 +0,0 @@
-import {
-  OntimeEvent,
-  CustomFieldLabel,
-  CustomFields,
-  OntimeEntry,
-  EntryId,
-  isOntimeEvent,
-  isPlayableEvent,
-  isOntimeDelay,
-  PlayableEvent,
-  RundownEntries,
-} from 'ontime-types';
-import { dayInMs, getLinkedTimes, getTimeFrom, isNewLatest } from 'ontime-utils';
-
-import type { RundownMetadata } from '../../api-data/rundown/rundown.types.js';
-
-/**
- * Utility function to add an entry, mutates given assignedCustomFields in place
- * @param label
- * @param eventId
- */
-export function addToCustomAssignment(
-  label: CustomFieldLabel,
-  eventId: string,
-  assignedCustomFields: Record<string, string[]>,
-) {
-  if (!Array.isArray(assignedCustomFields[label])) {
-    assignedCustomFields[label] = [];
-  }
-  assignedCustomFields[label].push(eventId);
-}
-
-/**
- * Sanitises custom fields and updates values if necessary
- * Mutates in place mutableEvent and assignedCustomFields
- */
-export function handleCustomField(
-  customFields: CustomFields,
-  customFieldChangelog: Record<string, string>,
-  mutableEvent: OntimeEvent,
-  assignedCustomFields: Record<string, string[]>,
-) {
-  for (const field in mutableEvent.custom) {
-    // rename the property if it is in the changelog
-    if (field in customFieldChangelog) {
-      const oldData = mutableEvent.custom[field];
-      const newLabel = customFieldChangelog[field];
-
-      mutableEvent.custom[newLabel] = oldData;
-      delete mutableEvent.custom[field];
-      addToCustomAssignment(newLabel, mutableEvent.id, assignedCustomFields);
-      continue;
-    }
-
-    if (field in customFields) {
-      // add field to assignment map
-      addToCustomAssignment(field, mutableEvent.id, assignedCustomFields);
-    } else {
-      // delete data if it is not declared in project level custom fields
-      delete mutableEvent.custom[field];
-    }
-  }
-}
-
-/**
- * Utility for calculating if the current events should have a day offset
- * @param current the current event under test
- * @param previous the previous event
- * @returns 0 or 1 for easy accumulation with the total days
- */
-export function calculateDayOffset(
-  current: Pick<OntimeEvent, 'timeStart'>,
-  previous: Pick<OntimeEvent, 'timeStart' | 'duration'> | null,
-) {
-  // if there is no previous there can't be a day offset
-  if (!previous) {
-    return 0;
-  }
-
-  // if the previous events duration is zero it will push the current event to next day
-  if (previous.duration === 0) {
-    return 0;
-  }
-
-  // if the previous event crossed midnight then the current event is in the next day
-  if (previous.timeStart + previous.duration >= dayInMs) {
-    return 1;
-  }
-
-  // if the current events starts at the same time or before the previous event then it is the next day
-  if (current.timeStart <= previous.timeStart) {
-    return 1;
-  }
-
-  return 0;
-}
-
-export type ProcessedRundownMetadata = RundownMetadata & {
-  entries: RundownEntries;
-  order: EntryId[];
-  previousEvent: PlayableEvent | null; // The playableEvent from the previous iteration
-  latestEvent: PlayableEvent | null; // The playableEvent most forwards in time processed so far
-  previousEntry: OntimeEntry | null; // The entry processed in the previous iteration
-};
-
-/**
- * Factory function to create a rundown metadata processor
- * @returns {process, getMetadata} process() - processes entries in order | getMetadata() -> returns the current metadata
- */
-export function makeRundownMetadata(customFields: CustomFields, customFieldChangelog: Record<string, string>) {
-  let rundownMeta: ProcessedRundownMetadata = {
-    totalDelay: 0,
-    totalDuration: 0,
-    totalDays: 0,
-    firstStart: null,
-    lastEnd: null,
-
-    assignedCustomFields: {},
-    playableEventOrder: [],
-    timedEventOrder: [],
-    flatEntryOrder: [],
-
-    entries: {},
-    order: [],
-    previousEvent: null,
-    latestEvent: null,
-    previousEntry: null,
-  };
-
-  function process<T extends OntimeEntry>(
-    entry: T,
-    childOfBlock: EntryId | null,
-  ): { processedData: ProcessedRundownMetadata; processedEntry: T } {
-    const data = processEntry(rundownMeta, customFields, customFieldChangelog, entry, childOfBlock);
-    rundownMeta = data.processedData;
-    return data;
-  }
-
-  function getMetadata(): ProcessedRundownMetadata {
-    return rundownMeta;
-  }
-
-  return { process, getMetadata };
-}
-
-/**
- * Processes a single entry and updates the rundown metadata
- */
-function processEntry<T extends OntimeEntry>(
-  rundownMetadata: ProcessedRundownMetadata,
-  customFields: CustomFields,
-  customFieldChangelog: Record<string, string>,
-  entry: T,
-  childOfBlock: EntryId | null,
-): { processedData: ProcessedRundownMetadata; processedEntry: T } {
-  const processedData = { ...rundownMetadata };
-  const currentEntry = structuredClone(entry);
-  processedData.flatEntryOrder.push(currentEntry.id);
-
-  if (isOntimeEvent(currentEntry)) {
-    processedData.timedEventOrder.push(currentEntry.id);
-
-    /**
-     * 1.Checks that link can be established (ie, events exist and are valid)
-     * and populates the time data from link
-     * The linked event is always the previous playable event
-     * If no previous event exists, the link is removed
-     */
-    if (currentEntry.linkStart) {
-      if (processedData.previousEvent) {
-        const timePatch = getLinkedTimes(currentEntry, processedData.previousEvent);
-        currentEntry.timeStart = timePatch.timeStart;
-        currentEntry.timeEnd = timePatch.timeEnd;
-        currentEntry.duration = timePatch.duration;
-      } else {
-        currentEntry.linkStart = false;
-      }
-    }
-
-    // 2. handle custom fields - mutates currentEntry
-    handleCustomField(customFields, customFieldChangelog, currentEntry, processedData.assignedCustomFields);
-
-    processedData.totalDays += calculateDayOffset(currentEntry, processedData.previousEvent);
-    currentEntry.dayOffset = processedData.totalDays;
-    currentEntry.delay = 0; // this means we dont calculate delays or gaps for skipped events
-    currentEntry.gap = 0; // this means we dont calculate delays or gaps for skipped events
-    currentEntry.parent = childOfBlock;
-
-    // update rundown metadata, it only concerns playable events
-    if (isPlayableEvent(currentEntry)) {
-      processedData.playableEventOrder.push(currentEntry.id);
-
-      // first start is always the first event
-      if (processedData.firstStart === null) {
-        processedData.firstStart = currentEntry.timeStart;
-      }
-
-      currentEntry.gap = getTimeFrom(currentEntry, processedData.latestEvent);
-
-      if (currentEntry.gap === 0) {
-        // event starts on previous finish, we add its duration
-        processedData.totalDuration += currentEntry.duration;
-      } else if (currentEntry.gap > 0) {
-        // event has a gap, we add the gap and the duration
-        processedData.totalDuration += currentEntry.gap + currentEntry.duration;
-      } else if (currentEntry.gap < 0) {
-        // there is an overlap, we remove the overlap from the duration
-        // ensuring that the sum is not negative (ie: fully overlapped events)
-        // NOTE: we add the gap since it is a negative number
-        processedData.totalDuration += Math.max(currentEntry.duration + currentEntry.gap, 0);
-      }
-
-      // remove eventual gaps from the accumulated delay
-      // we only affect positive delays (time forwards)
-      if (processedData.totalDelay > 0 && currentEntry.gap > 0) {
-        let correctedDelay = 0;
-        // we need to separate the delay that is accumulated from one that may exist after the gap
-        if (isOntimeDelay(processedData.previousEntry)) {
-          correctedDelay = processedData.previousEntry.duration;
-          processedData.totalDelay -= correctedDelay;
-        }
-        processedData.totalDelay = Math.max(processedData.totalDelay - currentEntry.gap, 0);
-        processedData.totalDelay += correctedDelay;
-      }
-
-      // current event delay is the current accumulated delay
-      currentEntry.delay = processedData.totalDelay;
-
-      // assign data for next iteration
-      processedData.previousEvent = currentEntry;
-
-      // lastEntry is the event with the latest end time
-      if (isNewLatest(currentEntry, processedData.latestEvent)) {
-        processedData.latestEvent = currentEntry;
-        processedData.lastEnd = currentEntry.timeEnd;
-      }
-    }
-  } else if (isOntimeDelay(currentEntry)) {
-    // !!! this must happen after handling the links
-    processedData.totalDelay += currentEntry.duration;
-    currentEntry.parent = childOfBlock;
-  }
-
-  if (!childOfBlock) {
-    processedData.order.push(currentEntry.id);
-  }
-  processedData.entries[currentEntry.id] = currentEntry;
-  processedData.previousEntry = currentEntry;
-
-  return { processedData, processedEntry: currentEntry };
-}
diff --git a/apps/server/src/services/rundown-service/rundownUtils.ts b/apps/server/src/services/rundown-service/rundownUtils.ts
deleted file mode 100644
index 2d917d6ab..000000000
--- a/apps/server/src/services/rundown-service/rundownUtils.ts
+++ /dev/null
@@ -1,188 +0,0 @@
-import {
-  OntimeEvent,
-  Rundown,
-  OntimeEntry,
-  PlayableEvent,
-  EntryId,
-  RundownEntries,
-  ProjectRundowns,
-} from 'ontime-types';
-
-import { getCurrentRundown } from '../../api-data/rundown/rundown.dao.js';
-
-import * as cache from './rundownCache.js';
-
-/**
- * returns the the project rundown and the order arrays
- */
-export function getRundownData() {
-  return {
-    rundown: getCurrentRundown(),
-    rundownOrder: cache.getEventOrder(),
-  };
-}
-
-/**
- * returns all events of type OntimeEvent
- */
-export function getTimedEvents(): OntimeEvent[] {
-  const { entries } = cache.get();
-  const { timedEventsOrder } = cache.getEventOrder();
-  return makeFlatRundownFromOrder(timedEventsOrder, entries);
-}
-
-/**
- * Utility flattens a normalised rundown
- */
-function makeFlatRundownFromOrder<T>(order: EntryId[], events: RundownEntries): T[] {
-  return order.map((id) => events[id] as T);
-}
-
-/**
- * returns an event given its index after filtering for OntimeEvents
- */
-export function getEventAtIndex(eventIndex: number): OntimeEvent | undefined {
-  const { timedEventsOrder } = cache.getEventOrder();
-  const eventId = timedEventsOrder[eventIndex];
-
-  if (!eventId) {
-    return undefined;
-  }
-  const { entries } = getCurrentRundown();
-  return entries[eventId] as OntimeEvent | undefined;
-}
-
-/**
- * returns first event that matches a given ID
- */
-export function getEntryWithId(entryId: EntryId): OntimeEntry | undefined {
-  const { entries } = getCurrentRundown();
-  return entries[entryId];
-}
-
-/**
- * Utility returns the first playable event in rundown
- */
-export function getFirstPlayable(playableOrder: EntryId[]): PlayableEvent | undefined {
-  const firstEventId = playableOrder.at(0);
-  if (!firstEventId) return;
-  return getEntryWithId(firstEventId) as PlayableEvent | undefined;
-}
-
-/**
- * returns first event that matches a given cue
- */
-export function getNextEventWithCue(targetCue: string, currentEventIndex = 0): OntimeEvent | undefined {
-  const { playableEventsOrder } = cache.getEventOrder();
-
-  const lowerCaseCue = targetCue.toLowerCase();
-
-  for (let i = currentEventIndex; i < playableEventsOrder.length; i++) {
-    const eventId = playableEventsOrder[i];
-    const event = getEntryWithId(eventId) as PlayableEvent | undefined;
-    if (event?.cue.toLowerCase() === lowerCaseCue) {
-      return event;
-    }
-  }
-}
-
-/**
- * finds the previous event
- */
-export function findPrevious(currentEventId?: string): OntimeEvent | undefined {
-  const { playableEventsOrder } = cache.getEventOrder();
-
-  if (!playableEventsOrder.length) {
-    return;
-  }
-
-  // if there is no event running, go to first
-  if (!currentEventId) {
-    return getFirstPlayable(playableEventsOrder);
-  }
-
-  const currentIndex = playableEventsOrder.findIndex((eventId) => eventId === currentEventId);
-  const newIndex = Math.max(currentIndex - 1, 0);
-  const previousEventId = playableEventsOrder.at(newIndex);
-
-  if (!previousEventId) {
-    return getFirstPlayable(playableEventsOrder);
-  }
-
-  return getEntryWithId(previousEventId) as PlayableEvent | undefined;
-}
-
-/**
- * finds the next event
- */
-export function findNext(currentEventId?: string): PlayableEvent | undefined {
-  const { playableEventOrder } = cache.getMetadata();
-
-  if (!playableEventOrder.length) {
-    return;
-  }
-
-  // if there is no event running, go to first
-  if (!currentEventId) {
-    return getFirstPlayable(playableEventOrder);
-  }
-
-  const currentIndex = playableEventOrder.findIndex((eventId) => eventId === currentEventId);
-  const newIndex = Math.min(currentIndex + 1, playableEventOrder.length - 1);
-  const nextEventId = playableEventOrder.at(newIndex);
-
-  if (!nextEventId) {
-    return getFirstPlayable(playableEventOrder);
-  }
-
-  return getEntryWithId(nextEventId) as PlayableEvent | undefined;
-}
-
-export function filterTimedEvents(rundown: Rundown, timedEventOrder: EntryId[]): OntimeEvent[] {
-  return timedEventOrder.map((id) => rundown.entries[id] as OntimeEvent);
-}
-
-/**
- * Gets the first rundown in the project
- * We know that the project has at least one rundown
- */
-export function getFirstRundown(rundowns: ProjectRundowns): Rundown {
-  const firstKey = Object.keys(rundowns)[0];
-
-  // eslint-disable-next-line no-unused-labels -- dev code path
-  DEV: {
-    if (!firstKey) {
-      throw new Error('rundownUtils.getFirstRundown() No rundowns found');
-    }
-  }
-
-  return rundowns[firstKey];
-}
-
-/**
- * Returns a rundown given its ID
- */
-export function getRundownOrThrow(rundowns: ProjectRundowns, rundownId: string): Rundown {
-  if (!rundowns[rundownId]) {
-    throw new Error(`Rundown with ID ${rundownId} not found`);
-  }
-  return rundowns[rundownId];
-}
-
-/**
- * Receives an insertion order and returns the reference to an event ID
- * after which we will insert the new event
- */
-export function getPreviousId(rundown: Rundown, afterId?: EntryId, beforeId?: EntryId): EntryId | null {
-  if (afterId) {
-    return afterId;
-  }
-
-  if (beforeId) {
-    const atIndex = rundown.flatOrder.findIndex((id) => id === beforeId);
-    if (atIndex < 1) return null;
-    return rundown.flatOrder[atIndex - 1];
-  }
-
-  return null;
-}
diff --git a/apps/server/src/services/runtime-service/RuntimeService.ts b/apps/server/src/services/runtime-service/RuntimeService.ts
index 6bd236295..4be8e192b 100644
--- a/apps/server/src/services/runtime-service/RuntimeService.ts
+++ b/apps/server/src/services/runtime-service/RuntimeService.ts
@@ -23,23 +23,22 @@ import { eventStore } from '../../stores/EventStore.js';
 import { triggerReportEntry } from '../../api-data/report/report.service.js';
 import { timerConfig } from '../../setup/config.js';
 import { triggerAutomations } from '../../api-data/automation/automation.service.js';
-import { getCurrentRundown } from '../../api-data/rundown/rundown.dao.js';
+import { getCurrentRundown, getEntryWithId, getRundownMetadata } from '../../api-data/rundown/rundown.dao.js';
 
 import { EventTimer } from '../EventTimer.js';
 import { RestorePoint, restoreService } from '../RestoreService.js';
-import {
-  findNext,
-  findPrevious,
-  getEventAtIndex,
-  getNextEventWithCue,
-  getEntryWithId,
-  getTimedEvents,
-  getRundownData,
-} from '../rundown-service/rundownUtils.js';
 import { skippedOutOfEvent } from '../timerUtils.js';
-import { getEventOrder } from '../rundown-service/rundownCache.js';
 
-import { getForceUpdate, getShouldClockUpdate, getShouldTimerUpdate } from './rundownService.utils.js';
+import {
+  filterTimedEvents,
+  findNextPlayableId,
+  findNextPlayableWithCue,
+  findPreviousPlayableId,
+  getEventAtIndex,
+  getForceUpdate,
+  getShouldClockUpdate,
+  getShouldTimerUpdate,
+} from './rundownService.utils.js';
 
 type RuntimeStateEventKeys = keyof Pick<RuntimeState, 'eventNext' | 'eventNow' | 'publicEventNow' | 'publicEventNext'>;
 
@@ -198,7 +197,10 @@ class RuntimeService {
   }
 
   private isNewNext() {
-    const timedEvents = getTimedEvents();
+    const rundown = getCurrentRundown();
+    const { timedEventOrder } = getRundownMetadata();
+    const timedEvents = filterTimedEvents(rundown, timedEventOrder);
+
     const state = runtimeState.getState();
     const now = state.eventNow?.id;
     const next = state.eventNext?.id;
@@ -271,8 +273,8 @@ class RuntimeService {
           runtimeState.updateLoaded(eventNow);
         } else {
           const rundown = getCurrentRundown();
-          const { timedEventsOrder } = getEventOrder();
-          runtimeState.updateAll(rundown, timedEventsOrder);
+          const { timedEventOrder } = getRundownMetadata();
+          runtimeState.updateAll(rundown, timedEventOrder);
         }
         return;
       }
@@ -281,7 +283,9 @@ class RuntimeService {
     // Maybe the event will become the next
     isNext = this.isNewNext();
     if (isNext) {
-      const timedEvents = getTimedEvents();
+      const rundown = getCurrentRundown();
+      const { timedEventOrder } = getRundownMetadata();
+      const timedEvents = filterTimedEvents(rundown, timedEventOrder);
       runtimeState.loadNext(timedEvents);
     }
   }
@@ -299,8 +303,10 @@ class RuntimeService {
     }
     const previousState = runtimeState.getState();
 
-    const { rundown, rundownOrder } = getRundownData();
-    const success = runtimeState.load(event, rundown, rundownOrder.timedEventsOrder, initialData);
+    // we can ignore events which are not playable
+    const rundown = getCurrentRundown();
+    const rundownMetadata = getRundownMetadata();
+    const success = runtimeState.load(event, rundown, rundownMetadata.playableEventOrder, initialData);
 
     if (success) {
       logger.info(LogOrigin.Playback, `Loaded event with ID ${event.id}`);
@@ -342,14 +348,20 @@ class RuntimeService {
    */
   @broadcastResult
   public startByIndex(eventIndex: number): boolean {
-    const event = getEventAtIndex(eventIndex);
+    const rundown = getCurrentRundown();
+    const { timedEventOrder } = getRundownMetadata();
+
+    const event = getEventAtIndex(rundown, timedEventOrder, eventIndex);
+
     if (!event) {
       return false;
     }
+
     const loaded = this.loadEvent(event);
     if (!loaded) {
       return false;
     }
+
     return this.handleStart();
   }
 
@@ -360,10 +372,21 @@ class RuntimeService {
    */
   @broadcastResult
   public startByCue(cue: string): boolean {
-    const event = getNextEventWithCue(cue); //TODO: add index
+    const state = runtimeState.getState();
+    const rundown = getCurrentRundown();
+    const { playableEventOrder } = getRundownMetadata();
+
+    const event = findNextPlayableWithCue(
+      rundown,
+      playableEventOrder,
+      cue,
+      state.runtime.selectedEventIndex ?? undefined,
+    );
+
     if (!event) {
       return false;
     }
+
     const loaded = this.loadEvent(event);
     if (!loaded) {
       return false;
@@ -392,7 +415,11 @@ class RuntimeService {
    */
   @broadcastResult
   public loadByIndex(eventIndex: number): boolean {
-    const event = getEventAtIndex(eventIndex);
+    const rundown = getCurrentRundown();
+    const { timedEventOrder } = getRundownMetadata();
+
+    const event = getEventAtIndex(rundown, timedEventOrder, eventIndex);
+
     if (!event) {
       return false;
     }
@@ -406,10 +433,21 @@ class RuntimeService {
    */
   @broadcastResult
   public loadByCue(cue: string): boolean {
-    const event = getNextEventWithCue(cue); //TODO: add index
+    const state = runtimeState.getState();
+    const rundown = getCurrentRundown();
+    const { playableEventOrder } = getRundownMetadata();
+
+    const event = findNextPlayableWithCue(
+      rundown,
+      playableEventOrder,
+      cue,
+      state.runtime.selectedEventIndex ?? undefined,
+    );
+
     if (!event) {
       return false;
     }
+
     return this.loadEvent(event);
   }
 
@@ -421,10 +459,16 @@ class RuntimeService {
    */
   private handleLoadPrevious(): boolean {
     const state = runtimeState.getState();
-    const previousEvent = findPrevious(state.eventNow?.id);
-    if (previousEvent) {
-      return this.loadEvent(previousEvent);
+    const { playableEventOrder } = getRundownMetadata();
+
+    const previousId = findPreviousPlayableId(playableEventOrder, state.eventNow?.id);
+    if (previousId) {
+      const previousEvent = getEntryWithId(previousId);
+      if (previousEvent && isOntimeEvent(previousEvent)) {
+        return this.loadEvent(previousEvent);
+      }
     }
+
     return false;
   }
 
@@ -446,8 +490,15 @@ class RuntimeService {
    */
   private handleLoadNext(): boolean {
     const state = runtimeState.getState();
-    const nextEvent = findNext(state.eventNow?.id);
-    if (nextEvent) {
+    const { playableEventOrder } = getRundownMetadata();
+
+    const nextId = findNextPlayableId(playableEventOrder, state.eventNow?.id);
+    if (nextId) {
+      const nextEvent = getEntryWithId(nextId);
+      if (!nextEvent || !isOntimeEvent(nextEvent)) {
+        return false;
+      }
+
       if (state.timer.playback === Playback.Roll) {
         return this.loadEvent(nextEvent, { firstStart: state.runtime.actualStart });
       }
@@ -457,7 +508,6 @@ class RuntimeService {
     logger.info(LogOrigin.Playback, 'No next event found! Continuing playback');
     return false;
   }
-
   /**
    * Loads event after currently selected
    * @return {boolean} success
@@ -585,10 +635,10 @@ class RuntimeService {
    */
   private rollLoaded(offset?: number) {
     const rundown = getCurrentRundown();
-    const { timedEventsOrder } = getEventOrder();
+    const { timedEventOrder } = getRundownMetadata();
 
     try {
-      runtimeState.roll(rundown, timedEventsOrder, offset);
+      runtimeState.roll(rundown, timedEventOrder, offset);
     } catch (error) {
       logger.error(LogOrigin.Server, `Roll: ${error}`);
     }
@@ -608,8 +658,10 @@ class RuntimeService {
     }
 
     try {
-      const { rundown, rundownOrder } = getRundownData();
-      const result = runtimeState.roll(rundown, rundownOrder.timedEventsOrder);
+      const rundown = getCurrentRundown();
+      const rundownMetadata = getRundownMetadata();
+      const result = runtimeState.roll(rundown, rundownMetadata.playableEventOrder);
+
       const newState = runtimeState.getState();
       if (result.eventId !== previousState.eventNow?.id) {
         logger.info(LogOrigin.Playback, `Loaded event with ID ${result.eventId}`);
@@ -660,8 +712,10 @@ class RuntimeService {
       return;
     }
 
-    const { rundown, rundownOrder } = getRundownData();
-    runtimeState.resume(restorePoint, event, rundown, rundownOrder.timedEventsOrder);
+    const rundown = getCurrentRundown();
+    const rundownMetadata = getRundownMetadata();
+    runtimeState.resume(restorePoint, event, rundown, rundownMetadata.playableEventOrder);
+
     logger.info(LogOrigin.Playback, 'Resuming playback');
   }
 
diff --git a/apps/server/src/services/runtime-service/rundownService.utils.ts b/apps/server/src/services/runtime-service/rundownService.utils.ts
index a551d64f2..ef4ebfbf3 100644
--- a/apps/server/src/services/runtime-service/rundownService.utils.ts
+++ b/apps/server/src/services/runtime-service/rundownService.utils.ts
@@ -1,5 +1,5 @@
 import { millisToSeconds } from 'ontime-utils';
-import { MaybeNumber, TimerType } from 'ontime-types';
+import { EntryId, isOntimeEvent, isPlayableEvent, MaybeNumber, OntimeEvent, Rundown, TimerType } from 'ontime-types';
 
 import { timerConfig } from '../../setup/config.js';
 
@@ -33,3 +33,97 @@ export function getForceUpdate(previousUpdate: number, now: number): boolean {
   const hasExceededRate = now - previousUpdate >= timerConfig.notificationRate;
   return isClockBehind || hasExceededRate;
 }
+
+/**
+ * finds the previous playable event, if it exists
+ */
+export function findPreviousPlayableId(playableEventsOrder: EntryId[], currentEventId?: string): EntryId | undefined {
+  if (!playableEventsOrder.length) {
+    return;
+  }
+
+  // if there is no event running, go to first
+  if (!currentEventId) {
+    return getFirstPlayableId(playableEventsOrder);
+  }
+
+  const currentIndex = playableEventsOrder.findIndex((eventId) => eventId === currentEventId);
+
+  if (currentIndex < 1) {
+    return getFirstPlayableId(playableEventsOrder);
+  }
+
+  return playableEventsOrder.at(currentIndex - 1);
+}
+
+/**
+ * finds the next event playable event, if it exists
+ */
+export function findNextPlayableId(playableEventsOrder: EntryId[], currentEventId?: string): EntryId | undefined {
+  if (!playableEventsOrder.length) {
+    return;
+  }
+
+  // if there is no event running, go to first
+  if (!currentEventId) {
+    return getFirstPlayableId(playableEventsOrder);
+  }
+
+  const currentIndex = playableEventsOrder.findIndex((eventId) => eventId === currentEventId);
+  if (currentIndex === -1 || currentIndex >= playableEventsOrder.length - 1) {
+    return getFirstPlayableId(playableEventsOrder);
+  }
+
+  return playableEventsOrder.at(currentIndex + 1);
+}
+
+/**
+ * returns first event that matches a given cue
+ */
+export function findNextPlayableWithCue(
+  rundown: Rundown,
+  playableEventsOrder: EntryId[],
+  targetCue: string,
+  currentEventIndex = 0,
+): OntimeEvent | undefined {
+  const lowerCaseCue = targetCue.toLowerCase();
+
+  for (let i = currentEventIndex; i < playableEventsOrder.length; i++) {
+    const eventId = playableEventsOrder[i];
+    const event = rundown.entries[eventId];
+    if (isOntimeEvent(event) && isPlayableEvent(event) && event.cue.toLowerCase() === lowerCaseCue) {
+      return event;
+    }
+  }
+}
+
+/**
+ * Utility returns the first playable event in rundown, if it exists
+ */
+export function getFirstPlayableId(playableOrder: EntryId[]): EntryId | undefined {
+  return playableOrder.at(0);
+}
+
+/**
+ * This is a utility function to return an event at a given index
+ * It uses the timedEventOrder so that the index is the same as the one in the UI
+ */
+export function getEventAtIndex(
+  rundown: Rundown,
+  timedEventOrder: EntryId[],
+  eventIndex: number,
+): OntimeEvent | undefined {
+  const eventId = timedEventOrder[eventIndex];
+  if (!eventId) {
+    return undefined;
+  }
+
+  return rundown.entries[eventId] as OntimeEvent | undefined;
+}
+
+/**
+ * TODO(v4): we dont need this function
+ */
+export function filterTimedEvents(rundown: Rundown, timedEventOrder: EntryId[]): OntimeEvent[] {
+  return timedEventOrder.map((id) => rundown.entries[id] as OntimeEvent);
+}
diff --git a/apps/server/src/services/sheet-service/SheetService.ts b/apps/server/src/services/sheet-service/SheetService.ts
index 842b1d110..af88aa0bf 100644
--- a/apps/server/src/services/sheet-service/SheetService.ts
+++ b/apps/server/src/services/sheet-service/SheetService.ts
@@ -12,12 +12,11 @@ import { Credentials, OAuth2Client } from 'google-auth-library';
 // TODO: rewrite logic to use fetch and remove dependency
 import got from 'got';
 
-import { parseExcel } from '../../utils/parser.js';
 import { logger } from '../../classes/Logger.js';
 import { parseRundowns } from '../../api-data/rundown/rundown.parser.js';
 import { getCurrentRundown, getProjectCustomFields } from '../../api-data/rundown/rundown.dao.js';
-
-import { getRundownOrThrow } from '../rundown-service/rundownUtils.js';
+import { parseExcel } from '../../api-data/excel/excel.parser.js';
+import { parseCustomFields } from '../../api-data/custom-fields/customFields.parser.js';
 
 import { cellRequestFromEvent, type ClientSecret, getA1Notation, isClientSecret } from './sheetUtils.js';
 import { catchCommonImportXlsxError } from './googleApi.utils.js';
@@ -381,6 +380,12 @@ export async function upload(sheetId: string, options: ImportMap) {
   }
 }
 
+/**
+ * Imports a sheet as a rundown
+ * @throws if the client is not authenticated
+ * @throws if the response from Google Sheets fails
+ * @throws if the sheet does not contain any data
+ */
 export async function download(
   sheetId: string,
   options: ImportMap,
@@ -418,10 +423,18 @@ export async function download(
     },
     customFields: dataFromSheet.customFields,
   };
-  const { customFields, rundowns } = parseRundowns(dataModel);
-  const rundown = getRundownOrThrow(rundowns, rundownId);
-  if (rundown.order.length < 1) {
+
+  const customFields = parseCustomFields(dataModel);
+  const rundowns = parseRundowns(dataModel, customFields);
+
+  const importedRundown = rundowns[rundownId];
+  if (!importedRundown) {
+    throw new Error(`Sheet: Rundown with ID ${rundownId} not found in the worksheet`);
+  }
+
+  if (importedRundown.order.length < 1) {
     throw new Error('Sheet: Could not find data to import in the worksheet');
   }
+
   return { rundown: rundowns[rundownId], customFields };
 }
diff --git a/apps/server/src/stores/runtimeState.ts b/apps/server/src/stores/runtimeState.ts
index cbce1fad6..da68316a7 100644
--- a/apps/server/src/stores/runtimeState.ts
+++ b/apps/server/src/stores/runtimeState.ts
@@ -27,8 +27,8 @@ import {
   getTimerPhase,
 } from '../services/timerUtils.js';
 import { loadRoll, normaliseRollStart } from '../services/rollUtils.js';
-import { filterTimedEvents } from '../services/rundown-service/rundownUtils.js';
 import { timerConfig } from '../setup/config.js';
+import { filterTimedEvents } from '../services/runtime-service/rundownService.utils.js';
 
 export type RuntimeState = {
   clock: number; // realtime clock
@@ -182,22 +182,23 @@ export function updateRundownData(rundownData: RundownData) {
 export function load(
   event: PlayableEvent,
   rundown: Rundown,
-  timedEventsOrder: EntryId[],
+  timedEventOrder: EntryId[],
   initialData?: Partial<TimerState & RestorePoint>,
 ): boolean {
   clearEventData();
 
-  if (timedEventsOrder.length === 0 || !isPlayableEvent(event)) {
+  if (timedEventOrder.length === 0 || !isPlayableEvent(event)) {
     return false;
   }
 
   // filter rundown
-  const eventIndex = timedEventsOrder.findIndex((timedEventId) => timedEventId === event.id);
+  const eventIndex = timedEventOrder.findIndex((entryId) => entryId === event.id);
   if (eventIndex === -1) {
     return false;
   }
 
-  const timedEvents = filterTimedEvents(rundown, timedEventsOrder);
+  // TODO(remove public): it is wasteful to recreate the object
+  const timedEvents = filterTimedEvents(rundown, timedEventOrder);
   // load events in memory along with their data
   loadNow(timedEvents, eventIndex);
   loadNext(timedEvents, eventIndex);
@@ -377,6 +378,7 @@ export function updateLoaded(event?: PlayableEvent): string | undefined {
  */
 export function updateAll(rundown: Rundown, timedEventsOrder: EntryId[]) {
   const timedEvents = filterTimedEvents(rundown, timedEventsOrder);
+  // TODO(remove public): we dont need to make the timedEvents object, we pass primitives and let the functions handle it
   loadNow(timedEvents);
   loadNext(timedEvents);
   updateLoaded(runtimeState.eventNow ?? undefined);
diff --git a/apps/server/src/utils/__tests__/parserUtils.test.ts b/apps/server/src/utils/__tests__/parserUtils.test.ts
index d9d414181..ba7202cad 100644
--- a/apps/server/src/utils/__tests__/parserUtils.test.ts
+++ b/apps/server/src/utils/__tests__/parserUtils.test.ts
@@ -1,4 +1,4 @@
-import { isEmptyObject, removeUndefined } from '../parserUtils.js';
+import { isEmptyObject, makeString, removeUndefined } from '../parserUtils.js';
 
 describe('isEmptyObject()', () => {
   test('finds an empty object', () => {
@@ -32,3 +32,39 @@ describe('removeUndefined()', () => {
     expect(removeUndefined(obj)).toStrictEqual(obj);
   });
 });
+
+describe('makeString()', () => {
+  it('converts variables to string', () => {
+    const cases = [
+      {
+        val: 2,
+        expected: '2',
+      },
+      {
+        val: 2.22222222,
+        expected: '2.22222222',
+      },
+      {
+        val: ['testing'],
+        expected: 'testing',
+      },
+      {
+        val: ' testing    ',
+        expected: 'testing',
+      },
+      {
+        val: { doing: 'testing' },
+        expected: 'fallback',
+      },
+      {
+        val: undefined,
+        expected: 'fallback',
+      },
+    ];
+
+    cases.forEach(({ val, expected }) => {
+      const converted = makeString(val, 'fallback');
+      expect(converted).toBe(expected);
+    });
+  });
+});
diff --git a/apps/server/src/utils/__tests__/varUtils.test.ts b/apps/server/src/utils/__tests__/varUtils.test.ts
deleted file mode 100644
index fd0f81eb2..000000000
--- a/apps/server/src/utils/__tests__/varUtils.test.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { isObject } from '../varUtils.js';
-
-describe('isObject', () => {
-  const testCases = [1, 0, false, undefined, 'test', null, () => undefined, []];
-  testCases.forEach((test) => {
-    it(`recognises normal primitives ${test}`, () => {
-      const result = isObject(test);
-      expect(result).toBe(false);
-    });
-  });
-});
diff --git a/apps/server/src/utils/fileManagement.ts b/apps/server/src/utils/fileManagement.ts
index 081eac287..314ba5473 100644
--- a/apps/server/src/utils/fileManagement.ts
+++ b/apps/server/src/utils/fileManagement.ts
@@ -114,7 +114,7 @@ export async function dockerSafeRename(oldPath: PathLike, newPath: PathLike) {
  * finds potential file index number in our (*) format and increments
  * the number section (*) must be separated from the name by a space
  * @example incrementProjectNumber('test(1).json') -> 'test(1).json'
-  * @example incrementProjectNumber('test (1).json') -> 'test(2).json'
+ * @example incrementProjectNumber('test (1).json') -> 'test(2).json'
  */
 export function incrementProjectNumber(path: string): string {
   const { dir, name, ext } = parse(path);
@@ -129,3 +129,12 @@ export function incrementProjectNumber(path: string): string {
 
   return join(dir, `${name.slice(0, openingParenIndex)} (${maybeNumber + 1})${ext}`);
 }
+
+/**
+ * @description Delete file from system
+ */
+export const deleteFile = async (filePath: string) => {
+  return await unlink(filePath).catch((error) => {
+    console.error('Could not delete file:', error);
+  });
+};
diff --git a/apps/server/src/utils/generateCrashReport.ts b/apps/server/src/utils/generateCrashReport.ts
index 37efc2137..f2bc8fe67 100644
--- a/apps/server/src/utils/generateCrashReport.ts
+++ b/apps/server/src/utils/generateCrashReport.ts
@@ -2,11 +2,11 @@ import { writeFileSync } from 'fs';
 import { join } from 'path';
 
 import { ONTIME_VERSION } from '../ONTIME_VERSION.js';
-import { get } from '../services/rundown-service/rundownCache.js';
 import { getState } from '../stores/runtimeState.js';
 import { publicDir } from '../setup/index.js';
 
 import { ensureDirectory } from './fileManagement.js';
+import { getCurrentRundown } from '../api-data/rundown/rundown.dao.js';
 /**
  * Writes a file to the crash report location
  * @param fileName
@@ -31,7 +31,7 @@ function writeToFile(fileName: string, content: object) {
 export function generateCrashReport(maybeError: unknown) {
   const timeNow = new Date().toISOString();
   const runtimeState = getState();
-  const rundownState = get();
+  const currentRundown = getCurrentRundown();
   const error =
     maybeError instanceof Error
       ? {
@@ -45,7 +45,7 @@ export function generateCrashReport(maybeError: unknown) {
     version: ONTIME_VERSION,
     error,
     runtimeState,
-    rundownState,
+    currentRundown,
   };
 
   writeToFile(`crash-log-${timeNow}.log`, crashReport);
diff --git a/apps/server/src/utils/parserFunctions.ts b/apps/server/src/utils/parserFunctions.ts
deleted file mode 100644
index 4b0bfffe4..000000000
--- a/apps/server/src/utils/parserFunctions.ts
+++ /dev/null
@@ -1,164 +0,0 @@
-import { CustomField, CustomFields, DatabaseModel, ProjectData, Settings, URLPreset, ViewSettings } from 'ontime-types';
-import { customFieldLabelToKey, isAlphanumericWithSpace } from 'ontime-utils';
-
-import { dbModel } from '../models/dataModel.js';
-
-import { type ErrorEmitter } from './parser.js';
-
-/**
- * Parse event portion of an entry
- */
-export function parseProject(data: Partial<DatabaseModel>, emitError?: ErrorEmitter): ProjectData {
-  if (!data.project) {
-    emitError?.('No data found to import');
-    return { ...dbModel.project };
-  }
-
-  console.log('Found project data, importing...');
-
-  return {
-    title: data.project.title ?? dbModel.project.title,
-    description: data.project.description ?? dbModel.project.description,
-    publicUrl: data.project.publicUrl ?? dbModel.project.publicUrl,
-    publicInfo: data.project.publicInfo ?? dbModel.project.publicInfo,
-    backstageUrl: data.project.backstageUrl ?? dbModel.project.backstageUrl,
-    backstageInfo: data.project.backstageInfo ?? dbModel.project.backstageInfo,
-    projectLogo: data.project.projectLogo ?? dbModel.project.projectLogo,
-    custom: data.project.custom ?? dbModel.project.custom,
-  };
-}
-
-/**
- * Parse settings portion of an entry
- */
-export function parseSettings(data: Partial<DatabaseModel>): Settings {
-  // skip if file definition is missing
-  // TODO: skip parsing if the version is not correct
-  if (!data.settings || data.settings?.version == null) {
-    throw new Error('ERROR: unable to parse settings, missing or incorrect version');
-  }
-
-  console.log('Found settings, importing...');
-
-  return {
-    version: dbModel.settings.version,
-    serverPort: data.settings.serverPort ?? dbModel.settings.serverPort,
-    editorKey: data.settings.editorKey ?? null,
-    operatorKey: data.settings.operatorKey ?? null,
-    timeFormat: data.settings.timeFormat ?? '24',
-    language: data.settings.language ?? 'en',
-  };
-}
-
-/**
- * Parse view settings portion of an entry
- */
-export function parseViewSettings(data: Partial<DatabaseModel>, emitError?: ErrorEmitter): ViewSettings {
-  if (!data.viewSettings) {
-    emitError?.('No data found to import');
-    return { ...dbModel.viewSettings };
-  }
-
-  console.log('Found view settings, importing...');
-
-  return {
-    dangerColor: data.viewSettings.dangerColor ?? dbModel.viewSettings.dangerColor,
-    endMessage: data.viewSettings.endMessage ?? dbModel.viewSettings.endMessage,
-    freezeEnd: data.viewSettings.freezeEnd ?? dbModel.viewSettings.freezeEnd,
-    normalColor: data.viewSettings.normalColor ?? dbModel.viewSettings.normalColor,
-    overrideStyles: data.viewSettings.overrideStyles ?? dbModel.viewSettings.overrideStyles,
-    warningColor: data.viewSettings.warningColor ?? dbModel.viewSettings.warningColor,
-  };
-}
-
-/**
- * Parse URL preset portion of an entry
- */
-export function parseUrlPresets(data: Partial<DatabaseModel>, emitError?: ErrorEmitter): URLPreset[] {
-  if (!data.urlPresets) {
-    emitError?.('No data found to import');
-    return [];
-  }
-
-  console.log('Found URL presets, importing...');
-
-  const newPresets: URLPreset[] = [];
-
-  for (const preset of data.urlPresets) {
-    const newPreset = {
-      enabled: preset.enabled ?? false,
-      alias: preset.alias ?? '',
-      pathAndParams: preset.pathAndParams ?? '',
-    };
-    newPresets.push(newPreset);
-  }
-
-  console.log(`Uploaded ${newPresets.length} preset(s)`);
-
-  return newPresets;
-}
-
-/**
- * Parse customFields entry
- */
-export function parseCustomFields(data: Partial<DatabaseModel>, emitError?: ErrorEmitter): CustomFields {
-  if (typeof data.customFields !== 'object') {
-    emitError?.('No data found to import');
-    return {};
-  }
-  console.log('Found Custom Fields, importing...');
-
-  const customFields = sanitiseCustomFields(data.customFields);
-  if (Object.keys(customFields).length !== Object.keys(data.customFields).length) {
-    emitError?.('Skipped invalid custom fields');
-  }
-  return customFields;
-}
-
-export function sanitiseCustomFields(data: object): CustomFields {
-  const newCustomFields: CustomFields = {};
-
-  for (const [originalKey, field] of Object.entries(data)) {
-    if (!isValidField(field)) {
-      continue;
-    }
-
-    if (!isAlphanumericWithSpace(field.label)) {
-      continue;
-    }
-
-    // Test label and key cohesion
-    const key = (() => {
-      const keyFromLabel = customFieldLabelToKey(field.label);
-      if (keyFromLabel === null) {
-        return originalKey;
-      }
-      return originalKey.toLowerCase() === keyFromLabel.toLowerCase() ? originalKey : keyFromLabel;
-    })();
-
-    if (key in newCustomFields) {
-      continue;
-    }
-
-    newCustomFields[key] = {
-      type: field.type,
-      colour: field.colour,
-      label: field.label,
-    };
-  }
-
-  function isValidField(data: unknown): data is CustomField {
-    return (
-      typeof data === 'object' &&
-      data !== null &&
-      'label' in data &&
-      data.label !== '' &&
-      'colour' in data &&
-      typeof data.colour === 'string' &&
-      'type' in data &&
-      (data.type === 'string' || data.type === 'image')
-    );
-  }
-
-  return newCustomFields;
-}
diff --git a/apps/server/src/utils/parserUtils.ts b/apps/server/src/utils/parserUtils.ts
index e6829d477..7edb76e22 100644
--- a/apps/server/src/utils/parserUtils.ts
+++ b/apps/server/src/utils/parserUtils.ts
@@ -1,4 +1,4 @@
-import { unlink } from 'fs';
+export type ErrorEmitter = (message: string) => void;
 
 /**
  * @description Ensures variable is string, it skips object types
@@ -12,17 +12,6 @@ export const makeString = (val: unknown, fallback = ''): string => {
   return val.toString().trim();
 };
 
-/**
- * @description Delete file from system
- */
-export const deleteFile = async (filePath: string) => {
-  unlink(filePath, (error) => {
-    if (error) {
-      console.error('Could not delete file:', error);
-    }
-  });
-};
-
 /**
  * @description Verifies if object is empty
  * @param {object} obj
diff --git a/apps/server/src/utils/varUtils.ts b/apps/server/src/utils/varUtils.ts
deleted file mode 100644
index d0fb68a3d..000000000
--- a/apps/server/src/utils/varUtils.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export function isObject(variable: unknown): boolean {
-  return typeof variable === 'object' && variable !== null && !Array.isArray(variable);
-}
diff --git a/packages/types/src/definitions/core/CustomFields.type.ts b/packages/types/src/definitions/core/CustomFields.type.ts
index 3aa0e80f0..3f8333fb4 100644
--- a/packages/types/src/definitions/core/CustomFields.type.ts
+++ b/packages/types/src/definitions/core/CustomFields.type.ts
@@ -1,10 +1,10 @@
-export type CustomFieldLabel = string;
+export type CustomFieldKey = string;
 
 export type CustomField = {
   type: 'string' | 'image';
   colour: string;
-  label: CustomFieldLabel;
+  label: string;
 };
 
-export type CustomFields = Record<CustomFieldLabel, CustomField>;
-export type EntryCustomFields = Record<CustomFieldLabel, string>;
+export type CustomFields = Record<CustomFieldKey, CustomField>;
+export type EntryCustomFields = Record<CustomFieldKey, string>;
diff --git a/packages/types/src/index.ts b/packages/types/src/index.ts
index 5a7fb8d51..e8a6d4ad6 100644
--- a/packages/types/src/index.ts
+++ b/packages/types/src/index.ts
@@ -59,7 +59,7 @@ export type { URLPreset } from './definitions/core/UrlPreset.type.js';
 export type {
   CustomFields,
   CustomField,
-  CustomFieldLabel,
+  CustomFieldKey,
   EntryCustomFields,
 } from './definitions/core/CustomFields.type.js';
 
diff --git a/packages/utils/index.ts b/packages/utils/index.ts
index a9d6bb3f4..8e2933083 100644
--- a/packages/utils/index.ts
+++ b/packages/utils/index.ts
@@ -28,6 +28,7 @@ export {
   getPreviousBlockNormal,
   swapEventData,
 } from './src/rundown-utils/rundownUtils.js';
+export { getFirstRundown } from './src/rundown/rundown.utils.js';
 
 // time format utils
 export {
@@ -53,7 +54,7 @@ export { isAlphanumeric, isAlphanumericWithSpace } from './src/regex-utils/isAlp
 export { isColourHex } from './src/regex-utils/isColourHex.js';
 export { splitWhitespace } from './src/regex-utils/splitWhitespace.js';
 
-export { customFieldLabelToKey, customKeyFromLabel } from './src/customField-utils/customFieldLabelToKey.js';
+export { customFieldLabelToKey, customKeyFromLabel } from './src/customField-utils/customFieldUtils.js';
 
 // helpers from externals
 export { deepmerge } from './src/externals/deepmerge.js';
diff --git a/packages/utils/src/customField-utils/customFieldLabelToKey.ts b/packages/utils/src/customField-utils/customFieldLabelToKey.ts
deleted file mode 100644
index 91fc57d97..000000000
--- a/packages/utils/src/customField-utils/customFieldLabelToKey.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import type { CustomFields } from 'ontime-types';
-
-import { isAlphanumericWithSpace } from '../regex-utils/isAlphanumeric.js';
-
-/**
- * @description Transforms a Custom field label into a valid key or returns null if not possible
- */
-export const customFieldLabelToKey = (label: string): string | null => {
-  if (isAlphanumericWithSpace(label)) {
-    return label.trim().replaceAll(' ', '_');
-  }
-  return null;
-};
-
-export const customKeyFromLabel = (label: string, fields: CustomFields): string | null => {
-  const maybeMatchingKey = Object.keys(fields).find((key) => fields[key].label === label);
-  if (maybeMatchingKey) {
-    return maybeMatchingKey;
-  }
-  return null;
-};
diff --git a/packages/utils/src/customField-utils/customFieldUtils.ts b/packages/utils/src/customField-utils/customFieldUtils.ts
new file mode 100644
index 000000000..b8a40821b
--- /dev/null
+++ b/packages/utils/src/customField-utils/customFieldUtils.ts
@@ -0,0 +1,19 @@
+import type { CustomFields } from 'ontime-types';
+
+/**
+ * Transforms an alphanumeric label with spaces into a valid key
+ */
+export function customFieldLabelToKey(label: string): string {
+  return label.trim().replaceAll(' ', '_');
+}
+
+/**
+ * Finds an object key in the CustomFields object that matches the given label
+ */
+export function customKeyFromLabel(label: string, fields: CustomFields): string | null {
+  const maybeMatchingKey = Object.keys(fields).find((key) => fields[key].label === label);
+  if (maybeMatchingKey) {
+    return maybeMatchingKey;
+  }
+  return null;
+}
diff --git a/packages/utils/src/rundown/rundown.utils.ts b/packages/utils/src/rundown/rundown.utils.ts
new file mode 100644
index 000000000..bc19f1eed
--- /dev/null
+++ b/packages/utils/src/rundown/rundown.utils.ts
@@ -0,0 +1,15 @@
+import type { ProjectRundowns, Rundown } from 'ontime-types';
+
+/**
+ * Gets the first rundown in the project
+ * We know that the project has at least one rundown
+ */
+export function getFirstRundown(rundowns: ProjectRundowns): Rundown {
+  const keys = Object.keys(rundowns);
+  if (keys.length === 0) {
+    throw new Error('No rundowns found in project');
+  }
+
+  const firstKey = keys[0];
+  return rundowns[firstKey];
+}