diff --git a/.github/workflows/build-artifacts.yml b/.github/workflows/build-artifacts.yml
new file mode 100644
index 0000000..c429830
--- /dev/null
+++ b/.github/workflows/build-artifacts.yml
@@ -0,0 +1,33 @@
+name: Build Artifacts
+
+on:
+  push:
+    branches:
+      - develop
+      - main
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v5
+
+      - name: Setup .NET
+        uses: actions/setup-dotnet@v5
+        with:
+          dotnet-version: 10.0.x
+
+      - name: Restore
+        run: dotnet restore
+
+      - name: Publish
+        run: dotnet publish -c Release --artifacts-path ./output
+
+      - name: Upload build artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: build-outputs
+          path: ./output/publish
+          if-no-files-found: error
\ No newline at end of file
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 23b2c26..6a0ef11 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -3,7 +3,7 @@ name: Deploy
 on:
   push:
     branches:
-      - develop
+      # - develop
       - main
 
 permissions:
diff --git a/src/Aspire/Aspire.AppHost/Extensions/AppExtensions.cs b/src/Aspire/Aspire.AppHost/Extensions/AppExtensions.cs
index 6dcf994..0f4163b 100644
--- a/src/Aspire/Aspire.AppHost/Extensions/AppExtensions.cs
+++ b/src/Aspire/Aspire.AppHost/Extensions/AppExtensions.cs
@@ -42,7 +42,7 @@ public static IDistributedApplicationBuilder AddDmsServices(
         //builder.AddDmsService<Meow>("Meow", rabbit, databases);
         builder.AddDmsService<Offloc_Cleaner>("Offloc-Cleaner", rabbit, databases);
         builder.AddDmsService<Offloc_Parser>("Offloc-Parser", rabbit, databases);
-        builder.AddDmsService<Orchestrator>("Orchestrator", rabbit, databases);
+        //builder.AddDmsService<Orchestrator>("Orchestrator", rabbit, databases);
 
         // Entry point - start the app to 'kick off' DMS
         builder.AddDmsService<Kickoff>("Kickoff", rabbit, databases)
diff --git a/src/AuditDb/AuditDb.sqlproj b/src/AuditDb/AuditDb.sqlproj
index b95c115..d70d28a 100644
--- a/src/AuditDb/AuditDb.sqlproj
+++ b/src/AuditDb/AuditDb.sqlproj
@@ -2,11 +2,11 @@
 <Project DefaultTargets="Build">
   <Sdk Name="Microsoft.Build.Sql" Version="2.0.0" />
   <PropertyGroup>
-		<Name>AuditDb</Name>
-		<DSP>Microsoft.Data.Tools.Schema.Sql.Sql160DatabaseSchemaProvider</DSP>
-		<ModelCollation>1033, CI</ModelCollation>
-		<RootNamespace>AuditDb</RootNamespace>
-		<AssemblyName>AuditDb</AssemblyName>
+    <Name>AuditDb</Name>
+    <DSP>Microsoft.Data.Tools.Schema.Sql.Sql160DatabaseSchemaProvider</DSP>
+    <ModelCollation>1033, CI</ModelCollation>
+    <RootNamespace>AuditDb</RootNamespace>
+    <AssemblyName>AuditDb</AssemblyName>
+    <ProjectGuid>{00000000-0000-0000-0000-000000000000}</ProjectGuid>
   </PropertyGroup>
-
 </Project>
\ No newline at end of file
diff --git a/src/ClusterDb/ClusterDb.sqlproj b/src/ClusterDb/ClusterDb.sqlproj
index 2d2c1aa..3af0a2e 100644
--- a/src/ClusterDb/ClusterDb.sqlproj
+++ b/src/ClusterDb/ClusterDb.sqlproj
@@ -1,12 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build">
   <Sdk Name="Microsoft.Build.Sql" Version="2.0.0" />
   <PropertyGroup>
-		<Name>ClusterDb</Name>
-		<DSP>Microsoft.Data.Tools.Schema.Sql.Sql160DatabaseSchemaProvider</DSP>
-		<ModelCollation>1033, CI</ModelCollation>
-		<RootNamespace>ClusterDb</RootNamespace>
-		<AssemblyName>ClusterDb</AssemblyName>
+    <Name>ClusterDb</Name>
+    <DSP>Microsoft.Data.Tools.Schema.Sql.Sql160DatabaseSchemaProvider</DSP>
+    <ModelCollation>1033, CI</ModelCollation>
+    <RootNamespace>ClusterDb</RootNamespace>
+    <AssemblyName>ClusterDb</AssemblyName>
+    <ProjectGuid>{00000000-0000-0000-0000-000000000000}</ProjectGuid>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\MatchingDb\MatchingDb.sqlproj">
diff --git a/src/ClusterDb/scripts/populate-reference-tables.sql b/src/ClusterDb/scripts/populate-reference-tables.sql
index 99ca38a..1d2ebbf 100644
--- a/src/ClusterDb/scripts/populate-reference-tables.sql
+++ b/src/ClusterDb/scripts/populate-reference-tables.sql
@@ -1,4 +1,5 @@
 IF '$(PopulateReferenceTables)' = 'True'
 BEGIN
+    RAISERROR (N'Executing post deployment script. This may take a while...', 0, 0) WITH NOWAIT;
     EXEC processing.PopulateReferenceTables;
 END
\ No newline at end of file
diff --git a/src/DeliusRunningPictureDb/DeliusRunningPictureDb.sqlproj b/src/DeliusRunningPictureDb/DeliusRunningPictureDb.sqlproj
index e49aa76..891a5f6 100644
--- a/src/DeliusRunningPictureDb/DeliusRunningPictureDb.sqlproj
+++ b/src/DeliusRunningPictureDb/DeliusRunningPictureDb.sqlproj
@@ -2,11 +2,11 @@
 <Project DefaultTargets="Build">
   <Sdk Name="Microsoft.Build.Sql" Version="2.0.0" />
   <PropertyGroup>
-		<Name>DeliusRunningPictureDb</Name>
-		<DSP>Microsoft.Data.Tools.Schema.Sql.Sql160DatabaseSchemaProvider</DSP>
-		<ModelCollation>1033, CI</ModelCollation>
-		<RootNamespace>DeliusRunningPictureDb</RootNamespace>
-		<AssemblyName>DeliusRunningPictureDb</AssemblyName>
+    <Name>DeliusRunningPictureDb</Name>
+    <DSP>Microsoft.Data.Tools.Schema.Sql.Sql160DatabaseSchemaProvider</DSP>
+    <ModelCollation>1033, CI</ModelCollation>
+    <RootNamespace>DeliusRunningPictureDb</RootNamespace>
+    <AssemblyName>DeliusRunningPictureDb</AssemblyName>
+    <ProjectGuid>{00000000-0000-0000-0000-000000000000}</ProjectGuid>
   </PropertyGroup>
-
 </Project>
\ No newline at end of file
diff --git a/src/DeliusStagingDb/DeliusStagingDb.sqlproj b/src/DeliusStagingDb/DeliusStagingDb.sqlproj
index ce34ca5..d262e6d 100644
--- a/src/DeliusStagingDb/DeliusStagingDb.sqlproj
+++ b/src/DeliusStagingDb/DeliusStagingDb.sqlproj
@@ -2,15 +2,16 @@
 <Project DefaultTargets="Build">
   <Sdk Name="Microsoft.Build.Sql" Version="2.0.0" />
   <PropertyGroup>
-		<Name>StagingDb</Name>
-		<DSP>Microsoft.Data.Tools.Schema.Sql.Sql160DatabaseSchemaProvider</DSP>
-		<ModelCollation>1033, CI</ModelCollation>
-		<RootNamespace>StagingDb</RootNamespace>
-		<AssemblyName>StagingDb</AssemblyName>
+    <Name>StagingDb</Name>
+    <DSP>Microsoft.Data.Tools.Schema.Sql.Sql160DatabaseSchemaProvider</DSP>
+    <ModelCollation>1033, CI</ModelCollation>
+    <RootNamespace>StagingDb</RootNamespace>
+    <AssemblyName>StagingDb</AssemblyName>
+    <ProjectGuid>{00000000-0000-0000-0000-000000000000}</ProjectGuid>
   </PropertyGroup>
   <ItemGroup>
-	<None Include="Scripts\Cleanup.sql">
-	  <CopyToOutputDirectory>DoNotCopy</CopyToOutputDirectory>
-	</None>
+    <None Include="Scripts\Cleanup.sql">
+      <CopyToOutputDirectory>DoNotCopy</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/MatchingDb/MatchingDb.sqlproj b/src/MatchingDb/MatchingDb.sqlproj
index d63b258..5aef1b4 100644
--- a/src/MatchingDb/MatchingDb.sqlproj
+++ b/src/MatchingDb/MatchingDb.sqlproj
@@ -2,11 +2,12 @@
 <Project DefaultTargets="Build">
   <Sdk Name="Microsoft.Build.Sql" Version="2.0.0" />
   <PropertyGroup>
-		<Name>MatchingDb</Name>
-		<DSP>Microsoft.Data.Tools.Schema.Sql.Sql160DatabaseSchemaProvider</DSP>
-		<ModelCollation>1033, CI</ModelCollation>
-		<RootNamespace>MatchingDb</RootNamespace>
-		<AssemblyName>MatchingDb</AssemblyName>
+    <Name>MatchingDb</Name>
+    <DSP>Microsoft.Data.Tools.Schema.Sql.Sql160DatabaseSchemaProvider</DSP>
+    <ModelCollation>1033, CI</ModelCollation>
+    <RootNamespace>MatchingDb</RootNamespace>
+    <AssemblyName>MatchingDb</AssemblyName>
+    <ProjectGuid>{00000000-0000-0000-0000-000000000000}</ProjectGuid>
   </PropertyGroup>
   <ItemGroup>
     <SqlCmdVariable Include="DeliusRunningPictureDb">
diff --git a/src/OfflocRunningPictureDb/OfflocRunningPictureDb.sqlproj b/src/OfflocRunningPictureDb/OfflocRunningPictureDb.sqlproj
index 0655646..efff024 100644
--- a/src/OfflocRunningPictureDb/OfflocRunningPictureDb.sqlproj
+++ b/src/OfflocRunningPictureDb/OfflocRunningPictureDb.sqlproj
@@ -2,11 +2,11 @@
 <Project DefaultTargets="Build">
   <Sdk Name="Microsoft.Build.Sql" Version="2.0.0" />
   <PropertyGroup>
-		<Name>OfflocRunningPictureDb</Name>
-		<DSP>Microsoft.Data.Tools.Schema.Sql.Sql160DatabaseSchemaProvider</DSP>
-		<ModelCollation>1033, CI</ModelCollation>
-		<RootNamespace>OfflocRunningPictureDb</RootNamespace>
-		<AssemblyName>OfflocRunningPictureDb</AssemblyName>
+    <Name>OfflocRunningPictureDb</Name>
+    <DSP>Microsoft.Data.Tools.Schema.Sql.Sql160DatabaseSchemaProvider</DSP>
+    <ModelCollation>1033, CI</ModelCollation>
+    <RootNamespace>OfflocRunningPictureDb</RootNamespace>
+    <AssemblyName>OfflocRunningPictureDb</AssemblyName>
+    <ProjectGuid>{00000000-0000-0000-0000-000000000000}</ProjectGuid>
   </PropertyGroup>
-
 </Project>
\ No newline at end of file
diff --git a/src/OfflocStagingDb/OfflocStagingDb.sqlproj b/src/OfflocStagingDb/OfflocStagingDb.sqlproj
index 8df22c9..7df66b6 100644
--- a/src/OfflocStagingDb/OfflocStagingDb.sqlproj
+++ b/src/OfflocStagingDb/OfflocStagingDb.sqlproj
@@ -2,11 +2,11 @@
 <Project DefaultTargets="Build">
   <Sdk Name="Microsoft.Build.Sql" Version="2.0.0" />
   <PropertyGroup>
-		<Name>OfflocStagingDb</Name>
-		<DSP>Microsoft.Data.Tools.Schema.Sql.Sql160DatabaseSchemaProvider</DSP>
-		<ModelCollation>1033, CI</ModelCollation>
-		<RootNamespace>OfflocStagingDb</RootNamespace>
-		<AssemblyName>OfflocStagingDb</AssemblyName>
+    <Name>OfflocStagingDb</Name>
+    <DSP>Microsoft.Data.Tools.Schema.Sql.Sql160DatabaseSchemaProvider</DSP>
+    <ModelCollation>1033, CI</ModelCollation>
+    <RootNamespace>OfflocStagingDb</RootNamespace>
+    <AssemblyName>OfflocStagingDb</AssemblyName>
+    <ProjectGuid>{00000000-0000-0000-0000-000000000000}</ProjectGuid>
   </PropertyGroup>
-
 </Project>
\ No newline at end of file
diff --git a/src/Visualiser/Pages/Index.cshtml b/src/Visualiser/Pages/Index.cshtml
index f815f7c..8b9d8d8 100644
--- a/src/Visualiser/Pages/Index.cshtml
+++ b/src/Visualiser/Pages/Index.cshtml
@@ -76,7 +76,7 @@
                     </div>
                 </div>
                 <div class="modal-footer">
-                    <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Cancel</button>
+                    <button type="button" class="btn btn-secondary" data-bs-dismiss="modal" id="cancelClusterButton">Cancel</button>
                     <button type="submit" class="btn btn-primary" id="findClusterButton" asp-page-handler="Details" hidden>Find</button>
                     <button type="submit" class="btn btn-primary" id="randomClusterButton" asp-page-handler="Random">Random</button>
                 </div>
@@ -94,17 +94,33 @@
             </div>
             <form id="saveNetwork" asp-page-handler="Network" method="post">
                 <div class="modal-body">
-                    <p>Hello</p>
+                    Are you sure you wish to save your changes?
+
+                    <div class="alert alert-warning mt-4" role="alert">
+                        Changes cannot be undone!
+                    </div>
+
                 </div>
                 <div class="modal-footer">
-                    <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Cancel</button>
-                    <button type="submit" class="btn btn-primary">Save</button>
+                    <button id="saveNetworkCancelBtn" type="button" class="btn btn-secondary" data-bs-dismiss="modal">Cancel</button>
+                    <button id="saveNetworkBtn" type="submit" class="btn btn-primary">Save</button>
                 </div>
             </form>
         </div>
     </div>
 </div>
 
+<div class="position-fixed bottom-0 start-0 p-3" style="z-index: 11">
+  <div id="success-toast" class="toast hide align-items-center text-white bg-success bg-opacity-75 border-0" role="alert" aria-live="assertive" aria-atomic="true">
+    <div class="d-flex">
+        <div class="toast-body">
+            Saved successfully
+        </div>
+        <button type="button" class="btn-close btn-close-white me-2 m-auto" data-bs-dismiss="toast" aria-label="Close"></button>
+    </div>
+  </div>
+</div>
+
 <div id="network"></div>
 
 <button id="saveNetworkButton" class="btn btn-success position-fixed bottom-0 end-0 m-4 shadow">
diff --git a/src/Visualiser/wwwroot/js/network.js b/src/Visualiser/wwwroot/js/network.js
index 7f3cd3e..8d989cd 100644
--- a/src/Visualiser/wwwroot/js/network.js
+++ b/src/Visualiser/wwwroot/js/network.js
@@ -49,6 +49,13 @@ var editNodeModal = new bootstrap.Modal('#editNodeModal');
 var findClusterModal = new bootstrap.Modal('#findClusterModal');
 var saveNetworkModal = new bootstrap.Modal('#saveNetworkModal');
 
+const toastEl = document.getElementById('success-toast');
+
+const toast = new bootstrap.Toast(toastEl, {
+    autohide: true,
+    delay: 3000
+});
+
 function getAntiForgeryToken() {
     const el = document.querySelector('input[name="__RequestVerificationToken"]');
     return el ? el.value : '';
@@ -104,6 +111,10 @@ document.getElementById("findClusterForm").addEventListener("submit", async even
         return;
     }
 
+    $('#randomClusterButton').prop('disabled', true);
+    $('#findClusterButton').prop('disabled', true);
+    $('#cancelClusterButton').prop('disabled', true);
+
     fetch(action + '?upci=' + group, { method: "GET" })
         .then(async response => {
 
@@ -131,6 +142,11 @@ document.getElementById("findClusterForm").addEventListener("submit", async even
     .catch(error => {
         console.error(error);
         alert(`Something went wrong. Error: ${error}`)
+    })
+    .finally(() => {
+        $('#randomClusterButton').prop('disabled', false);
+        $('#findClusterButton').prop('disabled', false);
+        $('#cancelClusterButton').prop('disabled', false);
     });
 });
 
@@ -158,6 +174,9 @@ document.getElementById("saveNetwork").addEventListener("submit", async event =>
         clusters: getNetwork()
     };
 
+    $('#saveNetworkBtn').prop('disabled', true);
+    $('#saveNetworkCancelBtn').prop('disabled', true);
+
     fetch(action, {
         method: "POST",
         headers: {
@@ -179,13 +198,16 @@ document.getElementById("saveNetwork").addEventListener("submit", async event =>
             return;
         }
 
-        // Saved successfully
-
         saveNetworkModal.hide();
+        toast.show();
     })
     .catch(error => {
         console.error(error);
         alert(`Something went wrong. Error: ${error}`)
+    })
+    .finally(() => {
+        $('#saveNetworkBtn').prop('disabled', false);
+        $('#saveNetworkCancelBtn').prop('disabled', false);
     });
 });